8 files changed, 29 insertions, 13 deletions
diff --git a/i386/include/mach/i386/asm.h b/i386/include/mach/i386/asm.h
index 3e3f48bf..4e3b589a 100644
--- a/i386/include/mach/i386/asm.h
+++ b/i386/include/mach/i386/asm.h
@@ -24,6 +24,8 @@
  * the rights to redistribute these changes.
  */
 
+#ifndef _MACH_I386_ASM_H_
+#define _MACH_I386_ASM_H_
 
 #define S_ARG0	 4(%esp)
 #define S_ARG1	 8(%esp)
@@ -113,3 +115,5 @@
 
 #define	Entry(x)	.globl EXT(x); .p2align TEXT_ALIGN; LEXT(x)
 #define	DATA(x)		.globl EXT(x); .p2align DATA_ALIGN; LEXT(x)
+
+#endif /* _MACH_I386_ASM_H_ */
diff --git a/i386/include/mach/i386/cthreads.h b/i386/include/mach/i386/cthreads.h
index f9755b4a..d2aa16f5 100644
--- a/i386/include/mach/i386/cthreads.h
+++ b/i386/include/mach/i386/cthreads.h
@@ -53,4 +53,4 @@ typedef volatile int spin_lock_t;
 
 #endif	/* __GNUC__ */
 
-#endif _MACHINE_CTHREADS_H_
+#endif	/* _MACHINE_CTHREADS_H_ */
diff --git a/i386/include/mach/i386/disk.h b/i386/include/mach/i386/disk.h
index 40ed4fa8..1bbbbdf3 100644
--- a/i386/include/mach/i386/disk.h
+++ b/i386/include/mach/i386/disk.h
@@ -49,6 +49,9 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  * disk.h
  */
 
+#ifndef _MACH_I386_DISK_H_
+#define _MACH_I386_DISK_H_
+
 #if	defined(__linux__) || defined(__masix__)
 #define PART_DISK	4		/* partition number for entire disk */
 #else
@@ -118,3 +121,4 @@ struct absio {
 	char	*abs_buf;		/* Sector buffer */
 };
 
+#endif /* _MACH_I386_DISK_H_ */
diff --git a/i386/include/mach/i386/mach_i386_types.h b/i386/include/mach/i386/mach_i386_types.h
index b03c0b06..b0552809 100644
--- a/i386/include/mach/i386/mach_i386_types.h
+++ b/i386/include/mach/i386/mach_i386_types.h
@@ -47,9 +47,9 @@ typedef	struct descriptor *descriptor_list_t;
 
 #ifdef MACH_KERNEL
 #include <i386/io_perm.h>
-#else
+#else /* MACH_KERNEL */
 typedef unsigned short io_port_t;
 typedef mach_port_t io_perm_t;
-#endif
+#endif /* MACH_KERNEL */
 
 #endif	/* _MACH_MACH_I386_TYPES_H_ */
diff --git a/i386/include/mach/i386/multiboot.h b/i386/include/mach/i386/multiboot.h
index 7aa0b1c4..8f1c47b0 100644
--- a/i386/include/mach/i386/multiboot.h
+++ b/i386/include/mach/i386/multiboot.h
@@ -175,6 +175,16 @@ struct AddrRangeDesc
   /* unspecified optional padding... */
 };
 
+struct multiboot_mmap
+{
+  unsigned long size;
+  unsigned long long BaseAddr;
+  unsigned long long Length;
+  unsigned long Type;
+
+  /* unspecified optional padding... */
+};
+
 /* usable memory "Type", all others are reserved.  */
 #define MB_ARD_MEMORY       1
 
diff --git a/i386/include/mach/i386/rpc.h b/i386/include/mach/i386/rpc.h
deleted file mode 100644
index 71d31fb9..00000000
--- a/i386/include/mach/i386/rpc.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-struct	rpc_csig_action
-{
-};
-
-struct	rpc_csig_entry
-{
-};
-
diff --git a/i386/include/mach/i386/thread_status.h b/i386/include/mach/i386/thread_status.h
index 5f20355e..ba1e3dea 100644
--- a/i386/include/mach/i386/thread_status.h
+++ b/i386/include/mach/i386/thread_status.h
@@ -56,6 +56,7 @@
 #define i386_ISA_PORT_MAP_STATE	3
 #define	i386_V86_ASSIST_STATE	4
 #define	i386_REGS_SEGS_STATE	5
+#define	i386_DEBUG_STATE	6
 
 /*
  * This structure is used for both
@@ -144,4 +145,10 @@ struct v86_interrupt_table {
 #define	i386_V86_ASSIST_STATE_COUNT \
 	    (sizeof(struct i386_v86_assist_state)/sizeof(unsigned int))
 
+struct i386_debug_state {
+	unsigned int	dr[8];
+};
+#define	i386_DEBUG_STATE_COUNT \
+	    (sizeof(struct i386_debug_state)/sizeof(unsigned int))
+
 #endif	/* _MACH_I386_THREAD_STATUS_H_ */
diff --git a/i386/include/mach/i386/vm_param.h b/i386/include/mach/i386/vm_param.h
index 8f708f0f..3a209b83 100644
--- a/i386/include/mach/i386/vm_param.h
+++ b/i386/include/mach/i386/vm_param.h
@@ -29,7 +29,7 @@
  *	Date:	1985
  *
  *	I386 machine dependent virtual memory parameters.
- *	Most of the declarations are preceeded by I386_ (or i386_)
+ *	Most of the declarations are preceded by I386_ (or i386_)
  *	which is OK because only I386 specific code will be using
  *	them.
  */