diff --git a/mingw-w64-headers/include/ChangeLog b/mingw-w64-headers/include/ChangeLog
index 0eea321..d88ae45 100644
--- a/mingw-w64-headers/include/ChangeLog
+++ b/mingw-w64-headers/include/ChangeLog
@@ -1,3 +1,32 @@
+2009-11-21  Jonathan Yong  <jon_y@sourceforge.net>
+
+	* shlobj.h (IDO_SHGIOI_DEFAULT): Define. Original patch by 
+	Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
+	* include/shlobj.h (SHARD): Add enum. Original patch by 
+	Chris Sutcliffe  <ir0nh34d@users.sourceforge.net>
+
+	* include/winuser.h (WM_TOUCHMOVE, WM_TOUCHDOWN, WM_TOUCHUP,
+	TOUCHEVENTF_DOWN, TOUCHEVENTF_INRANGE, TOUCHEVENTF_MOVE,
+	TOUCHEVENTF_NOCOALESCE, TOUCHEVENTF_PALM, TOUCHEVENTF_PEN,
+	TOUCHEVENTF_PRIMARY, TOUCHEVENTF_UP, TOUCHEVENTMASKF_CONTACTAREA,
+	TOUCHEVENTMASKF_EXTRAINFO, TOUCHEVENTMASKF_TIMEFROMSYSTEM, TOUCHINPUT,
+	CloseTouchInputHandle, RegisterTouchWindow,
+	UnregisterTouchWindow): Define.
+	Original patch by Jarkko Sakkinen  <jarkko.sakkinen@iki.fi>
+
+		2009-13-09  Jacky Lai  <crazyjacky@users.sourceforge.net>
+
+		* include/winerror.h: Fix typos in macro names.
+
+		2009-20-10  Dmitry Potapov  <dpotapov@users.sourceforge.net>
+
+		* include/winver.h (VerQueryValue[AW]): Correct definition.
+
+		2009-20-10  Aleksey Chernov  <virxkane@users.sourceforge.net>
+
+		* include/sspi.h: Include ntsecapi.h to correct postgresql build error.
+
 2009-11-10  Kai Tietz  <kai.tietz@onevision.com>
 
 	* strings.h: Move into ../crt folder.
diff --git a/mingw-w64-headers/include/shlobj.h b/mingw-w64-headers/include/shlobj.h
index 12f422f..8d2c880 100644
--- a/mingw-w64-headers/include/shlobj.h
+++ b/mingw-w64-headers/include/shlobj.h
@@ -379,6 +379,7 @@
 #define IDO_SHGIOI_SHARE 0x0FFFFFFF
 #define IDO_SHGIOI_LINK 0x0FFFFFFE
 #define IDO_SHGIOI_SLOWFILE 0x0FFFFFFFD
+#define IDO_SHGIOI_DEFAULT 0x0FFFFFFC
   SHSTDAPI_(int) SHGetIconOverlayIndexA(LPCSTR pszIconPath,int iIconIndex);
   SHSTDAPI_(int) SHGetIconOverlayIndexW(LPCWSTR pszIconPath,int iIconIndex);
 #ifdef UNICODE
@@ -1958,9 +1959,16 @@
 #define QIF_CACHED 0x00000001
 #define QIF_DONTEXPANDFOLDER 0x00000002
 
-#define SHARD_PIDL 0x00000001L
-#define SHARD_PATHA 0x00000002L
-#define SHARD_PATHW 0x00000003L
+  typedef enum enum_SHARD{
+    SHARD_PIDL = 0x00000001,
+    SHARD_PATHA = 0x00000002,
+    SHARD_PATHW = 0x00000003,
+    SHARD_APPIDINFO = 0x00000004,
+    SHARD_APPIDINFOIDLIST = 0x00000005,
+    SHARD_LINK = 0x00000006,
+    SHARD_APPIDINFOLINK = 0x00000007,
+    SHARD_SHELLITEM = 0x00000008
+  } SHARD;
 
 #ifdef UNICODE
 #define SHARD_PATH SHARD_PATHW
diff --git a/mingw-w64-headers/include/sspi.h b/mingw-w64-headers/include/sspi.h
index 446f8f1..72457ec 100644
--- a/mingw-w64-headers/include/sspi.h
+++ b/mingw-w64-headers/include/sspi.h
@@ -6,6 +6,8 @@
 #ifndef __SSPI_H__
 #define __SSPI_H__
 
+#include <ntsecapi.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/mingw-w64-headers/include/winerror.h b/mingw-w64-headers/include/winerror.h
index 6c72937..7701fcb 100644
--- a/mingw-w64-headers/include/winerror.h
+++ b/mingw-w64-headers/include/winerror.h
@@ -1742,6 +1742,9 @@
 #ifndef WSA_QOS_EUNKNOWNPSOBJ
 #define WSA_QOS_EUNKNOWNPSOBJ 11024L
 #endif
+#ifndef WSA_QOS_EUNKOWNPSOBJ
+#define WSA_QOS_EUNKOWNPSOBJ WSA_QOS_EUNKNOWNPSOBJ
+#endif
 #ifndef WSA_QOS_EPOLICYOBJ
 #define WSA_QOS_EPOLICYOBJ 11025L
 #endif
diff --git a/mingw-w64-headers/include/winuser.h b/mingw-w64-headers/include/winuser.h
index 7a2d8d7..6d1e5ed 100644
--- a/mingw-w64-headers/include/winuser.h
+++ b/mingw-w64-headers/include/winuser.h
@@ -5642,6 +5642,43 @@
 #define RIDEV_EXMODEMASK 0x000000F0
 #define RIDEV_EXMODE(mode) ((mode) & RIDEV_EXMODEMASK)
 
+#if (_WIN32_WINNT >= 0x0601)
+#define WM_TOUCHMOVE 576
+#define WM_TOUCHDOWN 577
+#define WM_TOUCHUP 578
+
+#define TOUCHEVENTF_DOWN        0x0001
+#define TOUCHEVENTF_INRANGE     0x0008
+#define TOUCHEVENTF_MOVE        0x0002
+#define TOUCHEVENTF_NOCOALESCE  0x0020
+#define TOUCHEVENTF_PALM        0x0080
+#define TOUCHEVENTF_PEN         0x0040
+#define TOUCHEVENTF_PRIMARY     0x0010
+#define TOUCHEVENTF_UP          0x0004
+
+#define TOUCHEVENTMASKF_CONTACTAREA     0x0004
+#define TOUCHEVENTMASKF_EXTRAINFO       0x0002
+#define TOUCHEVENTMASKF_TIMEFROMSYSTEM  0x0001
+
+  typedef struct _TOUCHINPUT {
+    LONG x;
+    LONG y;
+    HANDLE hSource;
+    DWORD dwID;
+    DWORD dwFlags;
+    DWORD wMask;
+    DWORD dwTime;
+    ULONG_PTR dwExtraInfo;
+    DWORD cxContact;
+    DWORD cyContact;
+} TOUCHINPUT,*PTOUCHINPUT;
+
+  WINUSERAPI WINBOOL WINAPI IsTouchWindow(HWND hWnd,PULONG pulFlags);
+  WINUSERAPI WINBOOL WINAPI RegisterTouchWindow(HWND hWnd,ULONG ulFlags);
+  WINUSERAPI WINBOOL WINAPI UnregisterTouchWindow(HWND hWnd);
+
+#endif
+
   WINUSERAPI WINBOOL WINAPI RegisterRawInputDevices(PCRAWINPUTDEVICE pRawInputDevices,UINT uiNumDevices,UINT cbSize);
   WINUSERAPI UINT WINAPI GetRegisteredRawInputDevices(PRAWINPUTDEVICE pRawInputDevices,PUINT puiNumDevices,UINT cbSize);
 
diff --git a/mingw-w64-headers/include/winver.h b/mingw-w64-headers/include/winver.h
index 5c0f036..6de4c9d 100644
--- a/mingw-w64-headers/include/winver.h
+++ b/mingw-w64-headers/include/winver.h
@@ -150,8 +150,8 @@
   WINBOOL WINAPI GetFileVersionInfoW(LPCWSTR lptstrFilename,DWORD dwHandle,DWORD dwLen,LPVOID lpData);
   DWORD WINAPI VerLanguageNameA(DWORD wLang,LPSTR szLang,DWORD nSize);
   DWORD WINAPI VerLanguageNameW(DWORD wLang,LPWSTR szLang,DWORD nSize);
-  WINBOOL WINAPI VerQueryValueA(const LPVOID pBlock,LPSTR lpSubBlock,LPVOID *lplpBuffer,PUINT puLen);
-  WINBOOL WINAPI VerQueryValueW(const LPVOID pBlock,LPWSTR lpSubBlock,LPVOID *lplpBuffer,PUINT puLen);
+  WINBOOL WINAPI VerQueryValueA(const LPVOID pBlock,LPCSTR lpSubBlock,LPVOID *lplpBuffer,PUINT puLen);
+  WINBOOL WINAPI VerQueryValueW(const LPVOID pBlock,LPCWSTR lpSubBlock,LPVOID *lplpBuffer,PUINT puLen);
 #endif
 
 #ifdef __cplusplus