diff --git a/vsprojects/extract_includes.bat b/vsprojects/extract_includes.bat
index beab8c4a33..d1638e3afe 100755
--- a/vsprojects/extract_includes.bat
+++ b/vsprojects/extract_includes.bat
@@ -7,44 +7,72 @@ md include\google\protobuf\compiler
 md include\google\protobuf\compiler\cpp
 md include\google\protobuf\compiler\java
 md include\google\protobuf\compiler\python
-copy ..\src\google\protobuf\stubs\atomicops.h include\google\protobuf\stubs\atomicops.h
-copy ..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.h include\google\protobuf\stubs\atomicops_internals_x86_msvc.h
-copy ..\src\google\protobuf\stubs\common.h include\google\protobuf\stubs\common.h
-copy ..\src\google\protobuf\stubs\once.h include\google\protobuf\stubs\once.h
-copy ..\src\google\protobuf\stubs\platform_macros.h include\google\protobuf\stubs\platform_macros.h
-copy ..\src\google\protobuf\stubs\template_util.h include\google\protobuf\stubs\template_util.h
-copy ..\src\google\protobuf\stubs\type_traits.h include\google\protobuf\stubs\type_traits.h
-copy ..\src\google\protobuf\descriptor.h include\google\protobuf\descriptor.h
-copy ..\src\google\protobuf\descriptor.pb.h include\google\protobuf\descriptor.pb.h
-copy ..\src\google\protobuf\descriptor_database.h include\google\protobuf\descriptor_database.h
-copy ..\src\google\protobuf\dynamic_message.h include\google\protobuf\dynamic_message.h
-copy ..\src\google\protobuf\extension_set.h include\google\protobuf\extension_set.h
-copy ..\src\google\protobuf\generated_enum_reflection.h include\google\protobuf\generated_enum_reflection.h
-copy ..\src\google\protobuf\generated_message_util.h include\google\protobuf\generated_message_util.h
-copy ..\src\google\protobuf\generated_message_reflection.h include\google\protobuf\generated_message_reflection.h
-copy ..\src\google\protobuf\message.h include\google\protobuf\message.h
-copy ..\src\google\protobuf\message_lite.h include\google\protobuf\message_lite.h
-copy ..\src\google\protobuf\reflection_ops.h include\google\protobuf\reflection_ops.h
-copy ..\src\google\protobuf\repeated_field.h include\google\protobuf\repeated_field.h
-copy ..\src\google\protobuf\service.h include\google\protobuf\service.h
-copy ..\src\google\protobuf\text_format.h include\google\protobuf\text_format.h
-copy ..\src\google\protobuf\unknown_field_set.h include\google\protobuf\unknown_field_set.h
-copy ..\src\google\protobuf\wire_format.h include\google\protobuf\wire_format.h
-copy ..\src\google\protobuf\wire_format_lite.h include\google\protobuf\wire_format_lite.h
-copy ..\src\google\protobuf\wire_format_lite_inl.h include\google\protobuf\wire_format_lite_inl.h
-copy ..\src\google\protobuf\io\coded_stream.h include\google\protobuf\io\coded_stream.h
-copy ..\src\google\protobuf\io\gzip_stream.h include\google\protobuf\io\gzip_stream.h
-copy ..\src\google\protobuf\io\printer.h include\google\protobuf\io\printer.h
-copy ..\src\google\protobuf\io\strtod.h include\google\protobuf\io\strtod.h
-copy ..\src\google\protobuf\io\tokenizer.h include\google\protobuf\io\tokenizer.h
-copy ..\src\google\protobuf\io\zero_copy_stream.h include\google\protobuf\io\zero_copy_stream.h
-copy ..\src\google\protobuf\io\zero_copy_stream_impl.h include\google\protobuf\io\zero_copy_stream_impl.h
-copy ..\src\google\protobuf\io\zero_copy_stream_impl_lite.h include\google\protobuf\io\zero_copy_stream_impl_lite.h
-copy ..\src\google\protobuf\compiler\code_generator.h include\google\protobuf\compiler\code_generator.h
-copy ..\src\google\protobuf\compiler\command_line_interface.h include\google\protobuf\compiler\command_line_interface.h
-copy ..\src\google\protobuf\compiler\importer.h include\google\protobuf\compiler\importer.h
-copy ..\src\google\protobuf\compiler\parser.h include\google\protobuf\compiler\parser.h
-copy ..\src\google\protobuf\compiler\cpp\cpp_generator.h include\google\protobuf\compiler\cpp\cpp_generator.h
-copy ..\src\google\protobuf\compiler\java\java_generator.h include\google\protobuf\compiler\java\java_generator.h
-copy ..\src\google\protobuf\compiler\python\python_generator.h include\google\protobuf\compiler\python\python_generator.h
-copy ..\src\google\protobuf\compiler\plugin.h include\google\protobuf\compiler\plugin.h
+copy ..\google\protobuf\arena.h include\google\protobuf\arena.h
+copy ..\google\protobuf\arenastring.h include\google\protobuf\arenastring.h
+copy ..\google\protobuf\compiler\code_generator.h include\google\protobuf\compiler\code_generator.h
+copy ..\google\protobuf\compiler\command_line_interface.h include\google\protobuf\compiler\command_line_interface.h
+copy ..\google\protobuf\compiler\cpp\cpp_generator.h include\google\protobuf\compiler\cpp\cpp_generator.h
+copy ..\google\protobuf\compiler\importer.h include\google\protobuf\compiler\importer.h
+copy ..\google\protobuf\compiler\java\java_generator.h include\google\protobuf\compiler\java\java_generator.h
+copy ..\google\protobuf\compiler\parser.h include\google\protobuf\compiler\parser.h
+copy ..\google\protobuf\compiler\plugin.h include\google\protobuf\compiler\plugin.h
+copy ..\google\protobuf\compiler\plugin.pb.h include\google\protobuf\compiler\plugin.pb.h
+copy ..\google\protobuf\compiler\python\python_generator.h include\google\protobuf\compiler\python\python_generator.h
+copy ..\google\protobuf\descriptor_database.h include\google\protobuf\descriptor_database.h
+copy ..\google\protobuf\descriptor.h include\google\protobuf\descriptor.h
+copy ..\google\protobuf\descriptor.pb.h include\google\protobuf\descriptor.pb.h
+copy ..\google\protobuf\dynamic_message.h include\google\protobuf\dynamic_message.h
+copy ..\google\protobuf\extension_set.h include\google\protobuf\extension_set.h
+copy ..\google\protobuf\generated_enum_reflection.h include\google\protobuf\generated_enum_reflection.h
+copy ..\google\protobuf\generated_message_reflection.h include\google\protobuf\generated_message_reflection.h
+copy ..\google\protobuf\generated_message_util.h include\google\protobuf\generated_message_util.h
+copy ..\google\protobuf\io\coded_stream.h include\google\protobuf\io\coded_stream.h
+copy ..\google\protobuf\io\gzip_stream.h include\google\protobuf\io\gzip_stream.h
+copy ..\google\protobuf\io\printer.h include\google\protobuf\io\printer.h
+copy ..\google\protobuf\io\strtod.h include\google\protobuf\io\strtod.h
+copy ..\google\protobuf\io\tokenizer.h include\google\protobuf\io\tokenizer.h
+copy ..\google\protobuf\io\zero_copy_stream.h include\google\protobuf\io\zero_copy_stream.h
+copy ..\google\protobuf\io\zero_copy_stream_impl.h include\google\protobuf\io\zero_copy_stream_impl.h
+copy ..\google\protobuf\io\zero_copy_stream_impl_lite.h include\google\protobuf\io\zero_copy_stream_impl_lite.h
+copy ..\google\protobuf\map_entry.h include\google\protobuf\map_entry.h
+copy ..\google\protobuf\map_field.h include\google\protobuf\map_field.h
+copy ..\google\protobuf\map_field_inl.h include\google\protobuf\map_field_inl.h
+copy ..\google\protobuf\map.h include\google\protobuf\map.h
+copy ..\google\protobuf\map_type_handler.h include\google\protobuf\map_type_handler.h
+copy ..\google\protobuf\message.h include\google\protobuf\message.h
+copy ..\google\protobuf\message_lite.h include\google\protobuf\message_lite.h
+copy ..\google\protobuf\metadata.h include\google\protobuf\metadata.h
+copy ..\google\protobuf\reflection.h include\google\protobuf\reflection.h
+copy ..\google\protobuf\reflection_ops.h include\google\protobuf\reflection_ops.h
+copy ..\google\protobuf\repeated_field.h include\google\protobuf\repeated_field.h
+copy ..\google\protobuf\repeated_field_reflection.h include\google\protobuf\repeated_field_reflection.h
+copy ..\google\protobuf\service.h include\google\protobuf\service.h
+copy ..\google\protobuf\stubs\atomicops.h include\google\protobuf\stubs\atomicops.h
+copy ..\google\protobuf\stubs\atomicops_internals_aix.h include\google\protobuf\stubs\atomicops_internals_aix.h
+copy ..\google\protobuf\stubs\atomicops_internals_arm64_gcc.h include\google\protobuf\stubs\atomicops_internals_arm64_gcc.h
+copy ..\google\protobuf\stubs\atomicops_internals_arm_gcc.h include\google\protobuf\stubs\atomicops_internals_arm_gcc.h
+copy ..\google\protobuf\stubs\atomicops_internals_arm_qnx.h include\google\protobuf\stubs\atomicops_internals_arm_qnx.h
+copy ..\google\protobuf\stubs\atomicops_internals_atomicword_compat.h include\google\protobuf\stubs\atomicops_internals_atomicword_compat.h
+copy ..\google\protobuf\stubs\atomicops_internals_generic_gcc.h include\google\protobuf\stubs\atomicops_internals_generic_gcc.h
+copy ..\google\protobuf\stubs\atomicops_internals_macosx.h include\google\protobuf\stubs\atomicops_internals_macosx.h
+copy ..\google\protobuf\stubs\atomicops_internals_mips_gcc.h include\google\protobuf\stubs\atomicops_internals_mips_gcc.h
+copy ..\google\protobuf\stubs\atomicops_internals_pnacl.h include\google\protobuf\stubs\atomicops_internals_pnacl.h
+copy ..\google\protobuf\stubs\atomicops_internals_solaris.h include\google\protobuf\stubs\atomicops_internals_solaris.h
+copy ..\google\protobuf\stubs\atomicops_internals_tsan.h include\google\protobuf\stubs\atomicops_internals_tsan.h
+copy ..\google\protobuf\stubs\atomicops_internals_x86_gcc.h include\google\protobuf\stubs\atomicops_internals_x86_gcc.h
+copy ..\google\protobuf\stubs\atomicops_internals_x86_msvc.h include\google\protobuf\stubs\atomicops_internals_x86_msvc.h
+copy ..\google\protobuf\stubs\atomic_sequence_num.h include\google\protobuf\stubs\atomic_sequence_num.h
+copy ..\google\protobuf\stubs\casts.h include\google\protobuf\stubs\casts.h
+copy ..\google\protobuf\stubs\common.h include\google\protobuf\stubs\common.h
+copy ..\google\protobuf\stubs\fastmem.h include\google\protobuf\stubs\fastmem.h
+copy ..\google\protobuf\stubs\once.h include\google\protobuf\stubs\once.h
+copy ..\google\protobuf\stubs\platform_macros.h include\google\protobuf\stubs\platform_macros.h
+copy ..\google\protobuf\stubs\singleton.h include\google\protobuf\stubs\singleton.h
+copy ..\google\protobuf\stubs\stl_util.h include\google\protobuf\stubs\stl_util.h
+copy ..\google\protobuf\stubs\template_util.h include\google\protobuf\stubs\template_util.h
+copy ..\google\protobuf\stubs\type_traits.h include\google\protobuf\stubs\type_traits.h
+copy ..\google\protobuf\text_format.h include\google\protobuf\text_format.h
+copy ..\google\protobuf\unknown_field_set.h include\google\protobuf\unknown_field_set.h
+copy ..\google\protobuf\wire_format.h include\google\protobuf\wire_format.h
+copy ..\google\protobuf\wire_format_lite.h include\google\protobuf\wire_format_lite.h
+copy ..\google\protobuf\wire_format_lite_inl.h include\google\protobuf\wire_format_lite_inl.h
diff --git a/vsprojects/libprotobuf-lite.vcproj b/vsprojects/libprotobuf-lite.vcproj
index 06b1598840..47642f5db8 100644
--- a/vsprojects/libprotobuf-lite.vcproj
+++ b/vsprojects/libprotobuf-lite.vcproj
@@ -248,7 +248,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream.cc"
+				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_gcc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc"
 				>
 			</File>
 			<File
@@ -256,23 +260,35 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\extension_set.cc"
+				RelativePath="..\src\google\protobuf\stubs\once.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\generated_message_util.cc"
+				RelativePath="..\src\google\protobuf\stubs\stringprintf.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\message_lite.cc"
+				RelativePath="..\src\google\protobuf\arena.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\once.cc"
+				RelativePath="..\src\google\protobuf\arenastring.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc"
+				RelativePath="..\src\google\protobuf\extension_set.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\generated_message_util.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\map_field.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\message_lite.cc"
 				>
 			</File>
 			<File
@@ -284,15 +300,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"
+				RelativePath="..\src\google\protobuf\io\coded_stream.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"
+				RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\stringprintf.cc"
+				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"
 				>
 			</File>
 		</Filter>
diff --git a/vsprojects/libprotobuf.vcproj b/vsprojects/libprotobuf.vcproj
index 1a488f7dd2..8bafcaadb7 100644
--- a/vsprojects/libprotobuf.vcproj
+++ b/vsprojects/libprotobuf.vcproj
@@ -328,7 +328,11 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream.cc"
+				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_gcc.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc"
 				>
 			</File>
 			<File
@@ -336,19 +340,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\descriptor.cc"
+				RelativePath="..\src\google\protobuf\stubs\once.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\descriptor.pb.cc"
+				RelativePath="..\src\google\protobuf\stubs\stringprintf.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\descriptor_database.cc"
+				RelativePath="..\src\google\protobuf\arena.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\dynamic_message.cc"
+				RelativePath="..\src\google\protobuf\arenastring.cc"
 				>
 			</File>
 			<File
@@ -356,83 +360,99 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\extension_set_heavy.cc"
+				RelativePath="..\src\google\protobuf\generated_message_util.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\generated_message_reflection.cc"
+				RelativePath="..\src\google\protobuf\map_field.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\generated_message_util.cc"
+				RelativePath="..\src\google\protobuf\message_lite.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\gzip_stream.cc"
+				RelativePath="..\src\google\protobuf\repeated_field.cc"
 				>
 			</File>
 			<File
-			        RelativePath="..\src\google\protobuf\io\strtod.cc"
+				RelativePath="..\src\google\protobuf\wire_format_lite.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\importer.cc"
+				RelativePath="..\src\google\protobuf\io\coded_stream.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\message.cc"
+				RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\message_lite.cc"
+				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\once.cc"
+				RelativePath="..\src\google\protobuf\stubs\strutil.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc"
+				RelativePath="..\src\google\protobuf\stubs\strutil.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\parser.cc"
+				RelativePath="..\src\google\protobuf\stubs\substitute.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\printer.cc"
+				RelativePath="..\src\google\protobuf\stubs\substitute.h"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\reflection_ops.cc"
+				RelativePath="..\src\google\protobuf\stubs\structurally_valid.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\repeated_field.cc"
+				RelativePath="..\src\google\protobuf\descriptor.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\service.cc"
+				RelativePath="..\src\google\protobuf\descriptor_database.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\structurally_valid.cc"
+				RelativePath="..\src\google\protobuf\descriptor.pb.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\strutil.cc"
+				RelativePath="..\src\google\protobuf\dynamic_message.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\substitute.cc"
+				RelativePath="..\src\google\protobuf\extension_set_heavy.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\text_format.cc"
+				RelativePath="..\src\google\protobuf\generated_message_reflection.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\tokenizer.cc"
+				RelativePath="..\src\google\protobuf\message.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\reflection_internal.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\reflection_ops.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\service.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\text_format.cc"
 				>
 			</File>
 			<File
@@ -444,11 +464,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\wire_format_lite.cc"
+				RelativePath="..\src\google\protobuf\io\gzip_stream.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"
+				RelativePath="..\src\google\protobuf\io\printer.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\io\strtod.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\io\tokenizer.cc"
 				>
 			</File>
 			<File
@@ -456,11 +484,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"
+				RelativePath="..\src\google\protobuf\compiler\importer.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\stringprintf.cc"
+				RelativePath="..\src\google\protobuf\compiler\parser.cc"
 				>
 			</File>
 		</Filter>
diff --git a/vsprojects/tests.vcproj b/vsprojects/tests.vcproj
index fb815b5a63..488feb71b6 100644
--- a/vsprojects/tests.vcproj
+++ b/vsprojects/tests.vcproj
@@ -247,23 +247,23 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream_unittest.cc"
+				RelativePath="..\src\google\protobuf\arenastring_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\command_line_interface_unittest.cc"
+				RelativePath="..\src\google\protobuf\arena_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\mock_code_generator.cc"
+				RelativePath="..\src\google\protobuf\compiler\command_line_interface_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\common_unittest.cc"
+				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_bootstrap_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_bootstrap_unittest.cc"
+				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_plugin_unittest.cc"
 				>
 			</File>
 			<File
@@ -271,23 +271,23 @@
 				>
 			</File>
 			<File
-				RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc"
+				RelativePath="..\src\google\protobuf\compiler\importer_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_unittest.cc"
+				RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_plugin_unittest.cc"
+				RelativePath="..\src\google\protobuf\compiler\java\java_plugin_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\java\java_plugin_unittest.cc"
+				RelativePath="..\src\google\protobuf\compiler\mock_code_generator.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment_unittest.cc"
+				RelativePath="..\src\google\protobuf\compiler\parser_unittest.cc"
 				>
 			</File>
 			<File
@@ -302,6 +302,10 @@
 				RelativePath="..\src\google\protobuf\descriptor_unittest.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\src\google\protobuf\drop_unknown_fields_test.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\src\google\protobuf\dynamic_message_unittest.cc"
 				>
@@ -311,19 +315,35 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\testing\file.cc"
+				RelativePath="..\src\google\protobuf\generated_message_reflection_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\generated_message_reflection_unittest.cc"
+				RelativePath="..\src\google\protobuf\io\coded_stream_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\testing\googletest.cc"
+				RelativePath="..\src\google\protobuf\io\printer_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\importer_unittest.cc"
+				RelativePath="..\src\google\protobuf\io\tokenizer_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\io\zero_copy_stream_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\map_field_test.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\map_test.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\map_test_util.cc"
 				>
 			</File>
 			<File
@@ -331,37 +351,49 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\once_unittest.cc"
+				RelativePath="..\src\google\protobuf\no_field_presence_test.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\compiler\parser_unittest.cc"
+				RelativePath="..\src\google\protobuf\preserve_unknown_enum_test.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\printer_unittest.cc"
+				RelativePath="..\src\google\protobuf\proto3_arena_unittest.cc"
 				>
 			</File>
 			<File
 				RelativePath="..\src\google\protobuf\reflection_ops_unittest.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\src\google\protobuf\repeated_field_reflection_unittest.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\src\google\protobuf\repeated_field_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\repeated_field_reflection_unittest.cc"
+				RelativePath="..\src\google\protobuf\stubs\common_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\structurally_valid_unittest.cc"
+				RelativePath="..\src\google\protobuf\stubs\once_unittest.cc"
 				>
 			</File>
 			<File
 				RelativePath="..\src\google\protobuf\stubs\stringprintf_unittest.cc"
 				>
 			</File>
+			<File
+				RelativePath="..\src\google\protobuf\stubs\structurally_valid_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\stubs\strutil_unittest.cc"
+				>
+			</File>
 			<File
 				RelativePath="..\src\google\protobuf\stubs\template_util_unittest.cc"
 				>
@@ -371,7 +403,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\stubs\strutil_unittest.cc"
+				RelativePath="..\src\google\protobuf\testing\file.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\google\protobuf\testing\googletest.cc"
 				>
 			</File>
 			<File
@@ -383,25 +419,61 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\tokenizer_unittest.cc"
+				RelativePath="..\src\google\protobuf\unknown_field_set_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\google\protobuf\unittest.pb.cc"
+				RelativePath="..\src\google\protobuf\wire_format_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\google\protobuf\map_lite_unittest.pb.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\google\protobuf\map_proto2_unittest.pb.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\google\protobuf\map_unittest.pb.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\google\protobuf\unittest_arena.pb.cc"
 				>
 			</File>
 			<File
 				RelativePath=".\google\protobuf\unittest_custom_options.pb.cc"
 				>
 			</File>
+			<File
+				RelativePath=".\google\protobuf\unittest_drop_unknown_fields.pb.cc"
+				>
+			</File>
 			<File
 				RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.cc"
 				>
 			</File>
+			<File
+				RelativePath=".\google\protobuf\unittest_empty.pb.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\google\protobuf\unittest_import_lite.pb.cc"
+				>
+			</File>
 			<File
 				RelativePath=".\google\protobuf\unittest_import.pb.cc"
 				>
 			</File>
+			<File
+				RelativePath=".\google\protobuf\unittest_import_public_lite.pb.cc"
+				>
+			</File>
 			<File
 				RelativePath=".\google\protobuf\unittest_import_public.pb.cc"
 				>
@@ -410,12 +482,24 @@
 				RelativePath=".\google\protobuf\unittest_lite_imports_nonlite.pb.cc"
 				>
 			</File>
+			<File
+				RelativePath=".\google\protobuf\unittest_lite.pb.cc"
+				>
+			</File>
 			<File
 				RelativePath=".\google\protobuf\unittest_mset.pb.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\google\protobuf\unittest_optimize_for.pb.cc"
+				RelativePath=".\google\protobuf\unittest_no_arena_import.pb.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\google\protobuf\unittest_no_arena.pb.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\google\protobuf\unittest_no_field_presence.pb.cc"
 				>
 			</File>
 			<File
@@ -423,29 +507,33 @@
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\unknown_field_set_unittest.cc"
+				RelativePath=".\google\protobuf\unittest_optimize_for.pb.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\wire_format_unittest.cc"
+				RelativePath=".\google\protobuf\unittest.pb.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_unittest.cc"
+				RelativePath=".\google\protobuf\unittest_preserve_unknown_enum.pb.cc"
+				>
+			</File>
+			<File
+				RelativePath=".\google\protobuf\unittest_proto3_arena.pb.cc"
 				>
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\src\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.proto"
+			RelativePath="..\src\google\protobuf\map_lite_unittest.proto"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating cpp_test_bad_identifiers.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto&#x0D;&#x0A;"
-					Outputs="google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h;google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc"
+					Description="Generating map_lite_unittest.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/map_lite_unittest.proto"
+					Outputs="google\protobuf\map_lite_unittest.pb.h;google\protobuf\map_lite_unittest.pb.cc"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -453,9 +541,57 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating cpp_test_bad_identifiers.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto&#x0D;&#x0A;"
-					Outputs="google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h;google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc"
+					Description="Generating map_lite_unittest.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/map_lite_unittest.proto"
+					Outputs="google\protobuf\map_lite_unittest.pb.h;google\protobuf\map_lite_unittest.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\google\protobuf\map_proto2_unittest.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating map_proto2_unittest.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/map_proto2_unittest.proto"
+					Outputs="google\protobuf\map_proto2_unittest.pb.h;google\protobuf\map_proto2_unittest.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating map_proto2_unittest.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/map_proto2_unittest.proto"
+					Outputs="google\protobuf\map_proto2_unittest.pb.h;google\protobuf\map_proto2_unittest.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\google\protobuf\map_unittest.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating map_unittest.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/map_unittest.proto"
+					Outputs="google\protobuf\map_unittest.pb.h;google\protobuf\map_unittest.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating map_unittest.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/map_unittest.proto"
+					Outputs="google\protobuf\map_unittest.pb.h;google\protobuf\map_unittest.pb.cc"
 				/>
 			</FileConfiguration>
 		</File>
@@ -468,7 +604,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest.proto&#x0D;&#x0A;"
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest.proto"
 					Outputs="google\protobuf\unittest.pb.h;google\protobuf\unittest.pb.cc"
 				/>
 			</FileConfiguration>
@@ -478,11 +614,35 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest.proto&#x0D;&#x0A;"
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest.proto"
 					Outputs="google\protobuf\unittest.pb.h;google\protobuf\unittest.pb.cc"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_arena.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_arena.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_arena.proto"
+					Outputs="google\protobuf\unittest_arena.pb.h;google\protobuf\unittest_arena.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_arena.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_arena.proto"
+					Outputs="google\protobuf\unittest_arena.pb.h;google\protobuf\unittest_arena.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\google\protobuf\unittest_custom_options.proto"
 			>
@@ -492,7 +652,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_custom_options.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto&#x0D;&#x0A;"
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto"
 					Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc"
 				/>
 			</FileConfiguration>
@@ -502,11 +662,35 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_custom_options.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto&#x0D;&#x0A;"
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_custom_options.proto"
 					Outputs="google\protobuf\unittest_custom_options.pb.h;google\protobuf\unittest_custom_options.pb.cc"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_drop_unknown_fields.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_drop_unknown_fields.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_drop_unknown_fields.proto"
+					Outputs="google\protobuf\unittest_drop_unknown_fields.pb.h;google\protobuf\unittest_drop_unknown_fields.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_drop_unknown_fields.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_drop_unknown_fields.proto"
+					Outputs="google\protobuf\unittest_drop_unknown_fields.pb.h;google\protobuf\unittest_drop_unknown_fields.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\google\protobuf\unittest_embed_optimize_for.proto"
 			>
@@ -516,7 +700,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_embed_optimize_for.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto&#x0D;&#x0A;"
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto"
 					Outputs="google\protobuf\unittest_embed_optimize_for.pb.h;google\protobuf\unittest_embed_optimize_for.pb.cc"
 				/>
 			</FileConfiguration>
@@ -526,11 +710,59 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_embed_optimize_for.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto&#x0D;&#x0A;"
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_embed_optimize_for.proto"
 					Outputs="google\protobuf\unittest_embed_optimize_for.pb.h;google\protobuf\unittest_embed_optimize_for.pb.cc"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_empty.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_empty.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_empty.proto"
+					Outputs="google\protobuf\unittest_empty.pb.h;google\protobuf\unittest_empty.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_empty.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_empty.proto"
+					Outputs="google\protobuf\unittest_empty.pb.h;google\protobuf\unittest_empty.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_import_lite.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_import_lite.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto"
+					Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_import_lite.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_lite.proto"
+					Outputs="google\protobuf\unittest_import_lite.pb.h;google\protobuf\unittest_import_lite.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\google\protobuf\unittest_import.proto"
 			>
@@ -540,7 +772,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_import.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto&#x0D;&#x0A;"
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto"
 					Outputs="google\protobuf\unittest_import.pb.h;google\protobuf\unittest_import.pb.cc"
 				/>
 			</FileConfiguration>
@@ -550,11 +782,35 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_import.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto&#x0D;&#x0A;"
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import.proto"
 					Outputs="google\protobuf\unittest_import.pb.h;google\protobuf\unittest_import.pb.cc"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_import_public_lite.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_import_public_lite.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public_lite.proto"
+					Outputs="google\protobuf\unittest_import_public_lite.pb.h;google\protobuf\unittest_import_public_lite.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_import_public_lite.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public_lite.proto"
+					Outputs="google\protobuf\unittest_import_public_lite.pb.h;google\protobuf\unittest_import_public_lite.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\google\protobuf\unittest_import_public.proto"
 			>
@@ -564,7 +820,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_import_public.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public.proto&#x0D;&#x0A;"
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public.proto"
 					Outputs="google\protobuf\unittest_import_public.pb.h;google\protobuf\unittest_import_public.pb.cc"
 				/>
 			</FileConfiguration>
@@ -574,7 +830,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_import_public.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public.proto&#x0D;&#x0A;"
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_import_public.proto"
 					Outputs="google\protobuf\unittest_import_public.pb.h;google\protobuf\unittest_import_public.pb.cc"
 				/>
 			</FileConfiguration>
@@ -588,7 +844,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto&#x0D;&#x0A;"
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto"
 					Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
 				/>
 			</FileConfiguration>
@@ -598,11 +854,35 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_lite_imports_nonlite.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto&#x0D;&#x0A;"
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite_imports_nonlite.proto"
 					Outputs="google\protobuf\unittest_lite_imports_nonlite.pb.h;google\protobuf\unittest_lite_imports_nonlite.pb.cc"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_lite.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_lite.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto"
+					Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_lite.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_lite.proto"
+					Outputs="google\protobuf\unittest_lite.pb.h;google\protobuf\unittest_lite.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\src\google\protobuf\unittest_mset.proto"
 			>
@@ -612,7 +892,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_mset.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto&#x0D;&#x0A;"
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto"
 					Outputs="google\protobuf\unittest_mset.pb.h;google\protobuf\unittest_mset.pb.cc"
 				/>
 			</FileConfiguration>
@@ -622,22 +902,22 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_mset.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto&#x0D;&#x0A;"
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_mset.proto"
 					Outputs="google\protobuf\unittest_mset.pb.h;google\protobuf\unittest_mset.pb.cc"
 				/>
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\src\google\protobuf\unittest_optimize_for.proto"
+			RelativePath="..\src\google\protobuf\unittest_no_arena_import.proto"
 			>
 			<FileConfiguration
 				Name="Debug|Win32"
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating unittest_optimize_for.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto&#x0D;&#x0A;"
-					Outputs="google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc"
+					Description="Generating unittest_no_arena_import.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_arena_import.proto"
+					Outputs="google\protobuf\unittest_no_arena_import.pb.h;google\protobuf\unittest_no_arena_import.pb.cc"
 				/>
 			</FileConfiguration>
 			<FileConfiguration
@@ -645,9 +925,57 @@
 				>
 				<Tool
 					Name="VCCustomBuildTool"
-					Description="Generating unittest_optimize_for.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto&#x0D;&#x0A;"
-					Outputs="google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc"
+					Description="Generating unittest_no_arena_import.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_arena_import.proto"
+					Outputs="google\protobuf\unittest_no_arena_import.pb.h;google\protobuf\unittest_no_arena_import.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_no_arena.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_no_arena.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_arena.proto"
+					Outputs="google\protobuf\unittest_no_arena.pb.h;google\protobuf\unittest_no_arena.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_no_arena.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_arena.proto"
+					Outputs="google\protobuf\unittest_no_arena.pb.h;google\protobuf\unittest_no_arena.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_no_field_presence.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_no_field_presence.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_field_presence.proto"
+					Outputs="google\protobuf\unittest_no_field_presence.pb.h;google\protobuf\unittest_no_field_presence.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_no_field_presence.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_field_presence.proto"
+					Outputs="google\protobuf\unittest_no_field_presence.pb.h;google\protobuf\unittest_no_field_presence.pb.cc"
 				/>
 			</FileConfiguration>
 		</File>
@@ -660,7 +988,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_no_generic_services.pb.{h,cc}..."
-					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_generic_services.proto&#x0D;&#x0A;"
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_generic_services.proto"
 					Outputs="google\protobuf\unittest_no_generic_services.pb.h;google\protobuf\unittest_no_generic_services.pb.cc"
 				/>
 			</FileConfiguration>
@@ -670,11 +998,107 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Generating unittest_no_generic_services.pb.{h,cc}..."
-					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_generic_services.proto&#x0D;&#x0A;"
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_no_generic_services.proto"
 					Outputs="google\protobuf\unittest_no_generic_services.pb.h;google\protobuf\unittest_no_generic_services.pb.cc"
 				/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_optimize_for.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_optimize_for.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto"
+					Outputs="google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_optimize_for.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_optimize_for.proto"
+					Outputs="google\protobuf\unittest_optimize_for.pb.h;google\protobuf\unittest_optimize_for.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_preserve_unknown_enum.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_preserve_unknown_enum.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_preserve_unknown_enum.proto"
+					Outputs="google\protobuf\unittest_preserve_unknown_enum.pb.h;google\protobuf\unittest_preserve_unknown_enum.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_preserve_unknown_enum.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_preserve_unknown_enum.proto"
+					Outputs="google\protobuf\unittest_preserve_unknown_enum.pb.h;google\protobuf\unittest_preserve_unknown_enum.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\google\protobuf\unittest_proto3_arena.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_proto3_arena.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_proto3_arena.proto"
+					Outputs="google\protobuf\unittest_proto3_arena.pb.h;google\protobuf\unittest_proto3_arena.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating unittest_proto3_arena.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/unittest_proto3_arena.proto"
+					Outputs="google\protobuf\unittest_proto3_arena.pb.h;google\protobuf\unittest_proto3_arena.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.proto"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating cpp_test_bad_identifiers.pb.{h,cc}..."
+					CommandLine="Debug\protoc -I../src --cpp_out=. ../src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto"
+					Outputs="google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h;google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				>
+				<Tool
+					Name="VCCustomBuildTool"
+					Description="Generating cpp_test_bad_identifiers.pb.{h,cc}..."
+					CommandLine="Release\protoc -I../src --cpp_out=. ../src/google/protobuf/compiler/cpp/cpp_test_bad_identifiers.proto"
+					Outputs="google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h;google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc"
+				/>
+			</FileConfiguration>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>