From 968516f86d12b03c1593ff7d9537099f77584bf3 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Wed, 2 Nov 2016 18:55:51 +0000
Subject: [PATCH] [SERVMAN] Sort out header inclusions.

svn path=/trunk/; revision=73098
---
 reactos/base/applications/mscutils/servman/export.c   |  3 +--
 reactos/base/applications/mscutils/servman/precomp.h  | 11 ++---------
 reactos/base/applications/mscutils/servman/progress.c |  2 ++
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/reactos/base/applications/mscutils/servman/export.c b/reactos/base/applications/mscutils/servman/export.c
index cfbfd7ebdbe..53bf8633019 100644
--- a/reactos/base/applications/mscutils/servman/export.c
+++ b/reactos/base/applications/mscutils/servman/export.c
@@ -9,8 +9,7 @@
 
 #include "precomp.h"
 
-//#include <commdlg.h>
-//#include <cderr.h>
+#include <cderr.h>
 
 static DWORD
 GetTextFromListView(PMAIN_WND_INFO Info,
diff --git a/reactos/base/applications/mscutils/servman/precomp.h b/reactos/base/applications/mscutils/servman/precomp.h
index af527f3438b..a4cf5551141 100644
--- a/reactos/base/applications/mscutils/servman/precomp.h
+++ b/reactos/base/applications/mscutils/servman/precomp.h
@@ -1,9 +1,6 @@
 #ifndef __SERVMAN_PRECOMP_H
 #define __SERVMAN_PRECOMP_H
 
-#if 0
-#include <stdarg.h>
-
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
@@ -14,13 +11,9 @@
 #include <winsvc.h>
 #include <wincon.h>
 #include <shlobj.h>
+#include <commdlg.h>
 #include <strsafe.h>
-#else
-#include <windows.h>
-#include <commctrl.h>
-#include <process.h>
-#include <strsafe.h>
-#endif
+
 #include "resource.h"
 
 #ifdef _MSC_VER
diff --git a/reactos/base/applications/mscutils/servman/progress.c b/reactos/base/applications/mscutils/servman/progress.c
index b60f4f95f45..239c598edc2 100644
--- a/reactos/base/applications/mscutils/servman/progress.c
+++ b/reactos/base/applications/mscutils/servman/progress.c
@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+#include <process.h>
+
 #define PROGRESS_RANGE      20
 #define PROGRESS_STEP_MAX   15