diff --git a/include/openssl/x509v3.h b/include/openssl/x509v3.h
index 67063bc..c39cf1b 100644
--- a/include/openssl/x509v3.h
+++ b/include/openssl/x509v3.h
@@ -732,7 +732,20 @@
 
 #ifdef  __cplusplus
 }
+
+extern "C++" {
+
+namespace bssl {
+
+BORINGSSL_MAKE_STACK_DELETER(GENERAL_NAME, GENERAL_NAME_free)
+
+BORINGSSL_MAKE_DELETER(GENERAL_NAME, GENERAL_NAME_free)
+
+}  // namespace bssl
+
+}  /* extern C++ */
 #endif
+
 #define X509V3_R_BAD_IP_ADDRESS 100
 #define X509V3_R_BAD_OBJECT 101
 #define X509V3_R_BN_DEC2BN_ERROR 102