8 files changed, 18 insertions, 42 deletions
diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml
index 192ac8a4110..977bd92d5e0 100644
--- a/build/sysincl/misc.yml
+++ b/build/sysincl/misc.yml
@@ -45,8 +45,7 @@
     - complex.h:     contrib/libs/libm/include/complex.h
     - math.h:        contrib/libs/libm/include/math.h
 
-# Some more sysincl/addincl clashes.
-- source_filter: "^contrib/tools/bison/(bison|gnulib|m4)/src"
+- source_filter: "^contrib/tools/bison/"
   includes:
     - error.h:       contrib/tools/bison/gnulib/src/error.h
     - fcntl.h:       contrib/tools/bison/gnulib/platform/posix/fcntl.h
@@ -55,6 +54,13 @@
     - regex.h:       contrib/tools/bison/gnulib/src/regex.h
     - system.h
     - unlocked-io.h: contrib/tools/bison/gnulib/src/unlocked-io.h
+    # ucrt headers are included by bison/gnulib in a very specific way
+    - ../ucrt/fcntl.h
+    - ../ucrt/locale.h
+    - ../ucrt/math.h
+    - ../ucrt/signal.h
+    - ../ucrt/sys/stat.h
+
 - source_filter: "^contrib/tools/make"
   includes:
     - fnmatch.h:     contrib/tools/make/glob/fnmatch.h
diff --git a/build/sysincl/unsorted.yml b/build/sysincl/unsorted.yml
index 3d3da1c400d..b2c6f06fba2 100644
--- a/build/sysincl/unsorted.yml
+++ b/build/sysincl/unsorted.yml
@@ -139,8 +139,6 @@
   #if CONTRIB && defined(_HAVE_LIBIDSA)
   - idsa.h
   #endif
-  - ../../VC/include/math.h
-  - ../../VC/include/cfloat
   - prof.h
   - ll_alloc_hook.c
   - cpptl/config.h
@@ -164,16 +162,6 @@
   - vasprintf.h
   #endif
 
-- case_sensitive: false
-  includes:
-  #if defined(WINDOWS) && CONTRIB && TRASH
-  - ../include/locale.h
-  - ../include/signal.h
-  - ../include/sys/stat.h
-  - ../include/fcntl.h
-  - ../include/math.h
-  #endif
-
 - source_filter: "^contrib/(libs/(apache|httpd|libuv)|python/uWSGI)"
   includes:
   - port.h
@@ -318,11 +306,6 @@
   #if defined(HAVE_ALTIVEC)
   - altivec.h
   #endif
-  #if defined(_LIBC) && TRASH
-  - ../locale/localeinfo.h
-  - ../locale/elem-hash.h
-  - ../locale/coll-lookup.h
-  #endif
   #if defined(HAVE_CONFIG_H) && TODO
   - config_auto.h
   #endif
@@ -362,11 +345,6 @@
   - sys/videoio.h
   - libv4l2.h
   - soundcard.h
-  - ../ucrt/fcntl.h
-  - ../ucrt/locale.h
-  - ../ucrt/math.h
-  - ../ucrt/signal.h
-  - ../ucrt/sys/stat.h
   - asm/page.h
   - asm/sgidefs.h
   - ndir.h
@@ -451,12 +429,6 @@
 # These includes are not used in autocheck builds, but might be necessary for
 # some external builds with exotic settings
 
-- case_sensitive: false
-  includes:
-  #if defined(WINDOWS) && CONTRIB && TRASH
-  - ../include/stdint.h
-  #endif
-
 - source_filter: ".*contrib.*"
   includes:
   #if defined (__OpenBSD__) && CONTRIB
@@ -540,8 +512,6 @@
   - win32thread.h
   - bsd/ctypes.h
   - sfio.h
-  - ../../VC/include/stdio.h
-  - ../ucrt/stdio.h
   - GL/glx.h
   - CL/va_ext.h
   - sys/sysconf.h
diff --git a/contrib/tools/bison/gnulib/platform/win64/fcntl.h b/contrib/tools/bison/gnulib/platform/win64/fcntl.h
index dd3a1e52084..0637e64b9f1 100644
--- a/contrib/tools/bison/gnulib/platform/win64/fcntl.h
+++ b/contrib/tools/bison/gnulib/platform/win64/fcntl.h
@@ -41,7 +41,7 @@
 #if _MSC_VER >= 1900
 #include <../ucrt/fcntl.h>
 #else
-#include <../include/fcntl.h>
+#error #include <../include/fcntl.h>
 #endif
 
 #else
@@ -65,7 +65,7 @@
 #if _MSC_VER >= 1900
 #include <../ucrt/fcntl.h>
 #else
-#include <../include/fcntl.h>
+#error #include <../include/fcntl.h>
 #endif
 
 #ifndef _GL_M4_FCNTL_H
diff --git a/contrib/tools/bison/gnulib/platform/win64/locale.h b/contrib/tools/bison/gnulib/platform/win64/locale.h
index ddebf413d2a..cd77270e4dd 100644
--- a/contrib/tools/bison/gnulib/platform/win64/locale.h
+++ b/contrib/tools/bison/gnulib/platform/win64/locale.h
@@ -28,7 +28,7 @@
 #if _MSC_VER >= 1900
 #include <../ucrt/locale.h>
 #else
-#include <../include/locale.h>
+#error #include <../include/locale.h>
 #endif
 
 #else
@@ -42,7 +42,7 @@
 #if _MSC_VER >= 1900
 #include <../ucrt/locale.h>
 #else
-#include <../include/locale.h>
+#error #include <../include/locale.h>
 #endif
 
 #undef _GL_ALREADY_INCLUDING_LOCALE_H
diff --git a/contrib/tools/bison/gnulib/platform/win64/math.h b/contrib/tools/bison/gnulib/platform/win64/math.h
index b2a0023d119..072a0fbd239 100644
--- a/contrib/tools/bison/gnulib/platform/win64/math.h
+++ b/contrib/tools/bison/gnulib/platform/win64/math.h
@@ -27,7 +27,7 @@
 #if _MSC_VER >= 1900
 #include <../ucrt/math.h>
 #else
-#include <../include/math.h>
+#error #include <../include/math.h>
 #endif
 
 #ifndef _GL_M4_MATH_H
diff --git a/contrib/tools/bison/gnulib/platform/win64/signal.h b/contrib/tools/bison/gnulib/platform/win64/signal.h
index 11f3a81cf57..be8043dfa74 100644
--- a/contrib/tools/bison/gnulib/platform/win64/signal.h
+++ b/contrib/tools/bison/gnulib/platform/win64/signal.h
@@ -36,7 +36,7 @@
 #if _MSC_VER >= 1900
 #include <../ucrt/signal.h>
 #else
-#include <../include/signal.h>
+#error #include <../include/signal.h>
 #endif
 
 #else
@@ -56,7 +56,7 @@
 #if _MSC_VER >= 1900
 #include <../ucrt/signal.h>
 #else
-#include <../include/signal.h>
+#error #include <../include/signal.h>
 #endif
 
 #undef _GL_ALREADY_INCLUDING_SIGNAL_H
diff --git a/contrib/tools/bison/gnulib/platform/win64/sys/stat.h b/contrib/tools/bison/gnulib/platform/win64/sys/stat.h
index 429d3886dc2..bf7dc29f6e5 100644
--- a/contrib/tools/bison/gnulib/platform/win64/sys/stat.h
+++ b/contrib/tools/bison/gnulib/platform/win64/sys/stat.h
@@ -32,7 +32,7 @@
 #if _MSC_VER >= 1900
 #include <../ucrt/sys/stat.h>
 #else
-#include <../include/sys/stat.h>
+#error #include <../include/sys/stat.h>
 #endif
 
 #else
@@ -51,7 +51,7 @@
 #if _MSC_VER >= 1900
 #include <../ucrt/sys/stat.h>
 #else
-#include <../include/sys/stat.h>
+#error #include <../include/sys/stat.h>
 #endif
 
 #ifndef _GL_M4_SYS_STAT_H
diff --git a/contrib/tools/bison/gnulib/src/regex.c b/contrib/tools/bison/gnulib/src/regex.c
index 5a0332e0030..85091669c70 100644
--- a/contrib/tools/bison/gnulib/src/regex.c
+++ b/contrib/tools/bison/gnulib/src/regex.c
@@ -56,7 +56,7 @@
 	__re_search_2 (bufp, st1, s1, st2, s2, startpos, range, regs, stop)
 # define re_compile_fastmap(bufp) __re_compile_fastmap (bufp)
 
-# include "../locale/localeinfo.h"
+# error #include "../locale/localeinfo.h"
 #endif
 
 /* On some systems, limits.h sets RE_DUP_MAX to a lower value than