Index: kernel/generic/include/synch/condvar.h
===================================================================
--- kernel/generic/include/synch/condvar.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/synch/condvar.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_CONDVAR_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 #include <synch/mutex.h>
Index: kernel/generic/include/synch/futex.h
===================================================================
--- kernel/generic/include/synch/futex.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/synch/futex.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_FUTEX_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 
Index: kernel/generic/include/synch/mutex.h
===================================================================
--- kernel/generic/include/synch/mutex.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/synch/mutex.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_MUTEX_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/semaphore.h>
 #include <synch/synch.h>
Index: kernel/generic/include/synch/rwlock.h
===================================================================
--- kernel/generic/include/synch/rwlock.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/synch/rwlock.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_RWLOCK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/mutex.h>
 #include <synch/synch.h>
Index: kernel/generic/include/synch/semaphore.h
===================================================================
--- kernel/generic/include/synch/semaphore.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/synch/semaphore.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_SEMAPHORE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/waitq.h>
 #include <synch/synch.h>
Index: kernel/generic/include/synch/spinlock.h
===================================================================
--- kernel/generic/include/synch/spinlock.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/synch/spinlock.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_SPINLOCK_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch/barrier.h>
 #include <preemption.h>
Index: kernel/generic/include/synch/waitq.h
===================================================================
--- kernel/generic/include/synch/waitq.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/synch/waitq.h	(revision 3db888900c2e62ec19ed8118072f743bca5a6eb7)
@@ -36,5 +36,5 @@
 #define KERN_WAITQ_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/spinlock.h>
 #include <synch/synch.h>