diff --git a/protoc-c/c_bytes_field.cc b/protoc-c/c_bytes_field.cc
index 0037858..668b0e1 100644
--- a/protoc-c/c_bytes_field.cc
+++ b/protoc-c/c_bytes_field.cc
@@ -20,8 +20,8 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_bytes_field.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_bytes_field.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/wire_format.h>
 #include <google/protobuf/descriptor.pb.h>
diff --git a/protoc-c/c_bytes_field.h b/protoc-c/c_bytes_field.h
index 68a0f09..20dfc6e 100644
--- a/protoc-c/c_bytes_field.h
+++ b/protoc-c/c_bytes_field.h
@@ -25,7 +25,7 @@
 
 #include <map>
 #include <string>
-#include <google/protobuf/compiler/c/c_field.h>
+#include <protoc-c/c_field.h>
 
 namespace google {
 namespace protobuf {
diff --git a/protoc-c/c_enum.cc b/protoc-c/c_enum.cc
index 7a0e030..5e8e7f4 100644
--- a/protoc-c/c_enum.cc
+++ b/protoc-c/c_enum.cc
@@ -23,8 +23,8 @@
 #include <set>
 #include <map>
 
-#include <google/protobuf/compiler/c/c_enum.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_enum.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 
 namespace google {
diff --git a/protoc-c/c_enum_field.cc b/protoc-c/c_enum_field.cc
index 7919a79..f17a3be 100644
--- a/protoc-c/c_enum_field.cc
+++ b/protoc-c/c_enum_field.cc
@@ -20,8 +20,8 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_enum_field.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_enum_field.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/wire_format.h>
 
diff --git a/protoc-c/c_enum_field.h b/protoc-c/c_enum_field.h
index 342b486..3e41587 100644
--- a/protoc-c/c_enum_field.h
+++ b/protoc-c/c_enum_field.h
@@ -25,7 +25,7 @@
 
 #include <map>
 #include <string>
-#include <google/protobuf/compiler/c/c_field.h>
+#include <protoc-c/c_field.h>
 
 namespace google {
 namespace protobuf {
diff --git a/protoc-c/c_extension.cc b/protoc-c/c_extension.cc
index 14edf0c..5381698 100644
--- a/protoc-c/c_extension.cc
+++ b/protoc-c/c_extension.cc
@@ -20,8 +20,8 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_extension.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_extension.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 
 namespace google {
diff --git a/protoc-c/c_field.cc b/protoc-c/c_field.cc
index dcddca5..f1aff34 100644
--- a/protoc-c/c_field.cc
+++ b/protoc-c/c_field.cc
@@ -20,13 +20,13 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_field.h>
-#include <google/protobuf/compiler/c/c_primitive_field.h>
-#include <google/protobuf/compiler/c/c_string_field.h>
-#include <google/protobuf/compiler/c/c_bytes_field.h>
-#include <google/protobuf/compiler/c/c_enum_field.h>
-#include <google/protobuf/compiler/c/c_message_field.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_field.h>
+#include <protoc-c/c_primitive_field.h>
+#include <protoc-c/c_string_field.h>
+#include <protoc-c/c_bytes_field.h>
+#include <protoc-c/c_enum_field.h>
+#include <protoc-c/c_message_field.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/descriptor.pb.h>
 #include <google/protobuf/stubs/common.h>
 #include <google/protobuf/io/printer.h>
diff --git a/protoc-c/c_file.cc b/protoc-c/c_file.cc
index e1c3db8..3a10faa 100644
--- a/protoc-c/c_file.cc
+++ b/protoc-c/c_file.cc
@@ -20,12 +20,12 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_file.h>
-#include <google/protobuf/compiler/c/c_enum.h>
-#include <google/protobuf/compiler/c/c_service.h>
-#include <google/protobuf/compiler/c/c_extension.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
-#include <google/protobuf/compiler/c/c_message.h>
+#include <protoc-c/c_file.h>
+#include <protoc-c/c_enum.h>
+#include <protoc-c/c_service.h>
+#include <protoc-c/c_extension.h>
+#include <protoc-c/c_helpers.h>
+#include <protoc-c/c_message.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/descriptor.pb.h>
 
diff --git a/protoc-c/c_file.h b/protoc-c/c_file.h
index 8d167f4..ba366d3 100644
--- a/protoc-c/c_file.h
+++ b/protoc-c/c_file.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <vector>
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/c/c_field.h>
+#include <protoc-c/c_field.h>
 
 namespace google {
 namespace protobuf {
diff --git a/protoc-c/c_generator.cc b/protoc-c/c_generator.cc
index 81a1064..d0037cd 100644
--- a/protoc-c/c_generator.cc
+++ b/protoc-c/c_generator.cc
@@ -20,13 +20,13 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_generator.h>
+#include <protoc-c/c_generator.h>
 
 #include <vector>
 #include <utility>
 
-#include <google/protobuf/compiler/c/c_file.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_file.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/io/zero_copy_stream.h>
 #include <google/protobuf/descriptor.pb.h>
diff --git a/protoc-c/c_helpers.cc b/protoc-c/c_helpers.cc
index 329f813..25b1027 100644
--- a/protoc-c/c_helpers.cc
+++ b/protoc-c/c_helpers.cc
@@ -25,7 +25,7 @@
 #include <stdio.h>		// for snprintf
 #include <float.h>
 
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/stubs/common.h>
 
 namespace google {
diff --git a/protoc-c/c_message.cc b/protoc-c/c_message.cc
index 0e9faef..dbbe0fc 100644
--- a/protoc-c/c_message.cc
+++ b/protoc-c/c_message.cc
@@ -22,10 +22,10 @@
 
 #include <algorithm>
 #include <map>
-#include <google/protobuf/compiler/c/c_message.h>
-#include <google/protobuf/compiler/c/c_enum.h>
-#include <google/protobuf/compiler/c/c_extension.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_message.h>
+#include <protoc-c/c_enum.h>
+#include <protoc-c/c_extension.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/wire_format.h>
diff --git a/protoc-c/c_message.h b/protoc-c/c_message.h
index fe12b6c..c3223fe 100644
--- a/protoc-c/c_message.h
+++ b/protoc-c/c_message.h
@@ -25,7 +25,7 @@
 
 #include <string>
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/compiler/c/c_field.h>
+#include <protoc-c/c_field.h>
 
 namespace google {
 namespace protobuf {
diff --git a/protoc-c/c_message_field.cc b/protoc-c/c_message_field.cc
index 724de5f..da613ac 100644
--- a/protoc-c/c_message_field.cc
+++ b/protoc-c/c_message_field.cc
@@ -20,8 +20,8 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_message_field.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_message_field.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/wire_format.h>
 
diff --git a/protoc-c/c_message_field.h b/protoc-c/c_message_field.h
index fc2facb..f18a8bd 100644
--- a/protoc-c/c_message_field.h
+++ b/protoc-c/c_message_field.h
@@ -25,7 +25,7 @@
 
 #include <map>
 #include <string>
-#include <google/protobuf/compiler/c/c_field.h>
+#include <protoc-c/c_field.h>
 
 namespace google {
 namespace protobuf {
diff --git a/protoc-c/c_primitive_field.cc b/protoc-c/c_primitive_field.cc
index 9ed62b9..f4c86de 100644
--- a/protoc-c/c_primitive_field.cc
+++ b/protoc-c/c_primitive_field.cc
@@ -20,8 +20,8 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_primitive_field.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_primitive_field.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/wire_format.h>
 
diff --git a/protoc-c/c_primitive_field.h b/protoc-c/c_primitive_field.h
index 75bdb9b..385543c 100644
--- a/protoc-c/c_primitive_field.h
+++ b/protoc-c/c_primitive_field.h
@@ -25,7 +25,7 @@
 
 #include <map>
 #include <string>
-#include <google/protobuf/compiler/c/c_field.h>
+#include <protoc-c/c_field.h>
 
 namespace google {
 namespace protobuf {
diff --git a/protoc-c/c_service.cc b/protoc-c/c_service.cc
index a85fbdf..d849ef6 100644
--- a/protoc-c/c_service.cc
+++ b/protoc-c/c_service.cc
@@ -20,8 +20,8 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_service.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_service.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 
 namespace google {
diff --git a/protoc-c/c_string_field.cc b/protoc-c/c_string_field.cc
index 8098b09..1d863b7 100644
--- a/protoc-c/c_string_field.cc
+++ b/protoc-c/c_string_field.cc
@@ -20,8 +20,8 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <google/protobuf/compiler/c/c_string_field.h>
-#include <google/protobuf/compiler/c/c_helpers.h>
+#include <protoc-c/c_string_field.h>
+#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 #include <google/protobuf/wire_format.h>
 #include <google/protobuf/descriptor.pb.h>
diff --git a/protoc-c/c_string_field.h b/protoc-c/c_string_field.h
index 36bd965..980cce4 100644
--- a/protoc-c/c_string_field.h
+++ b/protoc-c/c_string_field.h
@@ -25,7 +25,7 @@
 
 #include <map>
 #include <string>
-#include <google/protobuf/compiler/c/c_field.h>
+#include <protoc-c/c_field.h>
 
 namespace google {
 namespace protobuf {
diff --git a/protoc-c/main.cc b/protoc-c/main.cc
index 7509954..74a3dfe 100644
--- a/protoc-c/main.cc
+++ b/protoc-c/main.cc
@@ -1,5 +1,5 @@
 #include <google/protobuf/compiler/command_line_interface.h>
-#include <google/protobuf/compiler/c/c_generator.h>
+#include <protoc-c/c_generator.h>
 
 
 int main(int argc, char* argv[]) {