diff --git a/.gitignore b/.gitignore
index d1bec3652..0e5b2cd4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,6 @@
 *.exp
 *.ilk
 *.lastbuildstate
-vc100.pdb
 ipch
 *.sdf
 *.opensdf
@@ -29,10 +28,8 @@ obj*/
 !utils/smdlexp/smdlexp.mak
 
 # Specific Source build products
-client.pdb
 client.dll
 client.lib
-server.pdb
 server.dll
 server.lib
 
@@ -56,63 +53,67 @@ config.cfg
 
 #Auto Generated files (Andy)
 *.vpc_crc
+*.pdb
 /sp/game/mod_episodic/bin/
 /sp/game/mod_hl2/bin/
-/sp/src/fgdlib/Debug/
-/sp/src/fgdlib/fgdlib.vcxproj.filters
-/sp/src/game/client/Debug_mod_episodic/
-/sp/src/game/client/Debug_mod_hl2/
-/sp/src/game/client/client_episodic.vcxproj.filters
-/sp/src/game/client/client_hl2.vcxproj.filters
-/sp/src/game/server/Debug_mod_episodic/
-/sp/src/game/server/Debug_mod_hl2/
-/sp/src/game/server/server_episodic.vcxproj.filters
-/sp/src/game/server/server_hl2.vcxproj.filters
-/sp/src/materialsystem/stdshaders/Debug_dx9_mod_episodic/
-/sp/src/materialsystem/stdshaders/Debug_dx9_mod_hl2/
-/sp/src/materialsystem/stdshaders/game_shader_dx9_episodic.vcxproj.filters
-/sp/src/materialsystem/stdshaders/game_shader_dx9_hl2.vcxproj.filters
-/sp/src/mathlib/Debug/
-/sp/src/mathlib/mathlib.vcxproj.filters
-/sp/src/raytrace/Debug/
-/sp/src/raytrace/raytrace.vcxproj.filters
-/sp/src/tier1/Debug/
-/sp/src/tier1/tier1.vcxproj.filters
-/sp/src/utils/captioncompiler/Debug/
-/sp/src/utils/captioncompiler/captioncompiler.vcxproj.filters
-/sp/src/utils/glview/Debug/
-/sp/src/utils/glview/glview.vcxproj.filters
-/sp/src/utils/height2normal/Debug/
-/sp/src/utils/height2normal/height2normal.vcxproj.filters
-/sp/src/utils/motionmapper/Debug/
-/sp/src/utils/motionmapper/motionmapper.vcxproj.filters
-/sp/src/utils/phonemeextractor/phonemeextractor.vcxproj.filters
-/sp/src/utils/qc_eyes/Debug/
-/sp/src/utils/qc_eyes/qc_eyes.vcxproj.filters
-/sp/src/utils/serverplugin_sample/Debug/
-/sp/src/utils/serverplugin_sample/serverplugin_empty.vcxproj.filters
-/sp/src/utils/tgadiff/Debug/
-/sp/src/utils/tgadiff/tgadiff.vcxproj.filters
-/sp/src/utils/vbsp/Debug/
-/sp/src/utils/vbsp/vbsp.vcxproj.filters
-/sp/src/utils/vice/Debug/
-/sp/src/utils/vice/vice.vcxproj.filters
-/sp/src/utils/vrad/Debug/
-/sp/src/utils/vrad/vrad_dll.vcxproj.filters
-/sp/src/utils/vrad_launcher/Debug/
-/sp/src/utils/vrad_launcher/vrad_launcher.vcxproj.filters
-/sp/src/utils/vtf2tga/Debug/
-/sp/src/utils/vtf2tga/vtf2tga.vcxproj.filters
-/sp/src/utils/vtfdiff/Debug/
-/sp/src/utils/vtfdiff/vtfdiff.vcxproj.filters
-/sp/src/utils/vvis/Debug/
-/sp/src/utils/vvis/vvis_dll.vcxproj.filters
-/sp/src/utils/vvis_launcher/Debug/
-/sp/src/utils/vvis_launcher/vvis_launcher.vcxproj.filters
-/sp/src/vgui2/vgui_controls/Debug/
-/sp/src/vgui2/vgui_controls/vgui_controls.vcxproj.filters
-/sp/src/lib/public/fgdlib.lib
-/sp/src/lib/public/mathlib.lib
-/sp/src/lib/public/raytrace.lib
-/sp/src/lib/public/tier1.lib
-/sp/src/lib/public/vgui_controls.lib
+/mp/game/mod_hl2mp/bin/
+/[sm]p/game/bin/
+/[sm]p/src/fgdlib/Debug/
+/[sm]p/src/fgdlib/fgdlib.vcxproj.filters
+/[sm]p/src/game/client/Debug_mod_episodic/
+/[sm]p/src/game/client/Debug_mod_hl2/
+/[sm]p/src/game/client/client_episodic.vcxproj.filters
+/[sm]p/src/game/client/client_hl2.vcxproj.filters
+/[sm]p/src/game/server/Debug_mod_episodic/
+/[sm]p/src/game/server/Debug_mod_hl2/
+/[sm]p/src/game/server/server_episodic.vcxproj.filters
+/[sm]p/src/game/server/server_hl2.vcxproj.filters
+/[sm]p/src/materialsystem/stdshaders/Debug_dx9_mod_episodic/
+/[sm]p/src/materialsystem/stdshaders/Debug_dx9_mod_hl2/
+/[sm]p/src/materialsystem/stdshaders/game_shader_dx9_episodic.vcxproj.filters
+/[sm]p/src/materialsystem/stdshaders/game_shader_dx9_hl2.vcxproj.filters
+/[sm]p/src/mathlib/Debug/
+/[sm]p/src/mathlib/mathlib.vcxproj.filters
+/[sm]p/src/raytrace/Debug/
+/[sm]p/src/raytrace/raytrace.vcxproj.filters
+/[sm]p/src/tier1/Debug/
+/[sm]p/src/tier1/tier1.vcxproj.filters
+/[sm]p/src/utils/captioncompiler/Debug/
+/[sm]p/src/utils/captioncompiler/captioncompiler.vcxproj.filters
+/[sm]p/src/utils/glview/Debug/
+/[sm]p/src/utils/glview/glview.vcxproj.filters
+/[sm]p/src/utils/height2normal/Debug/
+/[sm]p/src/utils/height2normal/height2normal.vcxproj.filters
+/[sm]p/src/utils/motionmapper/Debug/
+/[sm]p/src/utils/motionmapper/motionmapper.vcxproj.filters
+/[sm]p/src/utils/phonemeextractor/phonemeextractor.vcxproj.filters
+/[sm]p/src/utils/phonemeextractor/Debug/
+/[sm]p/src/utils/qc_eyes/Debug/
+/[sm]p/src/utils/qc_eyes/qc_eyes.vcxproj.filters
+/[sm]p/src/utils/serverplugin_sample/Debug/
+/[sm]p/src/utils/serverplugin_sample/serverplugin_empty.vcxproj.filters
+/[sm]p/src/utils/tgadiff/Debug/
+/[sm]p/src/utils/tgadiff/tgadiff.vcxproj.filters
+/[sm]p/src/utils/vbsp/Debug/
+/[sm]p/src/utils/vbsp/vbsp.vcxproj.filters
+/[sm]p/src/utils/vice/Debug/
+/[sm]p/src/utils/vice/vice.vcxproj.filters
+/[sm]p/src/utils/vrad/Debug/
+/[sm]p/src/utils/vrad/vrad_dll.vcxproj.filters
+/[sm]p/src/utils/vrad_launcher/Debug/
+/[sm]p/src/utils/vrad_launcher/vrad_launcher.vcxproj.filters
+/[sm]p/src/utils/vtf2tga/Debug/
+/[sm]p/src/utils/vtf2tga/vtf2tga.vcxproj.filters
+/[sm]p/src/utils/vtfdiff/Debug/
+/[sm]p/src/utils/vtfdiff/vtfdiff.vcxproj.filters
+/[sm]p/src/utils/vvis/Debug/
+/[sm]p/src/utils/vvis/vvis_dll.vcxproj.filters
+/[sm]p/src/utils/vvis_launcher/Debug/
+/[sm]p/src/utils/vvis_launcher/vvis_launcher.vcxproj.filters
+/[sm]p/src/vgui2/vgui_controls/Debug/
+/[sm]p/src/vgui2/vgui_controls/vgui_controls.vcxproj.filters
+/[sm]p/src/lib/public/fgdlib.lib
+/[sm]p/src/lib/public/mathlib.lib
+/[sm]p/src/lib/public/raytrace.lib
+/[sm]p/src/lib/public/tier1.lib
+/[sm]p/src/lib/public/vgui_controls.lib
diff --git a/sp/src/utils/phonemeextractor/phonemeextractor.vpc b/sp/src/utils/phonemeextractor/phonemeextractor.vpc
index 32a314d71..e3fb11141 100644
--- a/sp/src/utils/phonemeextractor/phonemeextractor.vpc
+++ b/sp/src/utils/phonemeextractor/phonemeextractor.vpc
@@ -80,6 +80,6 @@ $Project "Phonemeextractor"
 	$Folder	"Link Libraries"
 	{
 		$Lib mathlib
-		$DynamicFile	$SAPIDIR\sapi51\lib\i386\sapi.lib"
+		$DynamicFile	"$SAPIDIR\sapi51\lib\i386\sapi.lib"
 	}
 }