Index: kernel/generic/include/lib/elf.h
===================================================================
--- kernel/generic/include/lib/elf.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/lib/elf.h	(revision eaf22d459455947bd485ac9ce93b76d1d374430b)
@@ -37,13 +37,13 @@
 
 #include <arch/elf.h>
-#include <arch/types.h>
+#include <typedefs.h>
 
 /**
  * current ELF version
  */
-#define	EV_CURRENT	1
-
-/** 
- * ELF types 
+#define EV_CURRENT	1
+
+/**
+ * ELF types
  */
 #define ET_NONE		0	/* No type */
Index: kernel/generic/include/lib/rd.h
===================================================================
--- kernel/generic/include/lib/rd.h	(revision a000878c0dee83a08f032207ffd800c201fca95b)
+++ kernel/generic/include/lib/rd.h	(revision eaf22d459455947bd485ac9ce93b76d1d374430b)
@@ -36,10 +36,10 @@
 #define KERN_RD_H_
 
-#include <arch/types.h>
+#include <typedefs.h>
 
 /**
  * RAM disk version
  */
-#define	RD_VERSION	1
+#define RD_VERSION	1
 
 /**