diff --git a/src/Backends/Audio/SDL2.cpp b/src/Backends/Audio/SDL2.cpp
index 724958f4..c737a582 100644
--- a/src/Backends/Audio/SDL2.cpp
+++ b/src/Backends/Audio/SDL2.cpp
@@ -1,7 +1,6 @@
 #include "../Audio.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <string.h>
 #include <string>
 
diff --git a/src/Backends/Audio/SoftwareMixer.cpp b/src/Backends/Audio/SoftwareMixer.cpp
index 0c19e46e..7a993eb8 100644
--- a/src/Backends/Audio/SoftwareMixer.cpp
+++ b/src/Backends/Audio/SoftwareMixer.cpp
@@ -2,9 +2,7 @@
 
 #include <math.h>
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 
 #include "../../Attributes.h"
 
diff --git a/src/Backends/Audio/miniaudio.cpp b/src/Backends/Audio/miniaudio.cpp
index b06b34aa..ced9e055 100644
--- a/src/Backends/Audio/miniaudio.cpp
+++ b/src/Backends/Audio/miniaudio.cpp
@@ -1,6 +1,7 @@
 #include "../Audio.h"
 
 #include <stddef.h>
+#include <string.h>
 
 #define MINIAUDIO_IMPLEMENTATION
 #define MA_NO_DECODING
diff --git a/src/Backends/Controller/SDL2.cpp b/src/Backends/Controller/SDL2.cpp
index 9e8ced2b..12182e27 100644
--- a/src/Backends/Controller/SDL2.cpp
+++ b/src/Backends/Controller/SDL2.cpp
@@ -1,6 +1,7 @@
 #include "../Controller.h"
 
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "SDL.h"
 
diff --git a/src/Backends/Platform/GLFW3.cpp b/src/Backends/Platform/GLFW3.cpp
index 9c84e8e0..af0406dd 100644
--- a/src/Backends/Platform/GLFW3.cpp
+++ b/src/Backends/Platform/GLFW3.cpp
@@ -17,7 +17,6 @@
 #include "../../Main.h"
 #include "../../Organya.h"
 #include "../../Profile.h"
-#include "../../Resource.h"
 
 #define DO_KEY(GLFW_KEY, BACKEND_KEY) \
 	case GLFW_KEY: \
diff --git a/src/Backends/Platform/Null.cpp b/src/Backends/Platform/Null.cpp
index 19f3f2a2..b64360f8 100644
--- a/src/Backends/Platform/Null.cpp
+++ b/src/Backends/Platform/Null.cpp
@@ -2,6 +2,8 @@
 
 #include <string>
 
+#include "../../Attributes.h"
+
 bool Backend_Init(void)
 {
 	return true;
diff --git a/src/Backends/Platform/SDL2.cpp b/src/Backends/Platform/SDL2.cpp
index 1d9e2484..ccda4c6c 100644
--- a/src/Backends/Platform/SDL2.cpp
+++ b/src/Backends/Platform/SDL2.cpp
@@ -1,6 +1,8 @@
 #include "../Misc.h"
 
+#include <stdarg.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string>
@@ -9,10 +11,10 @@
 
 #include "../Rendering.h"
 #include "../Shared/SDL2.h"
+#include "../../Attributes.h"
 #include "../../Main.h"
 #include "../../Organya.h"
 #include "../../Profile.h"
-#include "../../Resource.h"
 
 #define DO_KEY(SDL_KEY, BACKEND_KEY) \
 	case SDL_KEY: \
diff --git a/src/Backends/Platform/WiiU.cpp b/src/Backends/Platform/WiiU.cpp
index f18be654..db2aeb0b 100644
--- a/src/Backends/Platform/WiiU.cpp
+++ b/src/Backends/Platform/WiiU.cpp
@@ -1,6 +1,7 @@
 #include "../Misc.h"
 
 #include <stdarg.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <string>
diff --git a/src/Backends/Rendering/OpenGL3.cpp b/src/Backends/Rendering/OpenGL3.cpp
index 105221ab..c0af2db3 100644
--- a/src/Backends/Rendering/OpenGL3.cpp
+++ b/src/Backends/Rendering/OpenGL3.cpp
@@ -15,11 +15,8 @@
 #define SPRITEBATCH_IMPLEMENTATION
 #include "../../../external/cute_spritebatch.h"
 
-#include "../../WindowsWrapper.h"
-
 #include "../Misc.h"
 #include "Window/OpenGL.h"
-#include "../../Resource.h"
 
 #define TOTAL_VBOS 8
 
diff --git a/src/Backends/Rendering/SDLTexture.cpp b/src/Backends/Rendering/SDLTexture.cpp
index df78130f..4effac72 100644
--- a/src/Backends/Rendering/SDLTexture.cpp
+++ b/src/Backends/Rendering/SDLTexture.cpp
@@ -14,10 +14,6 @@
 
 #include "../Misc.h"
 #include "../Shared/SDL2.h"
-#include "../../Draw.h"
-#include "../../Ending.h"
-#include "../../MapName.h"
-#include "../../TextScr.h"
 
 typedef struct RenderBackend_Surface
 {
diff --git a/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
index 1fab4793..86f1bc8c 100644
--- a/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
+++ b/src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp
@@ -1,11 +1,8 @@
 #include "../OpenGL.h"
 
 #include <stddef.h>
-#include <stdlib.h>
 
-#ifdef USE_OPENGLES2
-#include <GLES2/gl2.h>
-#else
+#ifndef USE_OPENGLES2
 #include <glad/glad.h>
 #endif
 #include <GLFW/glfw3.h>
diff --git a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
index 64c5dc77..72eb2c47 100644
--- a/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
+++ b/src/Backends/Rendering/Window/OpenGL3/SDL2.cpp
@@ -3,9 +3,7 @@
 #include <stddef.h>
 #include <string>
 
-#ifdef USE_OPENGLES2
-#include <GLES2/gl2.h>
-#else
+#ifndef USE_OPENGLES2
 #include <glad/glad.h>
 #endif
 #include "SDL.h"
diff --git a/src/Backends/Rendering/Window/Software/SDL2.cpp b/src/Backends/Rendering/Window/Software/SDL2.cpp
index 27a02b1e..416a8d80 100644
--- a/src/Backends/Rendering/Window/Software/SDL2.cpp
+++ b/src/Backends/Rendering/Window/Software/SDL2.cpp
@@ -1,7 +1,6 @@
 #include "../Software.h"
 
 #include <stddef.h>
-#include <stdlib.h>
 #include <string>
 
 #include "SDL.h"
diff --git a/src/Draw.cpp b/src/Draw.cpp
index 0dead3dc..55e0fc49 100644
--- a/src/Draw.cpp
+++ b/src/Draw.cpp
@@ -1,7 +1,6 @@
 #include "Draw.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <string.h>
 #include <string>
 
diff --git a/src/Font.cpp b/src/Font.cpp
index beb0c6a3..196ae0e7 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -1,6 +1,5 @@
 #include "Font.h"
 
-#include <math.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
@@ -9,9 +8,6 @@
 #include FT_FREETYPE_H
 #include FT_BITMAP_H
 
-#include "WindowsWrapper.h"
-
-#include "Draw.h"
 #include "File.h"
 #include "Backends/Rendering.h"
 
diff --git a/src/Game.cpp b/src/Game.cpp
index 662cf797..2f0c3fc4 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -1,7 +1,6 @@
 #include "Game.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <string>
 
 #include "WindowsWrapper.h"
diff --git a/src/GenericLoad.cpp b/src/GenericLoad.cpp
index 850c799a..c34d6ecd 100644
--- a/src/GenericLoad.cpp
+++ b/src/GenericLoad.cpp
@@ -1,7 +1,5 @@
 #include "GenericLoad.h"
 
-#include <stdio.h>
-
 #include "WindowsWrapper.h"
 
 #include "CommonDefines.h"
diff --git a/src/Main.cpp b/src/Main.cpp
index e59db1f3..f5ee1c78 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -1,7 +1,6 @@
 #include "Main.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string>
@@ -9,19 +8,16 @@
 #include "WindowsWrapper.h"
 
 #include "Backends/Misc.h"
-#include "Backends/Rendering.h"
 #include "Bitmap.h"
 #include "CommonDefines.h"
 #include "Config.h"
 #include "Draw.h"
-#include "File.h"
 #include "Game.h"
 #include "Generic.h"
 #include "Input.h"
 #include "KeyControl.h"
 #include "MyChar.h"
 #include "Organya.h"
-#include "Profile.h"
 #include "Resource.h"
 #include "Sound.h"
 #include "Triangle.h"
diff --git a/src/Sound.cpp b/src/Sound.cpp
index cec619f1..f2c57572 100644
--- a/src/Sound.cpp
+++ b/src/Sound.cpp
@@ -20,7 +20,7 @@ equivalents.
 #include "WindowsWrapper.h"
 
 #include "Backends/Audio.h"
-#include "Main.h"
+//#include "Main.h"	// Was for gModulePath, but this is unneeded in the portable branch since LoadSoundObject is commented-out
 #include "Organya.h"
 #include "PixTone.h"
 
diff --git a/src/Stage.cpp b/src/Stage.cpp
index b9370f3b..86604424 100644
--- a/src/Stage.cpp
+++ b/src/Stage.cpp
@@ -1,7 +1,5 @@
 #include "Stage.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <string>
 
 #include "WindowsWrapper.h"