[APPWIZ]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61691

reactos/dll/cpl/appwiz/addons.c

@@ -16,8 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
+#include "appwiz.h"
 
 #include <stdio.h>
 
@@ -25,20 +24,8 @@
 # include <unistd.h>
 #endif
 
-#define COBJMACROS
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-#include <winbase.h>
 #include <msi.h>
 
-#include "appwiz.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(appwiz);
-
 #define GECKO_VERSION "2.21"
 
 #ifdef __i386__

reactos/dll/cpl/appwiz/appwiz.c

@@ -6,12 +6,11 @@
  *                          Dmitry Chapyshev (dmitry@reactos.org)
  */
 
-#include <config.h>
-#include <wine/port.h>
-
 #include "appwiz.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(appwiz);
+#include <shellapi.h>
+#include <cpl.h>
+#include <wine/unicode.h>
 
 HINSTANCE hApplet = NULL;
 

reactos/dll/cpl/appwiz/appwiz.h

@@ -1,19 +1,22 @@
-#define COBJMACROS
+#include <config.h>
+#include <wine/port.h>
+
+#include <stdarg.h>
+
 #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 <winnls.h>
-#include <shellapi.h>
-#include <cpl.h>
-#include <tchar.h>
 #include <shlobj.h>
 
 #include <wine/debug.h>
-#include <wine/unicode.h>
+WINE_DEFAULT_DEBUG_CHANNEL(appwiz);
 
 #include "resource.h"
 

reactos/dll/cpl/appwiz/createlink.c

@@ -11,6 +11,8 @@
 
 #include "appwiz.h"
 
+#include <tchar.h>
+
 BOOL
 IsShortcut(HKEY hKey)
 {