Index: generic/include/console/chardev.h
===================================================================
--- generic/include/console/chardev.h	(revision e07fe0c1834e24beaa907000673e1e37acbc7c7d)
+++ generic/include/console/chardev.h	(revision ff12a3c546fb5433fae9768de8c16772ea628030)
@@ -53,5 +53,5 @@
 	
 	waitq_t wq;
-	spinlock_t lock;		/**< Protects everything below. */
+	SPINLOCK_DECLARE(lock);		/**< Protects everything below. */
 	__u8 buffer[CHARDEV_BUFLEN];
 	count_t counter;
Index: generic/include/console/kconsole.h
===================================================================
--- generic/include/console/kconsole.h	(revision e07fe0c1834e24beaa907000673e1e37acbc7c7d)
+++ generic/include/console/kconsole.h	(revision ff12a3c546fb5433fae9768de8c16772ea628030)
@@ -56,5 +56,5 @@
 struct cmd_info {
 	link_t link;			/**< Command list link. */
-	spinlock_t lock;		/**< This lock protects everything below. */
+	SPINLOCK_DECLARE(lock);		/**< This lock protects everything below. */
 	const char *name;		/**< Command name. */
 	const char *description;	/**< Textual description. */