diff --git a/VisualC/SDL/SDL.vcxproj b/VisualC/SDL/SDL.vcxproj
index 2937791cf7..0713c5ce74 100644
--- a/VisualC/SDL/SDL.vcxproj
+++ b/VisualC/SDL/SDL.vcxproj
@@ -310,17 +310,6 @@
     <ClInclude Include="..\..\include\SDL3\SDL_storage.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_surface.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_system.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_log.h" />
-    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h" />
-    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_thread.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_time.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_timer.h" />
@@ -334,6 +323,7 @@
     <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h" />
     <ClInclude Include="..\..\src\audio\SDL_audiodev_c.h" />
+    <ClInclude Include="..\..\src\audio\SDL_audio_channel_converters.h" />
     <ClInclude Include="..\..\src\audio\SDL_sysaudio.h" />
     <ClInclude Include="..\..\src\audio\SDL_audioqueue.h" />
     <ClInclude Include="..\..\src\audio\SDL_audioresample.h" />
@@ -349,13 +339,19 @@
     <ClInclude Include="..\..\src\core\windows\SDL_windows.h" />
     <ClInclude Include="..\..\src\core\windows\SDL_xinput.h" />
     <ClInclude Include="..\..\src\cpuinfo\SDL_cpuinfo_c.h" />
+    <ClInclude Include="..\..\src\dialog\SDL_dialog.h" />
+    <ClInclude Include="..\..\src\dialog\SDL_dialog_utils.h" />
     <ClInclude Include="..\..\src\dynapi\SDL_dynapi.h" />
     <ClInclude Include="..\..\src\dynapi\SDL_dynapi_overrides.h" />
     <ClInclude Include="..\..\src\dynapi\SDL_dynapi_procs.h" />
     <ClInclude Include="..\..\src\dynapi\SDL_dynapi_unsupported.h" />
     <ClInclude Include="..\..\src\events\blank_cursor.h" />
     <ClInclude Include="..\..\src\events\default_cursor.h" />
+    <ClInclude Include="..\..\src\events\imKStoUCS.h" />
+    <ClInclude Include="..\..\src\events\scancodes_darwin.h" />
+    <ClInclude Include="..\..\src\events\scancodes_linux.h" />
     <ClInclude Include="..\..\src\events\scancodes_windows.h" />
+    <ClInclude Include="..\..\src\events\scancodes_xfree86.h" />
     <ClInclude Include="..\..\src\events\SDL_categories_c.h" />
     <ClInclude Include="..\..\src\events\SDL_clipboardevents_c.h" />
     <ClInclude Include="..\..\src\events\SDL_displayevents_c.h" />
@@ -364,13 +360,27 @@
     <ClInclude Include="..\..\src\events\SDL_eventwatch_c.h" />
     <ClInclude Include="..\..\src\events\SDL_keyboard_c.h" />
     <ClInclude Include="..\..\src\events\SDL_keymap_c.h" />
+    <ClInclude Include="..\..\src\events\SDL_keysym_to_keycode_c.h" />
+    <ClInclude Include="..\..\src\events\SDL_keysym_to_scancode_c.h" />
     <ClInclude Include="..\..\src\events\SDL_mouse_c.h" />
+    <ClInclude Include="..\..\src\events\SDL_pen_c.h" />
+    <ClInclude Include="..\..\src\events\SDL_scancode_tables_c.h" />
     <ClInclude Include="..\..\src\events\SDL_touch_c.h" />
     <ClInclude Include="..\..\src\events\SDL_windowevents_c.h" />
+    <ClInclude Include="..\..\src\filesystem\SDL_filesystem_c.h" />
     <ClInclude Include="..\..\src\filesystem\SDL_sysfilesystem.h" />
+    <ClInclude Include="..\..\src\gpu\d3d12\D3D12_Blit.h" />
     <ClInclude Include="..\..\src\gpu\SDL_sysgpu.h" />
     <ClInclude Include="..\..\src\gpu\vulkan\SDL_gpu_vulkan_vkfuncs.h" />
+    <ClInclude Include="..\..\src\hidapi\SDL_hidapi_windows.h" />
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_cfgmgr32.h" />
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_descriptor_reconstruct.h" />
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_hidclass.h" />
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_hidpi.h" />
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_hidsdi.h" />
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_winapi.h" />
     <ClInclude Include="..\..\src\io\SDL_asyncio_c.h" />
+    <ClInclude Include="..\..\src\io\SDL_iostream_c.h" />
     <ClInclude Include="..\..\src\io\SDL_sysasyncio.h" />
     <ClInclude Include="..\..\src\haptic\SDL_haptic_c.h" />
     <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h" />
@@ -380,10 +390,16 @@
     <ClInclude Include="..\..\src\haptic\hidapi\SDL_hidapihaptic_c.h" />
     <ClInclude Include="..\..\src\hidapi\hidapi\hidapi.h" />
     <ClInclude Include="..\..\src\hidapi\SDL_hidapi_c.h" />
+    <ClInclude Include="..\..\src\joystick\controller_list.h" />
     <ClInclude Include="..\..\src\joystick\controller_type.h" />
     <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapijoystick_c.h" />
+    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_flydigi.h" />
+    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_nintendo.h" />
     <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_rumble.h" />
+    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_sinput.h" />
     <ClInclude Include="..\..\src\joystick\hidapi\SDL_report_descriptor.h" />
+    <ClInclude Include="..\..\src\joystick\hidapi\steam\controller_constants.h" />
+    <ClInclude Include="..\..\src\joystick\hidapi\steam\controller_structs.h" />
     <ClInclude Include="..\..\src\joystick\SDL_gamepad_c.h" />
     <ClInclude Include="..\..\src\joystick\SDL_gamepad_db.h" />
     <ClInclude Include="..\..\src\joystick\SDL_joystick_c.h" />
@@ -399,16 +415,63 @@
     <ClInclude Include="..\..\src\libm\math_private.h" />
     <ClInclude Include="..\..\src\locale\SDL_syslocale.h" />
     <ClInclude Include="..\..\src\main\SDL_main_callbacks.h" />
+    <ClInclude Include="..\..\src\misc\SDL_libusb.h" />
     <ClInclude Include="..\..\src\misc\SDL_sysurl.h" />
     <ClInclude Include="..\..\src\power\SDL_syspower.h" />
+    <ClInclude Include="..\..\src\process\SDL_sysprocess.h" />
+    <ClInclude Include="..\..\src\render\direct3d11\D3D11_PixelShader_Advanced.h" />
+    <ClInclude Include="..\..\src\render\direct3d11\D3D11_PixelShader_Colors.h" />
+    <ClInclude Include="..\..\src\render\direct3d11\D3D11_PixelShader_Textures.h" />
+    <ClInclude Include="..\..\src\render\direct3d11\D3D11_VertexShader.h" />
     <ClInclude Include="..\..\src\render\direct3d11\SDL_shaders_d3d11.h" />
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_PixelShader_Advanced.h" />
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_PixelShader_Colors.h" />
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_PixelShader_Textures.h" />
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_RootSig_Advanced.h" />
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_RootSig_Color.h" />
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_RootSig_Texture.h" />
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_VertexShader_Advanced.h" />
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_VertexShader_Color.h" />
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_VertexShader_Texture.h" />
     <ClInclude Include="..\..\src\render\direct3d12\SDL_shaders_d3d12.h" />
+    <ClInclude Include="..\..\src\render\direct3d\D3D9_PixelShader_Palette.h" />
+    <ClInclude Include="..\..\src\render\direct3d\D3D9_PixelShader_Palette_Linear.h" />
+    <ClInclude Include="..\..\src\render\direct3d\D3D9_PixelShader_Palette_Nearest.h" />
+    <ClInclude Include="..\..\src\render\direct3d\D3D9_PixelShader_YUV.h" />
     <ClInclude Include="..\..\src\render\direct3d\SDL_shaders_d3d.h" />
+    <ClInclude Include="..\..\src\render\gpu\SDL_gpu_util.h" />
+    <ClInclude Include="..\..\src\render\gpu\SDL_pipeline_gpu.h" />
+    <ClInclude Include="..\..\src\render\gpu\SDL_shaders_gpu.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\color.frag.dxil.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\color.frag.msl.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\color.frag.spv.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\dxil.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\linepoint.vert.dxil.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\linepoint.vert.msl.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\linepoint.vert.spv.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\msl.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\spir-v.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_advanced.frag.dxil.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_advanced.frag.msl.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_advanced.frag.spv.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgb.frag.dxil.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgb.frag.msl.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgb.frag.spv.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgba.frag.dxil.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgba.frag.msl.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgba.frag.spv.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_color.vert.dxil.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_color.vert.msl.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_color.vert.spv.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_texture.vert.dxil.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_texture.vert.msl.h" />
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_texture.vert.spv.h" />
     <ClInclude Include="..\..\src\render\opengles2\SDL_gles2funcs.h" />
     <ClInclude Include="..\..\src\render\opengles2\SDL_shaders_gles2.h" />
     <ClInclude Include="..\..\src\render\opengl\SDL_glfuncs.h" />
     <ClInclude Include="..\..\src\render\opengl\SDL_shaders_gl.h" />
     <ClInclude Include="..\..\src\render\SDL_d3dmath.h" />
+    <ClInclude Include="..\..\src\render\SDL_render_debug_font.h" />
     <ClInclude Include="..\..\src\render\SDL_sysrender.h" />
     <ClInclude Include="..\..\src\render\SDL_yuv_sw_c.h" />
     <ClInclude Include="..\..\src\render\software\SDL_blendfillrect.h" />
@@ -420,6 +483,10 @@
     <ClInclude Include="..\..\src\render\software\SDL_render_sw_c.h" />
     <ClInclude Include="..\..\src\render\software\SDL_triangle.h" />
     <ClInclude Include="..\..\src\render\vulkan\SDL_shaders_vulkan.h" />
+    <ClInclude Include="..\..\src\render\vulkan\VULKAN_PixelShader_Advanced.h" />
+    <ClInclude Include="..\..\src\render\vulkan\VULKAN_PixelShader_Colors.h" />
+    <ClInclude Include="..\..\src\render\vulkan\VULKAN_PixelShader_Textures.h" />
+    <ClInclude Include="..\..\src\render\vulkan\VULKAN_VertexShader.h" />
     <ClInclude Include="..\..\src\SDL_assert_c.h" />
     <ClInclude Include="..\..\src\SDL_error_c.h" />
     <ClCompile Include="..\..\src\core\windows\pch.c">
@@ -443,6 +510,10 @@
     </ClCompile>
     <ClCompile Include="..\..\src\dialog\SDL_dialog.c" />
     <ClCompile Include="..\..\src\dialog\SDL_dialog_utils.c" />
+    <ClCompile Include="..\..\src\events\imKStoUCS.c" />
+    <ClCompile Include="..\..\src\events\SDL_keysym_to_keycode.c" />
+    <ClCompile Include="..\..\src\events\SDL_keysym_to_scancode.c" />
+    <ClCompile Include="..\..\src\events\SDL_scancode_tables.c" />
     <ClCompile Include="..\..\src\filesystem\SDL_filesystem.c" />
     <ClCompile Include="..\..\src\filesystem\windows\SDL_sysfsops.c" />
     <ClCompile Include="..\..\src\io\windows\SDL_asyncio_windows_ioring.c" />
@@ -464,10 +535,17 @@
     <ClInclude Include="..\..\src\SDL_list.h" />
     <ClInclude Include="..\..\src\SDL_log_c.h" />
     <ClInclude Include="..\..\src\SDL_properties_c.h" />
+    <ClInclude Include="..\..\src\SDL_utils_c.h" />
     <ClInclude Include="..\..\src\sensor\dummy\SDL_dummysensor.h" />
     <ClInclude Include="..\..\src\sensor\SDL_sensor_c.h" />
     <ClInclude Include="..\..\src\sensor\SDL_syssensor.h" />
     <ClInclude Include="..\..\src\sensor\windows\SDL_windowssensor.h" />
+    <ClInclude Include="..\..\src\stdlib\SDL_casefolding.h" />
+    <ClInclude Include="..\..\src\stdlib\SDL_getenv_c.h" />
+    <ClInclude Include="..\..\src\stdlib\SDL_sysstdlib.h" />
+    <ClInclude Include="..\..\src\stdlib\SDL_vacopy.h" />
+    <ClInclude Include="..\..\src\storage\SDL_sysstorage.h" />
+    <ClInclude Include="..\..\src\storage\steam\SDL_steamstorage_proc.h" />
     <ClInclude Include="..\..\src\thread\SDL_systhread.h" />
     <ClInclude Include="..\..\src\thread\SDL_thread_c.h" />
     <ClInclude Include="..\..\src\thread\generic\SDL_syscond_c.h" />
@@ -475,13 +553,23 @@
     <ClInclude Include="..\..\src\thread\generic\SDL_sysrwlock_c.h" />
     <ClInclude Include="..\..\src\thread\windows\SDL_systhread_c.h" />
     <ClInclude Include="..\..\src\timer\SDL_timer_c.h" />
+    <ClInclude Include="..\..\src\time\SDL_time_c.h" />
+    <ClInclude Include="..\..\src\tray\SDL_tray_utils.h" />
     <ClInclude Include="..\..\src\video\dummy\SDL_nullevents_c.h" />
     <ClInclude Include="..\..\src\video\dummy\SDL_nullframebuffer_c.h" />
     <ClInclude Include="..\..\src\video\dummy\SDL_nullvideo.h" />
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codecs_common.h" />
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_av1std.h" />
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_av1std_decode.h" />
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h264std.h" />
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h264std_decode.h" />
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h264std_encode.h" />
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h265std.h" />
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h265std_decode.h" />
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h265std_encode.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vk_icd.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vk_layer.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vk_platform.h" />
-    <ClInclude Include="..\..\src\video\khronos\vulkan\vk_sdk_platform.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_android.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_beta.h" />
@@ -492,12 +580,14 @@
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_ios.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_macos.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_metal.h" />
+    <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_screen.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_vi.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_wayland.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_win32.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_xcb.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_xlib.h" />
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_xlib_xrandr.h" />
+    <ClInclude Include="..\..\src\video\miniz.h" />
     <ClInclude Include="..\..\src\video\offscreen\SDL_offscreenevents_c.h" />
     <ClInclude Include="..\..\src\video\offscreen\SDL_offscreenframebuffer_c.h" />
     <ClInclude Include="..\..\src\video\offscreen\SDL_offscreenopengles.h" />
@@ -512,6 +602,7 @@
     <ClInclude Include="..\..\src\video\SDL_egl_c.h" />
     <ClInclude Include="..\..\src\video\SDL_pixels_c.h" />
     <ClInclude Include="..\..\src\video\SDL_rect_c.h" />
+    <ClInclude Include="..\..\src\video\SDL_rect_impl.h" />
     <ClInclude Include="..\..\src\video\SDL_RLEaccel_c.h" />
     <ClInclude Include="..\..\src\video\SDL_rotate.h" />
     <ClInclude Include="..\..\src\video\SDL_stb_c.h" />
@@ -520,8 +611,8 @@
     <ClInclude Include="..\..\src\video\SDL_video_unsupported.h" />
     <ClInclude Include="..\..\src\video\SDL_vulkan_internal.h" />
     <ClInclude Include="..\..\src\video\SDL_yuv_c.h" />
+    <ClInclude Include="..\..\src\video\stb_image.h" />
     <ClInclude Include="..\..\src\video\windows\SDL_msctf.h" />
-    <ClInclude Include="..\..\src\video\windows\SDL_surface_utils.h" />
     <ClInclude Include="..\..\src\video\windows\SDL_windowsclipboard.h" />
     <ClInclude Include="..\..\src\video\windows\SDL_windowsevents.h" />
     <ClInclude Include="..\..\src\video\windows\SDL_windowsframebuffer.h" />
@@ -787,4 +878,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/VisualC/SDL/SDL.vcxproj.filters b/VisualC/SDL/SDL.vcxproj.filters
index e1014918b2..c97143a205 100644
--- a/VisualC/SDL/SDL.vcxproj.filters
+++ b/VisualC/SDL/SDL.vcxproj.filters
@@ -175,9 +175,6 @@
     <Filter Include="render\direct3d12">
       <UniqueIdentifier>{f48c2b17-1bee-4fec-a7c8-24cf619abe08}</UniqueIdentifier>
     </Filter>
-    <Filter Include="video\intrin">
-      <UniqueIdentifier>{653672cc-90ae-4eba-a256-6479f2c31804}</UniqueIdentifier>
-    </Filter>
     <Filter Include="main">
       <UniqueIdentifier>{00001967ea2801028a046a722a070000}</UniqueIdentifier>
     </Filter>
@@ -220,6 +217,51 @@
     <Filter Include="io\windows">
       <UniqueIdentifier>{000028b2ea36d7190d13777a4dc70000}</UniqueIdentifier>
     </Filter>
+    <Filter Include="dialog\windows">
+      <UniqueIdentifier>{17a7dcfc-7c98-44a1-aea1-51bd6b3a256f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gpu\d3d12">
+      <UniqueIdentifier>{f494708a-3811-487d-8cf2-966fda54e0d4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="gpu\vulkan">
+      <UniqueIdentifier>{bec7962a-b390-479e-ae8b-1f8e0bb3359d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="joystick\hidapi\steam">
+      <UniqueIdentifier>{bbc0c9f4-712a-44d7-b6f4-dcc8439b4dff}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="process">
+      <UniqueIdentifier>{9e1aeafc-6ecd-4573-8831-eb3469068ae9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="process\windows">
+      <UniqueIdentifier>{fd90fd0f-e4d3-4d38-abc3-923dc7e87e9e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="render\gpu">
+      <UniqueIdentifier>{a84f88af-9adc-4943-93f4-b67c13c77946}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="storage">
+      <UniqueIdentifier>{171e10b7-6d72-41f0-b3f5-bb11bc5c936b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="storage\generic">
+      <UniqueIdentifier>{d37b0ad0-4dc4-400c-ad3c-d836f6e480e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="storage\steam">
+      <UniqueIdentifier>{ad368a0f-cba2-4628-879b-0fb5f40d483c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="tray">
+      <UniqueIdentifier>{5f006bd4-662d-4648-88a5-58956c59ae41}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="tray\windows">
+      <UniqueIdentifier>{2cc701c5-d15a-442d-865d-caa6ded137a6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="video\khronos\vk_video">
+      <UniqueIdentifier>{4da0dcf8-fff9-4673-ba57-7421436a8bff}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="hidapi\windows">
+      <UniqueIdentifier>{25581d35-16ca-483a-bff0-483b5428ff8b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="render\gpu\shaders">
+      <UniqueIdentifier>{107d41e6-7c7e-4d9a-a3b3-b6f4abfde0c1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\include\SDL3\SDL.h">
@@ -414,54 +456,15 @@
     <ClInclude Include="..\..\include\SDL3\SDL_stdinc.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_storage.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\SDL3\SDL_surface.h">
       <Filter>API Headers</Filter>
     </ClInclude>
     <ClInclude Include="..\..\include\SDL3\SDL_system.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_assert.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_common.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_compare.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_crc32.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_font.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_fuzzer.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_harness.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_log.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\SDL3\SDL_thread.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_time.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\SDL3\SDL_timer.h">
       <Filter>API Headers</Filter>
     </ClInclude>
@@ -507,9 +510,6 @@
     <ClInclude Include="..\..\include\SDL3\SDL_misc.h">
       <Filter>API Headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h">
-      <Filter>API Headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\audio\SDL_audio_c.h">
       <Filter>audio</Filter>
     </ClInclude>
@@ -528,9 +528,6 @@
     <ClInclude Include="..\..\src\audio\SDL_audioresample.h">
       <Filter>audio</Filter>
     </ClInclude>
-    <ClCompile Include="..\..\src\core\SDL_core_unsupported.h">
-      <Filter>core</Filter>
-    </ClCompile>
     <ClInclude Include="..\..\src\core\windows\SDL_directx.h">
       <Filter>core\windows</Filter>
     </ClInclude>
@@ -606,9 +603,6 @@
     <ClInclude Include="..\..\src\haptic\SDL_syshaptic.h">
       <Filter>haptic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h">
-      <Filter>haptic</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\haptic\SDL_haptic_c.h">
       <Filter>haptic</Filter>
     </ClInclude>
@@ -759,9 +753,6 @@
     <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_std_func.h">
       <Filter>video\yuv2rgb</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\video\windows\SDL_surface_utils.h">
-      <Filter>video\windows</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\video\windows\SDL_windowsclipboard.h">
       <Filter>video\windows</Filter>
     </ClInclude>
@@ -909,9 +900,6 @@
     <ClInclude Include="..\..\src\video\khronos\vulkan\vk_platform.h">
       <Filter>video\khronos\vulkan</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\video\khronos\vulkan\vk_sdk_platform.h">
-      <Filter>video\khronos\vulkan</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan.h">
       <Filter>video\khronos\vulkan</Filter>
     </ClInclude>
@@ -965,15 +953,7 @@
     <ClInclude Include="..\..\src\render\direct3d12\SDL_shaders_d3d12.h">
       <Filter>render\direct3d12</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\hidapi\SDL_hidapi_c.h" />
     <ClInclude Include="..\..\src\thread\generic\SDL_sysrwlock_c.h" />
-    <ClInclude Include="..\..\src\thread\generic\SDL_sysrwlock_c.h" />
-    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_common.h" />
-    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_internal.h" />
-    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_lsx.h" />
-    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_lsx_func.h" />
-    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_sse.h" />
-    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_std.h" />
     <ClInclude Include="..\..\src\render\vulkan\SDL_shaders_vulkan.h">
       <Filter>render\vulkan</Filter>
     </ClInclude>
@@ -1001,13 +981,349 @@
     <ClInclude Include="..\..\src\gpu\SDL_sysgpu.h">
       <Filter>gpu</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\gpu\vulkan\SDL_gpu_vulkan_vkfuncs.h">
-      <Filter>gpu</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\include\SDL3\SDL_storage.h" />
     <ClInclude Include="..\..\include\SDL3\SDL_time.h" />
-    <ClInclude Include="..\..\src\events\SDL_categories_c.h" />
-    <ClInclude Include="..\..\src\events\SDL_eventwatch_c.h" />
+    <ClInclude Include="..\..\src\core\SDL_core_unsupported.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_storage.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_time.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\audio\SDL_audio_channel_converters.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\dialog\SDL_dialog.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\dialog\SDL_dialog_utils.h">
+      <Filter>dialog</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\imKStoUCS.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\scancodes_darwin.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\scancodes_linux.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\scancodes_xfree86.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\SDL_categories_c.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\SDL_eventwatch_c.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\SDL_keysym_to_keycode_c.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\SDL_keysym_to_scancode_c.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\SDL_pen_c.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\events\SDL_scancode_tables_c.h">
+      <Filter>events</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\filesystem\SDL_filesystem_c.h">
+      <Filter>filesystem</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\gpu\d3d12\D3D12_Blit.h">
+      <Filter>gpu\d3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\gpu\vulkan\SDL_gpu_vulkan_vkfuncs.h">
+      <Filter>gpu\vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\haptic\SDL_hidapihaptic.h">
+      <Filter>haptic\hidapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\hidapi\SDL_hidapi_windows.h">
+      <Filter>hidapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\io\SDL_iostream_c.h">
+      <Filter>io</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_flydigi.h">
+      <Filter>joystick\hidapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_nintendo.h">
+      <Filter>joystick\hidapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\joystick\hidapi\SDL_hidapi_sinput.h">
+      <Filter>joystick\hidapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\joystick\hidapi\steam\controller_constants.h">
+      <Filter>joystick\hidapi\steam</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\joystick\hidapi\steam\controller_structs.h">
+      <Filter>joystick\hidapi\steam</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\joystick\controller_list.h">
+      <Filter>joystick</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\misc\SDL_libusb.h">
+      <Filter>misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\process\SDL_sysprocess.h">
+      <Filter>process</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d\D3D9_PixelShader_Palette.h">
+      <Filter>render\direct3d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d\D3D9_PixelShader_Palette_Linear.h">
+      <Filter>render\direct3d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d\D3D9_PixelShader_Palette_Nearest.h">
+      <Filter>render\direct3d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d\D3D9_PixelShader_YUV.h">
+      <Filter>render\direct3d</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d11\D3D11_PixelShader_Advanced.h">
+      <Filter>render\direct3d11</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d11\D3D11_PixelShader_Colors.h">
+      <Filter>render\direct3d11</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d11\D3D11_PixelShader_Textures.h">
+      <Filter>render\direct3d11</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d11\D3D11_VertexShader.h">
+      <Filter>render\direct3d11</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_PixelShader_Advanced.h">
+      <Filter>render\direct3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_PixelShader_Colors.h">
+      <Filter>render\direct3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_PixelShader_Textures.h">
+      <Filter>render\direct3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_RootSig_Texture.h">
+      <Filter>render\direct3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_RootSig_Advanced.h">
+      <Filter>render\direct3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_RootSig_Color.h">
+      <Filter>render\direct3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_VertexShader_Texture.h">
+      <Filter>render\direct3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_VertexShader_Advanced.h">
+      <Filter>render\direct3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\direct3d12\D3D12_VertexShader_Color.h">
+      <Filter>render\direct3d12</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\SDL_gpu_util.h">
+      <Filter>render\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\SDL_pipeline_gpu.h">
+      <Filter>render\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\SDL_shaders_gpu.h">
+      <Filter>render\gpu</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\vulkan\VULKAN_PixelShader_Advanced.h">
+      <Filter>render\vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\vulkan\VULKAN_PixelShader_Colors.h">
+      <Filter>render\vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\vulkan\VULKAN_PixelShader_Textures.h">
+      <Filter>render\vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\vulkan\VULKAN_VertexShader.h">
+      <Filter>render\vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\SDL_render_debug_font.h">
+      <Filter>render</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\stdlib\SDL_casefolding.h">
+      <Filter>stdlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\stdlib\SDL_getenv_c.h">
+      <Filter>stdlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\stdlib\SDL_vacopy.h">
+      <Filter>stdlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\stdlib\SDL_sysstdlib.h">
+      <Filter>stdlib</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\storage\SDL_sysstorage.h">
+      <Filter>storage</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\storage\steam\SDL_steamstorage_proc.h">
+      <Filter>storage\steam</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\thread\generic\SDL_sysrwlock_c.h">
+      <Filter>thread\generic</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\time\SDL_time_c.h">
+      <Filter>time</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\tray\SDL_tray_utils.h">
+      <Filter>tray</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_std.h">
+      <Filter>video\yuv2rgb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_common.h">
+      <Filter>video\yuv2rgb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_internal.h">
+      <Filter>video\yuv2rgb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_lsx.h">
+      <Filter>video\yuv2rgb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_lsx_func.h">
+      <Filter>video\yuv2rgb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\yuv2rgb\yuv_rgb_sse.h">
+      <Filter>video\yuv2rgb</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_av1std.h">
+      <Filter>video\khronos\vk_video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_av1std_decode.h">
+      <Filter>video\khronos\vk_video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h264std.h">
+      <Filter>video\khronos\vk_video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h264std_decode.h">
+      <Filter>video\khronos\vk_video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h264std_encode.h">
+      <Filter>video\khronos\vk_video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h265std.h">
+      <Filter>video\khronos\vk_video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h265std_decode.h">
+      <Filter>video\khronos\vk_video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codec_h265std_encode.h">
+      <Filter>video\khronos\vk_video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vk_video\vulkan_video_codecs_common.h">
+      <Filter>video\khronos\vk_video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\khronos\vulkan\vulkan_screen.h">
+      <Filter>video\khronos\vulkan</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\miniz.h">
+      <Filter>video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\SDL_rect_impl.h">
+      <Filter>video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\video\stb_image.h">
+      <Filter>video</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\hidapi\SDL_hidapi_c.h">
+      <Filter>hidapi</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\SDL_utils_c.h" />
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_winapi.h">
+      <Filter>hidapi\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_cfgmgr32.h">
+      <Filter>hidapi\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_hidclass.h">
+      <Filter>hidapi\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_hidsdi.h">
+      <Filter>hidapi\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_descriptor_reconstruct.h">
+      <Filter>hidapi\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\hidapi\windows\hidapi_hidpi.h">
+      <Filter>hidapi\windows</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_texture.vert.spv.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\color.frag.dxil.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\color.frag.msl.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\color.frag.spv.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\dxil.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\linepoint.vert.dxil.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\linepoint.vert.msl.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\linepoint.vert.spv.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\msl.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\spir-v.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_advanced.frag.dxil.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_advanced.frag.msl.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_advanced.frag.spv.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgb.frag.dxil.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgb.frag.msl.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgb.frag.spv.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgba.frag.dxil.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgba.frag.msl.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\texture_rgba.frag.spv.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_color.vert.dxil.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_color.vert.msl.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_color.vert.spv.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_texture.vert.dxil.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\render\gpu\shaders\tri_texture.vert.msl.h">
+      <Filter>render\gpu\shaders</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\audio\wasapi\SDL_wasapi.c" />
@@ -1113,9 +1429,6 @@
     <ClCompile Include="..\..\src\cpuinfo\SDL_cpuinfo.c">
       <Filter>cpuinfo</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\dialog\windows\SDL_windowsdialog.c">
-      <Filter>dialog</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\dynapi\SDL_dynapi.c">
       <Filter>dynapi</Filter>
     </ClCompile>
@@ -1335,12 +1648,6 @@
     <ClCompile Include="..\..\src\time\windows\SDL_systime.c">
       <Filter>time\windows</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\tray\windows\SDL_tray.c">
-      <Filter>video</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\tray\SDL_tray_utils.c">
-      <Filter>video</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\video\SDL_RLEaccel.c">
       <Filter>video</Filter>
     </ClCompile>
@@ -1619,10 +1926,6 @@
       <Filter>stdlib</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\thread\generic\SDL_sysrwlock.c" />
-    <ClCompile Include="..\..\src\thread\generic\SDL_sysrwlock.c" />
-    <ClCompile Include="..\..\src\video\yuv2rgb\yuv_rgb_lsx.c" />
-    <ClCompile Include="..\..\src\video\yuv2rgb\yuv_rgb_sse.c" />
-    <ClCompile Include="..\..\src\video\yuv2rgb\yuv_rgb_std.c" />
     <ClCompile Include="..\..\src\render\vulkan\SDL_render_vulkan.c">
       <Filter>render\vulkan</Filter>
     </ClCompile>
@@ -1650,29 +1953,82 @@
     <ClCompile Include="..\..\src\gpu\SDL_gpu.c">
       <Filter>gpu</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\gpu\d3d12\SDL_gpu_d3d12.c">
-      <Filter>gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gpu\vulkan\SDL_gpu_vulkan.c">
-      <Filter>gpu</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\process\SDL_process.c" />
-    <ClCompile Include="..\..\src\process\windows\SDL_windowsprocess.c" />
-    <ClCompile Include="..\..\src\render\gpu\SDL_pipeline_gpu.c" />
-    <ClCompile Include="..\..\src\render\gpu\SDL_render_gpu.c" />
-    <ClCompile Include="..\..\src\render\gpu\SDL_shaders_gpu.c" />
-    <ClCompile Include="..\..\src\storage\generic\SDL_genericstorage.c" />
-    <ClCompile Include="..\..\src\storage\steam\SDL_steamstorage.c" />
-    <ClCompile Include="..\..\src\storage\SDL_storage.c" />
     <ClCompile Include="..\..\src\joystick\hidapi\SDL_hidapi_steam_triton.c">
       <Filter>joystick\hidapi</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\events\SDL_eventwatch.c" />
     <ClCompile Include="..\..\src\core\windows\pch_cpp.cpp">
       <Filter>core\windows</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\dialog\windows\SDL_windowsdialog.c">
+      <Filter>dialog\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\events\imKStoUCS.c">
+      <Filter>events</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\events\SDL_eventwatch.c">
+      <Filter>events</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\events\SDL_keysym_to_keycode.c">
+      <Filter>events</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\events\SDL_keysym_to_scancode.c">
+      <Filter>events</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\events\SDL_scancode_tables.c">
+      <Filter>events</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\gpu\d3d12\SDL_gpu_d3d12.c">
+      <Filter>gpu\d3d12</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\gpu\vulkan\SDL_gpu_vulkan.c">
+      <Filter>gpu\vulkan</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\process\SDL_process.c">
+      <Filter>process</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\process\windows\SDL_windowsprocess.c">
+      <Filter>process\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\render\gpu\SDL_render_gpu.c">
+      <Filter>render\gpu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\render\gpu\SDL_shaders_gpu.c">
+      <Filter>render\gpu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\render\gpu\SDL_pipeline_gpu.c">
+      <Filter>render\gpu</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\storage\SDL_storage.c">
+      <Filter>storage</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\storage\generic\SDL_genericstorage.c">
+      <Filter>storage\generic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\storage\steam\SDL_steamstorage.c">
+      <Filter>storage\steam</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\thread\generic\SDL_sysrwlock.c">
+      <Filter>thread\generic</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tray\SDL_tray_utils.c">
+      <Filter>tray</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\tray\windows\SDL_tray.c">
+      <Filter>tray\windows</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\video\yuv2rgb\yuv_rgb_lsx.c">
+      <Filter>video\yuv2rgb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\video\yuv2rgb\yuv_rgb_sse.c">
+      <Filter>video\yuv2rgb</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\video\yuv2rgb\yuv_rgb_std.c">
+      <Filter>video\yuv2rgb</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\src\core\windows\version.rc" />
+    <ResourceCompile Include="..\..\src\core\windows\version.rc">
+      <Filter>core\windows</Filter>
+    </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/VisualC/SDL_test/SDL_test.vcxproj b/VisualC/SDL_test/SDL_test.vcxproj
index 6c159fb754..cb258a4904 100644
--- a/VisualC/SDL_test/SDL_test.vcxproj
+++ b/VisualC/SDL_test/SDL_test.vcxproj
@@ -176,7 +176,20 @@
     <ClCompile Include="..\..\src\test\SDL_test_md5.c" />
     <ClCompile Include="..\..\src\test\SDL_test_memory.c" />
   </ItemGroup>
+  <ItemGroup>
+    <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_log.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h" />
+    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/VisualC/SDL_test/SDL_test.vcxproj.filters b/VisualC/SDL_test/SDL_test.vcxproj.filters
new file mode 100644
index 0000000000..092fda055f
--- /dev/null
+++ b/VisualC/SDL_test/SDL_test.vcxproj.filters
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\src\test\SDL_test_internal.h" />
+    <ClCompile Include="..\..\src\test\SDL_test_assert.c" />
+    <ClCompile Include="..\..\src\test\SDL_test_common.c" />
+    <ClCompile Include="..\..\src\test\SDL_test_compare.c" />
+    <ClCompile Include="..\..\src\test\SDL_test_crc32.c" />
+    <ClCompile Include="..\..\src\test\SDL_test_font.c" />
+    <ClCompile Include="..\..\src\test\SDL_test_fuzzer.c" />
+    <ClCompile Include="..\..\src\test\SDL_test_harness.c" />
+    <ClCompile Include="..\..\src\test\SDL_test_log.c" />
+    <ClCompile Include="..\..\src\test\SDL_test_md5.c" />
+    <ClCompile Include="..\..\src\test\SDL_test_memory.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="API Headers">
+      <UniqueIdentifier>{7a277aa4-b043-46fe-bea1-f24da5d5ec5d}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\SDL3\SDL_test.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_assert.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_common.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_compare.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_crc32.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_font.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_fuzzer.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_harness.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_log.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_md5.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\SDL3\SDL_test_memory.h">
+      <Filter>API Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file