[MSCONFIG]

* 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=61552

reactos/base/applications/msconfig/freeldrpage.h

@@ -5,4 +5,4 @@ extern HWND hFreeLdrPage;
 
 INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
-#endif
+#endif /* _FREELDRPAGE_H_ */

reactos/base/applications/msconfig/generalpage.h

@@ -5,4 +5,4 @@ extern HWND hGeneralPage;
 
 INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
-#endif
+#endif /* _GENERALPAGE_H_ */

reactos/base/applications/msconfig/msconfig.c

@@ -6,8 +6,16 @@
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
  *
  */
+
 #include "precomp.h"
 
+#include "toolspage.h"
+#include "srvpage.h"
+#include "startuppage.h"
+#include "freeldrpage.h"
+#include "systempage.h"
+#include "generalpage.h"
+
 HINSTANCE hInst = 0;
 
 HWND hMainWnd;                   /* Main Window */

reactos/base/applications/msconfig/precomp.h

@@ -1,26 +1,19 @@
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 #define NTOS_MODE_USER
-#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
-#include <winsvc.h>
-#include <winver.h>
 #include <tchar.h>
 #include <stdio.h>
-#include <shlwapi.h>
 #include <shlobj.h>
 
-#include "resource.h"
 #include "msconfig.h"
-#include "toolspage.h"
+#include "resource.h"
-#include "srvpage.h"
-#include "startuppage.h"
-#include "freeldrpage.h"
-#include "systempage.h"
-#include "generalpage.h"
 
 #define MAX_KEY_LENGTH 255
 #define MAX_VALUE_NAME 16383

reactos/base/applications/msconfig/srvpage.c

@@ -9,6 +9,9 @@
 
 #include "precomp.h"
 
+#include <winsvc.h>
+#include <winver.h>
+
 HWND hServicesPage;
 HWND hServicesListCtrl;
 HWND hServicesDialog;

reactos/base/applications/msconfig/srvpage.h

@@ -6,4 +6,4 @@ extern HWND hServicesListCtrl;
 
 INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
-#endif
+#endif /* _SVRPAGE_H_ */

reactos/base/applications/msconfig/startuppage.h

@@ -6,4 +6,4 @@ extern HWND hStartupListCtrl;
 
 INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
-#endif
+#endif /* _STARTUPPAGE_H_ */

reactos/base/applications/msconfig/systempage.c

@@ -6,6 +6,7 @@
  * COPYRIGHT:   Copyright 2005-2006 Christoph von Wittich <Christoph@ApiViewer.de>
  *                        2011      Gregor Schneider <Gregor.Schneider@reactos.org>
  */
+
 #include "precomp.h"
 
 HWND hSystemPage;

reactos/base/applications/msconfig/systempage.h

@@ -5,4 +5,4 @@ extern HWND hSystemPage;
 
 INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
-#endif
+#endif /* _SYSTEMPAGE_H_ */

reactos/base/applications/msconfig/toolspage.c

@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+#include <shlwapi.h>
+
 HWND hToolsPage;
 HWND hToolsListCtrl;
 HWND hToolsDialog;

reactos/base/applications/msconfig/toolspage.h

@@ -6,4 +6,4 @@ extern HWND hToolsListCtrl;
 
 INT_PTR CALLBACK ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
-#endif
+#endif /* _TOOLSPAGE_H_ */