diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json
index 779cdff116..14f0774aa9 100644
--- a/binaries/data/mods/public/gui/credits/texts/programming.json
+++ b/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" },
diff --git a/source/graphics/MapGenerator.cpp b/source/graphics/MapGenerator.cpp
index 7752554000..4bbeb887cb 100644
--- a/source/graphics/MapGenerator.cpp
+++ b/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"
diff --git a/source/graphics/MapGenerator.h b/source/graphics/MapGenerator.h
index 4b47889bca..1c1b0faacf 100644
--- a/source/graphics/MapGenerator.h
+++ b/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>
diff --git a/source/graphics/MapReader.cpp b/source/graphics/MapReader.cpp
index c94e6a4ab1..f6007d9bda 100644
--- a/source/graphics/MapReader.cpp
+++ b/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"
diff --git a/source/graphics/tests/test_Model.h b/source/graphics/tests/test_Model.h
index e96729e2d9..a29d26cbda 100644
--- a/source/graphics/tests/test_Model.h
+++ b/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"
diff --git a/source/ps/Util.cpp b/source/ps/Util.cpp
index 0fe613a098..b0d588dd70 100644
--- a/source/ps/Util.cpp
+++ b/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)
 {
diff --git a/source/ps/scripting/JSInterface_VFS.h b/source/ps/scripting/JSInterface_VFS.h
index 53bf8fd43a..6528c34ac3 100644
--- a/source/ps/scripting/JSInterface_VFS.h
+++ b/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