diff --git a/headers/private/kernel/dev.h b/headers/private/kernel/dev.h
index 1b8c72ca04..ca8f405f37 100755
--- a/headers/private/kernel/dev.h
+++ b/headers/private/kernel/dev.h
@@ -5,11 +5,10 @@
 #ifndef _KERNEL_DEV_H
 #define _KERNEL_DEV_H
 
-#include <kernel.h>
+#include <image.h>
 #include <stage2.h>
 
 int dev_init(kernel_args *ka);
 image_id dev_load_dev_module(const char *name, const char *directory);
 
-#endif
-
+#endif	/* _KERNEL_DEV_H */
diff --git a/headers/private/kernel/ktypes.h b/headers/private/kernel/ktypes.h
index be7cf8ec9f..cb3423f938 100755
--- a/headers/private/kernel/ktypes.h
+++ b/headers/private/kernel/ktypes.h
@@ -13,13 +13,7 @@ extern "C" {
 
 typedef int32  region_id;
 typedef int32  aspace_id;
-
-#ifndef _IMAGE_H
-	typedef int32  image_id;
-#endif
-
-
-typedef unsigned long			addr;
+typedef uint32 addr;
 
 #ifdef __cplusplus
 }