diff --git a/.gitignore b/.gitignore
index 5c42a5ca..a7d56ca3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ projects/msvc12/*db
 projects/msvc12/GeneratedFiles
 projects/msvc12/libGLideNHQ.dir
 src/Revision.h
+/projects/msvc/.vs
diff --git a/projects/msvc/GLideN64.sln b/projects/msvc/GLideN64.sln
index 95988005..2d9ce551 100644
--- a/projects/msvc/GLideN64.sln
+++ b/projects/msvc/GLideN64.sln
@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -13,6 +12,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGLideNHQ", "libGLideNHQ.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osal", "osal.vcxproj", "{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideNUI", "GLideNUI.vcxproj", "{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug_mupenplus|Win32 = Debug_mupenplus|Win32
@@ -115,8 +116,37 @@ Global
 		{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.RelWithDebInfo|Win32.Build.0 = Release|Win32
 		{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.RelWithDebInfo|x64.ActiveCfg = Release|x64
 		{7BF6F100-31DB-44AE-A2A5-5DDEED9A909C}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_mupenplus|Win32.ActiveCfg = Debug|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_mupenplus|Win32.Build.0 = Debug|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_mupenplus|x64.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug_mupenplus|x64.Build.0 = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug|Win32.ActiveCfg = Debug|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug|Win32.Build.0 = Debug|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug|x64.ActiveCfg = Debug|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.MinSizeRel|Win32.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.MinSizeRel|Win32.Build.0 = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.MinSizeRel|x64.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.MinSizeRel|x64.Build.0 = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_mupenplus|Win32.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_mupenplus|Win32.Build.0 = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_mupenplus|x64.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_mupenplus|x64.Build.0 = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_with_debug_mupen64plus|Win32.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_with_debug_mupen64plus|Win32.Build.0 = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_with_debug_mupen64plus|x64.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release_with_debug_mupen64plus|x64.Build.0 = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release|Win32.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release|Win32.Build.0 = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release|x64.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.RelWithDebInfo|Win32.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.RelWithDebInfo|Win32.Build.0 = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.RelWithDebInfo|x64.ActiveCfg = Release|Win32
+		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.RelWithDebInfo|x64.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {D7155823-2893-4425-94B4-BA469E774A27}
+	EndGlobalSection
 EndGlobal
diff --git a/projects/msvc/GLideNUI.sln b/projects/msvc/GLideNUI.sln
deleted file mode 100644
index 9104f008..00000000
--- a/projects/msvc/GLideNUI.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLideNUI", "GLideNUI.vcxproj", "{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Debug|Win32.Build.0 = Debug|Win32
-		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release|Win32.ActiveCfg = Release|Win32
-		{37CAB375-A7A6-3CAB-BD56-0E954D3FD2FE}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		Qt5Version = qt-5_7_1-x86-msvc2015-static
-	EndGlobalSection
-EndGlobal