Standardize the multiple-include protect.

diff --git a/setjmp/setjmp.h b/setjmp/setjmp.h
index eb4305f..0bb6fd6 100644 (file)
--- a/setjmp/setjmp.h
+++ b/setjmp/setjmp.h
@@ -21,15 +21,14 @@
  */
 
 #ifndef        _SETJMP_H
-
 #define        _SETJMP_H       1
+
 #include <features.h>
 
 __BEGIN_DECLS
 
-/* Get the machine-dependent definition of `__jmp_buf'.  */
-#include <jmp_buf.h>
-#include <sigset.h>            /* Get `__sigset_t'.  */
+#include <bits/setjmp.h>               /* Get `__jmp_buf'.  */
+#include <bits/sigset.h>               /* Get `__sigset_t'.  */
 
 /* Calling environment, plus possibly a saved signal mask.  */
 typedef struct __jmp_buf_tag   /* C++ doesn't like tagless structs.  */

diff --git a/shadow/shadow.h b/shadow/shadow.h
index 2bd52d8..d32d440 100644 (file)
--- a/shadow/shadow.h
+++ b/shadow/shadow.h
@@ -19,8 +19,8 @@
 /* Declaration of types and functions for shadow password suite.  */
 
 #ifndef _SHADOW_H
-
 #define _SHADOW_H      1
+
 #include <features.h>
 
 #include <paths.h>

diff --git a/socket/sys/socket.h b/socket/sys/socket.h
index bb4444d..aa2309c 100644 (file)
--- a/socket/sys/socket.h
+++ b/socket/sys/socket.h
@@ -18,8 +18,8 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef        _SYS_SOCKET_H
-
 #define        _SYS_SOCKET_H   1
+
 #include <features.h>
 
 __BEGIN_DECLS
@@ -31,7 +31,7 @@ __BEGIN_DECLS
 /* This operating system-specific header file defines the SOCK_*, PF_*,
    AF_*, MSG_*, SOL_*, and SO_* constants, and the `struct sockaddr',
    `struct msghdr', and `struct linger' types.  */
-#include <socketbits.h>
+#include <bits/socket.h>
 
 #ifdef __USE_BSD
 /* This is the 4.3 BSD `struct sockaddr' format, which is used as wire

diff --git a/socket/sys/un.h b/socket/sys/un.h
index 331f496..03f3605 100644 (file)
--- a/socket/sys/un.h
+++ b/socket/sys/un.h
@@ -17,14 +17,14 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef        _SYS_UN_H
-
 #define        _SYS_UN_H       1
+
 #include <sys/cdefs.h>
 
 #include <string.h>            /* For prototype of `strlen'.  */
 
 /* Get the definition of the macro to define the common sockaddr members.  */
-#include <sockaddrcom.h>
+#include <bits/sockaddr.h>
 
 __BEGIN_DECLS