Index: kernel/generic/include/synch/condvar.h
===================================================================
--- kernel/generic/include/synch/condvar.h	(revision b1c57a828cb73794beb6a309f5ec0199ca75ecc2)
+++ kernel/generic/include/synch/condvar.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -36,5 +36,5 @@
 #define KERN_CONDVAR_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 #include <synch/waitq.h>
 #include <synch/mutex.h>
Index: kernel/generic/include/synch/mutex.h
===================================================================
--- kernel/generic/include/synch/mutex.h	(revision b1c57a828cb73794beb6a309f5ec0199ca75ecc2)
+++ kernel/generic/include/synch/mutex.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -36,5 +36,6 @@
 #define KERN_MUTEX_H_
 
-#include <typedefs.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <synch/semaphore.h>
 #include <abi/synch.h>
Index: kernel/generic/include/synch/semaphore.h
===================================================================
--- kernel/generic/include/synch/semaphore.h	(revision b1c57a828cb73794beb6a309f5ec0199ca75ecc2)
+++ kernel/generic/include/synch/semaphore.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -36,5 +36,5 @@
 #define KERN_SEMAPHORE_H_
 
-#include <typedefs.h>
+#include <stdint.h>
 #include <synch/waitq.h>
 #include <abi/synch.h>
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision b1c57a828cb73794beb6a309f5ec0199ca75ecc2)
+++ kernel/generic/include/synch/spinlock.h	(revision fb864d653f08c9c94bf26673eb5d1efd0c3e6f25)
@@ -36,5 +36,5 @@
 #define KERN_SPINLOCK_H_
 
-#include <typedefs.h>
+#include <stdbool.h>
 #include <arch/barrier.h>
 #include <preemption.h>