4 files changed, 13 insertions, 17 deletions
diff --git a/sysvipc/sys/ipc.h b/sysvipc/sys/ipc.h
index c36dd79b33..f1ba7ff188 100644
--- a/sysvipc/sys/ipc.h
+++ b/sysvipc/sys/ipc.h
@@ -1,6 +1,5 @@
 /* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -20,7 +19,7 @@
 #ifndef _SYS_IPC_H
 #define _SYS_IPC_H	1
 
-#include <sys/cdefs.h>
+#include <features.h>
 
 /* Get system dependent definition of `struct ipc_perm' and more.  */
 #include <bits/ipc.h>
diff --git a/sysvipc/sys/msg.h b/sysvipc/sys/msg.h
index b6fe7a77cf..56938bf613 100644
--- a/sysvipc/sys/msg.h
+++ b/sysvipc/sys/msg.h
@@ -1,6 +1,5 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -29,19 +28,19 @@
 /* Get system dependent definition of `struct msqid_ds' and more.  */
 #include <bits/msq.h>
 
-__BEGIN_DECLS
-
 /* The following System V style IPC functions implement a message queue
    system.  The definition is found in XPG2.  */
 
 /* Template for struct to be used as argument for `msgsnd' and `msgrcv'.  */
 struct msgbuf
-{
-  long int mtype;		/* type of received/sent message */
-  char mtext[1];		/* text of the message */
-};
+  {
+    long int mtype;		/* type of received/sent message */
+    char mtext[1];		/* text of the message */
+  };
 
 
+__BEGIN_DECLS
+
 /* Message queue control operation.  */
 extern int msgctl __P ((int __msqid, int __cmd, struct msqid_ds *__buf));
 
diff --git a/sysvipc/sys/sem.h b/sysvipc/sys/sem.h
index 84bcc5a0fc..f509d9b4a2 100644
--- a/sysvipc/sys/sem.h
+++ b/sysvipc/sys/sem.h
@@ -1,6 +1,5 @@
-/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -30,8 +29,6 @@
 /* Get system dependent definition of `struct semid_ds' and more.  */
 #include <bits/sem.h>
 
-__BEGIN_DECLS
-
 /* The following System V style IPC functions implement a semaphore
    handling.  The definition is found in XPG2.  */
 
@@ -44,6 +41,8 @@ struct sembuf
 };
 
 
+__BEGIN_DECLS
+
 /* Semaphore control operation.  */
 extern int semctl __P ((int __semid, int __semnum, int __cmd,
 			union semun __arg));
diff --git a/sysvipc/sys/shm.h b/sysvipc/sys/shm.h
index 56883b787b..6a3a34247b 100644
--- a/sysvipc/sys/shm.h
+++ b/sysvipc/sys/shm.h
@@ -1,6 +1,5 @@
 /* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -35,11 +34,11 @@
 /* Segment low boundary address multiple.  */
 #define SHMLBA		getpagesize ()
 
-__BEGIN_DECLS
-
 /* The following System V style IPC functions implement a shared memory
    facility.  The definition is found in XPG4.2.  */
 
+__BEGIN_DECLS
+
 /* Shared memory control operation.  */
 extern int shmctl __P ((int __shmid, int __cmd, struct shmid_ds *__buf));