Redo #includes to simplify upcoming merge

diff --git a/src/algorithm.h b/src/algorithm.h
index 322e09f959f5c16d13f15b494467b9f3b63a4d66..d028657fc2fcc1a2a89e8dbf2a627cd740724f54 100644 (file)
--- a/src/algorithm.h
+++ b/src/algorithm.h
@@ -4,7 +4,6 @@
 #include <openssl/x509.h>
 
 #include "asn1/asn1c/AlgorithmIdentifier.h"
-#include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 
 /**
  * This file is an implementation of RFC 7935 (previously 6485) plus RFC 8608

diff --git a/src/asn1/asn1c/ANY.h b/src/asn1/asn1c/ANY.h
index 462ddb752ba1351cd302de1e4a8341451243dfa2..580e5a8a72ee9460c38fba5f0ef21e2c0c7fecdd 100644 (file)
--- a/src/asn1/asn1c/ANY.h
+++ b/src/asn1/asn1c/ANY.h
@@ -6,7 +6,6 @@
 #define ASN_TYPE_ANY_H
 
 #include "asn1/asn1c/OCTET_STRING.h"
-#include "asn1/asn1c/constraints.h"
 
 typedef struct ANY {
        uint8_t *buf;   /* BER-encoded ANY contents */

diff --git a/src/asn1/asn1c/ASId.h b/src/asn1/asn1c/ASId.h
index 1355d95f18b4d44f619f1ce58e962c46d95f6feb..5ef5b51294becbf913c6d0bd370846ceaae18f27 100644 (file)
--- a/src/asn1/asn1c/ASId.h
+++ b/src/asn1/asn1c/ASId.h
@@ -9,7 +9,6 @@
 #define        _ASId_H_
 
 #include "asn1/asn1c/INTEGER.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* ASId */
 typedef INTEGER_t       ASId_t;

diff --git a/src/asn1/asn1c/ASIdOrRange.h b/src/asn1/asn1c/ASIdOrRange.h
index 2f47e30760d4a2b14174c95532e9695efee7f968..f33c53380011a95f47c64c251e4dccc98cbde974 100644 (file)
--- a/src/asn1/asn1c/ASIdOrRange.h
+++ b/src/asn1/asn1c/ASIdOrRange.h
@@ -8,10 +8,8 @@
 #ifndef        _ASIdOrRange_H_
 #define        _ASIdOrRange_H_
 
-#include "asn1/asn1c/ASId.h"
 #include "asn1/asn1c/ASRange.h"
 #include "asn1/asn1c/constr_CHOICE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum ASIdOrRange_PR {

diff --git a/src/asn1/asn1c/ASIdentifierChoice.c b/src/asn1/asn1c/ASIdentifierChoice.c
index 83cea85456a7f38a53e5357fd076323cace67449..75598f51f9480cb78018b07bc631025c998f96cf 100644 (file)
--- a/src/asn1/asn1c/ASIdentifierChoice.c
+++ b/src/asn1/asn1c/ASIdentifierChoice.c
@@ -7,6 +7,8 @@
 
 #include "asn1/asn1c/ASIdentifierChoice.h"
 
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
+
 static asn_TYPE_member_t asn_MBR_asIdsOrRanges_3[] = {
        { ATF_POINTER, 0, 0,
                -1 /* Ambiguous tag (CHOICE?) */,

diff --git a/src/asn1/asn1c/ASIdentifierChoice.h b/src/asn1/asn1c/ASIdentifierChoice.h
index 1c66f74bb6d81a0efd202bb80ae1b2ebcb3ea249..21877e7431e45c3ca330d39549f04948a6095b6b 100644 (file)
--- a/src/asn1/asn1c/ASIdentifierChoice.h
+++ b/src/asn1/asn1c/ASIdentifierChoice.h
@@ -11,9 +11,6 @@
 #include "asn1/asn1c/ASIdOrRange.h"
 #include "asn1/asn1c/NULL.h"
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_CHOICE.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum ASIdentifierChoice_PR {
@@ -22,9 +19,6 @@ typedef enum ASIdentifierChoice_PR {
        ASIdentifierChoice_PR_asIdsOrRanges
 } ASIdentifierChoice_PR;
 
-/* Forward declarations */
-struct ASIdOrRange;
-
 /* ASIdentifierChoice */
 typedef struct ASIdentifierChoice {
        ASIdentifierChoice_PR present;

diff --git a/src/asn1/asn1c/ASIdentifiers.h b/src/asn1/asn1c/ASIdentifiers.h
index 5c17193de5e38748923edaa761bae8d03ccfe2d6..91ae46e4401701f059be6ad8b82228fd559c2ea5 100644 (file)
--- a/src/asn1/asn1c/ASIdentifiers.h
+++ b/src/asn1/asn1c/ASIdentifiers.h
@@ -9,11 +9,6 @@
 #define        _ASIdentifiers_H_
 
 #include "asn1/asn1c/ASIdentifierChoice.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct ASIdentifierChoice;
 
 /* ASIdentifiers */
 typedef struct ASIdentifiers {

diff --git a/src/asn1/asn1c/ASRange.h b/src/asn1/asn1c/ASRange.h
index 99e14d13d5f8f04a597eb477ac88fa77c739313c..08bce8a9fc27591dffc17a7b14620a5278f24f22 100644 (file)
--- a/src/asn1/asn1c/ASRange.h
+++ b/src/asn1/asn1c/ASRange.h
@@ -10,7 +10,6 @@
 
 #include "asn1/asn1c/ASId.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* ASRange */
 typedef struct ASRange {

diff --git a/src/asn1/asn1c/AlgorithmIdentifier.h b/src/asn1/asn1c/AlgorithmIdentifier.h
index 08bd7e9a355ea647c1c5e77338119a2e79fed35b..f8030154cd83520d5a0be762720afc8e869320f5 100644 (file)
--- a/src/asn1/asn1c/AlgorithmIdentifier.h
+++ b/src/asn1/asn1c/AlgorithmIdentifier.h
@@ -11,7 +11,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* AlgorithmIdentifier */
 typedef struct AlgorithmIdentifier {

diff --git a/src/asn1/asn1c/AttributeType.h b/src/asn1/asn1c/AttributeType.h
index 99881aeb4dd7046af0a4da6d5ff267b83cf678b2..bc23b4e45f2f3c1676e4375796213edb5f7eb1f9 100644 (file)
--- a/src/asn1/asn1c/AttributeType.h
+++ b/src/asn1/asn1c/AttributeType.h
@@ -9,7 +9,6 @@
 #define        _AttributeType_H_
 
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* AttributeType */
 typedef OBJECT_IDENTIFIER_t     AttributeType_t;

diff --git a/src/asn1/asn1c/AttributeTypeAndValue.h b/src/asn1/asn1c/AttributeTypeAndValue.h
index 7de860b3efe3ece4cbae1c4e95e0cb0a5043f1d5..720adc5969c5ef082924c04788894f14666ad910 100644 (file)
--- a/src/asn1/asn1c/AttributeTypeAndValue.h
+++ b/src/asn1/asn1c/AttributeTypeAndValue.h
@@ -11,7 +11,6 @@
 #include "asn1/asn1c/AttributeType.h"
 #include "asn1/asn1c/AttributeValue.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* AttributeTypeAndValue */
 typedef struct AttributeTypeAndValue {

diff --git a/src/asn1/asn1c/AttributeValue.h b/src/asn1/asn1c/AttributeValue.h
index 81f0b07f1152cb34d39159040a126a68ddb7a635..d83e2197aca29e87a8110312d908fff46a79d1bc 100644 (file)
--- a/src/asn1/asn1c/AttributeValue.h
+++ b/src/asn1/asn1c/AttributeValue.h
@@ -9,7 +9,6 @@
 #define        _AttributeValue_H_
 
 #include "asn1/asn1c/ANY.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* AttributeValue */
 typedef ANY_t   AttributeValue_t;

diff --git a/src/asn1/asn1c/BOOLEAN.c b/src/asn1/asn1c/BOOLEAN.c
index 95706a1ce13ba09b8fe0e33d95e6a8b94c9da2b8..ce0a23cc41a2acafd21b25988955b3e432042e77 100644 (file)
--- a/src/asn1/asn1c/BOOLEAN.c
+++ b/src/asn1/asn1c/BOOLEAN.c
@@ -4,10 +4,8 @@
  */
 #include "asn1/asn1c/BOOLEAN.h"
 
-#include "asn1/asn1c/asn_codecs_prim.h"
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/ber_decoder.h"
-#include "asn1/asn1c/constraints.h"
 #include "asn1/asn1c/der_encoder.h"
 
 /*

diff --git a/src/asn1/asn1c/BOOLEAN.h b/src/asn1/asn1c/BOOLEAN.h
index fb2411bae96dba01926b99bdad3d6cde14a2fe94..6259aa0d4528c54f9fed4d4e879860b701600f44 100644 (file)
--- a/src/asn1/asn1c/BOOLEAN.h
+++ b/src/asn1/asn1c/BOOLEAN.h
@@ -5,7 +5,7 @@
 #ifndef        _BOOLEAN_H_
 #define        _BOOLEAN_H_
 
-#include "asn1/asn1c/constr_TYPE.h"
+#include "asn1/asn1c/constraints.h"
 
 /*
  * The underlying integer may contain various values, but everything

diff --git a/src/asn1/asn1c/BinarySigningTime.h b/src/asn1/asn1c/BinarySigningTime.h
index f118b85fca5485eee7ff3c1c0cae18f750dbd2d6..c147d75cd146d2e13bc3862e7ae8a76ae297feee 100644 (file)
--- a/src/asn1/asn1c/BinarySigningTime.h
+++ b/src/asn1/asn1c/BinarySigningTime.h
@@ -9,7 +9,6 @@
 #define        _BinarySigningTime_H_
 
 #include "asn1/asn1c/BinaryTime.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* BinarySigningTime */
 typedef BinaryTime_t    BinarySigningTime_t;

diff --git a/src/asn1/asn1c/BinaryTime.h b/src/asn1/asn1c/BinaryTime.h
index 25d18883ae143cde453e14db8e17a68c5afa6506..6764042452af36b27dadf13827ac46337cb741a5 100644 (file)
--- a/src/asn1/asn1c/BinaryTime.h
+++ b/src/asn1/asn1c/BinaryTime.h
@@ -9,7 +9,6 @@
 #define        _BinaryTime_H_
 
 #include "asn1/asn1c/INTEGER.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* BinaryTime */
 typedef INTEGER_t       BinaryTime_t;

diff --git a/src/asn1/asn1c/CMSAttribute.c b/src/asn1/asn1c/CMSAttribute.c
index 79c755d1de354ea8ee8a3ba8806839fd7913cb8b..12c284b96cf4e51fe92da3c2828152271eaf6d1b 100644 (file)
--- a/src/asn1/asn1c/CMSAttribute.c
+++ b/src/asn1/asn1c/CMSAttribute.c
@@ -12,6 +12,7 @@
 #include "asn1/asn1c/ContentType.h"
 #include "asn1/asn1c/MessageDigest.h"
 #include "asn1/asn1c/SigningTime.h"
+#include "asn1/asn1c/constr_SET_OF.h"
 #include "json_util.h"
 
 static json_t *

diff --git a/src/asn1/asn1c/CMSAttribute.h b/src/asn1/asn1c/CMSAttribute.h
index 414cd5c6a578d9a68a6a47c6e542ce838e319bf1..a43a6d0f15df184d3c509e8436b15087d986a60e 100644 (file)
--- a/src/asn1/asn1c/CMSAttribute.h
+++ b/src/asn1/asn1c/CMSAttribute.h
@@ -12,8 +12,6 @@
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_SET_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* CMSAttribute */
 typedef struct CMSAttribute {

diff --git a/src/asn1/asn1c/CMSAttributeValue.h b/src/asn1/asn1c/CMSAttributeValue.h
index 9bb9d85e87f2351442d1900f5888933db06d74da..fe3afc310f0e0c2dbeb82e03b5dae4601df1850f 100644 (file)
--- a/src/asn1/asn1c/CMSAttributeValue.h
+++ b/src/asn1/asn1c/CMSAttributeValue.h
@@ -9,7 +9,6 @@
 #define        _CMSAttributeValue_H_
 
 #include "asn1/asn1c/ANY.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* CMSAttributeValue */
 typedef ANY_t   CMSAttributeValue_t;

diff --git a/src/asn1/asn1c/CMSSubjectKeyIdentifier.h b/src/asn1/asn1c/CMSSubjectKeyIdentifier.h
index 8e6a468b8b639cf96772c7619109af406e9c8532..05caf9ea346a983e7688b9bc4b952c6cb210c732 100644 (file)
--- a/src/asn1/asn1c/CMSSubjectKeyIdentifier.h
+++ b/src/asn1/asn1c/CMSSubjectKeyIdentifier.h
@@ -9,7 +9,6 @@
 #define        _CMSSubjectKeyIdentifier_H_
 
 #include "asn1/asn1c/OCTET_STRING.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* CMSSubjectKeyIdentifier */
 typedef OCTET_STRING_t  CMSSubjectKeyIdentifier_t;

diff --git a/src/asn1/asn1c/CMSVersion.h b/src/asn1/asn1c/CMSVersion.h
index ffd6ee50b46c8ba6d04d9aea2190d6d4541c224c..19fdfe0c12574dd3c808f3ca8ffb7f4b4b004c93 100644 (file)
--- a/src/asn1/asn1c/CMSVersion.h
+++ b/src/asn1/asn1c/CMSVersion.h
@@ -9,7 +9,6 @@
 #define        _CMSVersion_H_
 
 #include "asn1/asn1c/INTEGER.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum CMSVersion {

diff --git a/src/asn1/asn1c/CRL.c b/src/asn1/asn1c/CRL.c
index fbcc02ecb1c8d978e8dded601916b555553198c4..ec5d11e29128979a7683e84ea3e78cb28640cb43 100644 (file)
--- a/src/asn1/asn1c/CRL.c
+++ b/src/asn1/asn1c/CRL.c
@@ -2,7 +2,6 @@
 
 #include <openssl/objects.h>
 
-#include "extension.h"
 #include "json_util.h"
 #include "libcrypto_util.h"
 

diff --git a/src/asn1/asn1c/Certificate.c b/src/asn1/asn1c/Certificate.c
index 807b890d29a4083a29e7c9e1f47a37a606a9e3b8..ca5060477ae887309d6caec4560812a2074865a6 100644 (file)
--- a/src/asn1/asn1c/Certificate.c
+++ b/src/asn1/asn1c/Certificate.c
@@ -2,7 +2,6 @@
 
 #include <openssl/objects.h>
 
-#include "extension.h"
 #include "json_util.h"
 #include "libcrypto_util.h"
 #include "log.h"

diff --git a/src/asn1/asn1c/CertificateList.h b/src/asn1/asn1c/CertificateList.h
index 19c92520074e796d9e6fa596d54157d393cdd0c5..1eebc42238a84dc66122bd7dc3b55e1ebd48d5f3 100644 (file)
--- a/src/asn1/asn1c/CertificateList.h
+++ b/src/asn1/asn1c/CertificateList.h
@@ -8,11 +8,8 @@
 #ifndef        _CertificateList_H_
 #define        _CertificateList_H_
 
-#include "asn1/asn1c/AlgorithmIdentifier.h"
 #include "asn1/asn1c/BIT_STRING.h"
 #include "asn1/asn1c/TBSCertList.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* CertificateList */
 typedef struct CertificateList {

diff --git a/src/asn1/asn1c/CertificateSerialNumber.h b/src/asn1/asn1c/CertificateSerialNumber.h
index b02927cb6424f111a6fc3d22d6ec1b2e4195678f..ae5f39d6ee69f86672d406a760598d1ad27e9f59 100644 (file)
--- a/src/asn1/asn1c/CertificateSerialNumber.h
+++ b/src/asn1/asn1c/CertificateSerialNumber.h
@@ -9,7 +9,6 @@
 #define        _CertificateSerialNumber_H_
 
 #include "asn1/asn1c/INTEGER.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* CertificateSerialNumber */
 typedef INTEGER_t       CertificateSerialNumber_t;

diff --git a/src/asn1/asn1c/CertificateSet.h b/src/asn1/asn1c/CertificateSet.h
index 09027225f3d0a8dbbbcce903a903dcb364c53927..f822c9974c1ede7af67184fde3a4f20d08f796d3 100644 (file)
--- a/src/asn1/asn1c/CertificateSet.h
+++ b/src/asn1/asn1c/CertificateSet.h
@@ -11,7 +11,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* CertificateSet */
 typedef struct CertificateSet {

diff --git a/src/asn1/asn1c/ContentInfo.h b/src/asn1/asn1c/ContentInfo.h
index 8bc91ad790ec9c0444123633c7f1ebba222ef16f..53b063452365474a2d1025b29ab43113cd36369c 100644 (file)
--- a/src/asn1/asn1c/ContentInfo.h
+++ b/src/asn1/asn1c/ContentInfo.h
@@ -10,8 +10,6 @@
 
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/ContentType.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* ContentInfo */
 typedef struct ContentInfo {

diff --git a/src/asn1/asn1c/ContentType.h b/src/asn1/asn1c/ContentType.h
index 0fcff7a8c5b4df1882dcf3d38e50621ff6d8a3ff..1c3324ca68db322328d18f6b3857c1b108610dab 100644 (file)
--- a/src/asn1/asn1c/ContentType.h
+++ b/src/asn1/asn1c/ContentType.h
@@ -9,7 +9,6 @@
 #define        _ContentType_H_
 
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* ContentType */
 typedef OBJECT_IDENTIFIER_t     ContentType_t;

diff --git a/src/asn1/asn1c/ContentTypePKCS7.h b/src/asn1/asn1c/ContentTypePKCS7.h
index d3050ed184314edb807a6dd7bdaea962b948bc80..3efcfd91d99a96a1c5b023e9af69011d74f2fcc7 100644 (file)
--- a/src/asn1/asn1c/ContentTypePKCS7.h
+++ b/src/asn1/asn1c/ContentTypePKCS7.h
@@ -9,7 +9,6 @@
 #define        _ContentTypePKCS7_H_
 
 #include "asn1/asn1c/OCTET_STRING.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* ContentTypePKCS7 */
 typedef OCTET_STRING_t  ContentTypePKCS7_t;

diff --git a/src/asn1/asn1c/Countersignature.h b/src/asn1/asn1c/Countersignature.h
index 755b76db46f95b8d09a06956922181ef84542804..0b93d74f3795edb265ee36c4c8e2a961f85cdd25 100644 (file)
--- a/src/asn1/asn1c/Countersignature.h
+++ b/src/asn1/asn1c/Countersignature.h
@@ -9,7 +9,6 @@
 #define        _Countersignature_H_
 
 #include "asn1/asn1c/SignerInfo.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Countersignature */
 typedef SignerInfo_t    Countersignature_t;

diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifier.h b/src/asn1/asn1c/DigestAlgorithmIdentifier.h
index cc36066300abfc2f62bafda0115c87f31d7566de..3e26c51144d09b41ef9ec3ad816e804f746fae5b 100644 (file)
--- a/src/asn1/asn1c/DigestAlgorithmIdentifier.h
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifier.h
@@ -9,7 +9,6 @@
 #define        _DigestAlgorithmIdentifier_H_
 
 #include "asn1/asn1c/AlgorithmIdentifier.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* DigestAlgorithmIdentifier */
 typedef AlgorithmIdentifier_t   DigestAlgorithmIdentifier_t;

diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifiers.c b/src/asn1/asn1c/DigestAlgorithmIdentifiers.c
index 86406cb0ce5f3595cde82d643dcec4171e51916b..76fdbfdb4ab04f61d15fe79e9ecd6fe58fd85f44 100644 (file)
--- a/src/asn1/asn1c/DigestAlgorithmIdentifiers.c
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifiers.c
@@ -7,6 +7,8 @@
 
 #include "asn1/asn1c/DigestAlgorithmIdentifiers.h"
 
+#include "asn1/asn1c/DigestAlgorithmIdentifier.h"
+
 asn_TYPE_member_t asn_MBR_DigestAlgorithmIdentifiers_1[] = {
        { ATF_POINTER, 0, 0,
                (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),

diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
index 27783eebdb1ee7fb9f8520938c79a9ef748af21b..ae1d932a70eba455aa9d3d1d6268f462b997f3dc 100644 (file)
--- a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
@@ -8,10 +8,8 @@
 #ifndef        _DigestAlgorithmIdentifiers_H_
 #define        _DigestAlgorithmIdentifiers_H_
 
-#include "asn1/asn1c/DigestAlgorithmIdentifier.h"
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Forward declarations */
 struct DigestAlgorithmIdentifier;

diff --git a/src/asn1/asn1c/DistinguishedName.c b/src/asn1/asn1c/DistinguishedName.c
index 38beeed5cbd98feffcc40cad276a5e29ffe97d51..9838a16543282a4716523de4d122cc78ab426b80 100644 (file)
--- a/src/asn1/asn1c/DistinguishedName.c
+++ b/src/asn1/asn1c/DistinguishedName.c
@@ -7,6 +7,8 @@
 
 #include "asn1/asn1c/DistinguishedName.h"
 
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
+
 /*
  * This type is implemented using RDNSequence,
  * so here we adjust the DEF accordingly.

diff --git a/src/asn1/asn1c/DistinguishedName.h b/src/asn1/asn1c/DistinguishedName.h
index 698b589f64c3fa5ec12c28408dbaa40ddd4ce968..c31ba50b6180d060632fdf92914d3da83c59b3c9 100644 (file)
--- a/src/asn1/asn1c/DistinguishedName.h
+++ b/src/asn1/asn1c/DistinguishedName.h
@@ -9,7 +9,6 @@
 #define        _DistinguishedName_H_
 
 #include "asn1/asn1c/RDNSequence.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* DistinguishedName */
 typedef RDNSequence_t   DistinguishedName_t;

diff --git a/src/asn1/asn1c/EncapsulatedContentInfo.h b/src/asn1/asn1c/EncapsulatedContentInfo.h
index 57683b55cc6590abb463b5540a13bd279b36ddca..6379d9a5485f78ed2191d85638ca181067d6bf65 100644 (file)
--- a/src/asn1/asn1c/EncapsulatedContentInfo.h
+++ b/src/asn1/asn1c/EncapsulatedContentInfo.h
@@ -9,9 +9,7 @@
 #define        _EncapsulatedContentInfo_H_
 
 #include "asn1/asn1c/ContentType.h"
-#include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* EncapsulatedContentInfo */
 typedef struct EncapsulatedContentInfo {

diff --git a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
index 0a80e0ba9125a51981bd38a5404e2d64e4477b02..e2b63b6dea754d649fcbe61589b51d2786e0e677 100644 (file)
--- a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
+++ b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
@@ -11,7 +11,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/ContentType.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* EncapsulatedContentInfoPKCS7 */
 typedef struct EncapsulatedContentInfoPKCS7 {

diff --git a/src/asn1/asn1c/Extension.h b/src/asn1/asn1c/Extension.h
index ad427001894610d0e2f41e2a0e4dae4bbb4688de..75aed911833f7bb62a837c2f29f3b2cc27d467fb 100644 (file)
--- a/src/asn1/asn1c/Extension.h
+++ b/src/asn1/asn1c/Extension.h
@@ -10,9 +10,7 @@
 
 #include "asn1/asn1c/BOOLEAN.h"
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
-#include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Extension */
 typedef struct Extension {

diff --git a/src/asn1/asn1c/Extensions.c b/src/asn1/asn1c/Extensions.c
index d5e02c3c0851c3d41749df66e72f06e36a87dd16..9374cefec8bb6c6686df95ce45e012cfb227e5f8 100644 (file)
--- a/src/asn1/asn1c/Extensions.c
+++ b/src/asn1/asn1c/Extensions.c
@@ -7,6 +7,8 @@
 
 #include "asn1/asn1c/Extensions.h"
 
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
+
 asn_TYPE_member_t asn_MBR_Extensions_1[] = {
        { ATF_POINTER, 0, 0,
                (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),

diff --git a/src/asn1/asn1c/Extensions.h b/src/asn1/asn1c/Extensions.h
index 81badbc31c89c25ca700638a9c335fe4586b36ef..811866fdb7be952317ca0d5818c3949cda60515e 100644 (file)
--- a/src/asn1/asn1c/Extensions.h
+++ b/src/asn1/asn1c/Extensions.h
@@ -10,11 +10,7 @@
 
 #include "asn1/asn1c/Extension.h"
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct Extension;
+#include "asn1/asn1c/constr_SET_OF.h"
 
 /* Extensions */
 typedef struct Extensions {

diff --git a/src/asn1/asn1c/FileAndHash.h b/src/asn1/asn1c/FileAndHash.h
index 52d90096879c5b624cc25b9d345b7cf0890f6c60..f1e9adf6e94f91369a821dfe4f8d0b6cb9adb6e6 100644 (file)
--- a/src/asn1/asn1c/FileAndHash.h
+++ b/src/asn1/asn1c/FileAndHash.h
@@ -11,7 +11,6 @@
 #include "asn1/asn1c/BIT_STRING.h"
 #include "asn1/asn1c/IA5String.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* FileAndHash */
 typedef struct FileAndHash {

diff --git a/src/asn1/asn1c/INTEGER.c b/src/asn1/asn1c/INTEGER.c
index 30a5d0410fa8dc9067e5cdbd0d0e2c7de9c8a6f4..e2a67e873923663ddf9aa128d2d2d6146c22d1fb 100644 (file)
--- a/src/asn1/asn1c/INTEGER.c
+++ b/src/asn1/asn1c/INTEGER.c
@@ -8,7 +8,6 @@
 #include <assert.h>
 #include <errno.h>
 
-#include "asn1/asn1c/asn_codecs_prim.h"
 #include "asn1/asn1c/asn_internal.h"
 #include "json_util.h"
 

diff --git a/src/asn1/asn1c/INTEGER.h b/src/asn1/asn1c/INTEGER.h
index b09933a776a73aee54668b2a06cb2d4261b71e36..84dcc09c6ab85bf62d1aded96f23d472733e7006 100644 (file)
--- a/src/asn1/asn1c/INTEGER.h
+++ b/src/asn1/asn1c/INTEGER.h
@@ -6,7 +6,6 @@
 #define        _INTEGER_H_
 
 #include "asn1/asn1c/asn_codecs_prim.h"
-#include "asn1/asn1c/constr_TYPE.h"
 #include "asn1/asn1c/constraints.h"
 
 typedef ASN__PRIMITIVE_TYPE_t INTEGER_t;

diff --git a/src/asn1/asn1c/IPAddrBlocks.c b/src/asn1/asn1c/IPAddrBlocks.c
index 8a4408854c99c86120e4d332926a2096baea0c27..276f045969d057ed4fd4b3e3d2d789384602ffc3 100644 (file)
--- a/src/asn1/asn1c/IPAddrBlocks.c
+++ b/src/asn1/asn1c/IPAddrBlocks.c
@@ -7,6 +7,8 @@
 
 #include "asn1/asn1c/IPAddrBlocks.h"
 
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
+
 static asn_TYPE_member_t asn_MBR_IPAddrBlocks_1[] = {
        { ATF_POINTER, 0, 0,
                (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),

diff --git a/src/asn1/asn1c/IPAddrBlocks.h b/src/asn1/asn1c/IPAddrBlocks.h
index a41fd0afd10ab91cbdfa0aee631a26bbbaf5db12..d7beb17030d01f6f7d27226e283daaea6a5a71f7 100644 (file)
--- a/src/asn1/asn1c/IPAddrBlocks.h
+++ b/src/asn1/asn1c/IPAddrBlocks.h
@@ -9,12 +9,6 @@
 #define        _IPAddrBlocks_H_
 
 #include "asn1/asn1c/IPAddressFamily.h"
-#include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct IPAddressFamily;
 
 /* IPAddrBlocks */
 typedef struct IPAddrBlocks {

diff --git a/src/asn1/asn1c/IPAddress.h b/src/asn1/asn1c/IPAddress.h
index ea13999648bcac782e1977fe24b0d7efaa4d0456..ee3cd60aa6d31dc6d91fdf7abcd6e4fcc856aa08 100644 (file)
--- a/src/asn1/asn1c/IPAddress.h
+++ b/src/asn1/asn1c/IPAddress.h
@@ -9,7 +9,6 @@
 #define        _IPAddress_H_
 
 #include "asn1/asn1c/BIT_STRING.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* IPAddress */
 typedef BIT_STRING_t    IPAddress_t;

diff --git a/src/asn1/asn1c/IPAddressChoice.c b/src/asn1/asn1c/IPAddressChoice.c
index 490dd454307d356d80b9602e27a7d8a7997f32c8..6ddda4c12bb3c9a5838f7cc5239e8462ea2b8c70 100644 (file)
--- a/src/asn1/asn1c/IPAddressChoice.c
+++ b/src/asn1/asn1c/IPAddressChoice.c
@@ -7,6 +7,8 @@
 
 #include "asn1/asn1c/IPAddressChoice.h"
 
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
+
 static asn_TYPE_member_t asn_MBR_addressesOrRanges_3[] = {
        { ATF_POINTER, 0, 0,
                -1 /* Ambiguous tag (CHOICE?) */,

diff --git a/src/asn1/asn1c/IPAddressChoice.h b/src/asn1/asn1c/IPAddressChoice.h
index 54ee62ef5f76d92428abf51a699face2a7e904f0..908c53c62af3a1dc2ef4b40ed178d057b842006c 100644 (file)
--- a/src/asn1/asn1c/IPAddressChoice.h
+++ b/src/asn1/asn1c/IPAddressChoice.h
@@ -11,9 +11,6 @@
 #include "asn1/asn1c/IPAddressOrRange.h"
 #include "asn1/asn1c/NULL.h"
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_CHOICE.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum IPAddressChoice_PR {
@@ -22,9 +19,6 @@ typedef enum IPAddressChoice_PR {
        IPAddressChoice_PR_addressesOrRanges
 } IPAddressChoice_PR;
 
-/* Forward declarations */
-struct IPAddressOrRange;
-
 /* IPAddressChoice */
 typedef struct IPAddressChoice {
        IPAddressChoice_PR present;

diff --git a/src/asn1/asn1c/IPAddressFamily.h b/src/asn1/asn1c/IPAddressFamily.h
index b16192144ca1e0502a17f191acdf290ec0b66624..7310d3ea163b487c7e7becd7334f6b4e40e016f7 100644 (file)
--- a/src/asn1/asn1c/IPAddressFamily.h
+++ b/src/asn1/asn1c/IPAddressFamily.h
@@ -9,9 +9,6 @@
 #define        _IPAddressFamily_H_
 
 #include "asn1/asn1c/IPAddressChoice.h"
-#include "asn1/asn1c/OCTET_STRING.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* IPAddressFamily */
 typedef struct IPAddressFamily {

diff --git a/src/asn1/asn1c/IPAddressOrRange.h b/src/asn1/asn1c/IPAddressOrRange.h
index b7cd15e28605c256d7e7bdd1b4dafcb7d35e4e01..77196252ab27aee3fd79930340f8d58ca51b4398 100644 (file)
--- a/src/asn1/asn1c/IPAddressOrRange.h
+++ b/src/asn1/asn1c/IPAddressOrRange.h
@@ -8,10 +8,8 @@
 #ifndef        _IPAddressOrRange_H_
 #define        _IPAddressOrRange_H_
 
-#include "asn1/asn1c/IPAddress.h"
 #include "asn1/asn1c/IPAddressRange.h"
 #include "asn1/asn1c/constr_CHOICE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum IPAddressOrRange_PR {

diff --git a/src/asn1/asn1c/IPAddressRange.h b/src/asn1/asn1c/IPAddressRange.h
index d218d8cc156bb655ed8733ca469957b140ffd226..2a3199353e8ab0e6bd3650256949a5ccfbce4cd1 100644 (file)
--- a/src/asn1/asn1c/IPAddressRange.h
+++ b/src/asn1/asn1c/IPAddressRange.h
@@ -10,7 +10,6 @@
 
 #include "asn1/asn1c/IPAddress.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* IPAddressRange */
 typedef struct IPAddressRange {

diff --git a/src/asn1/asn1c/IssuerAndSerialNumber.h b/src/asn1/asn1c/IssuerAndSerialNumber.h
index 18820a9f257eb60a103bb3ceb057aa55dd09aa48..7779c99a55620e1819cd1776aaf24cb9add644a6 100644 (file)
--- a/src/asn1/asn1c/IssuerAndSerialNumber.h
+++ b/src/asn1/asn1c/IssuerAndSerialNumber.h
@@ -10,8 +10,6 @@
 
 #include "asn1/asn1c/CertificateSerialNumber.h"
 #include "asn1/asn1c/Name.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* IssuerAndSerialNumber */
 typedef struct IssuerAndSerialNumber {

diff --git a/src/asn1/asn1c/Manifest.c b/src/asn1/asn1c/Manifest.c
index 29069a5cd2bf00d2172a87fa82cd43a9b98325ea..110e3fe9c1014868acb58cae5d74266f50dde749 100644 (file)
--- a/src/asn1/asn1c/Manifest.c
+++ b/src/asn1/asn1c/Manifest.c
@@ -8,6 +8,7 @@
 #include "asn1/asn1c/Manifest.h"
 
 #include "asn1/asn1c/asn_internal.h"
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
 static int
 memb_manifestNumber_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,

diff --git a/src/asn1/asn1c/Manifest.h b/src/asn1/asn1c/Manifest.h
index c066cf94b1acd640449d8d898d68412a5c124954..44277a6cbe8a0bbb3ebb826ec6cfeec0233cdc35 100644 (file)
--- a/src/asn1/asn1c/Manifest.h
+++ b/src/asn1/asn1c/Manifest.h
@@ -13,12 +13,6 @@
 #include "asn1/asn1c/INTEGER.h"
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct FileAndHash;
 
 /* Manifest */
 typedef struct Manifest {

diff --git a/src/asn1/asn1c/MessageDigest.h b/src/asn1/asn1c/MessageDigest.h
index 5b72392ea4e70658ea665a0d519674f4f8925871..dc3fff8f3787616b6c6e2d0bf7d5e93f755ef444 100644 (file)
--- a/src/asn1/asn1c/MessageDigest.h
+++ b/src/asn1/asn1c/MessageDigest.h
@@ -9,7 +9,6 @@
 #define        _MessageDigest_H_
 
 #include "asn1/asn1c/OCTET_STRING.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* MessageDigest */
 typedef OCTET_STRING_t  MessageDigest_t;

diff --git a/src/asn1/asn1c/NULL.c b/src/asn1/asn1c/NULL.c
index 477eb0f5ba2a9df81c0e6d2e7bb759322f3fda59..77ad15cda0d28db1b070b99ea5ee026ebdd976f2 100644 (file)
--- a/src/asn1/asn1c/NULL.c
+++ b/src/asn1/asn1c/NULL.c
@@ -4,10 +4,8 @@
  */
 #include "asn1/asn1c/NULL.h"
 
-#include "asn1/asn1c/asn_codecs_prim.h"
 #include "asn1/asn1c/asn_internal.h"
 #include "asn1/asn1c/ber_decoder.h"
-#include "asn1/asn1c/constraints.h"
 #include "asn1/asn1c/der_encoder.h"
 
 /*

diff --git a/src/asn1/asn1c/NULL.h b/src/asn1/asn1c/NULL.h
index b19d853c136a4a25e3f6dddfa073468f8c8697a9..d2a43628dca03f0fdf7ad096e7de3c7473f21323 100644 (file)
--- a/src/asn1/asn1c/NULL.h
+++ b/src/asn1/asn1c/NULL.h
@@ -5,7 +5,7 @@
 #ifndef        ASN_TYPE_NULL_H
 #define        ASN_TYPE_NULL_H
 
-#include "asn1/asn1c/constr_TYPE.h"
+#include "asn1/asn1c/constraints.h"
 
 /*
  * The value of the NULL type is meaningless.

diff --git a/src/asn1/asn1c/Name.h b/src/asn1/asn1c/Name.h
index 431506e94a8c2fc54d591fb449e0ce37d64c8b4a..d61cc9b0a36f50e446d84e8f68982487fbac718d 100644 (file)
--- a/src/asn1/asn1c/Name.h
+++ b/src/asn1/asn1c/Name.h
@@ -10,7 +10,6 @@
 
 #include "asn1/asn1c/RDNSequence.h"
 #include "asn1/asn1c/constr_CHOICE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum Name_PR {

diff --git a/src/asn1/asn1c/OBJECT_IDENTIFIER.c b/src/asn1/asn1c/OBJECT_IDENTIFIER.c
index e2a86942361f0654f90b011fd65b396a72363c94..53acaaeaeb27cb0986c167d4ab2404cb139b9fcc 100644 (file)
--- a/src/asn1/asn1c/OBJECT_IDENTIFIER.c
+++ b/src/asn1/asn1c/OBJECT_IDENTIFIER.c
@@ -12,7 +12,6 @@
 #include <openssl/objects.h>
 
 #include "asn1/asn1c/INTEGER.h"
-#include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/asn_internal.h"
 #include "json_util.h"
 

diff --git a/src/asn1/asn1c/OBJECT_IDENTIFIER.h b/src/asn1/asn1c/OBJECT_IDENTIFIER.h
index db74cae534a17fb0a029acdc3e3b44fde279a95e..91b4604d9fa07362946a13871e7bb81bced80f51 100644 (file)
--- a/src/asn1/asn1c/OBJECT_IDENTIFIER.h
+++ b/src/asn1/asn1c/OBJECT_IDENTIFIER.h
@@ -9,7 +9,6 @@
 
 #include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/asn_codecs_prim.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 typedef uint32_t asn_oid_arc_t;
 #define ASN_OID_ARC_MAX (~((asn_oid_arc_t)0))

diff --git a/src/asn1/asn1c/OCTET_STRING.h b/src/asn1/asn1c/OCTET_STRING.h
index 100605180edb380727e0ee614705f9b69bb7acce..5f8347669b50af67d8cccda79199fa0f6c2dbde2 100644 (file)
--- a/src/asn1/asn1c/OCTET_STRING.h
+++ b/src/asn1/asn1c/OCTET_STRING.h
@@ -5,7 +5,6 @@
 #ifndef        _OCTET_STRING_H_
 #define        _OCTET_STRING_H_
 
-#include "asn1/asn1c/constr_TYPE.h"
 #include "asn1/asn1c/constraints.h"
 
 /*

diff --git a/src/asn1/asn1c/OPEN_TYPE.c b/src/asn1/asn1c/OPEN_TYPE.c
index 995f1d51d08665f8304962bab69b50b9ff8677af..ca970a8a93a4321bbb0297dfba2d113d9e7d50bd 100644 (file)
--- a/src/asn1/asn1c/OPEN_TYPE.c
+++ b/src/asn1/asn1c/OPEN_TYPE.c
@@ -5,7 +5,6 @@
 #include "asn1/asn1c/OPEN_TYPE.h"
 
 #include "asn1/asn1c/asn_internal.h"
-#include "asn1/asn1c/constr_CHOICE.h"
 
 asn_TYPE_operation_t asn_OP_OPEN_TYPE = {
        OPEN_TYPE_free,

diff --git a/src/asn1/asn1c/OPEN_TYPE.h b/src/asn1/asn1c/OPEN_TYPE.h
index 75ed60ef4a9985694d0469fef4f313fcd1eba454..ef4e12212063d14d333f8b44a964be5ff99e3750 100644 (file)
--- a/src/asn1/asn1c/OPEN_TYPE.h
+++ b/src/asn1/asn1c/OPEN_TYPE.h
@@ -5,7 +5,7 @@
 #ifndef ASN_OPEN_TYPE_H
 #define ASN_OPEN_TYPE_H
 
-#include "asn1/asn1c/constr_TYPE.h"
+#include "asn1/asn1c/constr_CHOICE.h"
 
 #define OPEN_TYPE_free CHOICE_free
 #define OPEN_TYPE_print CHOICE_print

diff --git a/src/asn1/asn1c/OtherRevocationInfoFormat.h b/src/asn1/asn1c/OtherRevocationInfoFormat.h
index dabc56cd86df77ebfcf13b5265fb94aa2c8cd6ed..5ee24a3249d693937ef762048d85aa7b462cec8e 100644 (file)
--- a/src/asn1/asn1c/OtherRevocationInfoFormat.h
+++ b/src/asn1/asn1c/OtherRevocationInfoFormat.h
@@ -11,7 +11,6 @@
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* OtherRevocationInfoFormat */
 typedef struct OtherRevocationInfoFormat {

diff --git a/src/asn1/asn1c/RDNSequence.c b/src/asn1/asn1c/RDNSequence.c
index 129a8ec18ffad054a8eef9886cdd4a83bb082226..df48b872a7ebe3ebdd4d282e502ce08a1981ad40 100644 (file)
--- a/src/asn1/asn1c/RDNSequence.c
+++ b/src/asn1/asn1c/RDNSequence.c
@@ -7,6 +7,8 @@
 
 #include "asn1/asn1c/RDNSequence.h"
 
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
+
 asn_TYPE_member_t asn_MBR_RDNSequence_1[] = {
        { ATF_POINTER, 0, 0,
                (ASN_TAG_CLASS_UNIVERSAL | (17 << 2)),

diff --git a/src/asn1/asn1c/RDNSequence.h b/src/asn1/asn1c/RDNSequence.h
index 60fb1fa3184181f76ca4172ac75a29d463c99fd4..3db55e3ead4f619e165d70253c7d86e74761fc20 100644 (file)
--- a/src/asn1/asn1c/RDNSequence.h
+++ b/src/asn1/asn1c/RDNSequence.h
@@ -10,11 +10,6 @@
 
 #include "asn1/asn1c/RelativeDistinguishedName.h"
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct RelativeDistinguishedName;
 
 /* RDNSequence */
 typedef struct RDNSequence {

diff --git a/src/asn1/asn1c/ROAIPAddress.h b/src/asn1/asn1c/ROAIPAddress.h
index ff60eec3c5c1b6d21d6e6e10c51dea7e1f34e4e3..e712c83e5b579e4ffebe25bb3938c34cceaf2e99 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddress.h
+++ b/src/asn1/asn1c/ROAIPAddress.h
@@ -11,7 +11,6 @@
 #include "asn1/asn1c/INTEGER.h"
 #include "asn1/asn1c/IPAddress.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* ROAIPAddress */
 typedef struct ROAIPAddress {

diff --git a/src/asn1/asn1c/ROAIPAddressFamily.c b/src/asn1/asn1c/ROAIPAddressFamily.c
index 29f1aa51a7b3a0a839639d1bc42360184568292f..439fc2e7ae3d4b7d1f3d1a700390d7dec9908984 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddressFamily.c
+++ b/src/asn1/asn1c/ROAIPAddressFamily.c
@@ -7,6 +7,7 @@
 
 #include "asn1/asn1c/ROAIPAddressFamily.h"
 
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "json_util.h"
 #include "types/address.h"
 

diff --git a/src/asn1/asn1c/ROAIPAddressFamily.h b/src/asn1/asn1c/ROAIPAddressFamily.h
index 302b457d77414bf78d45d4292fe7577783f0667a..90ac0ffee046cf5833d179a5385819ecc5b7f9d7 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddressFamily.h
+++ b/src/asn1/asn1c/ROAIPAddressFamily.h
@@ -8,15 +8,8 @@
 #ifndef        _ROAIPAddressFamily_H_
 #define        _ROAIPAddressFamily_H_
 
-#include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/ROAIPAddress.h"
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct ROAIPAddress;
 
 /* ROAIPAddressFamily */
 typedef struct ROAIPAddressFamily {

diff --git a/src/asn1/asn1c/RelativeDistinguishedName.h b/src/asn1/asn1c/RelativeDistinguishedName.h
index d41f2d9220221182c36dd8e8dd9dfbf3a291aeb8..2dafa8de05d66bc1390da089c637f3e633b2ad44 100644 (file)
--- a/src/asn1/asn1c/RelativeDistinguishedName.h
+++ b/src/asn1/asn1c/RelativeDistinguishedName.h
@@ -11,10 +11,6 @@
 #include "asn1/asn1c/AttributeTypeAndValue.h"
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct AttributeTypeAndValue;
 
 /* RelativeDistinguishedName */
 typedef struct RelativeDistinguishedName {

diff --git a/src/asn1/asn1c/RevocationInfoChoice.h b/src/asn1/asn1c/RevocationInfoChoice.h
index 974073145085f4d1d9e4d85679a2fd357c9a2a1f..ef5dd6ed649dae77ee1bc4e79e80d3a2aaf72e62 100644 (file)
--- a/src/asn1/asn1c/RevocationInfoChoice.h
+++ b/src/asn1/asn1c/RevocationInfoChoice.h
@@ -10,8 +10,6 @@
 
 #include "asn1/asn1c/CertificateList.h"
 #include "asn1/asn1c/OtherRevocationInfoFormat.h"
-#include "asn1/asn1c/constr_CHOICE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum RevocationInfoChoice_PR {

diff --git a/src/asn1/asn1c/RevocationInfoChoices.h b/src/asn1/asn1c/RevocationInfoChoices.h
index a37537d425e0c22cfb7e6e10b09c35c9e82e37a3..1d986fe3ad74a3a490bcf5d6aaa20a77d3486581 100644 (file)
--- a/src/asn1/asn1c/RevocationInfoChoices.h
+++ b/src/asn1/asn1c/RevocationInfoChoices.h
@@ -9,12 +9,6 @@
 #define        _RevocationInfoChoices_H_
 
 #include "asn1/asn1c/RevocationInfoChoice.h"
-#include "asn1/asn1c/asn_SET_OF.h"
-#include "asn1/asn1c/constr_SET_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct RevocationInfoChoice;
 
 /* RevocationInfoChoices */
 typedef struct RevocationInfoChoices {

diff --git a/src/asn1/asn1c/RouteOriginAttestation.c b/src/asn1/asn1c/RouteOriginAttestation.c
index a9c22f7f07fd1fb7cb46fbccbb5d3f16a9585831..826b639ff040bab1711efeffaa3c41dc518cf20f 100644 (file)
--- a/src/asn1/asn1c/RouteOriginAttestation.c
+++ b/src/asn1/asn1c/RouteOriginAttestation.c
@@ -8,6 +8,7 @@
 #include "asn1/asn1c/RouteOriginAttestation.h"
 
 #include "asn1/asn1c/asn_internal.h"
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
 static int
 memb_ipAddrBlocks_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,

diff --git a/src/asn1/asn1c/RouteOriginAttestation.h b/src/asn1/asn1c/RouteOriginAttestation.h
index 1320aa778b9e94652f5b50f4fe204c3012592a74..b1fdd2e00be19ab940863d1223db4450286b65dc 100644 (file)
--- a/src/asn1/asn1c/RouteOriginAttestation.h
+++ b/src/asn1/asn1c/RouteOriginAttestation.h
@@ -9,15 +9,7 @@
 #define        _RouteOriginAttestation_H_
 
 #include "asn1/asn1c/ASId.h"
-#include "asn1/asn1c/INTEGER.h"
 #include "asn1/asn1c/ROAIPAddressFamily.h"
-#include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct ROAIPAddressFamily;
 
 /* RouteOriginAttestation */
 typedef struct RouteOriginAttestation {

diff --git a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
index 6575c3d3893127a83ab91dcafce89227abd3c63d..a65845d9dbba132720d4414fa6956c4c890b6a95 100644 (file)
--- a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
+++ b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
@@ -9,7 +9,6 @@
 #define        _SignatureAlgorithmIdentifier_H_
 
 #include "asn1/asn1c/AlgorithmIdentifier.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* SignatureAlgorithmIdentifier */
 typedef AlgorithmIdentifier_t   SignatureAlgorithmIdentifier_t;

diff --git a/src/asn1/asn1c/SignatureValue.h b/src/asn1/asn1c/SignatureValue.h
index 2c5dbd82539522a4b6f48dd550de88da55e29284..c020bfc557346b4353271b0f1d08104acc8ea5de 100644 (file)
--- a/src/asn1/asn1c/SignatureValue.h
+++ b/src/asn1/asn1c/SignatureValue.h
@@ -9,7 +9,6 @@
 #define        _SignatureValue_H_
 
 #include "asn1/asn1c/OCTET_STRING.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* SignatureValue */
 typedef OCTET_STRING_t  SignatureValue_t;

diff --git a/src/asn1/asn1c/SignedAttributes.h b/src/asn1/asn1c/SignedAttributes.h
index 0f6900e402dfdf037159e22bc3927cb4e3ddec47..57043797aff8cfbbca0d6a99f399c871b450a651 100644 (file)
--- a/src/asn1/asn1c/SignedAttributes.h
+++ b/src/asn1/asn1c/SignedAttributes.h
@@ -9,12 +9,7 @@
 #define        _SignedAttributes_H_
 
 #include "asn1/asn1c/CMSAttribute.h"
-#include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct CMSAttribute;
 
 /* SignedAttributes */
 typedef struct SignedAttributes {

diff --git a/src/asn1/asn1c/SignedData.h b/src/asn1/asn1c/SignedData.h
index 36270934ad1cc49fffb6911a584a41781bc5aee8..344ac834b8ebc58ba4accd4bb160f298722ecc05 100644 (file)
--- a/src/asn1/asn1c/SignedData.h
+++ b/src/asn1/asn1c/SignedData.h
@@ -8,18 +8,11 @@
 #ifndef        _SignedData_H_
 #define        _SignedData_H_
 
-#include "asn1/asn1c/CMSVersion.h"
 #include "asn1/asn1c/CertificateSet.h"
 #include "asn1/asn1c/DigestAlgorithmIdentifiers.h"
 #include "asn1/asn1c/EncapsulatedContentInfo.h"
 #include "asn1/asn1c/RevocationInfoChoices.h"
 #include "asn1/asn1c/SignerInfos.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct CertificateSet;
-struct RevocationInfoChoices;
 
 /* SignedData */
 typedef struct SignedData {

diff --git a/src/asn1/asn1c/SignedDataPKCS7.h b/src/asn1/asn1c/SignedDataPKCS7.h
index c019472af0fc525056aee11b68d1b15b38d1ec2c..eaaa75233518a0ea59af39e73a838458d009a5a6 100644 (file)
--- a/src/asn1/asn1c/SignedDataPKCS7.h
+++ b/src/asn1/asn1c/SignedDataPKCS7.h
@@ -8,18 +8,11 @@
 #ifndef        _SignedDataPKCS7_H_
 #define        _SignedDataPKCS7_H_
 
-#include "asn1/asn1c/CMSVersion.h"
 #include "asn1/asn1c/CertificateSet.h"
 #include "asn1/asn1c/DigestAlgorithmIdentifiers.h"
 #include "asn1/asn1c/EncapsulatedContentInfoPKCS7.h"
 #include "asn1/asn1c/RevocationInfoChoices.h"
 #include "asn1/asn1c/SignerInfos.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct CertificateSet;
-struct RevocationInfoChoices;
 
 /* SignedDataPKCS7 */
 typedef struct SignedDataPKCS7 {

diff --git a/src/asn1/asn1c/SignerIdentifier.h b/src/asn1/asn1c/SignerIdentifier.h
index 5cb7a84b95294d8f06c68288a3ea57255818b79a..59059b6b1f7bdb9fa78ce0cb3664390d9836e382 100644 (file)
--- a/src/asn1/asn1c/SignerIdentifier.h
+++ b/src/asn1/asn1c/SignerIdentifier.h
@@ -10,8 +10,6 @@
 
 #include "asn1/asn1c/CMSSubjectKeyIdentifier.h"
 #include "asn1/asn1c/IssuerAndSerialNumber.h"
-#include "asn1/asn1c/constr_CHOICE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum SignerIdentifier_PR {

diff --git a/src/asn1/asn1c/SignerInfo.h b/src/asn1/asn1c/SignerInfo.h
index b68ef3895bc762e2ae0f09ee08d94e7f34395d2f..292858d53b7910f38b9340c5db49227aad7e37d4 100644 (file)
--- a/src/asn1/asn1c/SignerInfo.h
+++ b/src/asn1/asn1c/SignerInfo.h
@@ -15,12 +15,6 @@
 #include "asn1/asn1c/SignedAttributes.h"
 #include "asn1/asn1c/SignerIdentifier.h"
 #include "asn1/asn1c/UnsignedAttributes.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct SignedAttributes;
-struct UnsignedAttributes;
 
 /* SignerInfo */
 typedef struct SignerInfo {

diff --git a/src/asn1/asn1c/SignerInfos.h b/src/asn1/asn1c/SignerInfos.h
index 4005a47c3e1a88f3b5b7df401a8a01ce573700ee..6dd70404a8dbdb1a2ccafe0dc12f01a6b65876f5 100644 (file)
--- a/src/asn1/asn1c/SignerInfos.h
+++ b/src/asn1/asn1c/SignerInfos.h
@@ -9,12 +9,6 @@
 #define        _SignerInfos_H_
 
 #include "asn1/asn1c/SignerInfo.h"
-#include "asn1/asn1c/asn_SET_OF.h"
-#include "asn1/asn1c/constr_SET_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct SignerInfo;
 
 /* SignerInfos */
 typedef struct SignerInfos {

diff --git a/src/asn1/asn1c/SigningTime.h b/src/asn1/asn1c/SigningTime.h
index a396e3e970a6b19082df42970abf09a1db34c407..a37677e09b64bfd1dc96b1a7842b2032d21f65d9 100644 (file)
--- a/src/asn1/asn1c/SigningTime.h
+++ b/src/asn1/asn1c/SigningTime.h
@@ -9,7 +9,6 @@
 #define        _SigningTime_H_
 
 #include "asn1/asn1c/Time.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* SigningTime */
 typedef Time_t  SigningTime_t;

diff --git a/src/asn1/asn1c/TBSCertList.c b/src/asn1/asn1c/TBSCertList.c
index 31b25b0241e88eff521dc11bfb4e7f4b33399216..9d0dfb8db8ec660f94a43c68bc9e7df0292041d0 100644 (file)
--- a/src/asn1/asn1c/TBSCertList.c
+++ b/src/asn1/asn1c/TBSCertList.c
@@ -7,6 +7,8 @@
 
 #include "asn1/asn1c/TBSCertList.h"
 
+#include "asn1/asn1c/constr_SEQUENCE_OF.h"
+
 static asn_TYPE_member_t asn_MBR_Member_8[] = {
        { ATF_NOFLAGS, 0, offsetof(struct TBSCertList__revokedCertificates__Member, userCertificate),
                (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),

diff --git a/src/asn1/asn1c/TBSCertList.h b/src/asn1/asn1c/TBSCertList.h
index bfbbbfd7bedbddd3da46420fe481db665cf297db..8bc70e49f2f1bed8794b13b7f6dad0ee8a183e84 100644 (file)
--- a/src/asn1/asn1c/TBSCertList.h
+++ b/src/asn1/asn1c/TBSCertList.h
@@ -14,14 +14,6 @@
 #include "asn1/asn1c/Name.h"
 #include "asn1/asn1c/Time.h"
 #include "asn1/asn1c/Version.h"
-#include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_SEQUENCE.h"
-#include "asn1/asn1c/constr_SEQUENCE_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct Time;
-struct Extensions;
 
 /* Forward definitions */
 typedef struct TBSCertList__revokedCertificates__Member {

diff --git a/src/asn1/asn1c/Time.h b/src/asn1/asn1c/Time.h
index 3ed85802b3d5e52c99ee2a2b34f8c669af108a3d..968514c8dd80db3228ff473aa715f03c20efb26b 100644 (file)
--- a/src/asn1/asn1c/Time.h
+++ b/src/asn1/asn1c/Time.h
@@ -11,7 +11,6 @@
 #include "asn1/asn1c/GeneralizedTime.h"
 #include "asn1/asn1c/UTCTime.h"
 #include "asn1/asn1c/constr_CHOICE.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum Time_PR {

diff --git a/src/asn1/asn1c/UnsignedAttributes.h b/src/asn1/asn1c/UnsignedAttributes.h
index 9079b59a327bd1e131775f79c40549e49ca4017a..0356054b76fdca0a511264ce4ce9db021b47e5c5 100644 (file)
--- a/src/asn1/asn1c/UnsignedAttributes.h
+++ b/src/asn1/asn1c/UnsignedAttributes.h
@@ -9,12 +9,7 @@
 #define        _UnsignedAttributes_H_
 
 #include "asn1/asn1c/CMSAttribute.h"
-#include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
-
-/* Forward declarations */
-struct CMSAttribute;
 
 /* UnsignedAttributes */
 typedef struct UnsignedAttributes {

diff --git a/src/asn1/asn1c/Version.h b/src/asn1/asn1c/Version.h
index 1c744c1f2f65794d8ddfb88c9dbbff709c124332..10052081115d293e8af6c900a151599315dfd3fd 100644 (file)
--- a/src/asn1/asn1c/Version.h
+++ b/src/asn1/asn1c/Version.h
@@ -9,7 +9,6 @@
 #define        _Version_H_
 
 #include "asn1/asn1c/INTEGER.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /* Dependencies */
 typedef enum Version {

diff --git a/src/asn1/asn1c/asn_SEQUENCE_OF.c b/src/asn1/asn1c/asn_SEQUENCE_OF.c
index 39f873a88f1f119ddbb8a9068da8d9328eff3023..af8b86e4c3cfa3bee79fa990c28cc829953dc698 100644 (file)
--- a/src/asn1/asn1c/asn_SEQUENCE_OF.c
+++ b/src/asn1/asn1c/asn_SEQUENCE_OF.c
@@ -5,9 +5,6 @@
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
 
 #include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
 
 typedef A_SEQUENCE_OF(void) asn_sequence;
 

diff --git a/src/asn1/asn1c/asn_internal.h b/src/asn1/asn1c/asn_internal.h
index 54aa25e13d3dcdfff784f64b558028725331ff85..d60826fb870abbeebecb306629f2ad322d09023d 100644 (file)
--- a/src/asn1/asn1c/asn_internal.h
+++ b/src/asn1/asn1c/asn_internal.h
@@ -10,7 +10,8 @@
 #ifndef __EXTENSIONS__
 #define __EXTENSIONS__          /* for Sun */
 #endif
-#include "asn1/asn1c/constr_TYPE.h"
+#include "asn1/asn1c/asn_codecs.h"
+#include "asn1/asn1c/asn_system.h"
 
 /* Environment version might be used to avoid running with the old library */
 #define        ASN1C_ENVIRONMENT_VERSION       923     /* Compile-time version */

diff --git a/src/asn1/asn1c/asn_ioc.h b/src/asn1/asn1c/asn_ioc.h
index 90026908a259d2cba280b8cb3cf2f5784b60f199..c4500da5964a7a8cb69a5eccb714f9564c4b6b4e 100644 (file)
--- a/src/asn1/asn1c/asn_ioc.h
+++ b/src/asn1/asn1c/asn_ioc.h
@@ -6,9 +6,8 @@
 #ifndef        ASN_IOC_H
 #define        ASN_IOC_H
 
-#include "asn1/asn1c/asn_system.h"
+#include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;
 struct asn_ioc_cell_s;
 
 /*

diff --git a/src/asn1/asn1c/ber_decoder.h b/src/asn1/asn1c/ber_decoder.h
index 6178c3ac521b614eb5f9094b4205c965d5c12d39..756bd5779344ff6fe12128a81213034d9dd18096 100644 (file)
--- a/src/asn1/asn1c/ber_decoder.h
+++ b/src/asn1/asn1c/ber_decoder.h
@@ -7,9 +7,6 @@
 
 #include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
-struct asn_codec_ctx_s;                /* Forward declaration */
-
 /*
  * The BER decoder of any type.
  * This function may be invoked directly from the application.

diff --git a/src/asn1/asn1c/constr_CHOICE.c b/src/asn1/asn1c/constr_CHOICE.c
index f74a14fe8ed79729bb61fcce1977eb551ebce3c3..8df70337c0ffa3be90dcf11e55b53a14b92bfc71 100644 (file)
--- a/src/asn1/asn1c/constr_CHOICE.c
+++ b/src/asn1/asn1c/constr_CHOICE.c
@@ -797,7 +797,7 @@ CHOICE_compare(const asn_TYPE_descriptor_t *td, const void *aptr, const void *bp
  * Return the 1-based choice variant presence index.
  * Returns 0 in case of error.
  */
-unsigned
+unsigned int
 CHOICE_variant_get_presence(const asn_TYPE_descriptor_t *td, const void *sptr) {
     const asn_CHOICE_specifics_t *specs =
         (const asn_CHOICE_specifics_t *)td->specifics;

diff --git a/src/asn1/asn1c/constr_CHOICE.h b/src/asn1/asn1c/constr_CHOICE.h
index 87c473e5c29d403846f79b03d8b3364943be7432..508731b963ad32531f62a0259419a2a0bd8a2606 100644 (file)
--- a/src/asn1/asn1c/constr_CHOICE.h
+++ b/src/asn1/asn1c/constr_CHOICE.h
@@ -46,7 +46,7 @@ extern asn_TYPE_operation_t asn_OP_CHOICE;
  * Return the 1-based choice variant presence index.
  * Returns 0 in case of error.
  */
-unsigned CHOICE_variant_get_presence(const asn_TYPE_descriptor_t *td,
+unsigned int CHOICE_variant_get_presence(const asn_TYPE_descriptor_t *td,
                                      const void *structure_ptr);
 
 /*

diff --git a/src/asn1/asn1c/constr_SEQUENCE_OF.h b/src/asn1/asn1c/constr_SEQUENCE_OF.h
index ec2e438983f462b21a7dc9dc24a480b1ed76b2df..f789487ed6ceace6fa25dcea453f689280c628e0 100644 (file)
--- a/src/asn1/asn1c/constr_SEQUENCE_OF.h
+++ b/src/asn1/asn1c/constr_SEQUENCE_OF.h
@@ -6,7 +6,6 @@
 #define        _CONSTR_SEQUENCE_OF_H_
 
 #include "asn1/asn1c/constr_SET_OF.h"
-#include "asn1/asn1c/constr_TYPE.h"
 
 /*
  * A set specialized functions dealing with the SEQUENCE OF type.

diff --git a/src/asn1/asn1c/constr_TYPE.h b/src/asn1/asn1c/constr_TYPE.h
index 065830e6719307acef3f0f11341cf4bcc72f2b7e..18c97d33b71fd2920dfaa3349e8f966738b11ce0 100644 (file)
--- a/src/asn1/asn1c/constr_TYPE.h
+++ b/src/asn1/asn1c/constr_TYPE.h
@@ -17,7 +17,6 @@
 #include "asn1/asn1c/ber_tlv_length.h"
 #include "asn1/asn1c/ber_tlv_tag.h"
 
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
 struct asn_TYPE_member_s;      /* Forward declaration */
 
 /*

diff --git a/src/asn1/asn1c/constraints.h b/src/asn1/asn1c/constraints.h
index 18d97863490aad848267014aafde860199e6660a..d66e250d62b4dbd833d56118e70702fb1379485e 100644 (file)
--- a/src/asn1/asn1c/constraints.h
+++ b/src/asn1/asn1c/constraints.h
@@ -5,11 +5,8 @@
 #ifndef        ASN1_CONSTRAINTS_VALIDATOR_H
 #define        ASN1_CONSTRAINTS_VALIDATOR_H
 
-#include "asn1/asn1c/asn_system.h"
 #include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;          /* Forward declaration */
-
 /*
  * Validate the structure according to the ASN.1 constraints.
  * If errbuf and errlen are given, they shall be pointing to the appropriate

diff --git a/src/asn1/asn1c/der_encoder.h b/src/asn1/asn1c/der_encoder.h
index c6420b938d4650cf540386d63569298807b7b22a..ae5581d773fe1ab4aed6b23d53aba234456430e9 100644 (file)
--- a/src/asn1/asn1c/der_encoder.h
+++ b/src/asn1/asn1c/der_encoder.h
@@ -7,8 +7,6 @@
 
 #include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
-
 /*
  * The DER encoder of any type. May be invoked by the application.
  * Produces DER- and BER-compliant encoding. (DER is a subset of BER).

diff --git a/src/asn1/asn1c/json_encoder.h b/src/asn1/asn1c/json_encoder.h
index f1cc4ec5fac0e4f95466643f34b36774b2f2ef3a..97bcefce5eaf124e851022ba79463781aece68f1 100644 (file)
--- a/src/asn1/asn1c/json_encoder.h
+++ b/src/asn1/asn1c/json_encoder.h
@@ -1,18 +1,7 @@
 #ifndef SRC_ASN1_ASN1C_JSON_ENCODER_H_
 #define SRC_ASN1_ASN1C_JSON_ENCODER_H_
 
-#include <jansson.h>
-#include <netinet/in.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
+#include "asn1/asn1c/constr_TYPE.h"
 
 json_t *json_encode(
     const struct asn_TYPE_descriptor_s *type_descriptor,

diff --git a/src/asn1/asn1c/xer_encoder.h b/src/asn1/asn1c/xer_encoder.h
index 0d9a4a02526e3c1f83117251fd88a4293785d883..6ac103bc0c8c08ee916af8f535e90789846d6e88 100644 (file)
--- a/src/asn1/asn1c/xer_encoder.h
+++ b/src/asn1/asn1c/xer_encoder.h
@@ -7,8 +7,6 @@
 
 #include "asn1/asn1c/constr_TYPE.h"
 
-struct asn_TYPE_descriptor_s;  /* Forward declaration */
-
 /* Flags used by the xer_encode() and (*xer_type_encoder_f), defined below */
 enum xer_encoder_flags_e {
        /* Mode of encoding */

diff --git a/src/asn1/content_info.c b/src/asn1/content_info.c
index b279160d7eeb3491f1adc9eda2291bb95320cb14..644d0720d1951889aeebcb37da119047ea5c8bcf 100644 (file)
--- a/src/asn1/content_info.c
+++ b/src/asn1/content_info.c
@@ -1,9 +1,7 @@
 #include "asn1/content_info.h"
 
-#include "asn1/asn1c/ContentType.h"
 #include "asn1/decode.h"
 #include "asn1/oid.h"
-#include "file.h"
 #include "log.h"
 
 static int

diff --git a/src/asn1/decode.c b/src/asn1/decode.c
index faa2ad404924d470c45fdc482c0c3b782b8f7e65..96f934b3de64332adf481277673dce6e5ee943c0 100644 (file)
--- a/src/asn1/decode.c
+++ b/src/asn1/decode.c
@@ -1,9 +1,6 @@
 #include "asn1/decode.h"
 
 #include "asn1/asn1c/ber_decoder.h"
-#include "asn1/asn1c/constraints.h"
-#include "common.h"
-#include "incidence.h"
 #include "log.h"
 
 #define COND_LOG(log, pr) (log ? pr : -EINVAL)

diff --git a/src/asn1/decode.h b/src/asn1/decode.h
index f16cbccb88bebdc619099725b88b7856b4110a1c..2ec8b7e1c83fb9747c32afa8d9db8e42db75cbfa 100644 (file)
--- a/src/asn1/decode.h
+++ b/src/asn1/decode.h
@@ -1,10 +1,7 @@
 #ifndef SRC_ASN1_DECODE_H_
 #define SRC_ASN1_DECODE_H_
 
-#include <stdbool.h>
-
 #include "asn1/asn1c/ANY.h"
-#include "asn1/asn1c/constr_TYPE.h"
 #include "file.h"
 
 int asn1_decode(const void *, size_t, asn_TYPE_descriptor_t const *, void **,

diff --git a/src/asn1/oid.c b/src/asn1/oid.c
index 5a331c06fbe4eb9562287e043800a5167a7ea1b1..a57dda89a04d703a81481042279e9afb9e6397ae 100644 (file)
--- a/src/asn1/oid.c
+++ b/src/asn1/oid.c
@@ -1,8 +1,8 @@
 #include "asn1/oid.h"
 
+#include <errno.h>
+
 #include "alloc.h"
-#include "asn1/decode.h"
-#include "common.h"
 #include "log.h"
 
 void

diff --git a/src/asn1/oid.h b/src/asn1/oid.h
index 9aea49931985eabf9603c8f6dd74bfec079621d9..328c9799ef7b70e4ca3795da0b4500760601a9b3 100644 (file)
--- a/src/asn1/oid.h
+++ b/src/asn1/oid.h
@@ -1,9 +1,9 @@
 #ifndef SRC_ASN1_OID_H_
 #define SRC_ASN1_OID_H_
 
-#include "asn1/asn1c/ANY.h"
+#include <stdbool.h>
+
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
-#include "common.h"
 #include "types/array.h"
 
 /* These objects are expected to live on the stack. */

diff --git a/src/asn1/signed_data.c b/src/asn1/signed_data.c
index a37ea4169f5618d4e6547e80c491672b52aee52a..d7ef887320681f7f72e494afd8df54dd0826835f 100644 (file)
--- a/src/asn1/signed_data.c
+++ b/src/asn1/signed_data.c
@@ -2,17 +2,15 @@
 
 #include "algorithm.h"
 #include "alloc.h"
-#include "asn1/asn1c/ContentType.h"
 #include "asn1/asn1c/ContentTypePKCS7.h"
 #include "asn1/asn1c/MessageDigest.h"
 #include "asn1/asn1c/SignedDataPKCS7.h"
 #include "asn1/decode.h"
 #include "asn1/oid.h"
-#include "config.h"
 #include "hash.h"
 #include "log.h"
 #include "object/certificate.h"
-#include "thread_var.h"
+#include "types/name.h"
 
 static const OID oid_cta = OID_CONTENT_TYPE_ATTR;
 static const OID oid_mda = OID_MESSAGE_DIGEST_ATTR;

diff --git a/src/asn1/signed_data.h b/src/asn1/signed_data.h
index f166a012d91330a1ee48310978b779457751ca00..fe3f6266a8bf91bfc1d3723d8765d382f9ded073 100644 (file)
--- a/src/asn1/signed_data.h
+++ b/src/asn1/signed_data.h
@@ -4,7 +4,7 @@
 /* Some wrappers for asn1/asn1c/SignedData.h. */
 
 #include "asn1/asn1c/SignedData.h"
-#include "object/certificate.h"
+#include "certificate_refs.h"
 #include "resource.h"
 
 struct ee_cert {

diff --git a/src/base64.c b/src/base64.c
index 3469082433851d087d688e418db5ad20af6dcfe5..25865bffa6280c7b1677fd839139cf5fe4e6e1b5 100644 (file)
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,5 +1,6 @@
 #include "base64.h"
 
+#include <openssl/bio.h>
 #include <openssl/buffer.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>

diff --git a/src/cache.c b/src/cache.c
index aaf975ac891e49c00c7bb7833c7455867c87de89..a8bbb2af664b690f9afb2df3404e673cc90867b7 100644 (file)
--- a/src/cache.c
+++ b/src/cache.c
@@ -7,25 +7,18 @@
 #include "cache.h"
 
 #include <ftw.h>
-#include <time.h>
 
-#include "alloc.h"
 #include "cachent.h"
 #include "cachetmp.h"
 #include "common.h"
 #include "config.h"
 #include "configure_ac.h"
 #include "file.h"
-#include "json_util.h"
-#include "log.h"
 #include "http.h"
-#include "rrdp.h"
+#include "log.h"
+#include "rpp.h"
 #include "rsync.h"
-#include "types/arraylist.h"
-#include "types/str.h"
 #include "types/path.h"
-#include "types/url.h"
-#include "types/uthash.h"
 
 /* XXX force RRDP if one RPP fails to validate by rsync? */
 

diff --git a/src/cachent.h b/src/cachent.h
index 397fd97f2c3ab078984492fe4e15658cf14752bb..c67362db937e62c3e2fb26724798fe9a46b21316 100644 (file)
--- a/src/cachent.h
+++ b/src/cachent.h
@@ -4,8 +4,10 @@
 /* CACHE ENTity, CACHE elemENT, CACHE componENT */
 
 #include <stdbool.h>
-#include "types/uthash.h"
+#include <sys/stat.h>
+
 #include "rrdp.h"
+#include "types/uthash.h"
 
 /* XXX rename "touched" and "validated" into "preserve"? */
 

diff --git a/src/cachetmp.c b/src/cachetmp.c
index 60ff618157f73745e5a272401c63d0e3c8fc356e..9547152dda67ea2e627f4c070a02b9a42244da61 100644 (file)
--- a/src/cachetmp.c
+++ b/src/cachetmp.c
@@ -1,6 +1,7 @@
 #include "cachetmp.h"
 
 #include <stdatomic.h>
+
 #include "types/path.h"
 
 static atomic_uint file_counter;

diff --git a/src/cert_stack.c b/src/cert_stack.c
index 7858955b137db7019f167a0ff47099d29ed043b9..8e4b23b00dce2d403301f3ecdc65daac84225bdd 100644 (file)
--- a/src/cert_stack.c
+++ b/src/cert_stack.c
@@ -3,12 +3,8 @@
 #include <errno.h>
 #include <sys/queue.h>
 
-#include "alloc.h"
 #include "log.h"
-#include "resource.h"
 #include "thread_var.h"
-#include "types/arraylist.h"
-#include "types/name.h"
 #include "types/str.h"
 
 enum defer_node_type {

diff --git a/src/cert_stack.h b/src/cert_stack.h
index 1e5c62494f14113c96c1e83dc9bddbdf18a916ad..7368419ba04db87230ee247af80a09ecc52d6011 100644 (file)
--- a/src/cert_stack.h
+++ b/src/cert_stack.h
@@ -4,8 +4,6 @@
 #include <openssl/bn.h>
 
 #include "object/certificate.h"
-#include "resource.h"
-#include "types/map.h"
 #include "types/name.h"
 
 /*

diff --git a/src/certificate_refs.c b/src/certificate_refs.c
index 87cc0b1c6cfda02864571ecff042760750b3f51a..a5b2d6426f69f8e23b393452d9f6ded9b3c3e7df 100644 (file)
--- a/src/certificate_refs.c
+++ b/src/certificate_refs.c
@@ -1,7 +1,10 @@
 #include "certificate_refs.h"
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "log.h"
-#include "thread_var.h"
 
 void
 refs_init(struct certificate_refs *refs)

diff --git a/src/config.c b/src/config.c
index a6346e3643706d0e90fce067c19937fb6831757e..f8e0bc9a5e5f3b95671eeb7d8506d56df87bde5e 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -1,8 +1,7 @@
 #include "config.h"
 
+#include <errno.h>
 #include <getopt.h>
-#include <limits.h>
-#include <sys/socket.h>
 #include <syslog.h>
 
 #include "alloc.h"
@@ -14,10 +13,11 @@
 #include "config/work_offline.h"
 #include "configure_ac.h"
 #include "daemon.h"
-#include "file.h"
 #include "init.h"
 #include "json_handler.h"
 #include "log.h"
+#include "state.h"
+#include "thread_pool.h"
 #include "types/array.h"
 
 /**

diff --git a/src/config.h b/src/config.h
index b26b507ad8300f67763cb52ba4af8cb6f2888a4c..aef7d37797eacd5b990b27bc19a9d14b3029e00d 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -5,6 +5,7 @@
 #include <netdb.h>
 #include <netinet/in.h>
 #include <stdint.h>
+#include <sys/stat.h>
 
 #include "config/file_type.h"
 #include "config/filename_format.h"
@@ -12,7 +13,6 @@
 #include "config/mode.h"
 #include "config/output_format.h"
 #include "config/string_array.h"
-#include "config/types.h"
 
 /* Init/destroy */
 int handle_flags_config(int , char **);

diff --git a/src/config/string_array.c b/src/config/string_array.c
index ba584b2d558b8bef165194d2e96c44af38ab846e..80ccb415d1227315bc21fd3bffc620ae99475adb 100644 (file)
--- a/src/config/string_array.c
+++ b/src/config/string_array.c
@@ -2,9 +2,9 @@
 
 #include <getopt.h>
 
-#include "alloc.h"
 #include "config/str.h"
 #include "log.h"
+#include "types/path.h"
 #include "types/str.h"
 
 void

diff --git a/src/config/work_offline.h b/src/config/work_offline.h
index 3815f0fd3824de2273fe29a947e6e8c76c80ea0e..17f214c50bd0f3a8f4597890089973556c7e70a2 100644 (file)
--- a/src/config/work_offline.h
+++ b/src/config/work_offline.h
@@ -4,3 +4,5 @@
 extern const struct global_type gt_work_offline;
 
 #endif /* SRC_CONFIG_WORK_OFFLINE_H_ */
+#include "config/types.h"
+

diff --git a/src/extension.c b/src/extension.c
index 7ecdfb729965e915b45fe134705c8cd3fd9399ec..c55e09d2a403c4829f180e105a3a9134e169e106 100644 (file)
--- a/src/extension.c
+++ b/src/extension.c
@@ -4,8 +4,6 @@
 #include <openssl/obj_mac.h>
 #include <openssl/objects.h>
 
-#include "cert_stack.h"
-#include "common.h"
 #include "hash.h"
 #include "json_util.h"
 #include "libcrypto_util.h"

diff --git a/src/file.c b/src/file.c
index 184f8d36a8b5bd49a55e73698b1435ac73ca94bc..174a751b1e732b4b4b80f85fbcc0a2a68bda4b72 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -2,13 +2,12 @@
 
 #include <fcntl.h>
 #include <ftw.h>
-#include <sys/stat.h>
 
 #include "alloc.h"
 #include "common.h"
+#include "config/mode.h"
 #include "log.h"
 #include "types/path.h"
-#include "types/uthash.h"
 
 int
 file_open(char const *file_name, FILE **result, struct stat *stat)

diff --git a/src/hash.c b/src/hash.c
index 4612d33523bd0e57f46693e87f0f7d1ab9b740e1..43887b5c8fabcebd636177fecbba752ce68f9aa8 100644 (file)
--- a/src/hash.c
+++ b/src/hash.c
@@ -1,8 +1,5 @@
 #include "hash.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
 #include <openssl/evp.h>
 
 #include "alloc.h"

diff --git a/src/hash.h b/src/hash.h
index c99c94695eefe0fefd5b23e793560ab82e82654e..386ecb413bc8cfa04a2855103f873255ce20172d 100644 (file)
--- a/src/hash.h
+++ b/src/hash.h
@@ -1,7 +1,13 @@
 #ifndef SRC_HASH_H_
 #define SRC_HASH_H_
 
-#include <openssl/evp.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 struct hash_algorithm;
 

diff --git a/src/http.c b/src/http.c
index c47253d7fd2d140c3796382b7f468f76dd5e28ac..03aae143c0bda7b2464b1305a053897b21c989b2 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -1,13 +1,11 @@
 #include "http.h"
 
 #include "alloc.h"
-#include "cache.h"
 #include "common.h"
 #include "config.h"
 #include "file.h"
 #include "log.h"
 #include "types/url.h"
-#include "types/uthash.h"
 
 struct http_handler {
        CURL *curl;

diff --git a/src/http.h b/src/http.h
index a8479ab537ab807579518c55f398b1ff0759d69b..ccab132fc2e6b1491e1fdf893acb0b27e74982f8 100644 (file)
--- a/src/http.h
+++ b/src/http.h
@@ -1,8 +1,8 @@
 #ifndef SRC_HTTP_H_
 #define SRC_HTTP_H_
 
-#include <stdbool.h>
 #include <curl/curl.h>
+#include <stdbool.h>
 
 int http_init(void);
 void http_cleanup(void);

diff --git a/src/init.c b/src/init.c
index 22972756b1649e8d7386e052e2cac599d97cad7c..4faf458735ed62e03d7f8b4565577b6ee02dfb2e 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -2,7 +2,6 @@
 
 #include "config.h"
 #include "http.h"
-#include "log.h"
 #include "types/path.h"
 
 static int

diff --git a/src/json_handler.c b/src/json_handler.c
index 79504090880ba92ee1002182168837c22f74480d..5c56c2a1fb55d8446a058fb3eb1cf6038cd6a86b 100644 (file)
--- a/src/json_handler.c
+++ b/src/json_handler.c
@@ -4,7 +4,6 @@
 
 #include "alloc.h"
 #include "config.h"
-#include "config/types.h"
 #include "log.h"
 
 static json_t *

diff --git a/src/libcrypto_util.c b/src/libcrypto_util.c
index db2e344b988e875dca0a2755f2e77740d332f8b8..f6ab8efe4c67a5b138c4dd63686d2516af427fba 100644 (file)
--- a/src/libcrypto_util.c
+++ b/src/libcrypto_util.c
@@ -7,7 +7,6 @@
 #include <openssl/pem.h>
 #include <time.h>
 
-#include "alloc.h"
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
 #include "extension.h"
 #include "json_util.h"

diff --git a/src/log.c b/src/log.c
index ecff284eb3a192ac63711c4f48b5c5e789bf3168..f15264b0594c305aadd4a93db24974d724c60214 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -8,7 +8,6 @@
 #include <pthread.h>
 #include <signal.h>
 #include <stdarg.h>
-#include <sys/stat.h>
 #include <syslog.h>
 #include <time.h>
 

diff --git a/src/main.c b/src/main.c
index 23161fe98d19dc2eeb60cbb569d4c34edcd04fef..d5ab1b77b85eebced37ea174ff1cbb739b7e2a62 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -4,12 +4,10 @@
 #include "extension.h"
 #include "hash.h"
 #include "http.h"
-#include "incidence.h"
 #include "log.h"
 #include "nid.h"
 #include "print_file.h"
 #include "relax_ng.h"
-#include "rtr/db/vrps.h"
 #include "rtr/rtr.h"
 #include "thread_var.h"
 

diff --git a/src/object/certificate.c b/src/object/certificate.c
index 7a547bdcc0a1732e73f2dee7aba0f7e4e2762a56..b2fec9e4c3c914c2011f8f545f36d1395263b51c 100644 (file)
--- a/src/object/certificate.c
+++ b/src/object/certificate.c
@@ -11,29 +11,20 @@
 #include <openssl/rsa.h>
 #include <openssl/x509v3.h>
 #include <syslog.h>
+#include <time.h>
 
 #include "algorithm.h"
-#include "alloc.h"
 #include "asn1/asn1c/IPAddrBlocks.h"
 #include "asn1/decode.h"
-#include "asn1/oid.h"
 #include "cache.h"
-#include "cert_stack.h"
+#include "common.h"
 #include "config.h"
-#include "hash.h"
-#include "types/str.h"
 #include "extension.h"
-#include "incidence.h"
 #include "log.h"
 #include "nid.h"
-#include "object/bgpsec.h"
 #include "object/manifest.h"
-#include "object/signed_object.h"
-#include "rrdp.h"
 #include "thread_var.h"
-#include "types/name.h"
 #include "types/path.h"
-#include "types/str.h"
 
 /*
  * The X509V3_EXT_METHOD that references NID_sinfo_access uses the AIA item.

diff --git a/src/object/certificate.h b/src/object/certificate.h
index 40d6fc257f1dacbf9fa9d6afcf7df984b6a46461..9bc4e56e2eb4a71a678b2890e3a2b600a1cda5d1 100644 (file)
--- a/src/object/certificate.h
+++ b/src/object/certificate.h
@@ -5,8 +5,6 @@
 #include "asn1/asn1c/SignatureValue.h"
 #include "certificate_refs.h"
 #include "resource.h"
-#include "rpp.h"
-#include "types/map.h"
 
 /* Certificate types in the RPKI */
 enum cert_type {

diff --git a/src/object/crl.c b/src/object/crl.c
index e4a197519bf38fa7fb3e677a9cbba00ebb6835c7..e4d7514351ba08774ae6fe9b6e8ad128f255d2d8 100644 (file)
--- a/src/object/crl.c
+++ b/src/object/crl.c
@@ -7,7 +7,6 @@
 #include "algorithm.h"
 #include "extension.h"
 #include "log.h"
-#include "thread_var.h"
 #include "types/name.h"
 
 static int

diff --git a/src/object/ghostbusters.c b/src/object/ghostbusters.c
index 5d655ff4236a44170b5aab35631a849c4744cd0b..833438d412ca7d4082d6e1975718452d38f21255 100644 (file)
--- a/src/object/ghostbusters.c
+++ b/src/object/ghostbusters.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 
-#include "asn1/oid.h"
 #include "log.h"
 #include "object/signed_object.h"
 #include "object/vcard.h"

diff --git a/src/object/ghostbusters.h b/src/object/ghostbusters.h
index 7f0454d65648900e55398fca47874011a7215e94..5e71f65885b7b607dc6791ed20870911b17441c1 100644 (file)
--- a/src/object/ghostbusters.h
+++ b/src/object/ghostbusters.h
@@ -2,7 +2,6 @@
 #define SRC_OBJECT_GHOSTBUSTERS_H_
 
 #include "rpp.h"
-#include "types/map.h"
 
 int ghostbusters_traverse(struct cache_mapping *, struct rpp *);
 

diff --git a/src/object/manifest.c b/src/object/manifest.c
index bb302dd2f0e923f056145861e7c33335f01a71d3..c155068f7e6c15cdfee81db77ac893feda4e2107 100644 (file)
--- a/src/object/manifest.c
+++ b/src/object/manifest.c
@@ -1,17 +1,11 @@
 #include "object/manifest.h"
 
-#include "alloc.h"
 #include "algorithm.h"
-#include "asn1/asn1c/GeneralizedTime.h"
 #include "asn1/asn1c/Manifest.h"
 #include "asn1/decode.h"
-#include "asn1/oid.h"
 #include "common.h"
 #include "hash.h"
 #include "log.h"
-#include "object/certificate.h"
-#include "object/crl.h"
-#include "object/roa.h"
 #include "object/signed_object.h"
 #include "thread_var.h"
 #include "types/path.h"

diff --git a/src/object/manifest.h b/src/object/manifest.h
index 402813ad5c930c5565705b53a58711099a2214e7..3deb6ca3aaf5850fea96e2c6cf4e032071da8bf4 100644 (file)
--- a/src/object/manifest.h
+++ b/src/object/manifest.h
@@ -2,7 +2,6 @@
 #define SRC_OBJECT_MANIFEST_H_
 
 #include "rpp.h"
-#include "types/map.h"
 
 int handle_manifest(struct cache_mapping *map, struct rpp **);
 

diff --git a/src/object/roa.c b/src/object/roa.c
index 93c979cf3a4dbfa26f1a0e331b88ad986d9dc3b2..5074467d8671d7c5821ea92816e02be1464e3a48 100644 (file)
--- a/src/object/roa.c
+++ b/src/object/roa.c
@@ -2,8 +2,6 @@
 
 #include "asn1/asn1c/RouteOriginAttestation.h"
 #include "asn1/decode.h"
-#include "asn1/oid.h"
-#include "config.h"
 #include "log.h"
 #include "object/signed_object.h"
 #include "thread_var.h"

diff --git a/src/object/roa.h b/src/object/roa.h
index 497f9c478b9c5851c677ca1fb441e3af3b22f34b..2ae9a227d409fd2968becfc3785076492f9bdaaa 100644 (file)
--- a/src/object/roa.h
+++ b/src/object/roa.h
@@ -2,7 +2,6 @@
 #define SRC_OBJECT_ROA_H_
 
 #include "rpp.h"
-#include "types/map.h"
 
 int roa_traverse(struct cache_mapping *, struct rpp *);
 

diff --git a/src/object/signed_object.h b/src/object/signed_object.h
index d148e06356316f186ba6e5d0fc2f223699a493de..cced66e69837db61ddbc1895df1c759b6b25a299 100644 (file)
--- a/src/object/signed_object.h
+++ b/src/object/signed_object.h
@@ -1,6 +1,7 @@
 #ifndef SRC_OBJECT_SIGNED_OBJECT_H_
 #define SRC_OBJECT_SIGNED_OBJECT_H_
 
+#include "asn1/asn1c/ContentInfo.h"
 #include "asn1/oid.h"
 #include "asn1/signed_data.h"
 

diff --git a/src/object/tal.c b/src/object/tal.c
index d5f3ee6a7d9f1bcbb02bb87581b11dd7c11d3751..4a4e07f05447b3150729beccdbe2edb03a9a5285 100644 (file)
--- a/src/object/tal.c
+++ b/src/object/tal.c
@@ -1,25 +1,16 @@
 #include "object/tal.h"
 
 #include <ctype.h>
-#include <errno.h>
-#include <openssl/evp.h>
 #include <sys/queue.h>
 #include <time.h>
 
-#include "alloc.h"
 #include "base64.h"
 #include "cache.h"
-#include "cert_stack.h"
 #include "common.h"
 #include "config.h"
 #include "file.h"
 #include "log.h"
-#include "object/certificate.h"
-#include "rtr/db/vrps.h"
-#include "state.h"
 #include "thread_var.h"
-#include "types/str.h"
-#include "validation_handler.h"
 
 struct tal {
        char const *file_name;

diff --git a/src/object/tal.h b/src/object/tal.h
index 9d9f8022cd4ae841c1f00fde6d7baaa79133aa74..0bf235cd5bac6d29f49a83dd6cd53fafec4bde4b 100644 (file)
--- a/src/object/tal.h
+++ b/src/object/tal.h
@@ -4,7 +4,6 @@
 /* This is RFC 8630. */
 
 #include "rtr/db/db_table.h"
-#include "types/map.h"
 
 struct tal;
 

diff --git a/src/output_printer.c b/src/output_printer.c
index 980aba111bc29253252fdd3dba017ada6b12da63..c9ecaf9fa94949425223cf5f0087b7f68a264f69 100644 (file)
--- a/src/output_printer.c
+++ b/src/output_printer.c
@@ -1,11 +1,9 @@
 #include "output_printer.h"
 
 #include "base64.h"
-#include "common.h"
 #include "config.h"
 #include "file.h"
 #include "log.h"
-#include "types/vrp.h"
 
 typedef struct json_out {
        FILE *file;

diff --git a/src/print_file.c b/src/print_file.c
index b5c1ad966c4d5acba4b455c9f78d07e3d56ef1ec..ad49e39252eb0fe0bfac62d7cfbae782e0ed3892 100644 (file)
--- a/src/print_file.c
+++ b/src/print_file.c
@@ -1,17 +1,17 @@
 #include "print_file.h"
 
+#include <errno.h>
+
 #include "asn1/asn1c/CRL.h"
 #include "asn1/asn1c/Certificate.h"
+#include "asn1/asn1c/ContentInfo.h"
 #include "asn1/asn1c/ber_decoder.h"
 #include "asn1/asn1c/json_encoder.h"
-#include "asn1/content_info.h"
 #include "common.h"
 #include "config.h"
-#include "file.h"
 #include "log.h"
 #include "rsync.h"
 #include "types/bio_seq.h"
-#include "types/map.h"
 #include "types/path.h"
 
 #define HDRSIZE 32

diff --git a/src/relax_ng.c b/src/relax_ng.c
index 4ae956bbb795457855d8a1d03694e1a102468d55..5839cdf392177b81523761f5f895180dd8d790f3 100644 (file)
--- a/src/relax_ng.c
+++ b/src/relax_ng.c
@@ -2,7 +2,7 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include "log.h"

diff --git a/src/relax_ng.h b/src/relax_ng.h
index eeb22f704c7b56c46b4ef9f70ac45a12643f07e6..71d21bc69fefe7e893ce5e7d0b9d5e121a9e33c1 100644 (file)
--- a/src/relax_ng.h
+++ b/src/relax_ng.h
@@ -2,7 +2,6 @@
 #define SRC_XML_RELAX_NG_H_
 
 #include <libxml/xmlreader.h>
-#include <string.h>
 
 /*
  * Schema obtained from RFC 8182, converted using the tool rnc2rng

diff --git a/src/resource.c b/src/resource.c
index 7ecb8405bac494c54ececdeb6b7230815bfcb56c..7ab0394eb9ff55b8efcb79d29d28765212a08673 100644 (file)
--- a/src/resource.c
+++ b/src/resource.c
@@ -3,12 +3,10 @@
 #include <errno.h>
 
 #include "alloc.h"
-#include "cert_stack.h"
 #include "log.h"
 #include "resource/ip4.h"
 #include "resource/ip6.h"
 #include "thread_var.h"
-#include "types/address.h"
 #include "types/sorted_array.h"
 
 /* The resources we extracted from one certificate. */

diff --git a/src/resource/asn.c b/src/resource/asn.c
index ace6c894fb299c1036fd662c316c3cf0bc2636e9..43303a87465ad2dea39dab54c43fcb2e269aedf0 100644 (file)
--- a/src/resource/asn.c
+++ b/src/resource/asn.c
@@ -1,6 +1,5 @@
 #include "resource/asn.h"
 
-#include "log.h"
 #include "types/sorted_array.h"
 
 struct asn_cb {

diff --git a/src/resource/asn.h b/src/resource/asn.h
index 784a75fa0fe8a8af672548eaff20b1c008ec43fe..696b146112e069c8eec415bae81a7d86b1375566 100644 (file)
--- a/src/resource/asn.h
+++ b/src/resource/asn.h
@@ -3,7 +3,6 @@
 
 #include <stdbool.h>
 
-#include "asn1/asn1c/ASId.h"
 #include "types/asn.h"
 
 /*

diff --git a/src/rpp.c b/src/rpp.c
index cd70ae02c7cb093fadf90955e8933b3a23bf858c..72ab988c0b7caa7a435715ec1160b8c4b812db70 100644 (file)
--- a/src/rpp.c
+++ b/src/rpp.c
@@ -1,15 +1,12 @@
 #include "rpp.h"
 
-#include "alloc.h"
-#include "cert_stack.h"
 #include "common.h"
 #include "log.h"
-#include "object/certificate.h"
 #include "object/crl.h"
 #include "object/ghostbusters.h"
 #include "object/roa.h"
 #include "thread_var.h"
-#include "types/str.h"
+#include "types/arraylist.h"
 
 STATIC_ARRAY_LIST(filelist, struct cache_mapping)
 

diff --git a/src/rrdp.c b/src/rrdp.c
index be11c554a92cb71f8b3576abcb5d4ef41c730412..2f172971b29d0ed9a17285d7867bcf2633bab638 100644 (file)
--- a/src/rrdp.c
+++ b/src/rrdp.c
@@ -1,11 +1,6 @@
 #include "rrdp.h"
 
-#include <ctype.h>
-#include <openssl/evp.h>
-
-#include "alloc.h"
 #include "base64.h"
-#include "cache.h"
 #include "cachent.h"
 #include "cachetmp.h"
 #include "common.h"
@@ -17,6 +12,7 @@
 #include "log.h"
 #include "relax_ng.h"
 #include "thread_var.h"
+#include "types/arraylist.h"
 #include "types/url.h"
 
 /* RRDP's XML namespace */

diff --git a/src/rtr/db/db_table.h b/src/rtr/db/db_table.h
index af86cdfd8d7a6d64e2cb18d15a543e806b0eab58..a763c957085a5459dee487e4970364a9f41845ae 100644 (file)
--- a/src/rtr/db/db_table.h
+++ b/src/rtr/db/db_table.h
@@ -3,7 +3,6 @@
 
 #include "rtr/db/delta.h"
 #include "types/address.h"
-#include "types/vrp.h"
 
 struct db_table;
 

diff --git a/src/rtr/db/delta.c b/src/rtr/db/delta.c
index 1ca822bac10e41f5297f27eac362923425f0016a..09eb72d7e76c6b239856b991dd9b8bfaf9e4f371 100644 (file)
--- a/src/rtr/db/delta.c
+++ b/src/rtr/db/delta.c
@@ -2,7 +2,6 @@
 
 #include <stdatomic.h>
 
-#include "alloc.h"
 #include "log.h"
 #include "types/address.h"
 #include "types/arraylist.h"

diff --git a/src/rtr/db/deltas_array.c b/src/rtr/db/deltas_array.c
index 48b9069e4f17848313e04328c2079ab7b78ebe81..85025fe31fc1c28c659019465b5dca9ec69186e9 100644 (file)
--- a/src/rtr/db/deltas_array.c
+++ b/src/rtr/db/deltas_array.c
@@ -5,7 +5,6 @@
 
 #include "alloc.h"
 #include "config.h"
-#include "log.h"
 
 struct deltas_array {
        struct deltas **array; /* It's a circular array. */

diff --git a/src/rtr/db/vrps.c b/src/rtr/db/vrps.c
index 1b2618179856ac89fb27713d3505e707b85c90ce..d43751c60ee052c279236cde0b2335acc22463f1 100644 (file)
--- a/src/rtr/db/vrps.c
+++ b/src/rtr/db/vrps.c
@@ -9,11 +9,9 @@
 #include "log.h"
 #include "object/tal.h"
 #include "output_printer.h"
-#include "rtr/db/db_table.h"
-#include "rtr/rtr.h"
+#include "rtr/db/deltas_array.h"
+#include "rtr/pdu.h"
 #include "slurm/slurm_loader.h"
-#include "types/router_key.h"
-#include "validation_handler.h"
 
 struct vrp_node {
        struct delta_vrp delta;

diff --git a/src/rtr/db/vrps.h b/src/rtr/db/vrps.h
index 967259facead0f3da30244b3d650ef4e0aded6c2..b10e20a387fa206417d686c0fa0d4e6ba63bdd01 100644 (file)
--- a/src/rtr/db/vrps.h
+++ b/src/rtr/db/vrps.h
@@ -7,9 +7,10 @@
  * This module stores VRPs and their serials.
  */
 
-#include "rtr/db/deltas_array.h"
 #include "types/address.h"
 #include "types/asn.h"
+#include "types/delta.h"
+#include "types/serial.h"
 
 int vrps_init(void);
 void vrps_destroy(void);

diff --git a/src/rtr/err_pdu.c b/src/rtr/err_pdu.c
index bf032defbb7c458e2655526d73522e8f28daa229..6af11313fae4d2b5a6ddacab97004cb480547466 100644 (file)
--- a/src/rtr/err_pdu.c
+++ b/src/rtr/err_pdu.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 
 #include "alloc.h"
-#include "log.h"
 #include "rtr/pdu_sender.h"
 
 typedef enum rtr_error_code {

diff --git a/src/rtr/pdu.h b/src/rtr/pdu.h
index 9b5be6752c7f808c2f104e627afd68062da1971d..9890e75e4102f6669fd15dd7aa0e85bd74fe0990 100644 (file)
--- a/src/rtr/pdu.h
+++ b/src/rtr/pdu.h
@@ -1,17 +1,18 @@
 #ifndef SRC_RTR_PDU_H_
 #define SRC_RTR_PDU_H_
 
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <netinet/in.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <sys/types.h>
 #include <unistd.h>
 
-#include "common.h"
-#include "rtr/rtr.h"
-#include "types/router_key.h"
-
 enum rtr_version {
        RTR_V0                  = 0,
        RTR_V1                  = 1,

diff --git a/src/rtr/pdu_handler.c b/src/rtr/pdu_handler.c
index dd82eb016fb984e5301727247795b7e0dd560eb8..5a419140cf67fc8bdbbb89da144dfd1e80207200 100644 (file)
--- a/src/rtr/pdu_handler.c
+++ b/src/rtr/pdu_handler.c
@@ -3,9 +3,9 @@
 #include <errno.h>
 
 #include "log.h"
+#include "rtr/db/vrps.h"
 #include "rtr/err_pdu.h"
 #include "rtr/pdu_sender.h"
-#include "rtr/pdu_stream.h"
 
 struct send_delta_args {
        int fd;

diff --git a/src/rtr/pdu_sender.c b/src/rtr/pdu_sender.c
index dfdf8343f268bc863d910bb89ad48ed7e40e0766..41e10e6b2713f974708d346df51a5b7441edbdcb 100644 (file)
--- a/src/rtr/pdu_sender.c
+++ b/src/rtr/pdu_sender.c
@@ -4,7 +4,6 @@
 #include <poll.h>
 
 #include "alloc.h"
-#include "common.h"
 #include "config.h"
 #include "log.h"
 #include "rtr/db/vrps.h"

diff --git a/src/rtr/pdu_sender.h b/src/rtr/pdu_sender.h
index a3009be140fcb736272da36600319f866495145c..ed1b709efec2ae849781672cb528f2bf02bb7882 100644 (file)
--- a/src/rtr/pdu_sender.h
+++ b/src/rtr/pdu_sender.h
@@ -1,9 +1,10 @@
 #ifndef SRC_RTR_PDU_SENDER_H_
 #define SRC_RTR_PDU_SENDER_H_
 
-#include "rtr/db/vrps.h"
 #include "rtr/pdu.h"
 #include "types/router_key.h"
+#include "types/serial.h"
+#include "types/vrp.h"
 
 int send_serial_notify_pdu(int, uint8_t, serial_t);
 int send_cache_reset_pdu(int, uint8_t);

diff --git a/src/rtr/pdu_stream.c b/src/rtr/pdu_stream.c
index f28906f378cc4c6f1790c39b2cf261e3d65195e7..416dc05d35585f9b16fa7509626ab9a8a325c6ed 100644 (file)
--- a/src/rtr/pdu_stream.c
+++ b/src/rtr/pdu_stream.c
@@ -5,7 +5,6 @@
 #include "alloc.h"
 #include "log.h"
 #include "rtr/err_pdu.h"
-#include "rtr/pdu.h"
 
 enum buffer_state {
        /* We've read all available bytes for now. */

diff --git a/src/rtr/pdu_stream.h b/src/rtr/pdu_stream.h
index e869454fab25837fd1db66cf5186575ddcce6edc..e827aa9e443506bda64098a389211ac7816ca3c3 100644 (file)
--- a/src/rtr/pdu_stream.h
+++ b/src/rtr/pdu_stream.h
@@ -1,8 +1,9 @@
 #ifndef SRC_RTR_PDU_STREAM_H_
 #define SRC_RTR_PDU_STREAM_H_
 
+#include <stdbool.h>
+
 #include "rtr/pdu.h"
-#include "rtr/rtr.h"
 
 struct pdu_stream; /* It's an *input* stream. */
 

diff --git a/src/rtr/rtr.c b/src/rtr/rtr.c
index ed0777b49a51a3c1693f9948d7a70c17faa0454f..15648244705fbae6a7e226d75564361a9fd33d9b 100644 (file)
--- a/src/rtr/rtr.c
+++ b/src/rtr/rtr.c
@@ -4,19 +4,14 @@
 #include <fcntl.h>
 #include <poll.h>
 
-#include "alloc.h"
+#include "common.h"
 #include "config.h"
 #include "log.h"
 #include "rtr/db/vrps.h"
-#include "rtr/err_pdu.h"
-#include "rtr/pdu.h"
 #include "rtr/pdu_handler.h"
 #include "rtr/pdu_sender.h"
-#include "rtr/pdu_stream.h"
 #include "thread_pool.h"
-#include "types/address.h"
 #include "types/arraylist.h"
-#include "types/serial.h"
 
 struct rtr_server {
        int fd;

diff --git a/src/slurm/db_slurm.c b/src/slurm/db_slurm.c
index f93fe45e2496690e7f811149c92f9f23c8d78f16..6816c993f52ff49b09d49b845099aafca7b797f2 100644 (file)
--- a/src/slurm/db_slurm.c
+++ b/src/slurm/db_slurm.c
@@ -3,12 +3,10 @@
 #include <errno.h>
 #include <time.h>
 
-#include "alloc.h"
 #include "base64.h"
 #include "common.h"
 #include "log.h"
 #include "types/arraylist.h"
-#include "types/router_key.h"
 
 struct slurm_prefix_wrap {
        struct slurm_prefix element;

diff --git a/src/slurm/db_slurm.h b/src/slurm/db_slurm.h
index 8755cd37820a5cac6021c39b2a52cbb96759a7a9..7c18aecedfeee9f3971a798cb80ddc42d0f4e870 100644 (file)
--- a/src/slurm/db_slurm.h
+++ b/src/slurm/db_slurm.h
@@ -2,7 +2,14 @@
 #define SRC_SLURM_DB_SLURM_H_
 
 #include <openssl/evp.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
 #include <sys/queue.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "types/router_key.h"
 #include "types/vrp.h"

diff --git a/src/slurm/slurm_loader.c b/src/slurm/slurm_loader.c
index 5438638cd111d154e1094f2134bf9c099081a195..6fca57d30133312f766558797c6dc4263f98a7c5 100644 (file)
--- a/src/slurm/slurm_loader.c
+++ b/src/slurm/slurm_loader.c
@@ -4,10 +4,10 @@
 #include <openssl/sha.h>
 
 #include "alloc.h"
-#include "log.h"
-#include "config.h"
 #include "common.h"
+#include "config.h"
 #include "hash.h"
+#include "log.h"
 #include "slurm/slurm_parser.h"
 
 #define SLURM_FILE_EXTENSION   ".slurm"

diff --git a/src/slurm/slurm_parser.c b/src/slurm/slurm_parser.c
index 00ddcaddedca22bd47d2828f58da6707fef764a8..8aeb98302953b3bb65d80da374ba4ae07d068bdc 100644 (file)
--- a/src/slurm/slurm_parser.c
+++ b/src/slurm/slurm_parser.c
@@ -10,7 +10,6 @@
 #include "log.h"
 #include "slurm/db_slurm.h"
 #include "types/address.h"
-#include "types/router_key.h"
 
 /* JSON members */
 #define SLURM_VERSION                  "slurmVersion"

diff --git a/src/state.c b/src/state.c
index a72347769be7dfe24f5ee6b0e161e4e4fd795798..62099e65db893463a0028c00c1dbd0e3af43678a 100644 (file)
--- a/src/state.c
+++ b/src/state.c
@@ -1,8 +1,6 @@
 #include "state.h"
 
 #include "alloc.h"
-#include "cache.h"
-#include "cert_stack.h"
 #include "log.h"
 #include "thread_var.h"
 

diff --git a/src/state.h b/src/state.h
index 19d160c9d9b9d9fa31b03ab1663a2de93ee81fd6..e00952397c4d8705b97efcd07f0c1f3404654344 100644 (file)
--- a/src/state.h
+++ b/src/state.h
@@ -1,6 +1,7 @@
 #ifndef SRC_STATE_H_
 #define SRC_STATE_H_
 
+#include "cert_stack.h"
 #include "object/tal.h"
 #include "validation_handler.h"
 

diff --git a/src/thread_var.c b/src/thread_var.c
index 46ac0a1b51d03749a5ccc94bb2d20528ae726630..b9a1b681954ed8fb3e2add14979e9034677fc34a 100644 (file)
--- a/src/thread_var.c
+++ b/src/thread_var.c
@@ -3,7 +3,6 @@
 #include <pthread.h>
 
 #include "alloc.h"
-#include "config.h"
 #include "log.h"
 
 static pthread_key_t state_key;

diff --git a/src/thread_var.h b/src/thread_var.h
index 8b91768fd58c2911373c76489905dccfcdfc758e..0d5d389c2767c790155a8db2bdbd66c45e062328 100644 (file)
--- a/src/thread_var.h
+++ b/src/thread_var.h
@@ -2,7 +2,6 @@
 #define SRC_THREAD_VAR_H_
 
 #include "state.h"
-#include "types/map.h"
 
 int thvar_init(void); /* This function does not need cleanup. */
 

diff --git a/src/types/address.h b/src/types/address.h
index 188c89b2d399114564c6c6436b70a75173f85a07..7dbe6ecf79d6e4ad56c9d38da42243ba885ae5ad 100644 (file)
--- a/src/types/address.h
+++ b/src/types/address.h
@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <sys/socket.h>
 
-#include "asn1/asn1c/IPAddress.h"
 #include "asn1/asn1c/IPAddressRange.h"
 
 struct ipv4_prefix {

diff --git a/src/types/arraylist.h b/src/types/arraylist.h
index 415ec85996afdce40d7ff142f05034dd2e91e44c..686f58ef2093c1ce8733397ae25fdef95442958d 100644 (file)
--- a/src/types/arraylist.h
+++ b/src/types/arraylist.h
@@ -1,6 +1,7 @@
 #ifndef SRC_TYPES_ARRAYLIST_H_
 #define SRC_TYPES_ARRAYLIST_H_
 
+#include "alloc.h"
 #include "types/array.h"
 
 #define DEFINE_ARRAY_LIST_STRUCT(name, elem_type)                      \

diff --git a/src/types/map.c b/src/types/map.c
index b7260c078b4ab2f50d0d3a55d60fa5c3c7c8298f..d23484e667b269332c2eeacda01f0f71c2e786cf 100644 (file)
--- a/src/types/map.c
+++ b/src/types/map.c
@@ -1,7 +1,5 @@
 #include "types/map.h"
 
-#include <string.h>
-
 #include "alloc.h"
 #include "config.h"
 #include "log.h"

diff --git a/src/types/name.c b/src/types/name.c
index 4c523a2c278fe10270638c391beaed60e1857fbb..0a128f7bcca3e9f784ce3dbd3244d7f65c489b95 100644 (file)
--- a/src/types/name.c
+++ b/src/types/name.c
@@ -6,7 +6,6 @@
 #include <syslog.h>
 
 #include "alloc.h"
-#include "cert_stack.h"
 #include "log.h"
 #include "thread_var.h"
 

diff --git a/src/types/path.c b/src/types/path.c
index 672bc104e5dc6a5b7149c24479ea7965bebb0340..364ed6d2786efe97854fd694e96cb05e2b329442 100644 (file)
--- a/src/types/path.c
+++ b/src/types/path.c
@@ -4,7 +4,6 @@
 
 #include "alloc.h"
 #include "config.h"
-#include "hash.h"
 #include "log.h"
 
 /* These are arbitrary; feel free to change them. */

diff --git a/src/types/path.h b/src/types/path.h
index b8a8c14c84a1c67a43edb1917b7670b57d588e34..54369a1b6a954cb1b59dee7b6cf4becadc996d6c 100644 (file)
--- a/src/types/path.h
+++ b/src/types/path.h
@@ -1,8 +1,18 @@
 #ifndef SRC_TYPES_PATH_H_
 #define SRC_TYPES_PATH_H_
 
-#include <stdbool.h>
+#include <arpa/inet.h>
 #include <netdb.h>
+#include <netinet/in.h>
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 // XXX rename
 struct tokenizer {

diff --git a/src/types/str.c b/src/types/str.c
index 0322b5acd013858a71e806f149c2e824d6b93c70..3c74edda2207c74302559da5fe3d36227fdbc79c 100644 (file)
--- a/src/types/str.c
+++ b/src/types/str.c
@@ -1,10 +1,9 @@
 #include "types/str.h"
 
 #include <openssl/bio.h>
-#include <stdint.h>
 
-#include "alloc.h"
 #include "log.h"
+#include "types/path.h"
 
 /**
  * Does not assume that @string is NULL-terminated.

diff --git a/src/types/str.h b/src/types/str.h
index 333596d5748a0393e33a6cca6fb3fbd9070a7229..0489a103bd8ecc5eeb2a05ace4b9632e8aeb3f34 100644 (file)
--- a/src/types/str.h
+++ b/src/types/str.h
@@ -4,13 +4,6 @@
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
 #include <stdbool.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <sys/types.h>
-#include <unistd.h>
 
 #include "types/arraylist.h"
 

diff --git a/src/validation_handler.h b/src/validation_handler.h
index 46d0163927b0bc62c677bb1f8c74829d8cf25772..2e284c1f923297e00185646fc1b0ed953d6fc87e 100644 (file)
--- a/src/validation_handler.h
+++ b/src/validation_handler.h
@@ -1,10 +1,7 @@
 #ifndef SRC_VALIDATION_HANDLER_H_
 #define SRC_VALIDATION_HANDLER_H_
 
-#include "types/address.h"
-#include "types/asn.h"
-#include "types/name.h"
-#include "types/router_key.h"
+#include "rtr/db/vrps.h"
 
 /**
  * Functions that handle validation results.