Index: generic/include/proc/scheduler.h
===================================================================
--- generic/include/proc/scheduler.h	(revision 05e2a7ad64a4c5a40748a558c64ca76a66934a0c)
+++ generic/include/proc/scheduler.h	(revision 49b6d32c4bf731f668a2569fb78160da0299283f)
@@ -41,5 +41,5 @@
 /** Scheduler run queue structure. */
 struct runq {
-	spinlock_t lock;
+	SPINLOCK_DECLARE(lock);
 	link_t rq_head;		/**< List of ready threads. */
 	count_t n;		/**< Number of threads in rq_ready. */
Index: generic/include/proc/task.h
===================================================================
--- generic/include/proc/task.h	(revision 05e2a7ad64a4c5a40748a558c64ca76a66934a0c)
+++ generic/include/proc/task.h	(revision 49b6d32c4bf731f668a2569fb78160da0299283f)
@@ -35,5 +35,5 @@
 
 struct task {
-	spinlock_t lock;
+	SPINLOCK_DECLARE(lock);
 	link_t th_head;		/**< List of threads contained in this task. */
 	link_t tasks_link;	/**< Link to other tasks within the system. */
Index: generic/include/proc/thread.h
===================================================================
--- generic/include/proc/thread.h	(revision 05e2a7ad64a4c5a40748a558c64ca76a66934a0c)
+++ generic/include/proc/thread.h	(revision 49b6d32c4bf731f668a2569fb78160da0299283f)
@@ -71,5 +71,5 @@
 	 * 
 	 */
-	spinlock_t lock;
+	SPINLOCK_DECLARE(lock);
 
 	void (* thread_code)(void *);		/**< Function implementing the thread. */