diff --git a/pb.h b/pb.h
index a1d7057..2eee7dc 100644
--- a/pb.h
+++ b/pb.h
@@ -902,10 +902,13 @@
 #define PB_INLINE_CONSTEXPR PB_CONSTEXPR
 #endif  // __cplusplus >= 201703L
 
+extern "C++"
+{
 namespace nanopb {
 // Each type will be partially specialized by the generator.
 template <typename GenMessageT> struct MessageDescriptor;
 }  // namespace nanopb
+}
 #endif  /* __cplusplus */
 
 #endif