[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

diff --git a/reactos/base/applications/mscutils/servman/export.c b/reactos/base/applications/mscutils/servman/export.c
index 07bc857..f637a5d 100644 (file)
--- a/reactos/base/applications/mscutils/servman/export.c
+++ b/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],

diff --git a/reactos/base/applications/mscutils/servman/mainwnd.c b/reactos/base/applications/mscutils/servman/mainwnd.c
index 525d8b5..6823379 100644 (file)
--- a/reactos/base/applications/mscutils/servman/mainwnd.c
+++ b/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;

diff --git a/reactos/base/applications/mscutils/servman/precomp.h b/reactos/base/applications/mscutils/servman/precomp.h
index eb6d107..4a63984 100644 (file)
--- a/reactos/base/applications/mscutils/servman/precomp.h
+++ b/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"

diff --git a/reactos/base/applications/mscutils/servman/servman.c b/reactos/base/applications/mscutils/servman/servman.c
index 999decd..7db7748 100644 (file)
--- a/reactos/base/applications/mscutils/servman/servman.c
+++ b/reactos/base/applications/mscutils/servman/servman.c
@@ -8,6 +8,9 @@
  */
 
 #include "precomp.h"
+
+#include <winnls.h>
+
 HINSTANCE hInstance;
 HANDLE ProcessHeap;