diff --git a/mingw-w64-crt/ChangeLog b/mingw-w64-crt/ChangeLog
index 30c830b..55f3ba3 100644
--- a/mingw-w64-crt/ChangeLog
+++ b/mingw-w64-crt/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-17  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* Makefile.am: Add $(sysincludes) to all build rules' CPPGLAGS.
+	* Makefile.in: Regenerate.
+
 2011-11-15  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* lib64/kernel32.def (RegUnLoadKeyA): Comment out advapi32 export.
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 6f77aed..37c81dd 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -98,7 +98,7 @@
   libsrc/hlink-uuid.c       libsrc/mlang-uuid.c       libsrc/msctf-uuid.c      libsrc/mshtml-uuid.c     libsrc/msxml-uuid.c        \
   libsrc/netcon-uuid.c      libsrc/objidl-uuid.c      libsrc/oaidl-uuid.c      libsrc/objsafe-uuid.c    libsrc/ocidl-uuid.c        \
   libsrc/oleacc-uuid.c      libsrc/olectlid-uuid.c    libsrc/oleidl-uuid.c     libsrc/power-uuid.c      libsrc/servprov-uuid.c     \
-  libsrc/unknwn-uuid.c      libsrc/urlmon-uuid.c     libsrc/vds-uuid.c        libsrc/virtdisk-uuid.c     \
+  libsrc/unknwn-uuid.c      libsrc/urlmon-uuid.c      libsrc/vds-uuid.c        libsrc/virtdisk-uuid.c   \
   libsrc/wia-uuid.c         libsrc/powrprof-uuid.c    libsrc/usbcamdi-uuid.c   libsrc/usbiodef-uuid.c   libsrc/ntddkbd-uuid.c      \
   libsrc/ntddmou-uuid.c     libsrc/ntddpar-uuid.c     libsrc/ntddser-uuid.c    libsrc/ntddscsi-uuid.c   libsrc/ntddstor-uuid.c     \
   libsrc/ntddvdeo-uuid.c
@@ -180,8 +180,8 @@
   math/fmod.c         math/modf.c         \
   math/fmodl.c        math/fpclassify.c   math/fpclassifyf.c  math/fpclassifyl.c   math/fp_consts.c   math/fp_constsf.c  \
   math/fp_constsl.c   math/frexpf.c       math/fucom.c        math/hypotf.c        math/hypotl.c      math/isnan.c       \
-  math/isnanf.c       math/isnanl.c       math/ldexpf.c       math/ldexpl.c \
-  math/ldexp.c        math/lgamma.c      math/lgammaf.c     \
+  math/isnanf.c       math/isnanl.c       math/ldexpf.c       math/ldexpl.c        \
+  math/ldexp.c        math/lgamma.c       math/lgammaf.c      \
   math/lgammal.c      math/llrint.c       math/llrintf.c      math/llrintl.c       math/llround.c     math/llroundf.c    \
   math/llroundl.c     math/log10f.c       math/logb.c         math/logbf.c         math/logbl.c       math/logf.c        \
   math/log.c          math/logl.c         \
@@ -320,54 +320,54 @@
 
 lib32_LIBRARIES = lib32/libm.a
 nodist_lib32_libm_a_SOURCES = $(src_libm)
-lib32_libm_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libm_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libgmon.a
 lib32_libgmon_a_SOURCES = profile/mcount.c \
   profile/profil.h profile/profil.c        \
   profile/gmon.h   profile/gmon.c \
   profile/mcountFunc.S
-lib32_libgmon_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libgmon_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libshell32.a
 lib32_libshell32_a_SOURCES = $(src_libshell32)
 lib32_libshell32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-lib32_libshell32_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libshell32_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libdinput.a
 lib32_libdinput_a_SOURCES = $(src_libdinput)
 lib32_libdinput_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-lib32_libdinput_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libdinput_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libdinput8.a
 lib32_libdinput8_a_SOURCES = $(src_libdinput8)
 lib32_libdinput8_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-lib32_libdinput8_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libdinput8_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libdmoguids.a
 lib32_libdmoguids_a_SOURCES = $(src_libdmoguids)
-lib32_libdmoguids_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libdmoguids_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libdxerr8.a
 lib32_libdxerr8_a_SOURCES = $(src_libdxerr8)
-lib32_libdxerr8_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libdxerr8_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libdxerr9.a
 lib32_libdxerr9_a_SOURCES = $(src_libdxerr9)
-lib32_libdxerr9_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libdxerr9_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libdxguid.a
 lib32_libdxguid_a_SOURCES = $(src_libdxguid)
-lib32_libdxguid_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libdxguid_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libksuser.a
 lib32_libksuser_a_SOURCES = $(src_libksuser)
-lib32_libksuser_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libksuser_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 lib32_libksuser_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
 
 lib32_LIBRARIES += lib32/liblargeint.a
 lib32_liblargeint_a_SOURCES = $(src_liblargeint)
-lib32_liblargeint_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_liblargeint_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libmingw32.a
 lib32_libmingw32_a_CPPFLAGS=$(CPPFLAGS32) -D_SYSCRT=1 -DCRTDLL=1 $(extra_include) $(AM_CPPFLAGS)
@@ -384,28 +384,28 @@
 
 lib32_LIBRARIES += lib32/libscrnsave.a
 lib32_libscrnsave_a_SOURCES = $(src_libscrnsave)
-lib32_libscrnsave_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libscrnsave_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libscrnsavw.a
 lib32_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
-lib32_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 lib32_libscrnsavw_a_CFLAGS = -DUNICODE
 
 lib32_LIBRARIES += lib32/libstrmiids.a
 lib32_libstrmiids_a_SOURCES = $(src_libstrmiids)
-lib32_libstrmiids_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libstrmiids_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libmingwthrd.a
 lib32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
-lib32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libuuid.a
 lib32_libuuid_a_SOURCES = $(src_libuuid)
-lib32_libuuid_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libuuid_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 
 lib32_LIBRARIES += lib32/libws2_32.a
 lib32_libws2_32_a_SOURCES = $(src_libws2_32)
-lib32_libws2_32_a_CPPFLAGS=$(CPPFLAGS32)
+lib32_libws2_32_a_CPPFLAGS=$(CPPFLAGS32) $(sysincludes)
 lib32_libws2_32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
 
 lib32_LIBRARIES += lib32/libdelayimp.a
@@ -586,67 +586,67 @@
 
 lib64_LIBRARIES = lib64/libm.a
 nodist_lib64_libm_a_SOURCES = $(src_libm)
-lib64_libm_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libm_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libshell32.a
 lib64_libshell32_a_SOURCES = $(src_libshell32)
-lib64_libshell32_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libshell32_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 lib64_libshell32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 
 lib64_LIBRARIES += lib64/libdinput.a
 lib64_libdinput_a_SOURCES = $(src_libdinput)
-lib64_libdinput_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libdinput_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 lib64_libdinput_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 
 lib64_LIBRARIES += lib64/libdinput8.a
 lib64_libdinput8_a_SOURCES = $(src_libdinput8)
-lib64_libdinput8_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libdinput8_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 lib64_libdinput8_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 
 lib64_LIBRARIES += lib64/libdmoguids.a
 lib64_libdmoguids_a_SOURCES = $(src_libdmoguids)
-lib64_libdmoguids_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libdmoguids_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libdxerr8.a
 lib64_libdxerr8_a_SOURCES = $(src_libdxerr8)
-lib64_libdxerr8_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libdxerr8_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libdxerr9.a
 lib64_libdxerr9_a_SOURCES = $(src_libdxerr9)
-lib64_libdxerr9_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libdxerr9_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libdxguid.a
 lib64_libdxguid_a_SOURCES = $(src_libdxguid)
-lib64_libdxguid_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libdxguid_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libgmon.a
 lib64_libgmon_a_SOURCES = profile/mcount.c \
   profile/profil.h profile/profil.c        \
   profile/gmon.h   profile/gmon.c \
   profile/mcountFunc.S
-lib64_libgmon_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libgmon_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libksuser.a
 lib64_libksuser_a_SOURCES = $(src_libksuser)
-lib64_libksuser_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libksuser_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 lib64_libksuser_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 
 lib64_LIBRARIES += lib64/liblargeint.a
 lib64_liblargeint_a_SOURCES = $(src_liblargeint)
-lib64_liblargeint_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_liblargeint_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libscrnsave.a
 lib64_libscrnsave_a_SOURCES = $(src_libscrnsave)
-lib64_libscrnsave_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libscrnsave_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libscrnsavw.a
 lib64_libscrnsavw_a_SOURCES = libsrc/scrnsave.c
-lib64_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libscrnsavw_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 lib64_libscrnsavw_a_CFLAGS = -DUNICODE
 
 lib64_LIBRARIES += lib64/libstrmiids.a
 lib64_libstrmiids_a_SOURCES = $(src_libstrmiids)
-lib64_libstrmiids_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libstrmiids_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libmingw32.a
 lib64_libmingw32_a_CPPFLAGS=$(CPPFLAGS64) -D_SYSCRT=1 -DCRTDLL=1 $(extra_include) $(AM_CPPFLAGS)
@@ -663,15 +663,15 @@
 
 lib64_LIBRARIES += lib64/libmingwthrd.a
 lib64_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
-lib64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libmingwthrd_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libuuid.a
 lib64_libuuid_a_SOURCES = $(src_libuuid)
-lib64_libuuid_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libuuid_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 
 lib64_LIBRARIES += lib64/libws2_32.a
 lib64_libws2_32_a_SOURCES = $(src_libws2_32)
-lib64_libws2_32_a_CPPFLAGS=$(CPPFLAGS64)
+lib64_libws2_32_a_CPPFLAGS=$(CPPFLAGS64) $(sysincludes)
 lib64_libws2_32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 
 lib64_LIBRARIES += lib64/libdelayimp.a
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 1a744ef..858bdab 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -3209,7 +3209,7 @@
   libsrc/hlink-uuid.c       libsrc/mlang-uuid.c       libsrc/msctf-uuid.c      libsrc/mshtml-uuid.c     libsrc/msxml-uuid.c        \
   libsrc/netcon-uuid.c      libsrc/objidl-uuid.c      libsrc/oaidl-uuid.c      libsrc/objsafe-uuid.c    libsrc/ocidl-uuid.c        \
   libsrc/oleacc-uuid.c      libsrc/olectlid-uuid.c    libsrc/oleidl-uuid.c     libsrc/power-uuid.c      libsrc/servprov-uuid.c     \
-  libsrc/unknwn-uuid.c      libsrc/urlmon-uuid.c     libsrc/vds-uuid.c        libsrc/virtdisk-uuid.c     \
+  libsrc/unknwn-uuid.c      libsrc/urlmon-uuid.c      libsrc/vds-uuid.c        libsrc/virtdisk-uuid.c   \
   libsrc/wia-uuid.c         libsrc/powrprof-uuid.c    libsrc/usbcamdi-uuid.c   libsrc/usbiodef-uuid.c   libsrc/ntddkbd-uuid.c      \
   libsrc/ntddmou-uuid.c     libsrc/ntddpar-uuid.c     libsrc/ntddser-uuid.c    libsrc/ntddscsi-uuid.c   libsrc/ntddstor-uuid.c     \
   libsrc/ntddvdeo-uuid.c
@@ -3291,8 +3291,8 @@
   math/fmod.c         math/modf.c         \
   math/fmodl.c        math/fpclassify.c   math/fpclassifyf.c  math/fpclassifyl.c   math/fp_consts.c   math/fp_constsf.c  \
   math/fp_constsl.c   math/frexpf.c       math/fucom.c        math/hypotf.c        math/hypotl.c      math/isnan.c       \
-  math/isnanf.c       math/isnanl.c       math/ldexpf.c       math/ldexpl.c \
-  math/ldexp.c        math/lgamma.c      math/lgammaf.c     \
+  math/isnanf.c       math/isnanl.c       math/ldexpf.c       math/ldexpl.c        \
+  math/ldexp.c        math/lgamma.c       math/lgammaf.c      \
   math/lgammal.c      math/llrint.c       math/llrintf.c      math/llrintl.c       math/llround.c     math/llroundf.c    \
   math/llroundl.c     math/log10f.c       math/logb.c         math/logbf.c         math/logbl.c       math/logf.c        \
   math/log.c          math/logl.c         \
@@ -3417,35 +3417,35 @@
 @LIB32_TRUE@	lib32/libuuid.a lib32/libws2_32.a \
 @LIB32_TRUE@	lib32/libdelayimp.a
 @LIB32_TRUE@nodist_lib32_libm_a_SOURCES = $(src_libm)
-@LIB32_TRUE@lib32_libm_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libm_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libgmon_a_SOURCES = profile/mcount.c \
 @LIB32_TRUE@  profile/profil.h profile/profil.c        \
 @LIB32_TRUE@  profile/gmon.h   profile/gmon.c \
 @LIB32_TRUE@  profile/mcountFunc.S
 
-@LIB32_TRUE@lib32_libgmon_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libgmon_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libshell32_a_SOURCES = $(src_libshell32)
 @LIB32_TRUE@lib32_libshell32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-@LIB32_TRUE@lib32_libshell32_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libshell32_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libdinput_a_SOURCES = $(src_libdinput)
 @LIB32_TRUE@lib32_libdinput_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-@LIB32_TRUE@lib32_libdinput_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libdinput_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libdinput8_a_SOURCES = $(src_libdinput8)
 @LIB32_TRUE@lib32_libdinput8_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
-@LIB32_TRUE@lib32_libdinput8_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libdinput8_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libdmoguids_a_SOURCES = $(src_libdmoguids)
-@LIB32_TRUE@lib32_libdmoguids_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libdmoguids_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libdxerr8_a_SOURCES = $(src_libdxerr8)
-@LIB32_TRUE@lib32_libdxerr8_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libdxerr8_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libdxerr9_a_SOURCES = $(src_libdxerr9)
-@LIB32_TRUE@lib32_libdxerr9_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libdxerr9_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libdxguid_a_SOURCES = $(src_libdxguid)
-@LIB32_TRUE@lib32_libdxguid_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libdxguid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libksuser_a_SOURCES = $(src_libksuser)
-@LIB32_TRUE@lib32_libksuser_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libksuser_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libksuser_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
 @LIB32_TRUE@lib32_liblargeint_a_SOURCES = $(src_liblargeint)
-@LIB32_TRUE@lib32_liblargeint_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_liblargeint_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libmingw32_a_CPPFLAGS = $(CPPFLAGS32) -D_SYSCRT=1 -DCRTDLL=1 $(extra_include) $(AM_CPPFLAGS)
 @LIB32_TRUE@lib32_libmingw32_a_SOURCES = $(src_libmingw32)
 @LIB32_TRUE@lib32_libmingwex_a_CPPFLAGS = $(CPPFLAGS32) $(extra_include) $(AM_CPPFLAGS)
@@ -3454,18 +3454,18 @@
 @LIB32_TRUE@lib32_libmoldname_a_SOURCES = $(src_libmoldname)
 @LIB32_TRUE@lib32_libmoldname_a_AR = $(DTDEF32) $(top_srcdir)/lib32/moldname-msvcrt.def -U --dllname msvcrt.dll && $(AR) $(ARFLAGS)
 @LIB32_TRUE@lib32_libscrnsave_a_SOURCES = $(src_libscrnsave)
-@LIB32_TRUE@lib32_libscrnsave_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libscrnsave_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libscrnsavw_a_SOURCES = $(src_libscrnsavw)
-@LIB32_TRUE@lib32_libscrnsavw_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libscrnsavw_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libscrnsavw_a_CFLAGS = -DUNICODE
 @LIB32_TRUE@lib32_libstrmiids_a_SOURCES = $(src_libstrmiids)
-@LIB32_TRUE@lib32_libstrmiids_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libstrmiids_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
-@LIB32_TRUE@lib32_libmingwthrd_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libmingwthrd_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libuuid_a_SOURCES = $(src_libuuid)
-@LIB32_TRUE@lib32_libuuid_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libuuid_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libws2_32_a_SOURCES = $(src_libws2_32)
-@LIB32_TRUE@lib32_libws2_32_a_CPPFLAGS = $(CPPFLAGS32)
+@LIB32_TRUE@lib32_libws2_32_a_CPPFLAGS = $(CPPFLAGS32) $(sysincludes)
 @LIB32_TRUE@lib32_libws2_32_a_AR = $(DTLIB32) && $(AR) $(ARFLAGS)
 @LIB32_TRUE@lib32_libdelayimp_a_SOURCES = 
 
@@ -3588,42 +3588,42 @@
 @LIB64_TRUE@	lib64/libuuid.a lib64/libws2_32.a \
 @LIB64_TRUE@	lib64/libdelayimp.a
 @LIB64_TRUE@nodist_lib64_libm_a_SOURCES = $(src_libm)
-@LIB64_TRUE@lib64_libm_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libm_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libshell32_a_SOURCES = $(src_libshell32)
-@LIB64_TRUE@lib64_libshell32_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libshell32_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libshell32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 @LIB64_TRUE@lib64_libdinput_a_SOURCES = $(src_libdinput)
-@LIB64_TRUE@lib64_libdinput_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libdinput_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libdinput_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 @LIB64_TRUE@lib64_libdinput8_a_SOURCES = $(src_libdinput8)
-@LIB64_TRUE@lib64_libdinput8_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libdinput8_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libdinput8_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 @LIB64_TRUE@lib64_libdmoguids_a_SOURCES = $(src_libdmoguids)
-@LIB64_TRUE@lib64_libdmoguids_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libdmoguids_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libdxerr8_a_SOURCES = $(src_libdxerr8)
-@LIB64_TRUE@lib64_libdxerr8_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libdxerr8_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libdxerr9_a_SOURCES = $(src_libdxerr9)
-@LIB64_TRUE@lib64_libdxerr9_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libdxerr9_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libdxguid_a_SOURCES = $(src_libdxguid)
-@LIB64_TRUE@lib64_libdxguid_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libdxguid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libgmon_a_SOURCES = profile/mcount.c \
 @LIB64_TRUE@  profile/profil.h profile/profil.c        \
 @LIB64_TRUE@  profile/gmon.h   profile/gmon.c \
 @LIB64_TRUE@  profile/mcountFunc.S
 
-@LIB64_TRUE@lib64_libgmon_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libgmon_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libksuser_a_SOURCES = $(src_libksuser)
-@LIB64_TRUE@lib64_libksuser_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libksuser_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libksuser_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 @LIB64_TRUE@lib64_liblargeint_a_SOURCES = $(src_liblargeint)
-@LIB64_TRUE@lib64_liblargeint_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_liblargeint_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libscrnsave_a_SOURCES = $(src_libscrnsave)
-@LIB64_TRUE@lib64_libscrnsave_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libscrnsave_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libscrnsavw_a_SOURCES = libsrc/scrnsave.c
-@LIB64_TRUE@lib64_libscrnsavw_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libscrnsavw_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libscrnsavw_a_CFLAGS = -DUNICODE
 @LIB64_TRUE@lib64_libstrmiids_a_SOURCES = $(src_libstrmiids)
-@LIB64_TRUE@lib64_libstrmiids_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libstrmiids_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libmingw32_a_CPPFLAGS = $(CPPFLAGS64) -D_SYSCRT=1 -DCRTDLL=1 $(extra_include) $(AM_CPPFLAGS)
 @LIB64_TRUE@lib64_libmingw32_a_SOURCES = $(src_libmingw32)
 @LIB64_TRUE@lib64_libmingwex_a_CPPFLAGS = $(CPPFLAGS64) $(extra_include) $(AM_CPPFLAGS)
@@ -3632,11 +3632,11 @@
 @LIB64_TRUE@lib64_libmoldname_a_SOURCES = $(src_libmoldname)
 @LIB64_TRUE@lib64_libmoldname_a_AR = $(DTDEF64) $(top_srcdir)/lib64/moldname-msvcrt.def -U --dllname msvcrt.dll && $(AR) $(ARFLAGS)
 @LIB64_TRUE@lib64_libmingwthrd_a_SOURCES = $(src_libmingwthrd)
-@LIB64_TRUE@lib64_libmingwthrd_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libmingwthrd_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libuuid_a_SOURCES = $(src_libuuid)
-@LIB64_TRUE@lib64_libuuid_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libuuid_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libws2_32_a_SOURCES = $(src_libws2_32)
-@LIB64_TRUE@lib64_libws2_32_a_CPPFLAGS = $(CPPFLAGS64)
+@LIB64_TRUE@lib64_libws2_32_a_CPPFLAGS = $(CPPFLAGS64) $(sysincludes)
 @LIB64_TRUE@lib64_libws2_32_a_AR = $(DTLIB64) && $(AR) $(ARFLAGS)
 @LIB64_TRUE@lib64_libdelayimp_a_SOURCES = 
 @LIB64_TRUE@lib64_DATA = \