Switch header convention from #include "SDL.h" to #include <SDL3/SDLh>

I ran this script in the include directory:
```sh
sed -i '' -e 's,#include "\(SDL.*\)",#include <SDL3/\1>,' *.h
```

I ran this script in the src directory:
```sh
for i in ../include/SDL3/SDL*.h
do hdr=$(basename $i)
   if [ x"$(echo $hdr | egrep 'SDL_main|SDL_name|SDL_test|SDL_syswm|SDL_opengl|SDL_egl|SDL_vulkan')" != x ]; then
        find . -type f -exec sed -i '' -e 's,#include "\('$hdr'\)",#include <SDL3/\1>,' {} \;
    else
        find . -type f -exec sed -i '' -e '/#include "'$hdr'"/d' {} \;
    fi
done
```

Fixes https://github.com/libsdl-org/SDL/issues/6575

src/SDL.c

@@ -35,9 +35,6 @@
 
 /* Initialization code for SDL */
 
-#include "SDL.h"
-#include "SDL_bits.h"
-#include "SDL_revision.h"
 #include "SDL_assert_c.h"
 #include "SDL_log_c.h"
 #include "events/SDL_events_c.h"

src/SDL_assert.c

@@ -24,11 +24,6 @@
 #include "core/windows/SDL_windows.h"
 #endif
 
-#include "SDL.h"
-#include "SDL_atomic.h"
-#include "SDL_messagebox.h"
-#include "SDL_video.h"
-#include "SDL_assert.h"
 #include "SDL_assert_c.h"
 #include "video/SDL_sysvideo.h"
 

src/SDL_dataqueue.c

@@ -20,7 +20,6 @@
 */
 #include "./SDL_internal.h"
 
-#include "SDL.h"
 #include "./SDL_dataqueue.h"
 
 typedef struct SDL_DataQueuePacket

src/SDL_error.c

@@ -22,7 +22,6 @@
 
 /* Simple error handling in SDL */
 
-#include "SDL_error.h"
 #include "SDL_error_c.h"
 
 int

src/SDL_guid.c

@@ -21,7 +21,6 @@
 #include "SDL_internal.h"
 
 
-#include "SDL_guid.h"
 
 /* convert the guid to a printable string */
 void SDL_GUIDToString(SDL_GUID guid, char *pszGUID, int cbGUID)

src/SDL_hints.c

@@ -20,8 +20,6 @@
 */
 #include "./SDL_internal.h"
 
-#include "SDL_hints.h"
-#include "SDL_error.h"
 #include "SDL_hints_c.h"
 
 

src/SDL_internal.h

@@ -100,7 +100,6 @@
 # include <float.h>
 #endif
 
-#include "SDL_stdinc.h"
 
 /* If you run into a warning that O_CLOEXEC is redefined, update the SDL configuration header for your platform to add HAVE_O_CLOEXEC */
 #ifndef HAVE_O_CLOEXEC
@@ -172,8 +171,7 @@
 #define SDL_HAVE_YUV                    !SDL_LEAN_AND_MEAN
 #endif
 
-#include "SDL_assert.h"
-#include "SDL_log.h"
+#include <SDL3/SDL.h>
 
 #endif /* SDL_internal_h_ */
 

src/SDL_list.c

@@ -20,7 +20,6 @@
 */
 #include "./SDL_internal.h"
 
-#include "SDL.h"
 #include "./SDL_list.h"
 
 /* Push */

src/SDL_log.c

@@ -26,9 +26,6 @@
 
 /* Simple log messages in SDL */
 
-#include "SDL_error.h"
-#include "SDL_log.h"
-#include "SDL_mutex.h"
 #include "SDL_log_c.h"
 
 #if HAVE_STDIO_H

src/atomic/SDL_atomic.c

@@ -20,7 +20,6 @@
 */
 #include "../SDL_internal.h"
 
-#include "SDL_atomic.h"
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1500)
 #include <intrin.h>

src/atomic/SDL_spinlock.c

@@ -24,9 +24,6 @@
 #include "../core/windows/SDL_windows.h"
 #endif
 
-#include "SDL_atomic.h"
-#include "SDL_mutex.h"
-#include "SDL_timer.h"
 
 #if !defined(HAVE_GCC_ATOMICS) && defined(__SOLARIS__)
 #include <atomic.h>

src/audio/SDL_audio.c

@@ -22,8 +22,6 @@
 
 /* Allow access to a raw mixing buffer */
 
-#include "SDL.h"
-#include "SDL_audio.h"
 #include "SDL_audio_c.h"
 #include "SDL_sysaudio.h"
 #include "../thread/SDL_systhread.h"

src/audio/SDL_audiocvt.c

@@ -22,13 +22,9 @@
 
 /* Functions for audio drivers to perform runtime conversion of audio format */
 
-#include "SDL.h"
-#include "SDL_audio.h"
 #include "SDL_audio_c.h"
 
-#include "SDL_loadso.h"
 #include "../SDL_dataqueue.h"
-#include "SDL_cpuinfo.h"
 
 #define DEBUG_AUDIOSTREAM 0
 

src/audio/SDL_audiodev.c

@@ -29,7 +29,6 @@
 #include <sys/stat.h>
 #include <unistd.h> /* For close() */
 
-#include "SDL_stdinc.h"
 #include "SDL_audiodev_c.h"
 
 #ifndef _PATH_DEV_DSP

src/audio/SDL_audiodev_c.h

@@ -22,7 +22,6 @@
 #ifndef SDL_audiodev_c_h_
 #define SDL_audiodev_c_h_
 
-#include "SDL.h"
 #include "../SDL_internal.h"
 #include "SDL_sysaudio.h"
 

src/audio/SDL_audiotypecvt.c

@@ -20,9 +20,7 @@
 */
 #include "../SDL_internal.h"
 
-#include "SDL_audio.h"
 #include "SDL_audio_c.h"
-#include "SDL_cpuinfo.h"
 
 #ifdef __ARM_NEON
 #define HAVE_NEON_INTRINSICS 1

src/audio/SDL_mixer.c

@@ -22,9 +22,6 @@
 
 /* This provides the default mixing callback for the SDL audio routines */
 
-#include "SDL_cpuinfo.h"
-#include "SDL_timer.h"
-#include "SDL_audio.h"
 #include "SDL_sysaudio.h"
 
 /* This table is used to add two sound values together and pin

src/audio/SDL_sysaudio.h

@@ -23,8 +23,6 @@
 #ifndef SDL_sysaudio_h_
 #define SDL_sysaudio_h_
 
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
 #include "../SDL_dataqueue.h"
 #include "./SDL_audio_c.h"
 

src/audio/SDL_wave.c

@@ -33,8 +33,6 @@
 
 /* Microsoft WAVE file loading routines */
 
-#include "SDL_hints.h"
-#include "SDL_audio.h"
 #include "SDL_wave.h"
 #include "SDL_audio_c.h"
 

src/audio/aaudio/SDL_aaudio.c

@@ -22,8 +22,6 @@
 
 #if SDL_AUDIO_DRIVER_AAUDIO
 
-#include "SDL_audio.h"
-#include "SDL_loadso.h"
 #include "../SDL_audio_c.h"
 #include "../../core/android/SDL_android.h"
 #include "SDL_aaudio.h"

src/audio/alsa/SDL_alsa_audio.c

@@ -37,13 +37,10 @@
 #include <signal.h>             /* For kill() */
 #include <string.h>
 
-#include "SDL_timer.h"
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_alsa_audio.h"
 
 #ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
-#include "SDL_loadso.h"
 #endif
 
 static int (*ALSA_snd_pcm_open)

src/audio/android/SDL_androidaudio.c

@@ -24,7 +24,6 @@
 
 /* Output audio to Android */
 
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_androidaudio.h"
 

src/audio/coreaudio/SDL_coreaudio.m

@@ -24,8 +24,6 @@
 
 /* !!! FIXME: clean out some of the macro salsa in here. */
 
-#include "SDL_audio.h"
-#include "SDL_hints.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_coreaudio.h"

src/audio/directsound/SDL_directsound.c

@@ -24,9 +24,6 @@
 
 /* Allow access to a raw mixing buffer */
 
-#include "SDL_timer.h"
-#include "SDL_loadso.h"
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_directsound.h"
 #include <mmreg.h>

src/audio/disk/SDL_diskaudio.c

@@ -28,9 +28,6 @@
 #include <stdio.h>
 #endif
 
-#include "SDL_rwops.h"
-#include "SDL_timer.h"
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_diskaudio.h"
 

src/audio/disk/SDL_diskaudio.h

@@ -23,7 +23,6 @@
 #ifndef SDL_diskaudio_h_
 #define SDL_diskaudio_h_
 
-#include "SDL_rwops.h"
 #include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */

src/audio/dsp/SDL_dspaudio.c

@@ -36,8 +36,6 @@
 
 #include <sys/soundcard.h>
 
-#include "SDL_timer.h"
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_audiodev_c.h"
 #include "SDL_dspaudio.h"

src/audio/dummy/SDL_dummyaudio.c

@@ -22,8 +22,6 @@
 
 /* Output audio to nowhere... */
 
-#include "SDL_timer.h"
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_dummyaudio.h"
 

src/audio/emscripten/SDL_emscriptenaudio.c

@@ -22,7 +22,6 @@
 
 #if SDL_AUDIO_DRIVER_EMSCRIPTEN
 
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_emscriptenaudio.h"
 

src/audio/haiku/SDL_haikuaudio.cc

@@ -32,7 +32,6 @@
 extern "C"
 {
 
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 #include "SDL_haikuaudio.h"

src/audio/jack/SDL_jackaudio.c

@@ -22,11 +22,8 @@
 
 #if SDL_AUDIO_DRIVER_JACK
 
-#include "SDL_timer.h"
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_jackaudio.h"
-#include "SDL_loadso.h"
 #include "../../thread/SDL_systhread.h"
 
 

src/audio/n3ds/SDL_n3dsaudio.c

@@ -22,13 +22,11 @@
 
 #ifdef SDL_AUDIO_DRIVER_N3DS
 
-#include "SDL_audio.h"
 
 /* N3DS Audio driver */
 
 #include "../SDL_sysaudio.h"
 #include "SDL_n3dsaudio.h"
-#include "SDL_timer.h"
 
 #define N3DSAUDIO_DRIVER_NAME "n3ds"
 

src/audio/netbsd/SDL_netbsdaudio.c

@@ -36,8 +36,6 @@
 #include <sys/types.h>
 #include <sys/audioio.h>
 
-#include "SDL_timer.h"
-#include "SDL_audio.h"
 #include "../../core/unix/SDL_poll.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_audiodev_c.h"

src/audio/openslES/SDL_openslES.c

@@ -26,7 +26,6 @@
    https://googlesamples.github.io/android-audio-high-performance/guides/opensl_es.html
 */
 
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "../../core/android/SDL_android.h"
 #include "SDL_openslES.h"

src/audio/pipewire/SDL_pipewire.c

@@ -20,12 +20,9 @@
 */
 
 #include "../../SDL_internal.h"
-#include "SDL_hints.h"
 
 #if SDL_AUDIO_DRIVER_PIPEWIRE
 
-#include "SDL_audio.h"
-#include "SDL_loadso.h"
 #include "SDL_pipewire.h"
 
 #include <pipewire/extensions/metadata.h>

src/audio/ps2/SDL_ps2audio.c

@@ -22,8 +22,6 @@
 
 /* Output audio to nowhere... */
 
-#include "SDL_timer.h"
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_ps2audio.h"
 

src/audio/psp/SDL_pspaudio.c

@@ -27,9 +27,6 @@
 #include <stdlib.h>
 #include <malloc.h> /* memalign() */
 
-#include "SDL_audio.h"
-#include "SDL_error.h"
-#include "SDL_timer.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_audiodev_c.h"
 #include "../SDL_sysaudio.h"

src/audio/pulseaudio/SDL_pulseaudio.c

@@ -26,7 +26,6 @@
    Stéphan Kochen: stephan .a.t. kochen.nl
 */
 #include "../../SDL_internal.h"
-#include "SDL_hints.h"
 
 #if SDL_AUDIO_DRIVER_PULSEAUDIO
 
@@ -39,11 +38,8 @@
 #include <sys/types.h>
 #include <pulse/pulseaudio.h>
 
-#include "SDL_timer.h"
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_pulseaudio.h"
-#include "SDL_loadso.h"
 #include "../../thread/SDL_systhread.h"
 
 /* should we include monitors in the device list? Set at SDL_Init time */

src/audio/sndio/SDL_sndioaudio.c

@@ -36,12 +36,10 @@
 #include <poll.h>
 #include <unistd.h>
 
-#include "SDL_audio.h"
 #include "../SDL_audio_c.h"
 #include "SDL_sndioaudio.h"
 
 #ifdef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC
-#include "SDL_loadso.h"
 #endif
 
 #ifndef INFTIM

src/audio/vita/SDL_vitaaudio.c

@@ -27,9 +27,6 @@
 #include <stdlib.h>
 #include <malloc.h> /* memalign() */
 
-#include "SDL_audio.h"
-#include "SDL_error.h"
-#include "SDL_timer.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_audiodev_c.h"
 #include "../SDL_sysaudio.h"

src/audio/wasapi/SDL_wasapi.c

@@ -24,8 +24,6 @@
 
 #include "../../core/windows/SDL_windows.h"
 #include "../../core/windows/SDL_immdevice.h"
-#include "SDL_audio.h"
-#include "SDL_timer.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 

src/audio/wasapi/SDL_wasapi_win32.c

@@ -30,8 +30,6 @@
 
 #include "../../core/windows/SDL_windows.h"
 #include "../../core/windows/SDL_immdevice.h"
-#include "SDL_audio.h"
-#include "SDL_timer.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 

src/audio/wasapi/SDL_wasapi_winrt.cpp

@@ -36,8 +36,6 @@
 
 extern "C" {
 #include "../../core/windows/SDL_windows.h"
-#include "SDL_audio.h"
-#include "SDL_timer.h"
 #include "../SDL_audio_c.h"
 #include "../SDL_sysaudio.h"
 }

src/core/android/SDL_android.c

@@ -20,16 +20,9 @@
 */
 #include "../../SDL_internal.h"
 
-#include "SDL_stdinc.h"
-#include "SDL_atomic.h"
-#include "SDL_hints.h"
-#include "SDL_main.h"
-#include "SDL_timer.h"
-#include "SDL_version.h"
 
 #ifdef __ANDROID__
 
-#include "SDL_system.h"
 #include "SDL_android.h"
 
 #include "../../events/SDL_events_c.h"

src/core/android/SDL_android.h

@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "../../SDL_internal.h"
-#include "SDL_system.h"
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -31,9 +30,6 @@ extern "C" {
 #include <EGL/eglplatform.h>
 #include <android/native_window_jni.h>
 
-#include "SDL_audio.h"
-#include "SDL_rect.h"
-#include "SDL_video.h"
 
 /* Interface from the SDL library into the Android Java activity */
 extern void Android_JNI_SetActivityTitle(const char *title);
@@ -64,7 +60,6 @@ extern void Android_JNI_AudioSetThreadPriority(int iscapture, int device_id);
 extern SDL_bool Android_IsDeXMode(void);
 extern SDL_bool Android_IsChromebook(void);
 
-#include "SDL_rwops.h"
 
 int Android_JNI_FileOpen(SDL_RWops* ctx, const char* fileName, const char* mode);
 Sint64 Android_JNI_FileSize(SDL_RWops* ctx);
@@ -113,7 +108,6 @@ int Android_JNI_SendMessage(int command, int param);
 JNIEXPORT void JNICALL SDL_Android_Init(JNIEnv* mEnv, jclass cls);
 
 /* MessageBox */
-#include "SDL_messagebox.h"
 int Android_JNI_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
 
 /* Cursor support */

src/core/freebsd/SDL_evdev_kbd_freebsd.c

@@ -22,7 +22,6 @@
 #include "../../SDL_internal.h"
 
 #include "../linux/SDL_evdev_kbd.h"
-#include "SDL_hints.h"
 
 #ifdef SDL_INPUT_FBSDKBIO
 

src/core/gdk/SDL_gdk.cpp

@@ -21,11 +21,7 @@
 #include "../../SDL_internal.h"
 
 extern "C" {
-#include "SDL_system.h"
 #include "../windows/SDL_windows.h"
-#include "SDL_messagebox.h"
-#include "SDL_main.h"
-#include "SDL_events.h"
 #include "../../events/SDL_events_c.h"
 }
 #include <XGameRuntime.h>

src/core/linux/SDL_dbus.c

@@ -19,15 +19,12 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "../../SDL_internal.h"
-#include "SDL_hints.h"
 #include "SDL_dbus.h"
-#include "SDL_atomic.h"
 #include "SDL_sandbox.h"
 #include "../../stdlib/SDL_vacopy.h"
 
 #if SDL_USE_LIBDBUS
 /* we never link directly to libdbus. */
-#include "SDL_loadso.h"
 static const char *dbus_library = "libdbus-1.so.3";
 static void *dbus_handle = NULL;
 static char *inhibit_handle = NULL;

src/core/linux/SDL_dbus.h

@@ -26,7 +26,6 @@
 
 #ifdef HAVE_DBUS_DBUS_H
 #define SDL_USE_LIBDBUS 1
-#include "SDL_stdinc.h"
 #include <dbus/dbus.h>
 
 

src/core/linux/SDL_evdev.c

@@ -38,9 +38,6 @@
 #include <sys/ioctl.h>
 #include <linux/input.h>
 
-#include "SDL.h"
-#include "SDL_endian.h"
-#include "SDL_scancode.h"
 #include "../../events/SDL_events_c.h"
 #include "../../events/SDL_scancode_tables_c.h"
 #include "../../core/linux/SDL_evdev_capabilities.h"

src/core/linux/SDL_evdev.h

@@ -26,7 +26,6 @@
 
 #ifdef SDL_INPUT_LINUXEV
 
-#include "SDL_events.h"
 
 extern int SDL_EVDEV_Init(void);
 extern void SDL_EVDEV_Quit(void);

src/core/linux/SDL_evdev_kbd.c

@@ -21,7 +21,6 @@
 #include "../../SDL_internal.h"
 
 #include "SDL_evdev_kbd.h"
-#include "SDL_hints.h"
 
 #ifdef SDL_INPUT_LINUXKD
 

src/core/linux/SDL_fcitx.c

@@ -23,9 +23,6 @@
 #include <unistd.h>
 
 #include "SDL_fcitx.h"
-#include "SDL_hints.h"
-#include "SDL_keycode.h"
-#include "SDL_keyboard.h"
 #include "../../events/SDL_keyboard_c.h"
 #include "SDL_dbus.h"
 
@@ -33,7 +30,7 @@
 #include "../../video/x11/SDL_x11video.h"
 #define SDL_ENABLE_SYSWM_X11
 #endif
-#include "SDL_syswm.h"
+#include <SDL3/SDL_syswm.h>
 
 
 #define FCITX_DBUS_SERVICE "org.freedesktop.portal.Fcitx"

src/core/linux/SDL_fcitx.h

@@ -24,8 +24,6 @@
 
 #include "../../SDL_internal.h"
 
-#include "SDL_stdinc.h"
-#include "SDL_rect.h"
 
 extern SDL_bool SDL_Fcitx_Init(void);
 extern void SDL_Fcitx_Quit(void);

src/core/linux/SDL_ibus.c

@@ -21,8 +21,6 @@
 #include "../../SDL_internal.h"
 
 #ifdef HAVE_IBUS_IBUS_H
-#include "SDL.h"
-#include "SDL_hints.h"
 #include "SDL_ibus.h"
 #include "SDL_dbus.h"
 #include "../../video/SDL_sysvideo.h"
@@ -32,7 +30,7 @@
 #include "../../video/x11/SDL_x11video.h"
 #define SDL_ENABLE_SYSWM_X11
 #endif
-#include "SDL_syswm.h"
+#include <SDL3/SDL_syswm.h>
 
 #include <sys/inotify.h>
 #include <unistd.h>

src/core/linux/SDL_ibus.h

@@ -26,7 +26,6 @@
 
 #ifdef HAVE_IBUS_IBUS_H
 #define SDL_USE_IBUS 1
-#include "SDL_stdinc.h"
 #include <ibus-1.0/ibus.h>
 
 extern SDL_bool SDL_IBus_Init(void);

src/core/linux/SDL_ime.h

@@ -24,8 +24,6 @@
 
 #include "../../SDL_internal.h"
 
-#include "SDL_stdinc.h"
-#include "SDL_rect.h"
 
 extern SDL_bool SDL_IME_Init(void);
 extern void SDL_IME_Quit(void);

src/core/linux/SDL_threadprio.c

@@ -22,16 +22,12 @@
 
 #ifdef __LINUX__
 
-#include "SDL_error.h"
-#include "SDL_stdinc.h"
-#include "SDL_thread.h"
 
 #if !SDL_THREADS_DISABLED
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <pthread.h>
 #include <unistd.h>
-#include "SDL_system.h"
 
 /* RLIMIT_RTTIME requires kernel >= 2.6.25 and is in glibc >= 2.14 */
 #ifndef RLIMIT_RTTIME

src/core/linux/SDL_udev.c

@@ -32,11 +32,7 @@
 
 #include <linux/input.h>
 
-#include "SDL_assert.h"
 #include "SDL_evdev_capabilities.h"
-#include "SDL_loadso.h"
-#include "SDL_timer.h"
-#include "SDL_hints.h"
 #include "../unix/SDL_poll.h"
 
 static const char *SDL_UDEV_LIBS[] = { "libudev.so.1", "libudev.so.0" };

src/core/linux/SDL_udev.h

@@ -30,8 +30,6 @@
 #define SDL_USE_LIBUDEV 1
 #endif
 
-#include "SDL_loadso.h"
-#include "SDL_events.h"
 #include <libudev.h>
 #include <sys/time.h>
 #include <sys/types.h>

src/core/openbsd/SDL_wscons_kbd.c

@@ -22,11 +22,7 @@
 #include "../../SDL_internal.h"
 #include <dev/wscons/wsksymvar.h>
 #include <dev/wscons/wsksymdef.h>
-#include "SDL_scancode.h"
-#include "SDL_events.h"
-#include "SDL_keyboard.h"
 #include "SDL_wscons.h"
-#include "SDL_log.h"
 #include <sys/time.h>
 #include <dev/wscons/wsconsio.h>
 #include <dev/wscons/wsdisplay_usl_io.h>

src/core/openbsd/SDL_wscons_mouse.c

@@ -20,7 +20,6 @@
 */
 
 #include "../../SDL_internal.h"
-#include "SDL_events.h"
 #include <sys/time.h>
 #include <dev/wscons/wsconsio.h>
 #include <unistd.h>

src/core/unix/SDL_poll.h

@@ -24,7 +24,6 @@
 #ifndef SDL_poll_h_
 #define SDL_poll_h_
 
-#include "SDL_stdinc.h"
 
 #define SDL_IOR_READ           0x1
 #define SDL_IOR_WRITE          0x2

src/core/windows/SDL_immdevice.h

@@ -22,8 +22,6 @@
 #ifndef SDL_IMMDEVICE_H
 #define SDL_IMMDEVICE_H
 
-#include "SDL_atomic.h"
-#include "SDL_audio.h"
 
 #define COBJMACROS
 #include <mmdeviceapi.h>

src/core/windows/SDL_windows.c

@@ -23,7 +23,6 @@
 #if defined(__WIN32__) || defined(__WINRT__) || defined(__GDK__)
 
 #include "SDL_windows.h"
-#include "SDL_error.h"
 
 #include <objbase.h>    /* for CoInitialize/CoUninitialize (Win32 only) */
 #if defined(HAVE_ROAPI_H)

src/core/windows/SDL_windows.h

@@ -89,8 +89,6 @@
 #endif
 #endif
 
-#include "SDL_rect.h"
-
 /* Routines to convert from UTF8 to native Windows text */
 #define WIN_StringToUTF8W(S) SDL_iconv_string("UTF-8", "UTF-16LE", (const char *)(S), (SDL_wcslen(S)+1)*sizeof(WCHAR))
 #define WIN_UTF8ToStringW(S) (WCHAR *)SDL_iconv_string("UTF-16LE", "UTF-8", (const char *)(S), SDL_strlen(S)+1)

src/core/winrt/SDL_winrtapp_common.cpp

@@ -20,8 +20,6 @@
 */
 #include "../../SDL_internal.h"
 
-#include "SDL_main.h"
-#include "SDL_system.h"
 #include "SDL_winrtapp_direct3d.h"
 #include "SDL_winrtapp_xaml.h"
 

src/core/winrt/SDL_winrtapp_direct3d.cpp

@@ -47,11 +47,6 @@ using namespace Windows::Phone::UI::Input;
 
 /* SDL includes */
 extern "C" {
-#include "SDL_events.h"
-#include "SDL_hints.h"
-#include "SDL_main.h"
-#include "SDL_stdinc.h"
-#include "SDL_render.h"
 #include "../../video/SDL_sysvideo.h"
 //#include "../../SDL_hints_c.h"
 #include "../../events/SDL_events_c.h"

src/core/winrt/SDL_winrtapp_xaml.cpp

@@ -30,7 +30,6 @@
 
 /* SDL includes */
 #include "../../SDL_internal.h"
-#include "SDL.h"
 #include "../../video/winrt/SDL_winrtevents_c.h"
 #include "../../video/winrt/SDL_winrtvideo_cpp.h"
 #include "SDL_winrtapp_common.h"

src/core/winrt/SDL_winrtapp_xaml.h

@@ -23,7 +23,6 @@
 #ifndef SDL_winrtapp_xaml_h_
 #define SDL_winrtapp_xaml_h_
 
-#include "SDL_stdinc.h"
 
 #ifdef __cplusplus
 extern SDL_bool WINRT_XAMLWasEnabled;

src/cpuinfo/SDL_cpuinfo.c

@@ -28,8 +28,6 @@
 
 /* CPU feature detection for SDL */
 
-#include "SDL_cpuinfo.h"
-#include "SDL_assert.h"
 
 #ifdef HAVE_SYSCONF
 #include <unistd.h>

src/dynapi/SDL_dynapi.c

@@ -28,11 +28,11 @@
 #include <stdio.h>
 #endif
 
-#include "SDL.h"
+#include <SDL3/SDL.h>
 
 /* These headers have system specific definitions, so aren't included above */
-#include "SDL_syswm.h"
-#include "SDL_vulkan.h"
+#include <SDL3/SDL_syswm.h>
+#include <SDL3/SDL_vulkan.h>
 
 /* This is the version of the dynamic API. This doesn't match the SDL version
    and should not change until there's been a major revamp in API/ABI.

src/dynapi/gendynapi.pl

@@ -48,10 +48,10 @@ if (-f $sdl_dynapi_procs_h) {
 open(SDL_DYNAPI_PROCS_H, '>>', $sdl_dynapi_procs_h) or die("Can't open $sdl_dynapi_procs_h: $!\n");
 open(SDL_DYNAPI_OVERRIDES_H, '>>', $sdl_dynapi_overrides_h) or die("Can't open $sdl_dynapi_overrides_h: $!\n");
 
-opendir(HEADERS, 'include') or die("Can't open include dir: $!\n");
+opendir(HEADERS, 'include/SDL3') or die("Can't open include dir: $!\n");
 while (my $d = readdir(HEADERS)) {
     next if not $d =~ /\.h\Z/;
-    my $header = "include/$d";
+    my $header = "include/SDL3/$d";
     open(HEADER, '<', $header) or die("Can't open $header: $!\n");
     while (<HEADER>) {
         chomp;

src/events/SDL_clipboardevents.c

@@ -22,7 +22,6 @@
 
 /* Clipboard event handling code for SDL */
 
-#include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "SDL_clipboardevents_c.h"
 

src/events/SDL_displayevents.c

@@ -22,7 +22,6 @@
 
 /* Display event handling code for SDL */
 
-#include "SDL_events.h"
 #include "SDL_events_c.h"
 
 

src/events/SDL_dropevents.c

@@ -22,7 +22,6 @@
 
 /* Drag and drop event handling code for SDL */
 
-#include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "SDL_dropevents_c.h"
 

src/events/SDL_events.c

@@ -22,9 +22,6 @@
 
 /* General event handling code for SDL */
 
-#include "SDL.h"
-#include "SDL_events.h"
-#include "SDL_thread.h"
 #include "SDL_events_c.h"
 #include "../SDL_hints_c.h"
 #include "../timer/SDL_timer_c.h"
@@ -32,7 +29,7 @@
 #include "../joystick/SDL_joystick_c.h"
 #endif
 #include "../video/SDL_sysvideo.h"
-#include "SDL_syswm.h"
+#include <SDL3/SDL_syswm.h>
 
 #undef SDL_PRIs64
 #if (defined(__WIN32__) || defined(__GDK__)) && !defined(__CYGWIN__)

src/events/SDL_events_c.h

@@ -25,8 +25,6 @@
 #include "../SDL_internal.h"
 
 /* Useful functions and variables from SDL_events.c */
-#include "SDL_events.h"
-#include "SDL_thread.h"
 #include "../video/SDL_sysvideo.h"
 
 #include "SDL_clipboardevents_c.h"

src/events/SDL_gesture.c

@@ -23,8 +23,6 @@
 
 /* General gesture handling code for SDL */
 
-#include "SDL_events.h"
-#include "SDL_endian.h"
 #include "SDL_events_c.h"
 #include "SDL_gesture_c.h"
 

src/events/SDL_keyboard.c

@@ -22,9 +22,6 @@
 
 /* General keyboard handling code for SDL */
 
-#include "SDL_hints.h"
-#include "SDL_timer.h"
-#include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "../video/SDL_sysvideo.h"
 #include "scancodes_ascii.h"

src/events/SDL_keyboard_c.h

@@ -23,8 +23,6 @@
 #ifndef SDL_keyboard_c_h_
 #define SDL_keyboard_c_h_
 
-#include "SDL_keycode.h"
-#include "SDL_events.h"
 
 /* Initialize the keyboard subsystem */
 extern int SDL_KeyboardInit(void);

src/events/SDL_keysym_to_scancode.c

@@ -18,7 +18,6 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-
 #include "../SDL_internal.h"
 
 #if SDL_VIDEO_DRIVER_WAYLAND || SDL_VIDEO_DRIVER_X11

src/events/SDL_keysym_to_scancode_c.h

@@ -22,7 +22,6 @@
 #ifndef SDL_keysym_to_scancode_c_h_
 #define SDL_keysym_to_scancode_c_h_
 
-#include "SDL_scancode.h"
 
 /* This function only correctly maps letters and numbers for keyboards in US QWERTY layout */
 extern SDL_Scancode SDL_GetScancodeFromKeySym(Uint32 keysym, Uint32 keycode);

src/events/SDL_mouse.c

@@ -22,9 +22,6 @@
 
 /* General mouse handling code for SDL */
 
-#include "SDL_hints.h"
-#include "SDL_timer.h"
-#include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "../SDL_hints_c.h"
 #include "../video/SDL_sysvideo.h"

src/events/SDL_mouse_c.h

@@ -23,7 +23,6 @@
 #ifndef SDL_mouse_c_h_
 #define SDL_mouse_c_h_
 
-#include "SDL_mouse.h"
 
 struct SDL_Cursor
 {

src/events/SDL_quit.c

@@ -20,7 +20,6 @@
 */
 #include "../SDL_internal.h"
 
-#include "SDL_hints.h"
 
 /* General quit handling code for SDL */
 
@@ -28,7 +27,6 @@
 #include <signal.h>
 #endif
 
-#include "SDL_events.h"
 #include "SDL_events_c.h"
 
 #if defined(HAVE_SIGNAL_H) || defined(HAVE_SIGACTION)

src/events/SDL_scancode_tables_c.h

@@ -20,8 +20,6 @@
 */
 #include "../SDL_internal.h"
 
-#include "../../include/SDL_scancode.h"
-
 typedef enum
 {
     SDL_SCANCODE_TABLE_DARWIN,

src/events/SDL_touch.c

@@ -22,7 +22,6 @@
 
 /* General touch handling code for SDL */
 
-#include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "../video/SDL_sysvideo.h"
 

src/events/SDL_touch_c.h

@@ -19,7 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 #include "../SDL_internal.h"
-#include "../../include/SDL_touch.h"
 
 #ifndef SDL_touch_c_h_
 #define SDL_touch_c_h_

src/events/SDL_windowevents.c

@@ -22,10 +22,8 @@
 
 /* Window event handling code for SDL */
 
-#include "SDL_events.h"
 #include "SDL_events_c.h"
 #include "SDL_mouse_c.h"
-#include "SDL_hints.h"
 
 typedef struct RemovePendingSizeChangedAndResizedEvents_Data
 {

src/events/scancodes_ascii.h

@@ -19,8 +19,6 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "SDL_scancode.h"
-#include "SDL_keycode.h"
 
 /*
     This file is used to convert between characters passed in from an ASCII

src/events/scancodes_linux.h

@@ -18,7 +18,7 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#include "../../include/SDL_scancode.h"
+#include "../SDL_internal.h"
 
 /* Linux virtual key code to SDL_Keycode mapping table
    Sources:

src/events/scancodes_windows.h

@@ -18,7 +18,7 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
-#include "../../include/SDL_scancode.h"
+#include "../SDL_internal.h"
 
 /* Windows scancode to SDL scancode mapping table */
 /* derived from Microsoft scan code document, http://download.microsoft.com/download/1/6/1/161ba512-40e2-4cc9-843a-923143f3456c/scancode.doc */

src/events/scancodes_xfree86.h

@@ -18,12 +18,11 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+#include "../SDL_internal.h"
 
 #ifndef scancodes_xfree86_h_
 #define scancodes_xfree86_h_
 
-#include "../../include/SDL_scancode.h"
-
 /* XFree86 key code to SDL scancode mapping table
    Sources:
    - atKeyNames.h from XFree86 source code

src/file/SDL_rwops.c

@@ -41,8 +41,6 @@
    data sources.  It can easily be extended to files, memory, etc.
 */
 
-#include "SDL_endian.h"
-#include "SDL_rwops.h"
 
 #ifdef __APPLE__
 #include "cocoa/SDL_rwopsbundlesupport.h"
@@ -54,7 +52,6 @@
 
 #ifdef __ANDROID__
 #include "../core/android/SDL_android.h"
-#include "SDL_system.h"
 #endif
 
 #if defined(__WIN32__) || defined(__GDK__)

src/file/n3ds/SDL_rwopsromfs.c

@@ -20,7 +20,6 @@
 */
 
 #include "SDL_rwopsromfs.h"
-#include "SDL_error.h"
 
 /* Checks if the mode is a kind of reading */
 SDL_FORCE_INLINE SDL_bool IsReadMode(const char *mode);

src/filesystem/android/SDL_sysfilesystem.c

@@ -27,9 +27,6 @@
 
 #include <unistd.h>
 
-#include "SDL_error.h"
-#include "SDL_filesystem.h"
-#include "SDL_system.h"
 
 
 char *

src/filesystem/cocoa/SDL_sysfilesystem.m

@@ -29,9 +29,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "SDL_error.h"
-#include "SDL_stdinc.h"
-#include "SDL_filesystem.h"
 
 char *
 SDL_GetBasePath(void)

src/filesystem/dummy/SDL_sysfilesystem.c

@@ -25,8 +25,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* System dependent filesystem routines                                */
 
-#include "SDL_error.h"
-#include "SDL_filesystem.h"
 
 char *
 SDL_GetBasePath(void)

src/filesystem/emscripten/SDL_sysfilesystem.c

@@ -27,8 +27,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "SDL_error.h"
-#include "SDL_filesystem.h"
 
 #include <emscripten/emscripten.h>