diff --git a/sys/arch/i386/include/endian.h b/sys/arch/i386/include/endian.h
index 6823c3ccd2eb..1e7b89258552 100644
--- a/sys/arch/i386/include/endian.h
+++ b/sys/arch/i386/include/endian.h
@@ -31,11 +31,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)endian.h	7.8 (Berkeley) 4/3/91
- *	$Id: endian.h,v 1.12 1994/09/10 01:07:08 jtc Exp $
+ *	$Id: endian.h,v 1.13 1994/10/09 13:33:53 mycroft Exp $
  */
 
-#ifndef _MACHINE_ENDIAN_H_
-#define _MACHINE_ENDIAN_H_
+#ifndef _I386_ENDIAN_H_
+#define	_I386_ENDIAN_H_
 
 /*
  * Define the order of 32-bit words in 64-bit words.
@@ -108,4 +108,4 @@ __END_DECLS
 
 #endif /* _POSIX_SOURCE */
 
-#endif /* _MACHINE_ENDIAN_H_ */
+#endif /* !_I386_ENDIAN_H_ */
diff --git a/sys/arch/i386/include/varargs.h b/sys/arch/i386/include/varargs.h
index b9d4f8f4bde9..a509f65fe0e2 100644
--- a/sys/arch/i386/include/varargs.h
+++ b/sys/arch/i386/include/varargs.h
@@ -36,11 +36,11 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)varargs.h	8.2 (Berkeley) 3/22/94
- *	$Id: varargs.h,v 1.4 1994/06/29 00:45:01 deraadt Exp $
+ *	$Id: varargs.h,v 1.5 1994/10/09 13:33:54 mycroft Exp $
  */
 
-#ifndef _MACHINE_VARARGS_H_
-#define	_MACHINE_VARARGS_H_
+#ifndef _I386_VARARGS_H_
+#define	_I386_VARARGS_H_
 
 typedef char *va_list;
 
@@ -60,4 +60,4 @@ typedef char *va_list;
 
 #define	va_end(ap)
 
-#endif /* !_MACHINE_VARARGS_H_ */
+#endif /* !_I386_VARARGS_H_ */