[akhaldi] 61362: [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...

Author: akhaldi
Date: Mon Dec 23 18:59:26 2013
New Revision: 61362

URL: http://svn.reactos.org/svn/reactos?rev=61362&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/hhctrl.ocx/chm.c
    trunk/reactos/dll/win32/hhctrl.ocx/content.c
    trunk/reactos/dll/win32/hhctrl.ocx/help.c
    trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c
    trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h
    trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
    trunk/reactos/dll/win32/hhctrl.ocx/index.c
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc
    trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc
    trunk/reactos/dll/win32/hhctrl.ocx/resource.h
    trunk/reactos/dll/win32/hhctrl.ocx/search.c
    trunk/reactos/dll/win32/hhctrl.ocx/stream.c
    trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c

Modified: trunk/reactos/dll/win32/hhctrl.ocx/chm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/chm.c…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/chm.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/chm.c	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -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)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/content.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/conte…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/content.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/content.c	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -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);
 
 typedef enum {
     INSERT_NEXT,

Modified: trunk/reactos/dll/win32/hhctrl.ocx/help.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/help.…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/help.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/help.c	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -22,15 +22,10 @@
 
 #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);

Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.c	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -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;

Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.h	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -20,13 +20,18 @@
 #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>
@@ -38,13 +43,14 @@
 #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

Modified: trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/hhctr…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/hhctrl.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -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"

Modified: trunk/reactos/dll/win32/hhctrl.ocx/index.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/index…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/index.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/index.c	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -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)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Cs.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -20,8 +20,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Da.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/De.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/El.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/En.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Es.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Fi.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Fr.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/He.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -20,8 +20,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Hu.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/It.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ja.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ko.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Lt.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Nl.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/No.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Pl.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Pt.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ro.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -19,8 +19,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Ru.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Si.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 #pragma code_page(65001)
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Sv.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Tr.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -18,8 +18,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Uk.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -20,8 +20,6 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
-
-#include "resource.h"
 
 /* UTF-8 */
 #pragma code_page(65001)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/lang/…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/lang/Zh.rc	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -17,8 +17,6 @@
  * License along with this library; if not, write to the Free Software
  * 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)

Modified: trunk/reactos/dll/win32/hhctrl.ocx/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/resou…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/resource.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/resource.h	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -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

Modified: trunk/reactos/dll/win32/hhctrl.ocx/search.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/searc…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/search.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/search.c	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -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);

Modified: trunk/reactos/dll/win32/hhctrl.ocx/stream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/strea…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/stream.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/stream.c	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -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)
 {

Modified: trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/hhctrl.ocx/webbr…
==============================================================================
--- trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/hhctrl.ocx/webbrowser.c	[iso-8859-1] Mon Dec 23 18:59:26 2013
@@ -19,10 +19,6 @@
  */
 
 #include "hhctrl.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp);
 
 typedef struct IOleClientSiteImpl
 {