diff --git a/source/graphics/scripting/JSInterface_GameView.h b/source/graphics/scripting/JSInterface_GameView.h
index 79b27bd25d..302250a32a 100644
--- a/source/graphics/scripting/JSInterface_GameView.h
+++ b/source/graphics/scripting/JSInterface_GameView.h
@@ -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
@@ -15,12 +15,11 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #ifndef INCLUDED_JSINTERFACE_GAMEVIEW
 #define INCLUDED_JSINTERFACE_GAMEVIEW
 
-#include "scriptinterface/ScriptInterface.h"
 #include "maths/FixedVector3D.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "simulation2/helpers/Position.h"
 #include "simulation2/system/Entity.h"
 
@@ -50,4 +49,4 @@ namespace JSI_GameView
 
 #undef DECLARE_BOOLEAN_SCRIPT_SETTING
 
-#endif
+#endif // INCLUDED_JSINTERFACE_GAMEVIEW
diff --git a/source/gui/scripting/JSInterface_GUIManager.cpp b/source/gui/scripting/JSInterface_GUIManager.cpp
index f80c1568c3..c4a70be79f 100644
--- a/source/gui/scripting/JSInterface_GUIManager.cpp
+++ b/source/gui/scripting/JSInterface_GUIManager.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
@@ -21,8 +21,8 @@
 
 #include "gui/GUIManager.h"
 #include "gui/IGUIObject.h"
-#include "scriptinterface/ScriptInterface.h"
 #include "ps/GameSetup/Config.h"
+#include "scriptinterface/ScriptInterface.h"
 
 // Note that the initData argument may only contain clonable data.
 // Functions aren't supported for example!
diff --git a/source/gui/scripting/JSInterface_GUIManager.h b/source/gui/scripting/JSInterface_GUIManager.h
index 9e7b4105be..0d1119ae8d 100644
--- a/source/gui/scripting/JSInterface_GUIManager.h
+++ b/source/gui/scripting/JSInterface_GUIManager.h
@@ -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
@@ -36,4 +36,4 @@ namespace JSI_GUIManager
 	void RegisterScriptFunctions(const ScriptInterface& scriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_GUIMANAGER
diff --git a/source/gui/scripting/JSInterface_GUITypes.cpp b/source/gui/scripting/JSInterface_GUITypes.cpp
index 84e4715f63..e324c63dba 100644
--- a/source/gui/scripting/JSInterface_GUITypes.cpp
+++ b/source/gui/scripting/JSInterface_GUITypes.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
@@ -18,7 +18,9 @@
 #include "precompiled.h"
 
 #include "JSInterface_GUITypes.h"
+
 #include "ps/CStr.h"
+#include "scriptinterface/ScriptInterface.h"
 
 /**** GUISize ****/
 JSClass JSI_GUISize::JSI_class = {
diff --git a/source/gui/scripting/JSInterface_GUITypes.h b/source/gui/scripting/JSInterface_GUITypes.h
index d42003e11b..c6e47473e9 100644
--- a/source/gui/scripting/JSInterface_GUITypes.h
+++ b/source/gui/scripting/JSInterface_GUITypes.h
@@ -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
@@ -15,11 +15,11 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scriptinterface/ScriptInterface.h"
-
 #ifndef INCLUDED_JSI_GUITYPES
 #define INCLUDED_JSI_GUITYPES
 
+#include "scriptinterface/ScriptInterface.h"
+
 #define GUISTDTYPE(x)							\
 	namespace JSI_GUI##x						\
 	{											\
@@ -41,4 +41,4 @@ namespace JSI_GUITypes
 	void init(ScriptInterface& scriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_GUITYPES
diff --git a/source/gui/scripting/JSInterface_IGUIObject.h b/source/gui/scripting/JSInterface_IGUIObject.h
index 052efd5908..316a775351 100644
--- a/source/gui/scripting/JSInterface_IGUIObject.h
+++ b/source/gui/scripting/JSInterface_IGUIObject.h
@@ -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
@@ -15,11 +15,11 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "scriptinterface/ScriptInterface.h"
-
 #ifndef INCLUDED_JSI_IGUIOBJECT
 #define INCLUDED_JSI_IGUIOBJECT
 
+#include "scriptinterface/ScriptInterface.h"
+
 namespace JSI_IGUIObject
 {
 	extern JSClass JSI_class;
@@ -35,4 +35,4 @@ namespace JSI_IGUIObject
 	void init(ScriptInterface& scriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_IGUIOBJECT
diff --git a/source/i18n/scripting/JSInterface_L10n.cpp b/source/i18n/scripting/JSInterface_L10n.cpp
index 2f3f738908..f4844d3e66 100644
--- a/source/i18n/scripting/JSInterface_L10n.cpp
+++ b/source/i18n/scripting/JSInterface_L10n.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
@@ -22,6 +22,7 @@
 #include "i18n/L10n.h"
 #include "lib/utf8.h"
 #include "ps/Profile.h"
+#include "scriptinterface/ScriptInterface.h"
 
 // Returns a translation of the specified English string into the current language.
 std::wstring JSI_L10n::Translate(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& sourceString)
diff --git a/source/i18n/scripting/JSInterface_L10n.h b/source/i18n/scripting/JSInterface_L10n.h
index f3c97ffb09..1ffbdbf2d1 100644
--- a/source/i18n/scripting/JSInterface_L10n.h
+++ b/source/i18n/scripting/JSInterface_L10n.h
@@ -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
@@ -18,8 +18,8 @@
 #ifndef INCLUDED_JSINTERFACE_L10N
 #define INCLUDED_JSINTERFACE_L10N
 
-#include "scriptinterface/ScriptInterface.h"
 #include "lib/external_libraries/icu.h"
+#include "scriptinterface/ScriptInterface.h"
 
 /**
  * Namespace for the functions of the JavaScript interface for
@@ -452,4 +452,4 @@ namespace JSI_L10n
 	void ReevaluateCurrentLocaleAndReload(ScriptInterface::CxPrivate* UNUSED(pCxPrivate));
 }
 
-#endif
+#endif // INCLUDED_JSINTERFACE_L10N
diff --git a/source/lobby/scripting/JSInterface_Lobby.h b/source/lobby/scripting/JSInterface_Lobby.h
index 60c381a277..f6bd2ca804 100644
--- a/source/lobby/scripting/JSInterface_Lobby.h
+++ b/source/lobby/scripting/JSInterface_Lobby.h
@@ -68,4 +68,4 @@ namespace JSI_Lobby
 #endif // CONFIG2_LOBBY
 }
 
-#endif
+#endif // INCLUDED_JSI_LOBBY
diff --git a/source/network/scripting/JSInterface_Network.cpp b/source/network/scripting/JSInterface_Network.cpp
index 005e235cc5..8436532eb5 100644
--- a/source/network/scripting/JSInterface_Network.cpp
+++ b/source/network/scripting/JSInterface_Network.cpp
@@ -17,7 +17,7 @@
 
 #include "precompiled.h"
 
-#include "network/scripting/JSInterface_Network.h"
+#include "JSInterface_Network.h"
 
 #include "lib/external_libraries/enet.h"
 #include "lib/external_libraries/libsdl.h"
@@ -28,6 +28,7 @@
 #include "network/StunClient.h"
 #include "ps/CLogger.h"
 #include "ps/Game.h"
+#include "scriptinterface/ScriptInterface.h"
 
 u16 JSI_Network::GetDefaultPort(ScriptInterface::CxPrivate* UNUSED(pCxPrivate))
 {
diff --git a/source/network/scripting/JSInterface_Network.h b/source/network/scripting/JSInterface_Network.h
index 91d5e5afd6..1e74df5059 100644
--- a/source/network/scripting/JSInterface_Network.h
+++ b/source/network/scripting/JSInterface_Network.h
@@ -44,4 +44,4 @@ namespace JSI_Network
 	void RegisterScriptFunctions(const ScriptInterface& scriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_NETWORK
diff --git a/source/ps/Mod.cpp b/source/ps/Mod.cpp
index 9e6cc9ded0..83e9eb7704 100644
--- a/source/ps/Mod.cpp
+++ b/source/ps/Mod.cpp
@@ -27,6 +27,7 @@
 #include "ps/Filesystem.h"
 #include "ps/GameSetup/GameSetup.h"
 #include "ps/GameSetup/Paths.h"
+#include "scriptinterface/ScriptInterface.h"
 
 std::vector<CStr> g_modsLoaded;
 
diff --git a/source/ps/scripting/JSInterface_ConfigDB.h b/source/ps/scripting/JSInterface_ConfigDB.h
index 62926a0fb0..9ecb1bbf73 100644
--- a/source/ps/scripting/JSInterface_ConfigDB.h
+++ b/source/ps/scripting/JSInterface_ConfigDB.h
@@ -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
@@ -18,8 +18,8 @@
 #ifndef INCLUDED_JSI_CONFIGDB
 #define INCLUDED_JSI_CONFIGDB
 
-#include "scriptinterface/ScriptInterface.h"
 #include "ps/ConfigDB.h"
+#include "scriptinterface/ScriptInterface.h"
 
 namespace JSI_ConfigDB
 {
@@ -36,4 +36,4 @@ namespace JSI_ConfigDB
 	void RegisterScriptFunctions(const ScriptInterface& scriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_CONFIGDB
diff --git a/source/ps/scripting/JSInterface_Console.h b/source/ps/scripting/JSInterface_Console.h
index 075f85eee3..a1d741d638 100644
--- a/source/ps/scripting/JSInterface_Console.h
+++ b/source/ps/scripting/JSInterface_Console.h
@@ -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
@@ -29,4 +29,4 @@ namespace JSI_Console
 	void RegisterScriptFunctions(const ScriptInterface& scriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_CONSOLE
diff --git a/source/ps/scripting/JSInterface_Debug.cpp b/source/ps/scripting/JSInterface_Debug.cpp
index 6f21de0d0d..c222d7c007 100644
--- a/source/ps/scripting/JSInterface_Debug.cpp
+++ b/source/ps/scripting/JSInterface_Debug.cpp
@@ -26,6 +26,7 @@
 #include "ps/Profile.h"
 #include "ps/ProfileViewer.h"
 #include "ps/UserReport.h"
+#include "scriptinterface/ScriptInterface.h"
 
 /**
  * Microseconds since the epoch.
diff --git a/source/ps/scripting/JSInterface_Debug.h b/source/ps/scripting/JSInterface_Debug.h
index 3c3bc57863..463b85badf 100644
--- a/source/ps/scripting/JSInterface_Debug.h
+++ b/source/ps/scripting/JSInterface_Debug.h
@@ -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
@@ -36,4 +36,4 @@ namespace JSI_Debug
 	void RegisterScriptFunctions(const ScriptInterface& ScriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_DEBUG
diff --git a/source/ps/scripting/JSInterface_Game.cpp b/source/ps/scripting/JSInterface_Game.cpp
index de1c1843a5..e48ac8fc03 100644
--- a/source/ps/scripting/JSInterface_Game.cpp
+++ b/source/ps/scripting/JSInterface_Game.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
@@ -26,6 +26,7 @@
 #include "ps/Game.h"
 #include "ps/Replay.h"
 #include "ps/World.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "simulation2/system/TurnManager.h"
 #include "simulation2/Simulation2.h"
 #include "soundmanager/SoundManager.h"
diff --git a/source/ps/scripting/JSInterface_Game.h b/source/ps/scripting/JSInterface_Game.h
index 06e99913de..3e88bf0073 100644
--- a/source/ps/scripting/JSInterface_Game.h
+++ b/source/ps/scripting/JSInterface_Game.h
@@ -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
@@ -40,4 +40,4 @@ namespace JSI_Game
 	void RegisterScriptFunctions(const ScriptInterface& ScriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_GAME
diff --git a/source/ps/scripting/JSInterface_Main.cpp b/source/ps/scripting/JSInterface_Main.cpp
index 12cc3692d4..13076d5a3b 100644
--- a/source/ps/scripting/JSInterface_Main.cpp
+++ b/source/ps/scripting/JSInterface_Main.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
@@ -28,6 +28,7 @@
 #include "ps/GameSetup/Atlas.h"
 #include "ps/Globals.h"
 #include "ps/Hotkey.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "tools/atlas/GameInterface/GameLoop.h"
 
 extern void restart_mainloop_in_atlas();
diff --git a/source/ps/scripting/JSInterface_Main.h b/source/ps/scripting/JSInterface_Main.h
index 06772bcc56..12153f3a4e 100644
--- a/source/ps/scripting/JSInterface_Main.h
+++ b/source/ps/scripting/JSInterface_Main.h
@@ -37,4 +37,4 @@ namespace JSI_Main
 	void RegisterScriptFunctions(const ScriptInterface& scriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_MAIN
diff --git a/source/ps/scripting/JSInterface_Mod.cpp b/source/ps/scripting/JSInterface_Mod.cpp
index 9c4d949333..420ab9211b 100644
--- a/source/ps/scripting/JSInterface_Mod.cpp
+++ b/source/ps/scripting/JSInterface_Mod.cpp
@@ -20,6 +20,7 @@
 #include "JSInterface_Mod.h"
 
 #include "ps/Mod.h"
+#include "scriptinterface/ScriptInterface.h"
 
 extern void restart_engine();
 
diff --git a/source/ps/scripting/JSInterface_SavedGame.cpp b/source/ps/scripting/JSInterface_SavedGame.cpp
index 34948b0fae..4a1b5eb030 100644
--- a/source/ps/scripting/JSInterface_SavedGame.cpp
+++ b/source/ps/scripting/JSInterface_SavedGame.cpp
@@ -17,13 +17,14 @@
 
 #include "precompiled.h"
 
-#include "ps/scripting/JSInterface_SavedGame.h"
+#include "JSInterface_SavedGame.h"
 
 #include "network/NetClient.h"
 #include "network/NetServer.h"
 #include "ps/CLogger.h"
 #include "ps/Game.h"
 #include "ps/SavedGame.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/system/TurnManager.h"
 
diff --git a/source/ps/scripting/JSInterface_SavedGame.h b/source/ps/scripting/JSInterface_SavedGame.h
index 32187c93d7..7eed8f992b 100644
--- a/source/ps/scripting/JSInterface_SavedGame.h
+++ b/source/ps/scripting/JSInterface_SavedGame.h
@@ -33,4 +33,4 @@ namespace JSI_SavedGame
 	void RegisterScriptFunctions(const ScriptInterface& scriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_SAVEDGAME
diff --git a/source/ps/scripting/JSInterface_VFS.cpp b/source/ps/scripting/JSInterface_VFS.cpp
index 8a22660c08..1bb406bdce 100644
--- a/source/ps/scripting/JSInterface_VFS.cpp
+++ b/source/ps/scripting/JSInterface_VFS.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,15 +17,16 @@
 
 #include "precompiled.h"
 
-#include <sstream>
+#include "JSInterface_VFS.h"
 
+#include "lib/file/vfs/vfs_util.h"
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "ps/Filesystem.h"
 #include "scriptinterface/ScriptVal.h"
 #include "scriptinterface/ScriptInterface.h"
-#include "ps/scripting/JSInterface_VFS.h"
-#include "lib/file/vfs/vfs_util.h"
+
+#include <sstream>
 
 // Only allow engine compartments to read files they may be concerned about.
 #define PathRestriction_GUI {L""}
diff --git a/source/ps/scripting/JSInterface_VFS.h b/source/ps/scripting/JSInterface_VFS.h
index e438b9c91d..25725a62c8 100644
--- a/source/ps/scripting/JSInterface_VFS.h
+++ b/source/ps/scripting/JSInterface_VFS.h
@@ -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
@@ -15,17 +15,11 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// JSInterface_VFS.h
-//
-// The JavaScript wrapper around useful snippets of the VFS
-
 #ifndef INCLUDED_JSI_VFS
 #define INCLUDED_JSI_VFS
 
 #include "scriptinterface/ScriptInterface.h"
 
-// these are registered in ScriptFunctions.cpp, hence the need for a header.
-
 namespace JSI_VFS
 {
 	// Return an array of pathname strings, one for each matching entry in the
@@ -61,4 +55,4 @@ namespace JSI_VFS
 	void RegisterScriptFunctions_Maps(const ScriptInterface& scriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_VFS
diff --git a/source/ps/scripting/JSInterface_VisualReplay.cpp b/source/ps/scripting/JSInterface_VisualReplay.cpp
index e599beab33..fc20338e7b 100644
--- a/source/ps/scripting/JSInterface_VisualReplay.cpp
+++ b/source/ps/scripting/JSInterface_VisualReplay.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 "ps/scripting/JSInterface_VisualReplay.h"
+#include "JSInterface_VisualReplay.h"
 
 #include "ps/CStr.h"
 #include "ps/Profile.h"
 #include "ps/VisualReplay.h"
+#include "scriptinterface/ScriptInterface.h"
 
 bool JSI_VisualReplay::StartVisualReplay(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const CStrW& directory)
 {
diff --git a/source/ps/scripting/JSInterface_VisualReplay.h b/source/ps/scripting/JSInterface_VisualReplay.h
index ad275d936a..a6b212c235 100644
--- a/source/ps/scripting/JSInterface_VisualReplay.h
+++ b/source/ps/scripting/JSInterface_VisualReplay.h
@@ -33,4 +33,4 @@ namespace JSI_VisualReplay
 	CStrW GetReplayDirectoryName(ScriptInterface::CxPrivate* pCxPrivate, const CStrW& directoryName);
 }
 
-#endif
+#endif // INCLUDED_JSI_VISUALREPLAY
diff --git a/source/renderer/scripting/JSInterface_Renderer.cpp b/source/renderer/scripting/JSInterface_Renderer.cpp
index 31a611b017..6f6f35c7ab 100644
--- a/source/renderer/scripting/JSInterface_Renderer.cpp
+++ b/source/renderer/scripting/JSInterface_Renderer.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
@@ -18,9 +18,11 @@
 #include "precompiled.h"
 
 #include "JSInterface_Renderer.h"
+
 #include "ps/Profile.h"
 #include "renderer/Renderer.h"
 #include "renderer/ShadowMap.h"
+#include "scriptinterface/ScriptInterface.h"
 
 #define IMPLEMENT_BOOLEAN_SCRIPT_SETTING(NAME, SCRIPTNAME) \
 bool JSI_Renderer::Get##SCRIPTNAME##Enabled(ScriptInterface::CxPrivate* UNUSED(pCxPrivate)) \
diff --git a/source/renderer/scripting/JSInterface_Renderer.h b/source/renderer/scripting/JSInterface_Renderer.h
index f2d99bef62..f72fa18d9f 100644
--- a/source/renderer/scripting/JSInterface_Renderer.h
+++ b/source/renderer/scripting/JSInterface_Renderer.h
@@ -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
@@ -15,7 +15,6 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #ifndef INCLUDED_JSINTERFACE_RENDERER
 #define INCLUDED_JSINTERFACE_RENDERER
 
@@ -53,4 +52,4 @@ namespace JSI_Renderer
 
 #undef DECLARE_BOOLEAN_SCRIPT_SETTING
 
-#endif
+#endif // INCLUDED_JSINTERFACE_RENDERER
diff --git a/source/simulation2/scripting/JSInterface_Simulation.cpp b/source/simulation2/scripting/JSInterface_Simulation.cpp
index 6334999635..75ab14ab7b 100644
--- a/source/simulation2/scripting/JSInterface_Simulation.cpp
+++ b/source/simulation2/scripting/JSInterface_Simulation.cpp
@@ -17,14 +17,13 @@
 
 #include "precompiled.h"
 
-#include <fstream>
-
 #include "JSInterface_Simulation.h"
 
 #include "graphics/GameView.h"
 #include "ps/Game.h"
 #include "ps/GameSetup/Config.h"
 #include "ps/Pyrogenesis.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/system/Entity.h"
 #include "simulation2/components/ICmpAIManager.h"
@@ -33,6 +32,8 @@
 #include "simulation2/components/ICmpSelectable.h"
 #include "simulation2/helpers/Selection.h"
 
+#include <fstream>
+
 JS::Value JSI_Simulation::GetInitAttributes(ScriptInterface::CxPrivate* pCxPrivate)
 {
 	if (!g_Game)
diff --git a/source/simulation2/scripting/JSInterface_Simulation.h b/source/simulation2/scripting/JSInterface_Simulation.h
index abf4380e6a..0c8d44c967 100644
--- a/source/simulation2/scripting/JSInterface_Simulation.h
+++ b/source/simulation2/scripting/JSInterface_Simulation.h
@@ -38,4 +38,4 @@ namespace JSI_Simulation
 	void RegisterScriptFunctions(const ScriptInterface& ScriptInterface);
 }
 
-#endif
+#endif // INCLUDED_JSI_SIMULATION
diff --git a/source/soundmanager/scripting/JSInterface_Sound.cpp b/source/soundmanager/scripting/JSInterface_Sound.cpp
index 83a9d381d8..c50f996d7f 100644
--- a/source/soundmanager/scripting/JSInterface_Sound.cpp
+++ b/source/soundmanager/scripting/JSInterface_Sound.cpp
@@ -15,7 +15,6 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "precompiled.h"
-#include "scriptinterface/ScriptInterface.h"
 
 #include "JSInterface_Sound.h"
 
@@ -24,6 +23,7 @@
 #include "maths/Vector3D.h"
 #include "ps/Filesystem.h"
 #include "ps/Profile.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "soundmanager/SoundManager.h"
 
 #include <sstream>
diff --git a/source/soundmanager/scripting/JSInterface_Sound.h b/source/soundmanager/scripting/JSInterface_Sound.h
index 8aef08b01e..2c6586fc92 100644
--- a/source/soundmanager/scripting/JSInterface_Sound.h
+++ b/source/soundmanager/scripting/JSInterface_Sound.h
@@ -26,4 +26,4 @@ namespace JSI_Sound
 	void RegisterScriptFunctions(const ScriptInterface& scriptInterface);
 }
 
-#endif // #ifndef INCLUDED_SOUNDSCRIPTINTERFACE
+#endif // INCLUDED_SOUNDSCRIPTINTERFACE