diff --git a/cpp/src/ffi_go/ir/decoder.h b/cpp/src/ffi_go/ir/decoder.h
index 52a58d3..32e5b51 100644
--- a/cpp/src/ffi_go/ir/decoder.h
+++ b/cpp/src/ffi_go/ir/decoder.h
@@ -5,15 +5,15 @@
 // NOLINTBEGIN(modernize-use-trailing-return-type)
 // NOLINTBEGIN(modernize-use-using)
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <ffi_go/defs.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
     /**
      * Create a ir::Decoder used as the underlying data storage for a Go ir.Decoder.
      * @return New ir::Decoder's address
diff --git a/cpp/src/ffi_go/ir/deserializer.h b/cpp/src/ffi_go/ir/deserializer.h
index 967d4da..3298544 100644
--- a/cpp/src/ffi_go/ir/deserializer.h
+++ b/cpp/src/ffi_go/ir/deserializer.h
@@ -4,16 +4,16 @@
 // NOLINTBEGIN(modernize-deprecated-headers)
 // NOLINTBEGIN(modernize-use-trailing-return-type)
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <ffi_go/defs.h>
 #include <ffi_go/search/wildcard_query.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
     /**
      * Clean up the underlying ir::Deserializer of a Go ir.Deserializer.
      * @param[in] ir_deserializer The address of a ir::Deserializer created and
diff --git a/cpp/src/ffi_go/ir/encoder.h b/cpp/src/ffi_go/ir/encoder.h
index c011c11..1737ada 100644
--- a/cpp/src/ffi_go/ir/encoder.h
+++ b/cpp/src/ffi_go/ir/encoder.h
@@ -5,15 +5,15 @@
 // NOLINTBEGIN(modernize-use-trailing-return-type)
 // NOLINTBEGIN(modernize-use-using)
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <ffi_go/defs.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
     /**
      * Create a ir::Encoder used as the underlying data storage for a Go ir.Encoder.
      * @return New ir::Encoder's address
diff --git a/cpp/src/ffi_go/ir/serializer.h b/cpp/src/ffi_go/ir/serializer.h
index 576cbe1..5e8aa46 100644
--- a/cpp/src/ffi_go/ir/serializer.h
+++ b/cpp/src/ffi_go/ir/serializer.h
@@ -9,6 +9,10 @@
 
 #include <ffi_go/defs.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Clean up the underlying ir::Serializer of a Go ir.Serializer.
  * @param[in] ir_serializer Address of a ir::Serializer created and returned by
@@ -104,6 +108,10 @@ int ir_serializer_serialize_four_byte_log_event(
         ByteSpan* ir_view
 );
 
+#ifdef __cplusplus
+}
+#endif
+
 // NOLINTEND(modernize-use-trailing-return-type)
 // NOLINTEND(modernize-deprecated-headers)
 #endif  // FFI_GO_IR_SERIALIZER_H
diff --git a/cpp/src/ffi_go/search/wildcard_query.h b/cpp/src/ffi_go/search/wildcard_query.h
index 36c1aac..3aea7bf 100644
--- a/cpp/src/ffi_go/search/wildcard_query.h
+++ b/cpp/src/ffi_go/search/wildcard_query.h
@@ -5,14 +5,14 @@
 // NOLINTBEGIN(modernize-use-trailing-return-type)
 // NOLINTBEGIN(modernize-use-using)
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdbool.h>
 
 #include <ffi_go/defs.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
     /**
      * A timestamp interval of [m_lower, m_upper).
      */