diff --git a/test/loopwave.c b/test/loopwave.c
index 9d50aaea5..e09fe0f72 100644
--- a/test/loopwave.c
+++ b/test/loopwave.c
@@ -29,7 +29,6 @@
 #endif
 
 #include "SDL.h"
-#include "SDL_audio.h"
 
 struct
 {
diff --git a/test/testatomic.c b/test/testatomic.c
index 662a017ca..178de7ac1 100644
--- a/test/testatomic.c
+++ b/test/testatomic.c
@@ -12,9 +12,6 @@
 #include <stdio.h>
 
 #include "SDL.h"
-#include "SDL_atomic.h"
-#include "SDL_assert.h"
-#include "SDL_cpuinfo.h"
 
 /*
   Absolutely basic tests just to see if we get the expected value
diff --git a/test/testerror.c b/test/testerror.c
index 1fa60885b..8290680e0 100644
--- a/test/testerror.c
+++ b/test/testerror.c
@@ -17,7 +17,6 @@
 #include <signal.h>
 
 #include "SDL.h"
-#include "SDL_thread.h"
 
 static int alive = 0;
 
diff --git a/test/testfile.c b/test/testfile.c
index 172da865c..38a6bb799 100644
--- a/test/testfile.c
+++ b/test/testfile.c
@@ -22,7 +22,6 @@
 #endif
 
 #include "SDL.h"
-#include "SDL_endian.h"
 
 
 #include <stdio.h>
diff --git a/test/testhaptic.c b/test/testhaptic.c
index ac8ab4158..bffe4467d 100644
--- a/test/testhaptic.c
+++ b/test/testhaptic.c
@@ -22,8 +22,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 #ifndef SDL_HAPTIC_DISABLED
 
-#include "SDL_haptic.h"
-
 static SDL_Haptic *haptic;
 
 
diff --git a/test/testhotplug.c b/test/testhotplug.c
index ba06dea0f..1b68db1e4 100644
--- a/test/testhotplug.c
+++ b/test/testhotplug.c
@@ -17,7 +17,6 @@
 #include <string.h>
 
 #include "SDL.h"
-#include "SDL_haptic.h"
 
 #if !defined SDL_JOYSTICK_DISABLED && !defined SDL_HAPTIC_DISABLED
 
diff --git a/test/testlock.c b/test/testlock.c
index 9ca3ca199..92a5e9b3f 100644
--- a/test/testlock.c
+++ b/test/testlock.c
@@ -19,8 +19,6 @@
 #include <stdlib.h> /* for atexit() */
 
 #include "SDL.h"
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
 
 static SDL_mutex *mutex = NULL;
 static SDL_threadID mainthread;
diff --git a/test/testmessage.c b/test/testmessage.c
index f44880c3f..b0bf39c89 100644
--- a/test/testmessage.c
+++ b/test/testmessage.c
@@ -17,7 +17,6 @@
 #include <signal.h>
 
 #include "SDL.h"
-#include "SDL_thread.h"
 
 /* Call this instead of exit(), so we can clean up SDL: atexit() is evil. */
 static void
diff --git a/test/testplatform.c b/test/testplatform.c
index e0dc29e7c..232bfe653 100644
--- a/test/testplatform.c
+++ b/test/testplatform.c
@@ -13,9 +13,6 @@
 #include <stdio.h>
 
 #include "SDL.h"
-#include "SDL_endian.h"
-#include "SDL_cpuinfo.h"
-#include "SDL_assert.h"
 
 /*
  * Watcom C flags these as Warning 201: "Unreachable code" if you just
diff --git a/test/testrumble.c b/test/testrumble.c
index 74a7e98fc..d72e5d94a 100644
--- a/test/testrumble.c
+++ b/test/testrumble.c
@@ -33,8 +33,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 #ifndef SDL_HAPTIC_DISABLED
 
-#include "SDL_haptic.h"
-
 static SDL_Haptic *haptic;
 
 
diff --git a/test/testsem.c b/test/testsem.c
index ca71ec2e6..8d41e083f 100644
--- a/test/testsem.c
+++ b/test/testsem.c
@@ -17,7 +17,6 @@
 #include <signal.h>
 
 #include "SDL.h"
-#include "SDL_thread.h"
 
 #define NUM_THREADS 10
 
diff --git a/test/testthread.c b/test/testthread.c
index d732320a5..75aed83fc 100644
--- a/test/testthread.c
+++ b/test/testthread.c
@@ -17,7 +17,6 @@
 #include <signal.h>
 
 #include "SDL.h"
-#include "SDL_thread.h"
 
 static SDL_TLSID tls;
 static int alive = 0;
diff --git a/test/torturethread.c b/test/torturethread.c
index bc4e1132f..2e572b64c 100644
--- a/test/torturethread.c
+++ b/test/torturethread.c
@@ -18,7 +18,6 @@
 #include <string.h>
 
 #include "SDL.h"
-#include "SDL_thread.h"
 
 #define NUMTHREADS 10