[NOTEPAD]

* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup headers.
CORE-7716

svn path=/trunk/; revision=61562

reactos/base/applications/notepad/dialog.c

@@ -22,6 +22,10 @@
 
 #include "notepad.h"
 
+#include <assert.h>
+#include <commctrl.h>
+#include <strsafe.h>
+
 LRESULT CALLBACK EDIT_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
 static const TCHAR helpfile[]     = _T("notepad.hlp");

reactos/base/applications/notepad/dialog.h

@@ -18,6 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#pragma once
+
 VOID DIALOG_FileNew(VOID);
 VOID DIALOG_FileOpen(VOID);
 BOOL DIALOG_FileSave(VOID);

reactos/base/applications/notepad/main.h

@@ -19,6 +19,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#pragma once
+
 #define SIZEOF(a) (sizeof(a)/sizeof((a)[0]))
 
 #include "notepad_res.h"

reactos/base/applications/notepad/notepad.h

@@ -2,20 +2,17 @@
 #define STRSAFE_NO_DEPRECATE
 #endif
 
-#include <assert.h>
-#include <stdio.h>
+#include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
 #include <winnls.h>
-#include <winreg.h>
 #include <wingdi.h>
 #include <shellapi.h>
 #include <commdlg.h>
-#include <commctrl.h>
 #include <tchar.h>
 #include <malloc.h>
-#include <strsafe.h>
 
 #include "main.h"
 #include "dialog.h"

reactos/base/applications/notepad/settings.c

@@ -22,6 +22,8 @@
 
 #include "notepad.h"
 
+#include <winreg.h>
+
 static LPCTSTR s_szRegistryKey = _T("Software\\Microsoft\\Notepad");