Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision 42bbbe2f75043018bca820dd1bd12d939b51ee1b)
+++ kernel/generic/include/synch/spinlock.h	(revision 769a1285463584c6e2c008c195f74009ac536e12)
@@ -184,7 +184,7 @@
 
 typedef struct {
-	spinlock_t lock;  /**< Spinlock */
-	bool guard;       /**< Flag whether ipl is valid */
-	ipl_t ipl;        /**< Original interrupt level */
+	SPINLOCK_DECLARE(lock);	/**< Spinlock */
+	bool guard;		/**< Flag whether ipl is valid */
+	ipl_t ipl;		/**< Original interrupt level */
 } irq_spinlock_t;