From f91ac77f2411d4c86daec55bb4650688058b19aa Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Thu, 23 Jan 2014 11:27:43 +0000
Subject: [PATCH] [HHCTRL.OCX] * Remove one time mshtmhst.h inclusion from the
 main header and put it back where it belongs. * Move resource.h inclusion to
 the main header. * Remove redundant winnls.h inclusion. CORE-7716

svn path=/trunk/; revision=61766
---
 reactos/dll/win32/hhctrl.ocx/content.c    | 2 --
 reactos/dll/win32/hhctrl.ocx/help.c       | 2 --
 reactos/dll/win32/hhctrl.ocx/hhctrl.h     | 8 +++-----
 reactos/dll/win32/hhctrl.ocx/stream.h     | 2 +-
 reactos/dll/win32/hhctrl.ocx/webbrowser.c | 2 ++
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/reactos/dll/win32/hhctrl.ocx/content.c b/reactos/dll/win32/hhctrl.ocx/content.c
index cf052d9e041..2a411bd69c7 100644
--- a/reactos/dll/win32/hhctrl.ocx/content.c
+++ b/reactos/dll/win32/hhctrl.ocx/content.c
@@ -19,8 +19,6 @@
 
 #include "hhctrl.h"
 
-#include "resource.h"
-
 typedef enum {
     INSERT_NEXT,
     INSERT_CHILD
diff --git a/reactos/dll/win32/hhctrl.ocx/help.c b/reactos/dll/win32/hhctrl.ocx/help.c
index 846d1ed25e1..c7ad4e744ad 100644
--- a/reactos/dll/win32/hhctrl.ocx/help.c
+++ b/reactos/dll/win32/hhctrl.ocx/help.c
@@ -25,8 +25,6 @@
 #include <wingdi.h>
 #include <wininet.h>
 
-#include "resource.h"
-
 static LRESULT Help_OnSize(HWND hWnd);
 static void ExpandContract(HHInfo *pHHInfo);
 
diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.h b/reactos/dll/win32/hhctrl.ocx/hhctrl.h
index 4600b79f85a..60ed3308d3d 100644
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.h
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.h
@@ -26,19 +26,16 @@
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
 
-#define COBJMACROS
-
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
-#include <winnls.h>
 #include <htmlhelp.h>
 #include <ole2.h>
 #include <exdisp.h>
-#include <mshtmhst.h>
 #include <commctrl.h>
 
 #include <wine/itss.h>
@@ -48,6 +45,7 @@
 #include <wine/debug.h>
 WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 
+#include "resource.h"
 #include "stream.h"
 
 #define WB_GOBACK     0
@@ -326,4 +324,4 @@ static inline LPSTR strdupWtoA(LPCWSTR str)
 extern HINSTANCE hhctrl_hinstance DECLSPEC_HIDDEN;
 extern BOOL hh_process DECLSPEC_HIDDEN;
 
-#endif
+#endif /* HHCTRL_H */
diff --git a/reactos/dll/win32/hhctrl.ocx/stream.h b/reactos/dll/win32/hhctrl.ocx/stream.h
index 8d61ad54d51..b45869b7381 100644
--- a/reactos/dll/win32/hhctrl.ocx/stream.h
+++ b/reactos/dll/win32/hhctrl.ocx/stream.h
@@ -45,4 +45,4 @@ BOOL next_content(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN;
 BOOL next_node(stream_t *stream, strbuf_t *buf) DECLSPEC_HIDDEN;
 const char *get_attr(const char *node, const char *name, int *len) DECLSPEC_HIDDEN;
 
-#endif
+#endif /* HHCTRL_STREAM_H */
diff --git a/reactos/dll/win32/hhctrl.ocx/webbrowser.c b/reactos/dll/win32/hhctrl.ocx/webbrowser.c
index 195eed2e0e4..afa213d8bc9 100644
--- a/reactos/dll/win32/hhctrl.ocx/webbrowser.c
+++ b/reactos/dll/win32/hhctrl.ocx/webbrowser.c
@@ -20,6 +20,8 @@
 
 #include "hhctrl.h"
 
+#include <mshtmhst.h>
+
 typedef struct IOleClientSiteImpl
 {
     IOleClientSite IOleClientSite_iface;