diff --git a/src/client/Client.cpp b/src/client/Client.cpp
index c04354e..bebdea2 100644
--- a/src/client/Client.cpp
+++ b/src/client/Client.cpp
@@ -4,7 +4,6 @@
 #include "db/Db.hpp"
 #include "async/AsyncFile.hpp"
 #include "glue/CGlueMgr.hpp"
-#include "gx/Device.hpp"
 #include "gx/Screen.hpp"
 #include "gx/Texture.hpp"
 #include "model/Model2.hpp"
@@ -13,7 +12,6 @@
 #include "ui/FrameXML.hpp"
 #include "console/CVar.hpp"
 #include "world/World.hpp"
-#include <cstring>
 #include <bc/Debug.hpp>
 #include <common/Prop.hpp>
 #include <storm/Error.hpp>
diff --git a/src/event/Event.cpp b/src/event/Event.cpp
index 0eb9da1..6d25f25 100644
--- a/src/event/Event.cpp
+++ b/src/event/Event.cpp
@@ -4,10 +4,8 @@
 #include "event/Input.hpp"
 #include "event/Queue.hpp"
 #include "event/Scheduler.hpp"
-#include <cstring>
 #include <common/Prop.hpp>
 #include <common/Time.hpp>
-#include <storm/String.hpp>
 
 SEvent Event::s_startEvent = SEvent(1, 0);
 SEvent Event::s_shutdownEvent = SEvent(1, 0);
diff --git a/src/gx/font/FreeType.cpp b/src/gx/font/FreeType.cpp
index 2fad0ed..f6cd4ed 100644
--- a/src/gx/font/FreeType.cpp
+++ b/src/gx/font/FreeType.cpp
@@ -1,7 +1,6 @@
 #include "gx/font/FreeType.hpp"
 #include "gx/font/FreeTypeInternal.hpp"
 #include "freetype/ftmodule.h"
-#include <storm/Memory.hpp>
 
 FT_Library g_FTLibrary;
 
diff --git a/src/gx/gll/CGxDeviceGLL.cpp b/src/gx/gll/CGxDeviceGLL.cpp
index 244ac4f..888fac8 100644
--- a/src/gx/gll/CGxDeviceGLL.cpp
+++ b/src/gx/gll/CGxDeviceGLL.cpp
@@ -4,7 +4,6 @@
 #include "gx/Blit.hpp"
 #include "gx/CGxBatch.hpp"
 #include "gx/Shader.hpp"
-#include "gx/Texture.hpp"
 #include "gx/Window.hpp"
 #include "gx/texture/CGxTex.hpp"
 #include <cmath>
diff --git a/src/gx/gll/GLAbstractWindow.cpp b/src/gx/gll/GLAbstractWindow.cpp
index d200e23..0297dd5 100644
--- a/src/gx/gll/GLAbstractWindow.cpp
+++ b/src/gx/gll/GLAbstractWindow.cpp
@@ -1,6 +1,5 @@
 #include "gx/gll/GLAbstractWindow.h"
 #include <cmath>
-#include <ApplicationServices/ApplicationServices.h>
 
 int32_t GLAbstractWindow::GetBackingWidth() {
     return static_cast<int32_t>(std::floor(this->GetBackingRect().size.width));
diff --git a/src/math/Types.cpp b/src/math/Types.cpp
index 33cc435..7d0ff14 100644
--- a/src/math/Types.cpp
+++ b/src/math/Types.cpp
@@ -1,6 +1,4 @@
 #include "math/Types.hpp"
-#include "math/Utils.hpp"
-#include <cmath>
 
 fixed16::operator float() const {
     return this->n / 32767.0f;
diff --git a/src/net/connection/NetClient.cpp b/src/net/connection/NetClient.cpp
index e8db9b3..e60e6ec 100644
--- a/src/net/connection/NetClient.cpp
+++ b/src/net/connection/NetClient.cpp
@@ -5,7 +5,6 @@
 #include <new>
 #include <common/DataStore.hpp>
 #include <common/Prop.hpp>
-#include <common/SHA1.hpp>
 #include <common/Time.hpp>
 #include <storm/Error.hpp>
 #include <storm/String.hpp>
diff --git a/src/ui/FrameScript.cpp b/src/ui/FrameScript.cpp
index 0a753d5..558c517 100644
--- a/src/ui/FrameScript.cpp
+++ b/src/ui/FrameScript.cpp
@@ -7,7 +7,6 @@
 #include "util/SFile.hpp"
 #include <algorithm>
 #include <cstdint>
-#include <cstring>
 #include <storm/Array.hpp>
 #include <storm/String.hpp>
 #include <tempest/Vector.hpp>
diff --git a/src/ui/FrameXML.cpp b/src/ui/FrameXML.cpp
index ef92ceb..eb642b1 100644
--- a/src/ui/FrameXML.cpp
+++ b/src/ui/FrameXML.cpp
@@ -1,5 +1,4 @@
 #include "ui/FrameXML.hpp"
-#include "gx/Coordinate.hpp"
 #include "ui/CSimpleButton.hpp"
 #include "ui/CSimpleCheckbox.hpp"
 #include "ui/CSimpleEditBox.hpp"
diff --git a/src/util/HMAC.cpp b/src/util/HMAC.cpp
index 538b784..71edf39 100644
--- a/src/util/HMAC.cpp
+++ b/src/util/HMAC.cpp
@@ -1,5 +1,4 @@
 #include "util/HMAC.hpp"
-#include <cstring>
 #include <common/SHA1.hpp>
 
 #define HMAC_SHA1_IPAD 0x36