diff --git a/vsprojects/libprotobuf-lite.vcproj b/vsprojects/libprotobuf-lite.vcproj
index d245448d38..39e8eedf7f 100644
--- a/vsprojects/libprotobuf-lite.vcproj
+++ b/vsprojects/libprotobuf-lite.vcproj
@@ -147,101 +147,32 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream_inl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\config.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\stubs\pbconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\extension_set.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\generated_message_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\map-util.h"
-				>
-			</File>
+			<File RelativePath=".\config.h"></File>
+			<File RelativePath=".\google\protobuf\stubs\pbconfig.h"></File>
+			<File RelativePath="..\src\google\protobuf\extension_set.h"></File>
+			<File RelativePath="..\src\google\protobuf\generated_message_util.h"></File>
 			<File RelativePath="..\src\google\protobuf\generated_enum_util.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\coded_stream.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\coded_stream_inl.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.h"></File>
 			<File RelativePath="..\src\google\protobuf\map_entry_lite.h"></File>
 			<File RelativePath="..\src\google\protobuf\map_field_lite.h"></File>
-			<File
-				RelativePath="..\src\google\protobuf\message_lite.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\once.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops.h"
-			>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.h"
-			>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\platform_macros.h"
-			>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\repeated_field.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\stl_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\wire_format_lite.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\wire_format_lite_inl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\stringprintf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\template_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\type_traits.h"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\message_lite.h"></File>
+			<File RelativePath="..\src\google\protobuf\repeated_field.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\atomicops.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\common.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\hash.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\map-util.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\once.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\platform_macros.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\stl_util.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\stringprintf.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\template_util.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\type_traits.h"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format_lite.h"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format_lite_inl.h"></File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -254,66 +185,21 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_gcc.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\common.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\once.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\stringprintf.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\arena.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\arenastring.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\extension_set.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\generated_message_util.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\message_lite.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\repeated_field.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\wire_format_lite.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\arena.cc"></File>
+			<File RelativePath="..\src\google\protobuf\arenastring.cc"></File>
+			<File RelativePath="..\src\google\protobuf\extension_set.cc"></File>
+			<File RelativePath="..\src\google\protobuf\generated_message_util.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\coded_stream.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"></File>
+			<File RelativePath="..\src\google\protobuf\message_lite.cc"></File>
+			<File RelativePath="..\src\google\protobuf\repeated_field.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_gcc.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\common.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\once.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\stringprintf.cc"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format_lite.cc"></File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/vsprojects/libprotobuf.vcproj b/vsprojects/libprotobuf.vcproj
index e782885f76..9125b4c72b 100644
--- a/vsprojects/libprotobuf.vcproj
+++ b/vsprojects/libprotobuf.vcproj
@@ -147,181 +147,52 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream_inl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\common.h"
-				>
-			</File>
-			<File
-				RelativePath=".\config.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\stubs\pbconfig.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\descriptor.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\descriptor.pb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\descriptor_database.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\dynamic_message.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\extension_set.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\generated_message_reflection.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\generated_message_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\gzip_stream.h"
-				>
-			</File>
-			<File
-			        RelativePath="..\src\google\protobuf\io\strtod.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\hash.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\importer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\map_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\message.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\message_lite.h"
-				>
-			</File>
+			<File RelativePath=".\config.h"></File>
+			<File RelativePath=".\google\protobuf\stubs\pbconfig.h"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\importer.h"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\parser.h"></File>
+			<File RelativePath="..\src\google\protobuf\descriptor.h"></File>
+			<File RelativePath="..\src\google\protobuf\descriptor.pb.h"></File>
+			<File RelativePath="..\src\google\protobuf\descriptor_database.h"></File>
+			<File RelativePath="..\src\google\protobuf\dynamic_message.h"></File>
+			<File RelativePath="..\src\google\protobuf\extension_set.h"></File>
 			<File RelativePath="..\src\google\protobuf\generated_enum_util.h"></File>
+			<File RelativePath="..\src\google\protobuf\generated_message_reflection.h"></File>
+			<File RelativePath="..\src\google\protobuf\generated_message_util.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\coded_stream.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\coded_stream_inl.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\gzip_stream.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\strtod.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\printer.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\tokenizer.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl.h"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.h"></File>
 			<File RelativePath="..\src\google\protobuf\map_entry_lite.h"></File>
 			<File RelativePath="..\src\google\protobuf\map_field_lite.h"></File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops.h"
-			>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.h"
-			>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\platform_macros.h"
-			>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\once.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\parser.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\printer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\reflection_ops.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\repeated_field.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\service.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\stl_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\stringprintf.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\template_util.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\type_traits.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\strutil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\substitute.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\text_format.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\tokenizer.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\unknown_field_set.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\wire_format.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\wire_format_lite.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\wire_format_lite_inl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.h"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\message.h"></File>
+			<File RelativePath="..\src\google\protobuf\message_lite.h"></File>
+			<File RelativePath="..\src\google\protobuf\reflection_ops.h"></File>
+			<File RelativePath="..\src\google\protobuf\repeated_field.h"></File>
+			<File RelativePath="..\src\google\protobuf\service.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\atomicops.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\common.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\hash.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\map_util.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\once.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\platform_macros.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\stl_util.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\stringprintf.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\strutil.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\substitute.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\template_util.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\type_traits.h"></File>
+			<File RelativePath="..\src\google\protobuf\text_format.h"></File>
+			<File RelativePath="..\src\google\protobuf\unknown_field_set.h"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format.h"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format_lite.h"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format_lite_inl.h"></File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -334,170 +205,47 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_gcc.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\common.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\once.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\stringprintf.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\arena.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\arenastring.cc"
-				>
-			</File>
-			<File
-				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
-				RelativePath="..\src\google\protobuf\repeated_field.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\wire_format_lite.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\strutil.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\strutil.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\substitute.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\substitute.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\structurally_valid.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\descriptor.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\descriptor_database.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\descriptor.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\dynamic_message.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\extension_set_heavy.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\generated_message_reflection.cc"
-				>
-			</File>
-			<File
-				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
-				RelativePath="..\src\google\protobuf\unknown_field_set.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\wire_format.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\gzip_stream.cc"
-				>
-			</File>
-			<File
-				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
-				RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\importer.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\parser.cc"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\arena.cc"></File>
+			<File RelativePath="..\src\google\protobuf\arenastring.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\importer.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\parser.cc"></File>
+			<File RelativePath="..\src\google\protobuf\descriptor.cc"></File>
+			<File RelativePath="..\src\google\protobuf\descriptor_database.cc"></File>
+			<File RelativePath="..\src\google\protobuf\descriptor.pb.cc"></File>
+			<File RelativePath="..\src\google\protobuf\dynamic_message.cc"></File>
+			<File RelativePath="..\src\google\protobuf\extension_set.cc"></File>
+			<File RelativePath="..\src\google\protobuf\extension_set_heavy.cc"></File>
+			<File RelativePath="..\src\google\protobuf\generated_message_reflection.cc"></File>
+			<File RelativePath="..\src\google\protobuf\generated_message_util.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\coded_stream.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl_lite.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\gzip_stream.cc"></File>
+			<File 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 RelativePath="..\src\google\protobuf\io\zero_copy_stream_impl.cc"></File>
+			<File RelativePath="..\src\google\protobuf\map_field.cc"></File>
+			<File RelativePath="..\src\google\protobuf\message.cc"></File>
+			<File RelativePath="..\src\google\protobuf\message_lite.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\repeated_field.cc"></File>
+			<File RelativePath="..\src\google\protobuf\service.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_gcc.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\atomicops_internals_x86_msvc.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\common.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\once.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\stringprintf.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\strutil.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\strutil.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\substitute.cc"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\substitute.h"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\structurally_valid.cc"></File>
+			<File RelativePath="..\src\google\protobuf\text_format.cc"></File>
+			<File RelativePath="..\src\google\protobuf\unknown_field_set.cc"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format.cc"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format_lite.cc"></File>
 		</Filter>
 	</Files>
 	<Globals>
diff --git a/vsprojects/libprotoc.vcproj b/vsprojects/libprotoc.vcproj
index 3474d21f47..222aa0eebd 100644
--- a/vsprojects/libprotoc.vcproj
+++ b/vsprojects/libprotoc.vcproj
@@ -147,250 +147,67 @@
       Filter="h;hpp;hxx;hm;inl;inc;xsd"
       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
       >
-      <File
-        RelativePath="..\src\google\protobuf\compiler\code_generator.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\command_line_interface.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\subprocess.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\zip_writer.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\plugin.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\plugin.pb.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_enum.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_enum_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_extension.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_file.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_generator.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_helpers.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_message.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_message_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_options.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_primitive_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_service.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_enum.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_enum_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_extension.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_field_base.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_generator.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_helpers.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_message.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_message_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_primitive_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_enum_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_message_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_primitive_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_source_generator_base.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_umbrella_class.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_writer.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_context.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_enum.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_enum_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_enum_field_lite.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_extension.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_file.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_generator.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_generator_factory.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_helpers.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_lazy_message_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_lazy_message_field_lite.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_lite.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_builder.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_builder_lite.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_field_lite.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_name_resolver.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_primitive_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_primitive_field_lite.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_service.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_shared_code_generator.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_string_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_string_field_lite.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment.cc"
-        >
-      </File>
+      <File RelativePath="..\src\google\protobuf\compiler\code_generator.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\command_line_interface.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\subprocess.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\zip_writer.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\plugin.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\plugin.pb.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_enum.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_enum_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_extension.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_file.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_generator.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_helpers.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_message.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_message_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_options.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_primitive_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_service.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_enum.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_enum_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_extension.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_field_base.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_generator.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_helpers.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_message.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_message_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_primitive_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_enum_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_message_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_primitive_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_source_generator_base.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_umbrella_class.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_writer.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_context.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_enum.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_enum_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_enum_field_lite.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_extension.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_file.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_generator.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_generator_factory.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_helpers.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_lazy_message_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_lazy_message_field_lite.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_lite.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_builder.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_builder_lite.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_field_lite.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_name_resolver.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_primitive_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_primitive_field_lite.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_service.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_shared_code_generator.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_string_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_string_field_lite.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment.cc"></File>
       <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_enum_field.h"></File>
       <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_enum.h"></File>
       <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_extension.h"></File>
@@ -403,62 +220,20 @@
       <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_message.h"></File>
       <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_params.h"></File>
       <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_primitive_field.h"></File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_enum.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_enum_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_extension.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_file.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_generator.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_helpers.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_map_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_message.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_message_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_oneof.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_primitive_field.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\python\python_generator.h"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\ruby\ruby_generator.h"
-        >
-      </File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_enum.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_enum_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_extension.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_file.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_generator.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_helpers.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_map_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_message.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_message_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_oneof.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_primitive_field.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\python\python_generator.h"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\ruby\ruby_generator.h"></File>
     </Filter>
     <Filter
       Name="Resource Files"
@@ -471,350 +246,92 @@
       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
       >
-      <File
-        RelativePath="..\src\google\protobuf\compiler\code_generator.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\command_line_interface.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_enum.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_enum_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_extension.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_file.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_generator.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_helpers.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_map_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_message.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_message_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_primitive_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_service.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_enum.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_enum_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_extension.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_field_base.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_generator.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_helpers.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_message.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_message_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_primitive_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_enum_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_message_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_primitive_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_source_generator_base.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_umbrella_class.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\csharp\csharp_writer.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\ruby\ruby_generator.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_context.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_enum.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_enum_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_extension.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_file.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_generator.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_generator_factory.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_helpers.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_lazy_message_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_lazy_message_field_lite.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_map_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_map_field_lite.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_lite.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_builder.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_builder_lite.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_message_field_lite.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_name_resolver.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_primitive_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_primitive_field_lite.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_service.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_shared_code_generator.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_string_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\java\java_string_field_lite.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_enum.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_enum_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_extension.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_file.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_generator.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_helpers.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_map_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_message.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_message_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\javanano\javanano_primitive_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_enum.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_enum_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_extension.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_file.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_generator.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_helpers.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_map_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_message.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_message_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_oneof.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_primitive_field.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\plugin.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\plugin.pb.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\python\python_generator.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\subprocess.cc"
-        >
-      </File>
-      <File
-        RelativePath="..\src\google\protobuf\compiler\zip_writer.cc"
-        >
-      </File>
+      <File RelativePath="..\src\google\protobuf\compiler\code_generator.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\command_line_interface.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\plugin.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\plugin.pb.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\subprocess.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\zip_writer.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_enum.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_enum_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_extension.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_file.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_generator.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_helpers.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_map_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_message.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_message_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_primitive_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_service.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_string_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_enum.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_enum_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_extension.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_field_base.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_generator.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_helpers.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_message.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_message_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_primitive_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_enum_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_message_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_repeated_primitive_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_source_generator_base.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_umbrella_class.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_writer.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_context.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_enum.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_enum_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_extension.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_file.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_generator.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_generator_factory.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_helpers.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_lazy_message_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_lazy_message_field_lite.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_map_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_map_field_lite.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_lite.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_builder.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_builder_lite.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_message_field_lite.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_name_resolver.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_primitive_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_primitive_field_lite.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_service.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_shared_code_generator.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_string_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\java\java_string_field_lite.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_enum.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_enum_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_extension.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_file.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_generator.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_helpers.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_map_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_message.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_message_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\javanano\javanano_primitive_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_enum.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_enum_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_extension.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_file.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_generator.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_helpers.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_map_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_message.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_message_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_oneof.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\objectivec\objectivec_primitive_field.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\python\python_generator.cc"></File>
+      <File RelativePath="..\src\google\protobuf\compiler\ruby\ruby_generator.cc"></File>
     </Filter>
   </Files>
   <Globals>
diff --git a/vsprojects/lite-test.vcproj b/vsprojects/lite-test.vcproj
index 8d17224886..c69634aeb0 100644
--- a/vsprojects/lite-test.vcproj
+++ b/vsprojects/lite-test.vcproj
@@ -178,24 +178,12 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath="..\src\google\protobuf\test_util_lite.h"
-				>
-			</File>
 			<File RelativePath=".\google\protobuf\map_lite_unittest.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_import_lite.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_import_public_lite.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_lite.pb.h"></File>
 			<File RelativePath="..\src\google\protobuf\map_lite_test_util.h"></File>
-			<File
-				RelativePath=".\google\protobuf\unittest_lite.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import_lite.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import_public_lite.pb.h"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\test_util_lite.h"></File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -208,28 +196,13 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\src\google\protobuf\lite_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\test_util_lite.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_lite.pb.cc"
-				>
-			</File>
 			<File RelativePath=".\google\protobuf\map_lite_unittest.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_import_lite.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_import_public_lite.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_lite.pb.cc"></File>
+			<File RelativePath="..\src\google\protobuf\lite_unittest.cc"></File>
 			<File RelativePath="..\src\google\protobuf\map_lite_test_util.cc"></File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import_lite.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import_public_lite.pb.cc"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\test_util_lite.cc"></File>
 		</Filter>
 		<File
 			RelativePath="..\src\google\protobuf\unittest_lite.proto"
diff --git a/vsprojects/tests.vcproj b/vsprojects/tests.vcproj
index 90515ba58d..ac671a8af1 100644
--- a/vsprojects/tests.vcproj
+++ b/vsprojects/tests.vcproj
@@ -178,65 +178,23 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
-			<File
-				RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\testing\file.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\testing\googletest.h"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\test_util.h"
-				>
-			</File>
+			<File RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_custom_options.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_import.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_import_public.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_mset.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_no_generic_services.pb.h"></File>
+			<File RelativePath=".\google\protobuf\unittest_optimize_for.pb.h"></File>
+			<File RelativePath="..\src\google\protobuf\testing\file.h"></File>
+			<File RelativePath="..\src\google\protobuf\testing\googletest.h"></File>
+			<File RelativePath="..\src\google\protobuf\test_util.h"></File>
 			<File RelativePath="..\src\google\protobuf\map_test_util_impl.h"></File>
 			<File RelativePath="..\src\google\protobuf\map_test_util.h"></File>
 			<File RelativePath="..\src\google\protobuf\arena_test_util.h"></File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\mock_code_generator.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_custom_options.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_embed_optimize_for.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_import_public.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_lite_imports_nonline.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_mset.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_optimize_for.pb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_no_generic_services.pb.h"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\compiler\mock_code_generator.h"></File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
@@ -249,287 +207,77 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
-			<File
-				RelativePath="..\src\google\protobuf\arenastring_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\arena_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\command_line_interface_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_bootstrap_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_plugin_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\cpp\cpp_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\csharp\csharp_generator_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\importer_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\java\java_plugin_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\mock_code_generator.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\parser_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\compiler\python\python_plugin_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\descriptor_database_unittest.cc"
-				>
-			</File>
-			<File
-				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"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\extension_set_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\generated_message_reflection_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\coded_stream_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\io\printer_unittest.cc"
-				>
-			</File>
-			<File
-				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 RelativePath=".\google\protobuf\compiler\cpp\cpp_test_bad_identifiers.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_preserve_unknown_enum2.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"></File>
+			<File 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_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 RelativePath=".\google\protobuf\unittest_no_generic_services.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_optimize_for.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_preserve_unknown_enum.pb.cc"></File>
+			<File RelativePath=".\google\protobuf\unittest_proto3_arena.pb.cc"></File>
+			<File RelativePath="..\src\google\protobuf\arenastring_unittest.cc"></File>
 			<File RelativePath="..\src\google\protobuf\arena_test_util.cc"></File>
-			<File
-				RelativePath="..\src\google\protobuf\message_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\no_field_presence_test.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\preserve_unknown_enum_test.cc"
-				>
-			</File>
-			<File
-				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\stubs\common_unittest.cc"
-				>
-			</File>
-			<File
-				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"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\stubs\type_traits_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\testing\file.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\testing\googletest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\test_util.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\text_format_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\src\google\protobuf\unknown_field_set_unittest.cc"
-				>
-			</File>
-			<File
-				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\unittest_preserve_unknown_enum2.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"
-				>
-			</File>
-			<File
-				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_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
-				RelativePath=".\google\protobuf\unittest_no_generic_services.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_optimize_for.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_preserve_unknown_enum.pb.cc"
-				>
-			</File>
-			<File
-				RelativePath=".\google\protobuf\unittest_proto3_arena.pb.cc"
-				>
-			</File>
+			<File RelativePath="..\src\google\protobuf\arena_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\command_line_interface_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_bootstrap_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_plugin_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\cpp\cpp_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\csharp\csharp_generator_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\importer_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\java\java_doc_comment_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\java\java_plugin_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\mock_code_generator.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\parser_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\compiler\python\python_plugin_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\descriptor_database_unittest.cc"></File>
+			<File 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"></File>
+			<File RelativePath="..\src\google\protobuf\extension_set_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\generated_message_reflection_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\coded_stream_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\io\printer_unittest.cc"></File>
+			<File 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 RelativePath="..\src\google\protobuf\message_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\no_field_presence_test.cc"></File>
+			<File RelativePath="..\src\google\protobuf\preserve_unknown_enum_test.cc"></File>
+			<File 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\stubs\common_unittest.cc"></File>
+			<File 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"></File>
+			<File RelativePath="..\src\google\protobuf\stubs\type_traits_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\testing\file.cc"></File>
+			<File RelativePath="..\src\google\protobuf\testing\googletest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\test_util.cc"></File>
+			<File RelativePath="..\src\google\protobuf\text_format_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\unknown_field_set_unittest.cc"></File>
+			<File RelativePath="..\src\google\protobuf\wire_format_unittest.cc"></File>
 		</Filter>
 		<File
 			RelativePath="..\src\google\protobuf\unittest_preserve_unknown_enum2.proto"