Index: generic/include/time/timeout.h
===================================================================
--- generic/include/time/timeout.h	(revision 169c408f8774661800aa0a9685c9914cbb5a974c)
+++ generic/include/time/timeout.h	(revision 7614565928991ee1b958841cfa45a268038da3f5)
@@ -40,5 +40,5 @@
 
 struct timeout {
-	spinlock_t lock;
+	SPINLOCK_DECLARE(lock);
 
 	link_t link;			/**< Link to the list of active timeouts on THE->cpu */