diff --git a/reactos/base/applications/regedit/about.c b/reactos/base/applications/regedit/about.c
index 5ac50c4999c..ad01d6da700 100644
--- a/reactos/base/applications/regedit/about.c
+++ b/reactos/base/applications/regedit/about.c
@@ -20,6 +20,8 @@
 
 #include "regedit.h"
 
+#include <shellapi.h>
+
 void ShowAboutBox(HWND hWnd)
 {
     WCHAR AppStr[255];
diff --git a/reactos/base/applications/regedit/edit.c b/reactos/base/applications/regedit/edit.c
index 5d45843192c..3dc134c3c65 100644
--- a/reactos/base/applications/regedit/edit.c
+++ b/reactos/base/applications/regedit/edit.c
@@ -20,6 +20,9 @@
 
 #include "regedit.h"
 
+#define NTOS_MODE_USER
+#include <ndk/cmtypes.h>
+
 typedef enum _EDIT_MODE
 {
     EDIT_MODE_DEC,
diff --git a/reactos/base/applications/regedit/framewnd.c b/reactos/base/applications/regedit/framewnd.c
index 39353c46465..38186736b1e 100644
--- a/reactos/base/applications/regedit/framewnd.c
+++ b/reactos/base/applications/regedit/framewnd.c
@@ -20,6 +20,10 @@
 
 #include "regedit.h"
 
+#include <commdlg.h>
+#include <cderr.h>
+#include <objsel.h>
+
 /********************************************************************************
  * Global and Local Variables:
  */
diff --git a/reactos/base/applications/regedit/hexedit.c b/reactos/base/applications/regedit/hexedit.c
index 65fada64395..a713d02e63a 100644
--- a/reactos/base/applications/regedit/hexedit.c
+++ b/reactos/base/applications/regedit/hexedit.c
@@ -19,6 +19,7 @@
  */
 
 #include "regedit.h"
+
 typedef struct
 {
     HWND hWndSelf;
diff --git a/reactos/base/applications/regedit/listview.c b/reactos/base/applications/regedit/listview.c
index d187063496a..4d99cd7814a 100644
--- a/reactos/base/applications/regedit/listview.c
+++ b/reactos/base/applications/regedit/listview.c
@@ -20,7 +20,6 @@
 
 #include "regedit.h"
 
-
 #define CX_ICON    16
 #define CY_ICON    16
 #define NUM_ICONS   2
diff --git a/reactos/base/applications/regedit/main.c b/reactos/base/applications/regedit/main.c
index 6964cfcdb6b..09c7668b2ba 100644
--- a/reactos/base/applications/regedit/main.c
+++ b/reactos/base/applications/regedit/main.c
@@ -22,7 +22,6 @@
 
 BOOL ProcessCmdLine(LPWSTR lpCmdLine);
 
-
 /*******************************************************************************
  * Global Variables:
  */
diff --git a/reactos/base/applications/regedit/regedit.c b/reactos/base/applications/regedit/regedit.c
index a879a22867b..4601427fb46 100644
--- a/reactos/base/applications/regedit/regedit.c
+++ b/reactos/base/applications/regedit/regedit.c
@@ -20,7 +20,6 @@
 
 #include "regedit.h"
 
-
 static const LPCWSTR usage =
     L"Usage:\n"
     L"    regedit filenames\n"
diff --git a/reactos/base/applications/regedit/regedit.h b/reactos/base/applications/regedit/regedit.h
index 40262b72698..929f205809a 100644
--- a/reactos/base/applications/regedit/regedit.h
+++ b/reactos/base/applications/regedit/regedit.h
@@ -4,25 +4,14 @@
 #define WIN32_LEAN_AND_MEAN     /* Exclude rarely-used stuff from Windows headers */
 #define WIN32_NO_STATUS
 #include <windows.h>
-
-#define NTOS_MODE_USER
-#include <ndk/cmtypes.h>
-
 #include <commctrl.h>
-#include <shellapi.h>
 #include <shlwapi.h>
 #include <stdio.h>
 #include <aclapi.h>
-#include <commdlg.h>
-#include <cderr.h>
-#include <objsel.h>
-#include <assert.h>
 
 #include "main.h"
 #include "regproc.h"
 #include "hexedit.h"
 #include "security.h"
 
-#endif
-
-/* EOF */
+#endif /* _REGEDIT_H */
diff --git a/reactos/base/applications/regedit/regproc.c b/reactos/base/applications/regedit/regproc.c
index 5ca08506c48..8df3199125a 100644
--- a/reactos/base/applications/regedit/regproc.c
+++ b/reactos/base/applications/regedit/regproc.c
@@ -23,6 +23,8 @@
 
 #include "regedit.h"
 
+#include <assert.h>
+
 #define REG_VAL_BUF_SIZE        4096
 
 /* maximal number of characters in hexadecimal data line,
diff --git a/reactos/base/applications/regedit/regproc.h b/reactos/base/applications/regedit/regproc.h
index 907a860e31d..b78a39c3900 100644
--- a/reactos/base/applications/regedit/regproc.h
+++ b/reactos/base/applications/regedit/regproc.h
@@ -17,6 +17,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#pragma once
+
 #define KEY_MAX_LEN             1024
 
 #define REG_FORMAT_5 1