diff --git a/SystemTools.cxx b/SystemTools.cxx
index 96cde13b3e38e4f2bfa3d5d39674d0bced40a802..fc433e3cfb89b279401b49f59d8de7b223230e2c 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -64,9 +64,12 @@
 #include <signal.h>    /* sigprocmask */
 #endif
 
-// Windows API.  Some parts used even on cygwin.
-#if defined(_WIN32) || defined (__CYGWIN__)
+// Windows API.
+#if defined(_WIN32)
+# include <windows.h>
+#elif defined (__CYGWIN__)
 # include <windows.h>
+# undef _WIN32
 #endif
 
 #ifdef __CYGWIN__
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 2c7f6644e4785cd9040c6ac8dbbeac4d9434bf54..b067929de527cd6d869802d9fbee63d87b476e6f 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2009)
 SET(KWSYS_DATE_STAMP_MONTH 09)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   23)
+SET(KWSYS_DATE_STAMP_DAY   24)