Remove osmo-iuh subdir level from include/ (2/2)
Make all changes to #include statements and build files.
diff --git a/include/osmocom/hnbap/AdditionalNeighbourInfoList.h b/include/osmocom/hnbap/AdditionalNeighbourInfoList.h
index 8098eab..7f1691d 100644
--- a/include/osmocom/hnbap/AdditionalNeighbourInfoList.h
+++ b/include/osmocom/hnbap/AdditionalNeighbourInfoList.h
@@ -38,7 +38,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
+#include <osmocom/hnbap/HNBConfigInfo.h>
#endif /* _AdditionalNeighbourInfoList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/CGI.h b/include/osmocom/hnbap/CGI.h
index 7971442..d588d01 100644
--- a/include/osmocom/hnbap/CGI.h
+++ b/include/osmocom/hnbap/CGI.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
-#include <osmocom/osmo-iuh/hnbap/LAC.h>
-#include <osmocom/osmo-iuh/hnbap/CI.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/LAC.h>
+#include <osmocom/hnbap/CI.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _CGI_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/CSGMembershipUpdate.h b/include/osmocom/hnbap/CSGMembershipUpdate.h
index dca4d2f..93e0248 100644
--- a/include/osmocom/hnbap/CSGMembershipUpdate.h
+++ b/include/osmocom/hnbap/CSGMembershipUpdate.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _CSGMembershipUpdate_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/Cause.h b/include/osmocom/hnbap/Cause.h
index 549cc79..1ce4c23 100644
--- a/include/osmocom/hnbap/Cause.h
+++ b/include/osmocom/hnbap/Cause.h
@@ -12,10 +12,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#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 <osmocom/hnbap/CauseRadioNetwork.h>
+#include <osmocom/hnbap/CauseTransport.h>
+#include <osmocom/hnbap/CauseProtocol.h>
+#include <osmocom/hnbap/CauseMisc.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/ConfigurationInformation.h b/include/osmocom/hnbap/ConfigurationInformation.h
index 0c33b02..4cd2bda 100644
--- a/include/osmocom/hnbap/ConfigurationInformation.h
+++ b/include/osmocom/hnbap/ConfigurationInformation.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationProvided.h>
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationMissing.h>
+#include <osmocom/hnbap/HNBConfigurationInformationProvided.h>
+#include <osmocom/hnbap/HNBConfigurationInformationMissing.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
index ae5a777..3e24ec9 100644
--- a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
@@ -13,9 +13,9 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
-#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/hnbap/TypeOfError.h>
+#include <osmocom/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProtocolIE-ID.h>
+#include <osmocom/hnbap/TypeOfError.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
@@ -54,7 +54,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _CriticalityDiagnostics_IE_List_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/CriticalityDiagnostics.h b/include/osmocom/hnbap/CriticalityDiagnostics.h
index 782da7b..d6595a1 100644
--- a/include/osmocom/hnbap/CriticalityDiagnostics.h
+++ b/include/osmocom/hnbap/CriticalityDiagnostics.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
-#include <osmocom/osmo-iuh/hnbap/TriggeringMessage.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/TriggeringMessage.h>
+#include <osmocom/hnbap/Criticality.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -49,8 +49,8 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics-IE-List.h>
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/CriticalityDiagnostics-IE-List.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _CriticalityDiagnostics_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/ErrorIndication.h b/include/osmocom/hnbap/ErrorIndication.h
index e2fd5cf..110934c 100644
--- a/include/osmocom/hnbap/ErrorIndication.h
+++ b/include/osmocom/hnbap/ErrorIndication.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _ErrorIndication_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/GeographicalCoordinates.h b/include/osmocom/hnbap/GeographicalCoordinates.h
index bc4cde3..cf0650b 100644
--- a/include/osmocom/hnbap/GeographicalCoordinates.h
+++ b/include/osmocom/hnbap/GeographicalCoordinates.h
@@ -53,7 +53,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _GeographicalCoordinates_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/GeographicalLocation.h b/include/osmocom/hnbap/GeographicalLocation.h
index c6ce2ca..bf228e7 100644
--- a/include/osmocom/hnbap/GeographicalLocation.h
+++ b/include/osmocom/hnbap/GeographicalLocation.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/hnbap/AltitudeAndDirection.h>
+#include <osmocom/hnbap/GeographicalCoordinates.h>
+#include <osmocom/hnbap/AltitudeAndDirection.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _GeographicalLocation_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNB-Cell-Identifier.h b/include/osmocom/hnbap/HNB-Cell-Identifier.h
index e5feebf..66e63f5 100644
--- a/include/osmocom/hnbap/HNB-Cell-Identifier.h
+++ b/include/osmocom/hnbap/HNB-Cell-Identifier.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
-#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/CellIdentity.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNB_Cell_Identifier_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNB-GWResponse.h b/include/osmocom/hnbap/HNB-GWResponse.h
index d2d99fa..436cf55 100644
--- a/include/osmocom/hnbap/HNB-GWResponse.h
+++ b/include/osmocom/hnbap/HNB-GWResponse.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
-#include <osmocom/osmo-iuh/hnbap/RNC-ID.h>
-#include <osmocom/osmo-iuh/hnbap/UnknownU-RNTIIndication.h>
+#include <osmocom/hnbap/HNBConfigInfo.h>
+#include <osmocom/hnbap/RNC-ID.h>
+#include <osmocom/hnbap/UnknownU-RNTIIndication.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/HNB-Identity.h b/include/osmocom/hnbap/HNB-Identity.h
index 30448d9..9fc83d5 100644
--- a/include/osmocom/hnbap/HNB-Identity.h
+++ b/include/osmocom/hnbap/HNB-Identity.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-Identity-Info.h>
+#include <osmocom/hnbap/HNB-Identity-Info.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNB_Identity_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNB-Location-Information.h b/include/osmocom/hnbap/HNB-Location-Information.h
index 1846a26..0416b59 100644
--- a/include/osmocom/hnbap/HNB-Location-Information.h
+++ b/include/osmocom/hnbap/HNB-Location-Information.h
@@ -45,9 +45,9 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/MacroCoverageInformation.h>
-#include <osmocom/osmo-iuh/hnbap/GeographicalLocation.h>
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/MacroCoverageInformation.h>
+#include <osmocom/hnbap/GeographicalLocation.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNB_Location_Information_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNB-RNL-Identity.h b/include/osmocom/hnbap/HNB-RNL-Identity.h
index 5e843d9..1256f16 100644
--- a/include/osmocom/hnbap/HNB-RNL-Identity.h
+++ b/include/osmocom/hnbap/HNB-RNL-Identity.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Identifier.h>
+#include <osmocom/hnbap/HNB-Cell-Identifier.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/HNBAP-PDU.h b/include/osmocom/hnbap/HNBAP-PDU.h
index 18017ae..4026a8e 100644
--- a/include/osmocom/hnbap/HNBAP-PDU.h
+++ b/include/osmocom/hnbap/HNBAP-PDU.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/InitiatingMessage.h>
-#include <osmocom/osmo-iuh/hnbap/SuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/hnbap/UnsuccessfulOutcome.h>
+#include <osmocom/hnbap/InitiatingMessage.h>
+#include <osmocom/hnbap/SuccessfulOutcome.h>
+#include <osmocom/hnbap/UnsuccessfulOutcome.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/HNBConfigInfo.h b/include/osmocom/hnbap/HNBConfigInfo.h
index 39b2802..95c4fb9 100644
--- a/include/osmocom/hnbap/HNBConfigInfo.h
+++ b/include/osmocom/hnbap/HNBConfigInfo.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
-#include <osmocom/osmo-iuh/hnbap/ConfigurationInformation.h>
+#include <osmocom/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/hnbap/ConfigurationInformation.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNBConfigInfo_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBConfigTransferRequest.h b/include/osmocom/hnbap/HNBConfigTransferRequest.h
index ae42e47..89229ca 100644
--- a/include/osmocom/hnbap/HNBConfigTransferRequest.h
+++ b/include/osmocom/hnbap/HNBConfigTransferRequest.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBConfigTransferRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBConfigTransferResponse.h b/include/osmocom/hnbap/HNBConfigTransferResponse.h
index dbcfa1e..edfb327 100644
--- a/include/osmocom/hnbap/HNBConfigTransferResponse.h
+++ b/include/osmocom/hnbap/HNBConfigTransferResponse.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBConfigTransferResponse_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBConfigurationInformationMissing.h b/include/osmocom/hnbap/HNBConfigurationInformationMissing.h
index 0833454..9f928f8 100644
--- a/include/osmocom/hnbap/HNBConfigurationInformationMissing.h
+++ b/include/osmocom/hnbap/HNBConfigurationInformationMissing.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/Cause.h>
+#include <osmocom/hnbap/Cause.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNBConfigurationInformationMissing_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBConfigurationInformationProvided.h b/include/osmocom/hnbap/HNBConfigurationInformationProvided.h
index 5eae3a3..5d8b8fe 100644
--- a/include/osmocom/hnbap/HNBConfigurationInformationProvided.h
+++ b/include/osmocom/hnbap/HNBConfigurationInformationProvided.h
@@ -12,10 +12,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#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 <osmocom/hnbap/PSC.h>
+#include <osmocom/hnbap/CSG-ID.h>
+#include <osmocom/hnbap/HNB-Cell-Access-Mode.h>
+#include <osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -49,7 +49,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNBConfigurationInformationProvided_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBDe-Register.h b/include/osmocom/hnbap/HNBDe-Register.h
index 23423f0..5cc8cce 100644
--- a/include/osmocom/hnbap/HNBDe-Register.h
+++ b/include/osmocom/hnbap/HNBDe-Register.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBDe_Register_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBRegisterAccept.h b/include/osmocom/hnbap/HNBRegisterAccept.h
index 41a7040..0d7719b 100644
--- a/include/osmocom/hnbap/HNBRegisterAccept.h
+++ b/include/osmocom/hnbap/HNBRegisterAccept.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBRegisterAccept_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBRegisterReject.h b/include/osmocom/hnbap/HNBRegisterReject.h
index 2e77521..e39e01d 100644
--- a/include/osmocom/hnbap/HNBRegisterReject.h
+++ b/include/osmocom/hnbap/HNBRegisterReject.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBRegisterReject_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBRegisterRequest.h b/include/osmocom/hnbap/HNBRegisterRequest.h
index 2d59145..181ef3c 100644
--- a/include/osmocom/hnbap/HNBRegisterRequest.h
+++ b/include/osmocom/hnbap/HNBRegisterRequest.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBRegisterRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/IE-Extensions.h b/include/osmocom/hnbap/IE-Extensions.h
index d56c93e..5236df0 100644
--- a/include/osmocom/hnbap/IE-Extensions.h
+++ b/include/osmocom/hnbap/IE-Extensions.h
@@ -38,7 +38,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _IE_Extensions_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/IE.h b/include/osmocom/hnbap/IE.h
index 8193b57..291932a 100644
--- a/include/osmocom/hnbap/IE.h
+++ b/include/osmocom/hnbap/IE.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProtocolIE-ID.h>
+#include <osmocom/hnbap/Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/hnbap/IMSIESN.h b/include/osmocom/hnbap/IMSIESN.h
index f81ecb9..e68989a 100644
--- a/include/osmocom/hnbap/IMSIESN.h
+++ b/include/osmocom/hnbap/IMSIESN.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
-#include <osmocom/osmo-iuh/hnbap/ESN.h>
+#include <osmocom/hnbap/IMSIDS41.h>
+#include <osmocom/hnbap/ESN.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/IP-Address.h b/include/osmocom/hnbap/IP-Address.h
index 26a4cb5..501dab1 100644
--- a/include/osmocom/hnbap/IP-Address.h
+++ b/include/osmocom/hnbap/IP-Address.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/Ipv4Address.h>
-#include <osmocom/osmo-iuh/hnbap/Ipv6Address.h>
+#include <osmocom/hnbap/Ipv4Address.h>
+#include <osmocom/hnbap/Ipv6Address.h>
#include <constr_CHOICE.h>
#include <constr_SEQUENCE.h>
@@ -67,7 +67,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _IP_Address_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/InitiatingMessage.h b/include/osmocom/hnbap/InitiatingMessage.h
index c3080b7..e3c958b 100644
--- a/include/osmocom/hnbap/InitiatingMessage.h
+++ b/include/osmocom/hnbap/InitiatingMessage.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h b/include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h
index 934203c..784f7c9 100644
--- a/include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h
+++ b/include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h
@@ -38,7 +38,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
+#include <osmocom/hnbap/IP-Address.h>
#endif /* _Iurh_Signalling_TNL_AddressList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/LAI.h b/include/osmocom/hnbap/LAI.h
index e0cd2ea..7537fe3 100644
--- a/include/osmocom/hnbap/LAI.h
+++ b/include/osmocom/hnbap/LAI.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
-#include <osmocom/osmo-iuh/hnbap/LAC.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/LAC.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/MacroCellID.h b/include/osmocom/hnbap/MacroCellID.h
index 04ed95f..88b4a62 100644
--- a/include/osmocom/hnbap/MacroCellID.h
+++ b/include/osmocom/hnbap/MacroCellID.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/UTRANCellID.h>
-#include <osmocom/osmo-iuh/hnbap/CGI.h>
+#include <osmocom/hnbap/UTRANCellID.h>
+#include <osmocom/hnbap/CGI.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/MacroCoverageInformation.h b/include/osmocom/hnbap/MacroCoverageInformation.h
index 9785267..1d3f915 100644
--- a/include/osmocom/hnbap/MacroCoverageInformation.h
+++ b/include/osmocom/hnbap/MacroCoverageInformation.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/MacroCellID.h>
+#include <osmocom/hnbap/MacroCellID.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _MacroCoverageInformation_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/NeighbourCellIdentityList.h b/include/osmocom/hnbap/NeighbourCellIdentityList.h
index 4f8060c..5b013cc 100644
--- a/include/osmocom/hnbap/NeighbourCellIdentityList.h
+++ b/include/osmocom/hnbap/NeighbourCellIdentityList.h
@@ -38,7 +38,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/NeighbourIdentity.h>
+#include <osmocom/hnbap/NeighbourIdentity.h>
#endif /* _NeighbourCellIdentityList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/NeighbourIdentity.h b/include/osmocom/hnbap/NeighbourIdentity.h
index 29f77db..290b09d 100644
--- a/include/osmocom/hnbap/NeighbourIdentity.h
+++ b/include/osmocom/hnbap/NeighbourIdentity.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
-#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
+#include <osmocom/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/hnbap/CellIdentity.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/NeighbourInfoList.h b/include/osmocom/hnbap/NeighbourInfoList.h
index cb0c83e..0581af4 100644
--- a/include/osmocom/hnbap/NeighbourInfoList.h
+++ b/include/osmocom/hnbap/NeighbourInfoList.h
@@ -38,7 +38,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
+#include <osmocom/hnbap/HNBConfigInfo.h>
#endif /* _NeighbourInfoList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/NeighbourInfoRequestItem.h b/include/osmocom/hnbap/NeighbourInfoRequestItem.h
index 02ffd34..39fd6d7 100644
--- a/include/osmocom/hnbap/NeighbourInfoRequestItem.h
+++ b/include/osmocom/hnbap/NeighbourInfoRequestItem.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/hnbap/HNB-RNL-Identity.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _NeighbourInfoRequestItem_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/NeighbourInfoRequestList.h b/include/osmocom/hnbap/NeighbourInfoRequestList.h
index b8d4c51..4944272 100644
--- a/include/osmocom/hnbap/NeighbourInfoRequestList.h
+++ b/include/osmocom/hnbap/NeighbourInfoRequestList.h
@@ -38,7 +38,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestItem.h>
+#include <osmocom/hnbap/NeighbourInfoRequestItem.h>
#endif /* _NeighbourInfoRequestList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/PTMSIRAI.h b/include/osmocom/hnbap/PTMSIRAI.h
index 570bc35..3564393 100644
--- a/include/osmocom/hnbap/PTMSIRAI.h
+++ b/include/osmocom/hnbap/PTMSIRAI.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/PTMSI.h>
-#include <osmocom/osmo-iuh/hnbap/RAI.h>
+#include <osmocom/hnbap/PTMSI.h>
+#include <osmocom/hnbap/RAI.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/PrivateMessage.h b/include/osmocom/hnbap/PrivateMessage.h
index 5a5d7d4..a9e65bb 100644
--- a/include/osmocom/hnbap/PrivateMessage.h
+++ b/include/osmocom/hnbap/PrivateMessage.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _PrivateMessage_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/RABList.h b/include/osmocom/hnbap/RABList.h
index 9b05ecc..9dff419 100644
--- a/include/osmocom/hnbap/RABList.h
+++ b/include/osmocom/hnbap/RABList.h
@@ -38,7 +38,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/RABListItem.h>
+#include <osmocom/hnbap/RABListItem.h>
#endif /* _RABList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/RABListItem.h b/include/osmocom/hnbap/RABListItem.h
index 18e1b29..3d5a9e9 100644
--- a/include/osmocom/hnbap/RABListItem.h
+++ b/include/osmocom/hnbap/RABListItem.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/RAB-ID.h>
-#include <osmocom/osmo-iuh/hnbap/TransportInfo.h>
-#include <osmocom/osmo-iuh/hnbap/CN-DomainIndicator.h>
+#include <osmocom/hnbap/RAB-ID.h>
+#include <osmocom/hnbap/TransportInfo.h>
+#include <osmocom/hnbap/CN-DomainIndicator.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _RABListItem_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/RAI.h b/include/osmocom/hnbap/RAI.h
index 6ecd006..a044246 100644
--- a/include/osmocom/hnbap/RAI.h
+++ b/include/osmocom/hnbap/RAI.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/LAI.h>
-#include <osmocom/osmo-iuh/hnbap/RAC.h>
+#include <osmocom/hnbap/LAI.h>
+#include <osmocom/hnbap/RAC.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/RelocationComplete.h b/include/osmocom/hnbap/RelocationComplete.h
index 74ca101..4dd2a2d 100644
--- a/include/osmocom/hnbap/RelocationComplete.h
+++ b/include/osmocom/hnbap/RelocationComplete.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _RelocationComplete_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/SuccessfulOutcome.h b/include/osmocom/hnbap/SuccessfulOutcome.h
index 90d798d..fc53d89 100644
--- a/include/osmocom/hnbap/SuccessfulOutcome.h
+++ b/include/osmocom/hnbap/SuccessfulOutcome.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/hnbap/TMSILAI.h b/include/osmocom/hnbap/TMSILAI.h
index 2ba0a1a..ee38a24 100644
--- a/include/osmocom/hnbap/TMSILAI.h
+++ b/include/osmocom/hnbap/TMSILAI.h
@@ -13,7 +13,7 @@
/* Including external dependencies */
#include <BIT_STRING.h>
-#include <osmocom/osmo-iuh/hnbap/LAI.h>
+#include <osmocom/hnbap/LAI.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/TNLUpdateFailure.h b/include/osmocom/hnbap/TNLUpdateFailure.h
index eb942e5..91ea963 100644
--- a/include/osmocom/hnbap/TNLUpdateFailure.h
+++ b/include/osmocom/hnbap/TNLUpdateFailure.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _TNLUpdateFailure_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/TNLUpdateRequest.h b/include/osmocom/hnbap/TNLUpdateRequest.h
index 129a35a..c87702c 100644
--- a/include/osmocom/hnbap/TNLUpdateRequest.h
+++ b/include/osmocom/hnbap/TNLUpdateRequest.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _TNLUpdateRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/TNLUpdateResponse.h b/include/osmocom/hnbap/TNLUpdateResponse.h
index 304cbe6..01ca4c6 100644
--- a/include/osmocom/hnbap/TNLUpdateResponse.h
+++ b/include/osmocom/hnbap/TNLUpdateResponse.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _TNLUpdateResponse_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/TransportInfo.h b/include/osmocom/hnbap/TransportInfo.h
index d81936d..dcd6420 100644
--- a/include/osmocom/hnbap/TransportInfo.h
+++ b/include/osmocom/hnbap/TransportInfo.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/hnbap/GTP-TEI.h>
-#include <osmocom/osmo-iuh/hnbap/BindingID.h>
+#include <osmocom/hnbap/TransportLayerAddress.h>
+#include <osmocom/hnbap/GTP-TEI.h>
+#include <osmocom/hnbap/BindingID.h>
#include <constr_CHOICE.h>
#include <constr_SEQUENCE.h>
@@ -69,7 +69,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _TransportInfo_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/Tunnel-Information.h b/include/osmocom/hnbap/Tunnel-Information.h
index 5d87aba..e01de71 100644
--- a/include/osmocom/hnbap/Tunnel-Information.h
+++ b/include/osmocom/hnbap/Tunnel-Information.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
-#include <osmocom/osmo-iuh/hnbap/UDP-Port-Number.h>
+#include <osmocom/hnbap/IP-Address.h>
+#include <osmocom/hnbap/UDP-Port-Number.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _Tunnel_Information_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/U-RNTIQueryRequest.h b/include/osmocom/hnbap/U-RNTIQueryRequest.h
index 2568963..7403c0a 100644
--- a/include/osmocom/hnbap/U-RNTIQueryRequest.h
+++ b/include/osmocom/hnbap/U-RNTIQueryRequest.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _U_RNTIQueryRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/U-RNTIQueryResponse.h b/include/osmocom/hnbap/U-RNTIQueryResponse.h
index ed411ab..730144f 100644
--- a/include/osmocom/hnbap/U-RNTIQueryResponse.h
+++ b/include/osmocom/hnbap/U-RNTIQueryResponse.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _U_RNTIQueryResponse_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UE-Capabilities.h b/include/osmocom/hnbap/UE-Capabilities.h
index 1d4cf41..1274bbf 100644
--- a/include/osmocom/hnbap/UE-Capabilities.h
+++ b/include/osmocom/hnbap/UE-Capabilities.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/Access-stratum-release-indicator.h>
-#include <osmocom/osmo-iuh/hnbap/CSG-Capability.h>
+#include <osmocom/hnbap/Access-stratum-release-indicator.h>
+#include <osmocom/hnbap/CSG-Capability.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _UE_Capabilities_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UE-Identity.h b/include/osmocom/hnbap/UE-Identity.h
index 90852f9..f0f012a 100644
--- a/include/osmocom/hnbap/UE-Identity.h
+++ b/include/osmocom/hnbap/UE-Identity.h
@@ -12,14 +12,14 @@
#include <asn_application.h>
/* Including external dependencies */
-#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 <osmocom/hnbap/IMSI.h>
+#include <osmocom/hnbap/TMSILAI.h>
+#include <osmocom/hnbap/PTMSIRAI.h>
+#include <osmocom/hnbap/IMEI.h>
+#include <osmocom/hnbap/ESN.h>
+#include <osmocom/hnbap/IMSIDS41.h>
+#include <osmocom/hnbap/IMSIESN.h>
+#include <osmocom/hnbap/TMSIDS41.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/UEDe-Register.h b/include/osmocom/hnbap/UEDe-Register.h
index 818491a..dab4334 100644
--- a/include/osmocom/hnbap/UEDe-Register.h
+++ b/include/osmocom/hnbap/UEDe-Register.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _UEDe_Register_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UERegisterAccept.h b/include/osmocom/hnbap/UERegisterAccept.h
index d6884bf..de630b1 100644
--- a/include/osmocom/hnbap/UERegisterAccept.h
+++ b/include/osmocom/hnbap/UERegisterAccept.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _UERegisterAccept_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UERegisterReject.h b/include/osmocom/hnbap/UERegisterReject.h
index fe697b4..abda80d 100644
--- a/include/osmocom/hnbap/UERegisterReject.h
+++ b/include/osmocom/hnbap/UERegisterReject.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _UERegisterReject_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UERegisterRequest.h b/include/osmocom/hnbap/UERegisterRequest.h
index e718945..09d6a29 100644
--- a/include/osmocom/hnbap/UERegisterRequest.h
+++ b/include/osmocom/hnbap/UERegisterRequest.h
@@ -48,7 +48,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _UERegisterRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/URAIdentityList.h b/include/osmocom/hnbap/URAIdentityList.h
index 12c3bb5..b4c8a36 100644
--- a/include/osmocom/hnbap/URAIdentityList.h
+++ b/include/osmocom/hnbap/URAIdentityList.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/URAIdentity.h>
+#include <osmocom/hnbap/URAIdentity.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/hnbap/UTRANCellID.h b/include/osmocom/hnbap/UTRANCellID.h
index b034165..39c5b84 100644
--- a/include/osmocom/hnbap/UTRANCellID.h
+++ b/include/osmocom/hnbap/UTRANCellID.h
@@ -12,10 +12,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#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 <osmocom/hnbap/LAC.h>
+#include <osmocom/hnbap/RAC.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/CellIdentity.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _UTRANCellID_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UnsuccessfulOutcome.h b/include/osmocom/hnbap/UnsuccessfulOutcome.h
index bae3125..5fd9bd0 100644
--- a/include/osmocom/hnbap/UnsuccessfulOutcome.h
+++ b/include/osmocom/hnbap/UnsuccessfulOutcome.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>