From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 4 Jan 2014 14:06:39 +0000 (+0000)
Subject: [CHARMAP]
X-Git-Tag: ReactOS-0.3.16~331
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=180fca0e90990a3d0e2e068c69c56844ea5d331e

[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 02787f2ef87..60716fe3cdf 100644
--- 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 eefa9193d2e..ed00aa14682 100644
--- 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 489420209c2..b5fef4dbb11 100644
--- 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 8104ce2679c..0029656cd1f 100644
--- 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 8ed87cd7f6f..83c1417e8e8 100644
--- 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 4eae8d916e5..e326df5adff 100644
--- 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;