Index: binaries/data/mods/public/gui/credits/texts/programming.json
===================================================================
--- binaries/data/mods/public/gui/credits/texts/programming.json
+++ binaries/data/mods/public/gui/credits/texts/programming.json
@@ -245,6 +245,7 @@
 				{ "nick": "RedFox", "name": "Jorma Rebane" },
 				{ "nick": "RefinedCode" },
 				{ "nick": "Riemer" },
+				{ "nick": "Riesi" },
 				{ "name": "Rolf Sievers" },
 				{ "nick": "s0600204", "name": "Matthew Norwood" },
 				{ "nick": "sacha_vrand", "name": "Sacha Vrand" },
Index: source/graphics/MapGenerator.h
===================================================================
--- source/graphics/MapGenerator.h
+++ source/graphics/MapGenerator.h
@@ -19,6 +19,7 @@
 #define INCLUDED_MAPGENERATOR
 
 #include "lib/file/vfs/vfs_path.h"
+#include "scriptinterface/ScriptTypes.h"
 #include "scriptinterface/StructuredClone.h"
 
 #include <atomic>
Index: source/graphics/MapGenerator.cpp
===================================================================
--- source/graphics/MapGenerator.cpp
+++ source/graphics/MapGenerator.cpp
@@ -28,7 +28,6 @@
 #include "maths/MathUtil.h"
 #include "ps/CLogger.h"
 #include "ps/FileIo.h"
-#include "ps/Profile.h"
 #include "ps/scripting/JSInterface_VFS.h"
 #include "ps/TemplateLoader.h"
 #include "scriptinterface/FunctionWrapper.h"
Index: source/graphics/MapReader.cpp
===================================================================
--- source/graphics/MapReader.cpp
+++ source/graphics/MapReader.cpp
@@ -32,6 +32,7 @@
 #include "maths/MathUtil.h"
 #include "ps/CLogger.h"
 #include "ps/Loader.h"
+#include "ps/Profiler2.h"
 #include "ps/TaskManager.h"
 #include "ps/World.h"
 #include "ps/XML/Xeromyces.h"
Index: source/graphics/tests/test_Model.h
===================================================================
--- source/graphics/tests/test_Model.h
+++ source/graphics/tests/test_Model.h
@@ -32,6 +32,7 @@
 #include "lib/file/io/io.h"
 #include "ps/ConfigDB.h"
 #include "ps/CStrInternStatic.h"
+#include "ps/Filesystem.h"
 #include "ps/ProfileViewer.h"
 #include "ps/VideoMode.h"
 #include "ps/XML/Xeromyces.h"
Index: source/ps/Util.cpp
===================================================================
--- source/ps/Util.cpp
+++ source/ps/Util.cpp
@@ -25,6 +25,8 @@
 #include "ps/Filesystem.h"
 #include "ps/Pyrogenesis.h"
 
+#include <iomanip>
+
 // not thread-safe!
 static const wchar_t* HardcodedErrorString(int err)
 {
Index: source/ps/scripting/JSInterface_VFS.h
===================================================================
--- source/ps/scripting/JSInterface_VFS.h
+++ source/ps/scripting/JSInterface_VFS.h
@@ -18,6 +18,8 @@
 #ifndef INCLUDED_JSI_VFS
 #define INCLUDED_JSI_VFS
 
+#include "scriptinterface/ScriptTypes.h"
+
 class ScriptRequest;
 
 namespace JSI_VFS