diff --git a/src/common/delay.cpp b/src/common/delay.cpp
index e6b0c43a4..13db3958c 100644
--- a/src/common/delay.cpp
+++ b/src/common/delay.cpp
@@ -20,8 +20,13 @@
 
 #include "delay.h"
 
+#if __has_include(<SDL3/SDL_timer.h>)
+#include <SDL3/SDL_timer.h>
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_timer.h>
 #include <SDL_version.h>
+#endif
 
 namespace love
 {
diff --git a/src/love.cpp b/src/love.cpp
index edd0e8eec..8c92bca30 100644
--- a/src/love.cpp
+++ b/src/love.cpp
@@ -22,12 +22,17 @@
 #include "common/runtime.h"
 #include "common/Variant.h"
 #include "modules/love/love.h"
+
+#if __has_include(<SDL3/SDL.h>)
+#include <SDL3/SDL.h>
+#else
 #include <SDL.h>
+#endif
 
 #ifdef LOVE_BUILD_EXE
 
 #if SDL_VERSION_ATLEAST(3, 0, 0)
-#include <SDL_main.h>
+#include <SDL3/SDL_main.h>
 #endif
 
 // Lua
diff --git a/src/modules/event/sdl/Event.cpp b/src/modules/event/sdl/Event.cpp
index 7025edc17..8da897f60 100644
--- a/src/modules/event/sdl/Event.cpp
+++ b/src/modules/event/sdl/Event.cpp
@@ -35,7 +35,11 @@
 
 #include <cmath>
 
+#if __has_include(<SDL3/SDL_version.h>)
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_version.h>
+#endif
 
 #if SDL_VERSION_ATLEAST(3, 0, 0)
 #include "joystick/sdl/JoystickSDL3.h"
diff --git a/src/modules/event/sdl/Event.h b/src/modules/event/sdl/Event.h
index b005e83bc..b06ad71db 100644
--- a/src/modules/event/sdl/Event.h
+++ b/src/modules/event/sdl/Event.h
@@ -26,7 +26,11 @@
 #include "audio/Source.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_events.h>)
+#include <SDL3/SDL_events.h>
+#else
 #include <SDL_events.h>
+#endif
 
 namespace love
 {
diff --git a/src/modules/filesystem/wrap_Filesystem.cpp b/src/modules/filesystem/wrap_Filesystem.cpp
index d350317ff..88cbe15e4 100644
--- a/src/modules/filesystem/wrap_Filesystem.cpp
+++ b/src/modules/filesystem/wrap_Filesystem.cpp
@@ -34,8 +34,13 @@
 #endif
 
 // SDL
+#if __has_include(<SDL3/SDL_loadso.h>)
+#include <SDL3/SDL_loadso.h>
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_loadso.h>
 #include <SDL_version.h>
+#endif
 
 // STL
 #include <vector>
diff --git a/src/modules/graphics/opengl/OpenGL.cpp b/src/modules/graphics/opengl/OpenGL.cpp
index cb8f8a1f3..8657ebc45 100644
--- a/src/modules/graphics/opengl/OpenGL.cpp
+++ b/src/modules/graphics/opengl/OpenGL.cpp
@@ -37,7 +37,11 @@
 #include <cstdio>
 
 // For SDL_GL_GetProcAddress.
+#if __has_include(<SDL3/SDL_video.h>)
+#include <SDL3/SDL_video.h>
+#else
 #include <SDL_video.h>
+#endif
 
 #ifdef LOVE_IOS
 #include <SDL_syswm.h>
diff --git a/src/modules/graphics/vulkan/Graphics.cpp b/src/modules/graphics/vulkan/Graphics.cpp
index f2071a421..25e5925ee 100644
--- a/src/modules/graphics/vulkan/Graphics.cpp
+++ b/src/modules/graphics/vulkan/Graphics.cpp
@@ -29,8 +29,13 @@
 #include "Shader.h"
 #include "Vulkan.h"
 
+#if __has_include(<SDL3/SDL_version.h>)
+#include <SDL3/SDL_version.h>
+#include <SDL3/SDL_vulkan.h>
+#else
 #include <SDL_version.h>
 #include <SDL_vulkan.h>
+#endif
 
 #include <algorithm>
 #include <vector>
diff --git a/src/modules/joystick/sdl/Joystick.cpp b/src/modules/joystick/sdl/Joystick.cpp
index 1ebe6f545..21c3f8679 100644
--- a/src/modules/joystick/sdl/Joystick.cpp
+++ b/src/modules/joystick/sdl/Joystick.cpp
@@ -25,7 +25,11 @@
 #include "sensor/sdl/Sensor.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_version.h>)
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_version.h>
+#endif
 
 // C++
 #include <algorithm>
diff --git a/src/modules/joystick/sdl/Joystick.h b/src/modules/joystick/sdl/Joystick.h
index 75763712f..e0353958a 100644
--- a/src/modules/joystick/sdl/Joystick.h
+++ b/src/modules/joystick/sdl/Joystick.h
@@ -26,7 +26,11 @@
 #include "common/EnumMap.h"
 
 // SDL
+#if __has_include(<SDL3/SDL.h>)
+#include <SDL3/SDL.h>
+#else
 #include <SDL.h>
+#endif
 
 #if !SDL_VERSION_ATLEAST(3, 0, 0)
 
diff --git a/src/modules/joystick/sdl/JoystickModule.cpp b/src/modules/joystick/sdl/JoystickModule.cpp
index dd7770229..b027dafe0 100644
--- a/src/modules/joystick/sdl/JoystickModule.cpp
+++ b/src/modules/joystick/sdl/JoystickModule.cpp
@@ -24,7 +24,11 @@
 #include "JoystickSDL3.h"
 
 // SDL
+#if __has_include(<SDL3/SDL.h>)
+#include <SDL3/SDL.h>
+#else
 #include <SDL.h>
+#endif
 
 // C++
 #include <sstream>
diff --git a/src/modules/joystick/sdl/JoystickSDL3.cpp b/src/modules/joystick/sdl/JoystickSDL3.cpp
index dba6ea0bd..b523e5d41 100644
--- a/src/modules/joystick/sdl/JoystickSDL3.cpp
+++ b/src/modules/joystick/sdl/JoystickSDL3.cpp
@@ -25,11 +25,15 @@
 #include "sensor/sdl/Sensor.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_version.h>)
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_version.h>
+#endif
 
 #if SDL_VERSION_ATLEAST(3, 0, 0)
 
-#include <SDL_guid.h>
+#include <SDL3/SDL_guid.h>
 
 // C++
 #include <algorithm>
diff --git a/src/modules/joystick/sdl/JoystickSDL3.h b/src/modules/joystick/sdl/JoystickSDL3.h
index 62992c39b..0265620ca 100644
--- a/src/modules/joystick/sdl/JoystickSDL3.h
+++ b/src/modules/joystick/sdl/JoystickSDL3.h
@@ -27,7 +27,11 @@
 #include "common/int.h"
 
 // SDL
+#if __has_include(<SDL3/SDL.h>)
+#include <SDL3/SDL.h>
+#else
 #include <SDL.h>
+#endif
 
 #if SDL_VERSION_ATLEAST(3, 0, 0)
 
diff --git a/src/modules/keyboard/sdl/Keyboard.cpp b/src/modules/keyboard/sdl/Keyboard.cpp
index 576b22671..4a7892cee 100644
--- a/src/modules/keyboard/sdl/Keyboard.cpp
+++ b/src/modules/keyboard/sdl/Keyboard.cpp
@@ -18,7 +18,11 @@
  * 3. This notice may not be removed or altered from any source distribution.
  **/
 
+#if __has_include(<SDL3/SDL_version.h>)
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_version.h>
+#endif
 
 #include "Keyboard.h"
 #include "window/Window.h"
diff --git a/src/modules/keyboard/sdl/Keyboard.h b/src/modules/keyboard/sdl/Keyboard.h
index f26a0b9f7..a0f35ce9d 100644
--- a/src/modules/keyboard/sdl/Keyboard.h
+++ b/src/modules/keyboard/sdl/Keyboard.h
@@ -26,8 +26,13 @@
 #include "common/EnumMap.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_keyboard.h>)
+#include <SDL3/SDL_keyboard.h>
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_keyboard.h>
 #include <SDL_version.h>
+#endif
 
 #include <map>
 
diff --git a/src/modules/mouse/sdl/Cursor.cpp b/src/modules/mouse/sdl/Cursor.cpp
index 05f7a25c2..2928a4128 100644
--- a/src/modules/mouse/sdl/Cursor.cpp
+++ b/src/modules/mouse/sdl/Cursor.cpp
@@ -22,7 +22,11 @@
 #include "Cursor.h"
 #include "common/config.h"
 
+#if __has_include(<SDL3/SDL_version.h>)
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_version.h>
+#endif
 
 namespace love
 {
diff --git a/src/modules/mouse/sdl/Cursor.h b/src/modules/mouse/sdl/Cursor.h
index b72d46131..de4807ba9 100644
--- a/src/modules/mouse/sdl/Cursor.h
+++ b/src/modules/mouse/sdl/Cursor.h
@@ -26,7 +26,11 @@
 #include "common/EnumMap.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_mouse.h>)
+#include <SDL3/SDL_mouse.h>
+#else
 #include <SDL_mouse.h>
+#endif
 
 namespace love
 {
diff --git a/src/modules/mouse/sdl/Mouse.cpp b/src/modules/mouse/sdl/Mouse.cpp
index 86b9e2490..022da0673 100644
--- a/src/modules/mouse/sdl/Mouse.cpp
+++ b/src/modules/mouse/sdl/Mouse.cpp
@@ -23,8 +23,13 @@
 #include "window/sdl/Window.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_version.h>)
+#include <SDL3/SDL_mouse.h>
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_mouse.h>
 #include <SDL_version.h>
+#endif
 
 namespace love
 {
diff --git a/src/modules/sensor/sdl/Sensor.cpp b/src/modules/sensor/sdl/Sensor.cpp
index d5b433a8a..b5917c87a 100644
--- a/src/modules/sensor/sdl/Sensor.cpp
+++ b/src/modules/sensor/sdl/Sensor.cpp
@@ -22,8 +22,13 @@
 #include "Sensor.h"
 
 // SDL
+#if __has_include(<SDL3/SDL.h>)
+#include <SDL3/SDL.h>
+#include <SDL3/SDL_sensor.h>
+#else
 #include <SDL.h>
 #include <SDL_sensor.h>
+#endif
 
 namespace love
 {
diff --git a/src/modules/sensor/sdl/Sensor.h b/src/modules/sensor/sdl/Sensor.h
index 02491add7..3cbc56581 100644
--- a/src/modules/sensor/sdl/Sensor.h
+++ b/src/modules/sensor/sdl/Sensor.h
@@ -25,7 +25,11 @@
 #include "sensor/Sensor.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_sensor.h>)
+#include <SDL3/SDL_sensor.h>
+#else
 #include <SDL_sensor.h>
+#endif
 
 // std
 #include <map>
diff --git a/src/modules/system/sdl/System.cpp b/src/modules/system/sdl/System.cpp
index 4ae99938e..c3f32aa08 100644
--- a/src/modules/system/sdl/System.cpp
+++ b/src/modules/system/sdl/System.cpp
@@ -23,6 +23,12 @@
 #include "window/Window.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_clipboard.h>)
+#include <SDL3/SDL_clipboard.h>
+#include <SDL3/SDL_cpuinfo.h>
+#include <SDL3/SDL_version.h>
+#include <SDL3/SDL_locale.h>
+#else
 #include <SDL_clipboard.h>
 #include <SDL_cpuinfo.h>
 #include <SDL_version.h>
@@ -30,6 +36,7 @@
 #if SDL_VERSION_ATLEAST(2, 0, 14)
 #include <SDL_locale.h>
 #endif
+#endif
 
 namespace love
 {
diff --git a/src/modules/system/sdl/System.h b/src/modules/system/sdl/System.h
index 39787e9d4..98776ac55 100644
--- a/src/modules/system/sdl/System.h
+++ b/src/modules/system/sdl/System.h
@@ -26,7 +26,11 @@
 #include "common/EnumMap.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_power.h>)
+#include <SDL3/SDL_power.h>
+#else
 #include <SDL_power.h>
+#endif
 
 namespace love
 {
diff --git a/src/modules/thread/sdl/Thread.h b/src/modules/thread/sdl/Thread.h
index a01926b63..8f43a52fd 100644
--- a/src/modules/thread/sdl/Thread.h
+++ b/src/modules/thread/sdl/Thread.h
@@ -26,7 +26,11 @@
 #include "threads.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_thread.h>)
+#include <SDL3/SDL_thread.h>
+#else
 #include <SDL_thread.h>
+#endif
 
 namespace love
 {
diff --git a/src/modules/thread/sdl/threads.h b/src/modules/thread/sdl/threads.h
index cc8f10e6e..8064921ad 100644
--- a/src/modules/thread/sdl/threads.h
+++ b/src/modules/thread/sdl/threads.h
@@ -24,9 +24,15 @@
 #include "common/config.h"
 #include "thread/threads.h"
 
+#if __has_include(<SDL3/SDL_version.h>)
+#include <SDL3/SDL_version.h>
+#include <SDL3/SDL_thread.h>
+#include <SDL3/SDL_mutex.h>
+#else
 #include <SDL_version.h>
 #include <SDL_thread.h>
 #include <SDL_mutex.h>
+#endif
 
 namespace love
 {
diff --git a/src/modules/touch/sdl/Touch.cpp b/src/modules/touch/sdl/Touch.cpp
index a004ff85c..0bfab4e67 100644
--- a/src/modules/touch/sdl/Touch.cpp
+++ b/src/modules/touch/sdl/Touch.cpp
@@ -23,7 +23,11 @@
 #include "common/Exception.h"
 #include "Touch.h"
 
+#if __has_include(<SDL3/SDL_version.h>)
+#include <SDL3/SDL_version.h>
+#else
 #include <SDL_version.h>
+#endif
 
 // C++
 #include <algorithm>
diff --git a/src/modules/touch/sdl/Touch.h b/src/modules/touch/sdl/Touch.h
index 8bd5c918d..91514c5b4 100644
--- a/src/modules/touch/sdl/Touch.h
+++ b/src/modules/touch/sdl/Touch.h
@@ -25,7 +25,11 @@
 #include "touch/Touch.h"
 
 // SDL
+#if __has_include(<SDL3/SDL_events.h>)
+#include <SDL3/SDL_events.h>
+#else
 #include <SDL_events.h>
+#endif
 
 namespace love
 {
diff --git a/src/modules/window/sdl/Window.cpp b/src/modules/window/sdl/Window.cpp
index 2ee847a77..647dc08ef 100644
--- a/src/modules/window/sdl/Window.cpp
+++ b/src/modules/window/sdl/Window.cpp
@@ -49,8 +49,12 @@
 #endif
 
 #ifdef LOVE_GRAPHICS_VULKAN
+#if __has_include(<SDL3/SDL_vulkan.h>)
+#include <SDL3/SDL_vulkan.h>
+#else
 #include <SDL_vulkan.h>
 #endif
+#endif
 
 #if defined(LOVE_WINDOWS)
 #define WIN32_LEAN_AND_MEAN
diff --git a/src/modules/window/sdl/Window.h b/src/modules/window/sdl/Window.h
index 96b857357..9a6509beb 100644
--- a/src/modules/window/sdl/Window.h
+++ b/src/modules/window/sdl/Window.h
@@ -27,7 +27,11 @@
 #include "graphics/Graphics.h"
 
 // SDL
+#if __has_include(<SDL3/SDL.h>)
+#include <SDL3/SDL.h>
+#else
 #include <SDL.h>
+#endif
 
 namespace love
 {