diff --git a/test/testnative.c b/test/testnative.c
index d5c54e458c..1df5ebd25e 100644
--- a/test/testnative.c
+++ b/test/testnative.c
@@ -11,15 +11,16 @@
 */
 /* Simple program:  Create a native window and attach an SDL renderer */
 
-#include <stdlib.h>
+#include "testnative.h"
 
 #include <SDL3/SDL.h>
 #include <SDL3/SDL_main.h>
 #include <SDL3/SDL_test.h>
 
-#include "testnative.h"
 #include "testutils.h"
 
+#include <stdlib.h>
+
 #define WINDOW_W    640
 #define WINDOW_H    480
 #define NUM_SPRITES 100
diff --git a/test/testnative.h b/test/testnative.h
index 7a1c934d02..40429bd109 100644
--- a/test/testnative.h
+++ b/test/testnative.h
@@ -13,16 +13,10 @@
 /* Definitions for platform dependent windowing functions to test SDL
    integration with native windows
 */
+
 #include <SDL3/SDL.h>
 
-/* Hack to avoid dynapi renaming */
-#include "../src/dynapi/SDL_dynapi.h"
-#ifdef SDL_DYNAMIC_API
-#undef SDL_DYNAMIC_API
-#endif
-#define SDL_DYNAMIC_API 0
-
-#include "../src/SDL_internal.h"
+#include "build_config/SDL_build_config.h"
 
 typedef struct
 {