diff options
94 files changed, 4 insertions, 412 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 914611034..597b010e8 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2008-04-07 Christopher Faylor <me+cygwin@cgf.cx> + + Remove unneeded header files from source files throughout. + 2008-04-07 Corinna Vinschen <corinna@vinschen.de> * postinstall: Add function print_flags and call where appropriate. diff --git a/winsup/cygwin/assert.cc b/winsup/cygwin/assert.cc index 2d50c190c..8b8c1815b 100644 --- a/winsup/cygwin/assert.cc +++ b/winsup/cygwin/assert.cc @@ -15,7 +15,6 @@ details. */ #include <assert.h> #include <stdlib.h> -#include <stdio.h> /* This function is called when the assert macro fails. This will override the function of the same name in newlib. */ diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc index 2d0fc2ad9..8245eff62 100644 --- a/winsup/cygwin/cygheap.cc +++ b/winsup/cygwin/cygheap.cc @@ -9,7 +9,6 @@ details. */ #include "winsup.h" -#include <string.h> #include <assert.h> #include <stdlib.h> #include "cygerrno.h" @@ -20,7 +19,6 @@ #include "cygheap.h" #include "child_info.h" #include "heap.h" -#include "sync.h" #include "sigproc.h" #include "pinfo.h" #include <unistd.h> diff --git a/winsup/cygwin/cygthread.cc b/winsup/cygwin/cygthread.cc index 104908289..4c674ed36 100644 --- a/winsup/cygwin/cygthread.cc +++ b/winsup/cygwin/cygthread.cc @@ -8,12 +8,7 @@ details. */ #include "winsup.h" #include "miscfuncs.h" -#include <windows.h> #include <stdlib.h> -#include "exceptions.h" -#include "security.h" -#include "sync.h" -#include "cygerrno.h" #include "sigproc.h" #include "thread.h" #include "cygtls.h" diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc index 20c693044..3d15ae6ea 100644 --- a/winsup/cygwin/cygtls.cc +++ b/winsup/cygwin/cygtls.cc @@ -7,23 +7,15 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <sys/time.h> #define USE_SYS_TYPES_FD_SET -#include <winsock.h> #include "thread.h" #include "cygtls.h" -#include "assert.h" #include <syslog.h> -#include <signal.h> #include <malloc.h> -#include "exceptions.h" -#include "sync.h" -#include "cygerrno.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "pinfo.h" #include "sigproc.h" class sentry diff --git a/winsup/cygwin/debug.cc b/winsup/cygwin/debug.cc index 4ef0872bc..87d35c799 100644 --- a/winsup/cygwin/debug.cc +++ b/winsup/cygwin/debug.cc @@ -8,11 +8,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <malloc.h> -#include "sync.h" -#include "sigproc.h" -#include "pinfo.h" -#include "perprocess.h" #include "security.h" #include "cygerrno.h" #ifdef DEBUGGING @@ -27,7 +22,6 @@ details. */ #ifdef DEBUGGING /* Here lies extra debugging routines which help track down internal Cygwin problems when compiled with -DDEBUGGING . */ -#include <stdlib.h> #define NFREEH (sizeof (cygheap->debug.freeh) / sizeof (cygheap->debug.freeh[0])) class lock_debug diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index 67138ce2e..30662e6d4 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -9,14 +9,11 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <unistd.h> #include <stdlib.h> -#include <sys/stat.h> #define _COMPILING_NEWLIB #include <dirent.h> -#include "pinfo.h" #include "cygerrno.h" #include "security.h" #include "path.h" @@ -24,8 +21,6 @@ details. */ #include "dtable.h" #include "cygheap.h" #include "cygtls.h" -#include "perprocess.h" -#include "cygwin/version.h" extern "C" int dirfd (DIR *dir) diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc index b022dac1b..bc2b39788 100644 --- a/winsup/cygwin/dlfcn.cc +++ b/winsup/cygwin/dlfcn.cc @@ -10,18 +10,11 @@ details. */ #include "winsup.h" #include <psapi.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <ctype.h> -#include "cygerrno.h" -#include "security.h" #include "path.h" -#include "fhandler.h" #include "perprocess.h" -#include "thread.h" #include "dlfcn.h" -#include "dll_init.h" #include "cygtls.h" #include "tls_pbuf.h" diff --git a/winsup/cygwin/dll_init.cc b/winsup/cygwin/dll_init.cc index 3e143abc1..22c64e1e2 100644 --- a/winsup/cygwin/dll_init.cc +++ b/winsup/cygwin/dll_init.cc @@ -7,7 +7,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <stdlib.h> #include "cygerrno.h" #include "perprocess.h" #include "dll_init.h" diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index 04e63d070..d3cc71917 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -16,9 +16,6 @@ details. */ #include <stdlib.h> #include <stdio.h> #include <unistd.h> -#include <sys/cygwin.h> -#include <assert.h> -#include <winnls.h> #include <wchar.h> #define USE_SYS_TYPES_FD_SET @@ -26,7 +23,6 @@ details. */ #include "pinfo.h" #include "cygerrno.h" #include "perprocess.h" -#include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index d8cc09374..ab068ac25 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -10,18 +10,14 @@ details. */ #include "winsup.h" #include <stdlib.h> -#include <stddef.h> -#include <string.h> #include <wchar.h> #include <wctype.h> #include <ctype.h> #include <assert.h> -#include <sys/cygwin.h> #include <cygwin/version.h> #include <winnls.h> #include "pinfo.h" #include "perprocess.h" -#include "security.h" #include "path.h" #include "cygerrno.h" #include "fhandler.h" diff --git a/winsup/cygwin/errno.cc b/winsup/cygwin/errno.cc index 593005689..09108541e 100644 --- a/winsup/cygwin/errno.cc +++ b/winsup/cygwin/errno.cc @@ -13,9 +13,6 @@ details. */ #define sys_nerr FOOsys_nerr #define _sys_errlist FOO_sys_errlist #include "winsup.h" -#include <stdio.h> -#include "cygerrno.h" -#include "thread.h" #include "cygtls.h" #undef _sys_nerr #undef sys_nerr diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index af28ef060..becf3cdc0 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -15,20 +15,14 @@ details. */ #include <winuser.h> #include <imagehlp.h> #include <stdlib.h> -#include <setjmp.h> -#include <assert.h> #include <syslog.h> #include <wchar.h> -#include "exceptions.h" -#include "sync.h" #include "pinfo.h" #include "cygtls.h" #include "sigproc.h" -#include "cygerrno.h" #include "shared_info.h" #include "perprocess.h" -#include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" diff --git a/winsup/cygwin/exec.cc b/winsup/cygwin/exec.cc index 1176307f6..ee0709c98 100644 --- a/winsup/cygwin/exec.cc +++ b/winsup/cygwin/exec.cc @@ -10,15 +10,9 @@ details. */ #define _execve __FOO_execve_ #include "winsup.h" -#include <unistd.h> -#include <stdlib.h> #include <process.h> #include "cygerrno.h" -#include "perprocess.h" -#include "security.h" #include "path.h" -#include "fhandler.h" -#include "pinfo.h" #include "environ.h" #undef _execve diff --git a/winsup/cygwin/external.cc b/winsup/cygwin/external.cc index 58decb8ba..4b80cb786 100644 --- a/winsup/cygwin/external.cc +++ b/winsup/cygwin/external.cc @@ -12,21 +12,16 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include "security.h" #include "sigproc.h" #include "pinfo.h" -#include <exceptions.h> #include "shared_info.h" #include "cygwin_version.h" -#include "perprocess.h" #include "cygerrno.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "wincap.h" #include "heap.h" -#include "pwdgrp.h" #include "cygtls.h" #include "child_info.h" #include "environ.h" diff --git a/winsup/cygwin/fcntl.cc b/winsup/cygwin/fcntl.cc index b49582274..b3ec8dcf2 100644 --- a/winsup/cygwin/fcntl.cc +++ b/winsup/cygwin/fcntl.cc @@ -9,7 +9,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <stdarg.h> #include <unistd.h> #include "cygerrno.h" #include "security.h" @@ -17,7 +16,6 @@ details. */ #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "thread.h" #include "cygtls.h" extern "C" int diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc index aaecf7465..b46756dd0 100644 --- a/winsup/cygwin/fhandler.cc +++ b/winsup/cygwin/fhandler.cc @@ -12,11 +12,8 @@ details. */ #include "winsup.h" #include <unistd.h> #include <stdlib.h> -#include <sys/cygwin.h> #include <sys/uio.h> #include <sys/acl.h> -#include <sys/statvfs.h> -#include <signal.h> #include "cygerrno.h" #include "perprocess.h" #include "security.h" @@ -25,12 +22,9 @@ details. */ #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "shared_info.h" #include "pinfo.h" #include <assert.h> -#include <limits.h> #include <winioctl.h> -#include <ntdef.h> #include "ntdll.h" #include "cygtls.h" #include "sigproc.h" diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler_clipboard.cc index 5055dc97d..d4b974393 100644 --- a/winsup/cygwin/fhandler_clipboard.cc +++ b/winsup/cygwin/fhandler_clipboard.cc @@ -11,12 +11,8 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <wchar.h> -#include <windows.h> -#include <winnls.h> #include <wingdi.h> #include <winuser.h> #include "cygerrno.h" diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 02cbb6ecd..bd4c6da50 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -11,13 +11,10 @@ details. */ #include "winsup.h" #include "miscfuncs.h" -#include <sys/termios.h> #include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <wingdi.h> #include <winuser.h> -#include <wincon.h> #include <winnls.h> #include <ctype.h> #include <sys/cygwin.h> diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 72d452290..112ad9c1d 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -10,16 +10,11 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <unistd.h> #include <stdlib.h> -#include <sys/cygwin.h> #include <sys/acl.h> #include <sys/statvfs.h> -#include <signal.h> #include "cygerrno.h" -#include "perprocess.h" #include "security.h" -#include "cygwin/version.h" #include "path.h" #include "fhandler.h" #include "dtable.h" @@ -27,8 +22,6 @@ details. */ #include "shared_info.h" #include "pinfo.h" #include "ntdll.h" -#include <assert.h> -#include <ctype.h> #include <winioctl.h> #define _COMPILING_NEWLIB diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc index 54d619d8b..ed5ddad8a 100644 --- a/winsup/cygwin/fhandler_dsp.cc +++ b/winsup/cygwin/fhandler_dsp.cc @@ -13,10 +13,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <stdio.h> -#include <windows.h> #include <sys/soundcard.h> -#include <mmsystem.h> #include "cygerrno.h" #include "security.h" #include "path.h" diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler_fifo.cc index 1f5a82b18..0faaec95e 100644 --- a/winsup/cygwin/fhandler_fifo.cc +++ b/winsup/cygwin/fhandler_fifo.cc @@ -10,19 +10,13 @@ #include "winsup.h" #include "miscfuncs.h" -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include <sys/statvfs.h> #include "cygerrno.h" -#include "perprocess.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "pinfo.h" #include "sigproc.h" #include "cygtls.h" diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler_floppy.cc index bcd0c7df6..48f901014 100644 --- a/winsup/cygwin/fhandler_floppy.cc +++ b/winsup/cygwin/fhandler_floppy.cc @@ -10,10 +10,8 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <sys/termios.h> #include <unistd.h> #include <winioctl.h> -#include <asm/socket.h> #include <cygwin/rdevio.h> #include <cygwin/hdreg.h> #include <cygwin/fs.h> @@ -21,7 +19,6 @@ details. */ #include "security.h" #include "path.h" #include "fhandler.h" -#include <ntdef.h> #include "ntdll.h" #define IS_EOM(err) ((err) == ERROR_INVALID_PARAMETER \ diff --git a/winsup/cygwin/fhandler_mailslot.cc b/winsup/cygwin/fhandler_mailslot.cc index d829deff2..edbb09441 100644 --- a/winsup/cygwin/fhandler_mailslot.cc +++ b/winsup/cygwin/fhandler_mailslot.cc @@ -9,17 +9,11 @@ details. */ #include "winsup.h" -#include <unistd.h> -#include <sys/termios.h> -#include <ntdef.h> #include "cygerrno.h" -#include "perprocess.h" #include "security.h" #include "path.h" #include "fhandler.h" -#include "dtable.h" -#include "cygheap.h" #include "ntdll.h" /**********************************************************************/ diff --git a/winsup/cygwin/fhandler_mem.cc b/winsup/cygwin/fhandler_mem.cc index 4df2ddf10..3d277f240 100644 --- a/winsup/cygwin/fhandler_mem.cc +++ b/winsup/cygwin/fhandler_mem.cc @@ -10,8 +10,6 @@ #include "winsup.h" #include <unistd.h> -#include <sys/mman.h> -#include <ntdef.h> #include "cygerrno.h" #include "security.h" diff --git a/winsup/cygwin/fhandler_netdrive.cc b/winsup/cygwin/fhandler_netdrive.cc index 44ad620f9..2c63a1d0b 100644 --- a/winsup/cygwin/fhandler_netdrive.cc +++ b/winsup/cygwin/fhandler_netdrive.cc @@ -9,18 +9,12 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <unistd.h> #include <stdlib.h> -#include <sys/cygwin.h> #include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" -#include "dtable.h" -#include "cygheap.h" -#include "sigproc.h" #include "cygthread.h" -#include <assert.h> #include <winnetwk.h> #include <dirent.h> diff --git a/winsup/cygwin/fhandler_nodevice.cc b/winsup/cygwin/fhandler_nodevice.cc index c23e4434b..cb3b61e0d 100644 --- a/winsup/cygwin/fhandler_nodevice.cc +++ b/winsup/cygwin/fhandler_nodevice.cc @@ -9,24 +9,10 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <errno.h> -#include <unistd.h> -#include <stdlib.h> -#include <sys/cygwin.h> -#include <sys/uio.h> -#include <signal.h> #include "cygerrno.h" -#include "perprocess.h" #include "security.h" -#include "cygwin/version.h" #include "path.h" #include "fhandler.h" -#include "dtable.h" -#include "cygheap.h" -#include "shared_info.h" -#include "pinfo.h" -#include <assert.h> -#include <limits.h> int fhandler_nodevice::open (int, mode_t) diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler_proc.cc index 36452c370..a30c1c246 100644 --- a/winsup/cygwin/fhandler_proc.cc +++ b/winsup/cygwin/fhandler_proc.cc @@ -12,8 +12,6 @@ details. */ #include "miscfuncs.h" #include <unistd.h> #include <stdlib.h> -#include <sys/cygwin.h> -#include <ntdef.h> #include "cygerrno.h" #include "security.h" #include "path.h" @@ -21,7 +19,6 @@ details. */ #include "pinfo.h" #include "dtable.h" #include "cygheap.h" -#include <assert.h> #include <sys/utsname.h> #include <sys/param.h> #include "ntdll.h" diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler_process.cc index b983543d1..a752bfb1c 100644 --- a/winsup/cygwin/fhandler_process.cc +++ b/winsup/cygwin/fhandler_process.cc @@ -9,10 +9,8 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <unistd.h> #include <stdlib.h> #include <sys/cygwin.h> -#include <ntdef.h> #include "cygerrno.h" #include "security.h" #include "path.h" @@ -25,8 +23,6 @@ details. */ #include "cygtls.h" #include "tls_pbuf.h" #include <sys/param.h> -#include <assert.h> -#include <sys/sysmacros.h> #include <ctype.h> #include <psapi.h> diff --git a/winsup/cygwin/fhandler_raw.cc b/winsup/cygwin/fhandler_raw.cc index e59b40484..8c46ab6a6 100644 --- a/winsup/cygwin/fhandler_raw.cc +++ b/winsup/cygwin/fhandler_raw.cc @@ -9,20 +9,13 @@ details. */ #include "winsup.h" -#include <sys/termios.h> -#include <unistd.h> #include <cygwin/rdevio.h> #include <sys/mtio.h> -#include <ntdef.h> #include "cygerrno.h" -#include "perprocess.h" #include "security.h" #include "path.h" #include "fhandler.h" -#include "dtable.h" -#include "cygheap.h" -#include "ntdll.h" /**********************************************************************/ /* fhandler_dev_raw */ diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc index 9ead6fcb2..dfd5a3612 100644 --- a/winsup/cygwin/fhandler_registry.cc +++ b/winsup/cygwin/fhandler_registry.cc @@ -11,16 +11,12 @@ details. */ /* FIXME: Access permissions are ignored at the moment. */ #include "winsup.h" -#include <unistd.h> -#include <stdlib.h> -#include <sys/cygwin.h> #include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include <assert.h> #define _COMPILING_NEWLIB #include <dirent.h> diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler_serial.cc index a82de0f76..36c6ee222 100644 --- a/winsup/cygwin/fhandler_serial.cc +++ b/winsup/cygwin/fhandler_serial.cc @@ -11,14 +11,12 @@ details. */ #include "winsup.h" #include <unistd.h> -#include <stdlib.h> #include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "sigproc.h" #include "pinfo.h" -#include <sys/termios.h> #include <ddk/ntddser.h> /**********************************************************************/ diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 9285a2896..d25733629 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -13,9 +13,7 @@ #define __INSIDE_CYGWIN_NET__ #include "winsup.h" -#include <sys/socket.h> #include <sys/un.h> -#include <sys/uio.h> #include <asm/byteorder.h> #include <stdlib.h> @@ -32,11 +30,9 @@ #include "cygheap.h" #include "shared_info.h" #include "sigproc.h" -#include "cygthread.h" #include "wininfo.h" #include <unistd.h> #include <sys/acl.h> -#include <sys/statvfs.h> #include "cygtls.h" #include "cygwin/in6.h" #include "ntdll.h" diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc index 565aaa7ca..1cdbf0ac9 100644 --- a/winsup/cygwin/fhandler_tape.cc +++ b/winsup/cygwin/fhandler_tape.cc @@ -11,14 +11,10 @@ details. */ #include "winsup.h" #include "cygtls.h" -#include <sys/termios.h> -#include <unistd.h> #include <stdlib.h> #include <sys/mtio.h> #include <sys/param.h> #include <ddk/ntddstor.h> -#include "cygerrno.h" -#include "perprocess.h" #include "security.h" #include "path.h" #include "fhandler.h" diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler_termios.cc index 9d76202b5..caa98e7ca 100644 --- a/winsup/cygwin/fhandler_termios.cc +++ b/winsup/cygwin/fhandler_termios.cc @@ -9,9 +9,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <sys/termios.h> #include <stdlib.h> -#include <unistd.h> #include <ctype.h> #include "cygerrno.h" #include "security.h" diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc index 892127adb..9bebcd0c0 100644 --- a/winsup/cygwin/fhandler_tty.cc +++ b/winsup/cygwin/fhandler_tty.cc @@ -10,13 +10,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <wingdi.h> -#include <winuser.h> -#include <stdio.h> -#include <unistd.h> #include <stdlib.h> -#include <ctype.h> -#include <limits.h> #include <cygwin/kd.h> #include "cygerrno.h" #include "security.h" diff --git a/winsup/cygwin/fhandler_virtual.cc b/winsup/cygwin/fhandler_virtual.cc index c005ff56d..ded590227 100644 --- a/winsup/cygwin/fhandler_virtual.cc +++ b/winsup/cygwin/fhandler_virtual.cc @@ -9,9 +9,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <unistd.h> #include <stdlib.h> -#include <sys/cygwin.h> #include <sys/acl.h> #include <sys/statvfs.h> #include "cygerrno.h" @@ -19,9 +17,7 @@ details. */ #include "path.h" #include "fhandler.h" #include "dtable.h" -#include "shared_info.h" #include "cygheap.h" -#include <assert.h> #include <dirent.h> diff --git a/winsup/cygwin/fhandler_zero.cc b/winsup/cygwin/fhandler_zero.cc index a3e74a62c..41d1dcdca 100644 --- a/winsup/cygwin/fhandler_zero.cc +++ b/winsup/cygwin/fhandler_zero.cc @@ -11,7 +11,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <errno.h> #include "security.h" #include "cygerrno.h" #include "path.h" diff --git a/winsup/cygwin/flock.cc b/winsup/cygwin/flock.cc index 5e7ede99f..1fb682266 100644 --- a/winsup/cygwin/flock.cc +++ b/winsup/cygwin/flock.cc @@ -102,18 +102,14 @@ #include "winsup.h" #include <assert.h> #include <sys/file.h> -#include <fcntl.h> #include <unistd.h> #include <stdlib.h> #include "cygerrno.h" -#include "perprocess.h" #include "security.h" -#include "cygwin/version.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "shared_info.h" #include "pinfo.h" #include "sigproc.h" #include "cygtls.h" diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc index 5bc986f37..fa80c6922 100644 --- a/winsup/cygwin/fork.cc +++ b/winsup/cygwin/fork.cc @@ -13,7 +13,6 @@ details. */ #include <stdio.h> #include <unistd.h> #include <stdlib.h> -#include <stdarg.h> #include "cygerrno.h" #include "security.h" #include "path.h" @@ -27,10 +26,7 @@ details. */ #include "tls_pbuf.h" #include "perprocess.h" #include "dll_init.h" -#include "sync.h" -#include "shared_info.h" #include "cygmalloc.h" -#include "cygthread.h" #define NPIDS_HELD 4 diff --git a/winsup/cygwin/glob.cc b/winsup/cygwin/glob.cc index b4c512c43..6534249a7 100644 --- a/winsup/cygwin/glob.cc +++ b/winsup/cygwin/glob.cc @@ -33,7 +33,6 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)glob.c 8.3 (Berkeley) 10/13/93"; #endif /* LIBC_SCCS and not lint */ -#include <sys/cdefs.h> #ifdef __CYGWIN __FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/gen/glob.c,v 1.25 2006/06/05 18:22:13 delphij Exp $"); #endif @@ -75,19 +74,12 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/lib/libc/gen/glob.c,v 1.25 2006/06/05 18 #include "winsup.h" -#include <sys/param.h> -#include <sys/stat.h> #include <ctype.h> #include <dirent.h> -#include <errno.h> #include <glob.h> -#include <limits.h> #include <pwd.h> -#include <stdint.h> -#include <stdio.h> #include <stdlib.h> -#include <string.h> #include <unistd.h> #include <wchar.h> diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc index 2398ae463..5c35be590 100644 --- a/winsup/cygwin/grp.cc +++ b/winsup/cygwin/grp.cc @@ -13,19 +13,15 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <grp.h> -#include <wininet.h> #include <stdio.h> #include <stdlib.h> #include "cygerrno.h" #include "pinfo.h" -#include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" #include "pwdgrp.h" -#include "cygtls.h" static __group32 *group_buf; static pwdgrp gr (group_buf); diff --git a/winsup/cygwin/heap.cc b/winsup/cygwin/heap.cc index 5278febfc..adf041bde 100644 --- a/winsup/cygwin/heap.cc +++ b/winsup/cygwin/heap.cc @@ -10,17 +10,11 @@ details. */ #include "winsup.h" #include "cygerrno.h" -#include "sigproc.h" -#include "pinfo.h" -#include "heap.h" #include "shared_info.h" -#include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "registry.h" -#include "cygwin_version.h" #include "child_info.h" #define assert(x) diff --git a/winsup/cygwin/hookapi.cc b/winsup/cygwin/hookapi.cc index 2e9ba0ece..07101982c 100644 --- a/winsup/cygwin/hookapi.cc +++ b/winsup/cygwin/hookapi.cc @@ -9,9 +9,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <imagehlp.h> #include <stdlib.h> -#include <alloca.h> #include "ntdll.h" #include "cygerrno.h" #include "security.h" @@ -19,7 +17,6 @@ details. */ #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "pinfo.h" #define rva(coerce, base, addr) (coerce) ((char *) (base) + (addr)) #define rvacyg(coerce, addr) rva (coerce, cygwin_hmodule, addr) diff --git a/winsup/cygwin/init.cc b/winsup/cygwin/init.cc index 88c616f1a..4fe62063d 100644 --- a/winsup/cygwin/init.cc +++ b/winsup/cygwin/init.cc @@ -10,12 +10,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <stdlib.h> -#include "thread.h" -#include "perprocess.h" #include "cygtls.h" -#include "pinfo.h" -#include <ntdef.h> #include "ntdll.h" static DWORD _my_oldfunc; diff --git a/winsup/cygwin/ioctl.cc b/winsup/cygwin/ioctl.cc index 62e533678..3bd019dae 100644 --- a/winsup/cygwin/ioctl.cc +++ b/winsup/cygwin/ioctl.cc @@ -12,15 +12,12 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <sys/ioctl.h> #include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "sigproc.h" -#include <sys/termios.h> extern "C" int ioctl (int fd, int cmd, ...) diff --git a/winsup/cygwin/ipc.cc b/winsup/cygwin/ipc.cc index c89b23e21..b9f09cbde 100644 --- a/winsup/cygwin/ipc.cc +++ b/winsup/cygwin/ipc.cc @@ -12,7 +12,6 @@ details. */ #include "winsup.h" -#include <cygwin/ipc.h> #include <sys/stat.h> /* Notes: we return a valid key even if id's low order 8 bits are 0. */ diff --git a/winsup/cygwin/localtime.cc b/winsup/cygwin/localtime.cc index 3d08cc67b..d5f3622ec 100644 --- a/winsup/cygwin/localtime.cc +++ b/winsup/cygwin/localtime.cc @@ -7,7 +7,6 @@ #include "winsup.h" #include "cygerrno.h" #include "sync.h" -#include <windows.h> #define STD_INSPIRED #define lint @@ -95,14 +94,11 @@ static char privatehid[] = "@(#)private.h 7.48"; ** Nested includes */ -#include "sys/types.h" /* for time_t */ #include "stdio.h" #include "limits.h" /* for CHAR_BIT */ -#include "time.h" #include "stdlib.h" #if HAVE_GETTEXT - 0 -#include "libintl.h" #endif /* HAVE_GETTEXT - 0 */ #if HAVE_UNISTD_H - 0 @@ -172,7 +168,6 @@ static char privatehid[] = "@(#)private.h 7.48"; #ifndef MAXPATHLEN #ifdef unix -#include "sys/param.h" #endif /* defined unix */ #endif /* !defined MAXPATHLEN */ diff --git a/winsup/cygwin/lsearch.cc b/winsup/cygwin/lsearch.cc index a348f0e35..9e2d93b77 100644 --- a/winsup/cygwin/lsearch.cc +++ b/winsup/cygwin/lsearch.cc @@ -5,11 +5,7 @@ As long as the above copyright statement and this notice remain unchanged, you can do what ever you want with this file. */ -#include <sys/types.h> -#include <sys/cdefs.h> -#include <search.h> #include <stdint.h> /* for uint8_t */ -#include <stdlib.h> /* for NULL */ #include <string.h> /* for memcpy () prototype */ static void *lwork (const void *, const void *, size_t *, size_t, diff --git a/winsup/cygwin/malloc_wrapper.cc b/winsup/cygwin/malloc_wrapper.cc index dce4a77dc..48a82beca 100644 --- a/winsup/cygwin/malloc_wrapper.cc +++ b/winsup/cygwin/malloc_wrapper.cc @@ -13,16 +13,11 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <stdlib.h> -#include <assert.h> #include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" -#include "cygheap.h" -#include "heap.h" -#include "sync.h" #include "perprocess.h" #include "cygmalloc.h" #ifndef MALLOC_DEBUG diff --git a/winsup/cygwin/mktemp.cc b/winsup/cygwin/mktemp.cc index 5567e4a67..4b73753b8 100644 --- a/winsup/cygwin/mktemp.cc +++ b/winsup/cygwin/mktemp.cc @@ -6,14 +6,7 @@ See the copyright at the bottom of this file. */ #include "winsup.h" #include "cygerrno.h" -#include <sys/cdefs.h> -#include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <ctype.h> #include <unistd.h> #define link_warning(symbol, msg) \ diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc index db8092026..48c3455fd 100644 --- a/winsup/cygwin/mmap.cc +++ b/winsup/cygwin/mmap.cc @@ -13,7 +13,6 @@ details. */ #include "miscfuncs.h" #include <unistd.h> #include <stdlib.h> -#include <stddef.h> #include <sys/mman.h> #include <sys/param.h> #include "cygerrno.h" @@ -22,8 +21,6 @@ details. */ #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "pinfo.h" -#include "sys/cygwin.h" #include "ntdll.h" #include <sys/queue.h> diff --git a/winsup/cygwin/msg.cc b/winsup/cygwin/msg.cc index 00d13a854..bda7b1309 100644 --- a/winsup/cygwin/msg.cc +++ b/winsup/cygwin/msg.cc @@ -9,16 +9,12 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include "cygerrno.h" -#include <signal.h> #ifdef USE_SERVER -#include <stdio.h> #include <unistd.h> #include "sigproc.h" #include "cygtls.h" -#include "cygserver_ipc.h" #include "cygserver_msg.h" /* diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index 053a288cf..19176187d 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -17,9 +17,6 @@ details. */ #include "miscfuncs.h" #include <ctype.h> #include <wchar.h> -#include <sys/socket.h> -#include <sys/un.h> -#include <syslog.h> #include <stdlib.h> #define gethostname cygwin_gethostname @@ -39,7 +36,6 @@ details. */ #include "dtable.h" #include "cygheap.h" #include "sigproc.h" -#include "pinfo.h" #include "registry.h" #include "cygtls.h" #include "cygwin/in6.h" diff --git a/winsup/cygwin/netdb.cc b/winsup/cygwin/netdb.cc index efbd33776..bf03d1f56 100644 --- a/winsup/cygwin/netdb.cc +++ b/winsup/cygwin/netdb.cc @@ -9,10 +9,7 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <windows.h> -#include <sys/cygwin.h> #include <stdio.h> -#include <string.h> #include <stdlib.h> #include <netdb.h> diff --git a/winsup/cygwin/ntea.cc b/winsup/cygwin/ntea.cc index 7c75235c2..e64dc4d99 100644 --- a/winsup/cygwin/ntea.cc +++ b/winsup/cygwin/ntea.cc @@ -10,14 +10,11 @@ details. */ #include "winsup.h" #include "cygtls.h" -#include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" -#include "pinfo.h" #include "cygheap.h" -#include <ntdef.h> #include "ntdll.h" #include <stdlib.h> #include <attr/xattr.h> diff --git a/winsup/cygwin/passwd.cc b/winsup/cygwin/passwd.cc index 0d30385ec..14d0cee5c 100644 --- a/winsup/cygwin/passwd.cc +++ b/winsup/cygwin/passwd.cc @@ -10,7 +10,6 @@ details. */ #include "winsup.h" #include <stdlib.h> -#include <pwd.h> #include <stdio.h> #include "cygerrno.h" #include "security.h" @@ -19,7 +18,6 @@ details. */ #include "dtable.h" #include "pinfo.h" #include "cygheap.h" -#include <sys/termios.h> #include "pwdgrp.h" /* Read /etc/passwd only once for better performance. This is done diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc index 0ff3d09fd..3cfa82a70 100644 --- a/winsup/cygwin/pinfo.cc +++ b/winsup/cygwin/pinfo.cc @@ -12,9 +12,6 @@ details. */ #include "winsup.h" #include "miscfuncs.h" #include <stdlib.h> -#include <time.h> -#include <limits.h> -#include <stdarg.h> #include "cygerrno.h" #include "security.h" #include "path.h" @@ -22,16 +19,12 @@ details. */ #include "dtable.h" #include "sigproc.h" #include "pinfo.h" -#include "cygwin_version.h" #include "perprocess.h" #include "environ.h" #include <assert.h> -#include <sys/wait.h> -#include <ntdef.h> #include "ntdll.h" #include "shared_info.h" #include "cygheap.h" -#include "fhandler.h" #include "cygmalloc.h" #include "cygtls.h" #include "tls_pbuf.h" @@ -1056,7 +1049,6 @@ cygwin_winpid_to_pid (int winpid) return (pid_t) -1; } -#include <tlhelp32.h> #define slop_pidlist 200 #define size_pidlist(i) (sizeof (pidlist[0]) * ((i) + 1)) diff --git a/winsup/cygwin/pipe.cc b/winsup/cygwin/pipe.cc index 82bfe47ad..edd901160 100644 --- a/winsup/cygwin/pipe.cc +++ b/winsup/cygwin/pipe.cc @@ -12,20 +12,15 @@ details. */ /* FIXME: Should this really be fhandler_pipe.cc? */ #include "winsup.h" -#include <unistd.h> #include <stdlib.h> #include <sys/socket.h> -#include <limits.h> #include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "thread.h" #include "pinfo.h" -#include "cygthread.h" -#include "ntdll.h" fhandler_pipe::fhandler_pipe () : fhandler_base (), popen_pid (0) diff --git a/winsup/cygwin/poll.cc b/winsup/cygwin/poll.cc index eda38ba5b..e7f8da5ad 100644 --- a/winsup/cygwin/poll.cc +++ b/winsup/cygwin/poll.cc @@ -12,19 +12,16 @@ #define FD_SETSIZE 16384 // lots of fds #include "winsup.h" -#include <sys/time.h> #include <sys/poll.h> #include <sys/socket.h> #include <stdlib.h> #define USE_SYS_TYPES_FD_SET -#include <winsock2.h> #include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "sigproc.h" extern "C" int poll (struct pollfd *fds, nfds_t nfds, int timeout) diff --git a/winsup/cygwin/posix_ipc.cc b/winsup/cygwin/posix_ipc.cc index 7bcc38087..f9090ae14 100644 --- a/winsup/cygwin/posix_ipc.cc +++ b/winsup/cygwin/posix_ipc.cc @@ -11,22 +11,15 @@ details. */ #include "winsup.h" #include "thread.h" #include "path.h" -#include "cygerrno.h" #include "cygtls.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "security.h" #include "sigproc.h" -#include <sys/stat.h> #include <sys/mman.h> #include <sys/param.h> -#include <fcntl.h> -#include <pwd.h> #include <stdlib.h> -#include <limits.h> #include <unistd.h> -#include <stdarg.h> #include <mqueue.h> #include <semaphore.h> diff --git a/winsup/cygwin/pthread.cc b/winsup/cygwin/pthread.cc index 310c5d76b..f2869c294 100644 --- a/winsup/cygwin/pthread.cc +++ b/winsup/cygwin/pthread.cc @@ -12,14 +12,6 @@ #include "winsup.h" #include "thread.h" -#include "cygerrno.h" -#include "path.h" -#include "fhandler.h" -#include "dtable.h" -#include "cygheap.h" -#include <stdarg.h> -#include <sys/fcntl.h> -#include "cygtls.h" extern "C" { diff --git a/winsup/cygwin/random.cc b/winsup/cygwin/random.cc index e1e21eccb..583276d0f 100644 --- a/winsup/cygwin/random.cc +++ b/winsup/cygwin/random.cc @@ -36,7 +36,6 @@ __FBSDID("$FreeBSD: src/lib/libc/stdlib/random.c,v 1.25 2007/01/09 00:28:10 imp #include <sys/time.h> /* for srandomdev() */ #include <fcntl.h> /* for srandomdev() */ -#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> /* for srandomdev() */ diff --git a/winsup/cygwin/registry.cc b/winsup/cygwin/registry.cc index 6c69362e8..f9008c013 100644 --- a/winsup/cygwin/registry.cc +++ b/winsup/cygwin/registry.cc @@ -10,7 +10,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include "shared_info.h" #include "registry.h" #include "security.h" #include <cygwin/version.h> diff --git a/winsup/cygwin/resource.cc b/winsup/cygwin/resource.cc index 9112bbe77..6258750f1 100644 --- a/winsup/cygwin/resource.cc +++ b/winsup/cygwin/resource.cc @@ -14,8 +14,6 @@ details. */ #include "winsup.h" #include <unistd.h> -#include <limits.h> -#include "cygerrno.h" #include "pinfo.h" #include "psapi.h" #include "cygtls.h" diff --git a/winsup/cygwin/sched.cc b/winsup/cygwin/sched.cc index 90133d8cb..d894bf051 100644 --- a/winsup/cygwin/sched.cc +++ b/winsup/cygwin/sched.cc @@ -11,17 +11,11 @@ details. */ #ifdef HAVE_CONFIG_H -# include "config.h" #endif #include "winsup.h" #include "miscfuncs.h" -#include <limits.h> #include "cygerrno.h" -#include <assert.h> -#include <stdlib.h> -#include <syslog.h> -#include <sched.h> #include "pinfo.h" /* for getpid */ #include <unistd.h> diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec_acl.cc index 4ba5a2c1b..b1f117416 100644 --- a/winsup/cygwin/sec_acl.cc +++ b/winsup/cygwin/sec_acl.cc @@ -19,7 +19,6 @@ details. */ #include "path.h" #include "fhandler.h" #include "dtable.h" -#include "pinfo.h" #include "cygheap.h" #include "pwdgrp.h" diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec_auth.cc index 0eb77accc..d760ac6bf 100644 --- a/winsup/cygwin/sec_auth.cc +++ b/winsup/cygwin/sec_auth.cc @@ -19,7 +19,6 @@ details. */ #include "path.h" #include "fhandler.h" #include "dtable.h" -#include "pinfo.h" #include "cygheap.h" #include "ntdll.h" #include "lm.h" diff --git a/winsup/cygwin/select.cc b/winsup/cygwin/select.cc index 674989357..5c26248ab 100644 --- a/winsup/cygwin/select.cc +++ b/winsup/cygwin/select.cc @@ -15,15 +15,11 @@ details. */ #define __INSIDE_CYGWIN_NET__ #include "winsup.h" -#include <sys/socket.h> #include <stdlib.h> -#include <sys/time.h> #include <wingdi.h> #include <winuser.h> #include <netdb.h> -#include <unistd.h> -#include <limits.h> #define USE_SYS_TYPES_FD_SET #include <winsock.h> #include "cygerrno.h" @@ -34,10 +30,7 @@ details. */ #include "cygheap.h" #include "pinfo.h" #include "sigproc.h" -#include "tty.h" -#include "ntdll.h" #include "cygtls.h" -#include <asm/byteorder.h> /* * All these defines below should be in sys/types.h diff --git a/winsup/cygwin/sem.cc b/winsup/cygwin/sem.cc index ea617f664..c00190c5d 100644 --- a/winsup/cygwin/sem.cc +++ b/winsup/cygwin/sem.cc @@ -9,17 +9,11 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include "cygerrno.h" -#include <signal.h> #ifdef USE_SERVER -#include <sys/types.h> -#include <stdio.h> #include <unistd.h> -#include <stdarg.h> #include "sigproc.h" -#include "cygserver_ipc.h" #include "cygserver_sem.h" #include "cygtls.h" diff --git a/winsup/cygwin/shared.cc b/winsup/cygwin/shared.cc index 431e5e3a2..3614753f6 100644 --- a/winsup/cygwin/shared.cc +++ b/winsup/cygwin/shared.cc @@ -12,13 +12,8 @@ details. */ #include "winsup.h" #include "miscfuncs.h" #include <unistd.h> -#include <stdio.h> -#include <stdlib.h> -#include <grp.h> -#include <pwd.h> #include "cygerrno.h" #include "pinfo.h" -#include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" @@ -27,7 +22,6 @@ details. */ #include "shared_info_magic.h" #include "registry.h" #include "cygwin_version.h" -#include "child_info.h" #include "mtinfo.h" static shared_info cygwin_shared_area __attribute__((section (".cygwin_dll_common"), shared)); diff --git a/winsup/cygwin/shm.cc b/winsup/cygwin/shm.cc index 3170fcae3..809bd339a 100644 --- a/winsup/cygwin/shm.cc +++ b/winsup/cygwin/shm.cc @@ -9,18 +9,13 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include "cygerrno.h" -#include <signal.h> #ifdef USE_SERVER -#include <sys/types.h> #include <sys/queue.h> -#include <stdio.h> #include <unistd.h> #include "pinfo.h" #include "sigproc.h" -#include "cygserver_ipc.h" #include "cygserver_shm.h" #include "cygtls.h" #include "sync.h" diff --git a/winsup/cygwin/signal.cc b/winsup/cygwin/signal.cc index 024fb9365..c39afc2b8 100644 --- a/winsup/cygwin/signal.cc +++ b/winsup/cygwin/signal.cc @@ -14,18 +14,14 @@ details. */ #include "winsup.h" #include <stdlib.h> -#include "cygerrno.h" #include <sys/cygwin.h> #include "pinfo.h" #include "sigproc.h" -#include "hires.h" -#include "security.h" #include "cygtls.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "cygtls.h" int sigcatchers; /* FIXME: Not thread safe. */ diff --git a/winsup/cygwin/sigproc.cc b/winsup/cygwin/sigproc.cc index 00c1a03fb..34e4c53a4 100644 --- a/winsup/cygwin/sigproc.cc +++ b/winsup/cygwin/sigproc.cc @@ -14,16 +14,9 @@ details. */ #include "winsup.h" #include "miscfuncs.h" #include <stdlib.h> -#include <time.h> -#include <sys/wait.h> -#include <stdlib.h> #include <sys/cygwin.h> -#include <assert.h> -#include <sys/signal.h> #include "cygerrno.h" -#include "sync.h" #include "pinfo.h" -#include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" @@ -32,7 +25,6 @@ details. */ #include "shared_info.h" #include "cygtls.h" #include "sigproc.h" -#include "exceptions.h" #include "ntdll.h" /* diff --git a/winsup/cygwin/smallprint.cc b/winsup/cygwin/smallprint.cc index 042c4c203..8a904a484 100644 --- a/winsup/cygwin/smallprint.cc +++ b/winsup/cygwin/smallprint.cc @@ -11,12 +11,9 @@ details. */ #include "winsup.h" #include "ntdll.h" -#include <stdarg.h> #include <stdlib.h> #include <ctype.h> -#include <wctype.h> #include <wchar.h> -#include <limits.h> #define LLMASK (0xffffffffffffffffULL) #define LMASK (0xffffffff) diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 2b728b0c4..a6c3fe7e5 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -11,11 +11,9 @@ details. */ #include "winsup.h" #include <stdlib.h> -#include <stdarg.h> #include <unistd.h> #include <process.h> #include <sys/wait.h> -#include <limits.h> #include <wingdi.h> #include <winuser.h> #include <wchar.h> @@ -29,9 +27,7 @@ details. */ #include "sigproc.h" #include "cygheap.h" #include "child_info.h" -#include "shared_info.h" #include "pinfo.h" -#include "registry.h" #include "environ.h" #include "cygtls.h" #include "tls_pbuf.h" diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc index 36dcae533..cba7e9a54 100644 --- a/winsup/cygwin/strace.cc +++ b/winsup/cygwin/strace.cc @@ -10,8 +10,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <stdlib.h> -#include <time.h> #include <wingdi.h> #include <winuser.h> #include <ctype.h> @@ -19,8 +17,6 @@ details. */ #include "pinfo.h" #include "perprocess.h" #include "cygwin_version.h" -#include "hires.h" -#include "security.h" #include "cygthread.h" #include "path.h" #include "fhandler.h" diff --git a/winsup/cygwin/strfuncs.cc b/winsup/cygwin/strfuncs.cc index a19c27ac6..5b05cc962 100644 --- a/winsup/cygwin/strfuncs.cc +++ b/winsup/cygwin/strfuncs.cc @@ -11,7 +11,6 @@ details. */ #include "winsup.h" #include <stdlib.h> -#include <winbase.h> #include <winnls.h> #include <ntdll.h> #include "cygerrno.h" diff --git a/winsup/cygwin/strsig.cc b/winsup/cygwin/strsig.cc index c8aaa9920..71a8eb56c 100644 --- a/winsup/cygwin/strsig.cc +++ b/winsup/cygwin/strsig.cc @@ -9,11 +9,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include "thread.h" -#include <time.h> -#include <stdlib.h> -#include <string.h> -#include <signal.h> #include <cygtls.h> struct sigdesc diff --git a/winsup/cygwin/sync.cc b/winsup/cygwin/sync.cc index 18c971a45..6bd0ecf66 100644 --- a/winsup/cygwin/sync.cc +++ b/winsup/cygwin/sync.cc @@ -16,13 +16,7 @@ details. */ #include "winsup.h" #include "miscfuncs.h" -#include <stdlib.h> -#include <time.h> -#include <sys/wait.h> -#include <errno.h> -#include <stdlib.h> #include "sync.h" -#include "security.h" #include "thread.h" #include "cygtls.h" diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 16a632d33..7ef3501a3 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -28,27 +28,16 @@ details. */ #include <sys/stat.h> #include <sys/vfs.h> /* needed for statfs */ #include <sys/statvfs.h> /* needed for statvfs */ -#include <pwd.h> -#include <grp.h> #include <stdlib.h> #include <stdio.h> #include <process.h> #include <utmp.h> #include <utmpx.h> #include <sys/uio.h> -#include <errno.h> #include <ctype.h> -#include <limits.h> #include <unistd.h> -#include <setjmp.h> #include <sys/wait.h> -#include <winnls.h> -#include <wininet.h> -#include <winioctl.h> -#include <lmcons.h> /* for UNLEN */ #include <rpc.h> -#include <shellapi.h> -#include <ntdef.h> #include "ntdll.h" #undef fstat @@ -58,7 +47,6 @@ details. */ #undef pwrite #include <cygwin/version.h> -#include <sys/cygwin.h> #include "cygerrno.h" #include "perprocess.h" #include "security.h" diff --git a/winsup/cygwin/sysconf.cc b/winsup/cygwin/sysconf.cc index dddf2c362..cf403fb77 100644 --- a/winsup/cygwin/sysconf.cc +++ b/winsup/cygwin/sysconf.cc @@ -11,15 +11,11 @@ details. */ #include "winsup.h" #include <unistd.h> -#include <time.h> -#include <limits.h> -#include <ntdef.h> #include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" -#include "cygheap.h" #include "ntdll.h" static long diff --git a/winsup/cygwin/syslog.cc b/winsup/cygwin/syslog.cc index 88313b2c2..fe76b50e0 100644 --- a/winsup/cygwin/syslog.cc +++ b/winsup/cygwin/syslog.cc @@ -15,17 +15,14 @@ details. */ #include <stdlib.h> #include <stdio.h> #include <syslog.h> -#include <stdarg.h> #include <unistd.h> #include <sys/un.h> -#include <sys/uio.h> #include "cygerrno.h" #include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include "thread.h" #include "cygtls.h" #define CYGWIN_LOG_NAME "Cygwin" diff --git a/winsup/cygwin/termios.cc b/winsup/cygwin/termios.cc index b99f32240..fe6a1de3c 100644 --- a/winsup/cygwin/termios.cc +++ b/winsup/cygwin/termios.cc @@ -13,7 +13,6 @@ details. */ #include "winsup.h" #include "cygwin/version.h" -#include <signal.h> #include <stdlib.h> #include "cygerrno.h" #include "security.h" @@ -22,9 +21,7 @@ details. */ #include "dtable.h" #include "cygheap.h" #include "perprocess.h" -#include "sigproc.h" #include "cygtls.h" -#include <sys/termios.h> /* tcsendbreak: POSIX 7.2.2.1 */ extern "C" int diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index 68cfa8143..d7cc0b790 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -24,30 +24,19 @@ details. */ R.Collins, April 2001. */ #ifdef HAVE_CONFIG_H -# include "config.h" #endif #include "winsup.h" #include "miscfuncs.h" -#include <limits.h> #include "path.h" -#include "cygerrno.h" -#include <assert.h> #include <stdlib.h> #include "pinfo.h" #include "sigproc.h" #include "perprocess.h" -#include "security.h" #include "cygtls.h" #include "fhandler.h" #include "dtable.h" #include "cygheap.h" -#include <semaphore.h> -#include <stdio.h> -#include <sys/timeb.h> -#include <exceptions.h> -#include <sys/fcntl.h> -#include <sys/lock.h> extern "C" void __fp_lock_all (); extern "C" void __fp_unlock_all (); diff --git a/winsup/cygwin/timer.cc b/winsup/cygwin/timer.cc index 7dea7ea69..ee4f0d803 100644 --- a/winsup/cygwin/timer.cc +++ b/winsup/cygwin/timer.cc @@ -9,15 +9,9 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <time.h> -#include <stdlib.h> -#include "cygerrno.h" -#include "security.h" -#include "hires.h" #include "thread.h" #include "cygtls.h" #include "sigproc.h" -#include "sync.h" #include "path.h" #include "fhandler.h" #include "dtable.h" diff --git a/winsup/cygwin/times.cc b/winsup/cygwin/times.cc index 4e1315322..1417dc9c7 100644 --- a/winsup/cygwin/times.cc +++ b/winsup/cygwin/times.cc @@ -11,13 +11,10 @@ details. */ #include "winsup.h" #define __timezonefunc__ -#include <time.h> #include <sys/times.h> #include <sys/timeb.h> #include <utime.h> -#include <stdio.h> #include <stdlib.h> -#include <pthread.h> #include "cygerrno.h" #include "security.h" #include "path.h" @@ -25,10 +22,7 @@ details. */ #include "dtable.h" #include "cygheap.h" #include "pinfo.h" -#include "hires.h" #include "cygtls.h" -#include "sigproc.h" -#include "sync.h" #include "ntdll.h" #define FACTOR (0x19db1ded53e8000LL) diff --git a/winsup/cygwin/tls_pbuf.cc b/winsup/cygwin/tls_pbuf.cc index 704f3bfc9..1f4b74807 100644 --- a/winsup/cygwin/tls_pbuf.cc +++ b/winsup/cygwin/tls_pbuf.cc @@ -8,7 +8,6 @@ details. */ #include <winsup.h> #include <malloc.h> -#include "thread.h" #include "cygtls.h" #include "tls_pbuf.h" diff --git a/winsup/cygwin/tty.cc b/winsup/cygwin/tty.cc index 61dc645cb..6021e3a9f 100644 --- a/winsup/cygwin/tty.cc +++ b/winsup/cygwin/tty.cc @@ -13,8 +13,6 @@ details. */ #include "miscfuncs.h" #include <unistd.h> #include <utmp.h> -#include <wingdi.h> -#include <winuser.h> #include <sys/cygwin.h> #include "cygerrno.h" #include "security.h" @@ -23,9 +21,7 @@ details. */ #include "dtable.h" #include "cygheap.h" #include "pinfo.h" -#include "cygserver.h" #include "shared_info.h" -#include "cygthread.h" extern fhandler_tty_master *tty_master; diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc index 2ad0b920b..c18ad8ebd 100644 --- a/winsup/cygwin/uinfo.cc +++ b/winsup/cygwin/uinfo.cc @@ -10,18 +10,13 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <pwd.h> #include <unistd.h> -#include <winnls.h> #include <wininet.h> -#include <utmp.h> -#include <limits.h> #include <stdlib.h> #include <lm.h> #include <sys/cygwin.h> #include "cygerrno.h" #include "pinfo.h" -#include "security.h" #include "path.h" #include "fhandler.h" #include "dtable.h" diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc index abd77cb19..639c941f7 100644 --- a/winsup/cygwin/uname.cc +++ b/winsup/cygwin/uname.cc @@ -12,7 +12,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for details. */ #include "winsup.h" -#include <stdio.h> #include <sys/utsname.h> #include "cygwin_version.h" #include "cygtls.h" diff --git a/winsup/cygwin/wait.cc b/winsup/cygwin/wait.cc index 2a7a94d37..8fc7f981c 100644 --- a/winsup/cygwin/wait.cc +++ b/winsup/cygwin/wait.cc @@ -10,8 +10,6 @@ details. */ #include "winsup.h" #include <sys/wait.h> -#include <stdlib.h> -#include "cygerrno.h" #include "sigproc.h" #include "thread.h" #include "cygtls.h" diff --git a/winsup/cygwin/window.cc b/winsup/cygwin/window.cc index 0821c64f8..ac00a0c0e 100644 --- a/winsup/cygwin/window.cc +++ b/winsup/cygwin/window.cc @@ -12,18 +12,11 @@ details. */ #include "winsup.h" #include <sys/time.h> -#include <stdlib.h> -#include <signal.h> -#include <limits.h> #include <wingdi.h> #include <winuser.h> #define USE_SYS_TYPES_FD_SET #include <winsock2.h> -#include <unistd.h> -#include "cygerrno.h" #include "perprocess.h" -#include "security.h" -#include "thread.h" #include "cygtls.h" #include "sync.h" #include "wininfo.h" diff --git a/winsup/cygwin/winf.cc b/winsup/cygwin/winf.cc index 0e16d6336..f4e094b42 100644 --- a/winsup/cygwin/winf.cc +++ b/winsup/cygwin/winf.cc @@ -10,7 +10,6 @@ details. */ #include <stdlib.h> #include "cygerrno.h" #include "security.h" -#include "sync.h" #include "path.h" #include "fhandler.h" #include "dtable.h" |