diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
index 96a1310352..7e2f0b44cf 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj
@@ -53,8 +53,11 @@
       <AdditionalManifestFiles>DolphinQt2.manifest;%(AdditionalManifestFiles)</AdditionalManifestFiles>
     </Manifest>
   </ItemDefinitionGroup>
-  <!--MOC files need to be listed. Perhaps scan for Q_OBJECT in the future? (like automoc)-->
-  <!--NOTE: When adding moc'd files, you must list the outputs in the following ItemGroup!-->
+  <!--
+  MOC files need to be listed. Put headers here ONLY if they use Q_OBJECT. Otherwise, put them
+  in the ItemGroup for ClInclude.
+  -->
+  <!--NOTE: When adding moc'd files, you must list outputs in the ClCompile ItemGroup too!-->
   <ItemGroup>
     <QtMoc Include="AboutDialog.h" />
     <QtMoc Include="Config\ControllersWindow.h" />
@@ -90,7 +93,6 @@
     <ClCompile Include="$(QtMocOutPrefix)ControllersWindow.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)FilesystemWidget.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)WindowActivationEventFilter.cpp" />
-    <ClCompile Include="$(QtMocOutPrefix)GameFile.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GameList.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GameListModel.cpp" />
     <ClCompile Include="$(QtMocOutPrefix)GameTracker.cpp" />
@@ -162,7 +164,24 @@
   </ItemGroup>
   <!--Put standard C/C++ headers here-->
   <ItemGroup>
+    <ClInclude Include="Config\Mapping\GCKeyboardEmu.h" />
+    <ClInclude Include="Config\Mapping\GCPadEmu.h" />
+    <ClInclude Include="Config\Mapping\GCPadWiiU.h" />
+    <ClInclude Include="Config\Mapping\Hotkey3D.h" />
+    <ClInclude Include="Config\Mapping\HotkeyGeneral.h" />
+    <ClInclude Include="Config\Mapping\HotkeyGraphics.h" />
+    <ClInclude Include="Config\Mapping\HotkeyStates.h" />
+    <ClInclude Include="Config\Mapping\HotkeyTAS.h" />
+    <ClInclude Include="Config\Mapping\HotkeyWii.h" />
+    <ClInclude Include="Config\Mapping\MappingBool.h" />
+    <ClInclude Include="Config\Mapping\MappingCommon.h" />
+    <ClInclude Include="Config\Mapping\MappingNumeric.h" />
+    <ClInclude Include="Config\Mapping\WiimoteEmuExtension.h" />
+    <ClInclude Include="Config\Mapping\WiimoteEmuGeneral.h" />
+    <ClInclude Include="Config\Mapping\WiimoteEmuMotionControl.h" />
+    <ClInclude Include="QtUtils\ElidedButton.h" />
     <ClInclude Include="Resources.h" />
+    <ClInclude Include="Settings\PathPane.h" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters
deleted file mode 100644
index e2947829f6..0000000000
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="MainWindow.cpp" />
-    <ClCompile Include="Resources.cpp" />
-    <ClCompile Include="RenderWidget.cpp" />
-    <ClCompile Include="$(QtMocOutPrefix)GameFile.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)GameList.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)GameListModel.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)GameTracker.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)Host.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)ListProxyModel.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)MainWindow.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)MenuBar.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)DoubleClickEventFilter.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)RenderWidget.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)ToolBar.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)Settings.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="GameList\GameFile.cpp">
-      <Filter>GameList</Filter>
-    </ClCompile>
-    <ClCompile Include="GameList\GameList.cpp">
-      <Filter>GameList</Filter>
-    </ClCompile>
-    <ClCompile Include="GameList\GameListModel.cpp">
-      <Filter>GameList</Filter>
-    </ClCompile>
-    <ClCompile Include="GameList\GameTracker.cpp">
-      <Filter>GameList</Filter>
-    </ClCompile>
-    <ClCompile Include="GameList\ListProxyModel.cpp">
-      <Filter>GameList</Filter>
-    </ClCompile>
-    <ClCompile Include="MenuBar.cpp" />
-    <ClCompile Include="Settings.cpp" />
-    <ClCompile Include="ToolBar.cpp" />
-    <ClCompile Include="Host.cpp" />
-    <ClCompile Include="AboutDialog.cpp" />
-    <ClCompile Include="$(QtMocOutPrefix)AboutDialog.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Config\SettingsWindow.cpp" />
-    <ClCompile Include="$(QtMocOutPrefix)SettingsWindow.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Config\PropertiesDialog.cpp" />
-    <ClCompile Include="$(QtMocOutPrefix)InfoWidget.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)PropertiesDialog.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Config\FilesystemWidget.cpp" />
-    <ClCompile Include="Config\InfoWidget.cpp" />
-    <ClCompile Include="$(QtMocOutPrefix)FilesystemWidget.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="InDevelopmentWarning.cpp" />
-    <ClCompile Include="$(QtMocOutPrefix)InDevelopmentWarning.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\GeneralPane.cpp">
-      <Filter>Settings</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)GeneralPane.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)InterfacePane.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Config\ControllersWindow.cpp" />
-    <ClCompile Include="$(QtMocOutPrefix)ControllersWindow.cpp">
-      <Filter>Generated Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\InterfacePane.cpp">
-      <Filter>Settings</Filter>
-    </ClCompile>
-    <ClCompile Include="Settings\PathPane.cpp">
-      <Filter>Settings</Filter>
-    </ClCompile>
-    <ClCompile Include="$(QtMocOutPrefix)MappingWidget.cpp" />
-    <ClCompile Include="$(QtMocOutPrefix)MappingWindow.cpp" />
-    <ClCompile Include="Config\Mapping\GCKeyboardEmu.cpp" />
-    <ClCompile Include="Config\Mapping\GCPadEmu.cpp" />
-    <ClCompile Include="Config\Mapping\GCPadWiiU.cpp" />
-    <ClCompile Include="Config\Mapping\MappingBool.cpp" />
-    <ClCompile Include="Config\Mapping\MappingButton.cpp" />
-    <ClCompile Include="Config\Mapping\MappingNumeric.cpp" />
-    <ClCompile Include="Config\Mapping\MappingWidget.cpp" />
-    <ClCompile Include="Config\Mapping\MappingWindow.cpp" />
-    <ClCompile Include="Config\Mapping\WiimoteEmuExtension.cpp" />
-    <ClCompile Include="Config\Mapping\WiimoteEmuGeneral.cpp" />
-    <ClCompile Include="Config\Mapping\WiimoteEmuMotionControl.cpp" />
-    <ClCompile Include="QtUtils\DoubleClickEventFilter.cpp">
-      <Filter>QtUtils</Filter>
-    </ClCompile>
-    <ClCompile Include="QtUtils\ElidedButton.cpp">
-      <Filter>QtUtils</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <QtMoc Include="MainWindow.h" />
-    <QtMoc Include="ToolBar.h" />
-    <QtMoc Include="MenuBar.h" />
-    <QtMoc Include="RenderWidget.h" />
-    <QtMoc Include="Host.h" />
-    <QtMoc Include="Settings.h" />
-    <QtMoc Include="GameList\ListProxyModel.h">
-      <Filter>GameList</Filter>
-    </QtMoc>
-    <QtMoc Include="GameList\GameListModel.h">
-      <Filter>GameList</Filter>
-    </QtMoc>
-    <QtMoc Include="GameList\GameFile.h">
-      <Filter>GameList</Filter>
-    </QtMoc>
-    <QtMoc Include="GameList\GameList.h">
-      <Filter>GameList</Filter>
-    </QtMoc>
-    <QtMoc Include="GameList\GameTracker.h">
-      <Filter>GameList</Filter>
-    </QtMoc>
-    <QtMoc Include="AboutDialog.h" />
-    <QtMoc Include="Config\SettingsWindow.h" />
-    <QtMoc Include="Config\PropertiesDialog.h" />
-    <QtMoc Include="Config\FilesystemWidget.h" />
-    <QtMoc Include="Config\InfoWidget.h" />
-    <QtMoc Include="InDevelopmentWarning.h" />
-    <QtMoc Include="Config\ControllersWindow.h" />
-    <QtMoc Include="Settings\InterfacePane.h">
-      <Filter>Settings</Filter>
-    </QtMoc>
-    <QtMoc Include="Settings\GeneralPane.h">
-      <Filter>Settings</Filter>
-    </QtMoc>
-    <QtMoc Include="Config\Mapping\MappingWidget.h" />
-    <QtMoc Include="Config\Mapping\MappingWindow.h" />
-    <QtMoc Include="QtUtils\DoubleClickEventFilter.h">
-      <Filter>QtUtils</Filter>
-    </QtMoc>
-  </ItemGroup>
-  <ItemGroup>
-    <QtUi Include="*.ui" />
-    <QtUi Include="GameList\*.ui">
-      <Filter>GameList</Filter>
-    </QtUi>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="CMakeLists.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{c18a1fb3-64ff-4249-b808-d73a56ea3a2d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="GameList">
-      <UniqueIdentifier>{be9925db-448c-46d8-a5a3-fb957490d3ef}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Config">
-      <UniqueIdentifier>{42f8a963-563e-420d-8aca-5761657dcff5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="QtUtils">
-      <UniqueIdentifier>{fb4b5691-df66-4984-af40-fcc2b37f3622}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Settings">
-      <UniqueIdentifier>{d2a31121-7903-4a66-9b42-9358e92d36ff}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Resources.h" />
-  </ItemGroup>
-</Project>
diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user
index 81453971f2..a2913d6b13 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user
@@ -3,5 +3,6 @@
   <PropertyGroup>
     <LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <ShowAllFiles>true</ShowAllFiles>
   </PropertyGroup>
-</Project>
+</Project>
\ No newline at end of file