Revert "pthread: We should not directly include arch/spinlock.h as it…

Revert "pthread: We should not directly include arch/spinlock.h as it… #2740