diff --git a/config.windows.h b/config.windows.h
index 80d5b7fc5..7c113182c 100644
--- a/config.windows.h
+++ b/config.windows.h
@@ -4,15 +4,12 @@
 #define PACKAGE "mkvtoolnix"
 #define VERSION "3.2.0"
 
-#pragma warning(disable:4018)
-#pragma warning(disable:4244)
-#pragma warning(disable:4146)
-#pragma warning(disable:4996)
-#pragma warning(disable:4805)
-#pragma warning(disable:4334)
-#pragma warning(disable:4800)
-#pragma warning(disable:4290)
-#pragma warning(disable:4305)
+#pragma warning(disable:4018)	//signed/unsigned mismatch
+#pragma warning(disable:4244)	//conversion; possible loss of data
+#pragma warning(disable:4290)	//C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
+#pragma warning(disable:4334)	//'operator' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
+#pragma warning(disable:4800)	//forcing value to bool 'true' or 'false' (performance warning)
+#pragma warning(disable:4996)	//'function': was declared deprecated
 
 #define HAVE_BOOST 1
 #define HAVE_BOOST_FILESYSTEM 1
diff --git a/src/common/checksums.cpp b/src/common/checksums.cpp
index 56b46035e..c1d5cabcd 100644
--- a/src/common/checksums.cpp
+++ b/src/common/checksums.cpp
@@ -75,6 +75,9 @@ static struct {
   { 1, 32, 0xEDB88320 },
 };
 static uint32_t s_crc_table[CRC_MAX][257];
+#ifdef COMP_MSC
+#pragma warning(disable:4146)	//unary minus operator applied to unsigned type, result still unsigned
+#endif
 
 int
 crc_init(uint32_t *ctx,
diff --git a/src/extract/xtr_aac.cpp b/src/extract/xtr_aac.cpp
index 1023b1b25..5340601f3 100644
--- a/src/extract/xtr_aac.cpp
+++ b/src/extract/xtr_aac.cpp
@@ -100,6 +100,10 @@ xtr_aac_c::create_file(xtr_base_c *master,
     m_srate_idx = 11;
 }
 
+#ifdef COMP_MSC
+#pragma warning(disable:4309)	//truncation of constant data. 0xff is an int.
+#endif
+
 void
 xtr_aac_c::handle_frame(memory_cptr &frame,
                         KaxBlockAdditions *additions,
diff --git a/winbuild/common.vcproj b/winbuild/common.vcproj
index cf6d34dcb..48a418278 100644
--- a/winbuild/common.vcproj
+++ b/winbuild/common.vcproj
@@ -383,26 +383,6 @@
 				RelativePath="..\src\common\wavpack.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\src\common\tags\writer.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\writer_collision.obj"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\writer_collision.obj"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\src\common\chapters\writer.cpp"
 				>
@@ -423,6 +403,26 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\src\common\tags\writer.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\writer_collision.obj"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						ObjectFile="$(IntDir)\writer_collision.obj"
+					/>
+				</FileConfiguration>
+			</File>
 			<File
 				RelativePath="..\src\common\xml\xml.cpp"
 				>
@@ -728,10 +728,6 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 		</Filter>
-		<File
-			RelativePath="..\src\common\Makefile.in"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/winbuild/info.vcproj b/winbuild/info.vcproj
index 5ddb913a3..230b5b9c6 100644
--- a/winbuild/info.vcproj
+++ b/winbuild/info.vcproj
@@ -193,6 +193,14 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\src\info\mkvinfo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\info\wxwidgets_ui.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"