diff --git a/src/Back.cpp b/src/Back.cpp
index 5234400f..7c0b8f34 100644
--- a/src/Back.cpp
+++ b/src/Back.cpp
@@ -1,17 +1,12 @@
 #include "Back.h"
 
-#include <stddef.h>
 #include <stdio.h>
 
 #include "WindowsWrapper.h"
 
 #include "CommonDefines.h"
 #include "Draw.h"
-#include "Frame.h"
-#include "Game.h"
 #include "Main.h"
-#include "Map.h"
-#include "Stage.h"
 
 BACK gBack;
 int gWaterY;
diff --git a/src/Config.cpp b/src/Config.cpp
index 4c2d6d69..e37b92a5 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -1,4 +1,3 @@
-#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/Draw.cpp b/src/Draw.cpp
index 59aff022..5c7ce42a 100644
--- a/src/Draw.cpp
+++ b/src/Draw.cpp
@@ -1,8 +1,6 @@
 #include "Draw.h"
 
-#include <stddef.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include <ddraw.h>
diff --git a/src/Game.cpp b/src/Game.cpp
index f4eaa39f..b09ec22a 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -1,6 +1,5 @@
 #include "Game.h"
 
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/Input.cpp b/src/Input.cpp
index 2776b269..7fa1a9b9 100644
--- a/src/Input.cpp
+++ b/src/Input.cpp
@@ -1,8 +1,6 @@
 #include "Input.h"
 
-#include <stddef.h>
 #include <stdio.h>
-#include <string.h>
 
 #if defined(_MSC_VER) && _MSC_VER >= 1500	// Newer versions of Visual Studio don't support anything earlier than DirectInput8
 #define DIRECTINPUT_VERSION 0x800
diff --git a/src/Main.cpp b/src/Main.cpp
index 4332c64e..d5939fd9 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -1,6 +1,5 @@
 #include "Main.h"
 
-#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/Map.cpp b/src/Map.cpp
index 0657e620..4b85a364 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -1,6 +1,5 @@
 #include "Map.h"
 
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/NpChar.cpp b/src/NpChar.cpp
index 1c372892..06985e57 100644
--- a/src/NpChar.cpp
+++ b/src/NpChar.cpp
@@ -1,6 +1,5 @@
 #include "NpChar.h"
 
-#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/NpChar.h b/src/NpChar.h
index 0f2f9583..542619ee 100644
--- a/src/NpChar.h
+++ b/src/NpChar.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "CommonDefines.h"
 #include "WindowsWrapper.h"
 
 #include "Draw.h"
diff --git a/src/NpcTbl.cpp b/src/NpcTbl.cpp
index cf37082a..34de4760 100644
--- a/src/NpcTbl.cpp
+++ b/src/NpcTbl.cpp
@@ -1,6 +1,5 @@
 #include "NpcTbl.h"
 
-#include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/Organya.cpp b/src/Organya.cpp
index f93394e2..43db6f2b 100644
--- a/src/Organya.cpp
+++ b/src/Organya.cpp
@@ -6,8 +6,6 @@
 
 #include "Organya.h"
 
-#include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/Profile.cpp b/src/Profile.cpp
index 2b78a369..7388d7fc 100644
--- a/src/Profile.cpp
+++ b/src/Profile.cpp
@@ -1,6 +1,5 @@
 #include "Profile.h"
 
-#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/Sound.cpp b/src/Sound.cpp
index c98a3606..9a4e54aa 100644
--- a/src/Sound.cpp
+++ b/src/Sound.cpp
@@ -12,7 +12,6 @@ equivalents.
 
 #include "Sound.h"
 
-#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/Sound.h b/src/Sound.h
index 46a0e032..d1dc3c40 100644
--- a/src/Sound.h
+++ b/src/Sound.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <stddef.h>
-
 #ifndef DIRECTSOUND_VERSION
 #define DIRECTSOUND_VERSION 0x500
 #endif