[MSPORTS]

* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

svn path=/trunk/; revision=61789

reactos/dll/win32/msports/classinst.c

@@ -8,6 +8,11 @@
 
 #include "precomp.h"
 
+#include <wchar.h>
+
+#define NTOS_MODE_USER
+#include <ndk/cmtypes.h>
+
 typedef enum _PORT_TYPE
 {
     UnknownPort,

reactos/dll/win32/msports/internal.h

@@ -6,4 +6,4 @@
  * COPYRIGHT:   Copyright 2011 Eric Kohl
  */
 
-extern HINSTANCE hInstance;
+extern HINSTANCE hInstance;

reactos/dll/win32/msports/precomp.h

@@ -1,16 +1,19 @@
-#define WIN32_NO_STATUS
 #include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <winuser.h>
-#include <wchar.h>
-#include <cmtypes.h>
 #include <msports.h>
 #include <setupapi.h>
 
 #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(msports);
 
 #include "internal.h"
 #include "resource.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msports);