Unify working directory #includes

I'm currently reviewing the system includes. There are some unnecesary
ones, as well as a few nonstandard quirks complicating portability.

This is the first of possibly quite a few commits intended to refactor
this relative mess. It makes all `#include ""`s relative to the root of
the source directory.

This makes them easier to analyze and copy-paste.

diff --git a/src/asn1/asn1c/ASId.c b/src/asn1/asn1c/ASId.c
index e64dd0f957d38472069a0330f4bff83206f35f8e..21a9ab22550a5a3ddf985102c372ce6ac6597713 100644 (file)
--- a/src/asn1/asn1c/ASId.c
+++ b/src/asn1/asn1c/ASId.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ASId.h"
+#include "asn1/asn1c/ASId.h"
 
 /*
  * This type is implemented using INTEGER,

diff --git a/src/asn1/asn1c/ASIdOrRange.c b/src/asn1/asn1c/ASIdOrRange.c
index 853a705c91c21bd48b2aefdb677ab857b6349ef2..1083c407009812367aa371033ae8144be9d9cee0 100644 (file)
--- a/src/asn1/asn1c/ASIdOrRange.c
+++ b/src/asn1/asn1c/ASIdOrRange.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ASIdOrRange.h"
+#include "asn1/asn1c/ASIdOrRange.h"
 
 static asn_oer_constraints_t asn_OER_type_ASIdOrRange_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/ASIdOrRange.h b/src/asn1/asn1c/ASIdOrRange.h
index c73cd86d5fa2807a49e2f50c1b7c221f5cddb6ac..1c0b9282625e8b88a0bb6819ddfab9fb703efdc7 100644 (file)
--- a/src/asn1/asn1c/ASIdOrRange.h
+++ b/src/asn1/asn1c/ASIdOrRange.h
@@ -12,8 +12,8 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "ASId.h"
-#include "ASRange.h"
+#include "asn1/asn1c/ASId.h"
+#include "asn1/asn1c/ASRange.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/ASIdentifierChoice.c b/src/asn1/asn1c/ASIdentifierChoice.c
index 854828c27a46ac781e4dd5455819ed9d43bd2f8f..c5016da2e11af031b08b1bbe3463c8d4b1eb79a3 100644 (file)
--- a/src/asn1/asn1c/ASIdentifierChoice.c
+++ b/src/asn1/asn1c/ASIdentifierChoice.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ASIdentifierChoice.h"
+#include "asn1/asn1c/ASIdentifierChoice.h"
 
 static asn_oer_constraints_t asn_OER_type_ASIdentifierChoice_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/ASIdentifierChoice.h b/src/asn1/asn1c/ASIdentifierChoice.h
index 93c8850eb156bf04611a5573bdb2380df9ef562e..ec58c81861e07203184f6c14e49935981d7a5492 100644 (file)
--- a/src/asn1/asn1c/ASIdentifierChoice.h
+++ b/src/asn1/asn1c/ASIdentifierChoice.h
@@ -58,7 +58,7 @@ extern asn_TYPE_member_t asn_MBR_ASIdentifierChoice_1[2];
 #endif
 
 /* Referred external types */
-#include "ASIdOrRange.h"
+#include "asn1/asn1c/ASIdOrRange.h"
 
 #endif /* _ASIdentifierChoice_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/ASIdentifiers.c b/src/asn1/asn1c/ASIdentifiers.c
index 6ba903beba0639148b4cc4fc11a98543ae7da1bc..fb89b22380288b9a1710065d8b2c9cce7a95aa0b 100644 (file)
--- a/src/asn1/asn1c/ASIdentifiers.c
+++ b/src/asn1/asn1c/ASIdentifiers.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ASIdentifiers.h"
+#include "asn1/asn1c/ASIdentifiers.h"
 
 static asn_TYPE_member_t asn_MBR_ASIdentifiers_1[] = {
        { ATF_POINTER, 2, offsetof(struct ASIdentifiers, asnum),

diff --git a/src/asn1/asn1c/ASIdentifiers.h b/src/asn1/asn1c/ASIdentifiers.h
index c5150f20908b34d7d4ed8c8740167dc5522544fa..3e66ab12d49274a5882fec240c98bcc5bcf876fc 100644 (file)
--- a/src/asn1/asn1c/ASIdentifiers.h
+++ b/src/asn1/asn1c/ASIdentifiers.h
@@ -38,7 +38,7 @@ extern asn_TYPE_descriptor_t asn_DEF_ASIdentifiers;
 #endif
 
 /* Referred external types */
-#include "ASIdentifierChoice.h"
+#include "asn1/asn1c/ASIdentifierChoice.h"
 
 #endif /* _ASIdentifiers_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/ASRange.c b/src/asn1/asn1c/ASRange.c
index 984ebe79643d817673f0c28b00401486120dfe2b..9a1063ee944c363b69408229c86c1abb7129a82a 100644 (file)
--- a/src/asn1/asn1c/ASRange.c
+++ b/src/asn1/asn1c/ASRange.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ASRange.h"
+#include "asn1/asn1c/ASRange.h"
 
 asn_TYPE_member_t asn_MBR_ASRange_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct ASRange, min),

diff --git a/src/asn1/asn1c/ASRange.h b/src/asn1/asn1c/ASRange.h
index 4f87287f65afbf8d69f8d1ea88ffa342b0dd87a2..0e6acfedf221b43cc7020c993165f5d89c0a1621 100644 (file)
--- a/src/asn1/asn1c/ASRange.h
+++ b/src/asn1/asn1c/ASRange.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "ASId.h"
+#include "asn1/asn1c/ASId.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/AlgorithmIdentifier.c b/src/asn1/asn1c/AlgorithmIdentifier.c
index 693ebdc224e05e24ff936756e8643551fdd0459f..33e19d098ed0a1a2c55654c24b4220b6d6de8c1e 100644 (file)
--- a/src/asn1/asn1c/AlgorithmIdentifier.c
+++ b/src/asn1/asn1c/AlgorithmIdentifier.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "AlgorithmIdentifier.h"
+#include "asn1/asn1c/AlgorithmIdentifier.h"
 
 asn_TYPE_member_t asn_MBR_AlgorithmIdentifier_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct AlgorithmIdentifier, algorithm),

diff --git a/src/asn1/asn1c/AttributeType.c b/src/asn1/asn1c/AttributeType.c
index 2890ad04bc9a404457ff7cd17fdac402fd1a6c45..d17a5c3a76fa186b6ab57a33dd96eea33c5861c5 100644 (file)
--- a/src/asn1/asn1c/AttributeType.c
+++ b/src/asn1/asn1c/AttributeType.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "AttributeType.h"
+#include "asn1/asn1c/AttributeType.h"
 
 /*
  * This type is implemented using OBJECT_IDENTIFIER,

diff --git a/src/asn1/asn1c/AttributeTypeAndValue.c b/src/asn1/asn1c/AttributeTypeAndValue.c
index c824a07be58fccbe299b59f8a2fedb77aac8288f..113a31633d32f89a8fc8eadea600bbca0e1ad864 100644 (file)
--- a/src/asn1/asn1c/AttributeTypeAndValue.c
+++ b/src/asn1/asn1c/AttributeTypeAndValue.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "AttributeTypeAndValue.h"
+#include "asn1/asn1c/AttributeTypeAndValue.h"
 
 asn_TYPE_member_t asn_MBR_AttributeTypeAndValue_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct AttributeTypeAndValue, type),

diff --git a/src/asn1/asn1c/AttributeTypeAndValue.h b/src/asn1/asn1c/AttributeTypeAndValue.h
index f99e724e3183f8dacbaa334abc8ac07a388387e3..7096e46d56fe393a003fd8639148945f5301ed80 100644 (file)
--- a/src/asn1/asn1c/AttributeTypeAndValue.h
+++ b/src/asn1/asn1c/AttributeTypeAndValue.h
@@ -12,8 +12,8 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "AttributeType.h"
-#include "AttributeValue.h"
+#include "asn1/asn1c/AttributeType.h"
+#include "asn1/asn1c/AttributeValue.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/AttributeValue.c b/src/asn1/asn1c/AttributeValue.c
index 05ad5099e73f7c6ee1a64e6b759fedd193ef37c9..bcedb9690aa96954301f6ff0e745fc5129ee360d 100644 (file)
--- a/src/asn1/asn1c/AttributeValue.c
+++ b/src/asn1/asn1c/AttributeValue.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "AttributeValue.h"
+#include "asn1/asn1c/AttributeValue.h"
 
 /*
  * This type is implemented using ANY,

diff --git a/src/asn1/asn1c/BinarySigningTime.c b/src/asn1/asn1c/BinarySigningTime.c
index 92774f5a851d811062a3f39c4fe845cf8f7cea94..4d960871cd8ff02ba92620d917e3fd519a91aa1e 100644 (file)
--- a/src/asn1/asn1c/BinarySigningTime.c
+++ b/src/asn1/asn1c/BinarySigningTime.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "BinarySigningTime.h"
+#include "asn1/asn1c/BinarySigningTime.h"
 
 int
 BinarySigningTime_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,

diff --git a/src/asn1/asn1c/BinarySigningTime.h b/src/asn1/asn1c/BinarySigningTime.h
index f51f32d65fc8950dd71117cecf24c1a2cb0c1245..36403542b6ec8eafce32fb0b41cd9b2ac339a78d 100644 (file)
--- a/src/asn1/asn1c/BinarySigningTime.h
+++ b/src/asn1/asn1c/BinarySigningTime.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "BinaryTime.h"
+#include "asn1/asn1c/BinaryTime.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/asn1/asn1c/BinaryTime.c b/src/asn1/asn1c/BinaryTime.c
index d5f230b294f6472244ee62765830e0c59c4cd6b6..0e5983d519d1ea7386296b7cd757d5e3dea98c5f 100644 (file)
--- a/src/asn1/asn1c/BinaryTime.c
+++ b/src/asn1/asn1c/BinaryTime.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "BinaryTime.h"
+#include "asn1/asn1c/BinaryTime.h"
 
 int
 BinaryTime_constraint(const asn_TYPE_descriptor_t *td, const void *sptr,

diff --git a/src/asn1/asn1c/CMSAttribute.c b/src/asn1/asn1c/CMSAttribute.c
index b7bb5555d9346f872cafcbf92ceae35dd47fb04e..6b84bb09f11d34113729264e315c64ff0ba5b996 100644 (file)
--- a/src/asn1/asn1c/CMSAttribute.c
+++ b/src/asn1/asn1c/CMSAttribute.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "CMSAttribute.h"
+#include "asn1/asn1c/CMSAttribute.h"
 
 static asn_TYPE_member_t asn_MBR_attrValues_3[] = {
        { ATF_ANY_TYPE | ATF_POINTER, 0, 0,

diff --git a/src/asn1/asn1c/CMSAttribute.h b/src/asn1/asn1c/CMSAttribute.h
index 70557935d2be5aa376b22a4347d0110d1345de5c..43784a5104db8520e77d500c4ecee9f29b15192e 100644 (file)
--- a/src/asn1/asn1c/CMSAttribute.h
+++ b/src/asn1/asn1c/CMSAttribute.h
@@ -13,7 +13,7 @@
 
 /* Including external dependencies */
 #include "asn1/asn1c/OBJECT_IDENTIFIER.h"
-#include "CMSAttributeValue.h"
+#include "asn1/asn1c/CMSAttributeValue.h"
 #include "asn1/asn1c/asn_SET_OF.h"
 #include "asn1/asn1c/constr_SET_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"

diff --git a/src/asn1/asn1c/CMSAttributeValue.c b/src/asn1/asn1c/CMSAttributeValue.c
index a2b0262ea0350b8ef52a4483767e585dbea74d7b..f3d9bb9dc4364d2084ef31dc85fdb2c085094791 100644 (file)
--- a/src/asn1/asn1c/CMSAttributeValue.c
+++ b/src/asn1/asn1c/CMSAttributeValue.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "CMSAttributeValue.h"
+#include "asn1/asn1c/CMSAttributeValue.h"
 
 /*
  * This type is implemented using ANY,

diff --git a/src/asn1/asn1c/CMSSubjectKeyIdentifier.c b/src/asn1/asn1c/CMSSubjectKeyIdentifier.c
index 80ae765a200c216caa43d16d0dd9fd094205b7f3..6a3d4c6462a8c78e840e7a47605b50b507967f6c 100644 (file)
--- a/src/asn1/asn1c/CMSSubjectKeyIdentifier.c
+++ b/src/asn1/asn1c/CMSSubjectKeyIdentifier.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "CMSSubjectKeyIdentifier.h"
+#include "asn1/asn1c/CMSSubjectKeyIdentifier.h"
 
 /*
  * This type is implemented using OCTET_STRING,

diff --git a/src/asn1/asn1c/CMSVersion.c b/src/asn1/asn1c/CMSVersion.c
index b83470cc2f38050255fd9b08541ac79e3cb6c461..24292790ed3d1942c8fb38c88e4a5766a446b820 100644 (file)
--- a/src/asn1/asn1c/CMSVersion.c
+++ b/src/asn1/asn1c/CMSVersion.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "CMSVersion.h"
+#include "asn1/asn1c/CMSVersion.h"
 
 /*
  * This type is implemented using INTEGER,

diff --git a/src/asn1/asn1c/CertificateList.c b/src/asn1/asn1c/CertificateList.c
index b90a34f4c927d3485d86b9e60e4277ada0b295fa..eed479693c93bf0659bb220a5c3d254c64d867cf 100644 (file)
--- a/src/asn1/asn1c/CertificateList.c
+++ b/src/asn1/asn1c/CertificateList.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "CertificateList.h"
+#include "asn1/asn1c/CertificateList.h"
 
 asn_TYPE_member_t asn_MBR_CertificateList_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct CertificateList, tbsCertList),

diff --git a/src/asn1/asn1c/CertificateList.h b/src/asn1/asn1c/CertificateList.h
index fc3c64e99dd7a4f5b7c424e1559b26b1967f96ae..4e600084a9f8261123a83f20ee7b55c54d535d07 100644 (file)
--- a/src/asn1/asn1c/CertificateList.h
+++ b/src/asn1/asn1c/CertificateList.h
@@ -12,8 +12,8 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "TBSCertList.h"
-#include "AlgorithmIdentifier.h"
+#include "asn1/asn1c/TBSCertList.h"
+#include "asn1/asn1c/AlgorithmIdentifier.h"
 #include "asn1/asn1c/BIT_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 

diff --git a/src/asn1/asn1c/CertificateSerialNumber.c b/src/asn1/asn1c/CertificateSerialNumber.c
index 5b9e2b950f0b2bf871eb18beadeddab4bf4fb43a..3a860b22949f2d2342d12b6acf61a2f6e6783ccd 100644 (file)
--- a/src/asn1/asn1c/CertificateSerialNumber.c
+++ b/src/asn1/asn1c/CertificateSerialNumber.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "CertificateSerialNumber.h"
+#include "asn1/asn1c/CertificateSerialNumber.h"
 
 /*
  * This type is implemented using INTEGER,

diff --git a/src/asn1/asn1c/CertificateSet.c b/src/asn1/asn1c/CertificateSet.c
index 683cc5eaf5866362e7ad609c0417771905f08f57..64373205c53834b99b01432956a2fc8f57cbfbbd 100644 (file)
--- a/src/asn1/asn1c/CertificateSet.c
+++ b/src/asn1/asn1c/CertificateSet.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "CertificateSet.h"
+#include "asn1/asn1c/CertificateSet.h"
 
 asn_TYPE_member_t asn_MBR_CertificateSet_1[] = {
        { ATF_ANY_TYPE | ATF_POINTER, 0, 0,

diff --git a/src/asn1/asn1c/ContentInfo.c b/src/asn1/asn1c/ContentInfo.c
index d6ec2dfa9a4c3d1f3ffb62e9649cdc868c76297b..a244ec498bf4314d98e9ad29dd4ac7a67126c470 100644 (file)
--- a/src/asn1/asn1c/ContentInfo.c
+++ b/src/asn1/asn1c/ContentInfo.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ContentInfo.h"
+#include "asn1/asn1c/ContentInfo.h"
 
 static asn_TYPE_member_t asn_MBR_ContentInfo_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct ContentInfo, contentType),

diff --git a/src/asn1/asn1c/ContentInfo.h b/src/asn1/asn1c/ContentInfo.h
index fc12e3c1ee024f4ca73a7b2c76fdea5932b82222..655ff0345bdbdf7be8beb6bae2a596c67886c11c 100644 (file)
--- a/src/asn1/asn1c/ContentInfo.h
+++ b/src/asn1/asn1c/ContentInfo.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "ContentType.h"
+#include "asn1/asn1c/ContentType.h"
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 

diff --git a/src/asn1/asn1c/ContentType.c b/src/asn1/asn1c/ContentType.c
index 291ce1035af93d2b208bb12f90fa423a4cfab21e..5b3ef169f024bf4de2b9b804ba5418f926620516 100644 (file)
--- a/src/asn1/asn1c/ContentType.c
+++ b/src/asn1/asn1c/ContentType.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ContentType.h"
+#include "asn1/asn1c/ContentType.h"
 
 /*
  * This type is implemented using OBJECT_IDENTIFIER,

diff --git a/src/asn1/asn1c/ContentTypePKCS7.c b/src/asn1/asn1c/ContentTypePKCS7.c
index 8cba12341786d89771a3d0954a443e7fc330954f..6d4067a94a50719e5eaf3ad8c7161feaa246d7fc 100644 (file)
--- a/src/asn1/asn1c/ContentTypePKCS7.c
+++ b/src/asn1/asn1c/ContentTypePKCS7.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ContentTypePKCS7.h"
+#include "asn1/asn1c/ContentTypePKCS7.h"
 
 /*
  * This type is implemented using OCTET_STRING,

diff --git a/src/asn1/asn1c/Countersignature.c b/src/asn1/asn1c/Countersignature.c
index ebd1c5b0f04daf6f47b55a8aa32625f64d17d749..aeedbad41c1c84a4b3332b5e521e212ecdf344ba 100644 (file)
--- a/src/asn1/asn1c/Countersignature.c
+++ b/src/asn1/asn1c/Countersignature.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "Countersignature.h"
+#include "asn1/asn1c/Countersignature.h"
 
 /*
  * This type is implemented using SignerInfo,

diff --git a/src/asn1/asn1c/Countersignature.h b/src/asn1/asn1c/Countersignature.h
index f929599ba789293afec8536c648aaa40fe5fb544..bb8358acd485f2f4fff356d4a662f63cd6654faa 100644 (file)
--- a/src/asn1/asn1c/Countersignature.h
+++ b/src/asn1/asn1c/Countersignature.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "SignerInfo.h"
+#include "asn1/asn1c/SignerInfo.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifier.c b/src/asn1/asn1c/DigestAlgorithmIdentifier.c
index 924cd146817335329588b1978a4d485f8f3cd7b8..b67d2f7ad74dab3725b3b46d6685605249b43113 100644 (file)
--- a/src/asn1/asn1c/DigestAlgorithmIdentifier.c
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifier.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "DigestAlgorithmIdentifier.h"
+#include "asn1/asn1c/DigestAlgorithmIdentifier.h"
 
 /*
  * This type is implemented using AlgorithmIdentifier,

diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifier.h b/src/asn1/asn1c/DigestAlgorithmIdentifier.h
index ca645ae852ac7245fa56ab09fbcd1fada7fbb03b..e520c190920ea501be602ccabfdf6da489da7059 100644 (file)
--- a/src/asn1/asn1c/DigestAlgorithmIdentifier.h
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifier.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "AlgorithmIdentifier.h"
+#include "asn1/asn1c/AlgorithmIdentifier.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifiers.c b/src/asn1/asn1c/DigestAlgorithmIdentifiers.c
index b4779c8ec22e4a5fb7991db1f1aaf9b2bddd1caf..2e5625cf4ecd399ed75ed6b5ce84ca6426c0bbcd 100644 (file)
--- a/src/asn1/asn1c/DigestAlgorithmIdentifiers.c
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifiers.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "DigestAlgorithmIdentifiers.h"
+#include "asn1/asn1c/DigestAlgorithmIdentifiers.h"
 
 asn_TYPE_member_t asn_MBR_DigestAlgorithmIdentifiers_1[] = {
        { ATF_POINTER, 0, 0,

diff --git a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
index 6b757c8e3ebda5ed426f1f189f72344de96195cf..b853005dadf4cf6e737575052e3de914afc7f484 100644 (file)
--- a/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
+++ b/src/asn1/asn1c/DigestAlgorithmIdentifiers.h
@@ -40,7 +40,7 @@ extern asn_TYPE_member_t asn_MBR_DigestAlgorithmIdentifiers_1[1];
 #endif
 
 /* Referred external types */
-#include "DigestAlgorithmIdentifier.h"
+#include "asn1/asn1c/DigestAlgorithmIdentifier.h"
 
 #endif /* _DigestAlgorithmIdentifiers_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/DistinguishedName.c b/src/asn1/asn1c/DistinguishedName.c
index 525a43c727f14ea1d8c3f50fd8ed02b434493f0c..71b493ea4b92e1d1f9fe7206798e782246f36576 100644 (file)
--- a/src/asn1/asn1c/DistinguishedName.c
+++ b/src/asn1/asn1c/DistinguishedName.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "DistinguishedName.h"
+#include "asn1/asn1c/DistinguishedName.h"
 
 /*
  * This type is implemented using RDNSequence,

diff --git a/src/asn1/asn1c/DistinguishedName.h b/src/asn1/asn1c/DistinguishedName.h
index 7dd0f41292db12efc0f13386f285c6cc6b9c388b..c1138ced38a149c786b0f9f28363bfcd539ac703 100644 (file)
--- a/src/asn1/asn1c/DistinguishedName.h
+++ b/src/asn1/asn1c/DistinguishedName.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "RDNSequence.h"
+#include "asn1/asn1c/RDNSequence.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/asn1/asn1c/EncapsulatedContentInfo.c b/src/asn1/asn1c/EncapsulatedContentInfo.c
index a66ad3b9c25bb0c49582839c65aee9d79f3806e1..51f7066fdf5e6cab5c14c7c669c0be42d7eb2e32 100644 (file)
--- a/src/asn1/asn1c/EncapsulatedContentInfo.c
+++ b/src/asn1/asn1c/EncapsulatedContentInfo.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "EncapsulatedContentInfo.h"
+#include "asn1/asn1c/EncapsulatedContentInfo.h"
 
 asn_TYPE_member_t asn_MBR_EncapsulatedContentInfo_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct EncapsulatedContentInfo, eContentType),

diff --git a/src/asn1/asn1c/EncapsulatedContentInfo.h b/src/asn1/asn1c/EncapsulatedContentInfo.h
index 95002ff96aa770ed0264b630e2ca623da8805144..3f9d91d411885d175a582f7903951d06aad1f366 100644 (file)
--- a/src/asn1/asn1c/EncapsulatedContentInfo.h
+++ b/src/asn1/asn1c/EncapsulatedContentInfo.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "ContentType.h"
+#include "asn1/asn1c/ContentType.h"
 #include "asn1/asn1c/OCTET_STRING.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 

diff --git a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.c b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.c
index 2b954dd9977d679e7d5b37bed137793c195207b7..8d1423e8b46329598f4ee7641bfdeea22d1a2807 100644 (file)
--- a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.c
+++ b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "EncapsulatedContentInfoPKCS7.h"
+#include "asn1/asn1c/EncapsulatedContentInfoPKCS7.h"
 
 asn_TYPE_member_t asn_MBR_EncapsulatedContentInfoPKCS7_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct EncapsulatedContentInfoPKCS7, eContentType),

diff --git a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
index 1b479c72afa8401a1340fd6953bccb9484ec3aa0..9b3dd1bb28e179ce0fd2b3b13466d90be9847bcd 100644 (file)
--- a/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
+++ b/src/asn1/asn1c/EncapsulatedContentInfoPKCS7.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "ContentType.h"
+#include "asn1/asn1c/ContentType.h"
 #include "asn1/asn1c/ANY.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 

diff --git a/src/asn1/asn1c/Extension.c b/src/asn1/asn1c/Extension.c
index b03d67eefe3daf25a1dc4ed2ff3aaf8b14ba1671..9e9876118150c03617533446976b51be9a67bdf5 100644 (file)
--- a/src/asn1/asn1c/Extension.c
+++ b/src/asn1/asn1c/Extension.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "Extension.h"
+#include "asn1/asn1c/Extension.h"
 
 static int asn_DFL_3_cmp_0(const void *sptr) {
        const BOOLEAN_t *st = sptr;

diff --git a/src/asn1/asn1c/Extensions.c b/src/asn1/asn1c/Extensions.c
index 1ef561a966c0b3ef72f7707422613debd4d6160d..0c09f279f5ce4e14156b91114e27fc30f47f3f9d 100644 (file)
--- a/src/asn1/asn1c/Extensions.c
+++ b/src/asn1/asn1c/Extensions.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "Extensions.h"
+#include "asn1/asn1c/Extensions.h"
 
 static asn_oer_constraints_t asn_OER_type_Extensions_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/Extensions.h b/src/asn1/asn1c/Extensions.h
index 5b8703eefc20ba33f86c73d65fb182cad0b01c46..dc296149df7126e9fae64ce786a3c35c4d3106cd 100644 (file)
--- a/src/asn1/asn1c/Extensions.h
+++ b/src/asn1/asn1c/Extensions.h
@@ -40,7 +40,7 @@ extern asn_TYPE_member_t asn_MBR_Extensions_1[1];
 #endif
 
 /* Referred external types */
-#include "Extension.h"
+#include "asn1/asn1c/Extension.h"
 
 #endif /* _Extensions_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/FileAndHash.c b/src/asn1/asn1c/FileAndHash.c
index ca83a31eacad52c4ec54a580cde0d9d3987089ee..05185d65977037bcc22093100c64dccc42931605 100644 (file)
--- a/src/asn1/asn1c/FileAndHash.c
+++ b/src/asn1/asn1c/FileAndHash.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "FileAndHash.h"
+#include "asn1/asn1c/FileAndHash.h"
 
 asn_TYPE_member_t asn_MBR_FileAndHash_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct FileAndHash, file),

diff --git a/src/asn1/asn1c/IPAddrBlocks.c b/src/asn1/asn1c/IPAddrBlocks.c
index cc99b2cf50efeb29d321298cb8c08ea3b9335572..aa7b09550ce121b6048b6f23db746faea335d1c7 100644 (file)
--- a/src/asn1/asn1c/IPAddrBlocks.c
+++ b/src/asn1/asn1c/IPAddrBlocks.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "IPAddrBlocks.h"
+#include "asn1/asn1c/IPAddrBlocks.h"
 
 static asn_TYPE_member_t asn_MBR_IPAddrBlocks_1[] = {
        { ATF_POINTER, 0, 0,

diff --git a/src/asn1/asn1c/IPAddrBlocks.h b/src/asn1/asn1c/IPAddrBlocks.h
index b3297cbd08e2cf0898051315ce19eadfa45fce0b..162be7a860448425294f318c1de07fa06f3815a8 100644 (file)
--- a/src/asn1/asn1c/IPAddrBlocks.h
+++ b/src/asn1/asn1c/IPAddrBlocks.h
@@ -38,7 +38,7 @@ extern asn_TYPE_descriptor_t asn_DEF_IPAddrBlocks;
 #endif
 
 /* Referred external types */
-#include "IPAddressFamily.h"
+#include "asn1/asn1c/IPAddressFamily.h"
 
 #endif /* _IPAddrBlocks_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/IPAddress.c b/src/asn1/asn1c/IPAddress.c
index 7ae1857bfd929f688bf4e9fe627d4ffb648b8029..5e66e0d4591aa3e7f2e46dba2e79d426045bce63 100644 (file)
--- a/src/asn1/asn1c/IPAddress.c
+++ b/src/asn1/asn1c/IPAddress.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "IPAddress.h"
+#include "asn1/asn1c/IPAddress.h"
 
 /*
  * This type is implemented using BIT_STRING,

diff --git a/src/asn1/asn1c/IPAddressChoice.c b/src/asn1/asn1c/IPAddressChoice.c
index f6e89c5a5dbbc6b51a9a9f2cb16a2c45b4c599a6..581a598a3f00fb766dc316a0eeb36950936f8701 100644 (file)
--- a/src/asn1/asn1c/IPAddressChoice.c
+++ b/src/asn1/asn1c/IPAddressChoice.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "IPAddressChoice.h"
+#include "asn1/asn1c/IPAddressChoice.h"
 
 static asn_oer_constraints_t asn_OER_type_IPAddressChoice_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/IPAddressChoice.h b/src/asn1/asn1c/IPAddressChoice.h
index 0a07c38d2706dbb93b6222d0a48eee3b4dd1b6b3..bc6548354ba68594b015bbafc6c43c3ca76a45d7 100644 (file)
--- a/src/asn1/asn1c/IPAddressChoice.h
+++ b/src/asn1/asn1c/IPAddressChoice.h
@@ -58,7 +58,7 @@ extern asn_TYPE_member_t asn_MBR_IPAddressChoice_1[2];
 #endif
 
 /* Referred external types */
-#include "IPAddressOrRange.h"
+#include "asn1/asn1c/IPAddressOrRange.h"
 
 #endif /* _IPAddressChoice_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/IPAddressFamily.c b/src/asn1/asn1c/IPAddressFamily.c
index ff8759952076f46f6ecedb42f3c54f17a3df8b64..adacc6dbf946e4063704ccf2b26495aca04019bc 100644 (file)
--- a/src/asn1/asn1c/IPAddressFamily.c
+++ b/src/asn1/asn1c/IPAddressFamily.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "IPAddressFamily.h"
+#include "asn1/asn1c/IPAddressFamily.h"
 
 static int
 memb_addressFamily_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,

diff --git a/src/asn1/asn1c/IPAddressFamily.h b/src/asn1/asn1c/IPAddressFamily.h
index e3db475d237354b6997448a2c2b1e085c78d04da..a8ed77ccf38e3c892aa8b36f780027a952c06188 100644 (file)
--- a/src/asn1/asn1c/IPAddressFamily.h
+++ b/src/asn1/asn1c/IPAddressFamily.h
@@ -13,7 +13,7 @@
 
 /* Including external dependencies */
 #include "asn1/asn1c/OCTET_STRING.h"
-#include "IPAddressChoice.h"
+#include "asn1/asn1c/IPAddressChoice.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/IPAddressOrRange.c b/src/asn1/asn1c/IPAddressOrRange.c
index 3837df632298e6206ebdb361623acfb5b91ad342..98ba69b779e8870e9b9fa768be80b109447e7ead 100644 (file)
--- a/src/asn1/asn1c/IPAddressOrRange.c
+++ b/src/asn1/asn1c/IPAddressOrRange.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "IPAddressOrRange.h"
+#include "asn1/asn1c/IPAddressOrRange.h"
 
 static asn_oer_constraints_t asn_OER_type_IPAddressOrRange_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/IPAddressOrRange.h b/src/asn1/asn1c/IPAddressOrRange.h
index 4d2fd9abc7c0c3fdc5e8cf14005b44dff05bdb51..22974db95f5458c7bcabe115e030cfcf8e6c7f27 100644 (file)
--- a/src/asn1/asn1c/IPAddressOrRange.h
+++ b/src/asn1/asn1c/IPAddressOrRange.h
@@ -12,8 +12,8 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "IPAddress.h"
-#include "IPAddressRange.h"
+#include "asn1/asn1c/IPAddress.h"
+#include "asn1/asn1c/IPAddressRange.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/IPAddressRange.c b/src/asn1/asn1c/IPAddressRange.c
index e4312318a68df43516f2fe1047e50059c0e60fa5..82d3b8ff7800400202e66404eecfb2fc62a80d6c 100644 (file)
--- a/src/asn1/asn1c/IPAddressRange.c
+++ b/src/asn1/asn1c/IPAddressRange.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "IPAddressRange.h"
+#include "asn1/asn1c/IPAddressRange.h"
 
 asn_TYPE_member_t asn_MBR_IPAddressRange_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct IPAddressRange, min),

diff --git a/src/asn1/asn1c/IPAddressRange.h b/src/asn1/asn1c/IPAddressRange.h
index 0efe82798323168245a2aa9bceb6f6c68b52673f..02038e4638cdae9feac2aee8fa25e09c0cbfbb0e 100644 (file)
--- a/src/asn1/asn1c/IPAddressRange.h
+++ b/src/asn1/asn1c/IPAddressRange.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "IPAddress.h"
+#include "asn1/asn1c/IPAddress.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/IssuerAndSerialNumber.c b/src/asn1/asn1c/IssuerAndSerialNumber.c
index 7ec53e98c9b8236d9f3b24da391cc094937d10f0..5cfb0d5acde445f3fb6eec19751693b81a98564e 100644 (file)
--- a/src/asn1/asn1c/IssuerAndSerialNumber.c
+++ b/src/asn1/asn1c/IssuerAndSerialNumber.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "IssuerAndSerialNumber.h"
+#include "asn1/asn1c/IssuerAndSerialNumber.h"
 
 asn_TYPE_member_t asn_MBR_IssuerAndSerialNumber_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct IssuerAndSerialNumber, issuer),

diff --git a/src/asn1/asn1c/IssuerAndSerialNumber.h b/src/asn1/asn1c/IssuerAndSerialNumber.h
index 80b66cf81ced30bcb7c86f92bf5d4694ef45b6e0..432120d31b07d077dcc269562774cd9dd06669b0 100644 (file)
--- a/src/asn1/asn1c/IssuerAndSerialNumber.h
+++ b/src/asn1/asn1c/IssuerAndSerialNumber.h
@@ -12,8 +12,8 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "Name.h"
-#include "CertificateSerialNumber.h"
+#include "asn1/asn1c/Name.h"
+#include "asn1/asn1c/CertificateSerialNumber.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/Manifest.c b/src/asn1/asn1c/Manifest.c
index 2f63b96dae50fcd13f661014fc2ba3445e0384ce..80a6885f8f2464058b91c5c39ace756cdbfe4546 100644 (file)
--- a/src/asn1/asn1c/Manifest.c
+++ b/src/asn1/asn1c/Manifest.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "Manifest.h"
+#include "asn1/asn1c/Manifest.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 98a22df400a4368ebb3e116d8eff5c9ca51bc409..8eb2bc73e92594e45559aedb75656b112537cb4a 100644 (file)
--- a/src/asn1/asn1c/Manifest.h
+++ b/src/asn1/asn1c/Manifest.h
@@ -52,7 +52,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Manifest;
 #endif
 
 /* Referred external types */
-#include "FileAndHash.h"
+#include "asn1/asn1c/FileAndHash.h"
 
 #endif /* _Manifest_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/MessageDigest.c b/src/asn1/asn1c/MessageDigest.c
index 95c992a1ce43d01ce6f67841457601f54428ba4d..29b39e76c6baa8bf391692587334e6dda6814eb7 100644 (file)
--- a/src/asn1/asn1c/MessageDigest.c
+++ b/src/asn1/asn1c/MessageDigest.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "MessageDigest.h"
+#include "asn1/asn1c/MessageDigest.h"
 
 /*
  * This type is implemented using OCTET_STRING,

diff --git a/src/asn1/asn1c/Name.c b/src/asn1/asn1c/Name.c
index e0fdfa54466e88d277ecf0fcdbeb70390545966d..19906fc472204b5867228c8bf80f3344714175b7 100644 (file)
--- a/src/asn1/asn1c/Name.c
+++ b/src/asn1/asn1c/Name.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "Name.h"
+#include "asn1/asn1c/Name.h"
 
 static asn_oer_constraints_t asn_OER_type_Name_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/Name.h b/src/asn1/asn1c/Name.h
index 97bf06e9edc000fc786f1342f800b8a0cd4b0c3c..c6a1b25b47f7107f6cd1abf51331634363f11957 100644 (file)
--- a/src/asn1/asn1c/Name.h
+++ b/src/asn1/asn1c/Name.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "RDNSequence.h"
+#include "asn1/asn1c/RDNSequence.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/OtherRevocationInfoFormat.c b/src/asn1/asn1c/OtherRevocationInfoFormat.c
index 45b7bb9497979f0e0347351b5231044718d44409..4c5301cee9648a53fe5be0866abcf22c7258b0a3 100644 (file)
--- a/src/asn1/asn1c/OtherRevocationInfoFormat.c
+++ b/src/asn1/asn1c/OtherRevocationInfoFormat.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "OtherRevocationInfoFormat.h"
+#include "asn1/asn1c/OtherRevocationInfoFormat.h"
 
 asn_TYPE_member_t asn_MBR_OtherRevocationInfoFormat_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct OtherRevocationInfoFormat, otherRevInfoFormat),

diff --git a/src/asn1/asn1c/RDNSequence.c b/src/asn1/asn1c/RDNSequence.c
index da65f173fb04a63d922674405d550466a94e2ac1..ad2ad4451597fd47f305f11ea0cbdee4dc6c5bcc 100644 (file)
--- a/src/asn1/asn1c/RDNSequence.c
+++ b/src/asn1/asn1c/RDNSequence.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "RDNSequence.h"
+#include "asn1/asn1c/RDNSequence.h"
 
 asn_TYPE_member_t asn_MBR_RDNSequence_1[] = {
        { ATF_POINTER, 0, 0,

diff --git a/src/asn1/asn1c/RDNSequence.h b/src/asn1/asn1c/RDNSequence.h
index 72a8bf0c7bac3cdeca7ee93b736b411e2d4c35cb..dea5d4f548670e38616c35ccac47a5e9139e0913 100644 (file)
--- a/src/asn1/asn1c/RDNSequence.h
+++ b/src/asn1/asn1c/RDNSequence.h
@@ -40,7 +40,7 @@ extern asn_TYPE_member_t asn_MBR_RDNSequence_1[1];
 #endif
 
 /* Referred external types */
-#include "RelativeDistinguishedName.h"
+#include "asn1/asn1c/RelativeDistinguishedName.h"
 
 #endif /* _RDNSequence_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/ROAIPAddress.c b/src/asn1/asn1c/ROAIPAddress.c
index 4fd51a5cb8cd6d6da33435e1e9d1af13f3229e07..6500d56c729f897a21ac5484fea6cc39d8e8158c 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddress.c
+++ b/src/asn1/asn1c/ROAIPAddress.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ROAIPAddress.h"
+#include "asn1/asn1c/ROAIPAddress.h"
 
 asn_TYPE_member_t asn_MBR_ROAIPAddress_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct ROAIPAddress, address),

diff --git a/src/asn1/asn1c/ROAIPAddress.h b/src/asn1/asn1c/ROAIPAddress.h
index e1d68e1870a01fb06bc56e883424730867d3d14c..49e7b86fe8eb650f4d76c26e12c5d107122c6875 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddress.h
+++ b/src/asn1/asn1c/ROAIPAddress.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "IPAddress.h"
+#include "asn1/asn1c/IPAddress.h"
 #include "asn1/asn1c/INTEGER.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 

diff --git a/src/asn1/asn1c/ROAIPAddressFamily.c b/src/asn1/asn1c/ROAIPAddressFamily.c
index cb3c0963ab3aada6a558184d27a70d5451b2b7df..697f2eb3cdb623c6cb2fd4b08a3aa27c8103215c 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddressFamily.c
+++ b/src/asn1/asn1c/ROAIPAddressFamily.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "ROAIPAddressFamily.h"
+#include "asn1/asn1c/ROAIPAddressFamily.h"
 
 static int
 memb_addressFamily_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr,

diff --git a/src/asn1/asn1c/ROAIPAddressFamily.h b/src/asn1/asn1c/ROAIPAddressFamily.h
index 668eb33e501505d1a98e78ed9bb623dff39a3ce2..dcd570ea25d8a55ad22dd9d9826bb5e98731e4af 100644 (file)
--- a/src/asn1/asn1c/ROAIPAddressFamily.h
+++ b/src/asn1/asn1c/ROAIPAddressFamily.h
@@ -48,7 +48,7 @@ extern asn_TYPE_member_t asn_MBR_ROAIPAddressFamily_1[2];
 #endif
 
 /* Referred external types */
-#include "ROAIPAddress.h"
+#include "asn1/asn1c/ROAIPAddress.h"
 
 #endif /* _ROAIPAddressFamily_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/RelativeDistinguishedName.c b/src/asn1/asn1c/RelativeDistinguishedName.c
index cb70d4f3280abec97638a8bccdcd1589a663032c..4cf2bdc7a2cd26dbe1728e9d4df88c802e7516e3 100644 (file)
--- a/src/asn1/asn1c/RelativeDistinguishedName.c
+++ b/src/asn1/asn1c/RelativeDistinguishedName.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "RelativeDistinguishedName.h"
+#include "asn1/asn1c/RelativeDistinguishedName.h"
 
 static asn_oer_constraints_t asn_OER_type_RelativeDistinguishedName_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/RelativeDistinguishedName.h b/src/asn1/asn1c/RelativeDistinguishedName.h
index 2d1d0b4d7983855a719a1c38d87961f54cfd8cef..6dcec988d1abe7690c80828701159850832eadce 100644 (file)
--- a/src/asn1/asn1c/RelativeDistinguishedName.h
+++ b/src/asn1/asn1c/RelativeDistinguishedName.h
@@ -40,7 +40,7 @@ extern asn_TYPE_member_t asn_MBR_RelativeDistinguishedName_1[1];
 #endif
 
 /* Referred external types */
-#include "AttributeTypeAndValue.h"
+#include "asn1/asn1c/AttributeTypeAndValue.h"
 
 #endif /* _RelativeDistinguishedName_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/RevocationInfoChoice.c b/src/asn1/asn1c/RevocationInfoChoice.c
index 4fdacdacfd88fe3fa5acff3c2bffc661b984e89b..6e0f9e6798277551f352ab098335226b609ab109 100644 (file)
--- a/src/asn1/asn1c/RevocationInfoChoice.c
+++ b/src/asn1/asn1c/RevocationInfoChoice.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "RevocationInfoChoice.h"
+#include "asn1/asn1c/RevocationInfoChoice.h"
 
 static asn_oer_constraints_t asn_OER_type_RevocationInfoChoice_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/RevocationInfoChoice.h b/src/asn1/asn1c/RevocationInfoChoice.h
index 7813aad6f959c3d3309d7b38f7cf78e8a5b8e38c..8df702e17d1f2b757d2d64cbcd4a110aebcf5a85 100644 (file)
--- a/src/asn1/asn1c/RevocationInfoChoice.h
+++ b/src/asn1/asn1c/RevocationInfoChoice.h
@@ -12,8 +12,8 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "CertificateList.h"
-#include "OtherRevocationInfoFormat.h"
+#include "asn1/asn1c/CertificateList.h"
+#include "asn1/asn1c/OtherRevocationInfoFormat.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/RevocationInfoChoices.c b/src/asn1/asn1c/RevocationInfoChoices.c
index 1364e098d8b8902a0dd7c24b595a69ab435b636a..2df9beb628ed70220fe2bacd3725e09436d17b23 100644 (file)
--- a/src/asn1/asn1c/RevocationInfoChoices.c
+++ b/src/asn1/asn1c/RevocationInfoChoices.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "RevocationInfoChoices.h"
+#include "asn1/asn1c/RevocationInfoChoices.h"
 
 asn_TYPE_member_t asn_MBR_RevocationInfoChoices_1[] = {
        { ATF_POINTER, 0, 0,

diff --git a/src/asn1/asn1c/RevocationInfoChoices.h b/src/asn1/asn1c/RevocationInfoChoices.h
index d5b2259c9dc0d0f6800a2e6e58f2e84edc65e062..bff280a31f2d2a0b2d1e70a918d9c9958e37b345 100644 (file)
--- a/src/asn1/asn1c/RevocationInfoChoices.h
+++ b/src/asn1/asn1c/RevocationInfoChoices.h
@@ -40,7 +40,7 @@ extern asn_TYPE_member_t asn_MBR_RevocationInfoChoices_1[1];
 #endif
 
 /* Referred external types */
-#include "RevocationInfoChoice.h"
+#include "asn1/asn1c/RevocationInfoChoice.h"
 
 #endif /* _RevocationInfoChoices_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/RouteOriginAttestation.c b/src/asn1/asn1c/RouteOriginAttestation.c
index 646964b91b478b41d08661aa5a7c764ec8804a0b..04ff4b273aadeeba38057f778a803afa6700b07c 100644 (file)
--- a/src/asn1/asn1c/RouteOriginAttestation.c
+++ b/src/asn1/asn1c/RouteOriginAttestation.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "RouteOriginAttestation.h"
+#include "asn1/asn1c/RouteOriginAttestation.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 c5ae9e419cc650b96cdd8c76949f2c040fe3f717..f8dc17fbf98e0b3df53ecfbfff2b08d0efd0ef3b 100644 (file)
--- a/src/asn1/asn1c/RouteOriginAttestation.h
+++ b/src/asn1/asn1c/RouteOriginAttestation.h
@@ -13,7 +13,7 @@
 
 /* Including external dependencies */
 #include "asn1/asn1c/INTEGER.h"
-#include "ASId.h"
+#include "asn1/asn1c/ASId.h"
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_RouteOriginAttestation;
 #endif
 
 /* Referred external types */
-#include "ROAIPAddressFamily.h"
+#include "asn1/asn1c/ROAIPAddressFamily.h"
 
 #endif /* _RouteOriginAttestation_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/SignatureAlgorithmIdentifier.c b/src/asn1/asn1c/SignatureAlgorithmIdentifier.c
index 2ade2dcc13cd21c96d5cea9fc08aaf3c0b71ab53..5eca1e7fb8295593ab1ba8523203c1ad1cb9439d 100644 (file)
--- a/src/asn1/asn1c/SignatureAlgorithmIdentifier.c
+++ b/src/asn1/asn1c/SignatureAlgorithmIdentifier.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "SignatureAlgorithmIdentifier.h"
+#include "asn1/asn1c/SignatureAlgorithmIdentifier.h"
 
 /*
  * This type is implemented using AlgorithmIdentifier,

diff --git a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
index 5d2f6d4f236f7f678d58a80b719b8ec2429717ad..cc15f45b125356023b7ac4ce8f29eecfd2d50abd 100644 (file)
--- a/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
+++ b/src/asn1/asn1c/SignatureAlgorithmIdentifier.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "AlgorithmIdentifier.h"
+#include "asn1/asn1c/AlgorithmIdentifier.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/asn1/asn1c/SignatureValue.c b/src/asn1/asn1c/SignatureValue.c
index a2be15710888f553a7341ca27a8a25032407cbc8..654cbb951d8c61554b0d29e785a8f788aba3b430 100644 (file)
--- a/src/asn1/asn1c/SignatureValue.c
+++ b/src/asn1/asn1c/SignatureValue.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "SignatureValue.h"
+#include "asn1/asn1c/SignatureValue.h"
 
 /*
  * This type is implemented using OCTET_STRING,

diff --git a/src/asn1/asn1c/SignedAttributes.c b/src/asn1/asn1c/SignedAttributes.c
index 31ac5e59a9318ec46290b66ce785afa4326829db..06514d3b39caf8aae8aa04821f3b81680a7950b6 100644 (file)
--- a/src/asn1/asn1c/SignedAttributes.c
+++ b/src/asn1/asn1c/SignedAttributes.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "SignedAttributes.h"
+#include "asn1/asn1c/SignedAttributes.h"
 
 static asn_oer_constraints_t asn_OER_type_SignedAttributes_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/SignedAttributes.h b/src/asn1/asn1c/SignedAttributes.h
index be8c616d9b4ee1c1fa1343ade5ae4e2f19be6321..c32d05ee8660fa858c175f58d182430ed99db898 100644 (file)
--- a/src/asn1/asn1c/SignedAttributes.h
+++ b/src/asn1/asn1c/SignedAttributes.h
@@ -40,7 +40,7 @@ extern asn_TYPE_member_t asn_MBR_SignedAttributes_1[1];
 #endif
 
 /* Referred external types */
-#include "CMSAttribute.h"
+#include "asn1/asn1c/CMSAttribute.h"
 
 #endif /* _SignedAttributes_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/SignedData.c b/src/asn1/asn1c/SignedData.c
index c925448b98f54818515835cf85497e17566503b3..ca1f1f804e3bc65186ee68e05b440792f8b80a92 100644 (file)
--- a/src/asn1/asn1c/SignedData.c
+++ b/src/asn1/asn1c/SignedData.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "SignedData.h"
+#include "asn1/asn1c/SignedData.h"
 
 static asn_TYPE_member_t asn_MBR_SignedData_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct SignedData, version),

diff --git a/src/asn1/asn1c/SignedData.h b/src/asn1/asn1c/SignedData.h
index 23573ff2f574c2e4d97817d520e5ce478963f2e2..f527eb294cfd024285064b88d9fb3bd25f0d0d0b 100644 (file)
--- a/src/asn1/asn1c/SignedData.h
+++ b/src/asn1/asn1c/SignedData.h
@@ -12,10 +12,10 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "CMSVersion.h"
-#include "DigestAlgorithmIdentifiers.h"
-#include "EncapsulatedContentInfo.h"
-#include "SignerInfos.h"
+#include "asn1/asn1c/CMSVersion.h"
+#include "asn1/asn1c/DigestAlgorithmIdentifiers.h"
+#include "asn1/asn1c/EncapsulatedContentInfo.h"
+#include "asn1/asn1c/SignerInfos.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
 #ifdef __cplusplus
@@ -47,8 +47,8 @@ extern asn_TYPE_descriptor_t asn_DEF_SignedData;
 #endif
 
 /* Referred external types */
-#include "CertificateSet.h"
-#include "RevocationInfoChoices.h"
+#include "asn1/asn1c/CertificateSet.h"
+#include "asn1/asn1c/RevocationInfoChoices.h"
 
 #endif /* _SignedData_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/SignedDataPKCS7.c b/src/asn1/asn1c/SignedDataPKCS7.c
index 5a9e89e42ed542332ee79a1dae0e243ab2514bb4..79d59bdcd5edd3f2ed6cdbe65c741b0cd9dc9bf0 100644 (file)
--- a/src/asn1/asn1c/SignedDataPKCS7.c
+++ b/src/asn1/asn1c/SignedDataPKCS7.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "SignedDataPKCS7.h"
+#include "asn1/asn1c/SignedDataPKCS7.h"
 
 static asn_TYPE_member_t asn_MBR_SignedDataPKCS7_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct SignedDataPKCS7, version),

diff --git a/src/asn1/asn1c/SignedDataPKCS7.h b/src/asn1/asn1c/SignedDataPKCS7.h
index f47ffdba3dace1df351b3f882023b26537573328..bc80e8e2ebe0bd3332aa204b89d80d46fef519c9 100644 (file)
--- a/src/asn1/asn1c/SignedDataPKCS7.h
+++ b/src/asn1/asn1c/SignedDataPKCS7.h
@@ -12,10 +12,10 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "CMSVersion.h"
-#include "DigestAlgorithmIdentifiers.h"
-#include "EncapsulatedContentInfoPKCS7.h"
-#include "SignerInfos.h"
+#include "asn1/asn1c/CMSVersion.h"
+#include "asn1/asn1c/DigestAlgorithmIdentifiers.h"
+#include "asn1/asn1c/EncapsulatedContentInfoPKCS7.h"
+#include "asn1/asn1c/SignerInfos.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
 #ifdef __cplusplus
@@ -47,8 +47,8 @@ extern asn_TYPE_descriptor_t asn_DEF_SignedDataPKCS7;
 #endif
 
 /* Referred external types */
-#include "CertificateSet.h"
-#include "RevocationInfoChoices.h"
+#include "asn1/asn1c/CertificateSet.h"
+#include "asn1/asn1c/RevocationInfoChoices.h"
 
 #endif /* _SignedDataPKCS7_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/SignerIdentifier.c b/src/asn1/asn1c/SignerIdentifier.c
index 13af4de580ccf4fe484b38445a538fdf943a3356..9f014fceef230fc007eb678617c3ab8d2f0ef5d1 100644 (file)
--- a/src/asn1/asn1c/SignerIdentifier.c
+++ b/src/asn1/asn1c/SignerIdentifier.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "SignerIdentifier.h"
+#include "asn1/asn1c/SignerIdentifier.h"
 
 static asn_oer_constraints_t asn_OER_type_SignerIdentifier_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/SignerIdentifier.h b/src/asn1/asn1c/SignerIdentifier.h
index e15a1d69e09080ddf26e23c662b985b7491beff1..a465dc753ea5c6b926d10e4ce8f8cf701806e4fc 100644 (file)
--- a/src/asn1/asn1c/SignerIdentifier.h
+++ b/src/asn1/asn1c/SignerIdentifier.h
@@ -12,8 +12,8 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "IssuerAndSerialNumber.h"
-#include "CMSSubjectKeyIdentifier.h"
+#include "asn1/asn1c/IssuerAndSerialNumber.h"
+#include "asn1/asn1c/CMSSubjectKeyIdentifier.h"
 #include "asn1/asn1c/constr_CHOICE.h"
 
 #ifdef __cplusplus

diff --git a/src/asn1/asn1c/SignerInfo.c b/src/asn1/asn1c/SignerInfo.c
index 4b944e78281eefefc8f5f7fd8baede191206fd53..ac2c6637a68fe65c50a66aa9871a6df07641f8ad 100644 (file)
--- a/src/asn1/asn1c/SignerInfo.c
+++ b/src/asn1/asn1c/SignerInfo.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "SignerInfo.h"
+#include "asn1/asn1c/SignerInfo.h"
 
 asn_TYPE_member_t asn_MBR_SignerInfo_1[] = {
        { ATF_NOFLAGS, 0, offsetof(struct SignerInfo, version),

diff --git a/src/asn1/asn1c/SignerInfo.h b/src/asn1/asn1c/SignerInfo.h
index 37d5a39ae7403a5cea9b9496cf707d8933281c66..9ef08085dc24d183364d3942ee34704abcee5f12 100644 (file)
--- a/src/asn1/asn1c/SignerInfo.h
+++ b/src/asn1/asn1c/SignerInfo.h
@@ -12,11 +12,11 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "CMSVersion.h"
-#include "SignerIdentifier.h"
-#include "DigestAlgorithmIdentifier.h"
-#include "SignatureAlgorithmIdentifier.h"
-#include "SignatureValue.h"
+#include "asn1/asn1c/CMSVersion.h"
+#include "asn1/asn1c/SignerIdentifier.h"
+#include "asn1/asn1c/DigestAlgorithmIdentifier.h"
+#include "asn1/asn1c/SignatureAlgorithmIdentifier.h"
+#include "asn1/asn1c/SignatureValue.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 
 #ifdef __cplusplus
@@ -51,8 +51,8 @@ extern asn_TYPE_member_t asn_MBR_SignerInfo_1[7];
 #endif
 
 /* Referred external types */
-#include "SignedAttributes.h"
-#include "UnsignedAttributes.h"
+#include "asn1/asn1c/SignedAttributes.h"
+#include "asn1/asn1c/UnsignedAttributes.h"
 
 #endif /* _SignerInfo_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/SignerInfos.c b/src/asn1/asn1c/SignerInfos.c
index a22d82809fdec878d8aaca10f47e0d46db80ebcd..68a085510cc6020b59001dfb13cdd347def029a7 100644 (file)
--- a/src/asn1/asn1c/SignerInfos.c
+++ b/src/asn1/asn1c/SignerInfos.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "SignerInfos.h"
+#include "asn1/asn1c/SignerInfos.h"
 
 asn_TYPE_member_t asn_MBR_SignerInfos_1[] = {
        { ATF_POINTER, 0, 0,

diff --git a/src/asn1/asn1c/SignerInfos.h b/src/asn1/asn1c/SignerInfos.h
index f1613142d757e56216c7adaf6dd5c18f1e56d387..fbcdc4690505631b314f1d15a1e0441be3600475 100644 (file)
--- a/src/asn1/asn1c/SignerInfos.h
+++ b/src/asn1/asn1c/SignerInfos.h
@@ -40,7 +40,7 @@ extern asn_TYPE_member_t asn_MBR_SignerInfos_1[1];
 #endif
 
 /* Referred external types */
-#include "SignerInfo.h"
+#include "asn1/asn1c/SignerInfo.h"
 
 #endif /* _SignerInfos_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/SigningTime.c b/src/asn1/asn1c/SigningTime.c
index 5f14fccfdbd90c4440494f2dd1c00106a6af2df9..7e69e7c35c1a9a778da757ae2211e80d0087105b 100644 (file)
--- a/src/asn1/asn1c/SigningTime.c
+++ b/src/asn1/asn1c/SigningTime.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "SigningTime.h"
+#include "asn1/asn1c/SigningTime.h"
 
 /*
  * This type is implemented using Time,

diff --git a/src/asn1/asn1c/SigningTime.h b/src/asn1/asn1c/SigningTime.h
index 601eab785648f42655662b409a9606863268a525..eab03ad8c67e1c0b7efdd834dc0996b3d7a3f4b0 100644 (file)
--- a/src/asn1/asn1c/SigningTime.h
+++ b/src/asn1/asn1c/SigningTime.h
@@ -12,7 +12,7 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "Time.h"
+#include "asn1/asn1c/Time.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/asn1/asn1c/TBSCertList.c b/src/asn1/asn1c/TBSCertList.c
index aef4dba0bf8b9e78791f1400b147b77c7cda119e..4f0476bcb9dd537b2a374faf9d371f3bd38e5b8f 100644 (file)
--- a/src/asn1/asn1c/TBSCertList.c
+++ b/src/asn1/asn1c/TBSCertList.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "TBSCertList.h"
+#include "asn1/asn1c/TBSCertList.h"
 
 static asn_TYPE_member_t asn_MBR_Member_8[] = {
        { ATF_NOFLAGS, 0, offsetof(struct TBSCertList__revokedCertificates__Member, userCertificate),

diff --git a/src/asn1/asn1c/TBSCertList.h b/src/asn1/asn1c/TBSCertList.h
index 24da00f0a34e2b09acba7fe6d36623253d1a51a9..4425e44f1e170b0818d2554cc537f5a952dc608d 100644 (file)
--- a/src/asn1/asn1c/TBSCertList.h
+++ b/src/asn1/asn1c/TBSCertList.h
@@ -12,12 +12,12 @@
 #include "asn1/asn1c/asn_application.h"
 
 /* Including external dependencies */
-#include "Version.h"
-#include "AlgorithmIdentifier.h"
-#include "Name.h"
-#include "Time.h"
+#include "asn1/asn1c/Version.h"
+#include "asn1/asn1c/AlgorithmIdentifier.h"
+#include "asn1/asn1c/Name.h"
+#include "asn1/asn1c/Time.h"
 #include "asn1/asn1c/asn_SEQUENCE_OF.h"
-#include "CertificateSerialNumber.h"
+#include "asn1/asn1c/CertificateSerialNumber.h"
 #include "asn1/asn1c/constr_SEQUENCE.h"
 #include "asn1/asn1c/constr_SEQUENCE_OF.h"
 
@@ -68,8 +68,8 @@ extern asn_TYPE_member_t asn_MBR_TBSCertList_1[7];
 #endif
 
 /* Referred external types */
-#include "Time.h"
-#include "Extensions.h"
+#include "asn1/asn1c/Time.h"
+#include "asn1/asn1c/Extensions.h"
 
 #endif /* _TBSCertList_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/Time.c b/src/asn1/asn1c/Time.c
index 2403d4b37c6fb182e5712232fe297c161f2e45bc..f805b5d313a898023ad5fe79c2a6cab87cb85d58 100644 (file)
--- a/src/asn1/asn1c/Time.c
+++ b/src/asn1/asn1c/Time.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "Time.h"
+#include "asn1/asn1c/Time.h"
 
 static asn_oer_constraints_t asn_OER_type_Time_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/UnsignedAttributes.c b/src/asn1/asn1c/UnsignedAttributes.c
index 586856812be7e66b9bae572f91431af07e923626..f5a122037f65f0c18504c448b414537663a544a2 100644 (file)
--- a/src/asn1/asn1c/UnsignedAttributes.c
+++ b/src/asn1/asn1c/UnsignedAttributes.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "UnsignedAttributes.h"
+#include "asn1/asn1c/UnsignedAttributes.h"
 
 static asn_oer_constraints_t asn_OER_type_UnsignedAttributes_constr_1 CC_NOTUSED = {
        { 0, 0 },

diff --git a/src/asn1/asn1c/UnsignedAttributes.h b/src/asn1/asn1c/UnsignedAttributes.h
index 1e25357d9c52c600d630747cc837b993ebaa0b4f..d278658d6dbb1cdd0336901c532f16772ee74d18 100644 (file)
--- a/src/asn1/asn1c/UnsignedAttributes.h
+++ b/src/asn1/asn1c/UnsignedAttributes.h
@@ -40,7 +40,7 @@ extern asn_TYPE_member_t asn_MBR_UnsignedAttributes_1[1];
 #endif
 
 /* Referred external types */
-#include "CMSAttribute.h"
+#include "asn1/asn1c/CMSAttribute.h"
 
 #endif /* _UnsignedAttributes_H_ */
 #include "asn1/asn1c/asn_internal.h"

diff --git a/src/asn1/asn1c/Version.c b/src/asn1/asn1c/Version.c
index 5b6df294fdaaa45a5b4ab3a8b40a3152b3291444..0a708afac7a76da718f41570bee510064f65c40d 100644 (file)
--- a/src/asn1/asn1c/Version.c
+++ b/src/asn1/asn1c/Version.c
@@ -5,7 +5,7 @@
  *     `asn1c -Werror -fcompound-names -fwide-types -D asn1/asn1c -no-gen-PER -no-gen-example`
  */
 
-#include "Version.h"
+#include "asn1/asn1c/Version.h"
 
 /*
  * This type is implemented using INTEGER,

diff --git a/src/asn1/asn1c/asn_application.h b/src/asn1/asn1c/asn_application.h
index 3ca9f138eee7b4ef777d165e7032f449e068720a..7d33201e8c8942465b76fe48b1fc217c8d6d9120 100644 (file)
--- a/src/asn1/asn1c/asn_application.h
+++ b/src/asn1/asn1c/asn_application.h
@@ -8,8 +8,8 @@
 #ifndef        ASN_APPLICATION_H
 #define        ASN_APPLICATION_H
 
-#include "asn_system.h"                /* for platform-dependent types */
-#include "asn_codecs.h"                /* for ASN.1 codecs specifics */
+#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" {
@@ -164,6 +164,6 @@ typedef void (asn_app_constraint_failed_f)(void *application_specific_key,
 }
 #endif
 
-#include "constr_TYPE.h"       /* for asn_TYPE_descriptor_t */
+#include "asn1/asn1c/constr_TYPE.h"    /* for asn_TYPE_descriptor_t */
 
 #endif /* ASN_APPLICATION_H */

diff --git a/src/asn1/asn1c/asn_internal.h b/src/asn1/asn1c/asn_internal.h
index 4e72d62f30addb09bc9fd92c354ff1233d321e69..e6bb4ee394c35b033fb27567d6404b1cadf63327 100644 (file)
--- a/src/asn1/asn1c/asn_internal.h
+++ b/src/asn1/asn1c/asn_internal.h
@@ -10,7 +10,7 @@
 #ifndef __EXTENSIONS__
 #define __EXTENSIONS__          /* for Sun */
 #endif
-#include "asn_application.h"   /* Application-visible API */
+#include "asn1/asn1c/asn_application.h"        /* Application-visible API */
 
 #ifndef        __NO_ASSERT_H__         /* Include assert.h only for internal use. */
 #include <assert.h>            /* for assert() macro */

diff --git a/src/asn1/content_info.c b/src/asn1/content_info.c
index 8c1225516815cf5e2fddc421b5201c43cbb01723..c5a2a27c80b2485afdef6ab010709076be77af65 100644 (file)
--- a/src/asn1/content_info.c
+++ b/src/asn1/content_info.c
@@ -1,9 +1,9 @@
-#include "content_info.h"
+#include "asn1/content_info.h"
 
 #include <errno.h>
 #include "file.h"
 #include "log.h"
-#include "oid.h"
+#include "asn1/oid.h"
 #include "asn1/decode.h"
 #include "asn1/asn1c/ContentType.h"
 

diff --git a/src/asn1/decode.c b/src/asn1/decode.c
index a7652946c6ee7883436d0ae8401b970a15bbbb2a..ca99b776682d7e74577f1a4c42be5c6571311840 100644 (file)
--- a/src/asn1/decode.c
+++ b/src/asn1/decode.c
@@ -1,4 +1,4 @@
-#include "decode.h"
+#include "asn1/decode.h"
 
 #include <errno.h>
 #include "common.h"

diff --git a/src/asn1/oid.c b/src/asn1/oid.c
index dc013a5c7951ed93517a7c513c6b7990f4d70fa4..ee569be8d299cf0c3b4664b77d47a06bad5284a7 100644 (file)
--- a/src/asn1/oid.c
+++ b/src/asn1/oid.c
@@ -1,4 +1,4 @@
-#include "oid.h"
+#include "asn1/oid.h"
 
 #include <errno.h>
 #include "alloc.h"

diff --git a/src/asn1/signed_data.c b/src/asn1/signed_data.c
index 535b51d6e41fee352edf934d3e686f9ce674c2ee..c4e178e0a119a565b8864d1b09d619c3e7532d59 100644 (file)
--- a/src/asn1/signed_data.c
+++ b/src/asn1/signed_data.c
@@ -6,7 +6,7 @@
 #include "alloc.h"
 #include "config.h"
 #include "log.h"
-#include "oid.h"
+#include "asn1/oid.h"
 #include "thread_var.h"
 #include "asn1/decode.h"
 #include "asn1/asn1c/ContentType.h"

diff --git a/src/crypto/base64.c b/src/crypto/base64.c
index ea890692e9c1b434aaee2c250e673e84511e42c6..2fa87d6546ec9b1511c7d513608e1cc1721672dc 100644 (file)
--- a/src/crypto/base64.c
+++ b/src/crypto/base64.c
@@ -1,4 +1,4 @@
-#include "base64.h"
+#include "crypto/base64.h"
 
 #include <openssl/err.h>
 #include <openssl/evp.h>

diff --git a/src/crypto/hash.c b/src/crypto/hash.c
index 33cc64aa77a6c4d77d86e5e4b944d87605bb534a..a17f6dded2cf0031f6685a810564663463dd4b25 100644 (file)
--- a/src/crypto/hash.c
+++ b/src/crypto/hash.c
@@ -1,4 +1,4 @@
-#include "hash.h"
+#include "crypto/hash.h"
 
 #include <errno.h>
 #include <openssl/evp.h>

diff --git a/src/object/certificate.c b/src/object/certificate.c
index d1e127846a3e61d397ca9eefc6fbe8006aa231d3..26e9cea6301500305c844f2ce258c2455877abf5 100644 (file)
--- a/src/object/certificate.c
+++ b/src/object/certificate.c
@@ -1,4 +1,4 @@
-#include "certificate.h"
+#include "object/certificate.h"
 
 #include <errno.h>
 #include <stdint.h> /* SIZE_MAX */

diff --git a/src/object/crl.c b/src/object/crl.c
index 7a746585e347537d18541f739666c7d7a707b5a7..bd9093440bf5d7b17794c0ed6554f1771ba4df4f 100644 (file)
--- a/src/object/crl.c
+++ b/src/object/crl.c
@@ -1,4 +1,4 @@
-#include "crl.h"
+#include "object/crl.h"
 
 #include <errno.h>
 #include <syslog.h>

diff --git a/src/object/ghostbusters.c b/src/object/ghostbusters.c
index e67ecbd1274901c209f6c1ca75032c867961ee4a..797e28991db85f48f4e380e8065149f91b59b127 100644 (file)
--- a/src/object/ghostbusters.c
+++ b/src/object/ghostbusters.c
@@ -4,7 +4,7 @@
 #include "thread_var.h"
 #include "asn1/oid.h"
 #include "object/signed_object.h"
-#include "vcard.h"
+#include "object/vcard.h"
 
 static int
 handle_vcard(struct signed_object *sobj)

diff --git a/src/object/manifest.c b/src/object/manifest.c
index f1c5037a8f37f1e94de77ac65b4db02da96ebb43..ba0e476b89e6137d55ba4886e59bca1dc22b525b 100644 (file)
--- a/src/object/manifest.c
+++ b/src/object/manifest.c
@@ -1,4 +1,4 @@
-#include "manifest.h"
+#include "object/manifest.h"
 
 #include <errno.h>
 

diff --git a/src/object/signed_object.c b/src/object/signed_object.c
index 539f5c79aded08ebee82040bc3212340b5164f26..aa66e68bf74d8526dbe8c7b77bc512093b55cdc0 100644 (file)
--- a/src/object/signed_object.c
+++ b/src/object/signed_object.c
@@ -1,4 +1,4 @@
-#include "signed_object.h"
+#include "object/signed_object.h"
 
 #include <errno.h>
 #include "log.h"

diff --git a/src/object/tal.c b/src/object/tal.c
index 28781c22b9e4604b395fed3655abcb341e4df013..d02c9dfb4f79b0d57fb6bcd47ef4b015f9c45bc4 100644 (file)
--- a/src/object/tal.c
+++ b/src/object/tal.c
@@ -1,4 +1,4 @@
-#include "tal.h"
+#include "object/tal.h"
 
 #include <errno.h>
 #include <pthread.h>

diff --git a/src/object/vcard.c b/src/object/vcard.c
index 9d08edb72c1d703bed17ef9b4019f87824c7fa17..1a056a66c923ff4f57a71cd57f3b3405670abd84 100644 (file)
--- a/src/object/vcard.c
+++ b/src/object/vcard.c
@@ -1,4 +1,4 @@
-#include "vcard.h"
+#include "object/vcard.h"
 
 #include <errno.h>
 #include <stdbool.h>

diff --git a/src/resource/asn.c b/src/resource/asn.c
index 6b472064b596a508050b217de8d3c390c3c37c67..60df25c348cbbb4c7f50ccd96b5a41114e0ece03 100644 (file)
--- a/src/resource/asn.c
+++ b/src/resource/asn.c
@@ -1,4 +1,4 @@
-#include "asn.h"
+#include "resource/asn.h"
 
 #include <errno.h>
 #include <limits.h>

diff --git a/src/resource/ip4.c b/src/resource/ip4.c
index b1109dd0e4bd0bb8fc7127648b91d80b898d0828..4bab3fa3c5107057ffea1287d4164b241d25d657 100644 (file)
--- a/src/resource/ip4.c
+++ b/src/resource/ip4.c
@@ -1,4 +1,4 @@
-#include "ip4.h"
+#include "resource/ip4.h"
 
 #include "sorted_array.h"
 

diff --git a/src/resource/ip6.c b/src/resource/ip6.c
index 81ed83649204a7da33775167c61b775da470689c..83bfa2b36e5bf057e91533f2359cd3c047e7c502 100644 (file)
--- a/src/resource/ip6.c
+++ b/src/resource/ip6.c
@@ -1,4 +1,4 @@
-#include "ip6.h"
+#include "resource/ip6.h"
 
 #include <string.h>
 #include "sorted_array.h"

diff --git a/src/rrdp/rrdp_loader.c b/src/rrdp/rrdp_loader.c
index 0b03fa90d782519a4ee4af9bcaa90b620bdffbce..1d4a36d15796b84cd4a2b47b9131d0d49881afd2 100644 (file)
--- a/src/rrdp/rrdp_loader.c
+++ b/src/rrdp/rrdp_loader.c
@@ -1,4 +1,4 @@
-#include "rrdp_loader.h"
+#include "rrdp/rrdp_loader.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/src/rrdp/rrdp_objects.c b/src/rrdp/rrdp_objects.c
index 7d44259d8f3c4cc458a43d8f62c9ae40b5a10e36..b74c9abb25ab0a3354d6df6bdcc309892a8338a0 100644 (file)
--- a/src/rrdp/rrdp_objects.c
+++ b/src/rrdp/rrdp_objects.c
@@ -1,4 +1,4 @@
-#include "rrdp_objects.h"
+#include "rrdp/rrdp_objects.h"
 
 #include <errno.h>
 #include <stdlib.h>

diff --git a/src/rrdp/rrdp_parser.c b/src/rrdp/rrdp_parser.c
index 06c1b1ce654ef86710252ed3130511a056ca529a..3217afeb9b3e6be29ee0e191ed72c7466c2c04a7 100644 (file)
--- a/src/rrdp/rrdp_parser.c
+++ b/src/rrdp/rrdp_parser.c
@@ -1,4 +1,4 @@
-#include "rrdp_parser.h"
+#include "rrdp/rrdp_parser.h"
 
 #include <libxml/xmlreader.h>
 #include <openssl/evp.h>

diff --git a/src/rtr/db/vrps.c b/src/rtr/db/vrps.c
index cb51ad5c2ceac864919054f837eab7b369cf9f9e..8bcda2fb3e4d2dc24967419b774e39da7cd24fa2 100644 (file)
--- a/src/rtr/db/vrps.c
+++ b/src/rtr/db/vrps.c
@@ -1,4 +1,4 @@
-#include "vrps.h"
+#include "rtr/db/vrps.h"
 
 #include <pthread.h>
 #include <string.h>

diff --git a/src/rtr/err_pdu.c b/src/rtr/err_pdu.c
index 0ae225bd8a12189cb12ffa91c352bfdf46676ac0..825e0f84d445787794efc83811955614e55436f6 100644 (file)
--- a/src/rtr/err_pdu.c
+++ b/src/rtr/err_pdu.c
@@ -1,8 +1,8 @@
-#include "err_pdu.h"
+#include "rtr/err_pdu.h"
 
 #include <unistd.h>
 #include "alloc.h"
-#include "pdu_sender.h"
+#include "rtr/pdu_sender.h"
 #include "log.h"
 
 typedef enum rtr_error_code {

diff --git a/src/rtr/pdu_handler.c b/src/rtr/pdu_handler.c
index c61825158e0f26c0071cb8dbb5dcf3747919648a..7c9499049190619e1573a1334793f57c7dc1b221 100644 (file)
--- a/src/rtr/pdu_handler.c
+++ b/src/rtr/pdu_handler.c
@@ -1,13 +1,13 @@
-#include "pdu_handler.h"
+#include "rtr/pdu_handler.h"
 
 #include <errno.h>
 #include <stddef.h>
 #include <unistd.h>
 
-#include "err_pdu.h"
+#include "rtr/err_pdu.h"
 #include "log.h"
-#include "pdu.h"
-#include "pdu_sender.h"
+#include "rtr/pdu.h"
+#include "rtr/pdu_sender.h"
 #include "rtr/db/vrps.h"
 
 #define WARN_UNEXPECTED_PDU(name, fd, request, pdu_name)               \

diff --git a/src/rtr/pdu_sender.c b/src/rtr/pdu_sender.c
index ed0c6215d2d24f1d059ddaf5740b9978b8d30e2c..edc27865cfe024f4d0f3e3e554a74a2c7fd50975 100644 (file)
--- a/src/rtr/pdu_sender.c
+++ b/src/rtr/pdu_sender.c
@@ -1,4 +1,4 @@
-#include "pdu_sender.h"
+#include "rtr/pdu_sender.h"
 
 #include <errno.h>
 #include <poll.h>

diff --git a/src/rtr/pdu_sender.h b/src/rtr/pdu_sender.h
index 7036e4b9edbef6d8928ead169c57c6a6b3e9d9c3..af81c49365a17b765b4521ce29998941d9a96b49 100644 (file)
--- a/src/rtr/pdu_sender.h
+++ b/src/rtr/pdu_sender.h
@@ -1,7 +1,7 @@
 #ifndef SRC_RTR_PDU_SENDER_H_
 #define SRC_RTR_PDU_SENDER_H_
 
-#include "pdu.h"
+#include "rtr/pdu.h"
 #include "types/router_key.h"
 #include "rtr/db/vrps.h"
 

diff --git a/src/rtr/pdu_serializer.c b/src/rtr/pdu_serializer.c
index 1ad7a77f9a03003bc0c433c57425a3a4a138f316..84397b835de3b57158a34acc62bd1d030232611a 100644 (file)
--- a/src/rtr/pdu_serializer.c
+++ b/src/rtr/pdu_serializer.c
@@ -1,8 +1,8 @@
-#include "pdu_serializer.h"
+#include "rtr/pdu_serializer.h"
 
 #include <stdlib.h>
 #include <string.h>
-#include "primitive_writer.h"
+#include "rtr/primitive_writer.h"
 
 static size_t
 serialize_pdu_header(struct pdu_header const *header, uint16_t union_value,

diff --git a/src/rtr/primitive_reader.c b/src/rtr/primitive_reader.c
index d71af2959ffe23edcb6870db741176a054d37332..1e8425114e2a5865543afd28f7f3447a70d5b7eb 100644 (file)
--- a/src/rtr/primitive_reader.c
+++ b/src/rtr/primitive_reader.c
@@ -1,4 +1,4 @@
-#include "primitive_reader.h"
+#include "rtr/primitive_reader.h"
 
 #include <err.h>
 #include <errno.h>

diff --git a/src/rtr/primitive_writer.c b/src/rtr/primitive_writer.c
index 599d267df3d804a13c722c4834ebd2acc44b5bcc..4f5a8601119b3d10abea06dfc36c32ad9251d61f 100644 (file)
--- a/src/rtr/primitive_writer.c
+++ b/src/rtr/primitive_writer.c
@@ -1,4 +1,4 @@
-#include "primitive_writer.h"
+#include "rtr/primitive_writer.h"
 
 unsigned char *
 write_int8(unsigned char *buf, uint8_t value)

diff --git a/src/rtr/rtr.c b/src/rtr/rtr.c
index 12d357a889c12137017dbf436479f36457dc9d6d..4c50a370448ef3c7c158dd9cacad22ca44e19fa7 100644 (file)
--- a/src/rtr/rtr.c
+++ b/src/rtr/rtr.c
@@ -1,4 +1,4 @@
-#include "rtr.h"
+#include "rtr/rtr.h"
 
 #include <errno.h>
 #include <fcntl.h>

diff --git a/src/xml/relax_ng.c b/src/xml/relax_ng.c
index c35e5a4d7681ac35ee17899be56f559807bb0ce2..df71a2de7d245d5b902a9f3422f51b803c31877f 100644 (file)
--- a/src/xml/relax_ng.c
+++ b/src/xml/relax_ng.c
@@ -1,4 +1,4 @@
-#include "relax_ng.h"
+#include "xml/relax_ng.h"
 
 #include <libxml/parser.h>
 #include <libxml/relaxng.h>