From c36b4a7737641e1fa8078d64f4293c221c420658 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Tue, 24 Dec 2013 21:47:58 +0000
Subject: [PATCH] [JSCRIPT] * 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=61386
---
 reactos/dll/win32/jscript/activex.c          |  8 +-------
 reactos/dll/win32/jscript/array.c            |  9 ---------
 reactos/dll/win32/jscript/bool.c             |  4 ----
 reactos/dll/win32/jscript/compile.c          |  7 -------
 reactos/dll/win32/jscript/date.c             | 11 ----------
 reactos/dll/win32/jscript/decode.c           |  4 ----
 reactos/dll/win32/jscript/dispex.c           |  7 -------
 reactos/dll/win32/jscript/engine.c           | 11 ----------
 reactos/dll/win32/jscript/error.c            |  8 --------
 reactos/dll/win32/jscript/function.c         |  7 -------
 reactos/dll/win32/jscript/global.c           | 11 ----------
 reactos/dll/win32/jscript/jscript.c          |  8 +-------
 reactos/dll/win32/jscript/jscript.h          | 21 +++++++++++++++-----
 reactos/dll/win32/jscript/jscript_main.c     | 12 +----------
 reactos/dll/win32/jscript/jsregexp.c         |  7 -------
 reactos/dll/win32/jscript/jsstr.c            |  4 ----
 reactos/dll/win32/jscript/jsutils.c          | 10 ----------
 reactos/dll/win32/jscript/lang/jscript_Da.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_De.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_En.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Es.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Fr.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_He.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Hu.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_It.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Ja.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Ko.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Lt.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Nl.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_No.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Pl.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Pt.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Ro.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Ru.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Si.rc |  2 --
 reactos/dll/win32/jscript/lang/jscript_Uk.rc |  2 --
 reactos/dll/win32/jscript/lex.c              | 13 ------------
 reactos/dll/win32/jscript/math.c             | 11 +---------
 reactos/dll/win32/jscript/number.c           | 10 ----------
 reactos/dll/win32/jscript/object.c           |  6 ------
 reactos/dll/win32/jscript/parser.tab.c       |  6 ------
 reactos/dll/win32/jscript/regexp.c           |  7 -------
 reactos/dll/win32/jscript/resource.h         |  2 +-
 reactos/dll/win32/jscript/rsrc.rc            |  4 ++++
 reactos/dll/win32/jscript/string.c           |  8 --------
 reactos/dll/win32/jscript/vbarray.c          |  4 ----
 46 files changed, 25 insertions(+), 233 deletions(-)

diff --git a/reactos/dll/win32/jscript/activex.c b/reactos/dll/win32/jscript/activex.c
index 36f52baba3a..30d7869b9d6 100644
--- a/reactos/dll/win32/jscript/activex.c
+++ b/reactos/dll/win32/jscript/activex.c
@@ -16,17 +16,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-//#include "wine/port.h"
-
 #include "jscript.h"
+
 #include <objsafe.h>
 #include <mshtmhst.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 /* Defined as extern in urlmon.idl, but not exported by uuid.lib */
 const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY =
     {0x10200490,0xfa38,0x11d0,{0xac,0x0e,0x00,0xa0,0xc9,0xf,0xff,0xc0}};
diff --git a/reactos/dll/win32/jscript/array.c b/reactos/dll/win32/jscript/array.c
index 3b05c1dab30..8d488274f51 100644
--- a/reactos/dll/win32/jscript/array.c
+++ b/reactos/dll/win32/jscript/array.c
@@ -16,17 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <wine/config.h>
-#include <wine/port.h>
-
-#include <math.h>
-
 #include "jscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 typedef struct {
     jsdisp_t dispex;
 
diff --git a/reactos/dll/win32/jscript/bool.c b/reactos/dll/win32/jscript/bool.c
index 2a96b6c0268..dffaecb58b3 100644
--- a/reactos/dll/win32/jscript/bool.c
+++ b/reactos/dll/win32/jscript/bool.c
@@ -19,10 +19,6 @@
 
 #include "jscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 typedef struct {
     jsdisp_t dispex;
 
diff --git a/reactos/dll/win32/jscript/compile.c b/reactos/dll/win32/jscript/compile.c
index 3d9ad74b78a..abc86432e0e 100644
--- a/reactos/dll/win32/jscript/compile.c
+++ b/reactos/dll/win32/jscript/compile.c
@@ -16,15 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <math.h>
-#include <assert.h>
-
 #include "jscript.h"
-#include "engine.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 WINE_DECLARE_DEBUG_CHANNEL(jscript_disas);
 
 typedef struct _statement_ctx_t {
diff --git a/reactos/dll/win32/jscript/date.c b/reactos/dll/win32/jscript/date.c
index f48d4e9e745..9cd1e26e9fd 100644
--- a/reactos/dll/win32/jscript/date.c
+++ b/reactos/dll/win32/jscript/date.c
@@ -17,19 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
-//#include <limits.h>
-//#include <math.h>
-#include <assert.h>
-
 #include "jscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 /* 1601 to 1970 is 369 years plus 89 leap days */
 #define TIME_EPOCH  ((ULONGLONG)(369 * 365 + 89) * 86400 * 1000)
 
diff --git a/reactos/dll/win32/jscript/decode.c b/reactos/dll/win32/jscript/decode.c
index bae0a39d4d8..297070c828b 100644
--- a/reactos/dll/win32/jscript/decode.c
+++ b/reactos/dll/win32/jscript/decode.c
@@ -18,10 +18,6 @@
 
 #include "jscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 /*
  * This file implements algorithm for decoding scripts encoded by
  * screnc.exe. The 'secret' algorithm that's well documented here:
diff --git a/reactos/dll/win32/jscript/dispex.c b/reactos/dll/win32/jscript/dispex.c
index 96280beaa4e..d99a2367f55 100644
--- a/reactos/dll/win32/jscript/dispex.c
+++ b/reactos/dll/win32/jscript/dispex.c
@@ -16,15 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
 #include "jscript.h"
 
-//#include "wine/unicode.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 /*
  * This IID is used to get jsdisp_t objecto from interface.
  * We might consider using private interface instead.
diff --git a/reactos/dll/win32/jscript/engine.c b/reactos/dll/win32/jscript/engine.c
index c82678fb644..222d9b494a9 100644
--- a/reactos/dll/win32/jscript/engine.c
+++ b/reactos/dll/win32/jscript/engine.c
@@ -16,18 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
-#include <assert.h>
-
 #include "jscript.h"
-#include "engine.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 
 static const WCHAR booleanW[] = {'b','o','o','l','e','a','n',0};
 static const WCHAR functionW[] = {'f','u','n','c','t','i','o','n',0};
diff --git a/reactos/dll/win32/jscript/error.c b/reactos/dll/win32/jscript/error.c
index aa5e9d7a26b..896c7c21399 100644
--- a/reactos/dll/win32/jscript/error.c
+++ b/reactos/dll/win32/jscript/error.c
@@ -15,17 +15,9 @@
  * 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 <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
 
 #include "jscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 static const WCHAR descriptionW[] = {'d','e','s','c','r','i','p','t','i','o','n',0};
 static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0};
 static const WCHAR nameW[] = {'n','a','m','e',0};
diff --git a/reactos/dll/win32/jscript/function.c b/reactos/dll/win32/jscript/function.c
index 9ff7bb803a1..b397957cb47 100644
--- a/reactos/dll/win32/jscript/function.c
+++ b/reactos/dll/win32/jscript/function.c
@@ -16,14 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
 #include "jscript.h"
-#include "engine.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 
 typedef struct {
     jsdisp_t dispex;
diff --git a/reactos/dll/win32/jscript/global.c b/reactos/dll/win32/jscript/global.c
index 160b147e9ff..fa1b7910c33 100644
--- a/reactos/dll/win32/jscript/global.c
+++ b/reactos/dll/win32/jscript/global.c
@@ -16,18 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
-//#include <limits.h>
-
 #include "jscript.h"
-#include "engine.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 
 #define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff)
 
diff --git a/reactos/dll/win32/jscript/jscript.c b/reactos/dll/win32/jscript/jscript.c
index 60f34f285bf..dda7051eb8b 100644
--- a/reactos/dll/win32/jscript/jscript.c
+++ b/reactos/dll/win32/jscript/jscript.c
@@ -16,16 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
 #include "jscript.h"
-#include "engine.h"
+
 #include <objsafe.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 #ifdef _WIN64
 
 #define CTXARG_T DWORDLONG
diff --git a/reactos/dll/win32/jscript/jscript.h b/reactos/dll/win32/jscript/jscript.h
index 787661c46af..4c4e03cd3e0 100644
--- a/reactos/dll/win32/jscript/jscript.h
+++ b/reactos/dll/win32/jscript/jscript.h
@@ -16,13 +16,18 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <wine/config.h>
+#include <wine/port.h>
+
+#include <assert.h>
+#include <math.h>
+#include <stdarg.h>
+#include <stdio.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H
 
-#include <stdarg.h>
-#include <stdio.h>
-
 #define COBJMACROS
 
 #include <windef.h>
@@ -32,11 +37,14 @@
 #include <dispex.h>
 #include <activscp.h>
 
-#include "resource.h"
-
 #include <wine/unicode.h>
 #include <wine/list.h>
 
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(jscript);
+
+#include "resource.h"
+
 typedef struct _jsval_t jsval_t;
 typedef struct _jsstr_t jsstr_t;
 typedef struct _script_ctx_t script_ctx_t;
@@ -545,3 +553,6 @@ static inline void unlock_module(void)
 {
     InterlockedDecrement(&module_ref);
 }
+
+#include "engine.h"
+#include "regexp.h"
diff --git a/reactos/dll/win32/jscript/jscript_main.c b/reactos/dll/win32/jscript/jscript_main.c
index df7f6a362d3..9cfb2e55c58 100644
--- a/reactos/dll/win32/jscript/jscript_main.c
+++ b/reactos/dll/win32/jscript/jscript_main.c
@@ -16,22 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <initguid.h>
-
 #include "jscript.h"
 
-#include <winreg.h>
-#include <advpub.h>
-#include <activaut.h>
-#include <objsafe.h>
-#include <mshtmhst.h>
+#include <initguid.h>
 #include <rpcproxy.h>
 #include <jscript_classes.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 LONG module_ref = 0;
 
 DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
diff --git a/reactos/dll/win32/jscript/jsregexp.c b/reactos/dll/win32/jscript/jsregexp.c
index 10c4ef2ac0d..49da0e7c97c 100644
--- a/reactos/dll/win32/jscript/jsregexp.c
+++ b/reactos/dll/win32/jscript/jsregexp.c
@@ -16,14 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <math.h>
-
 #include "jscript.h"
-#include "regexp.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 
 typedef struct {
     jsdisp_t dispex;
diff --git a/reactos/dll/win32/jscript/jsstr.c b/reactos/dll/win32/jscript/jsstr.c
index 7cb1fce20b0..b99cd6a3a4f 100644
--- a/reactos/dll/win32/jscript/jsstr.c
+++ b/reactos/dll/win32/jscript/jsstr.c
@@ -16,12 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
 #include "jscript.h"
 
-#include <wine/debug.h>
-
 /*
  * This is the length of a string that is considered to be long enough to be
  * worth the rope to avoid copy.
diff --git a/reactos/dll/win32/jscript/jsutils.c b/reactos/dll/win32/jscript/jsutils.c
index 97fd1721b84..7383370db51 100644
--- a/reactos/dll/win32/jscript/jsutils.c
+++ b/reactos/dll/win32/jscript/jsutils.c
@@ -16,18 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
-#include <assert.h>
-
 #include "jscript.h"
-//#include "engine.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 WINE_DECLARE_DEBUG_CHANNEL(heap);
 
 const char *debugstr_variant(const VARIANT *v)
diff --git a/reactos/dll/win32/jscript/lang/jscript_Da.rc b/reactos/dll/win32/jscript/lang/jscript_Da.rc
index 133c09527b4..bf7f9951968 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Da.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Da.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
diff --git a/reactos/dll/win32/jscript/lang/jscript_De.rc b/reactos/dll/win32/jscript/lang/jscript_De.rc
index 82628c9b7c3..74d77bfb608 100644
--- a/reactos/dll/win32/jscript/lang/jscript_De.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_De.rc
@@ -16,8 +16,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/jscript/lang/jscript_En.rc b/reactos/dll/win32/jscript/lang/jscript_En.rc
index d98b0b691d0..d396b9926bf 100644
--- a/reactos/dll/win32/jscript/lang/jscript_En.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_En.rc
@@ -16,8 +16,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/jscript/lang/jscript_Es.rc b/reactos/dll/win32/jscript/lang/jscript_Es.rc
index a953d61f170..ba2520ef44d 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Es.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Es.rc
@@ -16,8 +16,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/jscript/lang/jscript_Fr.rc b/reactos/dll/win32/jscript/lang/jscript_Fr.rc
index a5247a80dd1..2789f5dc95b 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Fr.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Fr.rc
@@ -18,8 +18,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/jscript/lang/jscript_He.rc b/reactos/dll/win32/jscript/lang/jscript_He.rc
index 75aae4a3848..d3f4f88b17a 100644
--- a/reactos/dll/win32/jscript/lang/jscript_He.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_He.rc
@@ -18,8 +18,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/jscript/lang/jscript_Hu.rc b/reactos/dll/win32/jscript/lang/jscript_Hu.rc
index b6ee1a3a77b..b1d97ebe4b4 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Hu.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Hu.rc
@@ -16,8 +16,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/jscript/lang/jscript_It.rc b/reactos/dll/win32/jscript/lang/jscript_It.rc
index 3bfea6395cc..90ea64004cf 100644
--- a/reactos/dll/win32/jscript/lang/jscript_It.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_It.rc
@@ -17,8 +17,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/jscript/lang/jscript_Ja.rc b/reactos/dll/win32/jscript/lang/jscript_Ja.rc
index b95e4aab190..35574d621b3 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Ja.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Ja.rc
@@ -17,8 +17,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/jscript/lang/jscript_Ko.rc b/reactos/dll/win32/jscript/lang/jscript_Ko.rc
index d45094e6bd8..f7184668294 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Ko.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Ko.rc
@@ -17,8 +17,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/jscript/lang/jscript_Lt.rc b/reactos/dll/win32/jscript/lang/jscript_Lt.rc
index 70e0d9670a8..9dfee1d0fca 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Lt.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Lt.rc
@@ -16,8 +16,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/jscript/lang/jscript_Nl.rc b/reactos/dll/win32/jscript/lang/jscript_Nl.rc
index e140b319a07..96b1dd21f3b 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Nl.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Nl.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 #pragma code_page(65001)
diff --git a/reactos/dll/win32/jscript/lang/jscript_No.rc b/reactos/dll/win32/jscript/lang/jscript_No.rc
index 9b9d9bbec82..0811226d777 100644
--- a/reactos/dll/win32/jscript/lang/jscript_No.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_No.rc
@@ -16,8 +16,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
diff --git a/reactos/dll/win32/jscript/lang/jscript_Pl.rc b/reactos/dll/win32/jscript/lang/jscript_Pl.rc
index ff924a3f924..468981682e1 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Pl.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Pl.rc
@@ -16,8 +16,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/jscript/lang/jscript_Pt.rc b/reactos/dll/win32/jscript/lang/jscript_Pt.rc
index 1ead171548b..db90b414ee9 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Pt.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Pt.rc
@@ -17,8 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "resource.h"
-
 #pragma code_page(65001)
 
 LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN
diff --git a/reactos/dll/win32/jscript/lang/jscript_Ro.rc b/reactos/dll/win32/jscript/lang/jscript_Ro.rc
index ec35c37b539..0db6517296c 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Ro.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Ro.rc
@@ -18,8 +18,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/jscript/lang/jscript_Ru.rc b/reactos/dll/win32/jscript/lang/jscript_Ru.rc
index ce58b44261c..b3a32310b6e 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Ru.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Ru.rc
@@ -16,8 +16,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/jscript/lang/jscript_Si.rc b/reactos/dll/win32/jscript/lang/jscript_Si.rc
index 1f282dd26b4..7453c331caf 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Si.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Si.rc
@@ -16,8 +16,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/jscript/lang/jscript_Uk.rc b/reactos/dll/win32/jscript/lang/jscript_Uk.rc
index 6f0913ac677..f08787e6f67 100644
--- a/reactos/dll/win32/jscript/lang/jscript_Uk.rc
+++ b/reactos/dll/win32/jscript/lang/jscript_Uk.rc
@@ -17,8 +17,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/jscript/lex.c b/reactos/dll/win32/jscript/lex.c
index 1d3e07d3d8c..effdf6456ef 100644
--- a/reactos/dll/win32/jscript/lex.c
+++ b/reactos/dll/win32/jscript/lex.c
@@ -16,23 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
-//#include <limits.h>
-
 #include "jscript.h"
-//#include "activscp.h"
-//#include "objsafe.h"
-#include "engine.h"
 
 #include "parser.tab.h"
 
-#include <wine/debug.h>
-//#include "wine/unicode.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 #define LONGLONG_MAX (((LONGLONG)0x7fffffff<<32)|0xffffffff)
 
 static const WCHAR breakW[] = {'b','r','e','a','k',0};
diff --git a/reactos/dll/win32/jscript/math.c b/reactos/dll/win32/jscript/math.c
index 19acd30a75d..77c2062380a 100644
--- a/reactos/dll/win32/jscript/math.c
+++ b/reactos/dll/win32/jscript/math.c
@@ -17,19 +17,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
-//#include <limits.h>
-
 #include "jscript.h"
+
 #include <ntsecapi.h>
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 static const WCHAR EW[] = {'E',0};
 static const WCHAR LOG2EW[] = {'L','O','G','2','E',0};
 static const WCHAR LOG10EW[] = {'L','O','G','1','0','E',0};
diff --git a/reactos/dll/win32/jscript/number.c b/reactos/dll/win32/jscript/number.c
index 50a73381e84..7b5a46de3be 100644
--- a/reactos/dll/win32/jscript/number.c
+++ b/reactos/dll/win32/jscript/number.c
@@ -16,18 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <config.h>
-#include <wine/port.h>
-
-//#include <math.h>
-#include <assert.h>
-
 #include "jscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 typedef struct {
     jsdisp_t dispex;
 
diff --git a/reactos/dll/win32/jscript/object.c b/reactos/dll/win32/jscript/object.c
index 4e102e8132b..daa026f1196 100644
--- a/reactos/dll/win32/jscript/object.c
+++ b/reactos/dll/win32/jscript/object.c
@@ -16,14 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <assert.h>
-
 #include "jscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0};
 static const WCHAR toLocaleStringW[] = {'t','o','L','o','c','a','l','e','S','t','r','i','n','g',0};
 static const WCHAR valueOfW[] = {'v','a','l','u','e','O','f',0};
diff --git a/reactos/dll/win32/jscript/parser.tab.c b/reactos/dll/win32/jscript/parser.tab.c
index 6a8ae68585b..44039655649 100644
--- a/reactos/dll/win32/jscript/parser.tab.c
+++ b/reactos/dll/win32/jscript/parser.tab.c
@@ -76,13 +76,7 @@
 /* Line 268 of yacc.c  */
 #line 19 "parser.y"
 
-
 #include "jscript.h"
-#include "engine.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 
 static int parser_error(parser_ctx_t*,const char*);
 static void set_error(parser_ctx_t*,UINT);
diff --git a/reactos/dll/win32/jscript/regexp.c b/reactos/dll/win32/jscript/regexp.c
index 6b0fc4bf84a..ed384485650 100644
--- a/reactos/dll/win32/jscript/regexp.c
+++ b/reactos/dll/win32/jscript/regexp.c
@@ -31,14 +31,7 @@
  * the Initial Developer. All Rights Reserved.
  */
 
-#include <assert.h>
-
 #include "jscript.h"
-#include "regexp.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 
 /* FIXME: Better error handling */
 #define ReportRegExpError(a,b,c)
diff --git a/reactos/dll/win32/jscript/resource.h b/reactos/dll/win32/jscript/resource.h
index fc4c8294181..cfe0881eef5 100644
--- a/reactos/dll/win32/jscript/resource.h
+++ b/reactos/dll/win32/jscript/resource.h
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <windef.h>
+#pragma once
 
 #define JSCRIPT_MAJOR_VERSION 5
 #define JSCRIPT_MINOR_VERSION 8
diff --git a/reactos/dll/win32/jscript/rsrc.rc b/reactos/dll/win32/jscript/rsrc.rc
index 776937a317d..0f9b0a68052 100644
--- a/reactos/dll/win32/jscript/rsrc.rc
+++ b/reactos/dll/win32/jscript/rsrc.rc
@@ -16,6 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <windef.h>
+
+#include "resource.h"
+
 /* @makedep: jscript.rgs */
 2 WINE_REGISTRY jscript.rgs
 
diff --git a/reactos/dll/win32/jscript/string.c b/reactos/dll/win32/jscript/string.c
index e86c706b051..08ef69fc7f1 100644
--- a/reactos/dll/win32/jscript/string.c
+++ b/reactos/dll/win32/jscript/string.c
@@ -16,15 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include "config.h"
-#include "wine/port.h"
-
 #include "jscript.h"
-#include "regexp.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
 
 #define UINT32_MAX 0xffffffff
 
diff --git a/reactos/dll/win32/jscript/vbarray.c b/reactos/dll/win32/jscript/vbarray.c
index 593d62f8b22..a598cdd88a7 100644
--- a/reactos/dll/win32/jscript/vbarray.c
+++ b/reactos/dll/win32/jscript/vbarray.c
@@ -18,10 +18,6 @@
 
 #include "jscript.h"
 
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(jscript);
-
 typedef struct {
     jsdisp_t dispex;