Index: kernel/genarch/include/fb/fb.h
===================================================================
--- kernel/genarch/include/fb/fb.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/genarch/include/fb/fb.h	(revision 6f4495f5c6915097f277fabc29a874343f77e88a)
@@ -36,6 +36,6 @@
 #define KERN_FB_H_
 
-#include <typedefs.h>
 #include <arch/types.h>
+#include <synch/spinlock.h>
 
 extern spinlock_t fb_lock;
Index: kernel/genarch/include/mm/page_ht.h
===================================================================
--- kernel/genarch/include/mm/page_ht.h	(revision df4ed852a2d1b242f9bdce0a873009a2cb77cec7)
+++ kernel/genarch/include/mm/page_ht.h	(revision 6f4495f5c6915097f277fabc29a874343f77e88a)
@@ -41,5 +41,5 @@
 
 #include <mm/page.h>
-#include <typedefs.h>
+#include <synch/mutex.h>
 #include <arch/types.h>
 #include <adt/list.h>