[REGEDIT]

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

reactos/base/applications/regedit/about.c

@@ -20,6 +20,8 @@
 
 #include "regedit.h"
 
+#include <shellapi.h>
+
 void ShowAboutBox(HWND hWnd)
 {
     WCHAR AppStr[255];

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,

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:
  */

reactos/base/applications/regedit/hexedit.c

@@ -19,6 +19,7 @@
  */
 
 #include "regedit.h"
+
 typedef struct
 {
     HWND hWndSelf;

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

reactos/base/applications/regedit/main.c

@@ -22,7 +22,6 @@
 
 BOOL ProcessCmdLine(LPWSTR lpCmdLine);
 
-
 /*******************************************************************************
  * Global Variables:
  */

reactos/base/applications/regedit/regedit.c

@@ -20,7 +20,6 @@
 
 #include "regedit.h"
 
-
 static const LPCWSTR usage =
     L"Usage:\n"
     L"    regedit filenames\n"

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
+#endif /* _REGEDIT_H */
-
-/* EOF */

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,

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