diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index da0de49..fda3a59 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-31  Corinna Vinschen  <vinschen@redhat.com>
+
+	* windows.h: Don't include stralign.h when build for Cygwin.
+
 2012-07-30  Corinna Vinschen  <vinschen@redhat.com>
 
 	* psdk_inc/_ip_types.h (struct __ms_timeval): Define on LP64 systems.
diff --git a/mingw-w64-headers/include/windows.h b/mingw-w64-headers/include/windows.h
index d486e60..d506d34 100644
--- a/mingw-w64-headers/include/windows.h
+++ b/mingw-w64-headers/include/windows.h
@@ -110,7 +110,9 @@
 #endif
 #endif
 
+#ifndef __CYGWIN__
 #include <stralign.h>
+#endif
 
 #ifdef INC_OLE2
 #include <ole2.h>