diff --git a/loader/include/Geode/ui/GeodeUI.hpp b/loader/include/Geode/ui/GeodeUI.hpp
index 2d9ba1ad..8fd3c726 100644
--- a/loader/include/Geode/ui/GeodeUI.hpp
+++ b/loader/include/Geode/ui/GeodeUI.hpp
@@ -2,6 +2,7 @@
 
 #include "../loader/Mod.hpp"
 #include <Geode/binding/FLAlertLayer.hpp>
+#include <Geode/ui/Popup.hpp>
 
 class ModPopup;
 class ModItem;
diff --git a/loader/include/Geode/utils/JsonValidation.hpp b/loader/include/Geode/utils/JsonValidation.hpp
index 53357a6f..cc32b56b 100644
--- a/loader/include/Geode/utils/JsonValidation.hpp
+++ b/loader/include/Geode/utils/JsonValidation.hpp
@@ -5,6 +5,7 @@
 #include <set>
 #include <variant>
 #include <Geode/utils/MiniFunction.hpp>
+#include <Geode/utils/Result.hpp>
 
 namespace geode {
     struct JsonChecker;
diff --git a/loader/src/loader/SettingNodeV3.cpp b/loader/src/loader/SettingNodeV3.cpp
index 74e5da14..1985df9b 100644
--- a/loader/src/loader/SettingNodeV3.cpp
+++ b/loader/src/loader/SettingNodeV3.cpp
@@ -1,6 +1,8 @@
 #include "SettingNodeV3.hpp"
 #include <Geode/loader/SettingNode.hpp>
 #include <Geode/utils/ColorProvider.hpp>
+#include <Geode/utils/ranges.hpp>
+#include <Geode/loader/Dirs.hpp>
 #include <ui/mods/GeodeStyle.hpp>
 
 class SettingNodeSizeChangeEventV3::Impl final {
diff --git a/loader/src/loader/SettingNodeV3.hpp b/loader/src/loader/SettingNodeV3.hpp
index 781db5f2..c20f498b 100644
--- a/loader/src/loader/SettingNodeV3.hpp
+++ b/loader/src/loader/SettingNodeV3.hpp
@@ -3,6 +3,8 @@
 #include <Geode/loader/SettingV3.hpp>
 #include <Geode/loader/SettingNode.hpp>
 #include <Geode/binding/CCMenuItemToggler.hpp>
+#include <Geode/binding/ColorChannelSprite.hpp>
+#include <Geode/binding/Slider.hpp>
 #include <Geode/ui/ColorPickPopup.hpp>
 
 using namespace geode::prelude;
diff --git a/loader/src/loader/SettingV3.cpp b/loader/src/loader/SettingV3.cpp
index 04f0fa80..118d4ce6 100644
--- a/loader/src/loader/SettingV3.cpp
+++ b/loader/src/loader/SettingV3.cpp
@@ -1,6 +1,9 @@
 #include <Geode/loader/SettingV3.hpp>
 #include <Geode/loader/SettingEvent.hpp>
 #include <Geode/loader/ModSettingsManager.hpp>
+#include <Geode/utils/ranges.hpp>
+#include <Geode/utils/string.hpp>
+#include <Geode/loader/Dirs.hpp>
 #include <Geode/utils/JsonValidation.hpp>
 #include <regex>
 #include "SettingNodeV3.hpp"
diff --git a/loader/src/ui/mods/popups/ModPopup.cpp b/loader/src/ui/mods/popups/ModPopup.cpp
index 9b0928f5..14ce5f52 100644
--- a/loader/src/ui/mods/popups/ModPopup.cpp
+++ b/loader/src/ui/mods/popups/ModPopup.cpp
@@ -1,6 +1,7 @@
 #include "ModPopup.hpp"
 #include <Geode/binding/ButtonSprite.hpp>
 #include <Geode/ui/MDTextArea.hpp>
+#include <Geode/ui/TextInput.hpp>
 #include <Geode/utils/web.hpp>
 #include <Geode/loader/Loader.hpp>
 #include <Geode/loader/ModSettingsManager.hpp>
diff --git a/loader/src/ui/mods/settings/ModSettingsPopup.cpp b/loader/src/ui/mods/settings/ModSettingsPopup.cpp
index 5048f8b0..40099b36 100644
--- a/loader/src/ui/mods/settings/ModSettingsPopup.cpp
+++ b/loader/src/ui/mods/settings/ModSettingsPopup.cpp
@@ -6,6 +6,7 @@
 #include <Geode/ui/ScrollLayer.hpp>
 #include <Geode/utils/cocos.hpp>
 #include <Geode/ui/General.hpp>
+#include <Geode/ui/Scrollbar.hpp>
 #include <loader/SettingNodeV3.hpp>
 // needed for weightedFuzzyMatch
 #include <ui/mods/sources/ModListSource.hpp>
diff --git a/loader/src/ui/mods/settings/ModSettingsPopup.hpp b/loader/src/ui/mods/settings/ModSettingsPopup.hpp
index c8cd14b5..c569d53f 100644
--- a/loader/src/ui/mods/settings/ModSettingsPopup.hpp
+++ b/loader/src/ui/mods/settings/ModSettingsPopup.hpp
@@ -3,6 +3,9 @@
 #include <Geode/loader/SettingV3.hpp>
 #include <Geode/ui/Popup.hpp>
 #include <Geode/utils/cocos.hpp>
+#include <Geode/ui/ScrollLayer.hpp>
+#include <Geode/ui/TextInput.hpp>
+
 #include "../GeodeStyle.hpp"
 
 using namespace geode::prelude;
diff --git a/loader/src/utils/JsonValidation.cpp b/loader/src/utils/JsonValidation.cpp
index b211ae89..71a5c908 100644
--- a/loader/src/utils/JsonValidation.cpp
+++ b/loader/src/utils/JsonValidation.cpp
@@ -1,4 +1,5 @@
 #include <Geode/utils/JsonValidation.hpp>
+#include <Geode/utils/ranges.hpp>
 
 using namespace geode::prelude;
 
diff --git a/loader/src/utils/PlatformID.cpp b/loader/src/utils/PlatformID.cpp
index 183791c3..49038918 100644
--- a/loader/src/utils/PlatformID.cpp
+++ b/loader/src/utils/PlatformID.cpp
@@ -1,6 +1,7 @@
 
 #include <Geode/platform/platform.hpp>
 #include <Geode/utils/general.hpp>
+#include <Geode/utils/ranges.hpp>
 
 using namespace geode::prelude;