--- ./fpu.h.orig	2003-08-12 17:09:50.000000000 -0700
+++ ./fpu.h	2005-10-31 10:04:35.000000000 -0800
@@ -38,6 +38,9 @@
  * Data register.
  */
 
+#ifndef _I386_FPU_H_
+#define _I386_FPU_H_
+
 typedef struct fp_data_reg {
     unsigned short		mant;
     unsigned short		mant1	:16,
@@ -120,7 +123,10 @@
 					:3;
 } fp_control_t;
 
+#ifndef _GUARD_I386_SEL_H_
+#define _GUARD_I386_SEL_H_
 #import <architecture/i386/sel.h>
+#endif
 
 /*
  * Floating point 'environment'
@@ -151,3 +157,5 @@
     fp_env_t			environ;
     fp_stack_t			stack;
 } fp_state_t;
+
+#endif
--- ./frame.h.orig	2003-08-12 17:09:53.000000000 -0700
+++ ./frame.h	2005-10-31 10:04:35.000000000 -0800
@@ -38,6 +38,9 @@
  *	Created.
  */
 
+#ifndef _I386_FRAME_H_
+#define _I386_FRAME_H_
+
 /*
  * Format of the error code
  * generated by the hardware
@@ -62,7 +65,10 @@
     } pgfault;
 } err_code_t;
 
+#ifndef _GUARD_I386_SEL_H_
+#define _GUARD_I386_SEL_H_
 #import <architecture/i386/sel.h>
+#endif
 
 /*
  * The actual hardware exception frame
@@ -122,3 +128,5 @@
 
 #define EFL_CLR		0xfff88028
 #define EFL_SET		0x00000002
+
+#endif