src: Cleaned up includes to only (and always) include what we use

Signed-off-by: Gabriel Ravier <gabravier@gmail.com>

src/Backends/Audio/SDL2.cpp

@@ -1,11 +1,13 @@
 #include "../Audio.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <string.h>
 #include <string>
 
 #include "SDL.h"
+#include "SDL_audio.h"
+#include "SDL_error.h"
+#include "SDL_stdinc.h"
 
 #include "../Misc.h"
 

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"
 

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

src/Backends/Controller/SDL2.cpp

@@ -1,8 +1,12 @@
 #include "../Controller.h"
 
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "SDL.h"
+#include "SDL_error.h"
+#include "SDL_joystick.h"
+#include "SDL_stdinc.h"
 
 #include "../Misc.h"
 #include "../Shared/SDL2.h"

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: \

src/Backends/Platform/Null.cpp

@@ -2,6 +2,8 @@
 
 #include <string>
 
+#include "../../Attributes.h"
+
 bool Backend_Init(void)
 {
 	return true;

src/Backends/Platform/SDL2.cpp

@@ -1,18 +1,32 @@
 #include "../Misc.h"
 
+#include <stdarg.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string>
 
 #include "SDL.h"
+#include "SDL_error.h"
+#include "SDL_events.h"
+#include "SDL_filesystem.h"
+#include "SDL_keyboard.h"
+#include "SDL_keycode.h"
+#include "SDL_messagebox.h"
+#include "SDL_mouse.h"
+#include "SDL_pixels.h"
+#include "SDL_stdinc.h"
+#include "SDL_surface.h"
+#include "SDL_timer.h"
+#include "SDL_video.h"
 
 #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: \

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
 

src/Backends/Rendering/SDLSurface.cpp

@@ -5,10 +5,14 @@
 #include <string.h>
 #include <string>
 
-#include "SDL.h"
+#include "SDL_error.h"
+#include "SDL_pixels.h"
+#include "SDL_rect.h"
+#include "SDL_stdinc.h"
+#include "SDL_surface.h"
+#include "SDL_video.h"
 
 #include "../Misc.h"
-#include "../Shared/SDL2.h"
 
 typedef struct RenderBackend_Surface
 {

src/Backends/Rendering/SDLTexture.cpp

@@ -5,7 +5,15 @@
 #include <string.h>
 #include <string>
 
-#include "SDL.h"
+#include "SDL_blendmode.h"
+#include "SDL_error.h"
+#include "SDL_hints.h"
+#include "SDL_pixels.h"
+#include "SDL_rect.h"
+#include "SDL_render.h"
+#include "SDL_stdinc.h"
+#include "SDL_version.h"
+#include "SDL_video.h"
 
 #define SPRITEBATCH_IMPLEMENTATION
 #include "../../../external/cute_spritebatch.h"
@@ -13,11 +21,6 @@
 #include "../../WindowsWrapper.h"
 
 #include "../Misc.h"
-#include "../Shared/SDL2.h"
-#include "../../Draw.h"
-#include "../../Ending.h"
-#include "../../MapName.h"
-#include "../../TextScr.h"
 
 typedef struct RenderBackend_Surface
 {

src/Backends/Rendering/Window/OpenGL3/GLFW3.cpp

@@ -1,17 +1,13 @@
 #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>
 
 #include "../../../Misc.h"
-#include "../../../Shared/GLFW3.h"
 
 GLFWwindow *window;
 

src/Backends/Rendering/Window/OpenGL3/SDL2.cpp

@@ -3,15 +3,13 @@
 #include <stddef.h>
 #include <string>
 
-#ifdef USE_OPENGLES2
-#include <GLES2/gl2.h>
-#else
+#ifndef USE_OPENGLES2
 #include <glad/glad.h>
 #endif
-#include "SDL.h"
+#include "SDL_error.h"
+#include "SDL_video.h"
 
 #include "../../../Misc.h"
-#include "../../../Shared/SDL2.h"
 
 SDL_Window *window;
 

src/Backends/Rendering/Window/Software/GLFW3.cpp

@@ -11,7 +11,6 @@
 #include <GLFW/glfw3.h>
 
 #include "../../../Misc.h"
-#include "../../../Shared/GLFW3.h"
 
 GLFWwindow *window;
 

src/Backends/Rendering/Window/Software/SDL2.cpp

@@ -1,13 +1,14 @@
 #include "../Software.h"
 
 #include <stddef.h>
-#include <stdlib.h>
 #include <string>
 
-#include "SDL.h"
+#include "SDL_error.h"
+#include "SDL_pixels.h"
+#include "SDL_surface.h"
+#include "SDL_video.h"
 
 #include "../../../Misc.h"
-#include "../../../Shared/SDL2.h"
 
 SDL_Window *window;
 

src/BossFrog.cpp

@@ -1,5 +1,7 @@
 #include "BossFrog.h"
 
+#include <stddef.h>
+
 #include "WindowsWrapper.h"
 
 #include "Boss.h"

src/BossIronH.cpp

@@ -1,5 +1,7 @@
 #include "BossIronH.h"
 
+#include <stddef.h>
+
 #include "WindowsWrapper.h"
 
 #include "Boss.h"

src/BossPress.cpp

@@ -1,5 +1,7 @@
 #include "BossPress.h"
 
+#include <stddef.h>
+
 #include "WindowsWrapper.h"
 
 #include "Boss.h"

src/BossTwinD.cpp

@@ -1,5 +1,7 @@
 #include "BossTwinD.h"
 
+#include <stddef.h>
+
 #include "WindowsWrapper.h"
 
 #include "Boss.h"

src/BulHit.cpp

@@ -1,5 +1,9 @@
 #include "BulHit.h"
 
+#include <stddef.h>
+
+#include "WindowsWrapper.h"
+
 #include "Bullet.h"
 #include "Caret.h"
 #include "Game.h"

src/Draw.cpp

@@ -1,7 +1,6 @@
 #include "Draw.h"
 
 #include <stddef.h>
-#include <stdio.h>
 #include <string.h>
 #include <string>
 

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"
 

src/Game.cpp

@@ -1,8 +1,6 @@
 #include "Game.h"
 
 #include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string>
 
 #include "WindowsWrapper.h"

src/GenericLoad.cpp

@@ -1,7 +1,5 @@
 #include "GenericLoad.h"
 
-#include <stdio.h>
-
 #include "WindowsWrapper.h"
 
 #include "CommonDefines.h"

src/Main.cpp

@@ -1,7 +1,5 @@
 #include "Main.h"
 
-#include <stddef.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string>
@@ -9,19 +7,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"

src/NpcAct240.cpp

@@ -1,5 +1,7 @@
 #include "NpcAct.h"
 
+#include <stddef.h>
+
 #include "WindowsWrapper.h"
 
 #include "Caret.h"

src/PixTone.cpp

@@ -1,7 +1,6 @@
 #include "PixTone.h"
 
 #include <math.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "WindowsWrapper.h"

src/Sound.cpp

@@ -20,7 +20,6 @@ equivalents.
 #include "WindowsWrapper.h"
 
 #include "Backends/Audio.h"
-#include "Main.h"
 #include "Organya.h"
 #include "PixTone.h"
 

src/Stage.cpp

@@ -1,7 +1,5 @@
 #include "Stage.h"
 
-#include <stdio.h>
-#include <string.h>
 #include <string>
 
 #include "WindowsWrapper.h"