5 files changed, 53 insertions, 21 deletions

diff --git a/sysdeps/unix/sysv/linux/sys/acct.h b/sysdeps/unix/sysv/linux/sys/acct.h
index adb2da7a99..da039307d1 100644
--- a/sysdeps/unix/sysv/linux/sys/acct.h
+++ b/sysdeps/unix/sysv/linux/sys/acct.h
@@ -21,6 +21,9 @@ Boston, MA 02111-1307, USA.  */
 #define _SYS_ACCT_H	1
 #include <features.h>
 
+#define	__need_time_t
+#include <time.h>
+
 /* Get needed constants.  */
 #include <linux/acct.h>
 
diff --git a/sysdeps/unix/sysv/linux/sys/io.h b/sysdeps/unix/sysv/linux/sys/io.h
index d44850f025..6f0b9aba14 100644
--- a/sysdeps/unix/sysv/linux/sys/io.h
+++ b/sysdeps/unix/sysv/linux/sys/io.h
@@ -16,9 +16,12 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 675 Mass Ave,
 Cambridge, MA 02139, USA.  */
 
-#ifndef _SYS_IO_H
-#define _SYS_IO_H
+#ifndef	_SYS_IO_H
 
+#define	_SYS_IO_H	1
+#include <features.h>
+
+/* Get constants from kernel header files. */
 #include <asm/io.h>
 
 /* If TURN_ON is TRUE, request for permission to do direct i/o on the
@@ -28,12 +31,12 @@ Cambridge, MA 02139, USA.  */
    Portability note: not all Linux platforms support this call.  Most
    platforms based on the PC I/O architecture probably will, however.
    E.g., Linux/Alpha for Alpha PCs supports this.  */
-extern int ioperm __P((unsigned long __from, unsigned long __num,
-		       int __turn_on));
+extern int ioperm __P ((unsigned long int __from, unsigned long int __num,
+			int __turn_on));
 
 /* Set the I/O privilege level to LEVEL.  If LEVEL>3, permission to
    access any I/O port is granted.  This call requires root
    privileges. */
-extern int iopl __P((int __level));
+extern int iopl __P ((int __level));
 
 #endif /* _SYS_IO_H */
diff --git a/sysdeps/unix/sysv/linux/sys/klog.h b/sysdeps/unix/sysv/linux/sys/klog.h
index b8a39d6492..91811c3e32 100644
--- a/sysdeps/unix/sysv/linux/sys/klog.h
+++ b/sysdeps/unix/sysv/linux/sys/klog.h
@@ -1,10 +1,30 @@
-#ifndef _SYS_KLOG_H
-#define _SYS_KLOG_H
+/* Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+
+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
+published by the Free Software Foundation; either version 2 of the
+License, or (at your option) any later version.
+
+The GNU C Library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Library General Public License for more details.
+
+You should have received a copy of the GNU Library General Public
+License along with the GNU C Library; see the file COPYING.LIB.  If
+not, write to the Free Software Foundation, Inc., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#ifndef	_SYS_KLOG_H
+
+#define	_SYS_KLOG_H	1
+#include <features.h>
 
 /* Control the kernel's logging facility.  This corresponds exactly to
    the kernel's syslog system call, but that name is easily confused
    with the user-level syslog facility, which is something completely
    different.  */
-extern int klogctl __P((int type, char *bufp, int len));
+extern int klogctl __P ((int __type, char *__bufp, int __len));
 
 #endif /* _SYS_KLOG_H */
diff --git a/sysdeps/unix/sysv/linux/sys/module.h b/sysdeps/unix/sysv/linux/sys/module.h
index 5c4dbcea37..1062854704 100644
--- a/sysdeps/unix/sysv/linux/sys/module.h
+++ b/sysdeps/unix/sysv/linux/sys/module.h
@@ -1,21 +1,24 @@
-#ifndef _SYS_MODULE_H
-#define _SYS_MODULE_H
+#ifndef	_SYS_MODULE_H
 
+#define	_SYS_MODULE_H	1
 #include <features.h>
 
+#define __need_size_t
+#include <stddef.h>
+
 #include <linux/module.h>
 
 /* Return number of kernel symbols if TABLE == NULL, otherwise, return
    kernel symbols in TABLE.  TABLE must be large enough to hold all
    kernel symbols.  */
-extern int get_kernel_syms __P((struct kernel_sym * table));
+extern int get_kernel_syms __P ((struct kernel_sym * table));
 
 /* Create a new module of name MODULE_NAME and of size SIZE bytes.
    The return address is the starting address of the new module or -1L
    if the module cannot be created (the return value needs to be cast
    to (long) to detect the error condition).  */
-extern unsigned long create_module __P((const char * module_name,
-					size_t size));
+extern unsigned long create_module __P ((__const char * module_name,
+					 size_t size));
 
 /* Initialize the module called MODULE_NAME with the CONTENTSSIZE
    bytes starting at address CONTENTS.  CONTENTS normally contains the
@@ -25,12 +28,12 @@ extern unsigned long create_module __P((const char * module_name,
    ROUTINES.cleanup is executed.  SYMTAB is NULL if the module does
    not want to export symbols by itself, or a pointer to a symbol
    table if the module wants to register its own symbols.  */
-extern int init_module __P((const char * module_name,
-			    const void * contents, size_t contentssize,
-			    struct mod_routines * routines,
-			    struct symbol_table * symtab));
+extern int init_module __P ((__const char * module_name,
+			     __const void * contents, size_t contentssize,
+			     struct mod_routines * routines,
+			     struct symbol_table * symtab));
 
 /* Delete the module named MODULE_NAME from the kernel.  */
-extern int delete_module __P((const char *module_name));
+extern int delete_module __P ((__const char *module_name));
 
 #endif /* _SYS_MODULE_H */
diff --git a/sysdeps/unix/sysv/linux/sys/timex.h b/sysdeps/unix/sysv/linux/sys/timex.h
index fad47cd607..8543b0deae 100644
--- a/sysdeps/unix/sysv/linux/sys/timex.h
+++ b/sysdeps/unix/sysv/linux/sys/timex.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
 
 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
@@ -15,10 +16,12 @@ License along with the GNU C Library; see the file COPYING.LIB.  If
 not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifndef _SYS_TIMEX_H
-#define _SYS_TIMEX_H
+#ifndef	_SYS_TIMEX_H
 
+#define	_SYS_TIMEX_H	1
 #include <features.h>
+
+#include <sys/time.h>
 #include <linux/timex.h>
 
 __BEGIN_DECLS