--- a/src/intl-auto-encap-win32.h	Fri Feb 27 17:48:44 2015 +0000
+++ b/src/intl-auto-encap-win32.h	Fri Jul 24 14:48:46 2015 +0100
@@ -478,11 +478,7 @@
 #undef CreateDesktop
 #define CreateDesktop error_split_sized_LPDEVMODE
 
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef OpenDesktop
-#define OpenDesktop error_use_qxeOpenDesktop_or_OpenDesktopA_and_OpenDesktopW
-#endif
-HDESK qxeOpenDesktop (const Extbyte * lpszDesktop, DWORD dwFlags, WINBOOL fInherit, ACCESS_MASK dwDesiredAccess);
+/* Skipping OpenDesktop because HST_LPC...pblm_unused */
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef EnumDesktops
@@ -496,11 +492,7 @@
 #endif
 HWINSTA qxeCreateWindowStation (Extbyte * arg1, DWORD arg2, DWORD arg3, LPSECURITY_ATTRIBUTES arg4);
 
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef OpenWindowStation
-#define OpenWindowStation error_use_qxeOpenWindowStation_or_OpenWindowStationA_and_OpenWindowStationW
-#endif
-HWINSTA qxeOpenWindowStation (const Extbyte * lpszWinSta, WINBOOL fInherit, ACCESS_MASK dwDesiredAccess);
+/* Skipping OpenWindowStation because HST_LPC...pblm_unused */
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef EnumWindowStations
@@ -879,17 +871,9 @@
 #endif
 WINBOOL qxeDrawState (HDC hdc, HBRUSH hbrFore, DRAWSTATEPROC qfnCallBack, LPARAM lData, WPARAM wData, int x, int y, int cx, int cy, UINT uFlags);
 
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef TabbedTextOut
-#define TabbedTextOut error_use_qxeTabbedTextOut_or_TabbedTextOutA_and_TabbedTextOutW
-#endif
-LONG qxeTabbedTextOut (HDC hdc, int x, int y, const Extbyte * lpString, int chCount, int nTabPositions, CONST INT * lpnTabStopPositions, int nTabOrigin);
-
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef GetTabbedTextExtent
-#define GetTabbedTextExtent error_use_qxeGetTabbedTextExtent_or_GetTabbedTextExtentA_and_GetTabbedTextExtentW
-#endif
-DWORD qxeGetTabbedTextExtent (HDC hdc, const Extbyte * lpString, int chCount, int nTabPositions, CONST INT * lpnTabStopPositions);
+/* Skipping TabbedTextOut because HST_LPC...pblm_unused */
+
+/* Skipping GetTabbedTextExtent because HST_LPC...pblm_unused */
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef SetProp
@@ -2688,8 +2672,11 @@
 #endif
 VOID qxeGetStartupInfo (LPSTARTUPINFOW lpStartupInfo);
 
+#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef CreateProcess
-#define CreateProcess error_HST__new_____needs_review
+#define CreateProcess error_use_qxeCreateProcess_or_CreateProcessA_and_CreateProcessW
+#endif
+WINBOOL qxeCreateProcess (const Extbyte * lpApplicationName, Extbyte * lpCommandLine, LPSECURITY_ATTRIBUTES lpProcessAttributes, LPSECURITY_ATTRIBUTES lpThreadAttributes, WINBOOL bInheritHandles, DWORD dwCreationFlags, LPVOID lpEnvironment, const Extbyte * lpCurrentDirectory, LPSTARTUPINFOW lpStartupInfo, LPPROCESS_INFORMATION lpProcessInformation);
 
 #ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
 #undef CreateProcessAsUser
@@ -3227,11 +3214,7 @@
 #endif
 WINBOOL qxeGetUserName (Extbyte * lpBuffer, LPDWORD pcbBuffer);
 
-#ifdef ERROR_WHEN_NONINTERCEPTED_FUNS_USED
-#undef LogonUser
-#define LogonUser error_use_qxeLogonUser_or_LogonUserA_and_LogonUserW
-#endif
-WINBOOL qxeLogonUser (const Extbyte * lpszUsername, const Extbyte * lpszDomain, const Extbyte * lpszPassword, DWORD dwLogonType, DWORD dwLogonProvider, PHANDLE phToken);
+/* Skipping LogonUser because HST_LPC...pblm_unused */
 
 #undef LogonUserEx
 #define LogonUserEx error_HST__new_____needs_review