Index: dll/win32/msi/action.c
===================================================================
--- dll/win32/msi/action.c	(revision 58214)
+++ dll/win32/msi/action.c	(working copy)
@@ -18,31 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
 #define COBJMACROS
 
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
-#include <winsvc.h>
-#include <odbcinst.h>
-#include <wine/debug.h>
-//#include "msidefs.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "winsvc.h"
+#include "odbcinst.h"
+#include "wine/debug.h"
+#include "msidefs.h"
 #include "msipriv.h"
-//#include "winuser.h"
-#include <shlobj.h>
-//#include "objbase.h"
-//#include "mscoree.h"
-//#include "shlwapi.h"
-#include <imagehlp.h>
-#include <wine/unicode.h>
-//#include "winver.h"
+#include "winuser.h"
+#include "shlobj.h"
+#include "objbase.h"
+#include "mscoree.h"
+#include "shlwapi.h"
+#include "imagehlp.h"
+#include "wine/unicode.h"
+#include "winver.h"
 
 #define REG_PROGRESS_VALUE 13200
 #define COMPONENT_PROGRESS_VALUE 24000
Index: dll/win32/msi/alter.c
===================================================================
--- dll/win32/msi/alter.c	(revision 58214)
+++ dll/win32/msi/alter.c	(working copy)
@@ -18,22 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "msipriv.h"
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-
 #include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
Index: dll/win32/msi/appsearch.c
===================================================================
--- dll/win32/msi/appsearch.c	(revision 58214)
+++ dll/win32/msi/appsearch.c	(working copy)
@@ -17,24 +17,20 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 
 #define COBJMACROS
 
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "msidefs.h"
-//#include "winver.h"
-#include <shlwapi.h>
-#include <wine/unicode.h>
-#include <wine/debug.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "msidefs.h"
+#include "winver.h"
+#include "shlwapi.h"
+#include "wine/unicode.h"
+#include "wine/debug.h"
 #include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
Index: dll/win32/msi/assembly.c
===================================================================
--- dll/win32/msi/assembly.c	(revision 58214)
+++ dll/win32/msi/assembly.c	(working copy)
@@ -18,19 +18,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
 #define COBJMACROS
 
-#include <windef.h>
-//#include "winbase.h"
-#include <winreg.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
 #include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
Index: dll/win32/msi/automation.c
===================================================================
--- dll/win32/msi/automation.c	(revision 58214)
+++ dll/win32/msi/automation.c	(working copy)
@@ -18,27 +18,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
-//#include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winuser.h"
-#include <winreg.h>
-//#include "msidefs.h"
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winuser.h"
+#include "winreg.h"
+#include "msidefs.h"
 #include "msipriv.h"
-#include <activscp.h>
-#include <oleauto.h>
-#include <shlwapi.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "activscp.h"
+#include "oleauto.h"
+#include "shlwapi.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
-#include <msiserver.h>
+#include "msiserver.h"
 #include "msiserver_dispids.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
Index: dll/win32/msi/classes.c
===================================================================
--- dll/win32/msi/classes.c	(revision 58214)
+++ dll/win32/msi/classes.c	(working copy)
@@ -30,20 +30,16 @@
  * UnregisterMIMEInfo
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
-#include <wine/debug.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "wine/debug.h"
 #include "msipriv.h"
-//#include "winuser.h"
-#include <wine/unicode.h>
+#include "winuser.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/cond.tab.c
===================================================================
--- dll/win32/msi/cond.tab.c	(revision 58214)
+++ dll/win32/msi/cond.tab.c	(working copy)
@@ -99,31 +99,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
-#include <config.h>
+#include "config.h"
 
 #include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
+#include <stdio.h>
+#include <stdlib.h>
 
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-//#include "msi.h"
-//#include "msiquery.h"
-#include <objbase.h>
-#include <oleauto.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "oleauto.h"
 
 #include "msipriv.h"
-#include <msiserver.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "wine/list.h"
+#include "msiserver.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "wine/list.h"
 
 #define YYLEX_PARAM info
 #define YYPARSE_PARAM info
Index: dll/win32/msi/create.c
===================================================================
--- dll/win32/msi/create.c	(revision 58214)
+++ dll/win32/msi/create.c	(working copy)
@@ -18,24 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "msipriv.h"
+#include "winnls.h"
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
-
 #include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
Index: dll/win32/msi/custom.c
===================================================================
--- dll/win32/msi/custom.c	(revision 58214)
+++ dll/win32/msi/custom.c	(working copy)
@@ -18,28 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "config.h"
+#include "wine/port.h"
 
-#include <config.h>
-//#include "wine/port.h"
-
 #define COBJMACROS
 
 #include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-//#include "msidefs.h"
-#include <winuser.h>
-#include <objbase.h>
-#include <oleauto.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "msidefs.h"
+#include "winuser.h"
+#include "objbase.h"
+#include "oleauto.h"
 
 #include "msipriv.h"
-#include <msiserver.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-#include <wine/exception.h>
+#include "msiserver.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "wine/exception.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/database.c
===================================================================
--- dll/win32/msi/database.c	(revision 58214)
+++ dll/win32/msi/database.c	(working copy)
@@ -18,31 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
+#include <stdarg.h>
 #include <stdio.h>
 
 #define COBJMACROS
 #define NONAMELESSUNION
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winreg.h"
-//#include "winnls.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "msi.h"
 #include "msiquery.h"
-//#include "msipriv.h"
-//#include "objidl.h"
-#include <objbase.h>
-#include <msiserver.h>
+#include "msipriv.h"
+#include "objidl.h"
+#include "objbase.h"
+#include "msiserver.h"
 #include "query.h"
 
-//#include "initguid.h"
+#include "initguid.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/delete.c
===================================================================
--- dll/win32/msi/delete.c	(revision 58214)
+++ dll/win32/msi/delete.c	(working copy)
@@ -18,24 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
 #include "msipriv.h"
-//#include "winnls.h"
+#include "winnls.h"
 
-//#include "query.h"
+#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
Index: dll/win32/msi/dialog.c
===================================================================
--- dll/win32/msi/dialog.c	(revision 58214)
+++ dll/win32/msi/dialog.c	(working copy)
@@ -18,34 +18,30 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
 #include <stdarg.h>
 
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
-//#include "winuser.h"
-//#include "winnls.h"
-//#include "msi.h"
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "msi.h"
 #include "msipriv.h"
-//#include "msidefs.h"
-//#include "ocidl.h"
-#include <olectl.h>
-#include <richedit.h>
-#include <commctrl.h>
-#include <winreg.h>
-#include <shlwapi.h>
-#include <msiserver.h>
+#include "msidefs.h"
+#include "ocidl.h"
+#include "olectl.h"
+#include "richedit.h"
+#include "commctrl.h"
+#include "winreg.h"
+#include "shlwapi.h"
+#include "msiserver.h"
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/distinct.c
===================================================================
--- dll/win32/msi/distinct.c	(revision 58214)
+++ dll/win32/msi/distinct.c	(working copy)
@@ -18,24 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
 #include "msipriv.h"
-//#include "winnls.h"
+#include "winnls.h"
 
-//#include "query.h"
+#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
Index: dll/win32/msi/drop.c
===================================================================
--- dll/win32/msi/drop.c	(revision 58214)
+++ dll/win32/msi/drop.c	(working copy)
@@ -18,22 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "msipriv.h"
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-
 #include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
Index: dll/win32/msi/events.c
===================================================================
--- dll/win32/msi/events.c	(revision 58214)
+++ dll/win32/msi/events.c	(working copy)
@@ -18,22 +18,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
+#include <stdio.h>
 
-//#include <stdarg.h>
-//#include <stdio.h>
-
-//#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winreg.h"
-//#include "msi.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "msi.h"
 #include "msipriv.h"
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/files.c
===================================================================
--- dll/win32/msi/files.c	(revision 58214)
+++ dll/win32/msi/files.c	(working copy)
@@ -30,24 +30,20 @@
  * RemoveFiles
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "fdi.h"
-//#include "msi.h"
-//#include "msidefs.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "fdi.h"
+#include "msi.h"
+#include "msidefs.h"
 #include "msipriv.h"
-//#include "winuser.h"
-#include <winreg.h>
-#include <shlwapi.h>
-#include <wine/unicode.h>
+#include "winuser.h"
+#include "winreg.h"
+#include "shlwapi.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/font.c
===================================================================
--- dll/win32/msi/font.c	(revision 58214)
+++ dll/win32/msi/font.c	(working copy)
@@ -18,18 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
-#include <wine/debug.h>
+#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "wine/debug.h"
 #include "msipriv.h"
-#include <wine/unicode.h>
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/format.c
===================================================================
--- dll/win32/msi/format.c	(revision 58214)
+++ dll/win32/msi/format.c	(working copy)
@@ -19,27 +19,23 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
-//#include <stdio.h>
+#include <stdio.h>
 
 #define COBJMACROS
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "winnls.h"
-#include <objbase.h>
-#include <oleauto.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "winnls.h"
+#include "objbase.h"
+#include "oleauto.h"
 
 #include "msipriv.h"
-#include <msiserver.h>
-#include <wine/unicode.h>
+#include "msiserver.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/handle.c
===================================================================
--- dll/win32/msi/handle.c	(revision 58214)
+++ dll/win32/msi/handle.c	(working copy)
@@ -18,21 +18,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
-//#include <stdarg.h>
+#include <stdarg.h>
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winreg.h"
-//#include "shlwapi.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "shlwapi.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msiquery.h"
 #include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
Index: dll/win32/msi/insert.c
===================================================================
--- dll/win32/msi/insert.c	(revision 58214)
+++ dll/win32/msi/insert.c	(working copy)
@@ -18,24 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "msipriv.h"
+#include "winnls.h"
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
-
 #include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
Index: dll/win32/msi/install.c
===================================================================
--- dll/win32/msi/install.c	(revision 58214)
+++ dll/win32/msi/install.c	(working copy)
@@ -20,26 +20,22 @@
 
 /* Msi top level apis directly related to installs */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
 #include <stdarg.h>
 
 #include "windef.h"
 #include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msidefs.h"
-#include <objbase.h>
-#include <oleauto.h>
+#include "winerror.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msidefs.h"
+#include "objbase.h"
+#include "oleauto.h"
 
 #include "msipriv.h"
-#include <msiserver.h>
-#include <wine/unicode.h>
+#include "msiserver.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/media.c
===================================================================
--- dll/win32/msi/media.c	(revision 58214)
+++ dll/win32/msi/media.c	(working copy)
@@ -18,24 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
 #define COBJMACROS
 
-//#include "windef.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "fdi.h"
+#include "windef.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "fdi.h"
 #include "msipriv.h"
-#include <winuser.h>
-#include <winreg.h>
-#include <shlwapi.h>
-//#include "objidl.h"
-#include <wine/unicode.h>
+#include "winuser.h"
+#include "winreg.h"
+#include "shlwapi.h"
+#include "objidl.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/msi.c
===================================================================
--- dll/win32/msi/msi.c	(revision 58214)
+++ dll/win32/msi/msi.c	(working copy)
@@ -18,39 +18,35 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 
 #define COBJMACROS
 #define NONAMELESSUNION
 
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-//#include "winnls.h"
-#include <shlwapi.h>
-//#include "msi.h"
-//#include "msidefs.h"
-//#include "msiquery.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "shlwapi.h"
+#include "msi.h"
+#include "msidefs.h"
+#include "msiquery.h"
 #include "msipriv.h"
-#include <msiserver.h>
-//#include "wincrypt.h"
-//#include "winver.h"
-//#include "winuser.h"
-#include <shlobj.h>
-//#include "shobjidl.h"
-//#include "objidl.h"
-//#include "wintrust.h"
-#include <softpub.h>
+#include "msiserver.h"
+#include "wincrypt.h"
+#include "winver.h"
+#include "winuser.h"
+#include "shlobj.h"
+#include "shobjidl.h"
+#include "objidl.h"
+#include "wintrust.h"
+#include "softpub.h"
 
-#include <initguid.h>
-#include <msxml2.h>
+#include "initguid.h"
+#include "msxml2.h"
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/msi.rc
===================================================================
--- dll/win32/msi/msi.rc	(revision 58214)
+++ dll/win32/msi/msi.rc	(working copy)
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
+#include "windef.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
@@ -87,4 +87,4 @@
 #define WINE_PRODUCTVERSION 4,5,6001,22299
 #define WINE_PRODUCTVERSION_STR "4.5.6001.22299"
 
-#include <wine/wine_common_ver.rc>
+#include "wine/wine_common_ver.rc"
Index: dll/win32/msi/msi_main.c
===================================================================
--- dll/win32/msi/msi_main.c	(revision 58214)
+++ dll/win32/msi/msi_main.c	(working copy)
@@ -18,25 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 
 #define COBJMACROS
 #define NONAMELESSUNION
 
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <shlwapi.h>
-//#include "oleauto.h"
-#include <rpcproxy.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "shlwapi.h"
+#include "oleauto.h"
+#include "rpcproxy.h"
 #include "msipriv.h"
-#include <msiserver.h>
+#include "msiserver.h"
 
-#include <wine/debug.h>
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/msipriv.h
===================================================================
--- dll/win32/msi/msipriv.h	(revision 58214)
+++ dll/win32/msi/msipriv.h	(working copy)
@@ -25,17 +25,17 @@
 #include <stdarg.h>
 
 #include "windef.h"
-#include <winbase.h>
+#include "winbase.h"
 #include "fdi.h"
 #include "msi.h"
-#include <msiquery.h>
-#include <msidefs.h>
+#include "msiquery.h"
+#include "msidefs.h"
 #include "objbase.h"
 #include "objidl.h"
-#include <fusion.h>
+#include "fusion.h"
 #include "winnls.h"
 #include "winver.h"
-#include <wine/list.h>
+#include "wine/list.h"
 #include "wine/debug.h"
 
 static const BOOL is_64bit = sizeof(void *) > sizeof(int);
Index: dll/win32/msi/msiquery.c
===================================================================
--- dll/win32/msi/msiquery.c	(revision 58214)
+++ dll/win32/msi/msiquery.c	(working copy)
@@ -18,30 +18,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
 #define COBJMACROS
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "msipriv.h"
+#include "winnls.h"
 
 #include "query.h"
-#include <msiserver.h>
+#include "msiserver.h"
 
-//#include "initguid.h"
+#include "initguid.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/package.c
===================================================================
--- dll/win32/msi/package.c	(revision 58214)
+++ dll/win32/msi/package.c	(working copy)
@@ -18,38 +18,34 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 #define COBJMACROS
 
 #include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-//#include "winnls.h"
-#include <shlwapi.h>
-#include <wingdi.h>
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objidl.h"
-//#include "wincrypt.h"
-//#include "winuser.h"
-#include <wininet.h>
-//#include "winver.h"
-//#include "urlmon.h"
-#include <shlobj.h>
-#include <wine/unicode.h>
-//#include "objbase.h"
-//#include "msidefs.h"
-#include <sddl.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "shlwapi.h"
+#include "wingdi.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objidl.h"
+#include "wincrypt.h"
+#include "winuser.h"
+#include "wininet.h"
+#include "winver.h"
+#include "urlmon.h"
+#include "shlobj.h"
+#include "wine/unicode.h"
+#include "objbase.h"
+#include "msidefs.h"
+#include "sddl.h"
 
 #include "msipriv.h"
-#include <msiserver.h>
+#include "msiserver.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/patch.c
===================================================================
--- dll/win32/msi/patch.c	(revision 58214)
+++ dll/win32/msi/patch.c	(working copy)
@@ -19,19 +19,15 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 #define COBJMACROS
-#include <windef.h>
-#include <winbase.h>
-#include <winreg.h>
-#include <objbase.h>
-#include <shlwapi.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "objbase.h"
+#include "shlwapi.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
 #include "msipriv.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
Index: dll/win32/msi/query.h
===================================================================
--- dll/win32/msi/query.h	(revision 58214)
+++ dll/win32/msi/query.h	(working copy)
@@ -21,16 +21,16 @@
 #ifndef __WINE_MSI_QUERY_H
 #define __WINE_MSI_QUERY_H
 
-//#include <stdarg.h>
+#include <stdarg.h>
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msi.h"
-//#include "msiquery.h"
+#include "windef.h"
+#include "winbase.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "msi.h"
+#include "msiquery.h"
 #include "msipriv.h"
-//#include "wine/list.h"
+#include "wine/list.h"
 
 
 #define OP_EQ       1
Index: dll/win32/msi/record.c
===================================================================
--- dll/win32/msi/record.c	(revision 58214)
+++ dll/win32/msi/record.c	(working copy)
@@ -18,31 +18,27 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
 #define COBJMACROS
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winuser.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "msi.h"
+#include "msiquery.h"
 #include "msipriv.h"
-//#include "objidl.h"
-//#include "winnls.h"
-#include <ole2.h>
+#include "objidl.h"
+#include "winnls.h"
+#include "ole2.h"
 
-#include <winreg.h>
-#include <shlwapi.h>
+#include "winreg.h"
+#include "shlwapi.h"
 
-//#include "query.h"
+#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
Index: dll/win32/msi/registry.c
===================================================================
--- dll/win32/msi/registry.c	(revision 58214)
+++ dll/win32/msi/registry.c	(working copy)
@@ -19,28 +19,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
 #define COBJMACROS
 #define NONAMELESSUNION
 
-#include <windef.h>
-//#include "winbase.h"
-#include <winreg.h>
-//#include "winnls.h"
-//#include "shlwapi.h"
-#include <wine/debug.h>
-//#include "msi.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "shlwapi.h"
+#include "wine/debug.h"
+#include "msi.h"
 #include "msipriv.h"
-//#include "wincrypt.h"
-#include <wine/unicode.h>
-//#include "winver.h"
-//#include "winuser.h"
-#include <sddl.h>
+#include "wincrypt.h"
+#include "wine/unicode.h"
+#include "winver.h"
+#include "winuser.h"
+#include "sddl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/script.c
===================================================================
--- dll/win32/msi/script.c	(revision 58214)
+++ dll/win32/msi/script.c	(working copy)
@@ -18,25 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
 #include <stdarg.h>
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "winuser.h"
-//#include "msidefs.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winuser.h"
+#include "msidefs.h"
 #include "msipriv.h"
-#include <activscp.h>
-#include <oleauto.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "activscp.h"
+#include "oleauto.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
-//#include "msiserver.h"
+#include "msiserver.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/select.c
===================================================================
--- dll/win32/msi/select.c	(revision 58214)
+++ dll/win32/msi/select.c	(working copy)
@@ -18,24 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
 #include "msipriv.h"
-//#include "winnls.h"
+#include "winnls.h"
 
-//#include "query.h"
+#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
Index: dll/win32/msi/source.c
===================================================================
--- dll/win32/msi/source.c	(revision 58214)
+++ dll/win32/msi/source.c	(working copy)
@@ -18,29 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
 #define COBJMACROS
 #define NONAMELESSUNION
 
-#include <windef.h>
-//#include "winbase.h"
-#include <winreg.h>
-//#include "winnls.h"
-//#include "shlwapi.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "shlwapi.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msiquery.h"
 #include "msipriv.h"
-//#include "wincrypt.h"
-//#include "winver.h"
-//#include "winuser.h"
-#include <wine/unicode.h>
-#include <sddl.h>
+#include "wincrypt.h"
+#include "winver.h"
+#include "winuser.h"
+#include "wine/unicode.h"
+#include "sddl.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/sql.tab.c
===================================================================
--- dll/win32/msi/sql.tab.c	(revision 58214)
+++ dll/win32/msi/sql.tab.c	(working copy)
@@ -98,22 +98,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
 
-#include <config.h>
+#include "config.h"
 
 #include <stdarg.h>
-//#include <stdio.h>
-//#include <stdlib.h>
+#include <stdio.h>
+#include <stdlib.h>
 
-#include <windef.h>
-//#include "winbase.h"
+#include "windef.h"
+#include "winbase.h"
 #include "query.h"
-//#include "wine/list.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "wine/list.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
 #define YYLEX_PARAM info
 #define YYPARSE_PARAM info
Index: dll/win32/msi/storages.c
===================================================================
--- dll/win32/msi/storages.c	(revision 58214)
+++ dll/win32/msi/storages.c	(working copy)
@@ -18,26 +18,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #include <stdarg.h>
 
 #define COBJMACROS
 
-#include <windef.h>
-#include <winbase.h>
-//#include "winuser.h"
-//#include "winerror.h"
-#include <ole2.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winuser.h"
+#include "winerror.h"
+#include "ole2.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
 #include "msipriv.h"
-//#include "query.h"
+#include "query.h"
 
-#include <wine/debug.h>
+#include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
Index: dll/win32/msi/streams.c
===================================================================
--- dll/win32/msi/streams.c	(revision 58214)
+++ dll/win32/msi/streams.c	(working copy)
@@ -18,25 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
 #define COBJMACROS
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
 #include "msipriv.h"
-//#include "query.h"
+#include "query.h"
 
-#include <wine/debug.h>
-//#include "wine/unicode.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
Index: dll/win32/msi/string.c
===================================================================
--- dll/win32/msi/string.c	(revision 58214)
+++ dll/win32/msi/string.c	(working copy)
@@ -20,28 +20,24 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
 #define COBJMACROS
 
-//#include <stdarg.h>
-//#include <assert.h>
+#include <stdarg.h>
+#include <assert.h>
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
 #include "msipriv.h"
-//#include "winnls.h"
+#include "winnls.h"
 
-//#include "query.h"
+#include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
Index: dll/win32/msi/suminfo.c
===================================================================
--- dll/win32/msi/suminfo.c	(revision 58214)
+++ dll/win32/msi/suminfo.c	(working copy)
@@ -18,33 +18,29 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
 #define COBJMACROS
 #define NONAMELESSUNION
 
-#include <windef.h>
-//#include "winbase.h"
-#include <winreg.h>
-//#include "winnls.h"
-//#include "shlwapi.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "msidefs.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winreg.h"
+#include "winnls.h"
+#include "shlwapi.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "msidefs.h"
 #include "msipriv.h"
-//#include "objidl.h"
-#include <propvarutil.h>
-#include <msiserver.h>
+#include "objidl.h"
+#include "propvarutil.h"
+#include "msiserver.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
-#include <pshpack1.h>
+#include "pshpack1.h"
 
 typedef struct { 
     WORD wByteOrder;
@@ -82,7 +78,7 @@
     } u;
 } PROPERTY_DATA;
  
-#include <poppack.h>
+#include "poppack.h"
 
 static HRESULT (WINAPI *pPropVariantChangeType)
     (PROPVARIANT *ppropvarDest, REFPROPVARIANT propvarSrc,
Index: dll/win32/msi/table.c
===================================================================
--- dll/win32/msi/table.c	(revision 58214)
+++ dll/win32/msi/table.c	(working copy)
@@ -18,30 +18,26 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
+#include <stdarg.h>
 #include <assert.h>
 
 #define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "winnls.h"
-//#include "msipriv.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "winnls.h"
+#include "msipriv.h"
 #include "query.h"
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
+#include "wine/debug.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
 
Index: dll/win32/msi/tokenize.c
===================================================================
--- dll/win32/msi/tokenize.c	(revision 58214)
+++ dll/win32/msi/tokenize.c	(working copy)
@@ -16,17 +16,13 @@
 ** parser for analysis.
 */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdlib.h>
 
-//#include <ctype.h>
-//#include <stdarg.h>
-//#include <stdlib.h>
-
-//#include "windef.h"
-//#include "winbase.h"
-#include <wine/unicode.h>
+#include "windef.h"
+#include "winbase.h"
+#include "wine/unicode.h"
 #include "query.h"
 #include "sql.tab.h"
 
Index: dll/win32/msi/update.c
===================================================================
--- dll/win32/msi/update.c	(revision 58214)
+++ dll/win32/msi/update.c	(working copy)
@@ -18,23 +18,19 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "msipriv.h"
+#include "winnls.h"
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
-
 #include "query.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msidb);
Index: dll/win32/msi/upgrade.c
===================================================================
--- dll/win32/msi/upgrade.c	(revision 58214)
+++ dll/win32/msi/upgrade.c	(working copy)
@@ -26,21 +26,17 @@
  * RemoveExistingProducts (TODO)
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include <stdarg.h>
 
-//#include <stdarg.h>
-
-#include <windef.h>
-//#include "winbase.h"
-//#include "winerror.h"
-#include <winreg.h>
-#include <wine/debug.h>
-//#include "msidefs.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "winreg.h"
+#include "wine/debug.h"
+#include "msidefs.h"
 #include "msipriv.h"
-//#include "winuser.h"
-#include <wine/unicode.h>
+#include "winuser.h"
+#include "wine/unicode.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msi);
 
Index: dll/win32/msi/where.c
===================================================================
--- dll/win32/msi/where.c	(revision 58214)
+++ dll/win32/msi/where.c	(working copy)
@@ -19,24 +19,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-//#include <stdarg.h>
+#include <stdarg.h>
 #include <assert.h>
 
-//#include "windef.h"
-//#include "winbase.h"
-//#include "winerror.h"
-#include <wine/debug.h>
-#include <wine/unicode.h>
-//#include "msi.h"
-//#include "msiquery.h"
-//#include "objbase.h"
-//#include "objidl.h"
-//#include "msipriv.h"
-//#include "winnls.h"
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/debug.h"
+#include "wine/unicode.h"
+#include "msi.h"
+#include "msiquery.h"
+#include "objbase.h"
+#include "objidl.h"
+#include "msipriv.h"
+#include "winnls.h"
 
 #include "query.h"