diff --git a/csharp/src/Google.Protobuf.Test/testprotos.pb b/csharp/src/Google.Protobuf.Test/testprotos.pb
index bc3979e965..71256aea77 100644
Binary files a/csharp/src/Google.Protobuf.Test/testprotos.pb and b/csharp/src/Google.Protobuf.Test/testprotos.pb differ
diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h
index 0dd0a2ae1f..b16b2980c3 100644
--- a/src/google/protobuf/type.pb.h
+++ b/src/google/protobuf/type.pb.h
@@ -8,12 +8,12 @@
 #include <string>
 
 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3008000
+#if PROTOBUF_VERSION < 3009000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3008000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3009000 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.
diff --git a/update_version.py b/update_version.py
index 38078c1a75..311b25c59f 100755
--- a/update_version.py
+++ b/update_version.py
@@ -169,6 +169,7 @@ def UpdateCpp():
   RewriteTextFile('src/google/protobuf/source_context.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/struct.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/timestamp.pb.h', RewritePbH)
+  RewriteTextFile('src/google/protobuf/type.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/wrappers.pb.h', RewritePbH)
   RewriteTextFile('src/google/protobuf/compiler/plugin.pb.h', RewritePbH)