diff --git a/Source/Core/AudioCommon/AudioCommon.vcxproj b/Source/Core/AudioCommon/AudioCommon.vcxproj
index 9da2eb3df7..dd3a37f852 100644
--- a/Source/Core/AudioCommon/AudioCommon.vcxproj
+++ b/Source/Core/AudioCommon/AudioCommon.vcxproj
@@ -76,15 +76,15 @@
-
- {ec082900-b4d8-42e9-9663-77f02f6936ae}
-
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
{8498f2fa-5ca6-4169-9971-de5b1fe6132c}
+
+ {ec082900-b4d8-42e9-9663-77f02f6936ae}
+
diff --git a/Source/Core/Common/Common.vcxproj b/Source/Core/Common/Common.vcxproj
index daa33ec366..0679a09ec5 100644
--- a/Source/Core/Common/Common.vcxproj
+++ b/Source/Core/Common/Common.vcxproj
@@ -291,17 +291,17 @@
+
+ {bb00605c-125f-4a21-b33b-7bf418322dcb}
+
{cbc76802-c128-4b17-bf6c-23b08c313e5e}
-
- {bdb6578b-0691-4e80-a46c-df21639fd3b8}
-
{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}
-
- {bb00605c-125f-4a21-b33b-7bf418322dcb}
+
+ {bdb6578b-0691-4e80-a46c-df21639fd3b8}
{41279555-f94f-4ebc-99de-af863c10c5c4}
diff --git a/Source/Core/Core/Core.vcxproj b/Source/Core/Core/Core.vcxproj
index ceefd749c9..f264587297 100644
--- a/Source/Core/Core/Core.vcxproj
+++ b/Source/Core/Core/Core.vcxproj
@@ -140,8 +140,8 @@
-
-
+
+
@@ -500,7 +500,7 @@
-
+
@@ -719,27 +719,6 @@
-
- {8ada04d7-6db1-4da4-ab55-64fb12a0997b}
-
-
- {cbc76802-c128-4b17-bf6c-23b08c313e5e}
-
-
- {349ee8f9-7d25-4909-aaf5-ff3fade72187}
-
-
- {ab993f38-c31d-4897-b139-a620c42bc565}
-
-
- {31643fdb-1bb8-4965-9de7-000fc88d35ae}
-
-
- {bdb6578b-0691-4e80-a46c-df21639fd3b8}
-
-
- {93d73454-2512-424e-9cda-4bb357fe13dd}
-
{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}
@@ -758,14 +737,35 @@
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
+
+ {8ada04d7-6db1-4da4-ab55-64fb12a0997b}
+
{8ea11166-6512-44fc-b7a5-a4d1ecc81170}
+
+ {cbc76802-c128-4b17-bf6c-23b08c313e5e}
+
+
+ {349ee8f9-7d25-4909-aaf5-ff3fade72187}
+
+
+ {ab993f38-c31d-4897-b139-a620c42bc565}
+
+
+ {31643fdb-1bb8-4965-9de7-000fc88d35ae}
+
+
+ {bdb6578b-0691-4e80-a46c-df21639fd3b8}
+
+
+ {23114507-079a-4418-9707-cfa81a03ca99}
+
{38fee76f-f347-484b-949c-b4649381cffb}
-
- {23114507-079a-4418-9707-cfa81a03ca99}
+
+ {93d73454-2512-424e-9cda-4bb357fe13dd}
diff --git a/Source/Core/DiscIO/DiscIO.vcxproj b/Source/Core/DiscIO/DiscIO.vcxproj
index f439564e72..b70e8e3a8c 100644
--- a/Source/Core/DiscIO/DiscIO.vcxproj
+++ b/Source/Core/DiscIO/DiscIO.vcxproj
@@ -106,24 +106,24 @@
-
- {bdb6578b-0691-4e80-a46c-df21639fd3b8}
-
-
- {ff213b23-2c26-4214-9f88-85271e557e87}
-
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
-
- {38fee76f-f347-484b-949c-b4649381cffb}
-
{055a775f-b4f5-4970-9240-f6cf7661f37b}
{1d8c51d2-ffa4-418e-b183-9f42b6a6717e}
+
+ {bdb6578b-0691-4e80-a46c-df21639fd3b8}
+
+
+ {38fee76f-f347-484b-949c-b4649381cffb}
+
+
+ {ff213b23-2c26-4214-9f88-85271e557e87}
+
{1bea10f3-80ce-4bc4-9331-5769372cdf99}
diff --git a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj
index 74a14f6d97..c1fbaa34fd 100644
--- a/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj
+++ b/Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj
@@ -54,35 +54,35 @@
-
- {c636d9d1-82fe-42b5-9987-63b7d4836341}
-
-
+
{e54cf649-140e-4255-81a5-30a673c1fb36}
-
+
{604c8368-f34a-4d55-82c8-cc92a0c13254}
-
+
{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}
-
+
+ {570215b7-e32f-4438-95ae-c8d955f9fca3}
+
+
{53a5391b-737e-49a8-bc8f-312ada00736f}
-
+
{ec1a314c-5588-4506-9c1e-2e58e5817f75}
-
+
{a4c423aa-f57c-46c7-a172-d1a777017d29}
-
+
{29f29a19-f141-45ad-9679-5a2923b49da3}
-
+
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
-
- {570215b7-e32f-4438-95ae-c8d955f9fca3}
+
+ {c636d9d1-82fe-42b5-9987-63b7d4836341}
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
index 5040634451..6761f1f104 100644
--- a/Source/Core/DolphinQt/DolphinQt.vcxproj
+++ b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -485,21 +485,6 @@
-
- {8ada04d7-6db1-4da4-ab55-64fb12a0997b}
-
-
- {4c9f135b-a85e-430c-bad4-4c67ef5fc12c}
-
-
- {ab993f38-c31d-4897-b139-a620c42bc565}
-
-
- {93d73454-2512-424e-9cda-4bb357fe13dd}
-
-
- {ff213b23-2c26-4214-9f88-85271e557e87}
-
{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}
@@ -518,35 +503,50 @@
{6bbd47cf-91fd-4077-b676-8b76980178a9}
+
+ {604C8368-F34A-4D55-82C8-CC92A0C13254}
+
{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}
+
+ {570215b7-e32f-4438-95ae-c8d955f9fca3}
+
+
+ {53A5391B-737E-49A8-BC8F-312ADA00736F}
+
{ec1a314c-5588-4506-9c1e-2e58e5817f75}
{a4c423aa-f57c-46c7-a172-d1a777017d29}
-
- {53A5391B-737E-49A8-BC8F-312ADA00736F}
+
+ {29f29a19-f141-45ad-9679-5a2923b49da3}
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
-
- {604C8368-F34A-4D55-82C8-CC92A0C13254}
-
{0e033be3-2e08-428e-9ae9-bc673efa12b5}
-
- {29f29a19-f141-45ad-9679-5a2923b49da3}
+
+ {8ada04d7-6db1-4da4-ab55-64fb12a0997b}
-
+
{4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb}
-
- {570215b7-e32f-4438-95ae-c8d955f9fca3}
+
+ {4c9f135b-a85e-430c-bad4-4c67ef5fc12c}
+
+
+ {ab993f38-c31d-4897-b139-a620c42bc565}
+
+
+ {93d73454-2512-424e-9cda-4bb357fe13dd}
+
+
+ {ff213b23-2c26-4214-9f88-85271e557e87}
@@ -567,4 +567,4 @@
-
+
\ No newline at end of file
diff --git a/Source/Core/UICommon/UICommon.vcxproj b/Source/Core/UICommon/UICommon.vcxproj
index e39a6c24df..4386fbe602 100644
--- a/Source/Core/UICommon/UICommon.vcxproj
+++ b/Source/Core/UICommon/UICommon.vcxproj
@@ -50,12 +50,12 @@
{E54CF649-140E-4255-81A5-30A673C1FB36}
-
- {2c0d058e-de35-4471-ad99-e68a2caf9e18}
-
{4482FD2A-EC43-3FFB-AC20-2E5C54B05EAD}
+
+ {2c0d058e-de35-4471-ad99-e68a2caf9e18}
+
{38fee76f-f347-484b-949c-b4649381cffb}
diff --git a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj
index f968ef20a5..02067c225a 100644
--- a/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj
+++ b/Source/Core/UpdaterCommon/UpdaterCommon.vcxproj
@@ -51,6 +51,9 @@
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
+
+ {c636d9d1-82fe-42b5-9987-63b7d4836341}
+
{bb00605c-125f-4a21-b33b-7bf418322dcb}
@@ -63,9 +66,6 @@
{ff213b23-2c26-4214-9f88-85271e557e87}
-
- {c636d9d1-82fe-42b5-9987-63b7d4836341}
-
diff --git a/Source/Core/VideoBackends/D3D/D3D.vcxproj b/Source/Core/VideoBackends/D3D/D3D.vcxproj
index 5622e7d79e..94dc1f1d41 100644
--- a/Source/Core/VideoBackends/D3D/D3D.vcxproj
+++ b/Source/Core/VideoBackends/D3D/D3D.vcxproj
@@ -71,12 +71,12 @@
+
+ {dea96cf2-f237-4a1a-b32f-c916769efb50}
+
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
-
- {dea96cf2-f237-4a1a-b32f-c916769efb50}
-
diff --git a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
index c2957fc654..9201593243 100644
--- a/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
+++ b/Source/Core/VideoBackends/D3D12/D3D12.vcxproj
@@ -77,12 +77,12 @@
+
+ {dea96cf2-f237-4a1a-b32f-c916769efb50}
+
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
-
- {dea96cf2-f237-4a1a-b32f-c916769efb50}
-
diff --git a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj
index 5f07041cf5..47e2bb56e6 100644
--- a/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj
+++ b/Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj
@@ -43,30 +43,10 @@
-
+
NotUsing
-
-
-
-
-
- NotUsing
-
-
-
-
-
-
- NotUsing
-
-
-
-
-
- NotUsing
-
-
+
diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj
index fc552200ae..faf54ef72d 100644
--- a/Source/Core/VideoBackends/OGL/OGL.vcxproj
+++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj
@@ -75,12 +75,12 @@
-
- {ff213b23-2c26-4214-9f88-85271e557e87}
-
{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}
+
+ {ff213b23-2c26-4214-9f88-85271e557e87}
+
diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj b/Source/Core/VideoCommon/VideoCommon.vcxproj
index 75c215a3ab..890dd61e10 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcxproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcxproj
@@ -200,6 +200,9 @@
+
+ {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
+
{4c3b2264-ea73-4a7b-9cfe-65b0fd635ebb}
@@ -212,9 +215,6 @@
{ff213b23-2c26-4214-9f88-85271e557e87}
-
- {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
-
diff --git a/Source/Core/WinUpdater/WinUpdater.vcxproj b/Source/Core/WinUpdater/WinUpdater.vcxproj
index 89c8553905..93bef66f82 100644
--- a/Source/Core/WinUpdater/WinUpdater.vcxproj
+++ b/Source/Core/WinUpdater/WinUpdater.vcxproj
@@ -53,10 +53,10 @@
-
+
{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}
-
+
{B001D13E-7EAB-4689-842D-801E5ACFFAC5}
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index 62355aacdc..31f7e3ad38 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -112,27 +112,27 @@
{E54CF649-140E-4255-81A5-30A673C1FB36}
+
+ {604c8368-f34a-4d55-82c8-cc92a0c13254}
+
{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}
+
+ {570215b7-e32f-4438-95ae-c8d955f9fca3}
+
+
+ {53A5391B-737E-49A8-BC8F-312ADA00736F}
+
{ec1a314c-5588-4506-9c1e-2e58e5817f75}
{a4c423aa-f57c-46c7-a172-d1a777017d29}
-
- {53A5391B-737E-49A8-BC8F-312ADA00736F}
-
{29F29A19-F141-45AD-9679-5A2923B49DA3}
-
- {604c8368-f34a-4d55-82c8-cc92a0c13254}
-
-
- {570215b7-e32f-4438-95ae-c8d955f9fca3}
-