143 files changed, 108 insertions, 85 deletions

diff --git a/winsup/acinclude.m4 b/winsup/acinclude.m4
index ffd15aaaa..aa18cacc8 100644
--- a/winsup/acinclude.m4
+++ b/winsup/acinclude.m4
@@ -16,7 +16,9 @@ if test -z "$newlib_headers"; then
 fi
 newlib_headers="$target_builddir/newlib/targ-include $newlib_headers"
 
-AM_CPPFLAGS="-U_FORTIFY_SOURCE -I${winsup_srcdir}/cygwin -I${target_builddir}/winsup/cygwin"
+AM_CPPFLAGS="-U_FORTIFY_SOURCE"
+AM_CPPFLAGS="${AM_CPPFLAGS} -I${winsup_srcdir}/cygwin/local_includes"
+AM_CPPFLAGS="${AM_CPPFLAGS} -I${target_builddir}/winsup/cygwin"
 AM_CPPFLAGS="${AM_CPPFLAGS} -isystem ${cygwin_headers}"
 for h in ${newlib_headers}; do
     AM_CPPFLAGS="${AM_CPPFLAGS} -isystem $h"
diff --git a/winsup/cygwin/DevNotes b/winsup/cygwin/DevDocs/CgfNotes.OLD
index 5d31ed72e..5d31ed72e 100644
--- a/winsup/cygwin/DevNotes
+++ b/winsup/cygwin/DevDocs/CgfNotes.OLD
diff --git a/winsup/cygwin/ROADMAP b/winsup/cygwin/DevDocs/ROADMAP.OLD
index fd0387d59..fd0387d59 100644
--- a/winsup/cygwin/ROADMAP
+++ b/winsup/cygwin/DevDocs/ROADMAP.OLD
diff --git a/winsup/cygwin/how-autoload-works.txt b/winsup/cygwin/DevDocs/how-autoload-works.txt
index d1765031a..d1765031a 100644
--- a/winsup/cygwin/how-autoload-works.txt
+++ b/winsup/cygwin/DevDocs/how-autoload-works.txt
diff --git a/winsup/cygwin/how-cygheap-works.txt b/winsup/cygwin/DevDocs/how-cygheap-works.txt
index 3aee07701..3aee07701 100644
--- a/winsup/cygwin/how-cygheap-works.txt
+++ b/winsup/cygwin/DevDocs/how-cygheap-works.txt
diff --git a/winsup/cygwin/how-cygtls-works.txt b/winsup/cygwin/DevDocs/how-cygtls-works.txt
index e4f694118..e4f694118 100644
--- a/winsup/cygwin/how-cygtls-works.txt
+++ b/winsup/cygwin/DevDocs/how-cygtls-works.txt
diff --git a/winsup/cygwin/how-fhandlers-work.txt b/winsup/cygwin/DevDocs/how-fhandlers-work.txt
index ba3a8dcbb..ba3a8dcbb 100644
--- a/winsup/cygwin/how-fhandlers-work.txt
+++ b/winsup/cygwin/DevDocs/how-fhandlers-work.txt
diff --git a/winsup/cygwin/how-signals-work.txt b/winsup/cygwin/DevDocs/how-signals-work.txt
index 09d7d0aa5..09d7d0aa5 100644
--- a/winsup/cygwin/how-signals-work.txt
+++ b/winsup/cygwin/DevDocs/how-signals-work.txt
diff --git a/winsup/cygwin/how-spawn-works.txt b/winsup/cygwin/DevDocs/how-spawn-works.txt
index e865ebf3e..e865ebf3e 100644
--- a/winsup/cygwin/how-spawn-works.txt
+++ b/winsup/cygwin/DevDocs/how-spawn-works.txt
diff --git a/winsup/cygwin/how-startup-shutdown-works.txt b/winsup/cygwin/DevDocs/how-startup-shutdown-works.txt
index 0a534b898..0a534b898 100644
--- a/winsup/cygwin/how-startup-shutdown-works.txt
+++ b/winsup/cygwin/DevDocs/how-startup-shutdown-works.txt
diff --git a/winsup/cygwin/how-to-debug-cygwin.txt b/winsup/cygwin/DevDocs/how-to-debug-cygwin.txt
index 61e91c88d..61e91c88d 100644
--- a/winsup/cygwin/how-to-debug-cygwin.txt
+++ b/winsup/cygwin/DevDocs/how-to-debug-cygwin.txt
diff --git a/winsup/cygwin/Makefile.am b/winsup/cygwin/Makefile.am
index fe17a5b1b..367894bb2 100644
--- a/winsup/cygwin/Makefile.am
+++ b/winsup/cygwin/Makefile.am
@@ -68,6 +68,45 @@ LIB_FILES= \
 	lib/premain3.c \
 	lib/pseudo-reloc-dummy.c
 
+FHANDLER_FILES= \
+	fhandler/base.cc \
+	fhandler/clipboard.cc \
+	fhandler/console.cc \
+	fhandler/cygdrive.cc \
+	fhandler/dev.cc \
+	fhandler/dev_fd.cc \
+	fhandler/disk_file.cc \
+	fhandler/dsp.cc \
+	fhandler/fifo.cc \
+	fhandler/floppy.cc \
+	fhandler/mqueue.cc \
+	fhandler/netdrive.cc \
+	fhandler/nodevice.cc \
+	fhandler/null.cc \
+	fhandler/pipe.cc \
+	fhandler/proc.cc \
+	fhandler/process.cc \
+	fhandler/process_fd.cc \
+	fhandler/procnet.cc \
+	fhandler/procsys.cc \
+	fhandler/procsysvipc.cc \
+	fhandler/random.cc \
+	fhandler/raw.cc \
+	fhandler/registry.cc \
+	fhandler/serial.cc \
+	fhandler/signalfd.cc \
+	fhandler/socket.cc \
+	fhandler/socket_inet.cc \
+	fhandler/socket_local.cc \
+	fhandler/socket_unix.cc \
+	fhandler/tape.cc \
+	fhandler/termios.cc \
+	fhandler/timerfd.cc \
+	fhandler/tty.cc \
+	fhandler/virtual.cc \
+	fhandler/windows.cc \
+	fhandler/zero.cc
+
 LIBC_FILES= \
 	libc/arc4random_stir.c \
 	libc/base64.c \
@@ -196,6 +235,13 @@ REGEX_FILES = \
 	regex/regexec.c \
 	regex/regfree.c
 
+SEC_FILES= \
+	sec/acl.cc \
+	sec/auth.cc \
+	sec/base.cc \
+	sec/helper.cc \
+	sec/posixacl.cc
+
 TZCODE_FILES= \
 	tzcode/localtime_wrapper.c
 
@@ -226,42 +272,6 @@ DLL_FILES= \
 	external.cc \
 	fcntl.cc \
 	fenv.c \
-	fhandler.cc \
-	fhandler_clipboard.cc \
-	fhandler_console.cc \
-	fhandler_cygdrive.cc \
-	fhandler_dev.cc \
-	fhandler_dev_fd.cc \
-	fhandler_disk_file.cc \
-	fhandler_dsp.cc \
-	fhandler_fifo.cc \
-	fhandler_floppy.cc \
-	fhandler_mqueue.cc \
-	fhandler_netdrive.cc \
-	fhandler_nodevice.cc \
-	fhandler_pipe.cc \
-	fhandler_proc.cc \
-	fhandler_process.cc \
-	fhandler_process_fd.cc \
-	fhandler_procnet.cc \
-	fhandler_procsys.cc \
-	fhandler_procsysvipc.cc \
-	fhandler_random.cc \
-	fhandler_raw.cc \
-	fhandler_registry.cc \
-	fhandler_serial.cc \
-	fhandler_signalfd.cc \
-	fhandler_socket.cc \
-	fhandler_socket_inet.cc \
-	fhandler_socket_local.cc \
-	fhandler_socket_unix.cc \
-	fhandler_tape.cc \
-	fhandler_termios.cc \
-	fhandler_timerfd.cc \
-	fhandler_tty.cc \
-	fhandler_virtual.cc \
-	fhandler_windows.cc \
-	fhandler_zero.cc \
 	flock.cc \
 	fork.cc \
 	forkable.cc \
@@ -305,11 +315,6 @@ DLL_FILES= \
 	resource.cc \
 	scandir.cc \
 	sched.cc \
-	sec_acl.cc \
-	sec_auth.cc \
-	sec_helper.cc \
-	sec_posixacl.cc \
-	security.cc \
 	select.cc \
 	sem.cc \
 	setlsapwd.cc \
@@ -359,8 +364,10 @@ libdll_a_SOURCES= \
 	$(DLL_FILES) \
 	$(REGEX_FILES) \
 	$(MALLOC_FILES) \
+	$(FHANDLER_FILES) \
 	$(LIBC_FILES) \
 	$(MATH_FILES) \
+	$(SEC_FILES) \
 	$(TZCODE_FILES) \
 	$(GENERATED_FILES)
 
@@ -368,13 +375,13 @@ libdll_a_SOURCES= \
 # generated sources
 #
 
-shared_info_magic.h: cygmagic shared_info.h
-	$(AM_V_GEN)$(srcdir)/cygmagic $@ "$(CC) $(INCLUDES) $(CPPFLAGS) -E -x c++" $(word 2,$^) SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
+shared_info_magic.h: scripts/cygmagic local_includes/shared_info.h
+	$(AM_V_GEN)$(srcdir)/scripts/cygmagic $@ "$(CC) $(INCLUDES) $(CPPFLAGS) -E -x c++" $(word 2,$^) SHARED_MAGIC 'class shared_info' USER_MAGIC 'class user_info'
 
-child_info_magic.h: cygmagic child_info.h
-	$(AM_V_GEN)$(srcdir)/cygmagic $@ "$(CC) $(INCLUDES) $(CPPFLAGS) -E -x c++" $(word 2,$^) CHILD_INFO_MAGIC 'class child_info'
+child_info_magic.h: scripts/cygmagic local_includes/child_info.h
+	$(AM_V_GEN)$(srcdir)/scripts/cygmagic $@ "$(CC) $(INCLUDES) $(CPPFLAGS) -E -x c++" $(word 2,$^) CHILD_INFO_MAGIC 'class child_info'
 
-globals.h: mkglobals_h globals.cc
+globals.h: scripts/mkglobals_h globals.cc
 	$(AM_V_GEN)$^ > $@
 
 localtime.patched.c: tzcode/localtime.c tzcode/localtime.c.patch
@@ -382,10 +389,10 @@ localtime.patched.c: tzcode/localtime.c tzcode/localtime.c.patch
 		    $(srcdir)/tzcode/localtime.c \
 		    $(srcdir)/tzcode/localtime.c.patch
 
-$(srcdir)/devices.cc: gendevices devices.in devices.h
+$(srcdir)/devices.cc: scripts/gendevices devices.in local_includes/devices.h
 	$(wordlist 1,2,$^) $@
 
-tlsoffsets: gentls_offsets cygtls.h
+tlsoffsets: scripts/gentls_offsets local_includes/cygtls.h
 	$(AM_V_GEN)CXXCOMPILE="$(CXXCOMPILE)" $^ $@
 
 BUILT_SOURCES = \
@@ -402,7 +409,7 @@ src_files := $(foreach dir,$(dirs),$(find_src_files))
 
 # mkvers.sh creates version.cc in the first place, winver.o always
 # second, so version.cc is always older than winver.o
-version.cc: mkvers.sh include/cygwin/version.h winver.rc $(src_files)
+version.cc: scripts/mkvers.sh include/cygwin/version.h winver.rc $(src_files)
 	@echo "Making version.cc and winver.o";\
 	export CC="$(CC)";\
 	/bin/sh $(word 1,$^) $(word 2,$^) $(word 3,$^) $(WINDRES) $(CFLAGS)
@@ -486,7 +493,7 @@ localtime_wrapper_CFLAGS=-I$(srcdir)/tzcode -fwrapv
 # required since gcc 9.x
 exec_CFLAGS=-fno-builtin-execve
 
-fhandler_proc_CFLAGS=-DUSERNAME="\"$(USER)\"" -DHOSTNAME="\"$(HOSTNAME)\"" \
+proc_CFLAGS=-DUSERNAME="\"$(USER)\"" -DHOSTNAME="\"$(HOSTNAME)\"" \
 		     -DGCC_VERSION="\"`$(CC) -v 2>&1 | tail -n 1`\""
 
 dtable_CFLAGS=-fcheck-new
@@ -608,8 +615,8 @@ $(NEW_DLL_NAME): $(PRE_DLL_NAME) $(DBG_DLL_NAME)
 # cygwin import library
 toolopts=--cpu=@target_cpu@ --ar=@AR@ --as=@AS@ --nm=@NM@ --objcopy=@OBJCOPY@
 
-$(DEF_FILE): gendef $(DIN_FILE) common.din
-	$(AM_V_GEN)$(srcdir)/gendef --cpu=@target_cpu@ --output-def=$(DEF_FILE) $(srcdir)/$(DIN_FILE) $(srcdir)/common.din
+$(DEF_FILE): scripts/gendef $(DIN_FILE) common.din
+	$(AM_V_GEN)$(srcdir)/scripts/gendef --cpu=@target_cpu@ --output-def=$(DEF_FILE) $(srcdir)/$(DIN_FILE) $(srcdir)/common.din
 
 sigfe.s: $(DEF_FILE) tlsoffsets
 	@[ -s $@ ] || \
@@ -618,7 +625,7 @@ sigfe.s: $(DEF_FILE) tlsoffsets
 
 LIBCOS=$(addsuffix .o,$(basename $(LIB_FILES)))
 $(LIB_NAME): $(DEF_FILE) $(LIBCOS) | $(NEW_DLL_NAME)
-	$(AM_V_GEN)$(srcdir)/mkimport $(toolopts) $(NEW_FUNCTIONS) $@ cygdll.a $(wordlist 2,99,$^)
+	$(AM_V_GEN)$(srcdir)/scripts/mkimport $(toolopts) $(NEW_FUNCTIONS) $@ cygdll.a $(wordlist 2,99,$^)
 
 # cygwin import library used by testsuite
 $(TEST_LIB_NAME): $(LIB_NAME)
@@ -627,7 +634,7 @@ $(TEST_LIB_NAME): $(LIB_NAME)
 # sublibs
 # import libraries for some subset of symbols indicated by given objects
 speclib=\
-	$(srcdir)/speclib $(toolopts) \
+	$(srcdir)/scripts/speclib $(toolopts) \
 	--exclude='cygwin' \
 	--exclude='(?i:dll)' \
 	--exclude='reloc' \
@@ -656,7 +663,7 @@ libresolv.a: $(LIB_NAME) libc/minires.o
 librt.a: $(LIB_NAME) posix_ipc.o
 	$(AM_V_GEN)$(speclib) $^ $(@F)
 
-libacl.a: $(LIB_NAME) sec_posixacl.o
+libacl.a: $(LIB_NAME) sec/posixacl.o
 	$(AM_V_GEN)$(speclib) $^ $(@F)
 
 libssp.a: $(LIB_NAME) $(wildcard $(newlib_build)/libc/ssp/*.o)
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler/base.cc
index 72d35391f..b2738cf20 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler/base.cc
@@ -1,4 +1,4 @@
-/* fhandler.cc.  See console.cc for fhandler_console functions.
+/* base.cc.  Base functions, inherited by all fhandlers.
 
 This file is part of Cygwin.
 
@@ -1488,23 +1488,6 @@ fhandler_base::~fhandler_base ()
     free (ra.rabuf);
 }
 
-/**********************************************************************/
-/* /dev/null */
-
-fhandler_dev_null::fhandler_dev_null () :
-	fhandler_base ()
-{
-}
-
-ssize_t
-fhandler_dev_null::write (const void *ptr, size_t len)
-{
-  /* Shortcut.  This also fixes a problem with the NUL device on x86_64:
-     If you write > 4 GB in a single attempt, the bytes written returned
-     from by is numBytes & 0xffffffff. */
-  return len;
-}
-
 void
 fhandler_base::set_no_inheritance (HANDLE &h, bool not_inheriting)
 {
diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler/clipboard.cc
index fe3545bf5..fe3545bf5 100644
--- a/winsup/cygwin/fhandler_clipboard.cc
+++ b/winsup/cygwin/fhandler/clipboard.cc
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler/console.cc
index a4a367005..a4a367005 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler/console.cc
diff --git a/winsup/cygwin/fhandler_cygdrive.cc b/winsup/cygwin/fhandler/cygdrive.cc
index 1ac1d5d4f..1ac1d5d4f 100644
--- a/winsup/cygwin/fhandler_cygdrive.cc
+++ b/winsup/cygwin/fhandler/cygdrive.cc
diff --git a/winsup/cygwin/fhandler_dev.cc b/winsup/cygwin/fhandler/dev.cc
index c6bda5654..c6bda5654 100644
--- a/winsup/cygwin/fhandler_dev.cc
+++ b/winsup/cygwin/fhandler/dev.cc
diff --git a/winsup/cygwin/fhandler_dev_fd.cc b/winsup/cygwin/fhandler/dev_fd.cc
index 96ebd85ea..96ebd85ea 100644
--- a/winsup/cygwin/fhandler_dev_fd.cc
+++ b/winsup/cygwin/fhandler/dev_fd.cc
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler/disk_file.cc
index 62c18e5e4..62c18e5e4 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler/disk_file.cc
diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler/dsp.cc
index c37bedea5..c37bedea5 100644
--- a/winsup/cygwin/fhandler_dsp.cc
+++ b/winsup/cygwin/fhandler/dsp.cc
diff --git a/winsup/cygwin/fhandler_fifo.cc b/winsup/cygwin/fhandler/fifo.cc
index 1d3e42908..1d3e42908 100644
--- a/winsup/cygwin/fhandler_fifo.cc
+++ b/winsup/cygwin/fhandler/fifo.cc
diff --git a/winsup/cygwin/fhandler_floppy.cc b/winsup/cygwin/fhandler/floppy.cc
index e883ab697..e883ab697 100644
--- a/winsup/cygwin/fhandler_floppy.cc
+++ b/winsup/cygwin/fhandler/floppy.cc
diff --git a/winsup/cygwin/fhandler_mqueue.cc b/winsup/cygwin/fhandler/mqueue.cc
index 6b94bca85..6b94bca85 100644
--- a/winsup/cygwin/fhandler_mqueue.cc
+++ b/winsup/cygwin/fhandler/mqueue.cc
diff --git a/winsup/cygwin/fhandler_netdrive.cc b/winsup/cygwin/fhandler/netdrive.cc
index 58ab8811b..58ab8811b 100644
--- a/winsup/cygwin/fhandler_netdrive.cc
+++ b/winsup/cygwin/fhandler/netdrive.cc
diff --git a/winsup/cygwin/fhandler_nodevice.cc b/winsup/cygwin/fhandler/nodevice.cc
index 515b1ae58..515b1ae58 100644
--- a/winsup/cygwin/fhandler_nodevice.cc
+++ b/winsup/cygwin/fhandler/nodevice.cc
diff --git a/winsup/cygwin/fhandler/null.cc b/winsup/cygwin/fhandler/null.cc
new file mode 100644
index 000000000..e4dec35e1
--- /dev/null
+++ b/winsup/cygwin/fhandler/null.cc
@@ -0,0 +1,35 @@
+/* null.cc.  /dev/null specifics.
+
+This file is part of Cygwin.
+
+This software is a copyrighted work licensed under the terms of the
+Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
+details. */
+
+#include "winsup.h"
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/uio.h>
+#include <cygwin/acl.h>
+#include <sys/param.h>
+#include "cygerrno.h"
+#include "perprocess.h"
+#include "security.h"
+#include "cygwin/version.h"
+#include "path.h"
+#include "fhandler.h"
+
+fhandler_dev_null::fhandler_dev_null () :
+	fhandler_base ()
+{
+}
+
+ssize_t
+fhandler_dev_null::write (const void *ptr, size_t len)
+{
+  /* Shortcut.  This also fixes a problem with the NUL device on x86_64:
+     If you write > 4 GB in a single attempt, the bytes written returned
+     from by is numBytes & 0xffffffff. */
+  return len;
+}
+
diff --git a/winsup/cygwin/fhandler_pipe.cc b/winsup/cygwin/fhandler/pipe.cc
index 720e4efd3..720e4efd3 100644
--- a/winsup/cygwin/fhandler_pipe.cc
+++ b/winsup/cygwin/fhandler/pipe.cc
diff --git a/winsup/cygwin/fhandler_proc.cc b/winsup/cygwin/fhandler/proc.cc
index 24067f687..24067f687 100644
--- a/winsup/cygwin/fhandler_proc.cc
+++ b/winsup/cygwin/fhandler/proc.cc
diff --git a/winsup/cygwin/fhandler_process.cc b/winsup/cygwin/fhandler/process.cc
index c8ca6e25a..c8ca6e25a 100644
--- a/winsup/cygwin/fhandler_process.cc
+++ b/winsup/cygwin/fhandler/process.cc
diff --git a/winsup/cygwin/fhandler_process_fd.cc b/winsup/cygwin/fhandler/process_fd.cc
index d81495103..d81495103 100644
--- a/winsup/cygwin/fhandler_process_fd.cc
+++ b/winsup/cygwin/fhandler/process_fd.cc
diff --git a/winsup/cygwin/fhandler_procnet.cc b/winsup/cygwin/fhandler/procnet.cc
index d512887d5..d512887d5 100644
--- a/winsup/cygwin/fhandler_procnet.cc
+++ b/winsup/cygwin/fhandler/procnet.cc
diff --git a/winsup/cygwin/fhandler_procsys.cc b/winsup/cygwin/fhandler/procsys.cc
index cd1d35984..cd1d35984 100644
--- a/winsup/cygwin/fhandler_procsys.cc
+++ b/winsup/cygwin/fhandler/procsys.cc
diff --git a/winsup/cygwin/fhandler_procsysvipc.cc b/winsup/cygwin/fhandler/procsysvipc.cc
index 453d3b4f7..453d3b4f7 100644
--- a/winsup/cygwin/fhandler_procsysvipc.cc
+++ b/winsup/cygwin/fhandler/procsysvipc.cc
diff --git a/winsup/cygwin/fhandler_random.cc b/winsup/cygwin/fhandler/random.cc
index 495e3a94b..495e3a94b 100644
--- a/winsup/cygwin/fhandler_random.cc
+++ b/winsup/cygwin/fhandler/random.cc
diff --git a/winsup/cygwin/fhandler_raw.cc b/winsup/cygwin/fhandler/raw.cc
index 44cb10dfb..44cb10dfb 100644
--- a/winsup/cygwin/fhandler_raw.cc
+++ b/winsup/cygwin/fhandler/raw.cc
diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler/registry.cc
index 2830c708a..2830c708a 100644
--- a/winsup/cygwin/fhandler_registry.cc
+++ b/winsup/cygwin/fhandler/registry.cc
diff --git a/winsup/cygwin/fhandler_serial.cc b/winsup/cygwin/fhandler/serial.cc
index 174a57a43..174a57a43 100644
--- a/winsup/cygwin/fhandler_serial.cc
+++ b/winsup/cygwin/fhandler/serial.cc
diff --git a/winsup/cygwin/fhandler_signalfd.cc b/winsup/cygwin/fhandler/signalfd.cc
index bdd8bc93e..bdd8bc93e 100644
--- a/winsup/cygwin/fhandler_signalfd.cc
+++ b/winsup/cygwin/fhandler/signalfd.cc
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler/socket.cc
index f7c5ff629..f7c5ff629 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler/socket.cc
diff --git a/winsup/cygwin/fhandler_socket_inet.cc b/winsup/cygwin/fhandler/socket_inet.cc
index 63cc498f1..63cc498f1 100644
--- a/winsup/cygwin/fhandler_socket_inet.cc
+++ b/winsup/cygwin/fhandler/socket_inet.cc
diff --git a/winsup/cygwin/fhandler_socket_local.cc b/winsup/cygwin/fhandler/socket_local.cc
index e4a88169b..e4a88169b 100644
--- a/winsup/cygwin/fhandler_socket_local.cc
+++ b/winsup/cygwin/fhandler/socket_local.cc
diff --git a/winsup/cygwin/fhandler_socket_unix.cc b/winsup/cygwin/fhandler/socket_unix.cc
index 0cd97f625..0cd97f625 100644
--- a/winsup/cygwin/fhandler_socket_unix.cc
+++ b/winsup/cygwin/fhandler/socket_unix.cc
diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler/tape.cc
index 0e235f16c..0e235f16c 100644
--- a/winsup/cygwin/fhandler_tape.cc
+++ b/winsup/cygwin/fhandler/tape.cc
diff --git a/winsup/cygwin/fhandler_termios.cc b/winsup/cygwin/fhandler/termios.cc
index 328c73fcd..328c73fcd 100644
--- a/winsup/cygwin/fhandler_termios.cc
+++ b/winsup/cygwin/fhandler/termios.cc
diff --git a/winsup/cygwin/fhandler_timerfd.cc b/winsup/cygwin/fhandler/timerfd.cc
index 9269494db..9269494db 100644
--- a/winsup/cygwin/fhandler_timerfd.cc
+++ b/winsup/cygwin/fhandler/timerfd.cc
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler/tty.cc
index 0f9dec570..0f9dec570 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler/tty.cc
diff --git a/winsup/cygwin/fhandler_virtual.cc b/winsup/cygwin/fhandler/virtual.cc
index 21ff4f35e..21ff4f35e 100644
--- a/winsup/cygwin/fhandler_virtual.cc
+++ b/winsup/cygwin/fhandler/virtual.cc
diff --git a/winsup/cygwin/fhandler_windows.cc b/winsup/cygwin/fhandler/windows.cc
index 90ab48daa..90ab48daa 100644
--- a/winsup/cygwin/fhandler_windows.cc
+++ b/winsup/cygwin/fhandler/windows.cc
diff --git a/winsup/cygwin/fhandler_zero.cc b/winsup/cygwin/fhandler/zero.cc
index 9d8fe004d..9d8fe004d 100644
--- a/winsup/cygwin/fhandler_zero.cc
+++ b/winsup/cygwin/fhandler/zero.cc
diff --git a/winsup/cygwin/libc/fnmatch.c b/winsup/cygwin/libc/fnmatch.c
index 6655bca88..410254ab8 100644
--- a/winsup/cygwin/libc/fnmatch.c
+++ b/winsup/cygwin/libc/fnmatch.c
@@ -64,11 +64,7 @@ __FBSDID("$FreeBSD: head/lib/libc/gen/fnmatch.c 288309 2015-09-27 12:52:18Z jill
 #include <wchar.h>
 #include <wctype.h>
 
-#ifdef __CYGWIN__
-#include "../collate.h"
-#else
 #include "collate.h"
-#endif
 
 #define	EOS	'\0'
 
diff --git a/winsup/cygwin/child_info.h b/winsup/cygwin/local_includes/child_info.h
index 2da62ffaa..2da62ffaa 100644
--- a/winsup/cygwin/child_info.h
+++ b/winsup/cygwin/local_includes/child_info.h
diff --git a/winsup/cygwin/clock.h b/winsup/cygwin/local_includes/clock.h
index 7323299df..7323299df 100644
--- a/winsup/cygwin/clock.h
+++ b/winsup/cygwin/local_includes/clock.h
diff --git a/winsup/cygwin/collate.h b/winsup/cygwin/local_includes/collate.h
index a89829a83..a89829a83 100644
--- a/winsup/cygwin/collate.h
+++ b/winsup/cygwin/local_includes/collate.h
diff --git a/winsup/cygwin/cpuid.h b/winsup/cygwin/local_includes/cpuid.h
index 6dbb1bddf..6dbb1bddf 100644
--- a/winsup/cygwin/cpuid.h
+++ b/winsup/cygwin/local_includes/cpuid.h
diff --git a/winsup/cygwin/cygerrno.h b/winsup/cygwin/local_includes/cygerrno.h
index 1bcc4c6ff..1bcc4c6ff 100644
--- a/winsup/cygwin/cygerrno.h
+++ b/winsup/cygwin/local_includes/cygerrno.h
diff --git a/winsup/cygwin/cygheap.h b/winsup/cygwin/local_includes/cygheap.h
index 7f36c5837..7f36c5837 100644
--- a/winsup/cygwin/cygheap.h
+++ b/winsup/cygwin/local_includes/cygheap.h
diff --git a/winsup/cygwin/cygheap_malloc.h b/winsup/cygwin/local_includes/cygheap_malloc.h
index 6950e8265..6950e8265 100644
--- a/winsup/cygwin/cygheap_malloc.h
+++ b/winsup/cygwin/local_includes/cygheap_malloc.h
diff --git a/winsup/cygwin/cygmalloc.h b/winsup/cygwin/local_includes/cygmalloc.h
index 73a2f060b..73a2f060b 100644
--- a/winsup/cygwin/cygmalloc.h
+++ b/winsup/cygwin/local_includes/cygmalloc.h
diff --git a/winsup/cygwin/cygserver.h b/winsup/cygwin/local_includes/cygserver.h
index 2788fa377..2788fa377 100644
--- a/winsup/cygwin/cygserver.h
+++ b/winsup/cygwin/local_includes/cygserver.h
diff --git a/winsup/cygwin/cygserver_ipc.h b/winsup/cygwin/local_includes/cygserver_ipc.h
index 2938e1a73..2938e1a73 100644
--- a/winsup/cygwin/cygserver_ipc.h
+++ b/winsup/cygwin/local_includes/cygserver_ipc.h
diff --git a/winsup/cygwin/cygserver_msg.h b/winsup/cygwin/local_includes/cygserver_msg.h
index b9fa7d77b..b9fa7d77b 100644
--- a/winsup/cygwin/cygserver_msg.h
+++ b/winsup/cygwin/local_includes/cygserver_msg.h
diff --git a/winsup/cygwin/cygserver_pwdgrp.h b/winsup/cygwin/local_includes/cygserver_pwdgrp.h
index 98f1fed40..98f1fed40 100644
--- a/winsup/cygwin/cygserver_pwdgrp.h
+++ b/winsup/cygwin/local_includes/cygserver_pwdgrp.h
diff --git a/winsup/cygwin/cygserver_sem.h b/winsup/cygwin/local_includes/cygserver_sem.h
index 75c688762..75c688762 100644
--- a/winsup/cygwin/cygserver_sem.h
+++ b/winsup/cygwin/local_includes/cygserver_sem.h
diff --git a/winsup/cygwin/cygserver_setpwd.h b/winsup/cygwin/local_includes/cygserver_setpwd.h
index fc1576b05..fc1576b05 100644
--- a/winsup/cygwin/cygserver_setpwd.h
+++ b/winsup/cygwin/local_includes/cygserver_setpwd.h
diff --git a/winsup/cygwin/cygserver_shm.h b/winsup/cygwin/local_includes/cygserver_shm.h
index 80bbf84f0..80bbf84f0 100644
--- a/winsup/cygwin/cygserver_shm.h
+++ b/winsup/cygwin/local_includes/cygserver_shm.h
diff --git a/winsup/cygwin/cygthread.h b/winsup/cygwin/local_includes/cygthread.h
index 241180f2b..241180f2b 100644
--- a/winsup/cygwin/cygthread.h
+++ b/winsup/cygwin/local_includes/cygthread.h
diff --git a/winsup/cygwin/cygtls.h b/winsup/cygwin/local_includes/cygtls.h
index b265978f0..b265978f0 100644
--- a/winsup/cygwin/cygtls.h
+++ b/winsup/cygwin/local_includes/cygtls.h
diff --git a/winsup/cygwin/cygwait.h b/winsup/cygwin/local_includes/cygwait.h
index 6212c334e..6212c334e 100644
--- a/winsup/cygwin/cygwait.h
+++ b/winsup/cygwin/local_includes/cygwait.h
diff --git a/winsup/cygwin/cygwin-cxx.h b/winsup/cygwin/local_includes/cygwin-cxx.h
index ccfaa26a0..ccfaa26a0 100644
--- a/winsup/cygwin/cygwin-cxx.h
+++ b/winsup/cygwin/local_includes/cygwin-cxx.h
diff --git a/winsup/cygwin/cygwin_version.h b/winsup/cygwin/local_includes/cygwin_version.h
index 8e2c4022a..8e2c4022a 100644
--- a/winsup/cygwin/cygwin_version.h
+++ b/winsup/cygwin/local_includes/cygwin_version.h
diff --git a/winsup/cygwin/cygxdr.h b/winsup/cygwin/local_includes/cygxdr.h
index d44fd6e6a..d44fd6e6a 100644
--- a/winsup/cygwin/cygxdr.h
+++ b/winsup/cygwin/local_includes/cygxdr.h
diff --git a/winsup/cygwin/debug.h b/winsup/cygwin/local_includes/debug.h
index 0fcfa13a5..0fcfa13a5 100644
--- a/winsup/cygwin/debug.h
+++ b/winsup/cygwin/local_includes/debug.h
diff --git a/winsup/cygwin/devices.h b/winsup/cygwin/local_includes/devices.h
index 8f718dd17..8f718dd17 100644
--- a/winsup/cygwin/devices.h
+++ b/winsup/cygwin/local_includes/devices.h
diff --git a/winsup/cygwin/dll_init.h b/winsup/cygwin/local_includes/dll_init.h
index 65f4213db..65f4213db 100644
--- a/winsup/cygwin/dll_init.h
+++ b/winsup/cygwin/local_includes/dll_init.h
diff --git a/winsup/cygwin/dtable.h b/winsup/cygwin/local_includes/dtable.h
index 7803fae1b..7803fae1b 100644
--- a/winsup/cygwin/dtable.h
+++ b/winsup/cygwin/local_includes/dtable.h
diff --git a/winsup/cygwin/environ.h b/winsup/cygwin/local_includes/environ.h
index 86e64a72f..86e64a72f 100644
--- a/winsup/cygwin/environ.h
+++ b/winsup/cygwin/local_includes/environ.h
diff --git a/winsup/cygwin/errmap.h b/winsup/cygwin/local_includes/errmap.h
index 326b35b6c..326b35b6c 100644
--- a/winsup/cygwin/errmap.h
+++ b/winsup/cygwin/local_includes/errmap.h
diff --git a/winsup/cygwin/exception.h b/winsup/cygwin/local_includes/exception.h
index 13159d17b..13159d17b 100644
--- a/winsup/cygwin/exception.h
+++ b/winsup/cygwin/local_includes/exception.h
diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/local_includes/fhandler.h
index aad7f4c37..aad7f4c37 100644
--- a/winsup/cygwin/fhandler.h
+++ b/winsup/cygwin/local_includes/fhandler.h
diff --git a/winsup/cygwin/fhandler_virtual.h b/winsup/cygwin/local_includes/fhandler_virtual.h
index 8af99a8a4..8af99a8a4 100644
--- a/winsup/cygwin/fhandler_virtual.h
+++ b/winsup/cygwin/local_includes/fhandler_virtual.h
diff --git a/winsup/cygwin/gcc_seh.h b/winsup/cygwin/local_includes/gcc_seh.h
index d93c5a239..d93c5a239 100644
--- a/winsup/cygwin/gcc_seh.h
+++ b/winsup/cygwin/local_includes/gcc_seh.h
diff --git a/winsup/cygwin/gmon.h b/winsup/cygwin/local_includes/gmon.h
index 3612aac96..3612aac96 100644
--- a/winsup/cygwin/gmon.h
+++ b/winsup/cygwin/local_includes/gmon.h
diff --git a/winsup/cygwin/heap.h b/winsup/cygwin/local_includes/heap.h
index 25200f286..25200f286 100644
--- a/winsup/cygwin/heap.h
+++ b/winsup/cygwin/local_includes/heap.h
diff --git a/winsup/cygwin/lc_era.h b/winsup/cygwin/local_includes/lc_era.h
index be0b67134..be0b67134 100644
--- a/winsup/cygwin/lc_era.h
+++ b/winsup/cygwin/local_includes/lc_era.h
diff --git a/winsup/cygwin/lc_msg.h b/winsup/cygwin/local_includes/lc_msg.h
index f84cf9370..f84cf9370 100644
--- a/winsup/cygwin/lc_msg.h
+++ b/winsup/cygwin/local_includes/lc_msg.h
diff --git a/winsup/cygwin/ldap.h b/winsup/cygwin/local_includes/ldap.h
index 224a67f05..224a67f05 100644
--- a/winsup/cygwin/ldap.h
+++ b/winsup/cygwin/local_includes/ldap.h
diff --git a/winsup/cygwin/loadavg.h b/winsup/cygwin/local_includes/loadavg.h
index e6fb594d0..e6fb594d0 100644
--- a/winsup/cygwin/loadavg.h
+++ b/winsup/cygwin/local_includes/loadavg.h
diff --git a/winsup/cygwin/math.h b/winsup/cygwin/local_includes/math.h
index d30ecf9e2..d30ecf9e2 100644
--- a/winsup/cygwin/math.h
+++ b/winsup/cygwin/local_includes/math.h
diff --git a/winsup/cygwin/miscfuncs.h b/winsup/cygwin/local_includes/miscfuncs.h
index fc791c2aa..fc791c2aa 100644
--- a/winsup/cygwin/miscfuncs.h
+++ b/winsup/cygwin/local_includes/miscfuncs.h
diff --git a/winsup/cygwin/mmap_alloc.h b/winsup/cygwin/local_includes/mmap_alloc.h
index 8d6aebcaf..8d6aebcaf 100644
--- a/winsup/cygwin/mmap_alloc.h
+++ b/winsup/cygwin/local_includes/mmap_alloc.h
diff --git a/winsup/cygwin/mmap_helper.h b/winsup/cygwin/local_includes/mmap_helper.h
index 645c5e3aa..645c5e3aa 100644
--- a/winsup/cygwin/mmap_helper.h
+++ b/winsup/cygwin/local_includes/mmap_helper.h
diff --git a/winsup/cygwin/mount.h b/winsup/cygwin/local_includes/mount.h
index 5bb84b976..5bb84b976 100644
--- a/winsup/cygwin/mount.h
+++ b/winsup/cygwin/local_includes/mount.h
diff --git a/winsup/cygwin/mqueue_types.h b/winsup/cygwin/local_includes/mqueue_types.h
index 1e4fe127e..1e4fe127e 100644
--- a/winsup/cygwin/mqueue_types.h
+++ b/winsup/cygwin/local_includes/mqueue_types.h
diff --git a/winsup/cygwin/mtinfo.h b/winsup/cygwin/local_includes/mtinfo.h
index 03aabbfd0..03aabbfd0 100644
--- a/winsup/cygwin/mtinfo.h
+++ b/winsup/cygwin/local_includes/mtinfo.h
diff --git a/winsup/cygwin/nfs.h b/winsup/cygwin/local_includes/nfs.h
index cd7ffa039..cd7ffa039 100644
--- a/winsup/cygwin/nfs.h
+++ b/winsup/cygwin/local_includes/nfs.h
diff --git a/winsup/cygwin/ntdll.h b/winsup/cygwin/local_includes/ntdll.h
index 0f2310882..0f2310882 100644
--- a/winsup/cygwin/ntdll.h
+++ b/winsup/cygwin/local_includes/ntdll.h
diff --git a/winsup/cygwin/path.h b/winsup/cygwin/local_includes/path.h
index 74f831e53..74f831e53 100644
--- a/winsup/cygwin/path.h
+++ b/winsup/cygwin/local_includes/path.h
diff --git a/winsup/cygwin/pathfinder.h b/winsup/cygwin/local_includes/pathfinder.h
index c3066044b..c3066044b 100644
--- a/winsup/cygwin/pathfinder.h
+++ b/winsup/cygwin/local_includes/pathfinder.h
diff --git a/winsup/cygwin/perprocess.h b/winsup/cygwin/local_includes/perprocess.h
index 78530894f..78530894f 100644
--- a/winsup/cygwin/perprocess.h
+++ b/winsup/cygwin/local_includes/perprocess.h
diff --git a/winsup/cygwin/pinfo.h b/winsup/cygwin/local_includes/pinfo.h
index 463f0e851..463f0e851 100644
--- a/winsup/cygwin/pinfo.h
+++ b/winsup/cygwin/local_includes/pinfo.h
diff --git a/winsup/cygwin/posix_timer.h b/winsup/cygwin/local_includes/posix_timer.h
index e1cfe84c7..e1cfe84c7 100644
--- a/winsup/cygwin/posix_timer.h
+++ b/winsup/cygwin/local_includes/posix_timer.h
diff --git a/winsup/cygwin/profil.h b/winsup/cygwin/local_includes/profil.h
index cb1a092da..cb1a092da 100644
--- a/winsup/cygwin/profil.h
+++ b/winsup/cygwin/local_includes/profil.h
diff --git a/winsup/cygwin/pwdgrp.h b/winsup/cygwin/local_includes/pwdgrp.h
index 8f3ef3adb..8f3ef3adb 100644
--- a/winsup/cygwin/pwdgrp.h
+++ b/winsup/cygwin/local_includes/pwdgrp.h
diff --git a/winsup/cygwin/registry.h b/winsup/cygwin/local_includes/registry.h
index eed640401..eed640401 100644
--- a/winsup/cygwin/registry.h
+++ b/winsup/cygwin/local_includes/registry.h
diff --git a/winsup/cygwin/sec_posixacl.h b/winsup/cygwin/local_includes/sec_posixacl.h
index 0f9e7bde3..0f9e7bde3 100644
--- a/winsup/cygwin/sec_posixacl.h
+++ b/winsup/cygwin/local_includes/sec_posixacl.h
diff --git a/winsup/cygwin/security.h b/winsup/cygwin/local_includes/security.h
index 41b4e275f..41b4e275f 100644
--- a/winsup/cygwin/security.h
+++ b/winsup/cygwin/local_includes/security.h
diff --git a/winsup/cygwin/select.h b/winsup/cygwin/local_includes/select.h
index b794690b6..b794690b6 100644
--- a/winsup/cygwin/select.h
+++ b/winsup/cygwin/local_includes/select.h
diff --git a/winsup/cygwin/shared_info.h b/winsup/cygwin/local_includes/shared_info.h
index 6c53ec0b8..6c53ec0b8 100644
--- a/winsup/cygwin/shared_info.h
+++ b/winsup/cygwin/local_includes/shared_info.h
diff --git a/winsup/cygwin/sigproc.h b/winsup/cygwin/local_includes/sigproc.h
index 7aca80595..7aca80595 100644
--- a/winsup/cygwin/sigproc.h
+++ b/winsup/cygwin/local_includes/sigproc.h
diff --git a/winsup/cygwin/spinlock.h b/winsup/cygwin/local_includes/spinlock.h
index d8ded1274..d8ded1274 100644
--- a/winsup/cygwin/spinlock.h
+++ b/winsup/cygwin/local_includes/spinlock.h
diff --git a/winsup/cygwin/string.h b/winsup/cygwin/local_includes/string.h
index ec9a030a0..ec9a030a0 100644
--- a/winsup/cygwin/string.h
+++ b/winsup/cygwin/local_includes/string.h
diff --git a/winsup/cygwin/sync.h b/winsup/cygwin/local_includes/sync.h
index d0b48782d..d0b48782d 100644
--- a/winsup/cygwin/sync.h
+++ b/winsup/cygwin/local_includes/sync.h
diff --git a/winsup/cygwin/thread.h b/winsup/cygwin/local_includes/thread.h
index 9939c4224..9939c4224 100644
--- a/winsup/cygwin/thread.h
+++ b/winsup/cygwin/local_includes/thread.h
diff --git a/winsup/cygwin/timerfd.h b/winsup/cygwin/local_includes/timerfd.h
index 80688e79e..80688e79e 100644
--- a/winsup/cygwin/timerfd.h
+++ b/winsup/cygwin/local_includes/timerfd.h
diff --git a/winsup/cygwin/tls_pbuf.h b/winsup/cygwin/local_includes/tls_pbuf.h
index f2cc3001c..f2cc3001c 100644
--- a/winsup/cygwin/tls_pbuf.h
+++ b/winsup/cygwin/local_includes/tls_pbuf.h
diff --git a/winsup/cygwin/tty.h b/winsup/cygwin/local_includes/tty.h
index 3d0ea0c68..3d0ea0c68 100644
--- a/winsup/cygwin/tty.h
+++ b/winsup/cygwin/local_includes/tty.h
diff --git a/winsup/cygwin/userinfo.h b/winsup/cygwin/local_includes/userinfo.h
index ba22f918a..ba22f918a 100644
--- a/winsup/cygwin/userinfo.h
+++ b/winsup/cygwin/local_includes/userinfo.h
diff --git a/winsup/cygwin/vstrlist.h b/winsup/cygwin/local_includes/vstrlist.h
index d5ad717c3..d5ad717c3 100644
--- a/winsup/cygwin/vstrlist.h
+++ b/winsup/cygwin/local_includes/vstrlist.h
diff --git a/winsup/cygwin/wchar.h b/winsup/cygwin/local_includes/wchar.h
index 0484b27d5..0484b27d5 100644
--- a/winsup/cygwin/wchar.h
+++ b/winsup/cygwin/local_includes/wchar.h
diff --git a/winsup/cygwin/wincap.h b/winsup/cygwin/local_includes/wincap.h
index 9fff12909..9fff12909 100644
--- a/winsup/cygwin/wincap.h
+++ b/winsup/cygwin/local_includes/wincap.h
diff --git a/winsup/cygwin/winf.h b/winsup/cygwin/local_includes/winf.h
index 651f78ba2..651f78ba2 100644
--- a/winsup/cygwin/winf.h
+++ b/winsup/cygwin/local_includes/winf.h
diff --git a/winsup/cygwin/wininfo.h b/winsup/cygwin/local_includes/wininfo.h
index 323d272a5..323d272a5 100644
--- a/winsup/cygwin/wininfo.h
+++ b/winsup/cygwin/local_includes/wininfo.h
diff --git a/winsup/cygwin/winlean.h b/winsup/cygwin/local_includes/winlean.h
index 9b30b6557..9b30b6557 100644
--- a/winsup/cygwin/winlean.h
+++ b/winsup/cygwin/local_includes/winlean.h
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/local_includes/winsup.h
index 43dfbf46f..43dfbf46f 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/local_includes/winsup.h
diff --git a/winsup/cygwin/analyze_sigfe b/winsup/cygwin/scripts/analyze_sigfe
index 8704eea48..8704eea48 100755
--- a/winsup/cygwin/analyze_sigfe
+++ b/winsup/cygwin/scripts/analyze_sigfe
diff --git a/winsup/cygwin/cygmagic b/winsup/cygwin/scripts/cygmagic
index eee4a3b73..eee4a3b73 100755
--- a/winsup/cygwin/cygmagic
+++ b/winsup/cygwin/scripts/cygmagic
diff --git a/winsup/cygwin/cygwin-shilka b/winsup/cygwin/scripts/cygwin-shilka
index 9abbf230f..9abbf230f 100755
--- a/winsup/cygwin/cygwin-shilka
+++ b/winsup/cygwin/scripts/cygwin-shilka
diff --git a/winsup/cygwin/gendef b/winsup/cygwin/scripts/gendef
index 3b1f8b9da..3b1f8b9da 100755
--- a/winsup/cygwin/gendef
+++ b/winsup/cygwin/scripts/gendef
diff --git a/winsup/cygwin/gendevices b/winsup/cygwin/scripts/gendevices
index be64a3090..be64a3090 100755
--- a/winsup/cygwin/gendevices
+++ b/winsup/cygwin/scripts/gendevices
diff --git a/winsup/cygwin/gentls_offsets b/winsup/cygwin/scripts/gentls_offsets
index 0adb702a3..0adb702a3 100755
--- a/winsup/cygwin/gentls_offsets
+++ b/winsup/cygwin/scripts/gentls_offsets
diff --git a/winsup/cygwin/mkglobals_h b/winsup/cygwin/scripts/mkglobals_h
index 2d185f2e8..2d185f2e8 100755
--- a/winsup/cygwin/mkglobals_h
+++ b/winsup/cygwin/scripts/mkglobals_h
diff --git a/winsup/cygwin/mkimport b/winsup/cygwin/scripts/mkimport
index 7684a8f0e..7684a8f0e 100755
--- a/winsup/cygwin/mkimport
+++ b/winsup/cygwin/scripts/mkimport
diff --git a/winsup/cygwin/mkvers.sh b/winsup/cygwin/scripts/mkvers.sh
index b2db73cc7..b2db73cc7 100755
--- a/winsup/cygwin/mkvers.sh
+++ b/winsup/cygwin/scripts/mkvers.sh
diff --git a/winsup/cygwin/sortdin b/winsup/cygwin/scripts/sortdin
index dafb329ff..dafb329ff 100755
--- a/winsup/cygwin/sortdin
+++ b/winsup/cygwin/scripts/sortdin
diff --git a/winsup/cygwin/speclib b/winsup/cygwin/scripts/speclib
index e6d4d8e94..e6d4d8e94 100755
--- a/winsup/cygwin/speclib
+++ b/winsup/cygwin/scripts/speclib
diff --git a/winsup/cygwin/update-copyright b/winsup/cygwin/scripts/update-copyright
index ad5eb2310..ad5eb2310 100755
--- a/winsup/cygwin/update-copyright
+++ b/winsup/cygwin/scripts/update-copyright
diff --git a/winsup/cygwin/sec_acl.cc b/winsup/cygwin/sec/acl.cc
index 03dbb8050..5c23e22b6 100644
--- a/winsup/cygwin/sec_acl.cc
+++ b/winsup/cygwin/sec/acl.cc
@@ -1,4 +1,4 @@
-/* sec_acl.cc: Solaris compatible ACL functions.
+/* sec/acl.cc: Solaris compatible ACL functions.
 
    Written by Corinna Vinschen <corinna@vinschen.de>
 
diff --git a/winsup/cygwin/sec_auth.cc b/winsup/cygwin/sec/auth.cc
index 8489a47a0..43b580389 100644
--- a/winsup/cygwin/sec_auth.cc
+++ b/winsup/cygwin/sec/auth.cc
@@ -1,4 +1,4 @@
-/* sec_auth.cc: NT authentication functions
+/* sec/auth.cc: NT authentication functions
 
 This file is part of Cygwin.
 
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/sec/base.cc
index 04e777852..dc85ca72a 100644
--- a/winsup/cygwin/security.cc
+++ b/winsup/cygwin/sec/base.cc
@@ -1,4 +1,4 @@
-/* security.cc: NT file access control functions
+/* sec/base.cc: NT file access control functions
 
    Originaly written by Gunther Ebert, gunther.ebert@ixos-leipzig.de
    Completely rewritten by Corinna Vinschen <corinna@vinschen.de>
diff --git a/winsup/cygwin/sec_helper.cc b/winsup/cygwin/sec/helper.cc
index fad3b3368..750631b2b 100644
--- a/winsup/cygwin/sec_helper.cc
+++ b/winsup/cygwin/sec/helper.cc
@@ -1,4 +1,4 @@
-/* sec_helper.cc: NT security helper functions
+/* sec/helper.cc: NT security helper functions
 
    Written by Corinna Vinschen <corinna@vinschen.de>
 
diff --git a/winsup/cygwin/sec_posixacl.cc b/winsup/cygwin/sec/posixacl.cc
index c2daa3309..6b01ded59 100644
--- a/winsup/cygwin/sec_posixacl.cc
+++ b/winsup/cygwin/sec/posixacl.cc
@@ -1,4 +1,4 @@
-/* sec_posixacl.cc: POSIX ACL functions based on Solaris ACLs.
+/* sec/posixacl.cc: POSIX ACL functions based on Solaris ACLs.
 
 This file is part of Cygwin.
 
diff --git a/winsup/utils/Makefile.am b/winsup/utils/Makefile.am
index e12dfdd00..6be5b12c2 100644
--- a/winsup/utils/Makefile.am
+++ b/winsup/utils/Makefile.am
@@ -83,7 +83,7 @@ ldd_LDADD = $(LDADD) -lpsapi -lntdll
 mount_CXXFLAGS = -DFSTAB_ONLY $(AM_CXXFLAGS)
 minidumper_LDADD = $(LDADD) -ldbghelp
 pldd_LDADD = $(LDADD) -lpsapi
-profiler_CXXFLAGS = -I$(srcdir) -idirafter ${top_srcdir}/cygwin -idirafter ${top_srcdir}/cygwin/include $(AM_CXXFLAGS)
+profiler_CXXFLAGS = -I$(srcdir) -idirafter ${top_srcdir}/cygwin/local_includes -idirafter ${top_srcdir}/cygwin/include $(AM_CXXFLAGS)
 profiler_LDADD = $(LDADD) -lntdll
 cygps_LDADD = $(LDADD) -lpsapi -lntdll
 
diff --git a/winsup/utils/mingw/Makefile.am b/winsup/utils/mingw/Makefile.am
index 46d821313..255fc4651 100644
--- a/winsup/utils/mingw/Makefile.am
+++ b/winsup/utils/mingw/Makefile.am
@@ -41,7 +41,7 @@ ldh_SOURCES = ldh.cc
 strace_SOURCES = \
 	path.cc \
 	strace.cc
-strace_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin -idirafter ${top_srcdir}/cygwin/include
+strace_CPPFLAGS=-I$(srcdir)/.. -idirafter ${top_srcdir}/cygwin/local_includes -idirafter ${top_srcdir}/cygwin/include
 strace_LDADD = -lntdll
 
 noinst_PROGRAMS = path-testsuite