A few cleanups to have less include files include each other.

2 files changed, 10 insertions, 20 deletions

diff --git a/sys/arch/mvme88k/include/bug.h b/sys/arch/mvme88k/include/bug.h
index ecc1a77212e..ac6cee7cb89 100644
--- a/sys/arch/mvme88k/include/bug.h
+++ b/sys/arch/mvme88k/include/bug.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: bug.h,v 1.7 2001/08/26 14:31:07 miod Exp $ */
-#ifndef __MACHINE_BUG_H__
-#define __MACHINE_BUG_H__
-#include <machine/bugio.h>
+/*	$OpenBSD: bug.h,v 1.8 2001/11/27 05:36:40 miod Exp $ */
+
+#ifndef _MACHINE_BUG_H_
+#define _MACHINE_BUG_H_
 
 struct bugenv {
 	int	clun;
@@ -13,4 +13,5 @@ struct bugenv {
 	char	*argstart;
 	char	*argend;
 };
-#endif /* __MACHINE_BUG_H__ */
+
+#endif	/* _MACHINE_BUG_H_ */
diff --git a/sys/arch/mvme88k/include/cmmu.h b/sys/arch/mvme88k/include/cmmu.h
index 8b07f9418c0..37f6081b1ab 100644
--- a/sys/arch/mvme88k/include/cmmu.h
+++ b/sys/arch/mvme88k/include/cmmu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmmu.h,v 1.5 2001/08/26 14:31:07 miod Exp $ */
+/*	$OpenBSD: cmmu.h,v 1.6 2001/11/27 05:36:40 miod Exp $ */
 /* 
  * Mach Operating System
  * Copyright (c) 1993-1992 Carnegie Mellon University
@@ -24,20 +24,9 @@
  * any improvements or extensions that they make and grant Carnegie Mellon 
  * the rights to redistribute these changes.
  */
-/*
- * HISTORY
- * 
- */
-
-
-#ifndef	__MACHINE_CMMU_H__
-#define	__MACHINE_CMMU_H__
-
-#ifndef _LOCORE
-#include <machine/mmu.h>		 /* batc_template_t */
-#endif
 
-#include <machine/board.h>
+#ifndef	_MACHINE_CMMU_H_
+#define	_MACHINE_CMMU_H_
 
 /* Area Description */
 #define AREA_D_WT	0x00000200	/* write through */
@@ -135,4 +124,4 @@ void cmmu_set_pair_batc_entry(
 
 #endif	/* _LOCORE */
 
-#endif	/* __MACHINE_CMMU_H__ */
+#endif	/* _MACHINE_CMMU_H_ */