diff --git a/include/signal.h b/include/signal.h
index 8b99573..ffd2beb 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -9,7 +9,7 @@
 #include <string.h>		/* For memset() */
 #include <limits.h>		/* For LONG_BIT */
 #include <sys/types.h>
-#include <linux/signal.h>
+#include <asm/signal.h>
 
 /* Some architectures don't define these */
 #ifndef SA_RESETHAND
diff --git a/include/sys/mman.h b/include/sys/mman.h
index 0576841..3d8a2f6 100644
--- a/include/sys/mman.h
+++ b/include/sys/mman.h
@@ -7,7 +7,7 @@
 
 #include <klibc/extern.h>
 #include <sys/types.h>
-#include <linux/mman.h>
+#include <asm/mman.h>
 #include <asm/page.h>		/* For PAGE_SIZE */
 
 #define MAP_FAILED ((void *)-1)
diff --git a/include/sys/types.h b/include/sys/types.h
index 85feeb2..a25873c 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -21,7 +21,7 @@
 #define _LINUX_TYPES_H		
 
 typedef __kernel_fd_set		fd_set;
-typedef __kernel_dev_t		dev_t;
+typedef uint32_t		dev_t;
 typedef __kernel_ino_t		ino_t;
 typedef __kernel_mode_t		mode_t;
 typedef __kernel_nlink_t	nlink_t;
diff --git a/klibc/include/signal.h b/klibc/include/signal.h
index 8b99573..ffd2beb 100644
--- a/klibc/include/signal.h
+++ b/klibc/include/signal.h
@@ -9,7 +9,7 @@
 #include <string.h>		/* For memset() */
 #include <limits.h>		/* For LONG_BIT */
 #include <sys/types.h>
-#include <linux/signal.h>
+#include <asm/signal.h>
 
 /* Some architectures don't define these */
 #ifndef SA_RESETHAND
diff --git a/klibc/include/sys/mman.h b/klibc/include/sys/mman.h
index 0576841..3d8a2f6 100644
--- a/klibc/include/sys/mman.h
+++ b/klibc/include/sys/mman.h
@@ -7,7 +7,7 @@
 
 #include <klibc/extern.h>
 #include <sys/types.h>
-#include <linux/mman.h>
+#include <asm/mman.h>
 #include <asm/page.h>		/* For PAGE_SIZE */
 
 #define MAP_FAILED ((void *)-1)
diff --git a/klibc/include/sys/types.h b/klibc/include/sys/types.h
index 85feeb2..a25873c 100644
--- a/klibc/include/sys/types.h
+++ b/klibc/include/sys/types.h
@@ -21,7 +21,7 @@
 #define _LINUX_TYPES_H		
 
 typedef __kernel_fd_set		fd_set;
-typedef __kernel_dev_t		dev_t;
+typedef uint32_t		dev_t;
 typedef __kernel_ino_t		ino_t;
 typedef __kernel_mode_t		mode_t;
 typedef __kernel_nlink_t	nlink_t;
diff --git a/utils/fstype.c b/utils/fstype.c
index 5cefc5c..bbc236a 100644
--- a/utils/fstype.c
+++ b/utils/fstype.c
@@ -21,6 +21,7 @@
 #include <linux/romfs_fs.h>
 #include <linux/cramfs_fs.h>
 #include <linux/minix_fs.h>
+#define _LINUX_EXT2_FS_SB
 #include <linux/ext2_fs.h>
 #include "ext3_fs.h"