[SERVMAN]

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

svn path=/trunk/; revision=61555

reactos/base/applications/mscutils/servman/export.c

@@ -9,6 +9,9 @@
 
 #include "precomp.h"
 
+#include <commdlg.h>
+#include <cderr.h>
+
 static DWORD
 GetTextFromListView(PMAIN_WND_INFO Info,
                     TCHAR Text[500],

reactos/base/applications/mscutils/servman/mainwnd.c

@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+#include <windowsx.h>
+
 static const TCHAR szMainWndClass[] = TEXT("ServManWndClass");
 
 BOOL bSortAscending = TRUE;

reactos/base/applications/mscutils/servman/precomp.h

@@ -1,21 +1,18 @@
 #ifndef __SERVMAN_PRECOMP_H
 #define __SERVMAN_PRECOMP_H
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <wingdi.h>
-#include <winnls.h>
 #include <winsvc.h>
-#include <winuser.h>
-#include <windowsx.h> /* GET_X/Y_LPARAM */
 #include <wincon.h>
 #include <tchar.h>
-#include <commdlg.h>
-#include <cderr.h>
 #include <shlobj.h>
 
 #include "resource.h"

reactos/base/applications/mscutils/servman/servman.c

@@ -8,6 +8,9 @@
  */
 
 #include "precomp.h"
+
+#include <winnls.h>
+
 HINSTANCE hInstance;
 HANDLE ProcessHeap;