diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 61091e1..7b6b10a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,6 +15,7 @@ ADD_EXECUTABLE(it2s-itss-facilities
 )
 
 TARGET_LINK_LIBRARIES(it2s-itss-facilities
+    -lit2s-asn-cdd-1.3.1
     -lit2s-asn-itss-facilities
     -lit2s-asn-itss-security
     -lit2s-asn-itss-management
@@ -23,6 +24,7 @@ TARGET_LINK_LIBRARIES(it2s-itss-facilities
     -lpthread
     -lit2s-config-etsi-its
     -lit2s-asn-camv2
+    -lit2s-asn-ivi-1
     -lit2s-asn-ivim
     -lit2s-asn-denmv2
     -lit2s-asn-cpm
diff --git a/src/config.c b/src/config.c
index e6aef44..4dcdd62 100644
--- a/src/config.c
+++ b/src/config.c
@@ -12,7 +12,7 @@
 #include <it2s-config/t2c-etsi-its.h>
 #include <dirent.h>
 #include <sys/time.h>
-#include <it2s-asn/camv2/ProtectedCommunicationZone.h>
+#include <it2s-asn/cdd-1.3.1/ProtectedCommunicationZone.h>
 #include <it2s-asn/tpm/TollingPaymentInfo.h>
 #include <zmq.h>
 
diff --git a/src/infrastructure.c b/src/infrastructure.c
index 01c8d01..98a5515 100644
--- a/src/infrastructure.c
+++ b/src/infrastructure.c
@@ -6,7 +6,7 @@
 #include <it2s-tender/space.h>
 #include <it2s-tender/time.h>
 
-#include <it2s-asn/ivim/ISO14823Code.h>
+#include <it2s-asn/ivi-1/ISO14823Code.h>
 
 const ivi_diid_ssp_bm_t DIID_SSP_BM_MAP[] = {
     {"Vienna Convention Code for road sign",                               IVI_DIID_ViennaCodeConvention,                                               0x800000},
diff --git a/src/requests.c b/src/requests.c
index 12badb4..cd8e049 100644
--- a/src/requests.c
+++ b/src/requests.c
@@ -1,6 +1,5 @@
 #include "requests.h"
 
-#include <it2s-asn/camv2/asn_application.h>
 #include <it2s-asn/cpm/CPM.h>
 #include <it2s-asn/itss-facilities/FacilitiesReply.h>
 #include <it2s-asn/itss-networking/NetworkingRequest.h>