diff --git a/engine/engine.vpc b/engine/engine.vpc
index 83471eea..234d3bdf 100644
--- a/engine/engine.vpc
+++ b/engine/engine.vpc
@@ -1120,7 +1120,7 @@ $Project "engine"
 		// http://code.google.com/p/gperftools/wiki/GooglePerformanceTools
 		$File	"$SRCDIR/thirdparty/gperftools-2.0/.libs/libprofiler.so" [$GPROFILER]
 
-		$Lib	"$LIBCOMMON/binkw32"					[$WIN32&&!$QUICKTIME_WIN32]
+		//$Lib	"$LIBCOMMON/binkw32"					[$WIN32&&!$QUICKTIME_WIN32]
 		$File   "$LIBCOMMON\quicktime\QTMLClient"       [$WIN32&&$QUICKTIME_WIN32]
 		$ImpLib	"SDL2" [$SDL]
 		$File	"$SRCDIR\DX9SDK\lib\dsound.lib" [$WIN32]
diff --git a/gameui/GameUI.vpc b/gameui/GameUI.vpc
index d3531d85..330e1ec7 100644
--- a/gameui/GameUI.vpc
+++ b/gameui/GameUI.vpc
@@ -246,8 +246,8 @@ $Project "GameUI"
 		$Lib	vtf
 		$Lib  	"$LIBCOMMON/libjpeg"		[!$DEDICATED]
 		$ImpLib	steam_api
-		$Lib libpng [!$VS2015&&!$DEDICATED]
-		$Lib $LIBCOMMON/libpng [$VS2015&&!$DEDICATED]
+		$Lib libpng [!$VS2015 && !$VS2019 && !$DEDICATED]
+		$Lib $LIBCOMMON/libpng [($VS2015 || $VS2019) && !$DEDICATED]
 		$Lib libz [!$DEDICATED]
 		$ImpLib SDL2 [$SDL]
 	}
diff --git a/replay/replay.vpc b/replay/replay.vpc
index 711cec71..326f043f 100644
--- a/replay/replay.vpc
+++ b/replay/replay.vpc
@@ -201,12 +201,12 @@ $Project "replay"
 
 		$Libexternal	$LIBCOMMON/libcrypto [$OSXALL]
 		$Libexternal 	"$SRCDIR\lib\common\$(CRYPTOPPDIR)\libcrypto" [$LINUXALL]
-		$Libexternal libpng [!$VS2015]
-		$Libexternal $LIBCOMMON/libpng [$VS2015]
+		$Libexternal libpng [!$VS2015 && !$VS2019]
+		$Libexternal $LIBCOMMON/libpng [$VS2015 || $VS2019]
 
 		$ImpLib	"$LIBCOMMON\curl"	  [$OSXALL]
 
-		$Lib	"$LIBCOMMON\libcurl" [$WIN32&&!$VS2015]
+		$Lib	"$LIBCOMMON\libcurl" [$WIN32&&!$VS2015&&!$VS2019]
 		$Lib   "libz" [$WIN32]
 
 		$Libexternal	libz [$LINUXALL]
diff --git a/vpc_scripts/source_dll_win32_base.vpc b/vpc_scripts/source_dll_win32_base.vpc
index 3266a737..841f6dbe 100644
--- a/vpc_scripts/source_dll_win32_base.vpc
+++ b/vpc_scripts/source_dll_win32_base.vpc
@@ -12,9 +12,9 @@ $MacroRequired				"OUTBINDIR"
 		
 $Macro OUTBINDIR	"$OUTBINDIR$PLATSUBDIR"
 $Macro LIBPUBLIC	"$SRCDIR\lib\public$PLATSUBDIR"
-$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015]
-$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR\2015\release" [$VS2015&&!$WIN32]
-$Macro LIBCOMMON	"$SRCDIR\lib\common\win32\2015\release" [$VS2015&&$WIN32]
+$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015 && !$VS2019]
+$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR\2015\release" [($VS2015 || $VS2019) && !$WIN32]
+$Macro LIBCOMMON	"$SRCDIR\lib\common\win32\2015\release" [($VS2015 || $VS2019) && $WIN32]
 
 $Include "$SRCDIR\vpc_scripts\loadaddress.vpc"
 $Include "$SRCDIR\vpc_scripts\source_dll_win32_debug.vpc"
diff --git a/vpc_scripts/source_exe_win_win32_base.vpc b/vpc_scripts/source_exe_win_win32_base.vpc
index 9d68e3c9..60ad198e 100644
--- a/vpc_scripts/source_exe_win_win32_base.vpc
+++ b/vpc_scripts/source_exe_win_win32_base.vpc
@@ -12,9 +12,9 @@ $MacroRequired				"OUTBINDIR"
 
 $Macro OUTBINDIR	"$OUTBINDIR$PLATSUBDIR"
 $Macro LIBPUBLIC	"$SRCDIR\lib\public$PLATSUBDIR"
-$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015]
-$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR\2015\release" [$VS2015&&!$WIN32]
-$Macro LIBCOMMON	"$SRCDIR\lib\common\win32\2015\release" [$VS2015&&$WIN32]
+$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015 && !$VS2019]
+$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR\2015\release" [($VS2015 || $VS2019) && !$WIN32]
+$Macro LIBCOMMON	"$SRCDIR\lib\common\win32\2015\release" [($VS2015 || $VS2019) && $WIN32]
 
 $Include "$SRCDIR\vpc_scripts\loadaddress.vpc"
 $Include "$SRCDIR\vpc_scripts\source_exe_win_win32_debug.vpc"
diff --git a/vpc_scripts/source_lib_win32_base.vpc b/vpc_scripts/source_lib_win32_base.vpc
index 88970d51..b5006a64 100644
--- a/vpc_scripts/source_lib_win32_base.vpc
+++ b/vpc_scripts/source_lib_win32_base.vpc
@@ -11,9 +11,9 @@ $MacroRequired				"OUTLIBNAME"	"$PROJECTNAME"
 $MacroRequired				"OUTLIBDIR"
 
 $Macro LIBPUBLIC	"$SRCDIR\lib\public$PLATSUBDIR"
-$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015]
-$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR\2015\release" [$VS2015&&!$WIN32]
-$Macro LIBCOMMON	"$SRCDIR\lib\common\win32\2015\release" [$VS2015&&$WIN32]
+$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR" [!$VS2015 && !$VS2019]
+$Macro LIBCOMMON	"$SRCDIR\lib\common$PLATSUBDIR\2015\release" [($VS2015 || $VS2019) && !$WIN32]
+$Macro LIBCOMMON	"$SRCDIR\lib\common\win32\2015\release" [($VS2015 || $VS2019) && $WIN32]
 
 $Include "$SRCDIR\vpc_scripts\source_lib_win32_debug.vpc"
 $Include "$SRCDIR\vpc_scripts\source_lib_win32_release.vpc"