6 files changed, 13 insertions, 14 deletions

diff --git a/libc/kinclude/arch/errno.h b/libc/kinclude/arch/errno.h
index 8cee74b..0a8f840 100644
--- a/libc/kinclude/arch/errno.h
+++ b/libc/kinclude/arch/errno.h
@@ -1,5 +1,5 @@
-#ifndef __ARCH_ERRNO_H
-#define __ARCH_ERRNO_H
+#ifndef __ARCH_8086_ERRNO_H
+#define __ARCH_8086_ERRNO_H
 
 #define	EPERM		 1	/* Operation not permitted */
 #define	ENOENT		 2	/* No such file or directory */
diff --git a/libc/kinclude/arch/ioctl.h b/libc/kinclude/arch/ioctl.h
index 55b276b..0e4459f 100644
--- a/libc/kinclude/arch/ioctl.h
+++ b/libc/kinclude/arch/ioctl.h
@@ -2,8 +2,8 @@
  *	Nothing here yet.
  */
 
-#ifndef _ASMI86_IOCTL_H
-#define _ASMI86_IOCTL_H
+#ifndef __ARCH_8086_IOCTL_H
+#define __ARCH_8086_IOCTL_H
 
 
-#endif /* _ASMI86_IOCTL_H */
+#endif /* __ARCH_8086_IOCTL_H */
diff --git a/libc/kinclude/arch/stat.h b/libc/kinclude/arch/stat.h
index fd77f62..98d77e1 100644
--- a/libc/kinclude/arch/stat.h
+++ b/libc/kinclude/arch/stat.h
@@ -1,9 +1,7 @@
+#ifndef __ARCH_8086_STAT_H
+#define __ARCH_8086_STAT_H
 
-#ifndef _ARCH_STAT_H
-#define _ARCH_STAT_H
-
-struct stat
-{
+struct stat {
 	dev_t st_dev;
 	ino_t st_ino;
 	mode_t st_mode;
@@ -16,4 +14,5 @@ struct stat
 	time_t st_mtime;
 	time_t st_ctime;
 };
+
 #endif
diff --git a/libc/kinclude/arch/types.h b/libc/kinclude/arch/types.h
index f59faf6..1f766a5 100644
--- a/libc/kinclude/arch/types.h
+++ b/libc/kinclude/arch/types.h
@@ -1,7 +1,7 @@
 /* arch/i86/include/asm/types.h - Basic Linux/MT data types. */
 
-#ifndef __LINUXMT_8086_TYPES
-#define __LINUXMT_8086_TYPES
+#ifndef __ARCH_8086_TYPES
+#define __ARCH_8086_TYPES
 
 #include <asm/types.h>
 	
diff --git a/libc/kinclude/linuxmt/errno.h b/libc/kinclude/linuxmt/errno.h
index b4c07a3..691fd47 100644
--- a/libc/kinclude/linuxmt/errno.h
+++ b/libc/kinclude/linuxmt/errno.h
@@ -1 +1 @@
-#include "../arch/errno.h"
+#include <arch/errno.h>
diff --git a/libc/kinclude/linuxmt/ioctl.h b/libc/kinclude/linuxmt/ioctl.h
index 20f5ac6..ce1136a 100644
--- a/libc/kinclude/linuxmt/ioctl.h
+++ b/libc/kinclude/linuxmt/ioctl.h
@@ -1 +1 @@
-#include "../arch/ioctl.h"
+#include <arch/ioctl.h>