diff --git a/reactos/base/applications/msconfig/freeldrpage.h b/reactos/base/applications/msconfig/freeldrpage.h
index 23b046b1849..d640dd915b9 100644
--- a/reactos/base/applications/msconfig/freeldrpage.h
+++ b/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_ */
diff --git a/reactos/base/applications/msconfig/generalpage.h b/reactos/base/applications/msconfig/generalpage.h
index 19551866bc4..d575ec81b65 100644
--- a/reactos/base/applications/msconfig/generalpage.h
+++ b/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_ */
diff --git a/reactos/base/applications/msconfig/msconfig.c b/reactos/base/applications/msconfig/msconfig.c
index ceb8249a1d8..a57c212599a 100644
--- a/reactos/base/applications/msconfig/msconfig.c
+++ b/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 */
diff --git a/reactos/base/applications/msconfig/precomp.h b/reactos/base/applications/msconfig/precomp.h
index 7fb5e8582b6..70af3be3d4a 100644
--- a/reactos/base/applications/msconfig/precomp.h
+++ b/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 "srvpage.h"
-#include "startuppage.h"
-#include "freeldrpage.h"
-#include "systempage.h"
-#include "generalpage.h"
+#include "resource.h"
 
 #define MAX_KEY_LENGTH 255
 #define MAX_VALUE_NAME 16383
diff --git a/reactos/base/applications/msconfig/srvpage.c b/reactos/base/applications/msconfig/srvpage.c
index dfd9ee47585..eb159b420d9 100644
--- a/reactos/base/applications/msconfig/srvpage.c
+++ b/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;
diff --git a/reactos/base/applications/msconfig/srvpage.h b/reactos/base/applications/msconfig/srvpage.h
index db51a1b2258..b6f63650dd9 100644
--- a/reactos/base/applications/msconfig/srvpage.h
+++ b/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_ */
diff --git a/reactos/base/applications/msconfig/startuppage.h b/reactos/base/applications/msconfig/startuppage.h
index 54f85d1a82f..4044e8063c2 100644
--- a/reactos/base/applications/msconfig/startuppage.h
+++ b/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_ */
diff --git a/reactos/base/applications/msconfig/systempage.c b/reactos/base/applications/msconfig/systempage.c
index 248edfbcea0..aad0b8c5dfc 100644
--- a/reactos/base/applications/msconfig/systempage.c
+++ b/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;
diff --git a/reactos/base/applications/msconfig/systempage.h b/reactos/base/applications/msconfig/systempage.h
index 1aa9dcafe8b..e5dee273b2a 100644
--- a/reactos/base/applications/msconfig/systempage.h
+++ b/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_ */
diff --git a/reactos/base/applications/msconfig/toolspage.c b/reactos/base/applications/msconfig/toolspage.c
index ab84b34274a..f9ac1002c70 100644
--- a/reactos/base/applications/msconfig/toolspage.c
+++ b/reactos/base/applications/msconfig/toolspage.c
@@ -9,6 +9,8 @@
 
 #include "precomp.h"
 
+#include <shlwapi.h>
+
 HWND hToolsPage;
 HWND hToolsListCtrl;
 HWND hToolsDialog;
diff --git a/reactos/base/applications/msconfig/toolspage.h b/reactos/base/applications/msconfig/toolspage.h
index 4ec159358bf..b2d296f79df 100644
--- a/reactos/base/applications/msconfig/toolspage.h
+++ b/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_ */