From: Alberto Leiva Popper <ydahhrk@gmail.com>
Date: Sun, 21 Apr 2024 19:13:40 +0000 (-0600)
Subject: ASN.1: Remove C++ glue
X-Git-Tag: 1.6.2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=74d7312902e1427534e19b9f170f91b4f670fc47;p=thirdparty%2FFORT-validator.git

ASN.1: Remove C++ glue

I might regret this one day.
---

diff --git a/src/asn1/asn1c/ANY.h b/src/asn1/asn1c/ANY.h
index 0a452179..399f70b1 100644
--- a/src/asn1/asn1c/ANY.h
+++ b/src/asn1/asn1c/ANY.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/OCTET_STRING.h"	/* Implemented via OCTET STRING type */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct ANY {
 	uint8_t *buf;	/* BER-encoded ANY contents */
 	int size;	/* Size of the above buffer */
@@ -50,8 +46,4 @@ int ANY_to_type(ANY_t *, asn_TYPE_descriptor_t *td, void **struct_ptr);
 #define	ANY_new_fromBuf(buf, size)	OCTET_STRING_new_fromBuf(	\
 						&asn_DEF_ANY, (buf), (size))
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* ASN_TYPE_ANY_H */
diff --git a/src/asn1/asn1c/ASId.h b/src/asn1/asn1c/ASId.h
index 7f0c95e8..eb03c848 100644
--- a/src/asn1/asn1c/ASId.h
+++ b/src/asn1/asn1c/ASId.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ASId */
 typedef INTEGER_t	 ASId_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f ASId_decode_ber;
 der_type_encoder_f ASId_encode_der;
 xer_type_encoder_f ASId_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _ASId_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/ASIdOrRange.h b/src/asn1/asn1c/ASIdOrRange.h
index 1c0b9282..87f3dee3 100644
--- a/src/asn1/asn1c/ASIdOrRange.h
+++ b/src/asn1/asn1c/ASIdOrRange.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ASRange.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum ASIdOrRange_PR {
 	ASIdOrRange_PR_NOTHING,	/* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_ASIdOrRange;
 extern asn_CHOICE_specifics_t asn_SPC_ASIdOrRange_specs_1;
 extern asn_TYPE_member_t asn_MBR_ASIdOrRange_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _ASIdOrRange_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/ASIdentifierChoice.h b/src/asn1/asn1c/ASIdentifierChoice.h
index ec58c818..1f5d7875 100644
--- a/src/asn1/asn1c/ASIdentifierChoice.h
+++ b/src/asn1/asn1c/ASIdentifierChoice.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum ASIdentifierChoice_PR {
 	ASIdentifierChoice_PR_NOTHING,	/* No components present */
@@ -53,10 +49,6 @@ extern asn_TYPE_descriptor_t asn_DEF_ASIdentifierChoice;
 extern asn_CHOICE_specifics_t asn_SPC_ASIdentifierChoice_specs_1;
 extern asn_TYPE_member_t asn_MBR_ASIdentifierChoice_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/ASIdOrRange.h"
 
diff --git a/src/asn1/asn1c/ASIdentifiers.h b/src/asn1/asn1c/ASIdentifiers.h
index 3e66ab12..bf64f35c 100644
--- a/src/asn1/asn1c/ASIdentifiers.h
+++ b/src/asn1/asn1c/ASIdentifiers.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct ASIdentifierChoice;
 
@@ -33,10 +29,6 @@ typedef struct ASIdentifiers {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_ASIdentifiers;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/ASIdentifierChoice.h"
 
diff --git a/src/asn1/asn1c/ASRange.h b/src/asn1/asn1c/ASRange.h
index 0e6acfed..ac25726f 100644
--- a/src/asn1/asn1c/ASRange.h
+++ b/src/asn1/asn1c/ASRange.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/ASId.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ASRange */
 typedef struct ASRange {
 	ASId_t	 min;
@@ -33,9 +29,5 @@ extern asn_TYPE_descriptor_t asn_DEF_ASRange;
 extern asn_SEQUENCE_specifics_t asn_SPC_ASRange_specs_1;
 extern asn_TYPE_member_t asn_MBR_ASRange_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _ASRange_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/AlgorithmIdentifier.h b/src/asn1/asn1c/AlgorithmIdentifier.h
index 731276ad..bc40e960 100644
--- a/src/asn1/asn1c/AlgorithmIdentifier.h
+++ b/src/asn1/asn1c/AlgorithmIdentifier.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* AlgorithmIdentifier */
 typedef struct AlgorithmIdentifier {
 	OBJECT_IDENTIFIER_t	 algorithm;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_AlgorithmIdentifier;
 extern asn_SEQUENCE_specifics_t asn_SPC_AlgorithmIdentifier_specs_1;
 extern asn_TYPE_member_t asn_MBR_AlgorithmIdentifier_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _AlgorithmIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/AttributeType.h b/src/asn1/asn1c/AttributeType.h
index c80a2625..8552996e 100644
--- a/src/asn1/asn1c/AttributeType.h
+++ b/src/asn1/asn1c/AttributeType.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* AttributeType */
 typedef OBJECT_IDENTIFIER_t	 AttributeType_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f AttributeType_decode_ber;
 der_type_encoder_f AttributeType_encode_der;
 xer_type_encoder_f AttributeType_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _AttributeType_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/AttributeTypeAndValue.h b/src/asn1/asn1c/AttributeTypeAndValue.h
index 7096e46d..8c21acca 100644
--- a/src/asn1/asn1c/AttributeTypeAndValue.h
+++ b/src/asn1/asn1c/AttributeTypeAndValue.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/AttributeValue.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* AttributeTypeAndValue */
 typedef struct AttributeTypeAndValue {
 	AttributeType_t	 type;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_AttributeTypeAndValue;
 extern asn_SEQUENCE_specifics_t asn_SPC_AttributeTypeAndValue_specs_1;
 extern asn_TYPE_member_t asn_MBR_AttributeTypeAndValue_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _AttributeTypeAndValue_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/AttributeValue.h b/src/asn1/asn1c/AttributeValue.h
index 74c514b1..d9462dc8 100644
--- a/src/asn1/asn1c/AttributeValue.h
+++ b/src/asn1/asn1c/AttributeValue.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/ANY.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* AttributeValue */
 typedef ANY_t	 AttributeValue_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f AttributeValue_decode_ber;
 der_type_encoder_f AttributeValue_encode_der;
 xer_type_encoder_f AttributeValue_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _AttributeValue_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/BIT_STRING.h b/src/asn1/asn1c/BIT_STRING.h
index aac8d0cf..acac92a8 100644
--- a/src/asn1/asn1c/BIT_STRING.h
+++ b/src/asn1/asn1c/BIT_STRING.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/OCTET_STRING.h"	/* Some help from OCTET STRING */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct BIT_STRING_s {
 	uint8_t *buf;	/* BIT STRING body */
 	size_t size;	/* Size of the above buffer */
@@ -34,8 +30,4 @@ asn_random_fill_f  BIT_STRING_random_fill;
 #define BIT_STRING_decode_ber        OCTET_STRING_decode_ber
 #define BIT_STRING_encode_der        OCTET_STRING_encode_der
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _BIT_STRING_H_ */
diff --git a/src/asn1/asn1c/BOOLEAN.h b/src/asn1/asn1c/BOOLEAN.h
index 1b110b98..bb9e8a85 100644
--- a/src/asn1/asn1c/BOOLEAN.h
+++ b/src/asn1/asn1c/BOOLEAN.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * The underlying integer may contain various values, but everything
  * non-zero is capped to 0xff by the DER encoder. The BER decoder may
@@ -31,8 +27,4 @@ asn_random_fill_f  BOOLEAN_random_fill;
 
 #define BOOLEAN_constraint     asn_generic_no_constraint
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _BOOLEAN_H_ */
diff --git a/src/asn1/asn1c/BinarySigningTime.h b/src/asn1/asn1c/BinarySigningTime.h
index 7849b97d..80507c1f 100644
--- a/src/asn1/asn1c/BinarySigningTime.h
+++ b/src/asn1/asn1c/BinarySigningTime.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/BinaryTime.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* BinarySigningTime */
 typedef BinaryTime_t	 BinarySigningTime_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f BinarySigningTime_decode_ber;
 der_type_encoder_f BinarySigningTime_encode_der;
 xer_type_encoder_f BinarySigningTime_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _BinarySigningTime_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/BinaryTime.h b/src/asn1/asn1c/BinaryTime.h
index 3d264b13..727d03b8 100644
--- a/src/asn1/asn1c/BinaryTime.h
+++ b/src/asn1/asn1c/BinaryTime.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* BinaryTime */
 typedef INTEGER_t	 BinaryTime_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f BinaryTime_decode_ber;
 der_type_encoder_f BinaryTime_encode_der;
 xer_type_encoder_f BinaryTime_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _BinaryTime_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/CMSAttribute.h b/src/asn1/asn1c/CMSAttribute.h
index 43784a51..ad7552bb 100644
--- a/src/asn1/asn1c/CMSAttribute.h
+++ b/src/asn1/asn1c/CMSAttribute.h
@@ -18,10 +18,6 @@
 #include "asn1/asn1c/constr_SET_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CMSAttribute */
 typedef struct CMSAttribute {
 	OBJECT_IDENTIFIER_t	 attrType;
@@ -41,9 +37,5 @@ extern asn_TYPE_descriptor_t asn_DEF_CMSAttribute;
 extern asn_SEQUENCE_specifics_t asn_SPC_CMSAttribute_specs_1;
 extern asn_TYPE_member_t asn_MBR_CMSAttribute_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CMSAttribute_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/CMSAttributeValue.h b/src/asn1/asn1c/CMSAttributeValue.h
index fc68549a..8a445f74 100644
--- a/src/asn1/asn1c/CMSAttributeValue.h
+++ b/src/asn1/asn1c/CMSAttributeValue.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/ANY.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CMSAttributeValue */
 typedef ANY_t	 CMSAttributeValue_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f CMSAttributeValue_decode_ber;
 der_type_encoder_f CMSAttributeValue_encode_der;
 xer_type_encoder_f CMSAttributeValue_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CMSAttributeValue_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/CMSSubjectKeyIdentifier.h b/src/asn1/asn1c/CMSSubjectKeyIdentifier.h
index 8e149ff9..7fe5da2a 100644
--- a/src/asn1/asn1c/CMSSubjectKeyIdentifier.h
+++ b/src/asn1/asn1c/CMSSubjectKeyIdentifier.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CMSSubjectKeyIdentifier */
 typedef OCTET_STRING_t	 CMSSubjectKeyIdentifier_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f CMSSubjectKeyIdentifier_decode_ber;
 der_type_encoder_f CMSSubjectKeyIdentifier_encode_der;
 xer_type_encoder_f CMSSubjectKeyIdentifier_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CMSSubjectKeyIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/CMSVersion.h b/src/asn1/asn1c/CMSVersion.h
index 2e8044c0..05235e7f 100644
--- a/src/asn1/asn1c/CMSVersion.h
+++ b/src/asn1/asn1c/CMSVersion.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum CMSVersion {
 	CMSVersion_v0	= 0,
@@ -40,9 +36,5 @@ ber_type_decoder_f CMSVersion_decode_ber;
 der_type_encoder_f CMSVersion_encode_der;
 xer_type_encoder_f CMSVersion_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CMSVersion_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/CertificateList.h b/src/asn1/asn1c/CertificateList.h
index 4e600084..4f2ddfbd 100644
--- a/src/asn1/asn1c/CertificateList.h
+++ b/src/asn1/asn1c/CertificateList.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/BIT_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CertificateList */
 typedef struct CertificateList {
 	TBSCertList_t	 tbsCertList;
@@ -36,9 +32,5 @@ extern asn_TYPE_descriptor_t asn_DEF_CertificateList;
 extern asn_SEQUENCE_specifics_t asn_SPC_CertificateList_specs_1;
 extern asn_TYPE_member_t asn_MBR_CertificateList_1[3];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CertificateList_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/CertificateSerialNumber.h b/src/asn1/asn1c/CertificateSerialNumber.h
index 3593122f..6851cd01 100644
--- a/src/asn1/asn1c/CertificateSerialNumber.h
+++ b/src/asn1/asn1c/CertificateSerialNumber.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CertificateSerialNumber */
 typedef INTEGER_t	 CertificateSerialNumber_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f CertificateSerialNumber_decode_ber;
 der_type_encoder_f CertificateSerialNumber_encode_der;
 xer_type_encoder_f CertificateSerialNumber_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CertificateSerialNumber_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/CertificateSet.h b/src/asn1/asn1c/CertificateSet.h
index eb1f3689..f5e96d87 100644
--- a/src/asn1/asn1c/CertificateSet.h
+++ b/src/asn1/asn1c/CertificateSet.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* CertificateSet */
 typedef struct CertificateSet {
 	A_SET_OF(ANY_t) list;
@@ -33,9 +29,5 @@ extern asn_TYPE_descriptor_t asn_DEF_CertificateSet;
 extern asn_SET_OF_specifics_t asn_SPC_CertificateSet_specs_1;
 extern asn_TYPE_member_t asn_MBR_CertificateSet_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CertificateSet_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/ContentInfo.h b/src/asn1/asn1c/ContentInfo.h
index 655ff034..838525ba 100644
--- a/src/asn1/asn1c/ContentInfo.h
+++ b/src/asn1/asn1c/ContentInfo.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ContentInfo */
 typedef struct ContentInfo {
 	ContentType_t	 contentType;
@@ -32,9 +28,5 @@ typedef struct ContentInfo {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_ContentInfo;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _ContentInfo_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/ContentType.h b/src/asn1/asn1c/ContentType.h
index f3a4f9c4..a03f9a98 100644
--- a/src/asn1/asn1c/ContentType.h
+++ b/src/asn1/asn1c/ContentType.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ContentType */
 typedef OBJECT_IDENTIFIER_t	 ContentType_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f ContentType_decode_ber;
 der_type_encoder_f ContentType_encode_der;
 xer_type_encoder_f ContentType_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _ContentType_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/ContentTypePKCS7.h b/src/asn1/asn1c/ContentTypePKCS7.h
index 2f19d3c4..f09c3d19 100644
--- a/src/asn1/asn1c/ContentTypePKCS7.h
+++ b/src/asn1/asn1c/ContentTypePKCS7.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ContentTypePKCS7 */
 typedef OCTET_STRING_t	 ContentTypePKCS7_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f ContentTypePKCS7_decode_ber;
 der_type_encoder_f ContentTypePKCS7_encode_der;
 xer_type_encoder_f ContentTypePKCS7_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _ContentTypePKCS7_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/Countersignature.h b/src/asn1/asn1c/Countersignature.h
index 68a81392..cb6cca45 100644
--- a/src/asn1/asn1c/Countersignature.h
+++ b/src/asn1/asn1c/Countersignature.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/SignerInfo.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Countersignature */
 typedef SignerInfo_t	 Countersignature_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f Countersignature_decode_ber;
 der_type_encoder_f Countersignature_encode_der;
 xer_type_encoder_f Countersignature_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _Countersignature_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifier.h b/src/asn1/asn1c/DigestAlgorithmIdentifier.h
index 1e6357fc..3e0f636d 100644
--- a/src/asn1/asn1c/DigestAlgorithmIdentifier.h
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifier.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/AlgorithmIdentifier.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* DigestAlgorithmIdentifier */
 typedef AlgorithmIdentifier_t	 DigestAlgorithmIdentifier_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f DigestAlgorithmIdentifier_decode_ber;
 der_type_encoder_f DigestAlgorithmIdentifier_encode_der;
 xer_type_encoder_f DigestAlgorithmIdentifier_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _DigestAlgorithmIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
index b853005d..86bde701 100644
--- a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct DigestAlgorithmIdentifier;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_DigestAlgorithmIdentifiers;
 extern asn_SET_OF_specifics_t asn_SPC_DigestAlgorithmIdentifiers_specs_1;
 extern asn_TYPE_member_t asn_MBR_DigestAlgorithmIdentifiers_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/DigestAlgorithmIdentifier.h"
 
diff --git a/src/asn1/asn1c/DistinguishedName.h b/src/asn1/asn1c/DistinguishedName.h
index df1384e5..602accb1 100644
--- a/src/asn1/asn1c/DistinguishedName.h
+++ b/src/asn1/asn1c/DistinguishedName.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/RDNSequence.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* DistinguishedName */
 typedef RDNSequence_t	 DistinguishedName_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f DistinguishedName_decode_ber;
 der_type_encoder_f DistinguishedName_encode_der;
 xer_type_encoder_f DistinguishedName_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _DistinguishedName_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/EncapsulatedContentInfo.h b/src/asn1/asn1c/EncapsulatedContentInfo.h
index 3f9d91d4..9faa6da6 100644
--- a/src/asn1/asn1c/EncapsulatedContentInfo.h
+++ b/src/asn1/asn1c/EncapsulatedContentInfo.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* EncapsulatedContentInfo */
 typedef struct EncapsulatedContentInfo {
 	ContentType_t	 eContentType;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_EncapsulatedContentInfo;
 extern asn_SEQUENCE_specifics_t asn_SPC_EncapsulatedContentInfo_specs_1;
 extern asn_TYPE_member_t asn_MBR_EncapsulatedContentInfo_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _EncapsulatedContentInfo_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
index 9b3dd1bb..fc28c4fd 100644
--- a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
+++ b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* EncapsulatedContentInfoPKCS7 */
 typedef struct EncapsulatedContentInfoPKCS7 {
 	ContentType_t	 eContentType;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_EncapsulatedContentInfoPKCS7;
 extern asn_SEQUENCE_specifics_t asn_SPC_EncapsulatedContentInfoPKCS7_specs_1;
 extern asn_TYPE_member_t asn_MBR_EncapsulatedContentInfoPKCS7_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _EncapsulatedContentInfoPKCS7_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/Extension.h b/src/asn1/asn1c/Extension.h
index 8ef6e5b5..6b0749a0 100644
--- a/src/asn1/asn1c/Extension.h
+++ b/src/asn1/asn1c/Extension.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Extension */
 typedef struct Extension {
 	OBJECT_IDENTIFIER_t	 extnID;
@@ -36,9 +32,5 @@ extern asn_TYPE_descriptor_t asn_DEF_Extension;
 extern asn_SEQUENCE_specifics_t asn_SPC_Extension_specs_1;
 extern asn_TYPE_member_t asn_MBR_Extension_1[3];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _Extension_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/Extensions.h b/src/asn1/asn1c/Extensions.h
index dc296149..10ff3374 100644
--- a/src/asn1/asn1c/Extensions.h
+++ b/src/asn1/asn1c/Extensions.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct Extension;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_Extensions;
 extern asn_SET_OF_specifics_t asn_SPC_Extensions_specs_1;
 extern asn_TYPE_member_t asn_MBR_Extensions_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/Extension.h"
 
diff --git a/src/asn1/asn1c/FileAndHash.h b/src/asn1/asn1c/FileAndHash.h
index 48752bc6..d61d2a3a 100644
--- a/src/asn1/asn1c/FileAndHash.h
+++ b/src/asn1/asn1c/FileAndHash.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/BIT_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* FileAndHash */
 typedef struct FileAndHash {
 	IA5String_t	 file;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_FileAndHash;
 extern asn_SEQUENCE_specifics_t asn_SPC_FileAndHash_specs_1;
 extern asn_TYPE_member_t asn_MBR_FileAndHash_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _FileAndHash_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/GeneralizedTime.h b/src/asn1/asn1c/GeneralizedTime.h
index 83dd26ca..7a8ad1bb 100644
--- a/src/asn1/asn1c/GeneralizedTime.h
+++ b/src/asn1/asn1c/GeneralizedTime.h
@@ -9,10 +9,6 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef OCTET_STRING_t GeneralizedTime_t;  /* Implemented via OCTET STRING */
 
 extern asn_TYPE_descriptor_t asn_DEF_GeneralizedTime;
@@ -67,8 +63,4 @@ GeneralizedTime_t *asn_time2GT(GeneralizedTime_t *_optional_gt,
 GeneralizedTime_t *asn_time2GT_frac(GeneralizedTime_t *_optional_gt,
 	const struct tm *, int frac_value, int frac_digits);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _GeneralizedTime_H_ */
diff --git a/src/asn1/asn1c/IA5String.h b/src/asn1/asn1c/IA5String.h
index 77ac1682..2cf64727 100644
--- a/src/asn1/asn1c/IA5String.h
+++ b/src/asn1/asn1c/IA5String.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef OCTET_STRING_t IA5String_t;  /* Implemented via OCTET STRING */
 
 /*
@@ -28,8 +24,4 @@ asn_constr_check_f IA5String_constraint;
 #define IA5String_encode_der    OCTET_STRING_encode_der
 #define IA5String_encode_xer    OCTET_STRING_encode_xer_utf8
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _IA5String_H_ */
diff --git a/src/asn1/asn1c/INTEGER.h b/src/asn1/asn1c/INTEGER.h
index 952fd082..9367d05f 100644
--- a/src/asn1/asn1c/INTEGER.h
+++ b/src/asn1/asn1c/INTEGER.h
@@ -8,10 +8,6 @@
 #include "asn1/asn1c/asn_application.h"
 #include "asn1/asn1c/asn_codecs_prim.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef ASN__PRIMITIVE_TYPE_t INTEGER_t;
 
 extern asn_TYPE_descriptor_t asn_DEF_INTEGER;
@@ -92,8 +88,4 @@ enum asn_strtox_result_e asn_strtoumax_lim(const char *str, const char **end,
 const asn_INTEGER_enum_map_t *INTEGER_map_value2enum(
     const asn_INTEGER_specifics_t *specs, long value);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _INTEGER_H_ */
diff --git a/src/asn1/asn1c/IPAddrBlocks.h b/src/asn1/asn1c/IPAddrBlocks.h
index 162be7a8..3d55e79b 100644
--- a/src/asn1/asn1c/IPAddrBlocks.h
+++ b/src/asn1/asn1c/IPAddrBlocks.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct IPAddressFamily;
 
@@ -33,10 +29,6 @@ typedef struct IPAddrBlocks {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_IPAddrBlocks;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/IPAddressFamily.h"
 
diff --git a/src/asn1/asn1c/IPAddress.h b/src/asn1/asn1c/IPAddress.h
index ece02220..bf173143 100644
--- a/src/asn1/asn1c/IPAddress.h
+++ b/src/asn1/asn1c/IPAddress.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/BIT_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* IPAddress */
 typedef BIT_STRING_t	 IPAddress_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f IPAddress_decode_ber;
 der_type_encoder_f IPAddress_encode_der;
 xer_type_encoder_f IPAddress_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _IPAddress_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/IPAddressChoice.h b/src/asn1/asn1c/IPAddressChoice.h
index bc654835..fc275fb3 100644
--- a/src/asn1/asn1c/IPAddressChoice.h
+++ b/src/asn1/asn1c/IPAddressChoice.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum IPAddressChoice_PR {
 	IPAddressChoice_PR_NOTHING,	/* No components present */
@@ -53,10 +49,6 @@ extern asn_TYPE_descriptor_t asn_DEF_IPAddressChoice;
 extern asn_CHOICE_specifics_t asn_SPC_IPAddressChoice_specs_1;
 extern asn_TYPE_member_t asn_MBR_IPAddressChoice_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/IPAddressOrRange.h"
 
diff --git a/src/asn1/asn1c/IPAddressFamily.h b/src/asn1/asn1c/IPAddressFamily.h
index a8ed77cc..3fddc08f 100644
--- a/src/asn1/asn1c/IPAddressFamily.h
+++ b/src/asn1/asn1c/IPAddressFamily.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/IPAddressChoice.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* IPAddressFamily */
 typedef struct IPAddressFamily {
 	OCTET_STRING_t	 addressFamily;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_IPAddressFamily;
 extern asn_SEQUENCE_specifics_t asn_SPC_IPAddressFamily_specs_1;
 extern asn_TYPE_member_t asn_MBR_IPAddressFamily_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _IPAddressFamily_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/IPAddressOrRange.h b/src/asn1/asn1c/IPAddressOrRange.h
index 22974db9..b6c86ab2 100644
--- a/src/asn1/asn1c/IPAddressOrRange.h
+++ b/src/asn1/asn1c/IPAddressOrRange.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/IPAddressRange.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum IPAddressOrRange_PR {
 	IPAddressOrRange_PR_NOTHING,	/* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_IPAddressOrRange;
 extern asn_CHOICE_specifics_t asn_SPC_IPAddressOrRange_specs_1;
 extern asn_TYPE_member_t asn_MBR_IPAddressOrRange_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _IPAddressOrRange_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/IPAddressRange.h b/src/asn1/asn1c/IPAddressRange.h
index 02038e46..8be2d3ab 100644
--- a/src/asn1/asn1c/IPAddressRange.h
+++ b/src/asn1/asn1c/IPAddressRange.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/IPAddress.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* IPAddressRange */
 typedef struct IPAddressRange {
 	IPAddress_t	 min;
@@ -33,9 +29,5 @@ extern asn_TYPE_descriptor_t asn_DEF_IPAddressRange;
 extern asn_SEQUENCE_specifics_t asn_SPC_IPAddressRange_specs_1;
 extern asn_TYPE_member_t asn_MBR_IPAddressRange_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _IPAddressRange_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/IssuerAndSerialNumber.h b/src/asn1/asn1c/IssuerAndSerialNumber.h
index 432120d3..9198b824 100644
--- a/src/asn1/asn1c/IssuerAndSerialNumber.h
+++ b/src/asn1/asn1c/IssuerAndSerialNumber.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/CertificateSerialNumber.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* IssuerAndSerialNumber */
 typedef struct IssuerAndSerialNumber {
 	Name_t	 issuer;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_IssuerAndSerialNumber;
 extern asn_SEQUENCE_specifics_t asn_SPC_IssuerAndSerialNumber_specs_1;
 extern asn_TYPE_member_t asn_MBR_IssuerAndSerialNumber_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _IssuerAndSerialNumber_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/Manifest.h b/src/asn1/asn1c/Manifest.h
index 8eb2bc73..1444ba18 100644
--- a/src/asn1/asn1c/Manifest.h
+++ b/src/asn1/asn1c/Manifest.h
@@ -19,10 +19,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct FileAndHash;
 
@@ -47,10 +43,6 @@ typedef struct Manifest {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_Manifest;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/FileAndHash.h"
 
diff --git a/src/asn1/asn1c/MessageDigest.h b/src/asn1/asn1c/MessageDigest.h
index 4d5f07c5..0b786db9 100644
--- a/src/asn1/asn1c/MessageDigest.h
+++ b/src/asn1/asn1c/MessageDigest.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* MessageDigest */
 typedef OCTET_STRING_t	 MessageDigest_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f MessageDigest_decode_ber;
 der_type_encoder_f MessageDigest_encode_der;
 xer_type_encoder_f MessageDigest_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _MessageDigest_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/NULL.h b/src/asn1/asn1c/NULL.h
index 40c93b8f..f6b877aa 100644
--- a/src/asn1/asn1c/NULL.h
+++ b/src/asn1/asn1c/NULL.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * The value of the NULL type is meaningless.
  * Use the BOOLEAN type if you need to carry true/false semantics.
@@ -30,8 +26,4 @@ asn_random_fill_f  NULL_random_fill;
 
 #define NULL_constraint	asn_generic_no_constraint
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* NULL_H */
diff --git a/src/asn1/asn1c/Name.h b/src/asn1/asn1c/Name.h
index c6a1b25b..a543aca5 100644
--- a/src/asn1/asn1c/Name.h
+++ b/src/asn1/asn1c/Name.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/RDNSequence.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum Name_PR {
 	Name_PR_NOTHING,	/* No components present */
@@ -41,9 +37,5 @@ extern asn_TYPE_descriptor_t asn_DEF_Name;
 extern asn_CHOICE_specifics_t asn_SPC_Name_specs_1;
 extern asn_TYPE_member_t asn_MBR_Name_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _Name_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/OBJECT_IDENTIFIER.h b/src/asn1/asn1c/OBJECT_IDENTIFIER.h
index 155283ae..c210cb5b 100644
--- a/src/asn1/asn1c/OBJECT_IDENTIFIER.h
+++ b/src/asn1/asn1c/OBJECT_IDENTIFIER.h
@@ -9,10 +9,6 @@
 #include "asn1/asn1c/asn_codecs_prim.h"
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef uint32_t asn_oid_arc_t;
 #define ASN_OID_ARC_MAX (~((asn_oid_arc_t)0))
 
@@ -142,8 +138,4 @@ ssize_t OBJECT_IDENTIFIER_get_single_arc(const uint8_t *arcbuf,
 ssize_t OBJECT_IDENTIFIER_set_single_arc(uint8_t *arcbuf, size_t arcbuf_len,
                                          asn_oid_arc_t arc_value);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _OBJECT_IDENTIFIER_H_ */
diff --git a/src/asn1/asn1c/OCTET_STRING.h b/src/asn1/asn1c/OCTET_STRING.h
index 2d1a7181..d12b5a61 100644
--- a/src/asn1/asn1c/OCTET_STRING.h
+++ b/src/asn1/asn1c/OCTET_STRING.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Note: Though this sometimes represents an actual string, I don't see any
  * guarantees of a NULL character.
@@ -93,8 +89,4 @@ size_t OCTET_STRING_random_length_constrained(
     const asn_TYPE_descriptor_t *, const asn_encoding_constraints_t *,
     size_t max_length);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _OCTET_STRING_H_ */
diff --git a/src/asn1/asn1c/OPEN_TYPE.h b/src/asn1/asn1c/OPEN_TYPE.h
index 721bc786..5913ab1b 100644
--- a/src/asn1/asn1c/OPEN_TYPE.h
+++ b/src/asn1/asn1c/OPEN_TYPE.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define OPEN_TYPE_free CHOICE_free
 #define OPEN_TYPE_print CHOICE_print
 #define OPEN_TYPE_compare CHOICE_compare
@@ -31,8 +27,4 @@ asn_dec_rval_t OPEN_TYPE_ber_get(const asn_codec_ctx_t *opt_codec_ctx,
                                  const asn_TYPE_member_t *element,
                                  const void *ptr, size_t size);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* ASN_OPEN_TYPE_H */
diff --git a/src/asn1/asn1c/OtherRevocationInfoFormat.h b/src/asn1/asn1c/OtherRevocationInfoFormat.h
index 4fc1ec2e..f5db354a 100644
--- a/src/asn1/asn1c/OtherRevocationInfoFormat.h
+++ b/src/asn1/asn1c/OtherRevocationInfoFormat.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* OtherRevocationInfoFormat */
 typedef struct OtherRevocationInfoFormat {
 	OBJECT_IDENTIFIER_t	 otherRevInfoFormat;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_OtherRevocationInfoFormat;
 extern asn_SEQUENCE_specifics_t asn_SPC_OtherRevocationInfoFormat_specs_1;
 extern asn_TYPE_member_t asn_MBR_OtherRevocationInfoFormat_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _OtherRevocationInfoFormat_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/RDNSequence.h b/src/asn1/asn1c/RDNSequence.h
index dea5d4f5..ee9cbe78 100644
--- a/src/asn1/asn1c/RDNSequence.h
+++ b/src/asn1/asn1c/RDNSequence.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct RelativeDistinguishedName;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_RDNSequence;
 extern asn_SET_OF_specifics_t asn_SPC_RDNSequence_specs_1;
 extern asn_TYPE_member_t asn_MBR_RDNSequence_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/RelativeDistinguishedName.h"
 
diff --git a/src/asn1/asn1c/ROAIPAddress.h b/src/asn1/asn1c/ROAIPAddress.h
index 49e7b86f..42d9fdc4 100644
--- a/src/asn1/asn1c/ROAIPAddress.h
+++ b/src/asn1/asn1c/ROAIPAddress.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/INTEGER.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* ROAIPAddress */
 typedef struct ROAIPAddress {
 	IPAddress_t	 address;
@@ -34,9 +30,5 @@ extern asn_TYPE_descriptor_t asn_DEF_ROAIPAddress;
 extern asn_SEQUENCE_specifics_t asn_SPC_ROAIPAddress_specs_1;
 extern asn_TYPE_member_t asn_MBR_ROAIPAddress_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _ROAIPAddress_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/ROAIPAddressFamily.h b/src/asn1/asn1c/ROAIPAddressFamily.h
index dcd570ea..fabd266e 100644
--- a/src/asn1/asn1c/ROAIPAddressFamily.h
+++ b/src/asn1/asn1c/ROAIPAddressFamily.h
@@ -17,10 +17,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct ROAIPAddress;
 
@@ -43,10 +39,6 @@ extern asn_TYPE_descriptor_t asn_DEF_ROAIPAddressFamily;
 extern asn_SEQUENCE_specifics_t asn_SPC_ROAIPAddressFamily_specs_1;
 extern asn_TYPE_member_t asn_MBR_ROAIPAddressFamily_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/ROAIPAddress.h"
 
diff --git a/src/asn1/asn1c/RelativeDistinguishedName.h b/src/asn1/asn1c/RelativeDistinguishedName.h
index 6dcec988..1ddd5661 100644
--- a/src/asn1/asn1c/RelativeDistinguishedName.h
+++ b/src/asn1/asn1c/RelativeDistinguishedName.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct AttributeTypeAndValue;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_RelativeDistinguishedName;
 extern asn_SET_OF_specifics_t asn_SPC_RelativeDistinguishedName_specs_1;
 extern asn_TYPE_member_t asn_MBR_RelativeDistinguishedName_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/AttributeTypeAndValue.h"
 
diff --git a/src/asn1/asn1c/RevocationInfoChoice.h b/src/asn1/asn1c/RevocationInfoChoice.h
index 8df702e1..26576a83 100644
--- a/src/asn1/asn1c/RevocationInfoChoice.h
+++ b/src/asn1/asn1c/RevocationInfoChoice.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/OtherRevocationInfoFormat.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum RevocationInfoChoice_PR {
 	RevocationInfoChoice_PR_NOTHING,	/* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_RevocationInfoChoice;
 extern asn_CHOICE_specifics_t asn_SPC_RevocationInfoChoice_specs_1;
 extern asn_TYPE_member_t asn_MBR_RevocationInfoChoice_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _RevocationInfoChoice_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/RevocationInfoChoices.h b/src/asn1/asn1c/RevocationInfoChoices.h
index bff280a3..342fbbff 100644
--- a/src/asn1/asn1c/RevocationInfoChoices.h
+++ b/src/asn1/asn1c/RevocationInfoChoices.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct RevocationInfoChoice;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_RevocationInfoChoices;
 extern asn_SET_OF_specifics_t asn_SPC_RevocationInfoChoices_specs_1;
 extern asn_TYPE_member_t asn_MBR_RevocationInfoChoices_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/RevocationInfoChoice.h"
 
diff --git a/src/asn1/asn1c/RouteOriginAttestation.h b/src/asn1/asn1c/RouteOriginAttestation.h
index f8dc17fb..a5a07229 100644
--- a/src/asn1/asn1c/RouteOriginAttestation.h
+++ b/src/asn1/asn1c/RouteOriginAttestation.h
@@ -18,10 +18,6 @@
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct ROAIPAddressFamily;
 
@@ -43,10 +39,6 @@ typedef struct RouteOriginAttestation {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_RouteOriginAttestation;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/ROAIPAddressFamily.h"
 
diff --git a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
index 968d9c8a..9a725150 100644
--- a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
+++ b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/AlgorithmIdentifier.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* SignatureAlgorithmIdentifier */
 typedef AlgorithmIdentifier_t	 SignatureAlgorithmIdentifier_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f SignatureAlgorithmIdentifier_decode_ber;
 der_type_encoder_f SignatureAlgorithmIdentifier_encode_der;
 xer_type_encoder_f SignatureAlgorithmIdentifier_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _SignatureAlgorithmIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/SignatureValue.h b/src/asn1/asn1c/SignatureValue.h
index ed5dd8c4..20c7b65f 100644
--- a/src/asn1/asn1c/SignatureValue.h
+++ b/src/asn1/asn1c/SignatureValue.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/OCTET_STRING.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* SignatureValue */
 typedef OCTET_STRING_t	 SignatureValue_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f SignatureValue_decode_ber;
 der_type_encoder_f SignatureValue_encode_der;
 xer_type_encoder_f SignatureValue_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _SignatureValue_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/SignedAttributes.h b/src/asn1/asn1c/SignedAttributes.h
index c32d05ee..fb97588f 100644
--- a/src/asn1/asn1c/SignedAttributes.h
+++ b/src/asn1/asn1c/SignedAttributes.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct CMSAttribute;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_SignedAttributes;
 extern asn_SET_OF_specifics_t asn_SPC_SignedAttributes_specs_1;
 extern asn_TYPE_member_t asn_MBR_SignedAttributes_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/CMSAttribute.h"
 
diff --git a/src/asn1/asn1c/SignedData.h b/src/asn1/asn1c/SignedData.h
index f527eb29..5c3e4fec 100644
--- a/src/asn1/asn1c/SignedData.h
+++ b/src/asn1/asn1c/SignedData.h
@@ -18,10 +18,6 @@
 #include "asn1/asn1c/SignerInfos.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct CertificateSet;
 struct RevocationInfoChoices;
@@ -42,10 +38,6 @@ typedef struct SignedData {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_SignedData;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/CertificateSet.h"
 #include "asn1/asn1c/RevocationInfoChoices.h"
diff --git a/src/asn1/asn1c/SignedDataPKCS7.h b/src/asn1/asn1c/SignedDataPKCS7.h
index bc80e8e2..df4f9e6f 100644
--- a/src/asn1/asn1c/SignedDataPKCS7.h
+++ b/src/asn1/asn1c/SignedDataPKCS7.h
@@ -18,10 +18,6 @@
 #include "asn1/asn1c/SignerInfos.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct CertificateSet;
 struct RevocationInfoChoices;
@@ -42,10 +38,6 @@ typedef struct SignedDataPKCS7 {
 /* Implementation */
 extern asn_TYPE_descriptor_t asn_DEF_SignedDataPKCS7;
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/CertificateSet.h"
 #include "asn1/asn1c/RevocationInfoChoices.h"
diff --git a/src/asn1/asn1c/SignerIdentifier.h b/src/asn1/asn1c/SignerIdentifier.h
index a465dc75..60edd293 100644
--- a/src/asn1/asn1c/SignerIdentifier.h
+++ b/src/asn1/asn1c/SignerIdentifier.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/CMSSubjectKeyIdentifier.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum SignerIdentifier_PR {
 	SignerIdentifier_PR_NOTHING,	/* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_SignerIdentifier;
 extern asn_CHOICE_specifics_t asn_SPC_SignerIdentifier_specs_1;
 extern asn_TYPE_member_t asn_MBR_SignerIdentifier_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _SignerIdentifier_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/SignerInfo.h b/src/asn1/asn1c/SignerInfo.h
index 9ef08085..ff1a7491 100644
--- a/src/asn1/asn1c/SignerInfo.h
+++ b/src/asn1/asn1c/SignerInfo.h
@@ -19,10 +19,6 @@
 #include "asn1/asn1c/SignatureValue.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct SignedAttributes;
 struct UnsignedAttributes;
@@ -46,10 +42,6 @@ extern asn_TYPE_descriptor_t asn_DEF_SignerInfo;
 extern asn_SEQUENCE_specifics_t asn_SPC_SignerInfo_specs_1;
 extern asn_TYPE_member_t asn_MBR_SignerInfo_1[7];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/SignedAttributes.h"
 #include "asn1/asn1c/UnsignedAttributes.h"
diff --git a/src/asn1/asn1c/SignerInfos.h b/src/asn1/asn1c/SignerInfos.h
index fbcdc469..977ec013 100644
--- a/src/asn1/asn1c/SignerInfos.h
+++ b/src/asn1/asn1c/SignerInfos.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct SignerInfo;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_SignerInfos;
 extern asn_SET_OF_specifics_t asn_SPC_SignerInfos_specs_1;
 extern asn_TYPE_member_t asn_MBR_SignerInfos_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/SignerInfo.h"
 
diff --git a/src/asn1/asn1c/SigningTime.h b/src/asn1/asn1c/SigningTime.h
index 25991ea7..9e94881e 100644
--- a/src/asn1/asn1c/SigningTime.h
+++ b/src/asn1/asn1c/SigningTime.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/Time.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* SigningTime */
 typedef Time_t	 SigningTime_t;
 
@@ -30,9 +26,5 @@ ber_type_decoder_f SigningTime_decode_ber;
 der_type_encoder_f SigningTime_encode_der;
 xer_type_encoder_f SigningTime_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _SigningTime_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/TBSCertList.h b/src/asn1/asn1c/TBSCertList.h
index 4425e44f..844b560f 100644
--- a/src/asn1/asn1c/TBSCertList.h
+++ b/src/asn1/asn1c/TBSCertList.h
@@ -21,10 +21,6 @@
 #include "asn1/asn1c/constr_SEQUENCE.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct Time;
 struct Extensions;
@@ -63,10 +59,6 @@ extern asn_TYPE_descriptor_t asn_DEF_TBSCertList;
 extern asn_SEQUENCE_specifics_t asn_SPC_TBSCertList_specs_1;
 extern asn_TYPE_member_t asn_MBR_TBSCertList_1[7];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/Time.h"
 #include "asn1/asn1c/Extensions.h"
diff --git a/src/asn1/asn1c/Time.h b/src/asn1/asn1c/Time.h
index 3853d083..413c957e 100644
--- a/src/asn1/asn1c/Time.h
+++ b/src/asn1/asn1c/Time.h
@@ -16,10 +16,6 @@
 #include "asn1/asn1c/GeneralizedTime.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum Time_PR {
 	Time_PR_NOTHING,	/* No components present */
@@ -44,9 +40,5 @@ extern asn_TYPE_descriptor_t asn_DEF_Time;
 extern asn_CHOICE_specifics_t asn_SPC_Time_specs_1;
 extern asn_TYPE_member_t asn_MBR_Time_1[2];
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _Time_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/UTCTime.h b/src/asn1/asn1c/UTCTime.h
index 183abaa7..2b035282 100644
--- a/src/asn1/asn1c/UTCTime.h
+++ b/src/asn1/asn1c/UTCTime.h
@@ -9,10 +9,6 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef OCTET_STRING_t UTCTime_t;  /* Implemented via OCTET STRING */
 
 extern asn_TYPE_descriptor_t asn_DEF_UTCTime;
@@ -40,8 +36,4 @@ time_t asn_UT2time(const UTCTime_t *, struct tm *_optional_tm4fill);
 /* See asn_time2GT() in GeneralizedTime.h */
 UTCTime_t *asn_time2UT(UTCTime_t *__opt_ut, const struct tm *);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _UTCTime_H_ */
diff --git a/src/asn1/asn1c/UnsignedAttributes.h b/src/asn1/asn1c/UnsignedAttributes.h
index d278658d..6bbc8044 100644
--- a/src/asn1/asn1c/UnsignedAttributes.h
+++ b/src/asn1/asn1c/UnsignedAttributes.h
@@ -15,10 +15,6 @@
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Forward declarations */
 struct CMSAttribute;
 
@@ -35,10 +31,6 @@ extern asn_TYPE_descriptor_t asn_DEF_UnsignedAttributes;
 extern asn_SET_OF_specifics_t asn_SPC_UnsignedAttributes_specs_1;
 extern asn_TYPE_member_t asn_MBR_UnsignedAttributes_1[1];
 
-#ifdef __cplusplus
-}
-#endif
-
 /* Referred external types */
 #include "asn1/asn1c/CMSAttribute.h"
 
diff --git a/src/asn1/asn1c/Version.h b/src/asn1/asn1c/Version.h
index 8621749f..574113e3 100644
--- a/src/asn1/asn1c/Version.h
+++ b/src/asn1/asn1c/Version.h
@@ -14,10 +14,6 @@
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* Dependencies */
 typedef enum Version {
 	Version_v1	= 0,
@@ -37,9 +33,5 @@ ber_type_decoder_f Version_decode_ber;
 der_type_encoder_f Version_encode_der;
 xer_type_encoder_f Version_encode_xer;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _Version_H_ */
 #include "asn1/asn1c/asn_internal.h"
diff --git a/src/asn1/asn1c/asn_SEQUENCE_OF.h b/src/asn1/asn1c/asn_SEQUENCE_OF.h
index 7b0e4d9e..6c5a11f8 100644
--- a/src/asn1/asn1c/asn_SEQUENCE_OF.h
+++ b/src/asn1/asn1c/asn_SEQUENCE_OF.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_SET_OF.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * SEQUENCE OF is the same as SET OF with a tiny difference:
  * the delete operation preserves the initial order of elements
@@ -45,8 +41,4 @@ typedef A_SEQUENCE_OF(void) asn_anonymous_sequence_;
 #define _A_SEQUENCE_FROM_VOID(ptr)	((asn_anonymous_sequence_ *)(ptr))
 #define _A_CSEQUENCE_FROM_VOID(ptr) 	((const asn_anonymous_sequence_ *)(ptr))
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* ASN_SEQUENCE_OF_H */
diff --git a/src/asn1/asn1c/asn_SET_OF.h b/src/asn1/asn1c/asn_SET_OF.h
index b51ad586..16b052ec 100644
--- a/src/asn1/asn1c/asn_SET_OF.h
+++ b/src/asn1/asn1c/asn_SET_OF.h
@@ -6,15 +6,6 @@
 #define	ASN_SET_OF_H
 #include <stdlib.h>
 
-#ifdef __cplusplus
-#define A_SET_OF(type)                   \
-    struct {                             \
-        type **array;                    \
-        int count; /* Meaningful size */ \
-        int size;  /* Allocated size */  \
-        void (*free)(decltype(*array));  \
-    }
-#else   /* C */
 #define A_SET_OF(type)                   \
     struct {                             \
         type **array;                    \
@@ -22,11 +13,6 @@
         int size;  /* Allocated size */  \
         void (*free)(type *);    \
     }
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 #define	ASN_SET_ADD(headptr, ptr)		\
 	asn_set_add((headptr), (ptr))
@@ -66,8 +52,4 @@ typedef A_SET_OF(void) asn_anonymous_set_;
 #define _A_SET_FROM_VOID(ptr)		((asn_anonymous_set_ *)(ptr))
 #define _A_CSET_FROM_VOID(ptr)		((const asn_anonymous_set_ *)(ptr))
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* ASN_SET_OF_H */
diff --git a/src/asn1/asn1c/asn_application.h b/src/asn1/asn1c/asn_application.h
index ed74febe..94c3407a 100644
--- a/src/asn1/asn1c/asn_application.h
+++ b/src/asn1/asn1c/asn_application.h
@@ -11,10 +11,6 @@
 #include "asn1/asn1c/asn_system.h"	/* for platform-dependent types */
 #include "asn1/asn1c/asn_codecs.h"	/* for ASN.1 codecs specifics */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * A selection of ASN.1 Transfer Syntaxes to use with generalized
  * encoders and decoders declared further in this .h file.
@@ -137,11 +133,6 @@ typedef void (asn_app_constraint_failed_f)(void *application_specific_key,
 	const void *structure_which_failed_ptr,
 	const char *error_message_format, ...) CC_PRINTFLIKE(4, 5);
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #include "asn1/asn1c/constr_TYPE.h"	/* for asn_TYPE_descriptor_t */
 
 #endif	/* ASN_APPLICATION_H */
diff --git a/src/asn1/asn1c/asn_codecs.h b/src/asn1/asn1c/asn_codecs.h
index 36a2d722..b7f25d1e 100644
--- a/src/asn1/asn1c/asn_codecs.h
+++ b/src/asn1/asn1c/asn_codecs.h
@@ -13,10 +13,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;	/* Forward declaration */
 
 /*
@@ -109,8 +105,4 @@ typedef struct asn_dec_rval_s {
 	return tmp_error;					\
 } while(0)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* ASN_CODECS_H */
diff --git a/src/asn1/asn1c/asn_codecs_prim.h b/src/asn1/asn1c/asn_codecs_prim.h
index 93c20d65..30675ca9 100644
--- a/src/asn1/asn1c/asn_codecs_prim.h
+++ b/src/asn1/asn1c/asn_codecs_prim.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct ASN__PRIMITIVE_TYPE_s {
     uint8_t *buf;   /* Buffer with consecutive primitive encoding bytes */
     size_t size;    /* Size of the buffer */
@@ -20,8 +16,4 @@ asn_struct_free_f ASN__PRIMITIVE_TYPE_free;
 ber_type_decoder_f ber_decode_primitive;
 der_type_encoder_f der_encode_primitive;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* ASN_CODECS_PRIM_H */
diff --git a/src/asn1/asn1c/asn_internal.h b/src/asn1/asn1c/asn_internal.h
index 198d7238..4d74313e 100644
--- a/src/asn1/asn1c/asn_internal.h
+++ b/src/asn1/asn1c/asn_internal.h
@@ -12,10 +12,6 @@
 #endif
 #include "asn1/asn1c/asn_application.h"	/* Application-visible API */
 
-#ifdef	__cplusplus
-extern "C" {
-#endif
-
 /* Environment version might be used to avoid running with the old library */
 #define	ASN1C_ENVIRONMENT_VERSION	923	/* Compile-time version */
 int get_asn1c_environment_version(void);	/* Run-time version */
@@ -141,8 +137,4 @@ ASN__STACK_OVERFLOW_CHECK(const asn_codec_ctx_t *ctx) {
 	return 0;
 }
 
-#ifdef	__cplusplus
-}
-#endif
-
 #endif	/* ASN_INTERNAL_H */
diff --git a/src/asn1/asn1c/asn_ioc.h b/src/asn1/asn1c/asn_ioc.h
index e04dba43..06c2a35e 100644
--- a/src/asn1/asn1c/asn_ioc.h
+++ b/src/asn1/asn1c/asn_ioc.h
@@ -8,10 +8,6 @@
 
 #include "asn1/asn1c/asn_system.h"		/* Platform-specific types */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;
 struct asn_ioc_cell_s;
 
@@ -42,9 +38,4 @@ typedef struct asn_ioc_cell_s {
     } open_type;
 } asn_ioc_cell_t;
 
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* ASN_IOC_H */
diff --git a/src/asn1/asn1c/ber_decoder.h b/src/asn1/asn1c/ber_decoder.h
index 68455dee..64e2be57 100644
--- a/src/asn1/asn1c/ber_decoder.h
+++ b/src/asn1/asn1c/ber_decoder.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;	/* Forward declaration */
 struct asn_codec_ctx_s;		/* Forward declaration */
 
@@ -59,8 +55,4 @@ asn_dec_rval_t ber_check_tags(
     ber_tlv_len_t *last_length, int *opt_tlv_form /* optional tag form */
 );
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _BER_DECODER_H_ */
diff --git a/src/asn1/asn1c/ber_tlv_length.h b/src/asn1/asn1c/ber_tlv_length.h
index c8d2b4be..8a5e68c7 100644
--- a/src/asn1/asn1c/ber_tlv_length.h
+++ b/src/asn1/asn1c/ber_tlv_length.h
@@ -13,10 +13,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef ssize_t ber_tlv_len_t;
 
 /*
@@ -51,8 +47,4 @@ ssize_t ber_skip_length(
  */
 size_t der_tlv_length_serialize(ber_tlv_len_t len, void *bufptr, size_t size);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _BER_TLV_LENGTH_H_ */
diff --git a/src/asn1/asn1c/ber_tlv_tag.h b/src/asn1/asn1c/ber_tlv_tag.h
index 89084cf2..a5d44e93 100644
--- a/src/asn1/asn1c/ber_tlv_tag.h
+++ b/src/asn1/asn1c/ber_tlv_tag.h
@@ -15,10 +15,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 enum asn_tag_class {
 	ASN_TAG_CLASS_UNIVERSAL		= 0,	/* 0b00 */
 	ASN_TAG_CLASS_APPLICATION	= 1,	/* 0b01 */
@@ -63,8 +59,4 @@ ssize_t ber_fetch_tag(const void *bufptr, size_t size, ber_tlv_tag_t *tag_r);
  */
 size_t ber_tlv_tag_serialize(ber_tlv_tag_t tag, void *bufptr, size_t size);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _BER_TLV_TAG_H_ */
diff --git a/src/asn1/asn1c/constr_CHOICE.h b/src/asn1/asn1c/constr_CHOICE.h
index 50f12067..a9490d93 100644
--- a/src/asn1/asn1c/constr_CHOICE.h
+++ b/src/asn1/asn1c/constr_CHOICE.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct asn_CHOICE_specifics_s {
 	/*
 	 * Target structure description.
@@ -62,8 +58,4 @@ unsigned CHOICE_variant_get_presence(const asn_TYPE_descriptor_t *td,
 int CHOICE_variant_set_presence(const asn_TYPE_descriptor_t *td,
                                 void *structure_ptr, unsigned present);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CONSTR_CHOICE_H_ */
diff --git a/src/asn1/asn1c/constr_SEQUENCE.h b/src/asn1/asn1c/constr_SEQUENCE.h
index c2ea6a9a..52e6c071 100644
--- a/src/asn1/asn1c/constr_SEQUENCE.h
+++ b/src/asn1/asn1c/constr_SEQUENCE.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct asn_SEQUENCE_specifics_s {
 	/*
 	 * Target structure description.
@@ -46,8 +42,4 @@ xer_type_encoder_f SEQUENCE_encode_xer;
 asn_random_fill_f  SEQUENCE_random_fill;
 extern asn_TYPE_operation_t asn_OP_SEQUENCE;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CONSTR_SEQUENCE_H_ */
diff --git a/src/asn1/asn1c/constr_SEQUENCE_OF.h b/src/asn1/asn1c/constr_SEQUENCE_OF.h
index a347449d..cc288f29 100644
--- a/src/asn1/asn1c/constr_SEQUENCE_OF.h
+++ b/src/asn1/asn1c/constr_SEQUENCE_OF.h
@@ -8,10 +8,6 @@
 #include "asn1/asn1c/asn_application.h"
 #include "asn1/asn1c/constr_SET_OF.h"		/* Implemented using SET OF */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * A set specialized functions dealing with the SEQUENCE OF type.
  * Generally implemented using SET OF.
@@ -27,8 +23,4 @@ extern asn_TYPE_operation_t asn_OP_SEQUENCE_OF;
 #define	SEQUENCE_OF_decode_ber	SET_OF_decode_ber
 #define	SEQUENCE_OF_random_fill SET_OF_random_fill
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CONSTR_SET_OF_H_ */
diff --git a/src/asn1/asn1c/constr_SET_OF.h b/src/asn1/asn1c/constr_SET_OF.h
index 2a1b305c..785b2c0c 100644
--- a/src/asn1/asn1c/constr_SET_OF.h
+++ b/src/asn1/asn1c/constr_SET_OF.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef struct asn_SET_OF_specifics_s {
     /*
      * Target structure description.
@@ -35,8 +31,4 @@ xer_type_encoder_f SET_OF_encode_xer;
 asn_random_fill_f  SET_OF_random_fill;
 extern asn_TYPE_operation_t asn_OP_SET_OF;
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* CONSTR_SET_OF_H */
diff --git a/src/asn1/asn1c/constr_TYPE.h b/src/asn1/asn1c/constr_TYPE.h
index 92d62d32..26b3fa59 100644
--- a/src/asn1/asn1c/constr_TYPE.h
+++ b/src/asn1/asn1c/constr_TYPE.h
@@ -14,10 +14,6 @@
 #include "asn1/asn1c/ber_tlv_length.h"
 #include "asn1/asn1c/ber_tlv_tag.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;	/* Forward declaration */
 struct asn_TYPE_member_s;	/* Forward declaration */
 
@@ -233,8 +229,4 @@ int asn_fprint(FILE *stream, /* Destination stream descriptor */
                const asn_TYPE_descriptor_t *td, /* ASN.1 type descriptor */
                const void *struct_ptr);         /* Structure to be printed */
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _CONSTR_TYPE_H_ */
diff --git a/src/asn1/asn1c/constraints.h b/src/asn1/asn1c/constraints.h
index 32cb1294..16150e07 100644
--- a/src/asn1/asn1c/constraints.h
+++ b/src/asn1/asn1c/constraints.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_system.h"		/* Platform-dependent types */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;		/* Forward declaration */
 
 /*
@@ -55,8 +51,4 @@ asn_constr_check_f asn_generic_unknown_constraint; /* Not fully supported */
  */
 #define	ASN__CTFAIL	if(ctfailcb) ctfailcb
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* ASN1_CONSTRAINTS_VALIDATOR_H */
diff --git a/src/asn1/asn1c/der_encoder.h b/src/asn1/asn1c/der_encoder.h
index 5a87dd27..37005550 100644
--- a/src/asn1/asn1c/der_encoder.h
+++ b/src/asn1/asn1c/der_encoder.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;	/* Forward declaration */
 
 /*
@@ -61,8 +57,4 @@ ssize_t der_write_tags(const struct asn_TYPE_descriptor_s *type_descriptor,
                        asn_app_consume_bytes_f *consume_bytes_cb,
                        void *app_key);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _DER_ENCODER_H_ */
diff --git a/src/asn1/asn1c/xer_encoder.h b/src/asn1/asn1c/xer_encoder.h
index fd516c0f..95a4cf78 100644
--- a/src/asn1/asn1c/xer_encoder.h
+++ b/src/asn1/asn1c/xer_encoder.h
@@ -7,10 +7,6 @@
 
 #include "asn1/asn1c/asn_application.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct asn_TYPE_descriptor_s;	/* Forward declaration */
 
 /* Flags used by the xer_encode() and (*xer_type_encoder_f), defined below */
@@ -54,8 +50,4 @@ typedef asn_enc_rval_t(xer_type_encoder_f)(
     void *app_key                              /* Arbitrary callback argument */
 );
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	/* _XER_ENCODER_H_ */
diff --git a/src/data_structure/uthash.h b/src/data_structure/uthash.h
index b6564586..0013ed37 100644
--- a/src/data_structure/uthash.h
+++ b/src/data_structure/uthash.h
@@ -38,23 +38,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <sys/types.h>
 #include <unistd.h>
 
-/* These macros use decltype or the earlier __typeof GNU extension.
-   As decltype is only available in newer compilers (VS2010 or gcc 4.3+
-   when compiling c++ source) this code uses whatever method is needed
-   or, for VS2008 where neither is available, uses casting workarounds. */
 #if !defined(DECLTYPE) && !defined(NO_DECLTYPE)
-#if defined(_MSC_VER)   /* MS compiler */
-#if _MSC_VER >= 1600 && defined(__cplusplus)  /* VS2010 or newer in C++ mode */
-#define DECLTYPE(x) (decltype(x))
-#else                   /* VS2008 or older (or VS2010 in C mode) */
-#define NO_DECLTYPE
-#endif
-#elif defined(__BORLANDC__) || defined(__ICCARM__) || defined(__LCC__) || defined(__WATCOMC__)
-#define NO_DECLTYPE
-#else                   /* GNU, Sun and other compilers */
 #define DECLTYPE(x) (__typeof(x))
 #endif
-#endif
 
 #ifdef NO_DECLTYPE
 #define DECLTYPE(x)