diff --git a/.gitignore b/.gitignore
index b8ba4892a4..220e5c3884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,8 @@ src/**/*.trs
 # JavaBuild output.
 java/target
 javanano/target
+
+# Windows native output.
+vsprojects/Debug
+vsprojects/Release
+
diff --git a/vsprojects/libprotoc.vcproj b/vsprojects/libprotoc.vcproj
index 455c2cc2d2..8c93b955c6 100644
--- a/vsprojects/libprotoc.vcproj
+++ b/vsprojects/libprotoc.vcproj
@@ -223,6 +223,66 @@
         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"
         >
@@ -391,6 +451,66 @@
         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"
         >
diff --git a/vsprojects/tests.vcproj b/vsprojects/tests.vcproj
index 0d42949e9d..90515ba58d 100644
--- a/vsprojects/tests.vcproj
+++ b/vsprojects/tests.vcproj
@@ -273,6 +273,10 @@
 				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"
 				>