diff --git a/.gitignore b/.gitignore
index 70184dd..34e49e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ CMakeCache.txt
 Makefile
 bin
 build
-.vscode
\ No newline at end of file
+.vscode
+*.user
diff --git a/msvc/raptor.vcxproj.user b/msvc/raptor.vcxproj.user
deleted file mode 100644
index b90f5ec..0000000
--- a/msvc/raptor.vcxproj.user
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerEnvironment>$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerCommandArguments>
-    </LocalDebuggerCommandArguments>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerEnvironment>$(LocalDebuggerEnvironment)</LocalDebuggerEnvironment>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/fx.cpp b/src/fx.cpp
index 0688467..0706188 100644
--- a/src/fx.cpp
+++ b/src/fx.cpp
@@ -80,7 +80,7 @@ int SND_InitSound(void)
     if (fx_init)
         return 0;
 
-    if (SDL_Init(SDL_INIT_AUDIO) < 0)
+    if (SDL_InitSubSystem(SDL_INIT_AUDIO) < 0)
         return 0;
 
     spec.freq = fx_freq;
diff --git a/src/gfxapi.cpp b/src/gfxapi.cpp
index 7d37ebc..a5dfa94 100644
--- a/src/gfxapi.cpp
+++ b/src/gfxapi.cpp
@@ -49,7 +49,7 @@ void GFX_InitTimer(void)
 #if SDL_VERSION_ATLEAST(2, 0, 5)
     SDL_SetHint(SDL_HINT_WINDOWS_DISABLE_THREAD_NAMING, "1");
 #endif
-    SDL_Init(SDL_INIT_TIMER);
+    SDL_InitSubSystem(SDL_INIT_TIMER);
     timer_init = 1;
 }
 
diff --git a/src/i_video.cpp b/src/i_video.cpp
index b59b5bb..ed26bad 100644
--- a/src/i_video.cpp
+++ b/src/i_video.cpp
@@ -1417,7 +1417,7 @@ void I_InitGraphics(uint8_t *pal)
 
     SetSDLVideoDriver();
 
-    if (SDL_Init(SDL_INIT_VIDEO) < 0)
+    if (SDL_InitSubSystem(SDL_INIT_VIDEO) < 0)
     {
         EXIT_Error("Failed to initialize video: %s", SDL_GetError());
     }
diff --git a/src/joyapi.cpp b/src/joyapi.cpp
index 2e60426..23a561d 100644
--- a/src/joyapi.cpp
+++ b/src/joyapi.cpp
@@ -28,7 +28,7 @@ IPT_CalJoy(
 	void
 )
 {
-	SDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC);
+	SDL_InitSubSystem(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC);
 
 	MaxJoysticks = SDL_NumJoysticks();
 	ControllerIndex = 0;