diff --git a/build/premake/extern_libs.lua b/build/premake/extern_libs.lua
index 4e957393a0..d8b98be7eb 100644
--- a/build/premake/extern_libs.lua
+++ b/build/premake/extern_libs.lua
@@ -182,9 +182,14 @@ extern_lib_defs = {
 	options["with-spidermonkey-tip"] and
 	{
 		add_func = function()
-			tinsert(package.config["Debug"  ].includepaths, libraries_dir.."spidermonkey-tip/include/debug")
-			tinsert(package.config["Testing"].includepaths, libraries_dir.."spidermonkey-tip/include/debug")
-			tinsert(package.config["Release"].includepaths, libraries_dir.."spidermonkey-tip/include/release")
+			if OS == "windows" then
+				include_dir = "include-win32"
+			else
+				include_dir = "include-unix"
+			end
+			tinsert(package.config["Debug"  ].includepaths, libraries_dir.."spidermonkey-tip/"..include_dir.."/debug")
+			tinsert(package.config["Testing"].includepaths, libraries_dir.."spidermonkey-tip/"..include_dir.."/debug")
+			tinsert(package.config["Release"].includepaths, libraries_dir.."spidermonkey-tip/"..include_dir.."/release")
 			tinsert(package.libpaths, libraries_dir.."spidermonkey-tip/lib")
 			tinsert(package.config["Debug"  ].links, "mozjs-ps-debug")
 			tinsert(package.config["Testing"].links, "mozjs-ps-release")
diff --git a/source/i18n/ScriptInterface.h b/source/i18n/ScriptInterface.h
index 0421145e7e..4b3dafdc5b 100644
--- a/source/i18n/ScriptInterface.h
+++ b/source/i18n/ScriptInterface.h
@@ -35,7 +35,7 @@ and 'variables' (dependent on the type passed with "translate(...) <<").
 ERROR_SUBGROUP(I18n, Script);
 ERROR_TYPE(I18n_Script, SetupFailed);
 
-typedef _W64 long JSWord;
+typedef intptr_t JSWord;
 typedef JSWord jsword;
 typedef jsword jsval;
 typedef unsigned short jschar;
diff --git a/source/scripting/ScriptingHost.cpp b/source/scripting/ScriptingHost.cpp
index 57f7c2cb64..caf859e266 100644
--- a/source/scripting/ScriptingHost.cpp
+++ b/source/scripting/ScriptingHost.cpp
@@ -26,15 +26,6 @@
 #include "ps/Filesystem.h"
 #include "scriptinterface/ScriptInterface.h"
 
-
-#if OS_WIN
-#ifdef NDEBUG
-# pragma comment (lib, "js32.lib")
-#else
-# pragma comment (lib, "js32d.lib")
-#endif
-#endif
-
 #define LOG_CATEGORY L"scriptinghost"
 
 namespace