Spinlock updated;
Fix includes.