diff --git a/src/hnbap/Access-stratum-release-indicator.c b/src/hnbap/Access-stratum-release-indicator.c
index 1b13cd9..746832e 100644
--- a/src/hnbap/Access-stratum-release-indicator.c
+++ b/src/hnbap/Access-stratum-release-indicator.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Access-stratum-release-indicator.h"
+#include <osmocom/osmo-iuh/hnbap/Access-stratum-release-indicator.h>
 
 int
 Access_stratum_release_indicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/AccessResult.c b/src/hnbap/AccessResult.c
index 0e6cda0..e0cec05 100644
--- a/src/hnbap/AccessResult.c
+++ b/src/hnbap/AccessResult.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "AccessResult.h"
+#include <osmocom/osmo-iuh/hnbap/AccessResult.h>
 
 int
 AccessResult_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/AdditionalNeighbourInfoList.c b/src/hnbap/AdditionalNeighbourInfoList.c
index e592c7f..5360e51 100644
--- a/src/hnbap/AdditionalNeighbourInfoList.c
+++ b/src/hnbap/AdditionalNeighbourInfoList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "AdditionalNeighbourInfoList.h"
+#include <osmocom/osmo-iuh/hnbap/AdditionalNeighbourInfoList.h>
 
 static asn_per_constraints_t asn_PER_type_AdditionalNeighbourInfoList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/AdditionalNeighbourInfoList.h b/src/hnbap/AdditionalNeighbourInfoList.h
index 7e15f4b..8098eab 100644
--- a/src/hnbap/AdditionalNeighbourInfoList.h
+++ b/src/hnbap/AdditionalNeighbourInfoList.h
@@ -38,7 +38,7 @@
 #endif
 
 /* Referred external types */
-#include "HNBConfigInfo.h"
+#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
 
 #endif	/* _AdditionalNeighbourInfoList_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/AltitudeAndDirection.c b/src/hnbap/AltitudeAndDirection.c
index a747406..d1fceee 100644
--- a/src/hnbap/AltitudeAndDirection.c
+++ b/src/hnbap/AltitudeAndDirection.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "AltitudeAndDirection.h"
+#include <osmocom/osmo-iuh/hnbap/AltitudeAndDirection.h>
 
 static int
 directionOfAltitude_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/BackoffTimer.c b/src/hnbap/BackoffTimer.c
index 7dee227..4057807 100644
--- a/src/hnbap/BackoffTimer.c
+++ b/src/hnbap/BackoffTimer.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "BackoffTimer.h"
+#include <osmocom/osmo-iuh/hnbap/BackoffTimer.h>
 
 int
 BackoffTimer_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/BindingID.c b/src/hnbap/BindingID.c
index 7021128..6ba857c 100644
--- a/src/hnbap/BindingID.c
+++ b/src/hnbap/BindingID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "BindingID.h"
+#include <osmocom/osmo-iuh/hnbap/BindingID.h>
 
 int
 BindingID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CELL-FACHMobilitySupport.c b/src/hnbap/CELL-FACHMobilitySupport.c
index e2bc3cb..eb026c0 100644
--- a/src/hnbap/CELL-FACHMobilitySupport.c
+++ b/src/hnbap/CELL-FACHMobilitySupport.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CELL-FACHMobilitySupport.h"
+#include <osmocom/osmo-iuh/hnbap/CELL-FACHMobilitySupport.h>
 
 int
 CELL_FACHMobilitySupport_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CGI.c b/src/hnbap/CGI.c
index 07ee72a..d7ea770 100644
--- a/src/hnbap/CGI.c
+++ b/src/hnbap/CGI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CGI.h"
+#include <osmocom/osmo-iuh/hnbap/CGI.h>
 
 static asn_TYPE_member_t asn_MBR_CGI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct CGI, pLMNidentity),
diff --git a/src/hnbap/CGI.h b/src/hnbap/CGI.h
index 802fc9a..7971442 100644
--- a/src/hnbap/CGI.h
+++ b/src/hnbap/CGI.h
@@ -12,9 +12,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "PLMNidentity.h"
-#include "LAC.h"
-#include "CI.h"
+#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
+#include <osmocom/osmo-iuh/hnbap/LAC.h>
+#include <osmocom/osmo-iuh/hnbap/CI.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _CGI_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/CI.c b/src/hnbap/CI.c
index 0f96301..d028842 100644
--- a/src/hnbap/CI.c
+++ b/src/hnbap/CI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CI.h"
+#include <osmocom/osmo-iuh/hnbap/CI.h>
 
 int
 CI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CN-DomainIndicator.c b/src/hnbap/CN-DomainIndicator.c
index 75fbca7..effdf66 100644
--- a/src/hnbap/CN-DomainIndicator.c
+++ b/src/hnbap/CN-DomainIndicator.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CN-DomainIndicator.h"
+#include <osmocom/osmo-iuh/hnbap/CN-DomainIndicator.h>
 
 int
 CN_DomainIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CSG-Capability.c b/src/hnbap/CSG-Capability.c
index b07caeb..acd31fd 100644
--- a/src/hnbap/CSG-Capability.c
+++ b/src/hnbap/CSG-Capability.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CSG-Capability.h"
+#include <osmocom/osmo-iuh/hnbap/CSG-Capability.h>
 
 int
 CSG_Capability_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CSG-ID.c b/src/hnbap/CSG-ID.c
index e7c2653..89720c3 100644
--- a/src/hnbap/CSG-ID.c
+++ b/src/hnbap/CSG-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CSG-ID.h"
+#include <osmocom/osmo-iuh/hnbap/CSG-ID.h>
 
 int
 CSG_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CSGMembershipStatus.c b/src/hnbap/CSGMembershipStatus.c
index 32abdca..2259429 100644
--- a/src/hnbap/CSGMembershipStatus.c
+++ b/src/hnbap/CSGMembershipStatus.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CSGMembershipStatus.h"
+#include <osmocom/osmo-iuh/hnbap/CSGMembershipStatus.h>
 
 int
 CSGMembershipStatus_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CSGMembershipUpdate.c b/src/hnbap/CSGMembershipUpdate.c
index bb5f940..6277a68 100644
--- a/src/hnbap/CSGMembershipUpdate.c
+++ b/src/hnbap/CSGMembershipUpdate.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CSGMembershipUpdate.h"
+#include <osmocom/osmo-iuh/hnbap/CSGMembershipUpdate.h>
 
 static int
 memb_csgMembershipUpdate_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CSGMembershipUpdate.h b/src/hnbap/CSGMembershipUpdate.h
index 30fd770..dca4d2f 100644
--- a/src/hnbap/CSGMembershipUpdate.h
+++ b/src/hnbap/CSGMembershipUpdate.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _CSGMembershipUpdate_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/Cause.c b/src/hnbap/Cause.c
index 0dd34e3..b0498ab 100644
--- a/src/hnbap/Cause.c
+++ b/src/hnbap/Cause.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Cause.h"
+#include <osmocom/osmo-iuh/hnbap/Cause.h>
 
 static asn_per_constraints_t asn_PER_type_Cause_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  3l }	/* (0..3,...) */,
diff --git a/src/hnbap/Cause.h b/src/hnbap/Cause.h
index 9802bf6..549cc79 100644
--- a/src/hnbap/Cause.h
+++ b/src/hnbap/Cause.h
@@ -12,10 +12,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "CauseRadioNetwork.h"
-#include "CauseTransport.h"
-#include "CauseProtocol.h"
-#include "CauseMisc.h"
+#include <osmocom/osmo-iuh/hnbap/CauseRadioNetwork.h>
+#include <osmocom/osmo-iuh/hnbap/CauseTransport.h>
+#include <osmocom/osmo-iuh/hnbap/CauseProtocol.h>
+#include <osmocom/osmo-iuh/hnbap/CauseMisc.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/CauseMisc.c b/src/hnbap/CauseMisc.c
index 47b1a6f..9626ed7 100644
--- a/src/hnbap/CauseMisc.c
+++ b/src/hnbap/CauseMisc.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CauseMisc.h"
+#include <osmocom/osmo-iuh/hnbap/CauseMisc.h>
 
 int
 CauseMisc_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CauseProtocol.c b/src/hnbap/CauseProtocol.c
index dee71e1..01fe69d 100644
--- a/src/hnbap/CauseProtocol.c
+++ b/src/hnbap/CauseProtocol.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CauseProtocol.h"
+#include <osmocom/osmo-iuh/hnbap/CauseProtocol.h>
 
 int
 CauseProtocol_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CauseRadioNetwork.c b/src/hnbap/CauseRadioNetwork.c
index 54a6dbf..13b83e2 100644
--- a/src/hnbap/CauseRadioNetwork.c
+++ b/src/hnbap/CauseRadioNetwork.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CauseRadioNetwork.h"
+#include <osmocom/osmo-iuh/hnbap/CauseRadioNetwork.h>
 
 int
 CauseRadioNetwork_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CauseTransport.c b/src/hnbap/CauseTransport.c
index 835b182..92a8d28 100644
--- a/src/hnbap/CauseTransport.c
+++ b/src/hnbap/CauseTransport.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CauseTransport.h"
+#include <osmocom/osmo-iuh/hnbap/CauseTransport.h>
 
 int
 CauseTransport_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CellIdentity.c b/src/hnbap/CellIdentity.c
index 8357943..88459ae 100644
--- a/src/hnbap/CellIdentity.c
+++ b/src/hnbap/CellIdentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CellIdentity.h"
+#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
 
 int
 CellIdentity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/ConfigurationInformation.c b/src/hnbap/ConfigurationInformation.c
index f04f125..bc9f9d8 100644
--- a/src/hnbap/ConfigurationInformation.c
+++ b/src/hnbap/ConfigurationInformation.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "ConfigurationInformation.h"
+#include <osmocom/osmo-iuh/hnbap/ConfigurationInformation.h>
 
 static asn_per_constraints_t asn_PER_type_ConfigurationInformation_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/ConfigurationInformation.h b/src/hnbap/ConfigurationInformation.h
index 347f5d2..0c33b02 100644
--- a/src/hnbap/ConfigurationInformation.h
+++ b/src/hnbap/ConfigurationInformation.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "HNBConfigurationInformationProvided.h"
-#include "HNBConfigurationInformationMissing.h"
+#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationProvided.h>
+#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationMissing.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/Context-ID.c b/src/hnbap/Context-ID.c
index 62820ae..5fca828 100644
--- a/src/hnbap/Context-ID.c
+++ b/src/hnbap/Context-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Context-ID.h"
+#include <osmocom/osmo-iuh/hnbap/Context-ID.h>
 
 int
 Context_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Criticality.c b/src/hnbap/Criticality.c
index 56f5640..801a88d 100644
--- a/src/hnbap/Criticality.c
+++ b/src/hnbap/Criticality.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Criticality.h"
+#include <osmocom/osmo-iuh/hnbap/Criticality.h>
 
 int
 Criticality_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CriticalityDiagnostics-IE-List.c b/src/hnbap/CriticalityDiagnostics-IE-List.c
index 4d58426..f90a9fa 100644
--- a/src/hnbap/CriticalityDiagnostics-IE-List.c
+++ b/src/hnbap/CriticalityDiagnostics-IE-List.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CriticalityDiagnostics-IE-List.h"
+#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics-IE-List.h>
 
 static asn_per_constraints_t asn_PER_type_CriticalityDiagnostics_IE_List_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/CriticalityDiagnostics-IE-List.h b/src/hnbap/CriticalityDiagnostics-IE-List.h
index 05eec0a..ae5a777 100644
--- a/src/hnbap/CriticalityDiagnostics-IE-List.h
+++ b/src/hnbap/CriticalityDiagnostics-IE-List.h
@@ -13,9 +13,9 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include "Criticality.h"
-#include "ProtocolIE-ID.h"
-#include "TypeOfError.h"
+#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
+#include <osmocom/osmo-iuh/hnbap/TypeOfError.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
@@ -54,7 +54,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _CriticalityDiagnostics_IE_List_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/CriticalityDiagnostics.c b/src/hnbap/CriticalityDiagnostics.c
index 56d460f..5332086 100644
--- a/src/hnbap/CriticalityDiagnostics.c
+++ b/src/hnbap/CriticalityDiagnostics.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "CriticalityDiagnostics.h"
+#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics.h>
 
 static asn_TYPE_member_t asn_MBR_CriticalityDiagnostics_1[] = {
 	{ ATF_POINTER, 5, offsetof(struct CriticalityDiagnostics, procedureCode),
diff --git a/src/hnbap/CriticalityDiagnostics.h b/src/hnbap/CriticalityDiagnostics.h
index 97936ed..782da7b 100644
--- a/src/hnbap/CriticalityDiagnostics.h
+++ b/src/hnbap/CriticalityDiagnostics.h
@@ -12,9 +12,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "ProcedureCode.h"
-#include "TriggeringMessage.h"
-#include "Criticality.h"
+#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
+#include <osmocom/osmo-iuh/hnbap/TriggeringMessage.h>
+#include <osmocom/osmo-iuh/hnbap/Criticality.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -49,8 +49,8 @@
 #endif
 
 /* Referred external types */
-#include "CriticalityDiagnostics-IE-List.h"
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics-IE-List.h>
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _CriticalityDiagnostics_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/ESN.c b/src/hnbap/ESN.c
index 1acc9f8..c442c25 100644
--- a/src/hnbap/ESN.c
+++ b/src/hnbap/ESN.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "ESN.h"
+#include <osmocom/osmo-iuh/hnbap/ESN.h>
 
 int
 ESN_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/ErrorIndication.c b/src/hnbap/ErrorIndication.c
index 7d25f8e..f0ff6a7 100644
--- a/src/hnbap/ErrorIndication.c
+++ b/src/hnbap/ErrorIndication.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "ErrorIndication.h"
+#include <osmocom/osmo-iuh/hnbap/ErrorIndication.h>
 
 static int
 memb_errorIndication_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/ErrorIndication.h b/src/hnbap/ErrorIndication.h
index b68ec1b..e2fd5cf 100644
--- a/src/hnbap/ErrorIndication.h
+++ b/src/hnbap/ErrorIndication.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _ErrorIndication_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/GTP-TEI.c b/src/hnbap/GTP-TEI.c
index 3faf842..6e91ef7 100644
--- a/src/hnbap/GTP-TEI.c
+++ b/src/hnbap/GTP-TEI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "GTP-TEI.h"
+#include <osmocom/osmo-iuh/hnbap/GTP-TEI.h>
 
 int
 GTP_TEI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/GeographicalCoordinates.c b/src/hnbap/GeographicalCoordinates.c
index 8ff5810..7467dbd 100644
--- a/src/hnbap/GeographicalCoordinates.c
+++ b/src/hnbap/GeographicalCoordinates.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "GeographicalCoordinates.h"
+#include <osmocom/osmo-iuh/hnbap/GeographicalCoordinates.h>
 
 static int
 latitudeSign_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/GeographicalCoordinates.h b/src/hnbap/GeographicalCoordinates.h
index 469a5cf..bc4cde3 100644
--- a/src/hnbap/GeographicalCoordinates.h
+++ b/src/hnbap/GeographicalCoordinates.h
@@ -53,7 +53,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _GeographicalCoordinates_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/GeographicalLocation.c b/src/hnbap/GeographicalLocation.c
index c76978d..e4a07dc 100644
--- a/src/hnbap/GeographicalLocation.c
+++ b/src/hnbap/GeographicalLocation.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "GeographicalLocation.h"
+#include <osmocom/osmo-iuh/hnbap/GeographicalLocation.h>
 
 static asn_TYPE_member_t asn_MBR_GeographicalLocation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct GeographicalLocation, geographicalCoordinates),
diff --git a/src/hnbap/GeographicalLocation.h b/src/hnbap/GeographicalLocation.h
index 4b2688d..c6ce2ca 100644
--- a/src/hnbap/GeographicalLocation.h
+++ b/src/hnbap/GeographicalLocation.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "GeographicalCoordinates.h"
-#include "AltitudeAndDirection.h"
+#include <osmocom/osmo-iuh/hnbap/GeographicalCoordinates.h>
+#include <osmocom/osmo-iuh/hnbap/AltitudeAndDirection.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -45,7 +45,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _GeographicalLocation_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNB-Cell-Access-Mode.c b/src/hnbap/HNB-Cell-Access-Mode.c
index 322c49a..1925813 100644
--- a/src/hnbap/HNB-Cell-Access-Mode.c
+++ b/src/hnbap/HNB-Cell-Access-Mode.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNB-Cell-Access-Mode.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Access-Mode.h>
 
 int
 HNB_Cell_Access_Mode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNB-Cell-Identifier.c b/src/hnbap/HNB-Cell-Identifier.c
index d72a3d6..0ee6816 100644
--- a/src/hnbap/HNB-Cell-Identifier.c
+++ b/src/hnbap/HNB-Cell-Identifier.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNB-Cell-Identifier.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Identifier.h>
 
 static asn_TYPE_member_t asn_MBR_HNB_Cell_Identifier_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct HNB_Cell_Identifier, pLMNidentity),
diff --git a/src/hnbap/HNB-Cell-Identifier.h b/src/hnbap/HNB-Cell-Identifier.h
index a887096..e5feebf 100644
--- a/src/hnbap/HNB-Cell-Identifier.h
+++ b/src/hnbap/HNB-Cell-Identifier.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "PLMNidentity.h"
-#include "CellIdentity.h"
+#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
+#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -45,7 +45,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _HNB_Cell_Identifier_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNB-GWResponse.c b/src/hnbap/HNB-GWResponse.c
index 2d782c2..a220d39 100644
--- a/src/hnbap/HNB-GWResponse.c
+++ b/src/hnbap/HNB-GWResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNB-GWResponse.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-GWResponse.h>
 
 static asn_per_constraints_t asn_PER_type_HNB_GWResponse_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  2l }	/* (0..2,...) */,
diff --git a/src/hnbap/HNB-GWResponse.h b/src/hnbap/HNB-GWResponse.h
index cd75a71..d2d99fa 100644
--- a/src/hnbap/HNB-GWResponse.h
+++ b/src/hnbap/HNB-GWResponse.h
@@ -12,9 +12,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "HNBConfigInfo.h"
-#include "RNC-ID.h"
-#include "UnknownU-RNTIIndication.h"
+#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
+#include <osmocom/osmo-iuh/hnbap/RNC-ID.h>
+#include <osmocom/osmo-iuh/hnbap/UnknownU-RNTIIndication.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/HNB-Identity-Info.c b/src/hnbap/HNB-Identity-Info.c
index 3296058..163730d 100644
--- a/src/hnbap/HNB-Identity-Info.c
+++ b/src/hnbap/HNB-Identity-Info.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNB-Identity-Info.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-Identity-Info.h>
 
 int
 HNB_Identity_Info_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNB-Identity.c b/src/hnbap/HNB-Identity.c
index 3c1cbeb..2389407 100644
--- a/src/hnbap/HNB-Identity.c
+++ b/src/hnbap/HNB-Identity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNB-Identity.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-Identity.h>
 
 static asn_TYPE_member_t asn_MBR_HNB_Identity_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct HNB_Identity, hNB_Identity_Info),
diff --git a/src/hnbap/HNB-Identity.h b/src/hnbap/HNB-Identity.h
index af0a7b2..30448d9 100644
--- a/src/hnbap/HNB-Identity.h
+++ b/src/hnbap/HNB-Identity.h
@@ -12,7 +12,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "HNB-Identity-Info.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-Identity-Info.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _HNB_Identity_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNB-Location-Information.c b/src/hnbap/HNB-Location-Information.c
index 6d1150b..a025eda 100644
--- a/src/hnbap/HNB-Location-Information.c
+++ b/src/hnbap/HNB-Location-Information.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNB-Location-Information.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-Location-Information.h>
 
 static asn_TYPE_member_t asn_MBR_HNB_Location_Information_1[] = {
 	{ ATF_POINTER, 3, offsetof(struct HNB_Location_Information, macroCoverageInfo),
diff --git a/src/hnbap/HNB-Location-Information.h b/src/hnbap/HNB-Location-Information.h
index 2450351..1846a26 100644
--- a/src/hnbap/HNB-Location-Information.h
+++ b/src/hnbap/HNB-Location-Information.h
@@ -45,9 +45,9 @@
 #endif
 
 /* Referred external types */
-#include "MacroCoverageInformation.h"
-#include "GeographicalLocation.h"
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/MacroCoverageInformation.h>
+#include <osmocom/osmo-iuh/hnbap/GeographicalLocation.h>
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _HNB_Location_Information_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNB-RNL-Identity.c b/src/hnbap/HNB-RNL-Identity.c
index 65769f2..23b0ed1 100644
--- a/src/hnbap/HNB-RNL-Identity.c
+++ b/src/hnbap/HNB-RNL-Identity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNB-RNL-Identity.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
 
 static asn_per_constraints_t asn_PER_type_HNB_RNL_Identity_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0l,  0l }	/* (0..0,...) */,
diff --git a/src/hnbap/HNB-RNL-Identity.h b/src/hnbap/HNB-RNL-Identity.h
index 75f29b0..5e843d9 100644
--- a/src/hnbap/HNB-RNL-Identity.h
+++ b/src/hnbap/HNB-RNL-Identity.h
@@ -12,7 +12,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "HNB-Cell-Identifier.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Identifier.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/HNBAP-PDU.c b/src/hnbap/HNBAP-PDU.c
index a430881..2661ba2 100644
--- a/src/hnbap/HNBAP-PDU.c
+++ b/src/hnbap/HNBAP-PDU.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBAP-PDU.h"
+#include <osmocom/osmo-iuh/hnbap/HNBAP-PDU.h>
 
 static asn_per_constraints_t asn_PER_type_HNBAP_PDU_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  2l }	/* (0..2,...) */,
diff --git a/src/hnbap/HNBAP-PDU.h b/src/hnbap/HNBAP-PDU.h
index 8417085..18017ae 100644
--- a/src/hnbap/HNBAP-PDU.h
+++ b/src/hnbap/HNBAP-PDU.h
@@ -12,9 +12,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "InitiatingMessage.h"
-#include "SuccessfulOutcome.h"
-#include "UnsuccessfulOutcome.h"
+#include <osmocom/osmo-iuh/hnbap/InitiatingMessage.h>
+#include <osmocom/osmo-iuh/hnbap/SuccessfulOutcome.h>
+#include <osmocom/osmo-iuh/hnbap/UnsuccessfulOutcome.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/HNBCapacity.c b/src/hnbap/HNBCapacity.c
index 0c8acb9..535fab4 100644
--- a/src/hnbap/HNBCapacity.c
+++ b/src/hnbap/HNBCapacity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBCapacity.h"
+#include <osmocom/osmo-iuh/hnbap/HNBCapacity.h>
 
 int
 HNBCapacity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBConfigInfo.c b/src/hnbap/HNBConfigInfo.c
index dd1ddda..8cdd461 100644
--- a/src/hnbap/HNBConfigInfo.c
+++ b/src/hnbap/HNBConfigInfo.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBConfigInfo.h"
+#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
 
 static asn_TYPE_member_t asn_MBR_HNBConfigInfo_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct HNBConfigInfo, hnb_RNL_Identity),
diff --git a/src/hnbap/HNBConfigInfo.h b/src/hnbap/HNBConfigInfo.h
index 2c45d51..39b2802 100644
--- a/src/hnbap/HNBConfigInfo.h
+++ b/src/hnbap/HNBConfigInfo.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "HNB-RNL-Identity.h"
-#include "ConfigurationInformation.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/osmo-iuh/hnbap/ConfigurationInformation.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -45,7 +45,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _HNBConfigInfo_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNBConfigTransferRequest.c b/src/hnbap/HNBConfigTransferRequest.c
index 336bd98..2e087ca 100644
--- a/src/hnbap/HNBConfigTransferRequest.c
+++ b/src/hnbap/HNBConfigTransferRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBConfigTransferRequest.h"
+#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferRequest.h>
 
 static int
 memb_hnbConfigTransferRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBConfigTransferRequest.h b/src/hnbap/HNBConfigTransferRequest.h
index 16fd0b1..ae42e47 100644
--- a/src/hnbap/HNBConfigTransferRequest.h
+++ b/src/hnbap/HNBConfigTransferRequest.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _HNBConfigTransferRequest_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNBConfigTransferResponse.c b/src/hnbap/HNBConfigTransferResponse.c
index da454cb..4630f0b 100644
--- a/src/hnbap/HNBConfigTransferResponse.c
+++ b/src/hnbap/HNBConfigTransferResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBConfigTransferResponse.h"
+#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferResponse.h>
 
 static int
 memb_hnbConfigTransferResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBConfigTransferResponse.h b/src/hnbap/HNBConfigTransferResponse.h
index b858332..dbcfa1e 100644
--- a/src/hnbap/HNBConfigTransferResponse.h
+++ b/src/hnbap/HNBConfigTransferResponse.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _HNBConfigTransferResponse_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNBConfigurationInformationMissing.c b/src/hnbap/HNBConfigurationInformationMissing.c
index aa20d2a..fec67a6 100644
--- a/src/hnbap/HNBConfigurationInformationMissing.c
+++ b/src/hnbap/HNBConfigurationInformationMissing.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBConfigurationInformationMissing.h"
+#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationMissing.h>
 
 static asn_TYPE_member_t asn_MBR_HNBConfigurationInformationMissing_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct HNBConfigurationInformationMissing, cause),
diff --git a/src/hnbap/HNBConfigurationInformationMissing.h b/src/hnbap/HNBConfigurationInformationMissing.h
index 6241f7b..0833454 100644
--- a/src/hnbap/HNBConfigurationInformationMissing.h
+++ b/src/hnbap/HNBConfigurationInformationMissing.h
@@ -12,7 +12,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "Cause.h"
+#include <osmocom/osmo-iuh/hnbap/Cause.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _HNBConfigurationInformationMissing_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNBConfigurationInformationProvided.c b/src/hnbap/HNBConfigurationInformationProvided.c
index c620055..baa6f71 100644
--- a/src/hnbap/HNBConfigurationInformationProvided.c
+++ b/src/hnbap/HNBConfigurationInformationProvided.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBConfigurationInformationProvided.h"
+#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationProvided.h>
 
 static asn_TYPE_member_t asn_MBR_HNBConfigurationInformationProvided_1[] = {
 	{ ATF_POINTER, 2, offsetof(struct HNBConfigurationInformationProvided, psc),
diff --git a/src/hnbap/HNBConfigurationInformationProvided.h b/src/hnbap/HNBConfigurationInformationProvided.h
index ccf9504..5eae3a3 100644
--- a/src/hnbap/HNBConfigurationInformationProvided.h
+++ b/src/hnbap/HNBConfigurationInformationProvided.h
@@ -12,10 +12,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "PSC.h"
-#include "CSG-ID.h"
-#include "HNB-Cell-Access-Mode.h"
-#include "Iurh-Signalling-TNL-AddressList.h"
+#include <osmocom/osmo-iuh/hnbap/PSC.h>
+#include <osmocom/osmo-iuh/hnbap/CSG-ID.h>
+#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Access-Mode.h>
+#include <osmocom/osmo-iuh/hnbap/Iurh-Signalling-TNL-AddressList.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -49,7 +49,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _HNBConfigurationInformationProvided_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNBDe-Register.c b/src/hnbap/HNBDe-Register.c
index 023cf9f..f99634c 100644
--- a/src/hnbap/HNBDe-Register.c
+++ b/src/hnbap/HNBDe-Register.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBDe-Register.h"
+#include <osmocom/osmo-iuh/hnbap/HNBDe-Register.h>
 
 static int
 memb_hnbDe_Register_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBDe-Register.h b/src/hnbap/HNBDe-Register.h
index fc501d5..23423f0 100644
--- a/src/hnbap/HNBDe-Register.h
+++ b/src/hnbap/HNBDe-Register.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _HNBDe_Register_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNBRegisterAccept.c b/src/hnbap/HNBRegisterAccept.c
index 466bb30..3dd7189 100644
--- a/src/hnbap/HNBRegisterAccept.c
+++ b/src/hnbap/HNBRegisterAccept.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBRegisterAccept.h"
+#include <osmocom/osmo-iuh/hnbap/HNBRegisterAccept.h>
 
 static int
 memb_hnbRegisterAccept_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBRegisterAccept.h b/src/hnbap/HNBRegisterAccept.h
index 2c0192c..41a7040 100644
--- a/src/hnbap/HNBRegisterAccept.h
+++ b/src/hnbap/HNBRegisterAccept.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _HNBRegisterAccept_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNBRegisterReject.c b/src/hnbap/HNBRegisterReject.c
index f39611d..7447a28 100644
--- a/src/hnbap/HNBRegisterReject.c
+++ b/src/hnbap/HNBRegisterReject.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBRegisterReject.h"
+#include <osmocom/osmo-iuh/hnbap/HNBRegisterReject.h>
 
 static int
 memb_hnbRegisterReject_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBRegisterReject.h b/src/hnbap/HNBRegisterReject.h
index 830ca8a..2e77521 100644
--- a/src/hnbap/HNBRegisterReject.h
+++ b/src/hnbap/HNBRegisterReject.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _HNBRegisterReject_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/HNBRegisterRequest.c b/src/hnbap/HNBRegisterRequest.c
index 214a3e7..92aa0a8 100644
--- a/src/hnbap/HNBRegisterRequest.c
+++ b/src/hnbap/HNBRegisterRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "HNBRegisterRequest.h"
+#include <osmocom/osmo-iuh/hnbap/HNBRegisterRequest.h>
 
 static int
 memb_hnbRegisterRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBRegisterRequest.h b/src/hnbap/HNBRegisterRequest.h
index f1ccf59..2d59145 100644
--- a/src/hnbap/HNBRegisterRequest.h
+++ b/src/hnbap/HNBRegisterRequest.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _HNBRegisterRequest_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/IE-Extensions.c b/src/hnbap/IE-Extensions.c
index 66b8965..f8d3e10 100644
--- a/src/hnbap/IE-Extensions.c
+++ b/src/hnbap/IE-Extensions.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 static asn_per_constraints_t asn_PER_type_IE_Extensions_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/IE-Extensions.h b/src/hnbap/IE-Extensions.h
index f666dae..d56c93e 100644
--- a/src/hnbap/IE-Extensions.h
+++ b/src/hnbap/IE-Extensions.h
@@ -38,7 +38,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _IE_Extensions_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/IE.c b/src/hnbap/IE.c
index 9d80998..fc9c45e 100644
--- a/src/hnbap/IE.c
+++ b/src/hnbap/IE.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 static asn_TYPE_member_t asn_MBR_IE_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct IE, id),
diff --git a/src/hnbap/IE.h b/src/hnbap/IE.h
index e7d081f..8193b57 100644
--- a/src/hnbap/IE.h
+++ b/src/hnbap/IE.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "ProtocolIE-ID.h"
-#include "Criticality.h"
+#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
+#include <osmocom/osmo-iuh/hnbap/Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/src/hnbap/IMEI.c b/src/hnbap/IMEI.c
index ea7dc79..8e5ce2c 100644
--- a/src/hnbap/IMEI.c
+++ b/src/hnbap/IMEI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "IMEI.h"
+#include <osmocom/osmo-iuh/hnbap/IMEI.h>
 
 int
 IMEI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/IMSI.c b/src/hnbap/IMSI.c
index 3a44270..2bb1f3d 100644
--- a/src/hnbap/IMSI.c
+++ b/src/hnbap/IMSI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "IMSI.h"
+#include <osmocom/osmo-iuh/hnbap/IMSI.h>
 
 int
 IMSI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/IMSIDS41.c b/src/hnbap/IMSIDS41.c
index b68c86e..c7547c9 100644
--- a/src/hnbap/IMSIDS41.c
+++ b/src/hnbap/IMSIDS41.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "IMSIDS41.h"
+#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
 
 int
 IMSIDS41_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/IMSIESN.c b/src/hnbap/IMSIESN.c
index 7bfd73b..19fd7b9 100644
--- a/src/hnbap/IMSIESN.c
+++ b/src/hnbap/IMSIESN.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "IMSIESN.h"
+#include <osmocom/osmo-iuh/hnbap/IMSIESN.h>
 
 static asn_TYPE_member_t asn_MBR_IMSIESN_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct IMSIESN, iMSIDS41),
diff --git a/src/hnbap/IMSIESN.h b/src/hnbap/IMSIESN.h
index 442a217..f81ecb9 100644
--- a/src/hnbap/IMSIESN.h
+++ b/src/hnbap/IMSIESN.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "IMSIDS41.h"
-#include "ESN.h"
+#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
+#include <osmocom/osmo-iuh/hnbap/ESN.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/IP-Address.c b/src/hnbap/IP-Address.c
index eb2e872..0b3b94e 100644
--- a/src/hnbap/IP-Address.c
+++ b/src/hnbap/IP-Address.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "IP-Address.h"
+#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
 
 static asn_per_constraints_t asn_PER_type_ipaddress_constr_2 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/IP-Address.h b/src/hnbap/IP-Address.h
index f73bd17..26a4cb5 100644
--- a/src/hnbap/IP-Address.h
+++ b/src/hnbap/IP-Address.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "Ipv4Address.h"
-#include "Ipv6Address.h"
+#include <osmocom/osmo-iuh/hnbap/Ipv4Address.h>
+#include <osmocom/osmo-iuh/hnbap/Ipv6Address.h>
 #include <constr_CHOICE.h>
 #include <constr_SEQUENCE.h>
 
@@ -67,7 +67,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _IP_Address_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/InitiatingMessage.c b/src/hnbap/InitiatingMessage.c
index bafcc94..144f211 100644
--- a/src/hnbap/InitiatingMessage.c
+++ b/src/hnbap/InitiatingMessage.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "InitiatingMessage.h"
+#include <osmocom/osmo-iuh/hnbap/InitiatingMessage.h>
 
 static asn_TYPE_member_t asn_MBR_InitiatingMessage_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct InitiatingMessage, procedureCode),
diff --git a/src/hnbap/InitiatingMessage.h b/src/hnbap/InitiatingMessage.h
index 60adbe1..c3080b7 100644
--- a/src/hnbap/InitiatingMessage.h
+++ b/src/hnbap/InitiatingMessage.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "ProcedureCode.h"
-#include "Criticality.h"
+#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
+#include <osmocom/osmo-iuh/hnbap/Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/src/hnbap/Ipv4Address.c b/src/hnbap/Ipv4Address.c
index fee44c2..7bf96f8 100644
--- a/src/hnbap/Ipv4Address.c
+++ b/src/hnbap/Ipv4Address.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Ipv4Address.h"
+#include <osmocom/osmo-iuh/hnbap/Ipv4Address.h>
 
 int
 Ipv4Address_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Ipv6Address.c b/src/hnbap/Ipv6Address.c
index 0a140e4..f9b7e43 100644
--- a/src/hnbap/Ipv6Address.c
+++ b/src/hnbap/Ipv6Address.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Ipv6Address.h"
+#include <osmocom/osmo-iuh/hnbap/Ipv6Address.h>
 
 int
 Ipv6Address_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Iurh-Signalling-TNL-AddressList.c b/src/hnbap/Iurh-Signalling-TNL-AddressList.c
index cd2830f..2ac7bb2 100644
--- a/src/hnbap/Iurh-Signalling-TNL-AddressList.c
+++ b/src/hnbap/Iurh-Signalling-TNL-AddressList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Iurh-Signalling-TNL-AddressList.h"
+#include <osmocom/osmo-iuh/hnbap/Iurh-Signalling-TNL-AddressList.h>
 
 static asn_per_constraints_t asn_PER_type_Iurh_Signalling_TNL_AddressList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/Iurh-Signalling-TNL-AddressList.h b/src/hnbap/Iurh-Signalling-TNL-AddressList.h
index cd86644..934203c 100644
--- a/src/hnbap/Iurh-Signalling-TNL-AddressList.h
+++ b/src/hnbap/Iurh-Signalling-TNL-AddressList.h
@@ -38,7 +38,7 @@
 #endif
 
 /* Referred external types */
-#include "IP-Address.h"
+#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
 
 #endif	/* _Iurh_Signalling_TNL_AddressList_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/LAC.c b/src/hnbap/LAC.c
index 2ff94dc..850fab5 100644
--- a/src/hnbap/LAC.c
+++ b/src/hnbap/LAC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "LAC.h"
+#include <osmocom/osmo-iuh/hnbap/LAC.h>
 
 int
 LAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/LAI.c b/src/hnbap/LAI.c
index 2fddfd2..43e20d2 100644
--- a/src/hnbap/LAI.c
+++ b/src/hnbap/LAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "LAI.h"
+#include <osmocom/osmo-iuh/hnbap/LAI.h>
 
 static asn_TYPE_member_t asn_MBR_LAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct LAI, pLMNID),
diff --git a/src/hnbap/LAI.h b/src/hnbap/LAI.h
index 36c0981..e0cd2ea 100644
--- a/src/hnbap/LAI.h
+++ b/src/hnbap/LAI.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "PLMNidentity.h"
-#include "LAC.h"
+#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
+#include <osmocom/osmo-iuh/hnbap/LAC.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/MacroCellID.c b/src/hnbap/MacroCellID.c
index 416dc1c..90e4b86 100644
--- a/src/hnbap/MacroCellID.c
+++ b/src/hnbap/MacroCellID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "MacroCellID.h"
+#include <osmocom/osmo-iuh/hnbap/MacroCellID.h>
 
 static asn_per_constraints_t asn_PER_type_MacroCellID_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/MacroCellID.h b/src/hnbap/MacroCellID.h
index f266925..04ed95f 100644
--- a/src/hnbap/MacroCellID.h
+++ b/src/hnbap/MacroCellID.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "UTRANCellID.h"
-#include "CGI.h"
+#include <osmocom/osmo-iuh/hnbap/UTRANCellID.h>
+#include <osmocom/osmo-iuh/hnbap/CGI.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/MacroCoverageInformation.c b/src/hnbap/MacroCoverageInformation.c
index 18ded6c..40716ae 100644
--- a/src/hnbap/MacroCoverageInformation.c
+++ b/src/hnbap/MacroCoverageInformation.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "MacroCoverageInformation.h"
+#include <osmocom/osmo-iuh/hnbap/MacroCoverageInformation.h>
 
 static asn_TYPE_member_t asn_MBR_MacroCoverageInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct MacroCoverageInformation, cellIdentity),
diff --git a/src/hnbap/MacroCoverageInformation.h b/src/hnbap/MacroCoverageInformation.h
index 547e03e..9785267 100644
--- a/src/hnbap/MacroCoverageInformation.h
+++ b/src/hnbap/MacroCoverageInformation.h
@@ -12,7 +12,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "MacroCellID.h"
+#include <osmocom/osmo-iuh/hnbap/MacroCellID.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _MacroCoverageInformation_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/MuxPortNumber.c b/src/hnbap/MuxPortNumber.c
index eed1c1a..11045d1 100644
--- a/src/hnbap/MuxPortNumber.c
+++ b/src/hnbap/MuxPortNumber.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "MuxPortNumber.h"
+#include <osmocom/osmo-iuh/hnbap/MuxPortNumber.h>
 
 int
 MuxPortNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/NeighbourCellIdentityList.c b/src/hnbap/NeighbourCellIdentityList.c
index 432e7f5..822c8c4 100644
--- a/src/hnbap/NeighbourCellIdentityList.c
+++ b/src/hnbap/NeighbourCellIdentityList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "NeighbourCellIdentityList.h"
+#include <osmocom/osmo-iuh/hnbap/NeighbourCellIdentityList.h>
 
 static asn_per_constraints_t asn_PER_type_NeighbourCellIdentityList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/NeighbourCellIdentityList.h b/src/hnbap/NeighbourCellIdentityList.h
index c1eb6ec..4f8060c 100644
--- a/src/hnbap/NeighbourCellIdentityList.h
+++ b/src/hnbap/NeighbourCellIdentityList.h
@@ -38,7 +38,7 @@
 #endif
 
 /* Referred external types */
-#include "NeighbourIdentity.h"
+#include <osmocom/osmo-iuh/hnbap/NeighbourIdentity.h>
 
 #endif	/* _NeighbourCellIdentityList_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/NeighbourIdentity.c b/src/hnbap/NeighbourIdentity.c
index 8ddefab..7b91d61 100644
--- a/src/hnbap/NeighbourIdentity.c
+++ b/src/hnbap/NeighbourIdentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "NeighbourIdentity.h"
+#include <osmocom/osmo-iuh/hnbap/NeighbourIdentity.h>
 
 static asn_per_constraints_t asn_PER_type_NeighbourIdentity_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/NeighbourIdentity.h b/src/hnbap/NeighbourIdentity.h
index 8335e5d..29f77db 100644
--- a/src/hnbap/NeighbourIdentity.h
+++ b/src/hnbap/NeighbourIdentity.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "HNB-RNL-Identity.h"
-#include "CellIdentity.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/NeighbourInfoList.c b/src/hnbap/NeighbourInfoList.c
index 52364b4..6ab0861 100644
--- a/src/hnbap/NeighbourInfoList.c
+++ b/src/hnbap/NeighbourInfoList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "NeighbourInfoList.h"
+#include <osmocom/osmo-iuh/hnbap/NeighbourInfoList.h>
 
 static asn_per_constraints_t asn_PER_type_NeighbourInfoList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/NeighbourInfoList.h b/src/hnbap/NeighbourInfoList.h
index cce2734..cb0c83e 100644
--- a/src/hnbap/NeighbourInfoList.h
+++ b/src/hnbap/NeighbourInfoList.h
@@ -38,7 +38,7 @@
 #endif
 
 /* Referred external types */
-#include "HNBConfigInfo.h"
+#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
 
 #endif	/* _NeighbourInfoList_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/NeighbourInfoRequestItem.c b/src/hnbap/NeighbourInfoRequestItem.c
index 0e5a2e5..3c9d323 100644
--- a/src/hnbap/NeighbourInfoRequestItem.c
+++ b/src/hnbap/NeighbourInfoRequestItem.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "NeighbourInfoRequestItem.h"
+#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestItem.h>
 
 static asn_TYPE_member_t asn_MBR_NeighbourInfoRequestItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct NeighbourInfoRequestItem, hnb_RNL_Identity),
diff --git a/src/hnbap/NeighbourInfoRequestItem.h b/src/hnbap/NeighbourInfoRequestItem.h
index e3fa668..02ffd34 100644
--- a/src/hnbap/NeighbourInfoRequestItem.h
+++ b/src/hnbap/NeighbourInfoRequestItem.h
@@ -12,7 +12,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "HNB-RNL-Identity.h"
+#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -43,7 +43,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _NeighbourInfoRequestItem_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/NeighbourInfoRequestList.c b/src/hnbap/NeighbourInfoRequestList.c
index 03e4c44..7c44216 100644
--- a/src/hnbap/NeighbourInfoRequestList.c
+++ b/src/hnbap/NeighbourInfoRequestList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "NeighbourInfoRequestList.h"
+#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestList.h>
 
 static asn_per_constraints_t asn_PER_type_NeighbourInfoRequestList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/NeighbourInfoRequestList.h b/src/hnbap/NeighbourInfoRequestList.h
index 5546368..b8d4c51 100644
--- a/src/hnbap/NeighbourInfoRequestList.h
+++ b/src/hnbap/NeighbourInfoRequestList.h
@@ -38,7 +38,7 @@
 #endif
 
 /* Referred external types */
-#include "NeighbourInfoRequestItem.h"
+#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestItem.h>
 
 #endif	/* _NeighbourInfoRequestList_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/PLMNidentity.c b/src/hnbap/PLMNidentity.c
index d69e0bb..2e6ca1b 100644
--- a/src/hnbap/PLMNidentity.c
+++ b/src/hnbap/PLMNidentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "PLMNidentity.h"
+#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
 
 int
 PLMNidentity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PSC.c b/src/hnbap/PSC.c
index f7b9004..1a3eb96 100644
--- a/src/hnbap/PSC.c
+++ b/src/hnbap/PSC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "PSC.h"
+#include <osmocom/osmo-iuh/hnbap/PSC.h>
 
 int
 PSC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PTMSI.c b/src/hnbap/PTMSI.c
index 8c8fb6f..9483033 100644
--- a/src/hnbap/PTMSI.c
+++ b/src/hnbap/PTMSI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "PTMSI.h"
+#include <osmocom/osmo-iuh/hnbap/PTMSI.h>
 
 int
 PTMSI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PTMSIRAI.c b/src/hnbap/PTMSIRAI.c
index 018f59c..100ce33 100644
--- a/src/hnbap/PTMSIRAI.c
+++ b/src/hnbap/PTMSIRAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "PTMSIRAI.h"
+#include <osmocom/osmo-iuh/hnbap/PTMSIRAI.h>
 
 static asn_TYPE_member_t asn_MBR_PTMSIRAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct PTMSIRAI, pTMSI),
diff --git a/src/hnbap/PTMSIRAI.h b/src/hnbap/PTMSIRAI.h
index 940a62c..570bc35 100644
--- a/src/hnbap/PTMSIRAI.h
+++ b/src/hnbap/PTMSIRAI.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "PTMSI.h"
-#include "RAI.h"
+#include <osmocom/osmo-iuh/hnbap/PTMSI.h>
+#include <osmocom/osmo-iuh/hnbap/RAI.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/Presence.c b/src/hnbap/Presence.c
index 087fb95..0145b55 100644
--- a/src/hnbap/Presence.c
+++ b/src/hnbap/Presence.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Presence.h"
+#include <osmocom/osmo-iuh/hnbap/Presence.h>
 
 int
 Presence_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PrivateIE-ID.c b/src/hnbap/PrivateIE-ID.c
index d35272a..d1abb8e 100644
--- a/src/hnbap/PrivateIE-ID.c
+++ b/src/hnbap/PrivateIE-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "PrivateIE-ID.h"
+#include <osmocom/osmo-iuh/hnbap/PrivateIE-ID.h>
 
 static int
 memb_local_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PrivateMessage.c b/src/hnbap/PrivateMessage.c
index f512d69..e977d28 100644
--- a/src/hnbap/PrivateMessage.c
+++ b/src/hnbap/PrivateMessage.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "PrivateMessage.h"
+#include <osmocom/osmo-iuh/hnbap/PrivateMessage.h>
 
 static int
 memb_privateMessage_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PrivateMessage.h b/src/hnbap/PrivateMessage.h
index 6d3d15e..5a5d7d4 100644
--- a/src/hnbap/PrivateMessage.h
+++ b/src/hnbap/PrivateMessage.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _PrivateMessage_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/ProcedureCode.c b/src/hnbap/ProcedureCode.c
index ddd920f..daa9700 100644
--- a/src/hnbap/ProcedureCode.c
+++ b/src/hnbap/ProcedureCode.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "ProcedureCode.h"
+#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
 
 int
 ProcedureCode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/ProtocolIE-ID.c b/src/hnbap/ProtocolIE-ID.c
index 5ac3206..f354abe 100644
--- a/src/hnbap/ProtocolIE-ID.c
+++ b/src/hnbap/ProtocolIE-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "ProtocolIE-ID.h"
+#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
 
 int
 ProtocolIE_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/RAB-ID.c b/src/hnbap/RAB-ID.c
index db9874f..2258617 100644
--- a/src/hnbap/RAB-ID.c
+++ b/src/hnbap/RAB-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "RAB-ID.h"
+#include <osmocom/osmo-iuh/hnbap/RAB-ID.h>
 
 int
 RAB_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/RABList.c b/src/hnbap/RABList.c
index c7acd62..095d758 100644
--- a/src/hnbap/RABList.c
+++ b/src/hnbap/RABList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "RABList.h"
+#include <osmocom/osmo-iuh/hnbap/RABList.h>
 
 static asn_per_constraints_t asn_PER_type_RABList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/RABList.h b/src/hnbap/RABList.h
index f4834de..9b05ecc 100644
--- a/src/hnbap/RABList.h
+++ b/src/hnbap/RABList.h
@@ -38,7 +38,7 @@
 #endif
 
 /* Referred external types */
-#include "RABListItem.h"
+#include <osmocom/osmo-iuh/hnbap/RABListItem.h>
 
 #endif	/* _RABList_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/RABListItem.c b/src/hnbap/RABListItem.c
index 447c0f7..9c9bc52 100644
--- a/src/hnbap/RABListItem.c
+++ b/src/hnbap/RABListItem.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "RABListItem.h"
+#include <osmocom/osmo-iuh/hnbap/RABListItem.h>
 
 static asn_TYPE_member_t asn_MBR_RABListItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RABListItem, rAB_ID),
diff --git a/src/hnbap/RABListItem.h b/src/hnbap/RABListItem.h
index d610453..18e1b29 100644
--- a/src/hnbap/RABListItem.h
+++ b/src/hnbap/RABListItem.h
@@ -12,9 +12,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "RAB-ID.h"
-#include "TransportInfo.h"
-#include "CN-DomainIndicator.h"
+#include <osmocom/osmo-iuh/hnbap/RAB-ID.h>
+#include <osmocom/osmo-iuh/hnbap/TransportInfo.h>
+#include <osmocom/osmo-iuh/hnbap/CN-DomainIndicator.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _RABListItem_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/RAC.c b/src/hnbap/RAC.c
index 5f0136c..aca374a 100644
--- a/src/hnbap/RAC.c
+++ b/src/hnbap/RAC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "RAC.h"
+#include <osmocom/osmo-iuh/hnbap/RAC.h>
 
 int
 RAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/RAI.c b/src/hnbap/RAI.c
index da7308c..2259163 100644
--- a/src/hnbap/RAI.c
+++ b/src/hnbap/RAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "RAI.h"
+#include <osmocom/osmo-iuh/hnbap/RAI.h>
 
 static asn_TYPE_member_t asn_MBR_RAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RAI, lAI),
diff --git a/src/hnbap/RAI.h b/src/hnbap/RAI.h
index faa8e3d..6ecd006 100644
--- a/src/hnbap/RAI.h
+++ b/src/hnbap/RAI.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "LAI.h"
-#include "RAC.h"
+#include <osmocom/osmo-iuh/hnbap/LAI.h>
+#include <osmocom/osmo-iuh/hnbap/RAC.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/RNC-ID.c b/src/hnbap/RNC-ID.c
index f386fd1..1005f39 100644
--- a/src/hnbap/RNC-ID.c
+++ b/src/hnbap/RNC-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "RNC-ID.h"
+#include <osmocom/osmo-iuh/hnbap/RNC-ID.h>
 
 int
 RNC_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Registration-Cause.c b/src/hnbap/Registration-Cause.c
index e04843c..00c3561 100644
--- a/src/hnbap/Registration-Cause.c
+++ b/src/hnbap/Registration-Cause.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Registration-Cause.h"
+#include <osmocom/osmo-iuh/hnbap/Registration-Cause.h>
 
 int
 Registration_Cause_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/RelocationComplete.c b/src/hnbap/RelocationComplete.c
index f5677b8..2fd8bce 100644
--- a/src/hnbap/RelocationComplete.c
+++ b/src/hnbap/RelocationComplete.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "RelocationComplete.h"
+#include <osmocom/osmo-iuh/hnbap/RelocationComplete.h>
 
 static int
 memb_relocationComplete_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/RelocationComplete.h b/src/hnbap/RelocationComplete.h
index a14ddb7..74ca101 100644
--- a/src/hnbap/RelocationComplete.h
+++ b/src/hnbap/RelocationComplete.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _RelocationComplete_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/S-RNTIPrefix.c b/src/hnbap/S-RNTIPrefix.c
index 2ea4857..042ce57 100644
--- a/src/hnbap/S-RNTIPrefix.c
+++ b/src/hnbap/S-RNTIPrefix.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "S-RNTIPrefix.h"
+#include <osmocom/osmo-iuh/hnbap/S-RNTIPrefix.h>
 
 int
 S_RNTIPrefix_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/SAC.c b/src/hnbap/SAC.c
index 78f2815..0a5a023 100644
--- a/src/hnbap/SAC.c
+++ b/src/hnbap/SAC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "SAC.h"
+#include <osmocom/osmo-iuh/hnbap/SAC.h>
 
 int
 SAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/SuccessfulOutcome.c b/src/hnbap/SuccessfulOutcome.c
index ffdaaa8..8c8f95b 100644
--- a/src/hnbap/SuccessfulOutcome.c
+++ b/src/hnbap/SuccessfulOutcome.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "SuccessfulOutcome.h"
+#include <osmocom/osmo-iuh/hnbap/SuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_SuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct SuccessfulOutcome, procedureCode),
diff --git a/src/hnbap/SuccessfulOutcome.h b/src/hnbap/SuccessfulOutcome.h
index b831b5f..90d798d 100644
--- a/src/hnbap/SuccessfulOutcome.h
+++ b/src/hnbap/SuccessfulOutcome.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "ProcedureCode.h"
-#include "Criticality.h"
+#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
+#include <osmocom/osmo-iuh/hnbap/Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/src/hnbap/TMSIDS41.c b/src/hnbap/TMSIDS41.c
index 1aaecfb..6e003a0 100644
--- a/src/hnbap/TMSIDS41.c
+++ b/src/hnbap/TMSIDS41.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "TMSIDS41.h"
+#include <osmocom/osmo-iuh/hnbap/TMSIDS41.h>
 
 int
 TMSIDS41_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TMSILAI.c b/src/hnbap/TMSILAI.c
index 2880c58..8fe7cd6 100644
--- a/src/hnbap/TMSILAI.c
+++ b/src/hnbap/TMSILAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "TMSILAI.h"
+#include <osmocom/osmo-iuh/hnbap/TMSILAI.h>
 
 static int
 memb_tMSI_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TMSILAI.h b/src/hnbap/TMSILAI.h
index ca71008..2ba0a1a 100644
--- a/src/hnbap/TMSILAI.h
+++ b/src/hnbap/TMSILAI.h
@@ -13,7 +13,7 @@
 
 /* Including external dependencies */
 #include <BIT_STRING.h>
-#include "LAI.h"
+#include <osmocom/osmo-iuh/hnbap/LAI.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/TNLUpdateFailure.c b/src/hnbap/TNLUpdateFailure.c
index 829cc13..8ba33b8 100644
--- a/src/hnbap/TNLUpdateFailure.c
+++ b/src/hnbap/TNLUpdateFailure.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "TNLUpdateFailure.h"
+#include <osmocom/osmo-iuh/hnbap/TNLUpdateFailure.h>
 
 static int
 memb_tnlUpdateFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TNLUpdateFailure.h b/src/hnbap/TNLUpdateFailure.h
index 5bd0c05..eb942e5 100644
--- a/src/hnbap/TNLUpdateFailure.h
+++ b/src/hnbap/TNLUpdateFailure.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _TNLUpdateFailure_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/TNLUpdateRequest.c b/src/hnbap/TNLUpdateRequest.c
index 1917269..9edfa65 100644
--- a/src/hnbap/TNLUpdateRequest.c
+++ b/src/hnbap/TNLUpdateRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "TNLUpdateRequest.h"
+#include <osmocom/osmo-iuh/hnbap/TNLUpdateRequest.h>
 
 static int
 memb_tnlUpdateRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TNLUpdateRequest.h b/src/hnbap/TNLUpdateRequest.h
index 52a4b38..129a35a 100644
--- a/src/hnbap/TNLUpdateRequest.h
+++ b/src/hnbap/TNLUpdateRequest.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _TNLUpdateRequest_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/TNLUpdateResponse.c b/src/hnbap/TNLUpdateResponse.c
index a956010..77123a7 100644
--- a/src/hnbap/TNLUpdateResponse.c
+++ b/src/hnbap/TNLUpdateResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "TNLUpdateResponse.h"
+#include <osmocom/osmo-iuh/hnbap/TNLUpdateResponse.h>
 
 static int
 memb_tnlUpdateResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TNLUpdateResponse.h b/src/hnbap/TNLUpdateResponse.h
index b01cd30..304cbe6 100644
--- a/src/hnbap/TNLUpdateResponse.h
+++ b/src/hnbap/TNLUpdateResponse.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _TNLUpdateResponse_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/TransportInfo.c b/src/hnbap/TransportInfo.c
index d511012..a1d383e 100644
--- a/src/hnbap/TransportInfo.c
+++ b/src/hnbap/TransportInfo.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "TransportInfo.h"
+#include <osmocom/osmo-iuh/hnbap/TransportInfo.h>
 
 static asn_per_constraints_t asn_PER_type_transportAssociation_constr_3 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/TransportInfo.h b/src/hnbap/TransportInfo.h
index 6176761..d81936d 100644
--- a/src/hnbap/TransportInfo.h
+++ b/src/hnbap/TransportInfo.h
@@ -12,9 +12,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "TransportLayerAddress.h"
-#include "GTP-TEI.h"
-#include "BindingID.h"
+#include <osmocom/osmo-iuh/hnbap/TransportLayerAddress.h>
+#include <osmocom/osmo-iuh/hnbap/GTP-TEI.h>
+#include <osmocom/osmo-iuh/hnbap/BindingID.h>
 #include <constr_CHOICE.h>
 #include <constr_SEQUENCE.h>
 
@@ -69,7 +69,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _TransportInfo_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/TransportLayerAddress.c b/src/hnbap/TransportLayerAddress.c
index db4b0da..d863b25 100644
--- a/src/hnbap/TransportLayerAddress.c
+++ b/src/hnbap/TransportLayerAddress.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "TransportLayerAddress.h"
+#include <osmocom/osmo-iuh/hnbap/TransportLayerAddress.h>
 
 int
 TransportLayerAddress_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TriggeringMessage.c b/src/hnbap/TriggeringMessage.c
index 0f2ab4e..a61090b 100644
--- a/src/hnbap/TriggeringMessage.c
+++ b/src/hnbap/TriggeringMessage.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "TriggeringMessage.h"
+#include <osmocom/osmo-iuh/hnbap/TriggeringMessage.h>
 
 int
 TriggeringMessage_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Tunnel-Information.c b/src/hnbap/Tunnel-Information.c
index dcb0dd7..6966335 100644
--- a/src/hnbap/Tunnel-Information.c
+++ b/src/hnbap/Tunnel-Information.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Tunnel-Information.h"
+#include <osmocom/osmo-iuh/hnbap/Tunnel-Information.h>
 
 static asn_TYPE_member_t asn_MBR_Tunnel_Information_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct Tunnel_Information, iP_Address),
diff --git a/src/hnbap/Tunnel-Information.h b/src/hnbap/Tunnel-Information.h
index 964b3e9..5d87aba 100644
--- a/src/hnbap/Tunnel-Information.h
+++ b/src/hnbap/Tunnel-Information.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "IP-Address.h"
-#include "UDP-Port-Number.h"
+#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
+#include <osmocom/osmo-iuh/hnbap/UDP-Port-Number.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -45,7 +45,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _Tunnel_Information_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/TypeOfError.c b/src/hnbap/TypeOfError.c
index 97e81f0..f3e132e 100644
--- a/src/hnbap/TypeOfError.c
+++ b/src/hnbap/TypeOfError.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "TypeOfError.h"
+#include <osmocom/osmo-iuh/hnbap/TypeOfError.h>
 
 int
 TypeOfError_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/U-RNTI.c b/src/hnbap/U-RNTI.c
index 0e06a13..3b1fd05 100644
--- a/src/hnbap/U-RNTI.c
+++ b/src/hnbap/U-RNTI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "U-RNTI.h"
+#include <osmocom/osmo-iuh/hnbap/U-RNTI.h>
 
 int
 U_RNTI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/U-RNTIQueryRequest.c b/src/hnbap/U-RNTIQueryRequest.c
index 8a64aa5..986a083 100644
--- a/src/hnbap/U-RNTIQueryRequest.c
+++ b/src/hnbap/U-RNTIQueryRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "U-RNTIQueryRequest.h"
+#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryRequest.h>
 
 static int
 memb_u_RNTIQueryRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/U-RNTIQueryRequest.h b/src/hnbap/U-RNTIQueryRequest.h
index b460dd1..2568963 100644
--- a/src/hnbap/U-RNTIQueryRequest.h
+++ b/src/hnbap/U-RNTIQueryRequest.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _U_RNTIQueryRequest_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/U-RNTIQueryResponse.c b/src/hnbap/U-RNTIQueryResponse.c
index 61222c0..0d00baa 100644
--- a/src/hnbap/U-RNTIQueryResponse.c
+++ b/src/hnbap/U-RNTIQueryResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "U-RNTIQueryResponse.h"
+#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryResponse.h>
 
 static int
 memb_u_RNTIQueryResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/U-RNTIQueryResponse.h b/src/hnbap/U-RNTIQueryResponse.h
index 3b27078..ed411ab 100644
--- a/src/hnbap/U-RNTIQueryResponse.h
+++ b/src/hnbap/U-RNTIQueryResponse.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _U_RNTIQueryResponse_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/UDP-Port-Number.c b/src/hnbap/UDP-Port-Number.c
index 7154553..647e546 100644
--- a/src/hnbap/UDP-Port-Number.c
+++ b/src/hnbap/UDP-Port-Number.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UDP-Port-Number.h"
+#include <osmocom/osmo-iuh/hnbap/UDP-Port-Number.h>
 
 int
 UDP_Port_Number_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UE-Capabilities.c b/src/hnbap/UE-Capabilities.c
index 9e69fb2..7fc2384 100644
--- a/src/hnbap/UE-Capabilities.c
+++ b/src/hnbap/UE-Capabilities.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UE-Capabilities.h"
+#include <osmocom/osmo-iuh/hnbap/UE-Capabilities.h>
 
 static asn_TYPE_member_t asn_MBR_UE_Capabilities_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct UE_Capabilities, access_stratum_release_indicator),
diff --git a/src/hnbap/UE-Capabilities.h b/src/hnbap/UE-Capabilities.h
index 221e434..1d4cf41 100644
--- a/src/hnbap/UE-Capabilities.h
+++ b/src/hnbap/UE-Capabilities.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "Access-stratum-release-indicator.h"
-#include "CSG-Capability.h"
+#include <osmocom/osmo-iuh/hnbap/Access-stratum-release-indicator.h>
+#include <osmocom/osmo-iuh/hnbap/CSG-Capability.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -45,7 +45,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _UE_Capabilities_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/UE-Identity.c b/src/hnbap/UE-Identity.c
index b6bd6f6..d354b76 100644
--- a/src/hnbap/UE-Identity.c
+++ b/src/hnbap/UE-Identity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UE-Identity.h"
+#include <osmocom/osmo-iuh/hnbap/UE-Identity.h>
 
 static asn_per_constraints_t asn_PER_type_UE_Identity_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0l,  7l }	/* (0..7,...) */,
diff --git a/src/hnbap/UE-Identity.h b/src/hnbap/UE-Identity.h
index 8c6d0d1..90852f9 100644
--- a/src/hnbap/UE-Identity.h
+++ b/src/hnbap/UE-Identity.h
@@ -12,14 +12,14 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "IMSI.h"
-#include "TMSILAI.h"
-#include "PTMSIRAI.h"
-#include "IMEI.h"
-#include "ESN.h"
-#include "IMSIDS41.h"
-#include "IMSIESN.h"
-#include "TMSIDS41.h"
+#include <osmocom/osmo-iuh/hnbap/IMSI.h>
+#include <osmocom/osmo-iuh/hnbap/TMSILAI.h>
+#include <osmocom/osmo-iuh/hnbap/PTMSIRAI.h>
+#include <osmocom/osmo-iuh/hnbap/IMEI.h>
+#include <osmocom/osmo-iuh/hnbap/ESN.h>
+#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
+#include <osmocom/osmo-iuh/hnbap/IMSIESN.h>
+#include <osmocom/osmo-iuh/hnbap/TMSIDS41.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/src/hnbap/UEDe-Register.c b/src/hnbap/UEDe-Register.c
index 967aad8..0008839 100644
--- a/src/hnbap/UEDe-Register.c
+++ b/src/hnbap/UEDe-Register.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UEDe-Register.h"
+#include <osmocom/osmo-iuh/hnbap/UEDe-Register.h>
 
 static int
 memb_ueDe_Register_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UEDe-Register.h b/src/hnbap/UEDe-Register.h
index 85a4e75..818491a 100644
--- a/src/hnbap/UEDe-Register.h
+++ b/src/hnbap/UEDe-Register.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _UEDe_Register_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/UERegisterAccept.c b/src/hnbap/UERegisterAccept.c
index a9c3589..87b15fd 100644
--- a/src/hnbap/UERegisterAccept.c
+++ b/src/hnbap/UERegisterAccept.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UERegisterAccept.h"
+#include <osmocom/osmo-iuh/hnbap/UERegisterAccept.h>
 
 static int
 memb_ueRegisterAccept_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UERegisterAccept.h b/src/hnbap/UERegisterAccept.h
index 8b9bdae..d6884bf 100644
--- a/src/hnbap/UERegisterAccept.h
+++ b/src/hnbap/UERegisterAccept.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _UERegisterAccept_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/UERegisterReject.c b/src/hnbap/UERegisterReject.c
index 49a439e..dd93ded 100644
--- a/src/hnbap/UERegisterReject.c
+++ b/src/hnbap/UERegisterReject.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UERegisterReject.h"
+#include <osmocom/osmo-iuh/hnbap/UERegisterReject.h>
 
 static int
 memb_ueRegisterReject_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UERegisterReject.h b/src/hnbap/UERegisterReject.h
index 4130147..fe697b4 100644
--- a/src/hnbap/UERegisterReject.h
+++ b/src/hnbap/UERegisterReject.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _UERegisterReject_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/UERegisterRequest.c b/src/hnbap/UERegisterRequest.c
index 052ac69..a0d51de 100644
--- a/src/hnbap/UERegisterRequest.c
+++ b/src/hnbap/UERegisterRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UERegisterRequest.h"
+#include <osmocom/osmo-iuh/hnbap/UERegisterRequest.h>
 
 static int
 memb_ueRegisterRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UERegisterRequest.h b/src/hnbap/UERegisterRequest.h
index c637a1f..e718945 100644
--- a/src/hnbap/UERegisterRequest.h
+++ b/src/hnbap/UERegisterRequest.h
@@ -48,7 +48,7 @@
 #endif
 
 /* Referred external types */
-#include "IE.h"
+#include <osmocom/osmo-iuh/hnbap/IE.h>
 
 #endif	/* _UERegisterRequest_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/URAIdentity.c b/src/hnbap/URAIdentity.c
index 63dfeb5..bdf7ea8 100644
--- a/src/hnbap/URAIdentity.c
+++ b/src/hnbap/URAIdentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "URAIdentity.h"
+#include <osmocom/osmo-iuh/hnbap/URAIdentity.h>
 
 int
 URAIdentity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/URAIdentityList.c b/src/hnbap/URAIdentityList.c
index e539ee2..63f9702 100644
--- a/src/hnbap/URAIdentityList.c
+++ b/src/hnbap/URAIdentityList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "URAIdentityList.h"
+#include <osmocom/osmo-iuh/hnbap/URAIdentityList.h>
 
 static asn_per_constraints_t asn_PER_type_URAIdentityList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/URAIdentityList.h b/src/hnbap/URAIdentityList.h
index 25e436f..12c3bb5 100644
--- a/src/hnbap/URAIdentityList.h
+++ b/src/hnbap/URAIdentityList.h
@@ -12,7 +12,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "URAIdentity.h"
+#include <osmocom/osmo-iuh/hnbap/URAIdentity.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/src/hnbap/UTRANCellID.c b/src/hnbap/UTRANCellID.c
index 928c0d3..2e61d55 100644
--- a/src/hnbap/UTRANCellID.c
+++ b/src/hnbap/UTRANCellID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UTRANCellID.h"
+#include <osmocom/osmo-iuh/hnbap/UTRANCellID.h>
 
 static asn_TYPE_member_t asn_MBR_UTRANCellID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct UTRANCellID, lAC),
diff --git a/src/hnbap/UTRANCellID.h b/src/hnbap/UTRANCellID.h
index bed91f5..b034165 100644
--- a/src/hnbap/UTRANCellID.h
+++ b/src/hnbap/UTRANCellID.h
@@ -12,10 +12,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "LAC.h"
-#include "RAC.h"
-#include "PLMNidentity.h"
-#include "CellIdentity.h"
+#include <osmocom/osmo-iuh/hnbap/LAC.h>
+#include <osmocom/osmo-iuh/hnbap/RAC.h>
+#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
+#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
@@ -45,7 +45,7 @@
 #endif
 
 /* Referred external types */
-#include "IE-Extensions.h"
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
 
 #endif	/* _UTRANCellID_H_ */
 #include <asn_internal.h>
diff --git a/src/hnbap/UnknownU-RNTIIndication.c b/src/hnbap/UnknownU-RNTIIndication.c
index c5b9f77..1dcbc16 100644
--- a/src/hnbap/UnknownU-RNTIIndication.c
+++ b/src/hnbap/UnknownU-RNTIIndication.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UnknownU-RNTIIndication.h"
+#include <osmocom/osmo-iuh/hnbap/UnknownU-RNTIIndication.h>
 
 int
 UnknownU_RNTIIndication_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UnsuccessfulOutcome.c b/src/hnbap/UnsuccessfulOutcome.c
index bb5947c..4689abb 100644
--- a/src/hnbap/UnsuccessfulOutcome.c
+++ b/src/hnbap/UnsuccessfulOutcome.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "UnsuccessfulOutcome.h"
+#include <osmocom/osmo-iuh/hnbap/UnsuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_UnsuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct UnsuccessfulOutcome, procedureCode),
diff --git a/src/hnbap/UnsuccessfulOutcome.h b/src/hnbap/UnsuccessfulOutcome.h
index 91090d0..bae3125 100644
--- a/src/hnbap/UnsuccessfulOutcome.h
+++ b/src/hnbap/UnsuccessfulOutcome.h
@@ -12,8 +12,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include "ProcedureCode.h"
-#include "Criticality.h"
+#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
+#include <osmocom/osmo-iuh/hnbap/Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/src/hnbap/Update-cause.c b/src/hnbap/Update-cause.c
index f9ba133..60304fa 100644
--- a/src/hnbap/Update-cause.c
+++ b/src/hnbap/Update-cause.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include "Update-cause.h"
+#include <osmocom/osmo-iuh/hnbap/Update-cause.h>
 
 int
 Update_cause_constraint(asn_TYPE_descriptor_t *td, const void *sptr,