diff --git a/.clang-format b/.clang-format
index cd8ae82c6..0148b907d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -19,6 +19,7 @@ IncludeBlocks: Preserve
 # as "attributes" so they don't get increasingly indented line after line
 BreakBeforeBraces: Allman
 InsertBraces: true
+IndentExternBlock: NoIndent
 WhitespaceSensitiveMacros: ['__contract__', '__loop__' ]
 Macros:
  # Make this artifically long to avoid function bodies after short contracts
diff --git a/mldsa/mldsa_native.h b/mldsa/mldsa_native.h
index ae7ab25b4..fd150a9df 100644
--- a/mldsa/mldsa_native.h
+++ b/mldsa/mldsa_native.h
@@ -199,6 +199,12 @@
 #include <stddef.h>
 #include <stdint.h>
 
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
 /*************************************************
  * Name:        crypto_sign_keypair_internal
  *
@@ -845,6 +851,10 @@ int MLD_API_NAMESPACE(pk_from_sk)(
 #endif
 );
 
+#ifdef __cplusplus
+}
+#endif
+
 /****************************** SUPERCOP API *********************************/
 
 #if !defined(MLD_CONFIG_API_NO_SUPERCOP)