From d6ad93027afc54b7af0d5e77c40d71c29fb4cac8 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Mon, 13 Jan 2014 12:43:38 +0000
Subject: [PATCH] [WINHLP32] * Move some inclusions to the main header. * Set
 the default debugging channel globally through the main header. * Remove
 inclusions and definitions that already exist in the main header/resource
 file. CORE-7716

svn path=/trunk/; revision=61602
---
 reactos/base/applications/winhlp32/callback.c |  8 -------
 reactos/base/applications/winhlp32/hlpfile.c  | 11 ---------
 reactos/base/applications/winhlp32/lang/Bg.rc |  2 --
 reactos/base/applications/winhlp32/lang/Cs.rc |  2 --
 reactos/base/applications/winhlp32/lang/Da.rc |  2 --
 reactos/base/applications/winhlp32/lang/De.rc |  2 --
 reactos/base/applications/winhlp32/lang/En.rc |  2 --
 reactos/base/applications/winhlp32/lang/Es.rc |  2 --
 reactos/base/applications/winhlp32/lang/Fi.rc |  2 --
 reactos/base/applications/winhlp32/lang/Fr.rc |  2 --
 reactos/base/applications/winhlp32/lang/He.rc |  2 --
 reactos/base/applications/winhlp32/lang/Hu.rc |  2 --
 reactos/base/applications/winhlp32/lang/It.rc |  2 --
 reactos/base/applications/winhlp32/lang/Ja.rc |  2 --
 reactos/base/applications/winhlp32/lang/Ko.rc |  2 --
 reactos/base/applications/winhlp32/lang/Lt.rc |  2 --
 reactos/base/applications/winhlp32/lang/Nl.rc |  2 --
 reactos/base/applications/winhlp32/lang/No.rc |  2 --
 reactos/base/applications/winhlp32/lang/Pl.rc |  2 --
 reactos/base/applications/winhlp32/lang/Pt.rc |  2 --
 reactos/base/applications/winhlp32/lang/Rm.rc |  2 --
 reactos/base/applications/winhlp32/lang/Ro.rc |  2 --
 reactos/base/applications/winhlp32/lang/Ru.rc |  2 --
 reactos/base/applications/winhlp32/lang/Si.rc |  2 --
 reactos/base/applications/winhlp32/lang/Sk.rc |  2 --
 reactos/base/applications/winhlp32/lang/Sq.rc |  2 --
 reactos/base/applications/winhlp32/lang/Sr.rc |  2 --
 reactos/base/applications/winhlp32/lang/Sv.rc |  2 --
 reactos/base/applications/winhlp32/lang/Tr.rc |  2 --
 reactos/base/applications/winhlp32/lang/Uk.rc |  2 --
 reactos/base/applications/winhlp32/lang/Zh.rc |  2 --
 reactos/base/applications/winhlp32/macro.c    | 11 +--------
 reactos/base/applications/winhlp32/macro.h    |  5 ----
 .../base/applications/winhlp32/macro.lex.yy.c | 12 +---------
 reactos/base/applications/winhlp32/winhelp.c  | 21 +----------------
 reactos/base/applications/winhlp32/winhelp.h  | 23 ++++++++++++++++---
 36 files changed, 23 insertions(+), 126 deletions(-)

diff --git a/reactos/base/applications/winhlp32/callback.c b/reactos/base/applications/winhlp32/callback.c
index 4c95a106cce..7f7e169ba63 100644
--- a/reactos/base/applications/winhlp32/callback.c
+++ b/reactos/base/applications/winhlp32/callback.c
@@ -18,16 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <windef.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wine/debug.h>
-
 #include "winhelp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
-
 static WORD CALLBACK WHD_GetFSError(void)
 {
     WINE_FIXME("()\n");
diff --git a/reactos/base/applications/winhlp32/hlpfile.c b/reactos/base/applications/winhlp32/hlpfile.c
index fbde82e9d6c..096904f32ef 100644
--- a/reactos/base/applications/winhlp32/hlpfile.c
+++ b/reactos/base/applications/winhlp32/hlpfile.c
@@ -20,19 +20,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdarg.h>
-#include <stdio.h>
-//#include <string.h>
-#include <windef.h>
-//#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wine/debug.h>
-
 #include "winhelp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
-
 static inline unsigned short GET_USHORT(const BYTE* buffer, unsigned i)
 {
     return (BYTE)buffer[i] + 0x100 * (BYTE)buffer[i + 1];
diff --git a/reactos/base/applications/winhlp32/lang/Bg.rc b/reactos/base/applications/winhlp32/lang/Bg.rc
index 191b5d0f78d..089ae32134f 100644
--- a/reactos/base/applications/winhlp32/lang/Bg.rc
+++ b/reactos/base/applications/winhlp32/lang/Bg.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Cs.rc b/reactos/base/applications/winhlp32/lang/Cs.rc
index 16fc70be2c1..28f63ad81f7 100644
--- a/reactos/base/applications/winhlp32/lang/Cs.rc
+++ b/reactos/base/applications/winhlp32/lang/Cs.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */
diff --git a/reactos/base/applications/winhlp32/lang/Da.rc b/reactos/base/applications/winhlp32/lang/Da.rc
index 7b2b6d114c7..2e5e0de158d 100644
--- a/reactos/base/applications/winhlp32/lang/Da.rc
+++ b/reactos/base/applications/winhlp32/lang/Da.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
diff --git a/reactos/base/applications/winhlp32/lang/De.rc b/reactos/base/applications/winhlp32/lang/De.rc
index 22554aaa58d..e0576b18bb9 100644
--- a/reactos/base/applications/winhlp32/lang/De.rc
+++ b/reactos/base/applications/winhlp32/lang/De.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
diff --git a/reactos/base/applications/winhlp32/lang/En.rc b/reactos/base/applications/winhlp32/lang/En.rc
index 6d987dbc7aa..555bfda0f8b 100644
--- a/reactos/base/applications/winhlp32/lang/En.rc
+++ b/reactos/base/applications/winhlp32/lang/En.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 /* Menu */
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
diff --git a/reactos/base/applications/winhlp32/lang/Es.rc b/reactos/base/applications/winhlp32/lang/Es.rc
index 940585e653d..7b6a3089114 100644
--- a/reactos/base/applications/winhlp32/lang/Es.rc
+++ b/reactos/base/applications/winhlp32/lang/Es.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Fi.rc b/reactos/base/applications/winhlp32/lang/Fi.rc
index eb5a95283bb..98238d214ed 100644
--- a/reactos/base/applications/winhlp32/lang/Fi.rc
+++ b/reactos/base/applications/winhlp32/lang/Fi.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Fr.rc b/reactos/base/applications/winhlp32/lang/Fr.rc
index 2b8ea8f6200..3977a3b4b3d 100644
--- a/reactos/base/applications/winhlp32/lang/Fr.rc
+++ b/reactos/base/applications/winhlp32/lang/Fr.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 /* UTF-8 */
diff --git a/reactos/base/applications/winhlp32/lang/He.rc b/reactos/base/applications/winhlp32/lang/He.rc
index 2b9da4631a9..c3d89381f03 100644
--- a/reactos/base/applications/winhlp32/lang/He.rc
+++ b/reactos/base/applications/winhlp32/lang/He.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 #pragma code_page(65001)
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Hu.rc b/reactos/base/applications/winhlp32/lang/Hu.rc
index 7699677b1e2..07b0f6ccce0 100644
--- a/reactos/base/applications/winhlp32/lang/Hu.rc
+++ b/reactos/base/applications/winhlp32/lang/Hu.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/It.rc b/reactos/base/applications/winhlp32/lang/It.rc
index f0dfd0c8573..e10c91c73fa 100644
--- a/reactos/base/applications/winhlp32/lang/It.rc
+++ b/reactos/base/applications/winhlp32/lang/It.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/base/applications/winhlp32/lang/Ja.rc b/reactos/base/applications/winhlp32/lang/Ja.rc
index a93e5a3b5e9..aeb0da7b6cc 100644
--- a/reactos/base/applications/winhlp32/lang/Ja.rc
+++ b/reactos/base/applications/winhlp32/lang/Ja.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 
 /* UTF-8 */
diff --git a/reactos/base/applications/winhlp32/lang/Ko.rc b/reactos/base/applications/winhlp32/lang/Ko.rc
index 1acc2db701b..37df48a213d 100644
--- a/reactos/base/applications/winhlp32/lang/Ko.rc
+++ b/reactos/base/applications/winhlp32/lang/Ko.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
diff --git a/reactos/base/applications/winhlp32/lang/Lt.rc b/reactos/base/applications/winhlp32/lang/Lt.rc
index 195740c3e3c..bfcd27fed21 100644
--- a/reactos/base/applications/winhlp32/lang/Lt.rc
+++ b/reactos/base/applications/winhlp32/lang/Lt.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/base/applications/winhlp32/lang/Nl.rc b/reactos/base/applications/winhlp32/lang/Nl.rc
index 08860098f3f..5250e8ebb15 100644
--- a/reactos/base/applications/winhlp32/lang/Nl.rc
+++ b/reactos/base/applications/winhlp32/lang/Nl.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
diff --git a/reactos/base/applications/winhlp32/lang/No.rc b/reactos/base/applications/winhlp32/lang/No.rc
index a18dbc4f19e..036c150f85b 100644
--- a/reactos/base/applications/winhlp32/lang/No.rc
+++ b/reactos/base/applications/winhlp32/lang/No.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Pl.rc b/reactos/base/applications/winhlp32/lang/Pl.rc
index fb2114d754b..23710bfe736 100644
--- a/reactos/base/applications/winhlp32/lang/Pl.rc
+++ b/reactos/base/applications/winhlp32/lang/Pl.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Pt.rc b/reactos/base/applications/winhlp32/lang/Pt.rc
index 86216754128..ab63da653ee 100644
--- a/reactos/base/applications/winhlp32/lang/Pt.rc
+++ b/reactos/base/applications/winhlp32/lang/Pt.rc
@@ -25,8 +25,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 #pragma code_page(65001)
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Rm.rc b/reactos/base/applications/winhlp32/lang/Rm.rc
index 60403f02d79..e58672bfed5 100644
--- a/reactos/base/applications/winhlp32/lang/Rm.rc
+++ b/reactos/base/applications/winhlp32/lang/Rm.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_ROMANSH, SUBLANG_DEFAULT
 
 #pragma code_page(65001)
diff --git a/reactos/base/applications/winhlp32/lang/Ro.rc b/reactos/base/applications/winhlp32/lang/Ro.rc
index 69b088fef2a..5cd51d2635e 100644
--- a/reactos/base/applications/winhlp32/lang/Ro.rc
+++ b/reactos/base/applications/winhlp32/lang/Ro.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
diff --git a/reactos/base/applications/winhlp32/lang/Ru.rc b/reactos/base/applications/winhlp32/lang/Ru.rc
index 456f7e2b168..ad30c3f561a 100644
--- a/reactos/base/applications/winhlp32/lang/Ru.rc
+++ b/reactos/base/applications/winhlp32/lang/Ru.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/base/applications/winhlp32/lang/Si.rc b/reactos/base/applications/winhlp32/lang/Si.rc
index 023b28a984a..1b0bce72a3c 100644
--- a/reactos/base/applications/winhlp32/lang/Si.rc
+++ b/reactos/base/applications/winhlp32/lang/Si.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT
 
 #pragma code_page(65001)
diff --git a/reactos/base/applications/winhlp32/lang/Sk.rc b/reactos/base/applications/winhlp32/lang/Sk.rc
index d1abcff02c7..c2276bf3220 100644
--- a/reactos/base/applications/winhlp32/lang/Sk.rc
+++ b/reactos/base/applications/winhlp32/lang/Sk.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 
 MAIN_MENU MENU
diff --git a/reactos/base/applications/winhlp32/lang/Sq.rc b/reactos/base/applications/winhlp32/lang/Sq.rc
index 25dcd798265..67b3112c5e4 100644
--- a/reactos/base/applications/winhlp32/lang/Sq.rc
+++ b/reactos/base/applications/winhlp32/lang/Sq.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 /* Menu */
 
 LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL
diff --git a/reactos/base/applications/winhlp32/lang/Sr.rc b/reactos/base/applications/winhlp32/lang/Sr.rc
index a33e75adfce..a7bef59d987 100644
--- a/reactos/base/applications/winhlp32/lang/Sr.rc
+++ b/reactos/base/applications/winhlp32/lang/Sr.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 #pragma code_page(65001)
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Sv.rc b/reactos/base/applications/winhlp32/lang/Sv.rc
index c91332093ee..cf03e05806c 100644
--- a/reactos/base/applications/winhlp32/lang/Sv.rc
+++ b/reactos/base/applications/winhlp32/lang/Sv.rc
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Tr.rc b/reactos/base/applications/winhlp32/lang/Tr.rc
index aa061c5a969..32c2ba0d228 100644
--- a/reactos/base/applications/winhlp32/lang/Tr.rc
+++ b/reactos/base/applications/winhlp32/lang/Tr.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 /* Menu */
diff --git a/reactos/base/applications/winhlp32/lang/Uk.rc b/reactos/base/applications/winhlp32/lang/Uk.rc
index 8009697172f..e71332dc3b0 100644
--- a/reactos/base/applications/winhlp32/lang/Uk.rc
+++ b/reactos/base/applications/winhlp32/lang/Uk.rc
@@ -23,8 +23,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/base/applications/winhlp32/lang/Zh.rc b/reactos/base/applications/winhlp32/lang/Zh.rc
index 2532cb3fa54..5c40837d51e 100644
--- a/reactos/base/applications/winhlp32/lang/Zh.rc
+++ b/reactos/base/applications/winhlp32/lang/Zh.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "winhelp_res.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 
diff --git a/reactos/base/applications/winhlp32/macro.c b/reactos/base/applications/winhlp32/macro.c
index a44393fd8d4..5a86c8188fe 100644
--- a/reactos/base/applications/winhlp32/macro.c
+++ b/reactos/base/applications/winhlp32/macro.c
@@ -19,18 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <commdlg.h>
-#include <shellapi.h>
-#include <wine/debug.h>
-
 #include "winhelp.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
+#include <shellapi.h>
 
 /**************************************************/
 /*               Macro table                      */
diff --git a/reactos/base/applications/winhlp32/macro.h b/reactos/base/applications/winhlp32/macro.h
index e4f2a31cfde..a82b90e5f3e 100644
--- a/reactos/base/applications/winhlp32/macro.h
+++ b/reactos/base/applications/winhlp32/macro.h
@@ -19,11 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <stdarg.h>
-
-//#include "windef.h"
-#include <winbase.h>
-
 struct lexret {
   LPCSTR        proto;
   BOOL          bool;
diff --git a/reactos/base/applications/winhlp32/macro.lex.yy.c b/reactos/base/applications/winhlp32/macro.lex.yy.c
index 1f9a5e30eca..b7dc9c54758 100644
--- a/reactos/base/applications/winhlp32/macro.lex.yy.c
+++ b/reactos/base/applications/winhlp32/macro.lex.yy.c
@@ -502,21 +502,11 @@ char *yytext;
 #define YY_NO_INPUT 1
 
 #line 26 "macro.lex.l"
-#include "config.h"
-#include <assert.h>
-#include <stdarg.h>
+#include <config.h>
 
 #define YY_NO_UNISTD_H
-#include "windef.h"
-#include "winbase.h"
-#include "wingdi.h"
-#include "winuser.h"
 #include "winhelp.h"
 
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
-
 struct lex_data {
     LPCSTR   macroptr;
     LPSTR    strptr;
diff --git a/reactos/base/applications/winhlp32/winhelp.c b/reactos/base/applications/winhlp32/winhelp.c
index 0c08e02d2a6..754fc1ad6f6 100644
--- a/reactos/base/applications/winhlp32/winhelp.c
+++ b/reactos/base/applications/winhlp32/winhelp.c
@@ -22,30 +22,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-#include <stdio.h>
-//#include <string.h>
-//#include <stdarg.h>
-//#include <stdlib.h>
-
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
-#include <windef.h>
-//#include "winbase.h"
-#include <wingdi.h>
-#include <winuser.h>
-#include <commdlg.h>
 #include "winhelp.h"
-//#include "winhelp_res.h"
-//#include "shellapi.h"
+
 #include <richedit.h>
 #include <commctrl.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
-
 WINHELP_GLOBALS Globals = {3, NULL, TRUE, NULL, NULL, NULL, NULL, NULL, {{{NULL,NULL}},0}, NULL};
 
 #define CTL_ID_BUTTON   0x700
diff --git a/reactos/base/applications/winhlp32/winhelp.h b/reactos/base/applications/winhlp32/winhelp.h
index ac3da225f92..b98c04f95fa 100644
--- a/reactos/base/applications/winhlp32/winhelp.h
+++ b/reactos/base/applications/winhlp32/winhelp.h
@@ -32,12 +32,29 @@
 
 #ifndef RC_INVOKED
 
-//#include <stdarg.h>
+#include <assert.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
+
+#include <windef.h>
+#include <winbase.h>
+#include <wingdi.h>
+#include <winuser.h>
+#include <commdlg.h>
 
 #include "hlpfile.h"
-//#include "windef.h"
-//#include "winbase.h"
 #include "macro.h"
+
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(winhelp);
+
 #include "winhelp_res.h"
 
 typedef struct tagHelpButton