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

CMakeLists.txt

@@ -2922,7 +2922,7 @@ endif()
 listtostr(EXTRA_CFLAGS _EXTRA_CFLAGS)
 set(EXTRA_CFLAGS ${_EXTRA_CFLAGS})
 
-file(GLOB SDL3_INCLUDE_FILES ${SDL3_SOURCE_DIR}/include/*.h)
+file(GLOB SDL3_INCLUDE_FILES ${SDL3_SOURCE_DIR}/include/SDL3/*.h)
 foreach(_hdr IN LISTS SDL3_INCLUDE_FILES)
   if(_hdr MATCHES ".*SDL_revision.h")
     list(REMOVE_ITEM SDL3_INCLUDE_FILES "${_hdr}")
@@ -2963,8 +2963,9 @@ else()
   set(SDL_REVISION "SDL-${SDL_VERSION}-no-vcs")
 endif()
 
+execute_process(COMMAND "${CMAKE_COMMAND}" -E make_directory "${SDL3_BINARY_DIR}/include/SDL3")
 configure_file("${SDL3_SOURCE_DIR}/include/build_config/SDL_revision.h.cmake"
-  "${SDL3_BINARY_DIR}/include/SDL_revision.h")
+  "${SDL3_BINARY_DIR}/include/SDL3/SDL_revision.h")
 
 if(CMAKE_STATIC_LIBRARY_PREFIX STREQUAL "" AND CMAKE_STATIC_LIBRARY_SUFFIX STREQUAL ".lib")
   # Avoid conflict between the dll import library and the static library
@@ -3454,7 +3455,7 @@ if(NOT SDL3_DISABLE_INSTALL)
   install(
     FILES
       ${SDL3_INCLUDE_FILES}
-      "${SDL3_BINARY_DIR}/include/SDL_revision.h"
+      "${SDL3_BINARY_DIR}/include/SDL3/SDL_revision.h"
     DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SDL3)
 
   install(FILES "LICENSE.txt" DESTINATION "${LICENSES_PREFIX}")

VisualC-GDK/SDL/SDL.vcxproj

@@ -290,84 +290,84 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\begin_code.h" />
-    <ClInclude Include="..\..\include\close_code.h" />
-    <ClInclude Include="..\..\include\SDL.h" />
-    <ClInclude Include="..\..\include\SDL_assert.h" />
-    <ClInclude Include="..\..\include\SDL_atomic.h" />
-    <ClInclude Include="..\..\include\SDL_audio.h" />
-    <ClInclude Include="..\..\include\SDL_bits.h" />
-    <ClInclude Include="..\..\include\SDL_blendmode.h" />
-    <ClInclude Include="..\..\include\SDL_clipboard.h" />
-    <ClInclude Include="..\..\include\SDL_copying.h" />
-    <ClInclude Include="..\..\include\SDL_cpuinfo.h" />
-    <ClInclude Include="..\..\include\SDL_egl.h" />
-    <ClInclude Include="..\..\include\SDL_endian.h" />
-    <ClInclude Include="..\..\include\SDL_error.h" />
-    <ClInclude Include="..\..\include\SDL_events.h" />
-    <ClInclude Include="..\..\include\SDL_filesystem.h" />
-    <ClInclude Include="..\..\include\SDL_gamecontroller.h" />
-    <ClInclude Include="..\..\include\SDL_gesture.h" />
-    <ClInclude Include="..\..\include\SDL_guid.h" />
-    <ClInclude Include="..\..\include\SDL_haptic.h" />
-    <ClInclude Include="..\..\include\SDL_hints.h" />
-    <ClInclude Include="..\..\include\SDL_hidapi.h" />
-    <ClInclude Include="..\..\include\SDL_joystick.h" />
-    <ClInclude Include="..\..\include\SDL_keyboard.h" />
-    <ClInclude Include="..\..\include\SDL_keycode.h" />
-    <ClInclude Include="..\..\include\SDL_loadso.h" />
-    <ClInclude Include="..\..\include\SDL_locale.h" />
-    <ClInclude Include="..\..\include\SDL_log.h" />
-    <ClInclude Include="..\..\include\SDL_main.h" />
-    <ClInclude Include="..\..\include\SDL_messagebox.h" />
-    <ClInclude Include="..\..\include\SDL_metal.h" />
-    <ClInclude Include="..\..\include\SDL_misc.h" />
-    <ClInclude Include="..\..\include\SDL_mouse.h" />
-    <ClInclude Include="..\..\include\SDL_mutex.h" />
-    <ClInclude Include="..\..\include\SDL_name.h" />
-    <ClInclude Include="..\..\include\SDL_opengl.h" />
-    <ClInclude Include="..\..\include\SDL_opengl_glext.h" />
-    <ClInclude Include="..\..\include\SDL_opengles.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2ext.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2platform.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2_khrplatform.h" />
-    <ClInclude Include="..\..\include\SDL_pixels.h" />
-    <ClInclude Include="..\..\include\SDL_platform.h" />
-    <ClInclude Include="..\..\include\SDL_power.h" />
-    <ClInclude Include="..\..\include\SDL_quit.h" />
-    <ClInclude Include="..\..\include\SDL_rect.h" />
-    <ClInclude Include="..\..\include\SDL_render.h" />
-    <ClInclude Include="..\..\include\SDL_revision.h" />
-    <ClInclude Include="..\..\include\SDL_rwops.h" />
-    <ClInclude Include="..\..\include\SDL_scancode.h" />
-    <ClInclude Include="..\..\include\SDL_sensor.h" />
-    <ClInclude Include="..\..\include\SDL_shape.h" />
-    <ClInclude Include="..\..\include\SDL_stdinc.h" />
-    <ClInclude Include="..\..\include\SDL_surface.h" />
-    <ClInclude Include="..\..\include\SDL_system.h" />
-    <ClInclude Include="..\..\include\SDL_syswm.h" />
-    <ClInclude Include="..\..\include\SDL_test.h" />
-    <ClInclude Include="..\..\include\SDL_test_assert.h" />
-    <ClInclude Include="..\..\include\SDL_test_common.h" />
-    <ClInclude Include="..\..\include\SDL_test_compare.h" />
-    <ClInclude Include="..\..\include\SDL_test_crc32.h" />
-    <ClInclude Include="..\..\include\SDL_test_font.h" />
-    <ClInclude Include="..\..\include\SDL_test_fuzzer.h" />
-    <ClInclude Include="..\..\include\SDL_test_harness.h" />
-    <ClInclude Include="..\..\include\SDL_test_images.h" />
-    <ClInclude Include="..\..\include\SDL_test_log.h" />
-    <ClInclude Include="..\..\include\SDL_test_md5.h" />
-    <ClInclude Include="..\..\include\SDL_test_memory.h" />
-    <ClInclude Include="..\..\include\SDL_test_random.h" />
-    <ClInclude Include="..\..\include\SDL_thread.h" />
-    <ClInclude Include="..\..\include\SDL_timer.h" />
-    <ClInclude Include="..\..\include\SDL_touch.h" />
-    <ClInclude Include="..\..\include\SDL_types.h" />
-    <ClInclude Include="..\..\include\SDL_version.h" />
-    <ClInclude Include="..\..\include\SDL_video.h" />
-    <ClInclude Include="..\..\include\SDL_vulkan.h" />
+    <ClInclude Include="..\..\include\SDL3\begin_code.h" />
+    <ClInclude Include="..\..\include\SDL3\close_code.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_assert.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_atomic.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_audio.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_bits.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_blendmode.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_clipboard.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_copying.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_cpuinfo.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_egl.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_endian.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_error.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_events.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_filesystem.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_gamecontroller.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_gesture.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_guid.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_haptic.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_hints.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_joystick.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_keyboard.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_keycode.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_loadso.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_locale.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_log.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_main.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_messagebox.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_metal.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_misc.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_mouse.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_mutex.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_name.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengl.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengl_glext.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2ext.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2platform.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_khrplatform.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_pixels.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_platform.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_power.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_quit.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_rect.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_render.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_revision.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_rwops.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_scancode.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_sensor.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_shape.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_stdinc.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_surface.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_system.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_syswm.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_assert.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_common.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_compare.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_crc32.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_font.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_fuzzer.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_harness.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_images.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_log.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_random.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_thread.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_timer.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_touch.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_types.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_version.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_video.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_vulkan.h" />
     <ClInclude Include="..\..\src\audio\directsound\SDL_directsound.h" />
     <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />

VisualC-GDK/SDL/SDL.vcxproj.filters

@@ -174,241 +174,241 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\begin_code.h">
+    <ClInclude Include="..\..\include\SDL3\begin_code.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\close_code.h">
+    <ClInclude Include="..\..\include\SDL3\close_code.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL.h">
+    <ClInclude Include="..\..\include\SDL3\SDL.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_assert.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_assert.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_atomic.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_atomic.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_audio.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_audio.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_bits.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_bits.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_blendmode.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_blendmode.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_clipboard.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_clipboard.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_copying.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_copying.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_cpuinfo.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_cpuinfo.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_egl.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_egl.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_endian.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_endian.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_error.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_error.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_events.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_events.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_filesystem.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_filesystem.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_gamecontroller.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_gamecontroller.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_gesture.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_gesture.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_guid.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_guid.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_haptic.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_haptic.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_hints.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_hints.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_hidapi.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_joystick.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_joystick.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_keyboard.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_keyboard.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_keycode.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_keycode.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_loadso.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_loadso.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_locale.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_locale.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_log.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_log.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_main.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_main.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_messagebox.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_messagebox.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_mouse.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_mouse.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_mutex.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_mutex.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_name.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_name.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengl.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengl.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengl_glext.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengl_glext.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2ext.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2ext.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2platform.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2platform.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2_khrplatform.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_khrplatform.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_pixels.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_pixels.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_platform.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_platform.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_power.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_power.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_quit.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_quit.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_rect.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_rect.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_render.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_render.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_revision.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_revision.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_rwops.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_rwops.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_scancode.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_scancode.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_sensor.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_sensor.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_shape.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_shape.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_stdinc.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_stdinc.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_surface.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_surface.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_system.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_system.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_syswm.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_syswm.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_assert.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_assert.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_common.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_common.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_compare.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_compare.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_crc32.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_crc32.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_font.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_font.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_fuzzer.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_fuzzer.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_harness.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_harness.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_images.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_images.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_log.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_log.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_md5.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_random.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_random.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_thread.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_thread.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_timer.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_timer.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_touch.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_touch.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_types.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_types.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_version.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_version.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_video.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_video.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_vulkan.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_vulkan.h">
       <Filter>API Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\SDL_dataqueue.h" />
     <ClInclude Include="..\..\src\SDL_error_c.h" />
     <ClInclude Include="..\..\src\SDL_list.h" />
-    <ClInclude Include="..\..\include\SDL_metal.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_metal.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_misc.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_misc.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_memory.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h">
       <Filter>API Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h">

VisualC-WinRT/SDL-UWP.vcxproj

@@ -35,59 +35,59 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\begin_code.h" />
-    <ClInclude Include="..\include\close_code.h" />
-    <ClInclude Include="..\include\SDL.h" />
-    <ClInclude Include="..\include\SDL_assert.h" />
-    <ClInclude Include="..\include\SDL_atomic.h" />
-    <ClInclude Include="..\include\SDL_audio.h" />
-    <ClInclude Include="..\include\SDL_blendmode.h" />
-    <ClInclude Include="..\include\SDL_clipboard.h" />
-    <ClInclude Include="..\include\SDL_copying.h" />
-    <ClInclude Include="..\include\SDL_cpuinfo.h" />
-    <ClInclude Include="..\include\SDL_egl.h" />
-    <ClInclude Include="..\include\SDL_endian.h" />
-    <ClInclude Include="..\include\SDL_error.h" />
-    <ClInclude Include="..\include\SDL_events.h" />
-    <ClInclude Include="..\include\SDL_filesystem.h" />
-    <ClInclude Include="..\include\SDL_guid.h" />
-    <ClInclude Include="..\include\SDL_haptic.h" />
-    <ClInclude Include="..\include\SDL_hints.h" />
-    <ClInclude Include="..\include\SDL_hidapi.h" />
-    <ClInclude Include="..\include\SDL_input.h" />
-    <ClInclude Include="..\include\SDL_joystick.h" />
-    <ClInclude Include="..\include\SDL_keyboard.h" />
-    <ClInclude Include="..\include\SDL_keycode.h" />
-    <ClInclude Include="..\include\SDL_loadso.h" />
-    <ClInclude Include="..\include\SDL_locale.h" />
-    <ClInclude Include="..\include\SDL_log.h" />
-    <ClInclude Include="..\include\SDL_main.h" />
-    <ClInclude Include="..\include\SDL_misc.h" />
-    <ClInclude Include="..\include\SDL_mouse.h" />
-    <ClInclude Include="..\include\SDL_mutex.h" />
-    <ClInclude Include="..\include\SDL_name.h" />
-    <ClInclude Include="..\include\SDL_opengles2.h" />
-    <ClInclude Include="..\include\SDL_pixels.h" />
-    <ClInclude Include="..\include\SDL_platform.h" />
-    <ClInclude Include="..\include\SDL_power.h" />
-    <ClInclude Include="..\include\SDL_quit.h" />
-    <ClInclude Include="..\include\SDL_rect.h" />
-    <ClInclude Include="..\include\SDL_render.h" />
-    <ClInclude Include="..\include\SDL_revision.h" />
-    <ClInclude Include="..\include\SDL_rwops.h" />
-    <ClInclude Include="..\include\SDL_scancode.h" />
-    <ClInclude Include="..\include\SDL_sensor.h" />
-    <ClInclude Include="..\include\SDL_shape.h" />
-    <ClInclude Include="..\include\SDL_stdinc.h" />
-    <ClInclude Include="..\include\SDL_surface.h" />
-    <ClInclude Include="..\include\SDL_system.h" />
-    <ClInclude Include="..\include\SDL_syswm.h" />
-    <ClInclude Include="..\include\SDL_thread.h" />
-    <ClInclude Include="..\include\SDL_timer.h" />
-    <ClInclude Include="..\include\SDL_touch.h" />
-    <ClInclude Include="..\include\SDL_types.h" />
-    <ClInclude Include="..\include\SDL_version.h" />
-    <ClInclude Include="..\include\SDL_video.h" />
+    <ClInclude Include="..\include\SDL3\begin_code.h" />
+    <ClInclude Include="..\include\SDL3\close_code.h" />
+    <ClInclude Include="..\include\SDL3\SDL.h" />
+    <ClInclude Include="..\include\SDL3\SDL_assert.h" />
+    <ClInclude Include="..\include\SDL3\SDL_atomic.h" />
+    <ClInclude Include="..\include\SDL3\SDL_audio.h" />
+    <ClInclude Include="..\include\SDL3\SDL_blendmode.h" />
+    <ClInclude Include="..\include\SDL3\SDL_clipboard.h" />
+    <ClInclude Include="..\include\SDL3\SDL_copying.h" />
+    <ClInclude Include="..\include\SDL3\SDL_cpuinfo.h" />
+    <ClInclude Include="..\include\SDL3\SDL_egl.h" />
+    <ClInclude Include="..\include\SDL3\SDL_endian.h" />
+    <ClInclude Include="..\include\SDL3\SDL_error.h" />
+    <ClInclude Include="..\include\SDL3\SDL_events.h" />
+    <ClInclude Include="..\include\SDL3\SDL_filesystem.h" />
+    <ClInclude Include="..\include\SDL3\SDL_guid.h" />
+    <ClInclude Include="..\include\SDL3\SDL_haptic.h" />
+    <ClInclude Include="..\include\SDL3\SDL_hints.h" />
+    <ClInclude Include="..\include\SDL3\SDL_hidapi.h" />
+    <ClInclude Include="..\include\SDL3\SDL_input.h" />
+    <ClInclude Include="..\include\SDL3\SDL_joystick.h" />
+    <ClInclude Include="..\include\SDL3\SDL_keyboard.h" />
+    <ClInclude Include="..\include\SDL3\SDL_keycode.h" />
+    <ClInclude Include="..\include\SDL3\SDL_loadso.h" />
+    <ClInclude Include="..\include\SDL3\SDL_locale.h" />
+    <ClInclude Include="..\include\SDL3\SDL_log.h" />
+    <ClInclude Include="..\include\SDL3\SDL_main.h" />
+    <ClInclude Include="..\include\SDL3\SDL_misc.h" />
+    <ClInclude Include="..\include\SDL3\SDL_mouse.h" />
+    <ClInclude Include="..\include\SDL3\SDL_mutex.h" />
+    <ClInclude Include="..\include\SDL3\SDL_name.h" />
+    <ClInclude Include="..\include\SDL3\SDL_opengles2.h" />
+    <ClInclude Include="..\include\SDL3\SDL_pixels.h" />
+    <ClInclude Include="..\include\SDL3\SDL_platform.h" />
+    <ClInclude Include="..\include\SDL3\SDL_power.h" />
+    <ClInclude Include="..\include\SDL3\SDL_quit.h" />
+    <ClInclude Include="..\include\SDL3\SDL_rect.h" />
+    <ClInclude Include="..\include\SDL3\SDL_render.h" />
+    <ClInclude Include="..\include\SDL3\SDL_revision.h" />
+    <ClInclude Include="..\include\SDL3\SDL_rwops.h" />
+    <ClInclude Include="..\include\SDL3\SDL_scancode.h" />
+    <ClInclude Include="..\include\SDL3\SDL_sensor.h" />
+    <ClInclude Include="..\include\SDL3\SDL_shape.h" />
+    <ClInclude Include="..\include\SDL3\SDL_stdinc.h" />
+    <ClInclude Include="..\include\SDL3\SDL_surface.h" />
+    <ClInclude Include="..\include\SDL3\SDL_system.h" />
+    <ClInclude Include="..\include\SDL3\SDL_syswm.h" />
+    <ClInclude Include="..\include\SDL3\SDL_thread.h" />
+    <ClInclude Include="..\include\SDL3\SDL_timer.h" />
+    <ClInclude Include="..\include\SDL3\SDL_touch.h" />
+    <ClInclude Include="..\include\SDL3\SDL_types.h" />
+    <ClInclude Include="..\include\SDL3\SDL_version.h" />
+    <ClInclude Include="..\include\SDL3\SDL_video.h" />
     <ClInclude Include="..\src\audio\disk\SDL_diskaudio.h" />
     <ClInclude Include="..\src\audio\dummy\SDL_dummyaudio.h" />
     <ClInclude Include="..\src\audio\SDL_audiodev_c.h" />

VisualC-WinRT/SDL-UWP.vcxproj.filters

@@ -9,157 +9,157 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\begin_code.h">
+    <ClInclude Include="..\include\SDL3\begin_code.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\close_code.h">
+    <ClInclude Include="..\include\SDL3\close_code.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL.h">
+    <ClInclude Include="..\include\SDL3\SDL.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_assert.h">
+    <ClInclude Include="..\include\SDL3\SDL_assert.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_atomic.h">
+    <ClInclude Include="..\include\SDL3\SDL_atomic.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_audio.h">
+    <ClInclude Include="..\include\SDL3\SDL_audio.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_blendmode.h">
+    <ClInclude Include="..\include\SDL3\SDL_blendmode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_clipboard.h">
+    <ClInclude Include="..\include\SDL3\SDL_clipboard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_copying.h">
+    <ClInclude Include="..\include\SDL3\SDL_copying.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_cpuinfo.h">
+    <ClInclude Include="..\include\SDL3\SDL_cpuinfo.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_egl.h">
+    <ClInclude Include="..\include\SDL3\SDL_egl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_endian.h">
+    <ClInclude Include="..\include\SDL3\SDL_endian.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_error.h">
+    <ClInclude Include="..\include\SDL3\SDL_error.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_events.h">
+    <ClInclude Include="..\include\SDL3\SDL_events.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_filesystem.h">
+    <ClInclude Include="..\include\SDL3\SDL_filesystem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_guid.h">
+    <ClInclude Include="..\include\SDL3\SDL_guid.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_haptic.h">
+    <ClInclude Include="..\include\SDL3\SDL_haptic.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_hints.h">
+    <ClInclude Include="..\include\SDL3\SDL_hints.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_hidapi.h">
+    <ClInclude Include="..\include\SDL3\SDL_hidapi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_input.h">
+    <ClInclude Include="..\include\SDL3\SDL_input.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_joystick.h">
+    <ClInclude Include="..\include\SDL3\SDL_joystick.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_keyboard.h">
+    <ClInclude Include="..\include\SDL3\SDL_keyboard.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_keycode.h">
+    <ClInclude Include="..\include\SDL3\SDL_keycode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_loadso.h">
+    <ClInclude Include="..\include\SDL3\SDL_loadso.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_locale.h">
+    <ClInclude Include="..\include\SDL3\SDL_locale.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_log.h">
+    <ClInclude Include="..\include\SDL3\SDL_log.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_main.h">
+    <ClInclude Include="..\include\SDL3\SDL_main.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_mouse.h">
+    <ClInclude Include="..\include\SDL3\SDL_mouse.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_mutex.h">
+    <ClInclude Include="..\include\SDL3\SDL_mutex.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_name.h">
+    <ClInclude Include="..\include\SDL3\SDL_name.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_opengles2.h">
+    <ClInclude Include="..\include\SDL3\SDL_opengles2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_pixels.h">
+    <ClInclude Include="..\include\SDL3\SDL_pixels.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_platform.h">
+    <ClInclude Include="..\include\SDL3\SDL_platform.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_power.h">
+    <ClInclude Include="..\include\SDL3\SDL_power.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_quit.h">
+    <ClInclude Include="..\include\SDL3\SDL_quit.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_rect.h">
+    <ClInclude Include="..\include\SDL3\SDL_rect.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_render.h">
+    <ClInclude Include="..\include\SDL3\SDL_render.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_revision.h">
+    <ClInclude Include="..\include\SDL3\SDL_revision.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_rwops.h">
+    <ClInclude Include="..\include\SDL3\SDL_rwops.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_scancode.h">
+    <ClInclude Include="..\include\SDL3\SDL_scancode.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_shape.h">
+    <ClInclude Include="..\include\SDL3\SDL_shape.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_stdinc.h">
+    <ClInclude Include="..\include\SDL3\SDL_stdinc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_surface.h">
+    <ClInclude Include="..\include\SDL3\SDL_surface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_system.h">
+    <ClInclude Include="..\include\SDL3\SDL_system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_syswm.h">
+    <ClInclude Include="..\include\SDL3\SDL_syswm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_thread.h">
+    <ClInclude Include="..\include\SDL3\SDL_thread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_timer.h">
+    <ClInclude Include="..\include\SDL3\SDL_timer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_touch.h">
+    <ClInclude Include="..\include\SDL3\SDL_touch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_types.h">
+    <ClInclude Include="..\include\SDL3\SDL_types.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_version.h">
+    <ClInclude Include="..\include\SDL3\SDL_version.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_video.h">
+    <ClInclude Include="..\include\SDL3\SDL_video.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\joystick\SDL_gamecontrollerdb.h">
@@ -426,7 +426,7 @@
     <ClInclude Include="..\src\render\direct3d11\SDL_shaders_d3d11.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_sensor.h">
+    <ClInclude Include="..\include\SDL3\SDL_sensor.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\sensor\SDL_sensor_c.h">
@@ -441,7 +441,7 @@
     <ClInclude Include="..\src\events\SDL_displayevents_c.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SDL_misc.h">
+    <ClInclude Include="..\include\SDL3\SDL_misc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClCompile Include="..\src\atomic\SDL_atomic.c">

VisualC/SDL/SDL.vcxproj

@@ -214,84 +214,83 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\begin_code.h" />
-    <ClInclude Include="..\..\include\close_code.h" />
-    <ClInclude Include="..\..\include\SDL.h" />
-    <ClInclude Include="..\..\include\SDL_assert.h" />
-    <ClInclude Include="..\..\include\SDL_atomic.h" />
-    <ClInclude Include="..\..\include\SDL_audio.h" />
-    <ClInclude Include="..\..\include\SDL_bits.h" />
-    <ClInclude Include="..\..\include\SDL_blendmode.h" />
-    <ClInclude Include="..\..\include\SDL_clipboard.h" />
-    <ClInclude Include="..\..\include\SDL_copying.h" />
-    <ClInclude Include="..\..\include\SDL_cpuinfo.h" />
-    <ClInclude Include="..\..\include\SDL_egl.h" />
-    <ClInclude Include="..\..\include\SDL_endian.h" />
-    <ClInclude Include="..\..\include\SDL_error.h" />
-    <ClInclude Include="..\..\include\SDL_events.h" />
-    <ClInclude Include="..\..\include\SDL_filesystem.h" />
-    <ClInclude Include="..\..\include\SDL_gamecontroller.h" />
-    <ClInclude Include="..\..\include\SDL_gesture.h" />
-    <ClInclude Include="..\..\include\SDL_guid.h" />
-    <ClInclude Include="..\..\include\SDL_haptic.h" />
-    <ClInclude Include="..\..\include\SDL_hints.h" />
-    <ClInclude Include="..\..\include\SDL_hidapi.h" />
-    <ClInclude Include="..\..\include\SDL_joystick.h" />
-    <ClInclude Include="..\..\include\SDL_keyboard.h" />
-    <ClInclude Include="..\..\include\SDL_keycode.h" />
-    <ClInclude Include="..\..\include\SDL_loadso.h" />
-    <ClInclude Include="..\..\include\SDL_locale.h" />
-    <ClInclude Include="..\..\include\SDL_log.h" />
-    <ClInclude Include="..\..\include\SDL_main.h" />
-    <ClInclude Include="..\..\include\SDL_messagebox.h" />
-    <ClInclude Include="..\..\include\SDL_metal.h" />
-    <ClInclude Include="..\..\include\SDL_misc.h" />
-    <ClInclude Include="..\..\include\SDL_mouse.h" />
-    <ClInclude Include="..\..\include\SDL_mutex.h" />
-    <ClInclude Include="..\..\include\SDL_name.h" />
-    <ClInclude Include="..\..\include\SDL_opengl.h" />
-    <ClInclude Include="..\..\include\SDL_opengl_glext.h" />
-    <ClInclude Include="..\..\include\SDL_opengles.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2ext.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2platform.h" />
-    <ClInclude Include="..\..\include\SDL_opengles2_khrplatform.h" />
-    <ClInclude Include="..\..\include\SDL_pixels.h" />
-    <ClInclude Include="..\..\include\SDL_platform.h" />
-    <ClInclude Include="..\..\include\SDL_power.h" />
-    <ClInclude Include="..\..\include\SDL_quit.h" />
-    <ClInclude Include="..\..\include\SDL_rect.h" />
-    <ClInclude Include="..\..\include\SDL_render.h" />
-    <ClInclude Include="..\..\include\SDL_revision.h" />
-    <ClInclude Include="..\..\include\SDL_rwops.h" />
-    <ClInclude Include="..\..\include\SDL_scancode.h" />
-    <ClInclude Include="..\..\include\SDL_sensor.h" />
-    <ClInclude Include="..\..\include\SDL_shape.h" />
-    <ClInclude Include="..\..\include\SDL_stdinc.h" />
-    <ClInclude Include="..\..\include\SDL_surface.h" />
-    <ClInclude Include="..\..\include\SDL_system.h" />
-    <ClInclude Include="..\..\include\SDL_syswm.h" />
-    <ClInclude Include="..\..\include\SDL_test.h" />
-    <ClInclude Include="..\..\include\SDL_test_assert.h" />
-    <ClInclude Include="..\..\include\SDL_test_common.h" />
-    <ClInclude Include="..\..\include\SDL_test_compare.h" />
-    <ClInclude Include="..\..\include\SDL_test_crc32.h" />
-    <ClInclude Include="..\..\include\SDL_test_font.h" />
-    <ClInclude Include="..\..\include\SDL_test_fuzzer.h" />
-    <ClInclude Include="..\..\include\SDL_test_harness.h" />
-    <ClInclude Include="..\..\include\SDL_test_images.h" />
-    <ClInclude Include="..\..\include\SDL_test_log.h" />
-    <ClInclude Include="..\..\include\SDL_test_md5.h" />
-    <ClInclude Include="..\..\include\SDL_test_memory.h" />
-    <ClInclude Include="..\..\include\SDL_test_random.h" />
-    <ClInclude Include="..\..\include\SDL_thread.h" />
-    <ClInclude Include="..\..\include\SDL_timer.h" />
-    <ClInclude Include="..\..\include\SDL_touch.h" />
-    <ClInclude Include="..\..\include\SDL_types.h" />
-    <ClInclude Include="..\..\include\SDL_version.h" />
-    <ClInclude Include="..\..\include\SDL_video.h" />
-    <ClInclude Include="..\..\include\SDL_vulkan.h" />
+    <ClInclude Include="..\..\include\SDL3\begin_code.h" />
+    <ClInclude Include="..\..\include\SDL3\close_code.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_assert.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_atomic.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_audio.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_bits.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_blendmode.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_clipboard.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_copying.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_cpuinfo.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_egl.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_endian.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_error.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_events.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_filesystem.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_gamecontroller.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_gesture.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_guid.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_haptic.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_hints.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_joystick.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_keyboard.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_keycode.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_loadso.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_locale.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_log.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_main.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_messagebox.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_metal.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_misc.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_mouse.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_mutex.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_name.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengl.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengl_glext.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2ext.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2platform.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_khrplatform.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_pixels.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_platform.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_power.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_quit.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_rect.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_render.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_revision.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_rwops.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_scancode.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_sensor.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_shape.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_stdinc.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_surface.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_system.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_syswm.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_assert.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_common.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_compare.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_crc32.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_font.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_fuzzer.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_harness.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_images.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_log.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_random.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_thread.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_timer.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_touch.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_version.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_video.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_vulkan.h" />
     <ClInclude Include="..\..\src\audio\directsound\SDL_directsound.h" />
     <ClInclude Include="..\..\src\audio\disk\SDL_diskaudio.h" />
     <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />

VisualC/SDL/SDL.vcxproj.filters

@@ -171,241 +171,238 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\include\begin_code.h">
+    <ClInclude Include="..\..\include\SDL3\begin_code.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\close_code.h">
+    <ClInclude Include="..\..\include\SDL3\close_code.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL.h">
+    <ClInclude Include="..\..\include\SDL3\SDL.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_assert.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_assert.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_atomic.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_atomic.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_audio.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_audio.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_bits.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_bits.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_blendmode.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_blendmode.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_clipboard.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_clipboard.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_copying.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_copying.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_cpuinfo.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_cpuinfo.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_egl.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_egl.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_endian.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_endian.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_error.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_error.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_events.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_events.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_filesystem.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_filesystem.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_gamecontroller.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_gamecontroller.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_gesture.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_gesture.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_guid.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_guid.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_haptic.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_haptic.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_hints.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_hints.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_hidapi.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_hidapi.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_joystick.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_joystick.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_keyboard.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_keyboard.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_keycode.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_keycode.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_loadso.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_loadso.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_locale.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_locale.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_log.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_log.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_main.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_main.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_messagebox.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_messagebox.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_mouse.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_mouse.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_mutex.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_mutex.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_name.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_name.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengl.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengl.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengl_glext.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengl_glext.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2ext.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2ext.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2_gl2platform.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_gl2platform.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_opengles2_khrplatform.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_opengles2_khrplatform.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_pixels.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_pixels.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_platform.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_platform.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_power.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_power.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_quit.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_quit.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_rect.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_rect.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_render.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_render.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_revision.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_revision.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_rwops.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_rwops.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_scancode.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_scancode.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_sensor.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_sensor.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_shape.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_shape.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_stdinc.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_stdinc.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_surface.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_surface.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_system.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_system.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_syswm.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_syswm.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_assert.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_assert.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_common.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_common.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_compare.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_compare.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_crc32.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_crc32.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_font.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_font.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_fuzzer.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_fuzzer.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_harness.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_harness.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_images.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_images.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_log.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_log.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_md5.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_random.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_random.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_thread.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_thread.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_timer.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_timer.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_touch.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_touch.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_types.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_version.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_version.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_video.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_video.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL_vulkan.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_vulkan.h">
       <Filter>API Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\SDL_dataqueue.h" />
     <ClInclude Include="..\..\src\SDL_error_c.h" />
     <ClInclude Include="..\..\src\SDL_list.h" />
-    <ClInclude Include="..\..\include\SDL_metal.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_metal.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_misc.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_misc.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL_test_memory.h">
+    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h">
       <Filter>API Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h">

WhatsNew.txt

@@ -6,6 +6,7 @@ This is a list of major changes in SDL's version history.
 ---------------------------------------------------------------------------
 
 General:
+* SDL headers should now be included as `#include <SDL3/SDL.h>`
 * M_PI is no longer defined in SDL_stdinc.h, now the symbols SDL_PI_D (double) and SDL_PI_F (float) are available
 * SDL_GetWindowWMInfo() returns a standard int result code instead of SDL_bool, and takes SDL_SYSWM_CURRENT_VERSION as a new third parameter
 * The preprocessor symbol __MACOSX__ has been renamed __MACOS__

build-scripts/showrev.sh

@@ -10,9 +10,9 @@ if [ -e ./VERSION.txt ]; then
     exit 0
 fi
 
-major=$(sed -ne 's/^#define SDL_MAJOR_VERSION  *//p' include/SDL_version.h)
-minor=$(sed -ne 's/^#define SDL_MINOR_VERSION  *//p' include/SDL_version.h)
-micro=$(sed -ne 's/^#define SDL_PATCHLEVEL  *//p' include/SDL_version.h)
+major=$(sed -ne 's/^#define SDL_MAJOR_VERSION  *//p' include/SDL3/SDL_version.h)
+minor=$(sed -ne 's/^#define SDL_MINOR_VERSION  *//p' include/SDL3/SDL_version.h)
+micro=$(sed -ne 's/^#define SDL_PATCHLEVEL  *//p' include/SDL3/SDL_version.h)
 version="${major}.${minor}.${micro}"
 
 if [ -x "$(command -v git)" ]; then

build-scripts/test-versioning.sh

@@ -6,9 +6,9 @@ set -eu
 
 cd `dirname $0`/..
 
-ref_major=$(sed -ne 's/^#define SDL_MAJOR_VERSION  *//p' include/SDL_version.h)
-ref_minor=$(sed -ne 's/^#define SDL_MINOR_VERSION  *//p' include/SDL_version.h)
-ref_micro=$(sed -ne 's/^#define SDL_PATCHLEVEL  *//p' include/SDL_version.h)
+ref_major=$(sed -ne 's/^#define SDL_MAJOR_VERSION  *//p' include/SDL3/SDL_version.h)
+ref_minor=$(sed -ne 's/^#define SDL_MINOR_VERSION  *//p' include/SDL3/SDL_version.h)
+ref_micro=$(sed -ne 's/^#define SDL_PATCHLEVEL  *//p' include/SDL3/SDL_version.h)
 ref_version="${ref_major}.${ref_minor}.${ref_micro}"
 
 tests=0

build-scripts/update-version.sh

@@ -62,9 +62,9 @@ perl -w -pi -e 's/\A(.* SDL_MAJOR_VERSION = )\d+/${1}'$MAJOR'/;' android-project
 perl -w -pi -e 's/\A(.* SDL_MINOR_VERSION = )\d+/${1}'$MINOR'/;' android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
 perl -w -pi -e 's/\A(.* SDL_MICRO_VERSION = )\d+/${1}'$PATCH'/;' android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
 
-perl -w -pi -e 's/(\#define SDL_MAJOR_VERSION\s+)\d+/${1}'$MAJOR'/;' include/SDL_version.h
-perl -w -pi -e 's/(\#define SDL_MINOR_VERSION\s+)\d+/${1}'$MINOR'/;' include/SDL_version.h
-perl -w -pi -e 's/(\#define SDL_PATCHLEVEL\s+)\d+/${1}'$PATCH'/;' include/SDL_version.h
+perl -w -pi -e 's/(\#define SDL_MAJOR_VERSION\s+)\d+/${1}'$MAJOR'/;' include/SDL3/SDL_version.h
+perl -w -pi -e 's/(\#define SDL_MINOR_VERSION\s+)\d+/${1}'$MINOR'/;' include/SDL3/SDL_version.h
+perl -w -pi -e 's/(\#define SDL_PATCHLEVEL\s+)\d+/${1}'$PATCH'/;' include/SDL3/SDL_version.h
 
 perl -w -pi -e 's/(FILEVERSION\s+)\d+,\d+,\d+/${1}'$MAJOR','$MINOR','$PATCH'/;' src/main/windows/version.rc
 perl -w -pi -e 's/(PRODUCTVERSION\s+)\d+,\d+,\d+/${1}'$MAJOR','$MINOR','$PATCH'/;' src/main/windows/version.rc

build-scripts/updaterev.sh

@@ -5,7 +5,7 @@
 outdir=`pwd`
 cd `dirname $0`
 srcdir=..
-header=$outdir/include/SDL_revision.h
+header=$outdir/include/SDL3/SDL_revision.h
 dist=
 vendor=
 

docs/README-migration.md

@@ -4,6 +4,8 @@ This guide provides useful information for migrating applications from SDL 2.0 t
 
 We have provided a handy Python script to automate some of this work for you [link to script], and details on the changes are organized by SDL 2.0 header below.
 
+SDL headers should now be included as `#include <SDL3/SDL.h>`. Typically that's the only header you'll need in your application unless you are using OpenGL or Vulkan functionality.
+
 
 ## SDL_platform.h
 

include/SDL.h → include/SDL3/SDL.h

@@ -29,42 +29,56 @@
 #ifndef SDL_h_
 #define SDL_h_
 
-#include "SDL_main.h"
-#include "SDL_stdinc.h"
-#include "SDL_assert.h"
-#include "SDL_atomic.h"
-#include "SDL_audio.h"
-#include "SDL_clipboard.h"
-#include "SDL_cpuinfo.h"
-#include "SDL_endian.h"
-#include "SDL_error.h"
-#include "SDL_events.h"
-#include "SDL_filesystem.h"
-#include "SDL_gamecontroller.h"
-#include "SDL_guid.h"
-#include "SDL_haptic.h"
-#include "SDL_hidapi.h"
-#include "SDL_hints.h"
-#include "SDL_joystick.h"
-#include "SDL_loadso.h"
-#include "SDL_log.h"
-#include "SDL_messagebox.h"
-#include "SDL_metal.h"
-#include "SDL_mutex.h"
-#include "SDL_power.h"
-#include "SDL_render.h"
-#include "SDL_rwops.h"
-#include "SDL_sensor.h"
-#include "SDL_shape.h"
-#include "SDL_system.h"
-#include "SDL_thread.h"
-#include "SDL_timer.h"
-#include "SDL_version.h"
-#include "SDL_video.h"
-#include "SDL_locale.h"
-#include "SDL_misc.h"
-
-#include "begin_code.h"
+#include <SDL3/SDL_main.h>
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_assert.h>
+#include <SDL3/SDL_atomic.h>
+#include <SDL3/SDL_audio.h>
+#include <SDL3/SDL_bits.h>
+#include <SDL3/SDL_blendmode.h>
+#include <SDL3/SDL_clipboard.h>
+#include <SDL3/SDL_cpuinfo.h>
+#include <SDL3/SDL_endian.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_events.h>
+#include <SDL3/SDL_filesystem.h>
+#include <SDL3/SDL_gamecontroller.h>
+#include <SDL3/SDL_gesture.h>
+#include <SDL3/SDL_guid.h>
+#include <SDL3/SDL_haptic.h>
+#include <SDL3/SDL_hidapi.h>
+#include <SDL3/SDL_hints.h>
+#include <SDL3/SDL_joystick.h>
+#include <SDL3/SDL_keyboard.h>
+#include <SDL3/SDL_keycode.h>
+#include <SDL3/SDL_loadso.h>
+#include <SDL3/SDL_locale.h>
+#include <SDL3/SDL_log.h>
+#include <SDL3/SDL_messagebox.h>
+#include <SDL3/SDL_metal.h>
+#include <SDL3/SDL_misc.h>
+#include <SDL3/SDL_mouse.h>
+#include <SDL3/SDL_mutex.h>
+#include <SDL3/SDL_pixels.h>
+#include <SDL3/SDL_platform.h>
+#include <SDL3/SDL_power.h>
+#include <SDL3/SDL_quit.h>
+#include <SDL3/SDL_rect.h>
+#include <SDL3/SDL_render.h>
+#include <SDL3/SDL_revision.h>
+#include <SDL3/SDL_rwops.h>
+#include <SDL3/SDL_scancode.h>
+#include <SDL3/SDL_sensor.h>
+#include <SDL3/SDL_shape.h>
+#include <SDL3/SDL_surface.h>
+#include <SDL3/SDL_system.h>
+#include <SDL3/SDL_thread.h>
+#include <SDL3/SDL_timer.h>
+#include <SDL3/SDL_touch.h>
+#include <SDL3/SDL_version.h>
+#include <SDL3/SDL_video.h>
+
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -226,7 +240,7 @@ extern DECLSPEC void SDLCALL SDL_Quit(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_h_ */
 

include/SDL_assert.h → include/SDL3/SDL_assert.h

@@ -22,9 +22,9 @@
 #ifndef SDL_assert_h_
 #define SDL_assert_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -319,7 +319,7 @@ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_assert_h_ */
 

include/SDL_atomic.h → include/SDL3/SDL_atomic.h

@@ -59,10 +59,10 @@
 #ifndef SDL_atomic_h_
 #define SDL_atomic_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_platform.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_platform.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -403,7 +403,7 @@ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a);
 }
 #endif
 
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_atomic_h_ */
 

include/SDL_audio.h → include/SDL3/SDL_audio.h

@@ -30,14 +30,14 @@
 #ifndef SDL_audio_h_
 #define SDL_audio_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_endian.h"
-#include "SDL_mutex.h"
-#include "SDL_thread.h"
-#include "SDL_rwops.h"
-
-#include "begin_code.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_endian.h>
+#include <SDL3/SDL_mutex.h>
+#include <SDL3/SDL_thread.h>
+#include <SDL3/SDL_rwops.h>
+
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1493,7 +1493,7 @@ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_audio_h_ */
 

include/SDL_bits.h → include/SDL3/SDL_bits.h

@@ -28,9 +28,9 @@
 #ifndef SDL_bits_h_
 #define SDL_bits_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -119,7 +119,7 @@ SDL_HasExactlyOneBitSet32(Uint32 x)
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_bits_h_ */
 

include/SDL_blendmode.h → include/SDL3/SDL_blendmode.h

@@ -28,7 +28,7 @@
 #ifndef SDL_blendmode_h_
 #define SDL_blendmode_h_
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -191,7 +191,7 @@ extern DECLSPEC SDL_BlendMode SDLCALL SDL_ComposeCustomBlendMode(SDL_BlendFactor
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_blendmode_h_ */
 

include/SDL_clipboard.h → include/SDL3/SDL_clipboard.h

@@ -28,9 +28,9 @@
 #ifndef SDL_clipboard_h_
 #define SDL_clipboard_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -134,7 +134,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasPrimarySelectionText(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_clipboard_h_ */
 

include/SDL_cpuinfo.h → include/SDL3/SDL_cpuinfo.h

@@ -28,7 +28,7 @@
 #ifndef SDL_cpuinfo_h_
 #define SDL_cpuinfo_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
 /* Need to do this here because intrin.h has C++ code in it */
 /* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */
@@ -124,7 +124,7 @@ _m_prefetch(void *__P)
 #endif
 #endif /* HAVE_IMMINTRIN_H */
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -587,7 +587,7 @@ extern DECLSPEC void SDLCALL SDL_SIMDFree(void *ptr);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_cpuinfo_h_ */
 

include/SDL_endian.h → include/SDL3/SDL_endian.h

@@ -28,7 +28,7 @@
 #ifndef SDL_endian_h_
 #define SDL_endian_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1400)
 /* As of Clang 11, '_m_prefetchw' is conflicting with the winnt.h's version,
@@ -110,7 +110,7 @@ _m_prefetch(void *__P)
 #endif /* !SDL_FLOATWORDORDER */
 
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -341,7 +341,7 @@ SDL_SwapFloat(float x)
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_endian_h_ */
 

include/SDL_error.h → include/SDL3/SDL_error.h

@@ -28,9 +28,9 @@
 #ifndef SDL_error_h_
 #define SDL_error_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -156,7 +156,7 @@ extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_error_h_ */
 

include/SDL_events.h → include/SDL3/SDL_events.h

@@ -28,18 +28,18 @@
 #ifndef SDL_events_h_
 #define SDL_events_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-#include "SDL_keyboard.h"
-#include "SDL_mouse.h"
-#include "SDL_joystick.h"
-#include "SDL_gamecontroller.h"
-#include "SDL_quit.h"
-#include "SDL_gesture.h"
-#include "SDL_touch.h"
-
-#include "begin_code.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_video.h>
+#include <SDL3/SDL_keyboard.h>
+#include <SDL3/SDL_mouse.h>
+#include <SDL3/SDL_joystick.h>
+#include <SDL3/SDL_gamecontroller.h>
+#include <SDL3/SDL_quit.h>
+#include <SDL3/SDL_gesture.h>
+#include <SDL3/SDL_touch.h>
+
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1159,7 +1159,7 @@ extern DECLSPEC Uint32 SDLCALL SDL_RegisterEvents(int numevents);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_events_h_ */
 

include/SDL_filesystem.h → include/SDL3/SDL_filesystem.h

@@ -28,9 +28,9 @@
 #ifndef SDL_filesystem_h_
 #define SDL_filesystem_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -142,7 +142,7 @@ extern DECLSPEC char *SDLCALL SDL_GetPrefPath(const char *org, const char *app);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_filesystem_h_ */
 

include/SDL_gamecontroller.h → include/SDL3/SDL_gamecontroller.h

@@ -28,13 +28,13 @@
 #ifndef SDL_gamecontroller_h_
 #define SDL_gamecontroller_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_rwops.h"
-#include "SDL_sensor.h"
-#include "SDL_joystick.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_rwops.h>
+#include <SDL3/SDL_sensor.h>
+#include <SDL3/SDL_joystick.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1067,7 +1067,7 @@ extern DECLSPEC const char* SDLCALL SDL_GameControllerGetAppleSFSymbolsNameForAx
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_gamecontroller_h_ */
 

include/SDL_gesture.h → include/SDL3/SDL_gesture.h

@@ -28,14 +28,14 @@
 #ifndef SDL_gesture_h_
 #define SDL_gesture_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_video.h>
 
-#include "SDL_touch.h"
+#include <SDL3/SDL_touch.h>
 
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -110,7 +110,7 @@ extern DECLSPEC int SDLCALL SDL_LoadDollarTemplates(SDL_TouchID touchId, SDL_RWo
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_gesture_h_ */
 

include/SDL_guid.h → include/SDL3/SDL_guid.h

@@ -28,10 +28,10 @@
 #ifndef SDL_guid_h_
 #define SDL_guid_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -93,7 +93,7 @@ extern DECLSPEC SDL_GUID SDLCALL SDL_GUIDFromString(const char *pchGUID);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_guid_h_ */
 

include/SDL_haptic.h → include/SDL3/SDL_haptic.h

@@ -107,11 +107,11 @@
 #ifndef SDL_haptic_h_
 #define SDL_haptic_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_joystick.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_joystick.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1334,7 +1334,7 @@ extern DECLSPEC int SDLCALL SDL_HapticRumbleStop(SDL_Haptic * haptic);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_haptic_h_ */
 

include/SDL_hidapi.h → include/SDL3/SDL_hidapi.h

@@ -62,9 +62,9 @@
 #ifndef SDL_hidapi_h_
 #define SDL_hidapi_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -444,7 +444,7 @@ extern DECLSPEC void SDLCALL SDL_hid_ble_scan(SDL_bool active);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_hidapi_h_ */
 

include/SDL_hints.h → include/SDL3/SDL_hints.h

@@ -39,9 +39,9 @@
 #ifndef SDL_hints_h_
 #define SDL_hints_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -2566,7 +2566,7 @@ extern DECLSPEC void SDLCALL SDL_ClearHints(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_hints_h_ */
 

include/SDL_joystick.h → include/SDL3/SDL_joystick.h

@@ -41,11 +41,11 @@
 #ifndef SDL_joystick_h_
 #define SDL_joystick_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_guid.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_guid.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1059,7 +1059,7 @@ extern DECLSPEC SDL_JoystickPowerLevel SDLCALL SDL_JoystickCurrentPowerLevel(SDL
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_joystick_h_ */
 

include/SDL_keyboard.h → include/SDL3/SDL_keyboard.h

@@ -28,12 +28,12 @@
 #ifndef SDL_keyboard_h_
 #define SDL_keyboard_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_keycode.h"
-#include "SDL_video.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_keycode.h>
+#include <SDL3/SDL_video.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -346,7 +346,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_keyboard_h_ */
 

include/SDL_keycode.h → include/SDL3/SDL_keycode.h

@@ -28,8 +28,8 @@
 #ifndef SDL_keycode_h_
 #define SDL_keycode_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_scancode.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_scancode.h>
 
 /**
  *  \brief The SDL virtual key representation.

include/SDL_loadso.h → include/SDL3/SDL_loadso.h

@@ -41,10 +41,10 @@
 #ifndef SDL_loadso_h_
 #define SDL_loadso_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -108,7 +108,7 @@ extern DECLSPEC void SDLCALL SDL_UnloadObject(void *handle);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_loadso_h_ */
 

include/SDL_locale.h → include/SDL3/SDL_locale.h

@@ -28,10 +28,10 @@
 #ifndef _SDL_locale_h
 #define _SDL_locale_h
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 /* *INDENT-OFF* */
@@ -96,7 +96,7 @@ extern DECLSPEC SDL_Locale * SDLCALL SDL_GetPreferredLocales(void);
 }
 /* *INDENT-ON* */
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* _SDL_locale_h */
 

include/SDL_log.h → include/SDL3/SDL_log.h

@@ -37,9 +37,9 @@
 #ifndef SDL_log_h_
 #define SDL_log_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -397,7 +397,7 @@ extern DECLSPEC void SDLCALL SDL_LogSetOutputFunction(SDL_LogOutputFunction call
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_log_h_ */
 

include/SDL_main.h → include/SDL3/SDL_main.h

@@ -22,7 +22,7 @@
 #ifndef SDL_main_h_
 #define SDL_main_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
 /**
  *  \file SDL_main.h
@@ -134,7 +134,7 @@
 #define main    SDL_main
 #endif
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -266,7 +266,7 @@ extern DECLSPEC void SDLCALL SDL_GDKSuspendComplete(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_main_h_ */
 

include/SDL_messagebox.h → include/SDL3/SDL_messagebox.h

@@ -22,10 +22,10 @@
 #ifndef SDL_messagebox_h_
 #define SDL_messagebox_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_video.h"      /* For SDL_Window */
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_video.h>      /* For SDL_Window */
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -186,7 +186,7 @@ extern DECLSPEC int SDLCALL SDL_ShowSimpleMessageBox(Uint32 flags, const char *t
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_messagebox_h_ */
 

include/SDL_metal.h → include/SDL3/SDL_metal.h

@@ -28,9 +28,9 @@
 #ifndef SDL_metal_h_
 #define SDL_metal_h_
 
-#include "SDL_video.h"
+#include <SDL3/SDL_video.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -108,6 +108,6 @@ extern DECLSPEC void SDLCALL SDL_Metal_GetDrawableSize(SDL_Window* window, int *
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_metal_h_ */

include/SDL_misc.h → include/SDL3/SDL_misc.h

@@ -28,9 +28,9 @@
 #ifndef SDL_misc_h_
 #define SDL_misc_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
@@ -72,7 +72,7 @@ extern DECLSPEC int SDLCALL SDL_OpenURL(const char *url);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_misc_h_ */
 

include/SDL_mouse.h → include/SDL3/SDL_mouse.h

@@ -28,11 +28,11 @@
 #ifndef SDL_mouse_h_
 #define SDL_mouse_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_video.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -460,7 +460,7 @@ extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_mouse_h_ */
 

include/SDL_mutex.h → include/SDL3/SDL_mutex.h

@@ -28,10 +28,10 @@
  *  Functions to provide thread synchronization primitives.
  */
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -464,7 +464,7 @@ extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_mutex_h_ */
 

include/SDL_opengl.h → include/SDL3/SDL_opengl.h

@@ -35,7 +35,7 @@
 #ifndef SDL_opengl_h_
 #define SDL_opengl_h_
 
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 #ifndef __IOS__  /* No OpenGL on iOS. */
 
@@ -69,7 +69,7 @@
 #define __gl_h_
 
 #if defined(USE_MGL_NAMESPACE)
-#include "gl_mangle.h"
+#include <SDL3/gl_mangle.h>
 #endif
 
 
@@ -2095,7 +2095,7 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh
  * defined in gl.h).  Otherwise, extensions will be included from glext.h.
  */
 #if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY)
-#include "SDL_opengl_glext.h"
+#include <SDL3/SDL_opengl_glext.h>
 #endif  /* GL_GLEXT_LEGACY */
 
 

include/SDL_opengles.h → include/SDL3/SDL_opengles.h

@@ -24,7 +24,7 @@
  *
  *  This is a simple file to encapsulate the OpenGL ES 1.X API headers.
  */
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 #ifdef __IOS__
 #include <OpenGLES/ES1/gl.h>

include/SDL_opengles2.h → include/SDL3/SDL_opengles2.h

@@ -24,7 +24,7 @@
  *
  *  This is a simple file to encapsulate the OpenGL ES 2.0 API headers.
  */
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 #if !defined(_MSC_VER) && !defined(SDL_USE_BUILTIN_OPENGL_DEFINITIONS)
 
@@ -40,10 +40,10 @@
 #else /* _MSC_VER */
 
 /* OpenGL ES2 headers for Visual Studio */
-#include "SDL_opengles2_khrplatform.h"
-#include "SDL_opengles2_gl2platform.h"
-#include "SDL_opengles2_gl2.h"
-#include "SDL_opengles2_gl2ext.h"
+#include <SDL3/SDL_opengles2_khrplatform.h>
+#include <SDL3/SDL_opengles2_gl2platform.h>
+#include <SDL3/SDL_opengles2_gl2.h>
+#include <SDL3/SDL_opengles2_gl2ext.h>
 
 #endif /* _MSC_VER */
 

include/SDL_pixels.h → include/SDL3/SDL_pixels.h

@@ -28,10 +28,10 @@
 #ifndef SDL_pixels_h_
 #define SDL_pixels_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_endian.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_endian.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -625,7 +625,7 @@ extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_pixels_h_ */
 

include/SDL_platform.h → include/SDL3/SDL_platform.h

@@ -207,7 +207,7 @@
 #define __3DS__ 1
 #endif
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -235,7 +235,7 @@ extern DECLSPEC const char * SDLCALL SDL_GetPlatform (void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_platform_h_ */
 

include/SDL_power.h → include/SDL3/SDL_power.h

@@ -28,9 +28,9 @@
  *  Header for the SDL power management routines.
  */
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -81,7 +81,7 @@ extern DECLSPEC SDL_PowerState SDLCALL SDL_GetPowerInfo(int *secs, int *pct);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_power_h_ */
 

include/SDL_quit.h → include/SDL3/SDL_quit.h

@@ -28,8 +28,8 @@
 #ifndef SDL_quit_h_
 #define SDL_quit_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
 
 /**
  *  \file SDL_quit.h

include/SDL_rect.h → include/SDL3/SDL_rect.h

@@ -28,12 +28,12 @@
 #ifndef SDL_rect_h_
 #define SDL_rect_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_pixels.h"
-#include "SDL_rwops.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_pixels.h>
+#include <SDL3/SDL_rwops.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -369,7 +369,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_IntersectFRectAndLine(const SDL_FRect *
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_rect_h_ */
 

include/SDL_render.h → include/SDL3/SDL_render.h

@@ -48,11 +48,11 @@
 #ifndef SDL_render_h_
 #define SDL_render_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_rect.h"
-#include "SDL_video.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_rect.h>
+#include <SDL3/SDL_video.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -1912,7 +1912,7 @@ extern DECLSPEC int SDLCALL SDL_RenderSetVSync(SDL_Renderer* renderer, int vsync
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_render_h_ */
 

include/SDL_rwops.h → include/SDL3/SDL_rwops.h

@@ -29,10 +29,10 @@
 #ifndef SDL_rwops_h_
 #define SDL_rwops_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -785,7 +785,7 @@ extern DECLSPEC size_t SDLCALL SDL_WriteBE64(SDL_RWops * dst, Uint64 value);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_rwops_h_ */
 

include/SDL_scancode.h → include/SDL3/SDL_scancode.h

@@ -28,7 +28,7 @@
 #ifndef SDL_scancode_h_
 #define SDL_scancode_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
 /**
  *  \brief The SDL keyboard scancode representation.

include/SDL_sensor.h → include/SDL3/SDL_sensor.h

@@ -29,10 +29,10 @@
 #ifndef SDL_sensor_h_
 #define SDL_sensor_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 /* *INDENT-OFF* */
@@ -315,7 +315,7 @@ extern DECLSPEC void SDLCALL SDL_SensorUpdate(void);
 }
 /* *INDENT-ON* */
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_sensor_h_ */
 

include/SDL_shape.h → include/SDL3/SDL_shape.h

@@ -22,13 +22,13 @@
 #ifndef SDL_shape_h_
 #define SDL_shape_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_pixels.h"
-#include "SDL_rect.h"
-#include "SDL_surface.h"
-#include "SDL_video.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_pixels.h>
+#include <SDL3/SDL_rect.h>
+#include <SDL3/SDL_surface.h>
+#include <SDL3/SDL_video.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -150,6 +150,6 @@ extern DECLSPEC int SDLCALL SDL_GetShapedWindowMode(SDL_Window *window,SDL_Windo
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_shape_h_ */

include/SDL_stdinc.h → include/SDL3/SDL_stdinc.h

@@ -28,7 +28,7 @@
 #ifndef SDL_stdinc_h_
 #define SDL_stdinc_h_
 
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 #include <inttypes.h>
@@ -367,7 +367,7 @@ SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
 #endif /* DOXYGEN_SHOULD_IGNORE_THIS */
 /** \endcond */
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -740,7 +740,7 @@ SDL_FORCE_INLINE int _SDL_size_add_overflow_builtin (size_t a,
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_stdinc_h_ */
 

include/SDL_surface.h → include/SDL3/SDL_surface.h

@@ -28,13 +28,13 @@
 #ifndef SDL_surface_h_
 #define SDL_surface_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_pixels.h"
-#include "SDL_rect.h"
-#include "SDL_blendmode.h"
-#include "SDL_rwops.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_pixels.h>
+#include <SDL3/SDL_rect.h>
+#include <SDL3/SDL_blendmode.h>
+#include <SDL3/SDL_rwops.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -990,7 +990,7 @@ extern DECLSPEC SDL_YUV_CONVERSION_MODE SDLCALL SDL_GetYUVConversionModeForResol
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_surface_h_ */
 

include/SDL_system.h → include/SDL3/SDL_system.h

@@ -28,12 +28,12 @@
 #ifndef SDL_system_h_
 #define SDL_system_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_keyboard.h"
-#include "SDL_render.h"
-#include "SDL_video.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_keyboard.h>
+#include <SDL3/SDL_render.h>
+#include <SDL3/SDL_video.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -616,7 +616,7 @@ extern DECLSPEC int SDLCALL SDL_GDKGetTaskQueue(XTaskQueueHandle * outTaskQueue)
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_system_h_ */
 

include/SDL_syswm.h → include/SDL3/SDL_syswm.h

@@ -28,10 +28,10 @@
 #ifndef SDL_syswm_h_
 #define SDL_syswm_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
-#include "SDL_version.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_video.h>
+#include <SDL3/SDL_version.h>
 
 /**
  *  \brief SDL_syswm.h
@@ -57,7 +57,7 @@
  */
 struct SDL_SysWMinfo;
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -261,7 +261,7 @@ extern DECLSPEC int SDLCALL SDL_GetWindowWMInfo(SDL_Window *window, SDL_SysWMinf
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_syswm_h_ */
 

include/SDL_test.h → include/SDL3/SDL_test.h

@@ -30,21 +30,21 @@
 #ifndef SDL_test_h_
 #define SDL_test_h_
 
-#include "SDL.h"
-#include "SDL_test_assert.h"
-#include "SDL_test_common.h"
-#include "SDL_test_compare.h"
-#include "SDL_test_crc32.h"
-#include "SDL_test_font.h"
-#include "SDL_test_fuzzer.h"
-#include "SDL_test_harness.h"
-#include "SDL_test_images.h"
-#include "SDL_test_log.h"
-#include "SDL_test_md5.h"
-#include "SDL_test_memory.h"
-#include "SDL_test_random.h"
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_test_assert.h>
+#include <SDL3/SDL_test_common.h>
+#include <SDL3/SDL_test_compare.h>
+#include <SDL3/SDL_test_crc32.h>
+#include <SDL3/SDL_test_font.h>
+#include <SDL3/SDL_test_fuzzer.h>
+#include <SDL3/SDL_test_harness.h>
+#include <SDL3/SDL_test_images.h>
+#include <SDL3/SDL_test_log.h>
+#include <SDL3/SDL_test_md5.h>
+#include <SDL3/SDL_test_memory.h>
+#include <SDL3/SDL_test_random.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -62,7 +62,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_h_ */
 

include/SDL_test_assert.h → include/SDL3/SDL_test_assert.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_assert_h_
 #define SDL_test_assert_h_
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -98,7 +98,7 @@ int SDLTest_AssertSummaryToTestResult(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_assert_h_ */
 

include/SDL_test_common.h → include/SDL3/SDL_test_common.h

@@ -32,7 +32,7 @@
 #ifndef SDL_test_common_h_
 #define SDL_test_common_h_
 
-#include "SDL.h"
+#include <SDL3/SDL.h>
 
 #if defined(__PSP__)
 #define DEFAULT_WINDOW_WIDTH  480
@@ -121,7 +121,7 @@ typedef struct
 
 } SDLTest_CommonState;
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -229,7 +229,7 @@ void SDLTest_CommonDrawWindowInfo(SDL_Renderer * renderer, SDL_Window * window,
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_common_h_ */
 

include/SDL_test_compare.h → include/SDL3/SDL_test_compare.h

@@ -36,11 +36,11 @@
 #ifndef SDL_test_compare_h_
 #define SDL_test_compare_h_
 
-#include "SDL.h"
+#include <SDL3/SDL.h>
 
-#include "SDL_test_images.h"
+#include <SDL3/SDL_test_images.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -62,7 +62,7 @@ int SDLTest_CompareSurfaces(SDL_Surface *surface, SDL_Surface *referenceSurface,
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_compare_h_ */
 

include/SDL_test_crc32.h → include/SDL3/SDL_test_crc32.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_crc32_h_
 #define SDL_test_crc32_h_
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -117,7 +117,7 @@ int SDLTest_Crc32Done(SDLTest_Crc32Context * crcContext);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_crc32_h_ */
 

include/SDL_test_font.h → include/SDL3/SDL_test_font.h

@@ -30,7 +30,7 @@
 #ifndef SDL_test_font_h_
 #define SDL_test_font_h_
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -161,7 +161,7 @@ void SDLTest_CleanupTextDrawing(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_font_h_ */
 

include/SDL_test_fuzzer.h → include/SDL3/SDL_test_fuzzer.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_fuzzer_h_
 #define SDL_test_fuzzer_h_
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -379,7 +379,7 @@ int SDLTest_GetFuzzerInvocationCount(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_fuzzer_h_ */
 

include/SDL_test_harness.h → include/SDL3/SDL_test_harness.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_h_arness_h
 #define SDL_test_h_arness_h
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -127,7 +127,7 @@ int SDLTest_RunSuites(SDLTest_TestSuiteReference *testSuites[], const char *user
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_h_arness_h */
 

include/SDL_test_images.h → include/SDL3/SDL_test_images.h

@@ -36,9 +36,9 @@
 #ifndef SDL_test_images_h_
 #define SDL_test_images_h_
 
-#include "SDL.h"
+#include <SDL3/SDL.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -71,7 +71,7 @@ SDL_Surface *SDLTest_ImagePrimitivesBlend(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_images_h_ */
 

include/SDL_test_log.h → include/SDL3/SDL_test_log.h

@@ -36,7 +36,7 @@
 #ifndef SDL_test_log_h_
 #define SDL_test_log_h_
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -60,7 +60,7 @@ void SDLTest_LogError(SDL_PRINTF_FORMAT_STRING const char *fmt, ...) SDL_PRINTF_
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_log_h_ */
 

include/SDL_test_md5.h → include/SDL3/SDL_test_md5.h

@@ -56,7 +56,7 @@
 #ifndef SDL_test_md5_h_
 #define SDL_test_md5_h_
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -122,7 +122,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_md5_h_ */
 

include/SDL_test_memory.h → include/SDL3/SDL_test_memory.h

@@ -30,7 +30,7 @@
 #ifndef SDL_test_memory_h_
 #define SDL_test_memory_h_
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -56,7 +56,7 @@ void SDLTest_LogAllocations(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_memory_h_ */
 

include/SDL_test_random.h → include/SDL3/SDL_test_random.h

@@ -40,7 +40,7 @@
 #ifndef SDL_test_random_h_
 #define SDL_test_random_h_
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -108,7 +108,7 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_test_random_h_ */
 

include/SDL_thread.h → include/SDL3/SDL_thread.h

@@ -28,18 +28,18 @@
  *  Header for the SDL thread management routines.
  */
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
 
 /* Thread synchronization primitives */
-#include "SDL_atomic.h"
-#include "SDL_mutex.h"
+#include <SDL3/SDL_atomic.h>
+#include <SDL3/SDL_mutex.h>
 
 #if defined(__WIN32__) || defined(__GDK__)
 #include <process.h> /* _beginthreadex() and _endthreadex() */
 #endif
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -414,7 +414,7 @@ extern DECLSPEC void SDLCALL SDL_TLSCleanup(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_thread_h_ */
 

include/SDL_timer.h → include/SDL3/SDL_timer.h

@@ -28,10 +28,10 @@
  *  Header for the SDL time management routines.
  */
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -215,7 +215,7 @@ extern DECLSPEC SDL_bool SDLCALL SDL_RemoveTimer(SDL_TimerID id);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_timer_h_ */
 

include/SDL_touch.h → include/SDL3/SDL_touch.h

@@ -28,11 +28,11 @@
 #ifndef SDL_touch_h_
 #define SDL_touch_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_error.h"
-#include "SDL_video.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_error.h>
+#include <SDL3/SDL_video.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -143,7 +143,7 @@ extern DECLSPEC SDL_Finger * SDLCALL SDL_GetTouchFinger(SDL_TouchID touchID, int
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_touch_h_ */
 

include/SDL_version.h → include/SDL3/SDL_version.h

@@ -28,9 +28,9 @@
 #ifndef SDL_version_h_
 #define SDL_version_h_
 
-#include "SDL_stdinc.h"
+#include <SDL3/SDL_stdinc.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -156,7 +156,7 @@ extern DECLSPEC const char *SDLCALL SDL_GetRevision(void);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_version_h_ */
 

include/SDL_video.h → include/SDL3/SDL_video.h

@@ -28,12 +28,12 @@
 #ifndef SDL_video_h_
 #define SDL_video_h_
 
-#include "SDL_stdinc.h"
-#include "SDL_pixels.h"
-#include "SDL_rect.h"
-#include "SDL_surface.h"
+#include <SDL3/SDL_stdinc.h>
+#include <SDL3/SDL_pixels.h>
+#include <SDL3/SDL_rect.h>
+#include <SDL3/SDL_surface.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -2122,7 +2122,7 @@ extern DECLSPEC void SDLCALL SDL_GL_DeleteContext(SDL_GLContext context);
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_video_h_ */
 

include/SDL_vulkan.h → include/SDL3/SDL_vulkan.h

@@ -28,9 +28,9 @@
 #ifndef SDL_vulkan_h_
 #define SDL_vulkan_h_
 
-#include "SDL_video.h"
+#include <SDL3/SDL_video.h>
 
-#include "begin_code.h"
+#include <SDL3/begin_code.h>
 /* Set up for C function definitions, even when using C++ */
 #ifdef __cplusplus
 extern "C" {
@@ -210,6 +210,6 @@ extern DECLSPEC void SDLCALL SDL_Vulkan_GetDrawableSize(SDL_Window * window,
 #ifdef __cplusplus
 }
 #endif
-#include "close_code.h"
+#include <SDL3/close_code.h>
 
 #endif /* SDL_vulkan_h_ */

include/SDL_types.h

@@ -1,29 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2022 Sam Lantinga <[email protected]>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-/**
- *  \file SDL_types.h
- *
- *  \deprecated
- */
-
-/* DEPRECATED */
-#include "SDL_stdinc.h"

include/build_config/SDL_build_config.h

@@ -22,7 +22,7 @@
 #ifndef SDL_build_config_h_
 #define SDL_build_config_h_
 
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 /**
  *  \file SDL_build_config.h

include/build_config/SDL_build_config.h.cmake

@@ -29,7 +29,7 @@
  */
 
 /* General platform specific identifiers */
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 /* C language features */
 #cmakedefine const @HAVE_CONST@

include/build_config/SDL_build_config_android.h

@@ -23,7 +23,7 @@
 #define SDL_build_config_android_h_
 #define SDL_build_config_h_
 
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 /**
  *  \file SDL_build_config_android.h

include/build_config/SDL_build_config_emscripten.h

@@ -22,7 +22,7 @@
 #ifndef _SDL_build_config_emscripten_h_
 #define _SDL_build_config_emscripten_h_
 
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 /**
  *  \file SDL_build_config_emscripten.h

include/build_config/SDL_build_config_ios.h

@@ -23,7 +23,7 @@
 #define SDL_build_config_ios_h_
 #define SDL_build_config_h_
 
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 #define HAVE_GCC_ATOMICS    1
 

include/build_config/SDL_build_config_macos.h

@@ -23,7 +23,7 @@
 #define SDL_build_config_macos_h_
 #define SDL_build_config_h_
 
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 /* This gets us MAC_OS_X_VERSION_MIN_REQUIRED... */
 #include <AvailabilityMacros.h>

include/build_config/SDL_build_config_minimal.h

@@ -23,7 +23,7 @@
 #define SDL_build_config_minimal_h_
 #define SDL_build_config_h_
 
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 /**
  *  \file SDL_build_config_minimal.h

include/build_config/SDL_build_config_ngage.h

@@ -23,7 +23,7 @@
 #define SDL_build_config_ngage_h_
 #define SDL_build_config_h_
 
-#include "SDL_platform.h"
+#include <SDL3/SDL_platform.h>
 
 typedef signed char        int8_t;
 typedef unsigned char      uint8_t;