Index: ps/trunk/source/ps/scripting/JSInterface_Console.h
===================================================================
--- ps/trunk/source/ps/scripting/JSInterface_Console.h
+++ ps/trunk/source/ps/scripting/JSInterface_Console.h
@@ -18,7 +18,7 @@
 #ifndef INCLUDED_JSI_CONSOLE
 #define INCLUDED_JSI_CONSOLE
 
-class ScriptInterface;
+#include "scriptinterface/ScriptInterface.h"
 
 namespace JSI_Console
 {
Index: ps/trunk/source/ps/scripting/JSInterface_Console.cpp
===================================================================
--- ps/trunk/source/ps/scripting/JSInterface_Console.cpp
+++ ps/trunk/source/ps/scripting/JSInterface_Console.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2018 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -17,11 +17,12 @@
 
 #include "precompiled.h"
 
-#include "scriptinterface/ScriptInterface.h"
 #include "JSInterface_Console.h"
+
 #include "ps/CConsole.h"
 #include "ps/CLogger.h"
 #include "ps/Profile.h"
+#include "scriptinterface/ScriptInterface.h"
 
 bool JSI_Console::CheckGlobalInitialized()
 {
Index: ps/trunk/source/ps/scripting/JSInterface_Mod.h
===================================================================
--- ps/trunk/source/ps/scripting/JSInterface_Mod.h
+++ ps/trunk/source/ps/scripting/JSInterface_Mod.h
@@ -21,8 +21,6 @@
 #include "ps/CStr.h"
 #include "scriptinterface/ScriptInterface.h"
 
-class ScriptInterface;
-
 namespace JSI_Mod
 {
 	void RegisterScriptFunctions(const ScriptInterface& scriptInterface);
Index: ps/trunk/source/ps/scripting/JSInterface_ModIo.h
===================================================================
--- ps/trunk/source/ps/scripting/JSInterface_ModIo.h
+++ ps/trunk/source/ps/scripting/JSInterface_ModIo.h
@@ -18,11 +18,8 @@
 #ifndef INCLUDED_JSI_MODIO
 #define INCLUDED_JSI_MODIO
 
-#include "ps/CStr.h"
 #include "scriptinterface/ScriptInterface.h"
 
-class ScriptInterface;
-
 namespace JSI_ModIo
 {
 	void RegisterScriptFunctions(const ScriptInterface& scriptInterface);
Index: ps/trunk/source/ps/scripting/JSInterface_ModIo.cpp
===================================================================
--- ps/trunk/source/ps/scripting/JSInterface_ModIo.cpp
+++ ps/trunk/source/ps/scripting/JSInterface_ModIo.cpp
@@ -20,7 +20,6 @@
 #include "JSInterface_ModIo.h"
 
 #include "ps/CLogger.h"
-#include "ps/Mod.h"
 #include "ps/ModIo.h"
 
 void JSI_ModIo::StartGetGameId(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
Index: ps/trunk/source/renderer/Renderer.h
===================================================================
--- ps/trunk/source/renderer/Renderer.h
+++ ps/trunk/source/renderer/Renderer.h
@@ -47,7 +47,6 @@
 class CTextureManager;
 class CTimeManager;
 class RenderPathVertexShader;
-class ScriptInterface;
 class ShadowMap;
 class SkyManager;
 class TerrainRenderer;