diff --git a/Editor/main_SDL3.cpp b/Editor/main_SDL3.cpp
index d27fc1814..4b8645fdd 100644
--- a/Editor/main_SDL3.cpp
+++ b/Editor/main_SDL3.cpp
@@ -96,7 +96,7 @@ int main(int argc, char *argv[])
 
     wi::arguments::Parse(argc, argv);
 
-    sdl3::sdlsystem_ptr_t system = sdl3::make_sdlsystem(SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_GAMEPAD | SDL_INIT_EVENTS);
+    sdl3::sdlsystem_ptr_t system = sdl3::make_sdlsystem(SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_GAMEPAD);
     if (!system) {
         throw sdl3::SDLError("Error creating SDL3 system");
     }
diff --git a/Samples/Template_Linux/main.cpp b/Samples/Template_Linux/main.cpp
index e9960e874..9d6fda2bd 100644
--- a/Samples/Template_Linux/main.cpp
+++ b/Samples/Template_Linux/main.cpp
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
     application.infoDisplay.resolution = true;
     application.infoDisplay.fpsinfo = true;
 
-    sdl3::sdlsystem_ptr_t system = sdl3::make_sdlsystem(SDL_INIT_VIDEO | SDL_INIT_EVENTS);
+    sdl3::sdlsystem_ptr_t system = sdl3::make_sdlsystem(SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_GAMEPAD);
     sdl3::window_ptr_t window = sdl3::make_window(
             "Template",
             2560, 1440,
diff --git a/Samples/Tests/main_SDL3.cpp b/Samples/Tests/main_SDL3.cpp
index 2af0919d7..2bdd47939 100644
--- a/Samples/Tests/main_SDL3.cpp
+++ b/Samples/Tests/main_SDL3.cpp
@@ -18,41 +18,36 @@ int sdl_loop(Tests &tests)
                 case SDL_EVENT_QUIT:
                     quit = true;
                     break;
-                // case SDL_WINDOWEVENT:
-                    // switch (event.window.event) {
-				case SDL_EVENT_WINDOW_CLOSE_REQUESTED: // exit tests
-					quit = true;
-					break;
-				case SDL_EVENT_WINDOW_RESIZED:
-					// Tells the engine to reload window configuration (size and dpi)
-					tests.SetWindow(tests.window);
-					break;
-				case SDL_EVENT_WINDOW_FOCUS_LOST:
-					tests.is_window_active = false;
-					break;
-				case SDL_EVENT_WINDOW_FOCUS_GAINED:
-					tests.is_window_active = true;
-					if (wi::shadercompiler::GetRegisteredShaderCount() > 0)
-					{
-						std::thread([] {
-							wi::backlog::post("[Shader check] Started checking " + std::to_string(wi::shadercompiler::GetRegisteredShaderCount()) + " registered shaders for changes...");
-							if (wi::shadercompiler::CheckRegisteredShadersOutdated())
-							{
-								wi::backlog::post("[Shader check] Changes detected, initiating reload...");
-								wi::eventhandler::Subscribe_Once(wi::eventhandler::EVENT_THREAD_SAFE_POINT, [](uint64_t userdata) {
-									wi::renderer::ReloadShaders();
-									});
-							}
-							else
-							{
-								wi::backlog::post("[Shader check] All up to date");
-							}
-							}).detach();
-					}
-					break;
-                        // default:
-                            // break;
-                    // }
+                case SDL_EVENT_WINDOW_CLOSE_REQUESTED: // exit tests
+                    quit = true;
+                    break;
+                case SDL_EVENT_WINDOW_RESIZED:
+                    // Tells the engine to reload window configuration (size and dpi)
+                    tests.SetWindow(tests.window);
+                    break;
+                case SDL_EVENT_WINDOW_FOCUS_LOST:
+                    tests.is_window_active = false;
+                    break;
+                case SDL_EVENT_WINDOW_FOCUS_GAINED:
+                    tests.is_window_active = true;
+                    if (wi::shadercompiler::GetRegisteredShaderCount() > 0)
+                    {
+                        std::thread([] {
+                            wi::backlog::post("[Shader check] Started checking " + std::to_string(wi::shadercompiler::GetRegisteredShaderCount()) + " registered shaders for changes...");
+                            if (wi::shadercompiler::CheckRegisteredShadersOutdated())
+                            {
+                                wi::backlog::post("[Shader check] Changes detected, initiating reload...");
+                                wi::eventhandler::Subscribe_Once(wi::eventhandler::EVENT_THREAD_SAFE_POINT, [](uint64_t userdata) {
+                                    wi::renderer::ReloadShaders();
+                                    });
+                            }
+                            else
+                            {
+                                wi::backlog::post("[Shader check] All up to date");
+                            }
+                            }).detach();
+                    }
+                    break;
                 default:
                     break;
             }
diff --git a/WickedEngine/sdl3.h b/WickedEngine/sdl3.h
index d9f0a46d7..10b9834e3 100644
--- a/WickedEngine/sdl3.h
+++ b/WickedEngine/sdl3.h
@@ -4,7 +4,6 @@
 #pragma once
 
 #include <SDL3/SDL.h>
-#include <SDL3/SDL_oldnames.h>
 #include <memory>
 #include <sstream>
 
diff --git a/WickedEngine/wiPlatform.h b/WickedEngine/wiPlatform.h
index 7241a26f3..c88ce6eb2 100644
--- a/WickedEngine/wiPlatform.h
+++ b/WickedEngine/wiPlatform.h
@@ -1,7 +1,6 @@
 #pragma once
 // This file includes platform, os specific libraries and supplies common platform specific resources
 
-#include <SDL3/SDL_video.h>
 #ifdef _WIN32
 
 #ifndef NOMINMAX
@@ -33,6 +32,7 @@ typedef void* HMODULE;
 
 #ifdef SDL3
 #include <SDL3/SDL.h>
+#include <SDL3/SDL_video.h>
 #include <SDL3/SDL_vulkan.h>
 #include "sdl3.h"
 #endif
diff --git a/WickedEngine/wiSDLInput.cpp b/WickedEngine/wiSDLInput.cpp
index d4e49b814..a6d9119fb 100644
--- a/WickedEngine/wiSDLInput.cpp
+++ b/WickedEngine/wiSDLInput.cpp
@@ -1,9 +1,9 @@
 #include "wiSDLInput.h"
-#include <SDL3/SDL_events.h>
-#include <SDL3/SDL_gamepad.h>
 
 #ifdef SDL3
 #include <SDL3/SDL.h>
+#include <SDL3/SDL_events.h>
+#include <SDL3/SDL_gamepad.h>
 
 #include "wiUnorderedMap.h"
 #include "wiBacklog.h"