Index: kernel/generic/include/adt/avl.h
===================================================================
--- kernel/generic/include/adt/avl.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
+++ kernel/generic/include/adt/avl.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,4 @@
 #define KERN_AVLTREE_H_ 
 
-#include <arch/types.h>
 #include <typedefs.h>
 
Index: kernel/generic/include/adt/bitmap.h
===================================================================
--- kernel/generic/include/adt/bitmap.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
+++ kernel/generic/include/adt/bitmap.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_BITMAP_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 #define BITS2BYTES(bits)	(bits ? ((((bits)-1)>>3)+1) : 0)
Index: kernel/generic/include/adt/btree.h
===================================================================
--- kernel/generic/include/adt/btree.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
+++ kernel/generic/include/adt/btree.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,5 @@
 #define KERN_BTREE_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 #include <adt/list.h>
 
Index: kernel/generic/include/adt/hash_table.h
===================================================================
--- kernel/generic/include/adt/hash_table.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
+++ kernel/generic/include/adt/hash_table.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -37,5 +37,5 @@
 
 #include <adt/list.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /** Set of operations for hash table. */
Index: kernel/generic/include/adt/list.h
===================================================================
--- kernel/generic/include/adt/list.h	(revision 98000fb4ea6015506f059c9b121e417ce991ecfd)
+++ kernel/generic/include/adt/list.h	(revision 626f9079bcffdfbce27d2e92f138ae9ce8e4c650)
@@ -36,5 +36,4 @@
 #define KERN_LIST_H_
 
-#include <arch/types.h>
 #include <typedefs.h>