diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index bdd8bec..154f88d 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,16 @@
+2011-09-26  Ozkan Sezer  <sezeroz@gmail.com>
+
+	* sdkddkver.h: Whitespace tidy-up.  Add our standart license header.
+	(_WIN32_WINNT): Define default value as _WIN32_WINNT_WS03, i.e. 0x0502,
+	which is what we had been defining in windows.h until this day.
+	(NTDDI_VERSION): Define default value as NTDDI_WS03, i.e. 0x05020000,
+	matching what we had been defining in windows.h until this day.
+	(WINVER): Define default value as 0x0502, which is what we had been
+	defining in windows.h until this day.
+	* winnt.h: Include sdkddkver.h.
+	* windows.h: Include sdkddkver.h.
+	(WINVER): Now that we include sdkddkver.h, remove the extra definition.
+
 2011-09-16  Ozkan Sezer  <sezeroz@gmail.com>
 
 	* ks.h (KSPROPSETID_MemoryTransport): New.
diff --git a/mingw-w64-headers/include/sdkddkver.h b/mingw-w64-headers/include/sdkddkver.h
index 80ed6be..71bb0b7 100644
--- a/mingw-w64-headers/include/sdkddkver.h
+++ b/mingw-w64-headers/include/sdkddkver.h
@@ -1,138 +1,139 @@
-/* ReactOS PSDK/DDK
-
-This file is in the public domain.
-
-Header Name:
-
-    sdkddkver.h
-
-Abstract:
-
-    Version definitions for SDK and DDK.
-
---*/
+/**
+ * sdkddkver.h: Version definitions for SDK and DDK. Originally
+ * from ReactOS PSDK/DDK, this file is in the public domain:
+ *
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the w64 mingw-runtime package.
+ * No warranty is given; refer to the file DISCLAIMER.PD within this package.
+ */
 
 #ifndef _INC_SDKDDKVER
 #define _INC_SDKDDKVER
 
 /* _WIN32_WINNT */
-#define _WIN32_WINNT_NT4                    0x0400
-#define _WIN32_WINNT_WIN2K                  0x0500
-#define _WIN32_WINNT_WINXP                  0x0501
-#define _WIN32_WINNT_WS03                   0x0502
-#define _WIN32_WINNT_WIN6                   0x0600
-#define _WIN32_WINNT_VISTA                  0x0600
-#define _WIN32_WINNT_WS08                   0x0600
-#define _WIN32_WINNT_LONGHORN               0x0600
-#define _WIN32_WINNT_WIN7                   0x0601
+#define _WIN32_WINNT_NT4		0x0400
+#define _WIN32_WINNT_WIN2K		0x0500
+#define _WIN32_WINNT_WINXP		0x0501
+#define _WIN32_WINNT_WS03		0x0502
+#define _WIN32_WINNT_WIN6		0x0600
+#define _WIN32_WINNT_VISTA		0x0600
+#define _WIN32_WINNT_WS08		0x0600
+#define _WIN32_WINNT_LONGHORN		0x0600
+#define _WIN32_WINNT_WIN7		0x0601
 
 /* _WIN32_IE */
-#define _WIN32_IE_IE20                      0x0200
-#define _WIN32_IE_IE30                      0x0300
-#define _WIN32_IE_IE302                     0x0302
-#define _WIN32_IE_IE40                      0x0400
-#define _WIN32_IE_IE401                     0x0401
-#define _WIN32_IE_IE50                      0x0500
-#define _WIN32_IE_IE501                     0x0501
-#define _WIN32_IE_IE55                      0x0550
-#define _WIN32_IE_IE60                      0x0600
-#define _WIN32_IE_IE60SP1                   0x0601
-#define _WIN32_IE_IE60SP2                   0x0603
-#define _WIN32_IE_IE70                      0x0700
-#define _WIN32_IE_IE80                      0x0800
+#define _WIN32_IE_IE20			0x0200
+#define _WIN32_IE_IE30			0x0300
+#define _WIN32_IE_IE302			0x0302
+#define _WIN32_IE_IE40			0x0400
+#define _WIN32_IE_IE401			0x0401
+#define _WIN32_IE_IE50			0x0500
+#define _WIN32_IE_IE501			0x0501
+#define _WIN32_IE_IE55			0x0550
+#define _WIN32_IE_IE60			0x0600
+#define _WIN32_IE_IE60SP1		0x0601
+#define _WIN32_IE_IE60SP2		0x0603
+#define _WIN32_IE_IE70			0x0700
+#define _WIN32_IE_IE80			0x0800
 
 /* Mappings Between IE Version  and Windows Version */
-#define _WIN32_IE_NT4                       _WIN32_IE_IE20
-#define _WIN32_IE_NT4SP1                    _WIN32_IE_IE20
-#define _WIN32_IE_NT4SP2                    _WIN32_IE_IE20
-#define _WIN32_IE_NT4SP3                    _WIN32_IE_IE302
-#define _WIN32_IE_NT4SP4                    _WIN32_IE_IE401
-#define _WIN32_IE_NT4SP5                    _WIN32_IE_IE401
-#define _WIN32_IE_NT4SP6                    _WIN32_IE_IE50
-#define _WIN32_IE_WIN98                     _WIN32_IE_IE401
-#define _WIN32_IE_WIN98SE                   _WIN32_IE_IE50
-#define _WIN32_IE_WINME                     _WIN32_IE_IE55
-#define _WIN32_IE_WIN2K                     _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP1                  _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP2                  _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP3                  _WIN32_IE_IE501
-#define _WIN32_IE_WIN2KSP4                  _WIN32_IE_IE501
-#define _WIN32_IE_XP                        _WIN32_IE_IE60
-#define _WIN32_IE_XPSP1                     _WIN32_IE_IE60SP1
-#define _WIN32_IE_XPSP2                     _WIN32_IE_IE60SP2
-#define _WIN32_IE_WS03                      0x0602
-#define _WIN32_IE_WS03SP1                   _WIN32_IE_IE60SP2
-#define _WIN32_IE_WIN6                      _WIN32_IE_IE70
-#define _WIN32_IE_LONGHORN                  _WIN32_IE_IE70
-#define _WIN32_IE_WIN7                      _WIN32_IE_IE80
+#define _WIN32_IE_NT4			_WIN32_IE_IE20
+#define _WIN32_IE_NT4SP1		_WIN32_IE_IE20
+#define _WIN32_IE_NT4SP2		_WIN32_IE_IE20
+#define _WIN32_IE_NT4SP3		_WIN32_IE_IE302
+#define _WIN32_IE_NT4SP4		_WIN32_IE_IE401
+#define _WIN32_IE_NT4SP5		_WIN32_IE_IE401
+#define _WIN32_IE_NT4SP6		_WIN32_IE_IE50
+#define _WIN32_IE_WIN98			_WIN32_IE_IE401
+#define _WIN32_IE_WIN98SE		_WIN32_IE_IE50
+#define _WIN32_IE_WINME			_WIN32_IE_IE55
+#define _WIN32_IE_WIN2K			_WIN32_IE_IE501
+#define _WIN32_IE_WIN2KSP1		_WIN32_IE_IE501
+#define _WIN32_IE_WIN2KSP2		_WIN32_IE_IE501
+#define _WIN32_IE_WIN2KSP3		_WIN32_IE_IE501
+#define _WIN32_IE_WIN2KSP4		_WIN32_IE_IE501
+#define _WIN32_IE_XP			_WIN32_IE_IE60
+#define _WIN32_IE_XPSP1			_WIN32_IE_IE60SP1
+#define _WIN32_IE_XPSP2			_WIN32_IE_IE60SP2
+#define _WIN32_IE_WS03			0x0602
+#define _WIN32_IE_WS03SP1		_WIN32_IE_IE60SP2
+#define _WIN32_IE_WIN6			_WIN32_IE_IE70
+#define _WIN32_IE_LONGHORN		_WIN32_IE_IE70
+#define _WIN32_IE_WIN7			_WIN32_IE_IE80
 
 /* NTDDI_VERSION */
-#define NTDDI_WIN2K                         0x05000000
-#define NTDDI_WIN2KSP1                      0x05000100
-#define NTDDI_WIN2KSP2                      0x05000200
-#define NTDDI_WIN2KSP3                      0x05000300
-#define NTDDI_WIN2KSP4                      0x05000400
-#define NTDDI_WINXP                         0x05010000
-#define NTDDI_WINXPSP1                      0x05010100
-#define NTDDI_WINXPSP2                      0x05010200
-#define NTDDI_WINXPSP3                      0x05010300
-#define NTDDI_WINXPSP4                      0x05010400
-#define NTDDI_WS03                          0x05020000
-#define NTDDI_WS03SP1                       0x05020100
-#define NTDDI_WS03SP2                       0x05020200
-#define NTDDI_WS03SP3                       0x05020300
-#define NTDDI_WS03SP4                       0x05020400
-#define NTDDI_WIN6                          0x06000000
-#define NTDDI_WIN6SP1                       0x06000100
-#define NTDDI_WIN6SP2                       0x06000200
-#define NTDDI_WIN6SP3                       0x06000300
-#define NTDDI_WIN6SP4                       0x06000400
-#define NTDDI_LONGHORN                      NTDDI_WIN6
-#define NTDDI_VISTA                         NTDDI_WIN6
-#define NTDDI_VISTASP1                      NTDDI_WIN6SP1
-#define NTDDI_VISTASP2                      NTDDI_WIN6SP2
-#define NTDDI_VISTASP3                      NTDDI_WIN6SP3
-#define NTDDI_VISTASP4                      NTDDI_WIN6SP4
-#define NTDDI_WS08                          NTDDI_WIN6SP1
-#define NTDDI_WS08SP2                       NTDDI_WIN6SP2
-#define NTDDI_WS08SP3                       NTDDI_WIN6SP3
-#define NTDDI_WS08SP4                       NTDDI_WIN6SP4
-#define NTDDI_WIN7                          0x06010000
+#define NTDDI_WIN2K			0x05000000
+#define NTDDI_WIN2KSP1			0x05000100
+#define NTDDI_WIN2KSP2			0x05000200
+#define NTDDI_WIN2KSP3			0x05000300
+#define NTDDI_WIN2KSP4			0x05000400
+
+#define NTDDI_WINXP			0x05010000
+#define NTDDI_WINXPSP1			0x05010100
+#define NTDDI_WINXPSP2			0x05010200
+#define NTDDI_WINXPSP3			0x05010300
+#define NTDDI_WINXPSP4			0x05010400
+
+#define NTDDI_WS03			0x05020000
+#define NTDDI_WS03SP1			0x05020100
+#define NTDDI_WS03SP2			0x05020200
+#define NTDDI_WS03SP3			0x05020300
+#define NTDDI_WS03SP4			0x05020400
+
+#define NTDDI_WIN6			0x06000000
+#define NTDDI_WIN6SP1			0x06000100
+#define NTDDI_WIN6SP2			0x06000200
+#define NTDDI_WIN6SP3			0x06000300
+#define NTDDI_WIN6SP4			0x06000400
+
+#define NTDDI_VISTA			NTDDI_WIN6
+#define NTDDI_VISTASP1			NTDDI_WIN6SP1
+#define NTDDI_VISTASP2			NTDDI_WIN6SP2
+#define NTDDI_VISTASP3			NTDDI_WIN6SP3
+#define NTDDI_VISTASP4			NTDDI_WIN6SP4
+#define NTDDI_LONGHORN			NTDDI_VISTA
+
+#define NTDDI_WS08			NTDDI_WIN6SP1
+#define NTDDI_WS08SP2			NTDDI_WIN6SP2
+#define NTDDI_WS08SP3			NTDDI_WIN6SP3
+#define NTDDI_WS08SP4			NTDDI_WIN6SP4
+
+#define NTDDI_WIN7			0x06010000
 
 /* Version Fields in NTDDI_VERSION */
-#define OSVERSION_MASK                      0xFFFF0000
-#define SPVERSION_MASK                      0x0000FF00
-#define SUBVERSION_MASK                     0x000000FF
+#define OSVERSION_MASK			0xFFFF0000
+#define SPVERSION_MASK			0x0000FF00
+#define SUBVERSION_MASK			0x000000FF
 
 /* Macros to Extract Version Fields From NTDDI_VERSION */
-#define OSVER(Version)                      ((Version) & OSVERSION_MASK)
-#define SPVER(Version)                      (((Version) & SPVERSION_MASK) >> 8)
-#define SUBVER(Version)                     (((Version) & SUBVERSION_MASK))
+#define OSVER(Version)			((Version) & OSVERSION_MASK)
+#define SPVER(Version)			(((Version) & SPVERSION_MASK) >> 8)
+#define SUBVER(Version)			(((Version) & SUBVERSION_MASK))
 
 /* Macros to get the NTDDI for a given WIN32 */
-#define NTDDI_VERSION_FROM_WIN32_WINNT2(Version) Version##0000
-#define NTDDI_VERSION_FROM_WIN32_WINNT(Version)  NTDDI_VERSION_FROM_WIN32_WINNT2(Version)
+#define NTDDI_VERSION_FROM_WIN32_WINNT2(Version)	Version##0000
+#define NTDDI_VERSION_FROM_WIN32_WINNT(Version)		NTDDI_VERSION_FROM_WIN32_WINNT2(Version)
 
 /* Select Default WIN32_WINNT Value */
 #if !defined(_WIN32_WINNT) && !defined(_CHICAGO_)
-#define _WIN32_WINNT    0x0600
+#define _WIN32_WINNT	_WIN32_WINNT_WS03
 #endif
 
 /* Choose NTDDI Version */
 #ifndef NTDDI_VERSION
 #ifdef _WIN32_WINNT
-#define NTDDI_VERSION   NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT)
+#define NTDDI_VERSION	NTDDI_VERSION_FROM_WIN32_WINNT(_WIN32_WINNT)
 #else
-#define NTDDI_VERSION   0x06000000
+#define NTDDI_VERSION	NTDDI_WS03
 #endif
 #endif
 
 /* Choose WINVER Value */
 #ifndef WINVER
 #ifdef _WIN32_WINNT
-#define WINVER          _WIN32_WINNT
+#define WINVER		_WIN32_WINNT
 #else
-#define WINVER          0x0600
+#define WINVER		0x0502
 #endif
 #endif
 
@@ -140,18 +141,18 @@
 #ifndef _WIN32_IE
 #ifdef _WIN32_WINNT
 #if (_WIN32_WINNT <= _WIN32_WINNT_NT4)
-#define _WIN32_IE       _WIN32_IE_IE50
+#define _WIN32_IE	_WIN32_IE_IE50
 #elif (_WIN32_WINNT <= _WIN32_WINNT_WIN2K)
-#define _WIN32_IE       _WIN32_IE_IE501
+#define _WIN32_IE	_WIN32_IE_IE501
 #elif (_WIN32_WINNT <= _WIN32_WINNT_WINXP)
-#define _WIN32_IE       _WIN32_IE_IE60
+#define _WIN32_IE	_WIN32_IE_IE60
 #elif (_WIN32_WINNT <= _WIN32_WINNT_WS03)
-#define _WIN32_IE       0x0602
+#define _WIN32_IE	0x0602
 #else
-#define _WIN32_IE       0x0700
+#define _WIN32_IE	0x0700
 #endif
 #else
-#define _WIN32_IE       0x0700
+#define _WIN32_IE	0x0700
 #endif
 #endif
 
@@ -163,4 +164,4 @@
 #error NTDDI_VERSION and _WIN32_WINNT mismatch!
 #endif
 
-#endif
+#endif /* _INC_SDKDDKVER */
diff --git a/mingw-w64-headers/include/windows.h b/mingw-w64-headers/include/windows.h
index 1590ab7..b59a3f6 100644
--- a/mingw-w64-headers/include/windows.h
+++ b/mingw-w64-headers/include/windows.h
@@ -6,11 +6,8 @@
 #ifndef _WINDOWS_
 #define _WINDOWS_
 
-#ifndef WINVER
-#define WINVER 0x0502
-#endif
-
 #include <_mingw.h>
+#include <sdkddkver.h>
 
 #ifndef _INC_WINDOWS
 #define _INC_WINDOWS
diff --git a/mingw-w64-headers/include/winnt.h b/mingw-w64-headers/include/winnt.h
index efed8d3..089e2ee 100644
--- a/mingw-w64-headers/include/winnt.h
+++ b/mingw-w64-headers/include/winnt.h
@@ -33,6 +33,8 @@
 #endif
 #endif /* _IA64_ */
 
+#include <sdkddkver.h>
+
 #define RESTRICTED_POINTER
 
 #undef  UNALIGNED	/* avoid redefinition warnings vs _mingw.h */