[HHCTRL.OCX]

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

diff --git a/reactos/dll/win32/hhctrl.ocx/chm.c b/reactos/dll/win32/hhctrl.ocx/chm.c
index 10c76a0..617e6df 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/chm.c
+++ b/reactos/dll/win32/hhctrl.ocx/chm.c
@@ -20,13 +20,9 @@
  */
 
 #include "hhctrl.h"
-#include "stream.h"
 
 #include <winreg.h>
 #include <shlwapi.h>
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 
 /* Reads a string from the #STRINGS section in the CHM file */
 static LPCSTR GetChmString(CHMInfo *chm, DWORD offset)

diff --git a/reactos/dll/win32/hhctrl.ocx/content.c b/reactos/dll/win32/hhctrl.ocx/content.c
index d34aac7..cf052d9 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/content.c
+++ b/reactos/dll/win32/hhctrl.ocx/content.c
@@ -17,16 +17,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "hhctrl.h"
-#include "stream.h"
-#include "resource.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
+#include "resource.h"
 
 typedef enum {
     INSERT_NEXT,

diff --git a/reactos/dll/win32/hhctrl.ocx/help.c b/reactos/dll/win32/hhctrl.ocx/help.c
index a4669cd..846d1ed 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/help.c
+++ b/reactos/dll/win32/hhctrl.ocx/help.c
@@ -22,16 +22,11 @@
 
 #include "hhctrl.h"
 
-//#include "wingdi.h"
-//#include "commctrl.h"
+#include <wingdi.h>
 #include <wininet.h>
 
-#include "wine/debug.h"
-
 #include "resource.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
-
 static LRESULT Help_OnSize(HWND hWnd);
 static void ExpandContract(HHInfo *pHHInfo);
 

diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.c b/reactos/dll/win32/hhctrl.ocx/hhctrl.c
index 7878457..a73d078 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.c
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.c
@@ -19,24 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/debug.h>
-
-#include <stdarg.h>
-
-#define COBJMACROS
-
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "htmlhelp.h"
-#include "ole2.h"
-#include "rpcproxy.h"
-
-#define INIT_GUID
 #include "hhctrl.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
+#include <rpcproxy.h>
 
 HINSTANCE hhctrl_hinstance;
 BOOL hh_process = FALSE;

diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.h b/reactos/dll/win32/hhctrl.ocx/hhctrl.h
index 29ce8ad..8fe5c64 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.h
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.h
@@ -20,14 +20,19 @@
 #ifndef HHCTRL_H
 #define HHCTRL_H
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
+#define NONAMELESSUNION
+#define NONAMELESSSTRUCT
 
 #define COBJMACROS
 
+#include <initguid.h>
+
 #include <windef.h>
 #include <winbase.h>
 #include <winuser.h>
@@ -38,14 +43,15 @@
 #include <mshtmhst.h>
 #include <commctrl.h>
 
-#ifdef INIT_GUID
-#include <initguid.h>
-#endif
-
 #include <wine/itss.h>
 #include <wine/unicode.h>
 #include <wine/list.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
+
+#include "stream.h"
+
 #define WB_GOBACK     0
 #define WB_GOFORWARD  1
 #define WB_GOHOME     2

diff --git a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
index a84fe7f..5426be1 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
+++ b/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
@@ -19,13 +19,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
 #include <windef.h>
-//#include "winbase.h"
-//#include "wingdi.h"
-//#include "winnls.h"
-//#include "htmlhelp.h"
-//#include "resource.h"
+#include <htmlhelp.h>
+
+#include "resource.h"
 
 #ifdef LANGUAGE_CS_CZ
     #include "lang/Cs.rc"

diff --git a/reactos/dll/win32/hhctrl.ocx/index.c b/reactos/dll/win32/hhctrl.ocx/index.c
index f80e532..327d4d7 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/index.c
+++ b/reactos/dll/win32/hhctrl.ocx/index.c
@@ -17,15 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "hhctrl.h"
-#include "stream.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 
 /* Fill the TreeView object corresponding to the Index items */
 static void fill_index_tree(HWND hwnd, IndexItem *item)

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc b/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc
index b914762..ec564d8 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 
 /* Czech strings in CP1250 */

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Da.rc b/reactos/dll/win32/hhctrl.ocx/lang/Da.rc
index 1832d71..e425ef0 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Da.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Da.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/De.rc b/reactos/dll/win32/hhctrl.ocx/lang/De.rc
index 20b20f8..fe9b516 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/De.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/De.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/El.rc b/reactos/dll/win32/hhctrl.ocx/lang/El.rc
index 4fa79a2..dd81eb6 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/El.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/El.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/En.rc b/reactos/dll/win32/hhctrl.ocx/lang/En.rc
index b69383e..3f71b52 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/En.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/En.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Es.rc b/reactos/dll/win32/hhctrl.ocx/lang/Es.rc
index d7681aa..2588f99 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Es.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Es.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc b/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc
index 825422e..975ce1f 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc b/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc
index 2146a3c..c487245 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/He.rc b/reactos/dll/win32/hhctrl.ocx/lang/He.rc
index d86afe4..ff9d159 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/He.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/He.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc b/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc
index 0cab8cd..225c04a 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/It.rc b/reactos/dll/win32/hhctrl.ocx/lang/It.rc
index 4c8f072..b8f610a 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/It.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/It.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc b/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc
index f16beab..0361195 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc b/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc
index c641404..321388a 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc b/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc
index 8c813ba..1a4183a 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc b/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc
index 99c12fa..929ac39 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/No.rc b/reactos/dll/win32/hhctrl.ocx/lang/No.rc
index a76ad31..5ff634d 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/No.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/No.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc b/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc
index f3ce6f2..40d3089 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc b/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc
index 2b8b101..7675131 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc b/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc
index 28f7569..92bbec7 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc
@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc b/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc
index 0634c39..eee2fd9 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Si.rc b/reactos/dll/win32/hhctrl.ocx/lang/Si.rc
index bc8ca1d..d391efc 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Si.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Si.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_SLOVENIAN, SUBLANG_DEFAULT

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc b/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc
index b92c63c..cb3e4e2 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc b/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc
index f1011b1..7488999 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc b/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc
index 40d96b8..6f65d83 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc b/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc
index d6295a9..320e487 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc
+++ b/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc
@@ -18,8 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 /* Chinese text is encoded in UTF-8 */
 #pragma code_page(65001)
 

diff --git a/reactos/dll/win32/hhctrl.ocx/resource.h b/reactos/dll/win32/hhctrl.ocx/resource.h
index b8aac13..b825a32 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/resource.h
+++ b/reactos/dll/win32/hhctrl.ocx/resource.h
@@ -18,10 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-//#include <windef.h>
-//#include <winbase.h>
-#include <wingdi.h>
-#include <htmlhelp.h>
+#pragma once
 
 #define IDS_CONTENTS    1
 #define IDS_INDEX       2

diff --git a/reactos/dll/win32/hhctrl.ocx/search.c b/reactos/dll/win32/hhctrl.ocx/search.c
index f1b44dd..c60879e 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/search.c
+++ b/reactos/dll/win32/hhctrl.ocx/search.c
@@ -16,15 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define NONAMELESSUNION
-#define NONAMELESSSTRUCT
-
 #include "hhctrl.h"
-#include "stream.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 
 static SearchItem *SearchCHM_Folder(SearchItem *item, IStorage *pStorage,
                                     const WCHAR *folder, const char *needle);

diff --git a/reactos/dll/win32/hhctrl.ocx/stream.c b/reactos/dll/win32/hhctrl.ocx/stream.c
index 339de8f..828c8d4 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/stream.c
+++ b/reactos/dll/win32/hhctrl.ocx/stream.c
@@ -17,11 +17,6 @@
  */
 
 #include "hhctrl.h"
-#include "stream.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 
 void strbuf_init(strbuf_t *buf)
 {

diff --git a/reactos/dll/win32/hhctrl.ocx/webbrowser.c b/reactos/dll/win32/hhctrl.ocx/webbrowser.c
index ce9c779..195eed2 100644 (file)
--- a/reactos/dll/win32/hhctrl.ocx/webbrowser.c
+++ b/reactos/dll/win32/hhctrl.ocx/webbrowser.c
@@ -20,10 +20,6 @@
 
 #include "hhctrl.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
-
 typedef struct IOleClientSiteImpl
 {
     IOleClientSite IOleClientSite_iface;