Index: kernel/generic/include/console/kconsole.h
===================================================================
--- kernel/generic/include/console/kconsole.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
+++ kernel/generic/include/console/kconsole.h	(revision 8be8cfa20aad57a15e51e9a83cf62a49af0b59a4)
@@ -70,5 +70,5 @@
 } cmd_info_t;
 
-extern spinlock_t cmd_lock;
+SPINLOCK_EXTERN(cmd_lock);
 extern link_t cmd_head;
 
Index: kernel/generic/include/mm/as.h
===================================================================
--- kernel/generic/include/mm/as.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
+++ kernel/generic/include/mm/as.h	(revision 8be8cfa20aad57a15e51e9a83cf62a49af0b59a4)
@@ -140,5 +140,5 @@
 extern as_operations_t *as_operations;
 
-extern spinlock_t inactive_as_with_asid_lock;
+SPINLOCK_EXTERN(inactive_as_with_asid_lock);
 extern link_t inactive_as_with_asid_head;
 
Index: kernel/generic/include/mm/asid.h
===================================================================
--- kernel/generic/include/mm/asid.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
+++ kernel/generic/include/mm/asid.h	(revision 8be8cfa20aad57a15e51e9a83cf62a49af0b59a4)
@@ -59,5 +59,5 @@
 #define ASIDS_ALLOCABLE	((ASID_MAX + 1) - ASID_START)
 
-extern spinlock_t asidlock;
+SPINLOCK_EXTERN(asidlock);
 extern link_t as_with_asid_head;
 
Index: kernel/generic/include/print.h
===================================================================
--- kernel/generic/include/print.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
+++ kernel/generic/include/print.h	(revision 8be8cfa20aad57a15e51e9a83cf62a49af0b59a4)
@@ -41,5 +41,5 @@
 
 /* We need this address in spinlock to avoid deadlock in deadlock detection */
-extern spinlock_t printflock;
+SPINLOCK_EXTERN(printflock);
 
 #define EOF (-1)
Index: kernel/generic/include/proc/task.h
===================================================================
--- kernel/generic/include/proc/task.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
+++ kernel/generic/include/proc/task.h	(revision 8be8cfa20aad57a15e51e9a83cf62a49af0b59a4)
@@ -247,5 +247,5 @@
 } thread_t;
 
-extern spinlock_t tasks_lock;
+SPINLOCK_EXTERN(tasks_lock);
 extern btree_t tasks_btree;
 
Index: kernel/generic/include/proc/thread.h
===================================================================
--- kernel/generic/include/proc/thread.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
+++ kernel/generic/include/proc/thread.h	(revision 8be8cfa20aad57a15e51e9a83cf62a49af0b59a4)
@@ -61,5 +61,5 @@
  *
  */
-extern spinlock_t threads_lock;
+SPINLOCK_EXTERN(threads_lock);
 
 extern btree_t threads_btree;			/**< B+tree containing all threads. */
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 0b3a78fec9fcd0f2d1ba2ad32efec95c4ad2cfdf)
+++ kernel/generic/include/synch/spinlock.h	(revision 8be8cfa20aad57a15e51e9a83cf62a49af0b59a4)
@@ -54,4 +54,5 @@
  */
 #define SPINLOCK_DECLARE(slname) 	spinlock_t slname
+#define SPINLOCK_EXTERN(slname)		extern spinlock_t slname
 
 /*
@@ -103,8 +104,7 @@
 #else
 
-typedef void spinlock_t;
-
 /* On UP systems, spinlocks are effectively left out. */
 #define SPINLOCK_DECLARE(name)
+#define SPINLOCK_EXTERN(name)
 #define SPINLOCK_INITIALIZE(name)