diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4a765c..daf9c90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,7 @@ else()
     message(STATUS "Found Geode: $ENV{GEODE_SDK}")
 endif()
 
-add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode)
+add_subdirectory($ENV{GEODE_SDK} ${CMAKE_CURRENT_BINARY_DIR}/geode SYSTEM)
 
 setup_geode_mod(${PROJECT_NAME})
 
@@ -70,5 +70,9 @@ else()
 		-Wno-dollar-in-identifier-extension
 		# Class init functions all overload a virtual
 		-Wno-overloaded-virtual
+		# GEODE_UNWRAP
+		-Wno-gnu-statement-expression-from-macro-expansion
+		# Style "IDC"s
+		-Wno-extra-semi
 	)
 endif()
diff --git a/src/features/CopyToClipboard.cpp b/src/features/CopyToClipboard.cpp
index 89070ba..a0ccc31 100644
--- a/src/features/CopyToClipboard.cpp
+++ b/src/features/CopyToClipboard.cpp
@@ -1,6 +1,7 @@
 #include <Geode/modify/EditorUI.hpp>
 #include <Geode/utils/general.hpp>
 #include <Geode/ui/Notification.hpp>
+#include <Geode/binding/GameManager.hpp>
 
 using namespace geode::prelude;
 
diff --git a/src/features/EditMixedValues.cpp b/src/features/EditMixedValues.cpp
index cdb9fe1..731849c 100644
--- a/src/features/EditMixedValues.cpp
+++ b/src/features/EditMixedValues.cpp
@@ -1,7 +1,12 @@
 #include <Geode/modify/SetGroupIDLayer.hpp>
 #include <Geode/modify/SetupTriggerPopup.hpp>
 #include <Geode/modify/SetupRotateCommandPopup.hpp>
+#include <Geode/binding/GameObject.hpp>
+#include <Geode/binding/ButtonSprite.hpp>
+#include <Geode/binding/EffectGameObject.hpp>
 #include <Geode/utils/cocos.hpp>
+#include <Geode/utils/string.hpp>
+#include <Geode/ui/TextInput.hpp>
 
 using namespace geode::prelude;
 
diff --git a/src/features/HSVPreview.cpp b/src/features/HSVPreview.cpp
index 606532b..d9a82b5 100644
--- a/src/features/HSVPreview.cpp
+++ b/src/features/HSVPreview.cpp
@@ -2,6 +2,12 @@
 #include <Geode/modify/HSVWidgetPopup.hpp>
 #include <Geode/modify/CustomizeObjectLayer.hpp>
 #include <Geode/modify/ColorSelectPopup.hpp>
+#include <Geode/binding/LevelEditorLayer.hpp>
+#include <Geode/binding/GameToolbox.hpp>
+#include <Geode/binding/EffectGameObject.hpp>
+#include <Geode/binding/ColorAction.hpp>
+#include <Geode/binding/LevelSettingsObject.hpp>
+#include <Geode/binding/GJEffectManager.hpp>
 
 using namespace geode::prelude;
 
diff --git a/src/features/ImprovedScaleAndRotate.cpp b/src/features/ImprovedScaleAndRotate.cpp
index 2e78e04..1601db7 100644
--- a/src/features/ImprovedScaleAndRotate.cpp
+++ b/src/features/ImprovedScaleAndRotate.cpp
@@ -1,6 +1,11 @@
 #include <Geode/modify/EditorUI.hpp>
 #include <Geode/modify/GJScaleControl.hpp>
 #include <Geode/modify/GJRotationControl.hpp>
+#include <Geode/binding/ButtonSprite.hpp>
+#include <Geode/binding/Slider.hpp>
+#include <Geode/binding/GameManager.hpp>
+#include <Geode/binding/GameObject.hpp>
+#include <Geode/ui/TextInput.hpp>
 #include <utils/Editor.hpp>
 #include <numbers>
 #include <span>
@@ -171,7 +176,7 @@ class $modify(SnappableScaleControl, GJScaleControl) {
         inputX->setID("input-x"_spr);
         inputX->setPosition(30, m_scaleXLabel->getPositionY());
         inputX->setCommonFilter(CommonFilter::Float);
-        inputX->setCallback([this, inputX](auto const& str) {
+        inputX->setCallback([this](auto const& str) {
             if (auto scale = numFromString<float>(str)) {
                 m_delegate->scaleXChanged(*scale, m_scaleLocked);
                 m_sliderX->setValue(this->valueFromScale(*scale));
@@ -184,7 +189,7 @@ class $modify(SnappableScaleControl, GJScaleControl) {
         inputY->setID("input-y"_spr);
         inputY->setPosition(30, m_scaleYLabel->getPositionY());
         inputY->setCommonFilter(CommonFilter::Float);
-        inputY->setCallback([this, inputY](auto const& str) {
+        inputY->setCallback([this](auto const& str) {
             if (auto scale = numFromString<float>(str)) {
                 m_delegate->scaleYChanged(*scale, m_scaleLocked);
                 m_sliderY->setValue(this->valueFromScale(*scale));
@@ -197,7 +202,7 @@ class $modify(SnappableScaleControl, GJScaleControl) {
         inputXY->setID("input-xy"_spr);
         inputXY->setPosition(25, m_scaleLabel->getPositionY());
         inputXY->setCommonFilter(CommonFilter::Float);
-        inputXY->setCallback([this, inputXY](auto const& str) {
+        inputXY->setCallback([this](auto const& str) {
             if (auto scale = numFromString<float>(str)) {
                 m_delegate->scaleXYChanged(*scale, *scale, m_scaleLocked);
                 m_sliderXY->setValue(this->valueFromScale(*scale));
@@ -385,7 +390,7 @@ class $modify(InputRotationControl, GJRotationControl) {
         input->setID("input-angle"_spr);
         input->setPosition(110, 0);
         input->setCommonFilter(CommonFilter::Float);
-        input->setCallback([this, input](auto const& str) {
+        input->setCallback([this](auto const& str) {
             if (auto angle = numFromString<float>(str)) {
                 m_delegate->angleChangeBegin();
                 m_delegate->angleChanged(*angle);
diff --git a/src/features/Keybinds.cpp b/src/features/Keybinds.cpp
index f943b10..ae8ea8f 100644
--- a/src/features/Keybinds.cpp
+++ b/src/features/Keybinds.cpp
@@ -6,6 +6,8 @@
 #include <geode.custom-keybinds/include/Keybinds.hpp>
 #include <Geode/modify/EditorUI.hpp>
 #include <Geode/binding/EditButtonBar.hpp>
+#include <Geode/binding/GameManager.hpp>
+#include <Geode/ui/Notification.hpp>
 #include <utils/Editor.hpp>
 #include <utils/HolyUB.hpp>
 #include "GridScaling.hpp"
diff --git a/src/features/TypeInZLayer.cpp b/src/features/TypeInZLayer.cpp
index 1daff1b..6d46f88 100644
--- a/src/features/TypeInZLayer.cpp
+++ b/src/features/TypeInZLayer.cpp
@@ -5,6 +5,7 @@
 #include <Geode/binding/CCMenuItemSpriteExtra.hpp>
 #include <Geode/binding/LevelEditorLayer.hpp>
 #include <Geode/binding/GameManager.hpp>
+#include <Geode/binding/GameObject.hpp>
 #include <utils/Editor.hpp>
 #include <utils/Pro.hpp>
 
diff --git a/src/features/ViewTab/ViewTab.cpp b/src/features/ViewTab/ViewTab.cpp
index 10f0476..76826d2 100644
--- a/src/features/ViewTab/ViewTab.cpp
+++ b/src/features/ViewTab/ViewTab.cpp
@@ -3,12 +3,12 @@
 #include <Geode/modify/GameObject.hpp>
 #include <Geode/modify/DrawGridLayer.hpp>
 #include <Geode/modify/FMODAudioEngine.hpp>
-
 #include <Geode/binding/LevelEditorLayer.hpp>
 #include <Geode/binding/CCMenuItemSpriteExtra.hpp>
 #include <Geode/binding/ButtonSprite.hpp>
 #include <Geode/binding/EditButtonBar.hpp>
 #include <Geode/binding/GameManager.hpp>
+#include <Geode/binding/GJGroundLayer.hpp>
 #include <Geode/utils/cocos.hpp>
 #include <geode.custom-keybinds/include/Keybinds.hpp>
 #include <utils/Editor.hpp>
diff --git a/src/features/backups/Backup.cpp b/src/features/backups/Backup.cpp
index 4b9bc36..8778afa 100644
--- a/src/features/backups/Backup.cpp
+++ b/src/features/backups/Backup.cpp
@@ -1,6 +1,7 @@
 #include "Backup.hpp"
 #include <Geode/loader/Dirs.hpp>
 #include <Geode/utils/file.hpp>
+#include <Geode/utils/JsonValidation.hpp>
 #include <hjfod.gmd-api/include/GMD.hpp>
 #include <cvolton.level-id-api/include/EditorIDs.hpp>
 #include <matjson/stl_serialize.hpp>
diff --git a/src/features/backups/QuickSave.cpp b/src/features/backups/QuickSave.cpp
index 790ae97..f41b412 100644
--- a/src/features/backups/QuickSave.cpp
+++ b/src/features/backups/QuickSave.cpp
@@ -2,6 +2,8 @@
 #include <Geode/modify/EditorPauseLayer.hpp>
 #include <Geode/modify/GManager.hpp>
 #include <Geode/modify/MenuLayer.hpp>
+#include <Geode/binding/LocalLevelManager.hpp>
+#include <Geode/binding/FLAlertLayer.hpp>
 #include <cvolton.level-id-api/include/EditorIDs.hpp>
 #include <hjfod.gmd-api/include/GMD.hpp>
 #include <utils/HolyUB.hpp>
diff --git a/src/utils/Editor.cpp b/src/utils/Editor.cpp
index bbae925..9852c08 100644
--- a/src/utils/Editor.cpp
+++ b/src/utils/Editor.cpp
@@ -2,6 +2,8 @@
 #include <Geode/modify/GameManager.hpp>
 #include <Geode/modify/EditorUI.hpp>
 #include <Geode/modify/EditorPauseLayer.hpp>
+#include <Geode/binding/EditButtonBar.hpp>
+#include <Geode/binding/CCTextInputNode.hpp>
 #include <utils/Warn.hpp>
 
 // i hate touch prioi hate touch prioi hate touch prioi hate touch prioi hate