diff --git a/source/gui/CGUISetting.h b/source/gui/CGUISetting.h
index 1f6cfdf7d1..e5a9e17017 100644
--- a/source/gui/CGUISetting.h
+++ b/source/gui/CGUISetting.h
@@ -21,7 +21,15 @@
 #include "lib/code_annotation.h"
 #include "ps/CStr.h"
 
+#if MSC_VERSION
+# pragma warning(push, 1)
+# pragma warning(disable: 4068)
+# pragma warning(disable: 4100)
+#endif
 #include <js/TypeDecls.h>
+#if MSC_VERSION
+# pragma warning(pop)
+#endif
 #include <utility>
 
 class IGUIObject;
diff --git a/source/gui/ObjectBases/IGUIObject.cpp b/source/gui/ObjectBases/IGUIObject.cpp
index 38938f9090..74ba6143dc 100644
--- a/source/gui/ObjectBases/IGUIObject.cpp
+++ b/source/gui/ObjectBases/IGUIObject.cpp
@@ -31,6 +31,7 @@
 #include "ps/Profiler2.h"
 #include "scriptinterface/Object.h"
 #include "scriptinterface/ScriptExceptions.h"
+#include "scriptinterface/ScriptExtraHeaders.h"
 #include "scriptinterface/ScriptRequest.h"
 #include "soundmanager/ISoundManager.h"
 
diff --git a/source/gui/ObjectBases/IGUIObject.h b/source/gui/ObjectBases/IGUIObject.h
index 94a9832a32..d7c9fb0578 100644
--- a/source/gui/ObjectBases/IGUIObject.h
+++ b/source/gui/ObjectBases/IGUIObject.h
@@ -33,6 +33,7 @@
 #include "lib/input.h"
 #include "maths/Rect.h"
 #include "ps/CStr.h"
+#include "scriptinterface/ScriptTypes.h"
 
 #include <js/RootingAPI.h>
 #include <js/TypeDecls.h>
diff --git a/source/ps/XMB/XMBStorage.h b/source/ps/XMB/XMBStorage.h
index 9bb4375624..a94fec358d 100644
--- a/source/ps/XMB/XMBStorage.h
+++ b/source/ps/XMB/XMBStorage.h
@@ -21,7 +21,15 @@
 #include "lib/types.h"
 
 #include <cstddef>
+#if MSC_VERSION
+# pragma warning(push, 1)
+# pragma warning(disable: 4068)
+# pragma warning(disable: 4100)
+#endif
 #include <js/TypeDecls.h>
+#if MSC_VERSION
+# pragma warning(pop)
+#endif
 #include <libxml/parser.h>
 #include <memory>
 #include <string>