Standardize the multiple-include protect.

diff --git a/elf/link.h b/elf/link.h
index c894540..6c272fe 100644 (file)
--- a/elf/link.h
+++ b/elf/link.h
@@ -18,8 +18,8 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef        _LINK_H
-
 #define        _LINK_H 1
+
 #include <features.h>
 
 #define __need_size_t
@@ -36,7 +36,8 @@ __BEGIN_DECLS
 #define ELFW(type)     _ElfW (ELF, __ELF_NATIVE_CLASS, type)
 #define _ElfW(e,w,t)   _ElfW_1 (e, w, _##t)
 #define _ElfW_1(e,w,t) e##w##t
-#include <elfclass.h>          /* Defines __ELF_NATIVE_CLASS.  */
+
+#include <bits/elfclass.h>             /* Defines __ELF_NATIVE_CLASS.  */
 
 /* Rendezvous structure used by the run-time dynamic linker to communicate
    details of shared object loading to the debugger.  If the executable's

diff --git a/gmon/sys/gmon.h b/gmon/sys/gmon.h
index d963797..2eff69b 100644 (file)
--- a/gmon/sys/gmon.h
+++ b/gmon/sys/gmon.h
@@ -33,9 +33,9 @@
  *     @(#)gmon.h      8.2 (Berkeley) 1/4/94
  */
 
-#ifndef        _SYS_GMON_H_
+#ifndef        _SYS_GMON_H
+#define        _SYS_GMON_H     1
 
-#define        _SYS_GMON_H_    1
 #include <features.h>
 
 #include <sys/types.h>
@@ -176,4 +176,4 @@ void _mcleanup __P ((void));
 
 __END_DECLS
 
-#endif /* !_SYS_GMON_H_ */
+#endif /* sys/gmon.h */

diff --git a/gmon/sys/gmon_out.h b/gmon/sys/gmon_out.h
index 36059cc..bb80a1a 100644 (file)
--- a/gmon/sys/gmon_out.h
+++ b/gmon/sys/gmon_out.h
@@ -26,8 +26,8 @@
    identifying the type of records, followed by records specific data. */
 
 #ifndef _SYS_GMON_OUT_H
-
 #define _SYS_GMON_OUT_H        1
+
 #include <features.h>
 
 #define        GMON_MAGIC      "gmon"  /* magic cookie */
@@ -74,4 +74,4 @@ struct gmon_cg_arc_record
 
 __END_DECLS
 
-#endif /* _SYS_GMON_OUT_H */
+#endif /* sys/gmon_out.h */

diff --git a/grp/grp.h b/grp/grp.h
index 292bd26..72b8925 100644 (file)
--- a/grp/grp.h
+++ b/grp/grp.h
@@ -21,13 +21,13 @@
  */
 
 #ifndef        _GRP_H
-
 #define        _GRP_H  1
+
 #include <features.h>
 
 __BEGIN_DECLS
 
-#include <gnu/types.h>
+#include <bits/types.h>
 
 #define __need_size_t
 #include <stddef.h>