[MSPAINT]

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

diff --git a/reactos/base/applications/mspaint/dialogs.c b/reactos/base/applications/mspaint/dialogs.c
index 6a3e4e7..7a7b4df 100644 (file)
--- a/reactos/base/applications/mspaint/dialogs.c
+++ b/reactos/base/applications/mspaint/dialogs.c
@@ -10,6 +10,8 @@
 
 #include "precomp.h"
 
+#include <winnls.h>
+
 /* FUNCTIONS ********************************************************/
 
 LRESULT CALLBACK

diff --git a/reactos/base/applications/mspaint/main.c b/reactos/base/applications/mspaint/main.c
index ccd991d..55bd9d4 100644 (file)
--- a/reactos/base/applications/mspaint/main.c
+++ b/reactos/base/applications/mspaint/main.c
@@ -10,6 +10,12 @@
 
 #include "precomp.h"
 
+#include "winproc.h"
+#include "palette.h"
+#include "toolsettings.h"
+#include "selection.h"
+#include "sizebox.h"
+
 /* FUNCTIONS ********************************************************/
 
 HDC hDrawingDC;

diff --git a/reactos/base/applications/mspaint/precomp.h b/reactos/base/applications/mspaint/precomp.h
index 7fce478..0221d2b 100644 (file)
--- a/reactos/base/applications/mspaint/precomp.h
+++ b/reactos/base/applications/mspaint/precomp.h
@@ -1,13 +1,11 @@
 #include <stdarg.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
-#include <winnls.h>
-#include <winreg.h>
 #include <wingdi.h>
 #include <windowsx.h>
 #include <commdlg.h>
-#include <shellapi.h>
 #include <commctrl.h>
 #include <tchar.h>
 #include <stdlib.h>
@@ -18,10 +16,3 @@
 #include "globalvar.h"
 #include "history.h"
 #include "mouse.h"
-#include "winproc.h"
-#include "palette.h"
-#include "toolsettings.h"
-#include "selection.h"
-#include "sizebox.h"
-#include "dialogs.h"
-#include "registry.h"

diff --git a/reactos/base/applications/mspaint/registry.c b/reactos/base/applications/mspaint/registry.c
index 9da17c9..06bc840 100644 (file)
--- a/reactos/base/applications/mspaint/registry.c
+++ b/reactos/base/applications/mspaint/registry.c
@@ -10,6 +10,8 @@
 
 #include "precomp.h"
 
+#include <winreg.h>
+
 /* FUNCTIONS ********************************************************/
 
 void

diff --git a/reactos/base/applications/mspaint/winproc.c b/reactos/base/applications/mspaint/winproc.c
index 9ee8376..a68b268 100644 (file)
--- a/reactos/base/applications/mspaint/winproc.c
+++ b/reactos/base/applications/mspaint/winproc.c
@@ -9,9 +9,13 @@
 
 /* INCLUDES *********************************************************/
 
-//#include <htmlhelp.h>
 #include "precomp.h"
 
+#include <shellapi.h>
+
+#include "dialogs.h"
+#include "registry.h"
+
 /* FUNCTIONS ********************************************************/
 
 void