[CHARMAP]

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

diff --git a/reactos/base/applications/charmap/about.c b/reactos/base/applications/charmap/about.c
index 02787f2..60716fe 100644 (file)
--- a/reactos/base/applications/charmap/about.c
+++ b/reactos/base/applications/charmap/about.c
@@ -7,10 +7,8 @@
  *
  */
 
-
 #include <precomp.h>
 
-
 static
 INT_PTR
 CALLBACK

diff --git a/reactos/base/applications/charmap/charmap.c b/reactos/base/applications/charmap/charmap.c
index eefa919..ed00aa1 100644 (file)
--- a/reactos/base/applications/charmap/charmap.c
+++ b/reactos/base/applications/charmap/charmap.c
@@ -9,6 +9,9 @@
 
 #include <precomp.h>
 
+#include <commctrl.h>
+#include <richedit.h>
+
 #define ID_ABOUT    0x1
 
 HINSTANCE hInstance;

diff --git a/reactos/base/applications/charmap/lrgcell.c b/reactos/base/applications/charmap/lrgcell.c
index 4894202..b5fef4d 100644 (file)
--- a/reactos/base/applications/charmap/lrgcell.c
+++ b/reactos/base/applications/charmap/lrgcell.c
@@ -9,7 +9,6 @@
 
 #include <precomp.h>
 
-
 static
 HFONT
 SetLrgFont(PMAP infoPtr)

diff --git a/reactos/base/applications/charmap/map.c b/reactos/base/applications/charmap/map.c
index 8104ce2..0029656 100644 (file)
--- a/reactos/base/applications/charmap/map.c
+++ b/reactos/base/applications/charmap/map.c
@@ -9,6 +9,8 @@
 
 #include <precomp.h>
 
+#include <stdlib.h>
+
 static const WCHAR szMapWndClass[] = L"FontMapWnd";
 static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd";
 

diff --git a/reactos/base/applications/charmap/precomp.h b/reactos/base/applications/charmap/precomp.h
index 8ed87cd..83c1417 100644 (file)
--- a/reactos/base/applications/charmap/precomp.h
+++ b/reactos/base/applications/charmap/precomp.h
@@ -5,14 +5,7 @@
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
-#include <winreg.h>
 #include <wingdi.h>
-#include <windowsx.h>
-#include <tchar.h>
-//#include <stdio.h>
-#include <stdlib.h>
-#include <commctrl.h>
-#include <richedit.h>
 
 #include "resource.h"
 

diff --git a/reactos/base/applications/charmap/settings.c b/reactos/base/applications/charmap/settings.c
index 4eae8d9..e326df5 100644 (file)
--- a/reactos/base/applications/charmap/settings.c
+++ b/reactos/base/applications/charmap/settings.c
@@ -9,6 +9,9 @@
 
 #include <precomp.h>
 
+#include <winreg.h>
+#include <windowsx.h>
+#include <tchar.h>
 
 const TCHAR g_szGeneralRegKey[] = _T("Software\\Microsoft\\CharMap");
 HWND hWnd;