diff --git a/include/SDL3/SDL_audio.h b/include/SDL3/SDL_audio.h
index 37e7f06db8..3ea393a844 100644
--- a/include/SDL3/SDL_audio.h
+++ b/include/SDL3/SDL_audio.h
@@ -94,7 +94,6 @@
 #include <SDL3/SDL_mutex.h>
 #include <SDL3/SDL_properties.h>
 #include <SDL3/SDL_iostream.h>
-#include <SDL3/SDL_thread.h>
 
 #include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
diff --git a/include/SDL3/SDL_camera.h b/include/SDL3/SDL_camera.h
index 1c35368a80..841bce0a4c 100644
--- a/include/SDL3/SDL_camera.h
+++ b/include/SDL3/SDL_camera.h
@@ -38,7 +38,6 @@
 #include <SDL3/SDL_pixels.h>
 #include <SDL3/SDL_properties.h>
 #include <SDL3/SDL_surface.h>
-#include <SDL3/SDL_video.h>
 
 #include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
diff --git a/include/SDL3/SDL_guid.h b/include/SDL3/SDL_guid.h
index 285b2376e5..d45a3c3652 100644
--- a/include/SDL3/SDL_guid.h
+++ b/include/SDL3/SDL_guid.h
@@ -32,7 +32,6 @@
 #define SDL_guid_h_
 
 #include <SDL3/SDL_stdinc.h>
-#include <SDL3/SDL_error.h>
 
 #include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
diff --git a/include/SDL3/SDL_pen.h b/include/SDL3/SDL_pen.h
index 2babed902a..ebb08dc47f 100644
--- a/include/SDL3/SDL_pen.h
+++ b/include/SDL3/SDL_pen.h
@@ -40,7 +40,6 @@
 #define SDL_pen_h_
 
 #include <SDL3/SDL_stdinc.h>
-#include <SDL3/SDL_error.h>
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
diff --git a/include/SDL3/SDL_system.h b/include/SDL3/SDL_system.h
index e3aa8c0c3d..595b955a3b 100644
--- a/include/SDL3/SDL_system.h
+++ b/include/SDL3/SDL_system.h
@@ -31,7 +31,6 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_error.h>
 #include <SDL3/SDL_keyboard.h>
-#include <SDL3/SDL_render.h>
 #include <SDL3/SDL_video.h>
 
 #include <SDL3/SDL_begin_code.h>
diff --git a/include/SDL3/SDL_thread.h b/include/SDL3/SDL_thread.h
index a205650ce5..37915c4557 100644
--- a/include/SDL3/SDL_thread.h
+++ b/include/SDL3/SDL_thread.h
@@ -34,7 +34,6 @@
 
 /* Thread synchronization primitives */
 #include <SDL3/SDL_atomic.h>
-#include <SDL3/SDL_mutex.h>
 
 #if defined(SDL_PLATFORM_WINDOWS)
 #include <process.h> /* _beginthreadex() and _endthreadex() */
diff --git a/include/SDL3/SDL_touch.h b/include/SDL3/SDL_touch.h
index 6889f36972..2b07d2d32a 100644
--- a/include/SDL3/SDL_touch.h
+++ b/include/SDL3/SDL_touch.h
@@ -31,7 +31,6 @@
 #include <SDL3/SDL_stdinc.h>
 #include <SDL3/SDL_error.h>
 #include <SDL3/SDL_mouse.h>
-#include <SDL3/SDL_video.h>
 
 #include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */
diff --git a/include/SDL3/SDL_version.h b/include/SDL3/SDL_version.h
index c0f518d4a3..01946dd911 100644
--- a/include/SDL3/SDL_version.h
+++ b/include/SDL3/SDL_version.h
@@ -30,7 +30,6 @@
 #define SDL_version_h_
 
 #include <SDL3/SDL_stdinc.h>
-#include <SDL3/SDL_error.h>
 
 #include <SDL3/SDL_begin_code.h>
 /* Set up for C function definitions, even when using C++ */