protoc-gen-c/: Update #include's, copyright years

protoc-gen-c/c_bytes_field.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,12 +61,14 @@
 
 // Modified to implement C code by Dave Benson.
 
-#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 <protobuf-c/protobuf-c.pb.h>
 
+#include "c_bytes_field.h"
+#include "c_helpers.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_bytes_field.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -65,7 +66,8 @@
 
 #include <map>
 #include <string>
-#include <protoc-c/c_field.h>
+
+#include "c_field.h"
 
 namespace google {
 namespace protobuf {

protoc-gen-c/c_enum.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,13 +61,14 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <set>
 #include <map>
+#include <set>
 
-#include <protoc-c/c_enum.h>
-#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 
+#include "c_enum.h"
+#include "c_helpers.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_enum.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -64,15 +65,11 @@
 #define GOOGLE_PROTOBUF_COMPILER_C_ENUM_H__
 
 #include <string>
+
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/io/printer.h>
 
 namespace google {
-namespace protobuf {
-  namespace io {
-    class Printer;             // printer.h
-  }
-}
-
 namespace protobuf {
 namespace compiler {
 namespace c {

protoc-gen-c/c_enum_field.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,11 +61,12 @@
 
 // Modified to implement C code by Dave Benson.
 
-#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>
 
+#include "c_enum_field.h"
+#include "c_helpers.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_enum_field.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -65,7 +66,8 @@
 
 #include <map>
 #include <string>
-#include <protoc-c/c_field.h>
+
+#include "c_field.h"
 
 namespace google {
 namespace protobuf {

protoc-gen-c/c_extension.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,10 +61,10 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <protoc-c/c_extension.h>
-#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 
+#include "c_extension.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_extension.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -64,16 +65,12 @@
 #define GOOGLE_PROTOBUF_COMPILER_C_EXTENSION_H__
 
 #include <string>
+
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/io/printer.h>
 #include <google/protobuf/stubs/common.h>
 
 namespace google {
-namespace protobuf {
-  class FieldDescriptor;       // descriptor.h
-  namespace io {
-    class Printer;             // printer.h
-  }
-}
-
 namespace protobuf {
 namespace compiler {
 namespace c {

protoc-gen-c/c_field.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,16 +61,18 @@
 
 // Modified to implement C code by Dave Benson.
 
-#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 <protobuf-c/protobuf-c.pb.h>
-#include <google/protobuf/stubs/common.h>
 #include <google/protobuf/io/printer.h>
+#include <google/protobuf/stubs/common.h>
+
+#include <protobuf-c/protobuf-c.pb.h>
+
+#include "c_bytes_field.h"
+#include "c_enum_field.h"
+#include "c_field.h"
+#include "c_helpers.h"
+#include "c_message_field.h"
+#include "c_primitive_field.h"
+#include "c_string_field.h"
 
 namespace google {
 namespace protobuf {

protoc-gen-c/c_field.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -64,16 +65,12 @@
 #define GOOGLE_PROTOBUF_COMPILER_C_FIELD_H__
 
 #include <memory>
-#include <google/protobuf/stubs/common.h>
+
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/io/printer.h>
+#include <google/protobuf/stubs/common.h>
 
 namespace google {
-namespace protobuf {
-  namespace io {
-    class Printer;             // printer.h
-  }
-}
-
 namespace protobuf {
 namespace compiler {
 namespace c {

protoc-gen-c/c_file.cc

@@ -32,7 +32,7 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2014, Dave Benson and the protobuf-c authors.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
@@ -61,17 +61,18 @@
 
 // Modified to implement C code by Dave Benson.
 
-#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 <protobuf-c/protobuf-c.pb.h>
 
+#include <protobuf-c/protobuf-c.pb.h>
 #include "protobuf-c.h"
 
+#include "c_enum.h"
+#include "c_extension.h"
+#include "c_file.h"
+#include "c_helpers.h"
+#include "c_message.h"
+#include "c_service.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_file.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -66,17 +67,14 @@
 #include <memory>
 #include <string>
 #include <vector>
+
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/io/printer.h>
 #include <google/protobuf/stubs/common.h>
-#include <protoc-c/c_field.h>
 
-namespace google {
-namespace protobuf {
-  class FileDescriptor;        // descriptor.h
-  namespace io {
-    class Printer;             // printer.h
-  }
-}
+#include "c_field.h"
 
+namespace google {
 namespace protobuf {
 namespace compiler {
 namespace c {

protoc-gen-c/c_generator.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,17 +61,17 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <protoc-c/c_generator.h>
-
 #include <memory>
-#include <vector>
 #include <utility>
+#include <vector>
 
-#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 <protobuf-c/protobuf-c.pb.h>
+#include "c_file.h"
+#include "c_generator.h"
+#include "c_helpers.h"
 
 namespace google {
 namespace protobuf {

protoc-gen-c/c_generator.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -66,6 +67,7 @@
 #define GOOGLE_PROTOBUF_COMPILER_C_GENERATOR_H__
 
 #include <string>
+
 #include <google/protobuf/compiler/code_generator.h>
 
 #if defined(_WIN32) && defined(PROTOBUF_C_USE_SHARED_LIB)

protoc-gen-c/c_helpers.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -61,14 +62,16 @@
 // Modified to implement C code by Dave Benson.
 
 #include <memory>
-#include <vector>
 #include <set>
-#include <stdio.h>		// for snprintf
+#include <vector>
+
 #include <float.h>
+#include <stdio.h>		// for snprintf
 
-#include <protoc-c/c_helpers.h>
 #include <google/protobuf/stubs/common.h>
 
+#include "c_helpers.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_helpers.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -66,10 +67,12 @@
 #include <string>
 #include <vector>
 #include <sstream>
+
 #include <google/protobuf/descriptor.h>
-#include <protobuf-c/protobuf-c.pb.h>
 #include <google/protobuf/io/printer.h>
 
+#include <protobuf-c/protobuf-c.pb.h>
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_message.cc

@@ -63,19 +63,21 @@
 
 #include <algorithm>
 #include <map>
-#include <memory>
 #include <string_view>
 #include <tuple>
 #include <vector>
-#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/io/printer.h>
 #include <google/protobuf/wire_format.h>
+
 #include <protobuf-c/protobuf-c.pb.h>
 
+#include "c_enum.h"
+#include "c_extension.h"
+#include "c_helpers.h"
+#include "c_message.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_message.h

@@ -66,23 +66,19 @@
 
 #include <memory>
 #include <string>
+
+#include <google/protobuf/io/printer.h>
 #include <google/protobuf/stubs/common.h>
-#include <protoc-c/c_field.h>
 
-namespace google {
-namespace protobuf {
-  namespace io {
-    class Printer;             // printer.h
-  }
-}
+#include "c_enum.h"
+#include "c_extension.h"
+#include "c_field.h"
 
+namespace google {
 namespace protobuf {
 namespace compiler {
 namespace c {
 
-class EnumGenerator;           // enum.h
-class ExtensionGenerator;      // extension.h
-
 class MessageGenerator {
  public:
   // See generator.cc for the meaning of dllexport_decl.

protoc-gen-c/c_message_field.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,11 +61,12 @@
 
 // Modified to implement C code by Dave Benson.
 
-#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>
 
+#include "c_helpers.h"
+#include "c_message_field.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_message_field.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -65,7 +66,8 @@
 
 #include <map>
 #include <string>
-#include <protoc-c/c_field.h>
+
+#include "c_field.h"
 
 namespace google {
 namespace protobuf {

protoc-gen-c/c_primitive_field.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,11 +61,12 @@
 
 // Modified to implement C code by Dave Benson.
 
-#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>
 
+#include "c_helpers.h"
+#include "c_primitive_field.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_primitive_field.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -65,7 +66,8 @@
 
 #include <map>
 #include <string>
-#include <protoc-c/c_field.h>
+
+#include "c_field.h"
 
 namespace google {
 namespace protobuf {

protoc-gen-c/c_service.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,10 +61,11 @@
 
 // Modified to implement C code by Dave Benson.
 
-#include <protoc-c/c_service.h>
-#include <protoc-c/c_helpers.h>
 #include <google/protobuf/io/printer.h>
 
+#include "c_helpers.h"
+#include "c_service.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_service.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -65,15 +66,11 @@
 
 #include <map>
 #include <string>
+
 #include <google/protobuf/descriptor.h>
+#include <google/protobuf/io/printer.h>
 
 namespace google {
-namespace protobuf {
-  namespace io {
-    class Printer;             // printer.h
-  }
-}
-
 namespace protobuf {
 namespace compiler {
 namespace c {

protoc-gen-c/c_string_field.cc

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -60,12 +61,14 @@
 
 // Modified to implement C code by Dave Benson.
 
-#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 <protobuf-c/protobuf-c.pb.h>
 
+#include "c_helpers.h"
+#include "c_string_field.h"
+
 namespace google {
 namespace protobuf {
 namespace compiler {

protoc-gen-c/c_string_field.h

@@ -32,7 +32,8 @@
 //  Based on original Protocol Buffers design by
 //  Sanjay Ghemawat, Jeff Dean, and others.
 
-// Copyright (c) 2008-2013, Dave Benson.  All rights reserved.
+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
@@ -65,7 +66,8 @@
 
 #include <map>
 #include <string>
-#include <protoc-c/c_field.h>
+
+#include "c_field.h"
 
 namespace google {
 namespace protobuf {

protoc-gen-c/main.cc

+// Copyright (c) 2008-2025, Dave Benson and the protobuf-c authors.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 #include <string>
 
-#include <google/protobuf/compiler/plugin.h>
 #include <google/protobuf/compiler/command_line_interface.h>
-#include <protoc-c/c_generator.h>
+#include <google/protobuf/compiler/plugin.h>
+
+#include "c_generator.h"
 
 int main(int argc, char* argv[]) {
   google::protobuf::compiler::c::CGenerator c_generator;