diff --git a/core/include/mmcore/LuaAPI.h b/core/include/mmcore/LuaAPI.h
index 115e5e14da..853d779192 100644
--- a/core/include/mmcore/LuaAPI.h
+++ b/core/include/mmcore/LuaAPI.h
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include <map>
 #include <mutex>
 #include <string>
 
@@ -14,8 +15,6 @@
 #define SOL_PRINT_ERRORS 0
 #include <sol/sol.hpp>
 
-#include "mmcore/MegaMolGraph.h"
-
 #ifdef MEGAMOL_USE_TRACY
 #include <tracy/Tracy.hpp>
 #endif
diff --git a/core/include/mmcore/utility/animation/AnimationData.h b/core/include/mmcore/utility/animation/AnimationData.h
index 13fb9b13fa..44c9673210 100644
--- a/core/include/mmcore/utility/animation/AnimationData.h
+++ b/core/include/mmcore/utility/animation/AnimationData.h
@@ -13,8 +13,6 @@
 #include <imgui.h>
 #include <sol/sol.hpp>
 
-#include "mmcore/MegaMolGraph.h"
-
 namespace megamol::core::utility::animation {
 
 using KeyTimeType = int32_t;
diff --git a/frontend/main/src/CLIConfigParsing.cpp b/frontend/main/src/CLIConfigParsing.cpp
index 6c8efdfcfc..023d0c5146 100644
--- a/frontend/main/src/CLIConfigParsing.cpp
+++ b/frontend/main/src/CLIConfigParsing.cpp
@@ -10,10 +10,16 @@
 #include <cstdlib>
 #include <filesystem>
 #include <fstream>
+#include <numeric>
+#include <vector>
 
 #define CXXOPTS_VECTOR_DELIMITER '\0'
 #include <cxxopts.hpp>
 
+#ifdef _WIN32
+#include "Windows.h"
+#endif
+
 // find user home
 static std::filesystem::path getHomeDir() {
 #ifdef _WIN32
diff --git a/frontend/services/lua_service_wrapper/Lua_Service_Wrapper.cpp b/frontend/services/lua_service_wrapper/Lua_Service_Wrapper.cpp
index e2c27f1fec..b082e94aea 100644
--- a/frontend/services/lua_service_wrapper/Lua_Service_Wrapper.cpp
+++ b/frontend/services/lua_service_wrapper/Lua_Service_Wrapper.cpp
@@ -20,6 +20,7 @@
 #include "GUIRegisterWindow.h"
 #include "LuaApiResource.h"
 #include "PerformanceManager.h"
+#include "mmcore/MegaMolGraph.h"
 #include "mmcore/utility/buildinfo/BuildInfo.h"
 #include "mmcore/utility/log/Log.h"