diff --git a/reactos/dll/win32/syssetup/classinst.c b/reactos/dll/win32/syssetup/classinst.c
index 5c3a4d0a754..8e043211426 100644
--- a/reactos/dll/win32/syssetup/classinst.c
+++ b/reactos/dll/win32/syssetup/classinst.c
@@ -11,7 +11,6 @@
 #define NDEBUG
 #include <debug.h>
 
-
 /*
  * @unimplemented
  */
diff --git a/reactos/dll/win32/syssetup/dllmain.c b/reactos/dll/win32/syssetup/dllmain.c
index 731a784ab90..120fb63ed4e 100644
--- a/reactos/dll/win32/syssetup/dllmain.c
+++ b/reactos/dll/win32/syssetup/dllmain.c
@@ -32,7 +32,6 @@
 
 HINSTANCE hDllInstance;
 
-
 /* FUNCTIONS *****************************************************************/
 
 BOOL WINAPI
diff --git a/reactos/dll/win32/syssetup/globals.h b/reactos/dll/win32/syssetup/globals.h
index 756a68be5f5..f6764808e6a 100644
--- a/reactos/dll/win32/syssetup/globals.h
+++ b/reactos/dll/win32/syssetup/globals.h
@@ -16,6 +16,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#pragma once
 
 typedef struct _TZ_INFO
 {
diff --git a/reactos/dll/win32/syssetup/install.c b/reactos/dll/win32/syssetup/install.c
index ce5024aeee8..097537e394f 100644
--- a/reactos/dll/win32/syssetup/install.c
+++ b/reactos/dll/win32/syssetup/install.c
@@ -28,7 +28,14 @@
 
 #include "precomp.h"
 
+#include <tchar.h>
+#include <wincon.h>
+#include <winsvc.h>
+#include <userenv.h>
+#include <shlobj.h>
+#include <shlwapi.h>
 #include <rpcproxy.h>
+#include <ndk/cmfuncs.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/dll/win32/syssetup/logfile.c b/reactos/dll/win32/syssetup/logfile.c
index 4d3679f98ef..ea0db8e547d 100644
--- a/reactos/dll/win32/syssetup/logfile.c
+++ b/reactos/dll/win32/syssetup/logfile.c
@@ -25,13 +25,13 @@
  */
 
 /* INCLUDES *****************************************************************/
+
 #include "precomp.h"
 
 /* GLOBALS ******************************************************************/
 
 HANDLE hLogFile = NULL;
 
-
 /* FUNCTIONS ****************************************************************/
 
 BOOL WINAPI
diff --git a/reactos/dll/win32/syssetup/precomp.h b/reactos/dll/win32/syssetup/precomp.h
index 6dbfee864c0..79b5f488bc6 100644
--- a/reactos/dll/win32/syssetup/precomp.h
+++ b/reactos/dll/win32/syssetup/precomp.h
@@ -1,4 +1,4 @@
-#include <stdarg.h>
+#include <stdio.h>
 
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
@@ -8,26 +8,12 @@
 #include <winbase.h>
 #include <winreg.h>
 #include <wingdi.h>
-#include <winsvc.h>
-#include <winnls.h>
 #include <winuser.h>
-#include <windowsx.h>
-#include <wincon.h>
 #define NTOS_MODE_USER
-#include <ndk/cmfuncs.h>
 #include <ndk/rtlfuncs.h>
 #include <setupapi.h>
-#include <stdio.h>
-#include <tchar.h>
 #include <syssetup/syssetup.h>
-#include <userenv.h>
-#include <shlobj.h>
-#include <shlwapi.h>
-#include <time.h>
-#include <ntlsa.h>
-#include <ntsecapi.h>
-#include <ntsam.h>
-#include <sddl.h>
+#include <pseh/pseh2.h>
 
 #include "globals.h"
 #include "resource.h"
diff --git a/reactos/dll/win32/syssetup/security.c b/reactos/dll/win32/syssetup/security.c
index 0e55d0befb5..c181f2c09ae 100644
--- a/reactos/dll/win32/syssetup/security.c
+++ b/reactos/dll/win32/syssetup/security.c
@@ -10,10 +10,14 @@
 
 #include "precomp.h"
 
+#include <ntlsa.h>
+#include <ntsecapi.h>
+#include <ntsam.h>
+#include <sddl.h>
+
 #define NDEBUG
 #include <debug.h>
 
-
 /* FUNCTIONS ****************************************************************/
 
 NTSTATUS
diff --git a/reactos/dll/win32/syssetup/wizard.c b/reactos/dll/win32/syssetup/wizard.c
index 39c33631c6a..9cbcb49b6a6 100644
--- a/reactos/dll/win32/syssetup/wizard.c
+++ b/reactos/dll/win32/syssetup/wizard.c
@@ -11,6 +11,11 @@
 
 #include "precomp.h"
 
+#include <stdlib.h>
+#include <time.h>
+#include <winnls.h>
+#include <windowsx.h>
+
 #define NDEBUG
 #include <debug.h>