diff --git a/configure.ac b/configure.ac
index 0fafb7f..fc8c737 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,7 @@
 	Makefile
 	include/Makefile
 	include/osmocom/Makefile
-	include/osmocom/osmo-iuh/Makefile
-	include/osmocom/osmo-iuh/hnbap/Makefile
-	include/osmocom/osmo-iuh/ranap/Makefile
-	include/osmocom/osmo-iuh/rua/Makefile
+	include/osmocom/hnbap/Makefile
+	include/osmocom/ranap/Makefile
+	include/osmocom/rua/Makefile
 	)
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>
 
diff --git a/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h b/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h
index 56526ae..ec73d30 100644
--- a/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h
+++ b/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PriorityLevel.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionCapability.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionVulnerability.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_QueuingAllowed.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PriorityLevel.h>
+#include <osmocom/ranap/RANAP_Pre-emptionCapability.h>
+#include <osmocom/ranap/RANAP_Pre-emptionVulnerability.h>
+#include <osmocom/ranap/RANAP_QueuingAllowed.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h
index 9003723..7d209d5 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h
index 5d72191..d6105a2 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h
index ff54257..dff57a7 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h
index 6c2d8b7..cc56279 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h
index 59146e4..518acbe 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h
index e4f15c1..d22f7fd 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h
index 716e128..262c742 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h
index 970cfa1..b7099d0 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h
index 35cd221..e8e2f8d 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h
index 29bceae..5d7a8c9 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h
index 1e36c19..4ff9287 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h
index 9b9f4da..9d26566 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h
index 5dec296..3dcaf55 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h
index 7936bf2..d712b9a 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
+#include <osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h
index b19b33c..3e6a1cf 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h
index d8fa544..c2a462b 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
+#include <osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h
index 87383dd..855cfcf 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_AreaIdentity.h b/include/osmocom/ranap/RANAP_AreaIdentity.h
index 15529f2..a57bc5b 100644
--- a/include/osmocom/ranap/RANAP_AreaIdentity.h
+++ b/include/osmocom/ranap/RANAP_AreaIdentity.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalArea.h>
+#include <osmocom/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_GeographicalArea.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h
index 4994e50..6445665 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h
index ee5ce75..994102b 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h
index 8674e12..716733e 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h
index 377f623..a808288 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h
index 227b242..dbbe10a 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
index 93c96c5..77b65a7 100644
--- a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
+++ b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
@@ -12,9 +12,9 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedSNAs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_AuthorisedSNAs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_AuthorisedSNAs.h b/include/osmocom/ranap/RANAP_AuthorisedSNAs.h
index 16aaa74..2cad6d9 100644
--- a/include/osmocom/ranap/RANAP_AuthorisedSNAs.h
+++ b/include/osmocom/ranap/RANAP_AuthorisedSNAs.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SNAC.h>
+#include <osmocom/ranap/RANAP_SNAC.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_CGI.h b/include/osmocom/ranap/RANAP_CGI.h
index 312ff7f..9e03e28 100644
--- a/include/osmocom/ranap/RANAP_CGI.h
+++ b/include/osmocom/ranap/RANAP_CGI.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_CI.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h b/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h
index e43efd3..fa42126 100644
--- a/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h
+++ b/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_CN-InvokeTrace.h b/include/osmocom/ranap/RANAP_CN-InvokeTrace.h
index 0d1f570..6b51611 100644
--- a/include/osmocom/ranap/RANAP_CN-InvokeTrace.h
+++ b/include/osmocom/ranap/RANAP_CN-InvokeTrace.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h b/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h
index c7fd7ca..93e9342 100644
--- a/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h
+++ b/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_JoinedMBMSBearerService-IEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CSG-Id-List.h b/include/osmocom/ranap/RANAP_CSG-Id-List.h
index b6cb0d1..2ea2274 100644
--- a/include/osmocom/ranap/RANAP_CSG-Id-List.h
+++ b/include/osmocom/ranap/RANAP_CSG-Id-List.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Id.h>
+#include <osmocom/ranap/RANAP_CSG-Id.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Cause.h b/include/osmocom/ranap/RANAP_Cause.h
index 277a5fb..82ec137 100644
--- a/include/osmocom/ranap/RANAP_Cause.h
+++ b/include/osmocom/ranap/RANAP_Cause.h
@@ -11,13 +11,13 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetwork.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseTransmissionNetwork.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseNAS.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseProtocol.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseMisc.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseNon-Standard.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetworkExtension.h>
+#include <osmocom/ranap/RANAP_CauseRadioNetwork.h>
+#include <osmocom/ranap/RANAP_CauseTransmissionNetwork.h>
+#include <osmocom/ranap/RANAP_CauseNAS.h>
+#include <osmocom/ranap/RANAP_CauseProtocol.h>
+#include <osmocom/ranap/RANAP_CauseMisc.h>
+#include <osmocom/ranap/RANAP_CauseNon-Standard.h>
+#include <osmocom/ranap/RANAP_CauseRadioNetworkExtension.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CellBased.h b/include/osmocom/ranap/RANAP_CellBased.h
index ecf930f..09edeeb 100644
--- a/include/osmocom/ranap/RANAP_CellBased.h
+++ b/include/osmocom/ranap/RANAP_CellBased.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CellIdList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_CellIdList.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CellIdList.h b/include/osmocom/ranap/RANAP_CellIdList.h
index 4096006..9b5779f 100644
--- a/include/osmocom/ranap/RANAP_CellIdList.h
+++ b/include/osmocom/ranap/RANAP_CellIdList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Id.h>
+#include <osmocom/ranap/RANAP_Cell-Id.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_CellLoadInformation.h b/include/osmocom/ranap/RANAP_CellLoadInformation.h
index 550a909..b4f3753 100644
--- a/include/osmocom/ranap/RANAP_CellLoadInformation.h
+++ b/include/osmocom/ranap/RANAP_CellLoadInformation.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Capacity-Class-Value.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoadValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RTLoadValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NRTLoadInformationValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h>
+#include <osmocom/ranap/RANAP_LoadValue.h>
+#include <osmocom/ranap/RANAP_RTLoadValue.h>
+#include <osmocom/ranap/RANAP_NRTLoadInformationValue.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h b/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h
index 5e17daf..092b5b0 100644
--- a/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h
+++ b/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceCellID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_SourceCellID.h>
+#include <osmocom/ranap/RANAP_CellLoadInformation.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h b/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h
index 16327e9..6d4b8fe 100644
--- a/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h
+++ b/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h
@@ -12,7 +12,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_EncryptionAlgorithm.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h b/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h
index ad4d52a..d3d4963 100644
--- a/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h
+++ b/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h
@@ -12,7 +12,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osmocom/ranap/RANAP_CommonID.h b/include/osmocom/ranap/RANAP_CommonID.h
index f46cf37..0eb0e41 100644
--- a/include/osmocom/ranap/RANAP_CommonID.h
+++ b/include/osmocom/ranap/RANAP_CommonID.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
index 51322ee..0eaeb3e 100644
--- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
@@ -12,10 +12,10 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber0.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber0.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h b/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h
index 06a8b40..a247953 100644
--- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h
+++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TriggeringMessage.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CriticalityDiagnostics-IE-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_TriggeringMessage.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_DataVolumeList.h b/include/osmocom/ranap/RANAP_DataVolumeList.h
index 83e0f87..459c2d5 100644
--- a/include/osmocom/ranap/RANAP_DataVolumeList.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeList.h
@@ -12,9 +12,9 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
+#include <osmocom/ranap/RANAP_DataVolumeReference.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_DataVolumeReport.h b/include/osmocom/ranap/RANAP_DataVolumeReport.h
index aeff753..1018cd7 100644
--- a/include/osmocom/ranap/RANAP_DataVolumeReport.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReport.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DataVolumeReportList.h b/include/osmocom/ranap/RANAP_DataVolumeReportList.h
index 8f0f52d..9a26ba7 100644
--- a/include/osmocom/ranap/RANAP_DataVolumeReportList.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReportList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h b/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h
index 764593b..cf76036 100644
--- a/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h
index 71225fc..209e61c 100644
--- a/include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_NewRAListofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_DirectInformationTransfer.h b/include/osmocom/ranap/RANAP_DirectInformationTransfer.h
index 065bb3e..08478d5 100644
--- a/include/osmocom/ranap/RANAP_DirectInformationTransfer.h
+++ b/include/osmocom/ranap/RANAP_DirectInformationTransfer.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h b/include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h
index 0b2af58..cc7d096 100644
--- a/include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h
+++ b/include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_DirectTransfer.h b/include/osmocom/ranap/RANAP_DirectTransfer.h
index a6005b4..2a8a1ff 100644
--- a/include/osmocom/ranap/RANAP_DirectTransfer.h
+++ b/include/osmocom/ranap/RANAP_DirectTransfer.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h b/include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h
index b55dbf9..59dd639 100644
--- a/include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h
+++ b/include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-PDU.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAPI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_NAS-PDU.h>
+#include <osmocom/ranap/RANAP_SAPI.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_EUTRANFrequencies.h b/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
index b71948d..f6c653c 100644
--- a/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
+++ b/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
@@ -13,8 +13,8 @@
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasBand.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_MeasBand.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_EncryptionInformation.h b/include/osmocom/ranap/RANAP_EncryptionInformation.h
index ac52f75..6f3c91e 100644
--- a/include/osmocom/ranap/RANAP_EncryptionInformation.h
+++ b/include/osmocom/ranap/RANAP_EncryptionInformation.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PermittedEncryptionAlgorithms.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h>
+#include <osmocom/ranap/RANAP_EncryptionKey.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h
index 0fbca3f..fa5b0f5 100644
--- a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h
+++ b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h
index ed239e1..2e0b586 100644
--- a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h
+++ b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h
index f01ae99..91a6ac3 100644
--- a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h
+++ b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h
index 66086b7..26126c2 100644
--- a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h
+++ b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h b/include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h
index e7894a2..e9084ec 100644
--- a/include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h
+++ b/include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEIList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEIGroup.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVGroup.h>
+#include <osmocom/ranap/RANAP_IMEIList.h>
+#include <osmocom/ranap/RANAP_IMEISVList.h>
+#include <osmocom/ranap/RANAP_IMEIGroup.h>
+#include <osmocom/ranap/RANAP_IMEISVGroup.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ErrorIndication.h b/include/osmocom/ranap/RANAP_ErrorIndication.h
index e4ca344..5bad287 100644
--- a/include/osmocom/ranap/RANAP_ErrorIndication.h
+++ b/include/osmocom/ranap/RANAP_ErrorIndication.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Event1F-Parameters.h b/include/osmocom/ranap/RANAP_Event1F-Parameters.h
index 6180f8b..96fd004 100644
--- a/include/osmocom/ranap/RANAP_Event1F-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Event1F-Parameters.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementQuantity.h>
+#include <osmocom/ranap/RANAP_MeasurementQuantity.h>
 #include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_ForwardSRNS-Context.h b/include/osmocom/ranap/RANAP_ForwardSRNS-Context.h
index 2050ae5..da74458 100644
--- a/include/osmocom/ranap/RANAP_ForwardSRNS-Context.h
+++ b/include/osmocom/ranap/RANAP_ForwardSRNS-Context.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_GA-EllipsoidArc.h b/include/osmocom/ranap/RANAP_GA-EllipsoidArc.h
index 7956cfb..5f2442b 100644
--- a/include/osmocom/ranap/RANAP_GA-EllipsoidArc.h
+++ b/include/osmocom/ranap/RANAP_GA-EllipsoidArc.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-Point.h b/include/osmocom/ranap/RANAP_GA-Point.h
index 65b4c83..5aebf02 100644
--- a/include/osmocom/ranap/RANAP_GA-Point.h
+++ b/include/osmocom/ranap/RANAP_GA-Point.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-PointWithAltitude.h b/include/osmocom/ranap/RANAP_GA-PointWithAltitude.h
index 9d3258d..a709c8d 100644
--- a/include/osmocom/ranap/RANAP_GA-PointWithAltitude.h
+++ b/include/osmocom/ranap/RANAP_GA-PointWithAltitude.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-AltitudeAndDirection.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GA-AltitudeAndDirection.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h b/include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h
index 6963746..76663f5 100644
--- a/include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h
+++ b/include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-AltitudeAndDirection.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-UncertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GA-AltitudeAndDirection.h>
+#include <osmocom/ranap/RANAP_GA-UncertaintyEllipse.h>
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h b/include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h
index 8c3cdc1..a498393 100644
--- a/include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h
+++ b/include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h b/include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h
index 4ca74ae..0ed80e7 100644
--- a/include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h
+++ b/include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-UncertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GA-UncertaintyEllipse.h>
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-Polygon.h b/include/osmocom/ranap/RANAP_GA-Polygon.h
index 5c4e057..200d0a4 100644
--- a/include/osmocom/ranap/RANAP_GA-Polygon.h
+++ b/include/osmocom/ranap/RANAP_GA-Polygon.h
@@ -12,8 +12,8 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h b/include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h
index ea252dc..5f1784f 100644
--- a/include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h
+++ b/include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GANSS-PositioningMethodAndUsage.h>
+#include <osmocom/ranap/RANAP_GANSS-PositioningMethodAndUsage.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_GERAN-Cell-ID.h b/include/osmocom/ranap/RANAP_GERAN-Cell-ID.h
index 4b44bba..c161a39 100644
--- a/include/osmocom/ranap/RANAP_GERAN-Cell-ID.h
+++ b/include/osmocom/ranap/RANAP_GERAN-Cell-ID.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_CI.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h b/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h
index 3d76a77..7466bc5 100644
--- a/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h
+++ b/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Classmark.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_GERAN-Classmark.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h b/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h
index b5c5e05..1d8ea3b 100644
--- a/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h
+++ b/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_GeographicalArea.h b/include/osmocom/ranap/RANAP_GeographicalArea.h
index 7908b1c..66474d2 100644
--- a/include/osmocom/ranap/RANAP_GeographicalArea.h
+++ b/include/osmocom/ranap/RANAP_GeographicalArea.h
@@ -11,13 +11,13 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-Point.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertainty.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-Polygon.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitude.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-EllipsoidArc.h>
+#include <osmocom/ranap/RANAP_GA-Point.h>
+#include <osmocom/ranap/RANAP_GA-PointWithUnCertainty.h>
+#include <osmocom/ranap/RANAP_GA-Polygon.h>
+#include <osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GA-PointWithAltitude.h>
+#include <osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h>
+#include <osmocom/ranap/RANAP_GA-EllipsoidArc.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GeographicalCoordinates.h b/include/osmocom/ranap/RANAP_GeographicalCoordinates.h
index 35ee9a6..48a638e 100644
--- a/include/osmocom/ranap/RANAP_GeographicalCoordinates.h
+++ b/include/osmocom/ranap/RANAP_GeographicalCoordinates.h
@@ -13,7 +13,7 @@
 /* Including external dependencies */
 #include <NativeEnumerated.h>
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GlobalCN-ID.h b/include/osmocom/ranap/RANAP_GlobalCN-ID.h
index deff72a..09b43e0 100644
--- a/include/osmocom/ranap/RANAP_GlobalCN-ID.h
+++ b/include/osmocom/ranap/RANAP_GlobalCN-ID.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-ID.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_CN-ID.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GlobalRNC-ID.h b/include/osmocom/ranap/RANAP_GlobalRNC-ID.h
index e873cb1..90c1264 100644
--- a/include/osmocom/ranap/RANAP_GlobalRNC-ID.h
+++ b/include/osmocom/ranap/RANAP_GlobalRNC-ID.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RNC-ID.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_RNC-ID.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_HorizontalVelocity.h b/include/osmocom/ranap/RANAP_HorizontalVelocity.h
index e30a0e9..802941c 100644
--- a/include/osmocom/ranap/RANAP_HorizontalVelocity.h
+++ b/include/osmocom/ranap/RANAP_HorizontalVelocity.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h b/include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h
index 40a650c..5570c8c 100644
--- a/include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h
+++ b/include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h b/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h
index d7bfd9b..e0a03eb 100644
--- a/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h
+++ b/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_VerticalVelocity.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h b/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h
index c04c936..b100f38 100644
--- a/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h
+++ b/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalVelocity.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_VerticalVelocity.h>
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_IE-Extensions.h b/include/osmocom/ranap/RANAP_IE-Extensions.h
index 64dd651..c310803 100644
--- a/include/osmocom/ranap/RANAP_IE-Extensions.h
+++ b/include/osmocom/ranap/RANAP_IE-Extensions.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_IE.h b/include/osmocom/ranap/RANAP_IE.h
index 15a55a4..3ac83c0 100644
--- a/include/osmocom/ranap/RANAP_IE.h
+++ b/include/osmocom/ranap/RANAP_IE.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_IMEIGroup.h b/include/osmocom/ranap/RANAP_IMEIGroup.h
index 2d83e36..a3bd9d0 100644
--- a/include/osmocom/ranap/RANAP_IMEIGroup.h
+++ b/include/osmocom/ranap/RANAP_IMEIGroup.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEI.h>
+#include <osmocom/ranap/RANAP_IMEI.h>
 #include <BIT_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_IMEIList.h b/include/osmocom/ranap/RANAP_IMEIList.h
index c6d4c5c..5e1246c 100644
--- a/include/osmocom/ranap/RANAP_IMEIList.h
+++ b/include/osmocom/ranap/RANAP_IMEIList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEI.h>
+#include <osmocom/ranap/RANAP_IMEI.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_IMEISVGroup.h b/include/osmocom/ranap/RANAP_IMEISVGroup.h
index 8e4c63c..92a3836 100644
--- a/include/osmocom/ranap/RANAP_IMEISVGroup.h
+++ b/include/osmocom/ranap/RANAP_IMEISVGroup.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISV.h>
+#include <osmocom/ranap/RANAP_IMEISV.h>
 #include <BIT_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_IMEISVList.h b/include/osmocom/ranap/RANAP_IMEISVList.h
index 6ac8c57..8eb1996 100644
--- a/include/osmocom/ranap/RANAP_IMEISVList.h
+++ b/include/osmocom/ranap/RANAP_IMEISVList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISV.h>
+#include <osmocom/ranap/RANAP_IMEISV.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h b/include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h
index 597da0c..e2d1321 100644
--- a/include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h
+++ b/include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h
@@ -12,8 +12,8 @@
 
 /* Including external dependencies */
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IRATmeasurementParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IRATmeasurementParameters.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_IRATmeasurementParameters.h b/include/osmocom/ranap/RANAP_IRATmeasurementParameters.h
index d9b90b1..e52b0e2 100644
--- a/include/osmocom/ranap/RANAP_IRATmeasurementParameters.h
+++ b/include/osmocom/ranap/RANAP_IRATmeasurementParameters.h
@@ -12,8 +12,8 @@
 
 /* Including external dependencies */
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EUTRANFrequencies.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_EUTRANFrequencies.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ImmediateMDT.h b/include/osmocom/ranap/RANAP_ImmediateMDT.h
index 7bffa56..2399e42 100644
--- a/include/osmocom/ranap/RANAP_ImmediateMDT.h
+++ b/include/osmocom/ranap/RANAP_ImmediateMDT.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementsToActivate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M1Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M2Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_MeasurementsToActivate.h>
+#include <osmocom/ranap/RANAP_M1Report.h>
+#include <osmocom/ranap/RANAP_M2Report.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InformationRequestType.h b/include/osmocom/ranap/RANAP_InformationRequestType.h
index 9069e26..03ccc15 100644
--- a/include/osmocom/ranap/RANAP_InformationRequestType.h
+++ b/include/osmocom/ranap/RANAP_InformationRequestType.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PermanentNAS-UE-ID.h>
+#include <osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/ranap/RANAP_PermanentNAS-UE-ID.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InformationRequested.h b/include/osmocom/ranap/RANAP_InformationRequested.h
index 912101d..0b195b1 100644
--- a/include/osmocom/ranap/RANAP_InformationRequested.h
+++ b/include/osmocom/ranap/RANAP_InformationRequested.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMulticastServiceList.h>
+#include <osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/ranap/RANAP_RequestedMulticastServiceList.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InformationTransferConfirmation.h b/include/osmocom/ranap/RANAP_InformationTransferConfirmation.h
index e4ec50a..eab0930 100644
--- a/include/osmocom/ranap/RANAP_InformationTransferConfirmation.h
+++ b/include/osmocom/ranap/RANAP_InformationTransferConfirmation.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_InformationTransferFailure.h b/include/osmocom/ranap/RANAP_InformationTransferFailure.h
index 612dacb..3e11e6d 100644
--- a/include/osmocom/ranap/RANAP_InformationTransferFailure.h
+++ b/include/osmocom/ranap/RANAP_InformationTransferFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_InformationTransferIndication.h b/include/osmocom/ranap/RANAP_InformationTransferIndication.h
index 5861eeb..0a2dcaf 100644
--- a/include/osmocom/ranap/RANAP_InformationTransferIndication.h
+++ b/include/osmocom/ranap/RANAP_InformationTransferIndication.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_InformationTransferType.h b/include/osmocom/ranap/RANAP_InformationTransferType.h
index 22cb651..5214ad5 100644
--- a/include/osmocom/ranap/RANAP_InformationTransferType.h
+++ b/include/osmocom/ranap/RANAP_InformationTransferType.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RNCTraceInformation.h>
+#include <osmocom/ranap/RANAP_RNCTraceInformation.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InitialUE-Message.h b/include/osmocom/ranap/RANAP_InitialUE-Message.h
index b382794..f535cd9 100644
--- a/include/osmocom/ranap/RANAP_InitialUE-Message.h
+++ b/include/osmocom/ranap/RANAP_InitialUE-Message.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_InitiatingMessage.h b/include/osmocom/ranap/RANAP_InitiatingMessage.h
index faf3a94..62e0667 100644
--- a/include/osmocom/ranap/RANAP_InitiatingMessage.h
+++ b/include/osmocom/ranap/RANAP_InitiatingMessage.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h b/include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h
index 1bf702c..a907df2 100644
--- a/include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h
+++ b/include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionKey.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h b/include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h
index 53a209f..d6b1039 100644
--- a/include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h
+++ b/include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_CellLoadInformation.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h b/include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h
index 5c0bbd4..605967e 100644
--- a/include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h
+++ b/include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RIM-Transfer.h>
+#include <osmocom/ranap/RANAP_RIM-Transfer.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InterfacesToTraceItem.h b/include/osmocom/ranap/RANAP_InterfacesToTraceItem.h
index 771aa55..e690f90 100644
--- a/include/osmocom/ranap/RANAP_InterfacesToTraceItem.h
+++ b/include/osmocom/ranap/RANAP_InterfacesToTraceItem.h
@@ -12,7 +12,7 @@
 
 /* Including external dependencies */
 #include <NativeEnumerated.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h b/include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h
index d6071f6..bbe20ec 100644
--- a/include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h
+++ b/include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h b/include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h
index f81a3ed..b9a7507 100644
--- a/include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h
+++ b/include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h b/include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h
index 1c94e8c..6f07090 100644
--- a/include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h
+++ b/include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h b/include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h
index 1e81c4b..7654441 100644
--- a/include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h
+++ b/include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_IuTransportAssociation.h b/include/osmocom/ranap/RANAP_IuTransportAssociation.h
index 50dc107..450c644 100644
--- a/include/osmocom/ranap/RANAP_IuTransportAssociation.h
+++ b/include/osmocom/ranap/RANAP_IuTransportAssociation.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GTP-TEI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_BindingID.h>
+#include <osmocom/ranap/RANAP_GTP-TEI.h>
+#include <osmocom/ranap/RANAP_BindingID.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
index 4b84a4d..b27cde4 100644
--- a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
+++ b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
@@ -12,9 +12,9 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMS-PTP-RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_LA-LIST.h b/include/osmocom/ranap/RANAP_LA-LIST.h
index f109393..08e76ed 100644
--- a/include/osmocom/ranap/RANAP_LA-LIST.h
+++ b/include/osmocom/ranap/RANAP_LA-LIST.h
@@ -12,9 +12,9 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ListOF-SNAs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_ListOF-SNAs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_LABased.h b/include/osmocom/ranap/RANAP_LABased.h
index edd9b30..49de171 100644
--- a/include/osmocom/ranap/RANAP_LABased.h
+++ b/include/osmocom/ranap/RANAP_LABased.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAI-List.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LAI-List.h b/include/osmocom/ranap/RANAP_LAI-List.h
index cafb3d4..ba2ddf3 100644
--- a/include/osmocom/ranap/RANAP_LAI-List.h
+++ b/include/osmocom/ranap/RANAP_LAI-List.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_LAI.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_LAI.h b/include/osmocom/ranap/RANAP_LAI.h
index 6f93b48..f66b324 100644
--- a/include/osmocom/ranap/RANAP_LAI.h
+++ b/include/osmocom/ranap/RANAP_LAI.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h
index 2463a29..4332963 100644
--- a/include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_LAI.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_LastKnownServiceArea.h b/include/osmocom/ranap/RANAP_LastKnownServiceArea.h
index eff3688..9fa72cd 100644
--- a/include/osmocom/ranap/RANAP_LastKnownServiceArea.h
+++ b/include/osmocom/ranap/RANAP_LastKnownServiceArea.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_SAI.h>
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h b/include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h
index 8376a9d..1adfd3e 100644
--- a/include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h
+++ b/include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_UTRAN-CellID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CellType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Time-UE-StayedInCell.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_UTRAN-CellID.h>
+#include <osmocom/ranap/RANAP_CellType.h>
+#include <osmocom/ranap/RANAP_Time-UE-StayedInCell.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
index b47d1d3..f348739 100644
--- a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
+++ b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
@@ -12,8 +12,8 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_ListOF-SNAs.h b/include/osmocom/ranap/RANAP_ListOF-SNAs.h
index 77f927c..beeb609 100644
--- a/include/osmocom/ranap/RANAP_ListOF-SNAs.h
+++ b/include/osmocom/ranap/RANAP_ListOF-SNAs.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SNAC.h>
+#include <osmocom/ranap/RANAP_SNAC.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h b/include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h
index 8ccedd7..3be571b 100644
--- a/include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h
+++ b/include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_InterfacesToTraceItem.h>
+#include <osmocom/ranap/RANAP_InterfacesToTraceItem.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h b/include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h
index b710726..6ac119b 100644
--- a/include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h
+++ b/include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h b/include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h
index ea3914f..3192de2 100644
--- a/include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h
+++ b/include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h b/include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h
index c0ee9e6..7ed1e3c 100644
--- a/include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h
+++ b/include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedLocationRelatedDataType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedGPSAssistanceData.h>
+#include <osmocom/ranap/RANAP_RequestedLocationRelatedDataType.h>
+#include <osmocom/ranap/RANAP_RequestedGPSAssistanceData.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h b/include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h
index 90c3fc6..222e9b7 100644
--- a/include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h
+++ b/include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationReport.h b/include/osmocom/ranap/RANAP_LocationReport.h
index 385417e..e2e8700 100644
--- a/include/osmocom/ranap/RANAP_LocationReport.h
+++ b/include/osmocom/ranap/RANAP_LocationReport.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationReportingControl.h b/include/osmocom/ranap/RANAP_LocationReportingControl.h
index 050e3d6..8909093 100644
--- a/include/osmocom/ranap/RANAP_LocationReportingControl.h
+++ b/include/osmocom/ranap/RANAP_LocationReportingControl.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h b/include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h
index fa5c618..dcdcbc2 100644
--- a/include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h
+++ b/include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h
@@ -11,16 +11,16 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportChangeOfSAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicReportingIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectReportingIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalAccuracyCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningPriority.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ClientType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResponseTime.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IncludeVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicLocationInfo.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_ReportChangeOfSAI.h>
+#include <osmocom/ranap/RANAP_PeriodicReportingIndicator.h>
+#include <osmocom/ranap/RANAP_DirectReportingIndicator.h>
+#include <osmocom/ranap/RANAP_VerticalAccuracyCode.h>
+#include <osmocom/ranap/RANAP_PositioningPriority.h>
+#include <osmocom/ranap/RANAP_ClientType.h>
+#include <osmocom/ranap/RANAP_ResponseTime.h>
+#include <osmocom/ranap/RANAP_IncludeVelocity.h>
+#include <osmocom/ranap/RANAP_PeriodicLocationInfo.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LoggedMDT.h b/include/osmocom/ranap/RANAP_LoggedMDT.h
index 65b3d2a..83f86e5 100644
--- a/include/osmocom/ranap/RANAP_LoggedMDT.h
+++ b/include/osmocom/ranap/RANAP_LoggedMDT.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggingInterval.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggingDuration.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LoggingInterval.h>
+#include <osmocom/ranap/RANAP_LoggingDuration.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M1Report.h b/include/osmocom/ranap/RANAP_M1Report.h
index c4ec2ed..0773dd5 100644
--- a/include/osmocom/ranap/RANAP_M1Report.h
+++ b/include/osmocom/ranap/RANAP_M1Report.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Report-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Event1F-Parameters.h>
+#include <osmocom/ranap/RANAP_MDT-Report-Parameters.h>
+#include <osmocom/ranap/RANAP_Event1F-Parameters.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M2Report.h b/include/osmocom/ranap/RANAP_M2Report.h
index 7a593f1..b38126d 100644
--- a/include/osmocom/ranap/RANAP_M2Report.h
+++ b/include/osmocom/ranap/RANAP_M2Report.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Report-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Event1I-Parameters.h>
+#include <osmocom/ranap/RANAP_MDT-Report-Parameters.h>
+#include <osmocom/ranap/RANAP_Event1I-Parameters.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M4-Collection-Parameters.h b/include/osmocom/ranap/RANAP_M4-Collection-Parameters.h
index eb8351c..40084ca 100644
--- a/include/osmocom/ranap/RANAP_M4-Collection-Parameters.h
+++ b/include/osmocom/ranap/RANAP_M4-Collection-Parameters.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Threshold.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_M4-Period.h>
+#include <osmocom/ranap/RANAP_M4-Threshold.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M4Report.h b/include/osmocom/ranap/RANAP_M4Report.h
index f96d443..cafd394 100644
--- a/include/osmocom/ranap/RANAP_M4Report.h
+++ b/include/osmocom/ranap/RANAP_M4Report.h
@@ -12,7 +12,7 @@
 
 /* Including external dependencies */
 #include <NULL.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Collection-Parameters.h>
+#include <osmocom/ranap/RANAP_M4-Collection-Parameters.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M5Report.h b/include/osmocom/ranap/RANAP_M5Report.h
index 878ec42..1e20feb 100644
--- a/include/osmocom/ranap/RANAP_M5Report.h
+++ b/include/osmocom/ranap/RANAP_M5Report.h
@@ -12,7 +12,7 @@
 
 /* Including external dependencies */
 #include <NULL.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M5-Period.h>
+#include <osmocom/ranap/RANAP_M5-Period.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M6Report.h b/include/osmocom/ranap/RANAP_M6Report.h
index 8c16728..46b8336 100644
--- a/include/osmocom/ranap/RANAP_M6Report.h
+++ b/include/osmocom/ranap/RANAP_M6Report.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_M6-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Links-to-log.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_M6-Period.h>
+#include <osmocom/ranap/RANAP_Links-to-log.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M7Report.h b/include/osmocom/ranap/RANAP_M7Report.h
index 4b6e85a..e0587f5 100644
--- a/include/osmocom/ranap/RANAP_M7Report.h
+++ b/include/osmocom/ranap/RANAP_M7Report.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_M7-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Links-to-log.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_M7-Period.h>
+#include <osmocom/ranap/RANAP_Links-to-log.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h b/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h
index 43e7e13..dfd1188 100644
--- a/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h b/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h
index f56429d..4c5d1ca 100644
--- a/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h b/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h
index 6365ae8..329e54e 100644
--- a/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h b/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h
index 525f52d..8dba5c2 100644
--- a/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h
+++ b/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IPMulticastAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_APN.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_IPMulticastAddress.h>
+#include <osmocom/ranap/RANAP_APN.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h b/include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h
index 190f75e..80bacec 100644
--- a/include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h
+++ b/include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRABRelease.h b/include/osmocom/ranap/RANAP_MBMSRABRelease.h
index e4063f5..6f12d37 100644
--- a/include/osmocom/ranap/RANAP_MBMSRABRelease.h
+++ b/include/osmocom/ranap/RANAP_MBMSRABRelease.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h b/include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h
index a619a15..43d55ef 100644
--- a/include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h
+++ b/include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h b/include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h
index 075fc65..369aee0 100644
--- a/include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h b/include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h
index 6a9dfaf..76e07d4 100644
--- a/include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h
+++ b/include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h b/include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h
index 25e818c..7db35d0 100644
--- a/include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h b/include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h
index 4589ffc..72bb393 100644
--- a/include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStart.h b/include/osmocom/ranap/RANAP_MBMSSessionStart.h
index ffc2006..de6ccd7 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStart.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStart.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h b/include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h
index 2f06d16..ebae2d2 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h b/include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h
index 0750412..4171e68 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStop.h b/include/osmocom/ranap/RANAP_MBMSSessionStop.h
index 0cfca3f..b5d3119 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStop.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStop.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h b/include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h
index 058d2bb..0c0acd1 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionUpdate.h b/include/osmocom/ranap/RANAP_MBMSSessionUpdate.h
index 09c520d..58b3a98 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionUpdate.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionUpdate.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h b/include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h
index 16b2fab..16829b9 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h b/include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h
index b005e97..7736961 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h b/include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h
index 63003b1..66704f6 100644
--- a/include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h
+++ b/include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSHCIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IPMulticastAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GTP-TEI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_MBMSHCIndicator.h>
+#include <osmocom/ranap/RANAP_IPMulticastAddress.h>
+#include <osmocom/ranap/RANAP_GTP-TEI.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h b/include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h
index af5d0cc..f1ea76a 100644
--- a/include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h b/include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h
index 2418d36..61e411f 100644
--- a/include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MDT-Configuration.h b/include/osmocom/ranap/RANAP_MDT-Configuration.h
index 87d84a8..d2c980d 100644
--- a/include/osmocom/ranap/RANAP_MDT-Configuration.h
+++ b/include/osmocom/ranap/RANAP_MDT-Configuration.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Activation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDTAreaScope.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDTMode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_MDT-Activation.h>
+#include <osmocom/ranap/RANAP_MDTAreaScope.h>
+#include <osmocom/ranap/RANAP_MDTMode.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MDT-PLMN-List.h b/include/osmocom/ranap/RANAP_MDT-PLMN-List.h
index d186239..8e9884c 100644
--- a/include/osmocom/ranap/RANAP_MDT-PLMN-List.h
+++ b/include/osmocom/ranap/RANAP_MDT-PLMN-List.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_MDT-Report-Parameters.h b/include/osmocom/ranap/RANAP_MDT-Report-Parameters.h
index 66f5a08..93a98a0 100644
--- a/include/osmocom/ranap/RANAP_MDT-Report-Parameters.h
+++ b/include/osmocom/ranap/RANAP_MDT-Report-Parameters.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportInterval.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportAmount.h>
+#include <osmocom/ranap/RANAP_ReportInterval.h>
+#include <osmocom/ranap/RANAP_ReportAmount.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MDTAreaScope.h b/include/osmocom/ranap/RANAP_MDTAreaScope.h
index c2b911a..ad94533 100644
--- a/include/osmocom/ranap/RANAP_MDTAreaScope.h
+++ b/include/osmocom/ranap/RANAP_MDTAreaScope.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CellBased.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LABased.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABased.h>
+#include <osmocom/ranap/RANAP_CellBased.h>
+#include <osmocom/ranap/RANAP_LABased.h>
+#include <osmocom/ranap/RANAP_RABased.h>
 #include <NULL.h>
 #include <constr_CHOICE.h>
 
diff --git a/include/osmocom/ranap/RANAP_MDTMode.h b/include/osmocom/ranap/RANAP_MDTMode.h
index 97657a4..79f39f2 100644
--- a/include/osmocom/ranap/RANAP_MDTMode.h
+++ b/include/osmocom/ranap/RANAP_MDTMode.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ImmediateMDT.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggedMDT.h>
+#include <osmocom/ranap/RANAP_ImmediateMDT.h>
+#include <osmocom/ranap/RANAP_LoggedMDT.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MessageStructure.h b/include/osmocom/ranap/RANAP_MessageStructure.h
index 0cf9623..f44d0b4 100644
--- a/include/osmocom/ranap/RANAP_MessageStructure.h
+++ b/include/osmocom/ranap/RANAP_MessageStructure.h
@@ -12,9 +12,9 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber1.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber1.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h
index 9645e18..384213c 100644
--- a/include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RAC.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h
index 0b59ab6..70e9005 100644
--- a/include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RAofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h b/include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h
index 4d348a3..825bcf2 100644
--- a/include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-APN.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters-APN.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Outcome.h b/include/osmocom/ranap/RANAP_Outcome.h
index 0c17792..ded1fe5 100644
--- a/include/osmocom/ranap/RANAP_Outcome.h
+++ b/include/osmocom/ranap/RANAP_Outcome.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_Overload.h b/include/osmocom/ranap/RANAP_Overload.h
index a00cd40..817d44c 100644
--- a/include/osmocom/ranap/RANAP_Overload.h
+++ b/include/osmocom/ranap/RANAP_Overload.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h b/include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h
index 8b2e4ce..3b7521d 100644
--- a/include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h
+++ b/include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type-extension.h>
+#include <osmocom/ranap/RANAP_PDP-Type-extension.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_PDP-TypeInformation.h b/include/osmocom/ranap/RANAP_PDP-TypeInformation.h
index 583a104..0c81cff 100644
--- a/include/osmocom/ranap/RANAP_PDP-TypeInformation.h
+++ b/include/osmocom/ranap/RANAP_PDP-TypeInformation.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type.h>
+#include <osmocom/ranap/RANAP_PDP-Type.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
index 8ba24d5..d335490 100644
--- a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
+++ b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
@@ -12,9 +12,9 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LA-LIST.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_LA-LIST.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Paging.h b/include/osmocom/ranap/RANAP_Paging.h
index 6b17550..cf96a39 100644
--- a/include/osmocom/ranap/RANAP_Paging.h
+++ b/include/osmocom/ranap/RANAP_Paging.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_PagingAreaID.h b/include/osmocom/ranap/RANAP_PagingAreaID.h
index 03efe6f..40ac1cb 100644
--- a/include/osmocom/ranap/RANAP_PagingAreaID.h
+++ b/include/osmocom/ranap/RANAP_PagingAreaID.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI.h>
+#include <osmocom/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_RAI.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_PeriodicLocationInfo.h b/include/osmocom/ranap/RANAP_PeriodicLocationInfo.h
index 0f8f5af..358ee7f 100644
--- a/include/osmocom/ranap/RANAP_PeriodicLocationInfo.h
+++ b/include/osmocom/ranap/RANAP_PeriodicLocationInfo.h
@@ -12,7 +12,7 @@
 
 /* Including external dependencies */
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h b/include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h
index 644f2ea..7292f28 100644
--- a/include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h
+++ b/include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMSI.h>
+#include <osmocom/ranap/RANAP_IMSI.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h b/include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h
index 4b2d56f..062182f 100644
--- a/include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h
+++ b/include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_EncryptionAlgorithm.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h b/include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h
index faff381..22d87f4 100644
--- a/include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h
+++ b/include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_PositionData.h b/include/osmocom/ranap/RANAP_PositionData.h
index 98703c0..a1365c2 100644
--- a/include/osmocom/ranap/RANAP_PositionData.h
+++ b/include/osmocom/ranap/RANAP_PositionData.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataDiscriminator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataSet.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PositioningDataDiscriminator.h>
+#include <osmocom/ranap/RANAP_PositioningDataSet.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_PositioningDataSet.h b/include/osmocom/ranap/RANAP_PositioningDataSet.h
index d2a5569..7b6372b 100644
--- a/include/osmocom/ranap/RANAP_PositioningDataSet.h
+++ b/include/osmocom/ranap/RANAP_PositioningDataSet.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningMethodAndUsage.h>
+#include <osmocom/ranap/RANAP_PositioningMethodAndUsage.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_PrivateMessage.h b/include/osmocom/ranap/RANAP_PrivateMessage.h
index 7295890..a783e37 100644
--- a/include/osmocom/ranap/RANAP_PrivateMessage.h
+++ b/include/osmocom/ranap/RANAP_PrivateMessage.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h b/include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h
index 0681a90..3090462 100644
--- a/include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h
+++ b/include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h b/include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h
index 11c67f3..ce7e39a 100644
--- a/include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h
+++ b/include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionField.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionField.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_ProtocolExtensionField.h b/include/osmocom/ranap/RANAP_ProtocolExtensionField.h
index e962c94..110eeae 100644
--- a/include/osmocom/ranap/RANAP_ProtocolExtensionField.h
+++ b/include/osmocom/ranap/RANAP_ProtocolExtensionField.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_ProtocolIE-Container.h b/include/osmocom/ranap/RANAP_ProtocolIE-Container.h
index b210328..4987e62 100644
--- a/include/osmocom/ranap/RANAP_ProtocolIE-Container.h
+++ b/include/osmocom/ranap/RANAP_ProtocolIE-Container.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h b/include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h
index f4f76e2..79d0676 100644
--- a/include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h
+++ b/include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-FieldPair.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-FieldPair.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h b/include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h
index c8e99f9..0b5e3e0 100644
--- a/include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h
+++ b/include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_ProvidedData.h b/include/osmocom/ranap/RANAP_ProvidedData.h
index 2f6012e..4d17369 100644
--- a/include/osmocom/ranap/RANAP_ProvidedData.h
+++ b/include/osmocom/ranap/RANAP_ProvidedData.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Shared-Network-Information.h>
+#include <osmocom/ranap/RANAP_Shared-Network-Information.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h b/include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h
index 1fbe112..508b56d 100644
--- a/include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h
+++ b/include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h b/include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h
index 4565d98..181da05 100644
--- a/include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h
+++ b/include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h b/include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h
index 19ecdc4..3bac5ec 100644
--- a/include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h
+++ b/include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h
@@ -11,12 +11,12 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ContextItem.h b/include/osmocom/ranap/RANAP_RAB-ContextItem.h
index 595ff43..ddd0265 100644
--- a/include/osmocom/ranap/RANAP_RAB-ContextItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-ContextItem.h
@@ -11,12 +11,12 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h b/include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h
index a02c58b..79f3432 100644
--- a/include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h
+++ b/include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ContextList.h b/include/osmocom/ranap/RANAP_RAB-ContextList.h
index 88c006f..68bc6cd 100644
--- a/include/osmocom/ranap/RANAP_RAB-ContextList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ContextList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h b/include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h
index 7d40910..4ebe04b 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h b/include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h
index 7346e07..dd96d6e 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h b/include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h
index e0ee98b..4659a09 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-DataForwardingList.h b/include/osmocom/ranap/RANAP_RAB-DataForwardingList.h
index 29a8edf..79b6724 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataForwardingList.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataForwardingList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h
index f55f11d..2c500ac 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DataVolumeList.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h
index 497c11a..fd1a5a9 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h
index de6101f..f928e0a 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h
index 5f68a9d..cda59bb 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h b/include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h
index 8e8b0e1..cfcf0f0 100644
--- a/include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-FailedItem.h b/include/osmocom/ranap/RANAP_RAB-FailedItem.h
index 201383f..f7a6416 100644
--- a/include/osmocom/ranap/RANAP_RAB-FailedItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-FailedItem.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h b/include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h
index 74766d4..310dddb 100644
--- a/include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-FailedList.h b/include/osmocom/ranap/RANAP_RAB-FailedList.h
index ba7628d..333fe89 100644
--- a/include/osmocom/ranap/RANAP_RAB-FailedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-FailedList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h b/include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h
index 5b5d166..9371d29 100644
--- a/include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h
+++ b/include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h b/include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h
index a2eec78..10db90a 100644
--- a/include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h
+++ b/include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ContainerPair.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RAB-ModifyItem.h b/include/osmocom/ranap/RANAP_RAB-ModifyItem.h
index 91e86eb..0b2d5da 100644
--- a/include/osmocom/ranap/RANAP_RAB-ModifyItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-ModifyItem.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-Values.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ModifyList.h b/include/osmocom/ranap/RANAP_RAB-ModifyList.h
index d1a809f..45c4ab9 100644
--- a/include/osmocom/ranap/RANAP_RAB-ModifyList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ModifyList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ModifyRequest.h b/include/osmocom/ranap/RANAP_RAB-ModifyRequest.h
index 91d46a2..2a358a6 100644
--- a/include/osmocom/ranap/RANAP_RAB-ModifyRequest.h
+++ b/include/osmocom/ranap/RANAP_RAB-ModifyRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h
index 151d0e4..e5dd173 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h b/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h
index 2f523bd..414c33a 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h
index 8ce2b6f..af13305 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h b/include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h
index 5cf089c..5557a45 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameters.h b/include/osmocom/ranap/RANAP_RAB-Parameters.h
index 9ac9f02..7c37ad9 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameters.h
@@ -11,19 +11,19 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TrafficClass.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AsymmetryIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOrder.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxSDU-Size.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransferDelay.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrafficHandlingPriority.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AllocationOrRetentionPriority.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceStatisticsDescriptor.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequirement.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TrafficClass.h>
+#include <osmocom/ranap/RANAP_RAB-AsymmetryIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_DeliveryOrder.h>
+#include <osmocom/ranap/RANAP_MaxSDU-Size.h>
+#include <osmocom/ranap/RANAP_SDU-Parameters.h>
+#include <osmocom/ranap/RANAP_TransferDelay.h>
+#include <osmocom/ranap/RANAP_TrafficHandlingPriority.h>
+#include <osmocom/ranap/RANAP_AllocationOrRetentionPriority.h>
+#include <osmocom/ranap/RANAP_SourceStatisticsDescriptor.h>
+#include <osmocom/ranap/RANAP_RelocationRequirement.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-QueuedItem.h b/include/osmocom/ranap/RANAP_RAB-QueuedItem.h
index bd0d3f7..c67d6c1 100644
--- a/include/osmocom/ranap/RANAP_RAB-QueuedItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-QueuedItem.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-QueuedList.h b/include/osmocom/ranap/RANAP_RAB-QueuedList.h
index 9c001c4..94439ef 100644
--- a/include/osmocom/ranap/RANAP_RAB-QueuedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-QueuedList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h b/include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h
index afd3937..808c42a 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedList.h>
+#include <osmocom/ranap/RANAP_RAB-FailedList.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleaseItem.h b/include/osmocom/ranap/RANAP_RAB-ReleaseItem.h
index d1547eb..28934cb 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleaseItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleaseItem.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleaseList.h b/include/osmocom/ranap/RANAP_RAB-ReleaseList.h
index 5c537f0..4ac68bd 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleaseList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleaseList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h b/include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h
index 8207ecb..0b09f38 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h b/include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h
index 9147a22..1d73866 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleasedItem.h b/include/osmocom/ranap/RANAP_RAB-ReleasedItem.h
index 7a9748e..14bd8fa 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleasedItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleasedItem.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DataVolumeList.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h b/include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h
index f7918ec..98bb6c7 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleasedList.h b/include/osmocom/ranap/RANAP_RAB-ReleasedList.h
index cd4e2d6..9f047c7 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleasedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleasedList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h b/include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h
index fb696a4..ab8cf40 100644
--- a/include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h b/include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h
index b6abfb9..f008a3b 100644
--- a/include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h
+++ b/include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h
index 08b5208..ed6cb11 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h
@@ -11,16 +11,16 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Service-Handover.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportingIndication.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h>
+#include <osmocom/ranap/RANAP_Service-Handover.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h
index 09c4f98..8de47bb 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h
index 798fa4e..16e4e94 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h
index 768eb1f..b20556f 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h
@@ -11,13 +11,13 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h
index 7a4e9cb..fd2b921 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h
@@ -11,16 +11,16 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SynchronisationIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Service-Handover.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportingIndication.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_Service-Handover.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h
index 0b7d275..c520c66 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h
index 8b78502..074f88b 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h
index 72016e4..3c054bd 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h
index 12d3078..87dc504 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h
index ac7e4a5..cc32d0c 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h b/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h
index 7b50ccc..1004ed5 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h b/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h
index 54c3e81..8df1869 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h
index 4b8ee09..bebf2c7 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_DataVolumeList.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h
index 299749e..81dd128 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h
index 743cf72..d613698 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h
@@ -11,13 +11,13 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SynchronisationIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Service-Handover.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_TransportLayerInformation.h>
+#include <osmocom/ranap/RANAP_Service-Handover.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h
index bd79baf..c2270d5 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h
@@ -11,13 +11,13 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportingIndication.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h
index 7efdada..58c1759 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-IE-ContainerPairList.h>
+#include <osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h b/include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h
index a39c3eb..7884317 100644
--- a/include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h b/include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h
index 46d994b..a9d4fd9 100644
--- a/include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h b/include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h
index 4548dc7..3e69734 100644
--- a/include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h
+++ b/include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-MappingItem.h>
+#include <osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h b/include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h
index 259967c..d84a86c 100644
--- a/include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TrCH-ID-List.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RABDataVolumeReport.h b/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
index afb09e8..ab671d5 100644
--- a/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
+++ b/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
@@ -12,9 +12,9 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
+#include <osmocom/ranap/RANAP_DataVolumeReference.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RABParametersList.h b/include/osmocom/ranap/RANAP_RABParametersList.h
index 93fbbee..f3bec06 100644
--- a/include/osmocom/ranap/RANAP_RABParametersList.h
+++ b/include/osmocom/ranap/RANAP_RABParametersList.h
@@ -12,11 +12,11 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABDataVolumeReport.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UPInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_RABDataVolumeReport.h>
+#include <osmocom/ranap/RANAP_UPInformation.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RABased.h b/include/osmocom/ranap/RANAP_RABased.h
index a23d29e..5ddfaa4 100644
--- a/include/osmocom/ranap/RANAP_RABased.h
+++ b/include/osmocom/ranap/RANAP_RABased.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RAI-List.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h b/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h
index 2db97c2..09ba8b6 100644
--- a/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h
+++ b/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h b/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h
index 9abd29a..6dae24e 100644
--- a/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h
+++ b/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h b/include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h
index 5069f62..c3032e5 100644
--- a/include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h
+++ b/include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h b/include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h
index 32425fe..33e3943 100644
--- a/include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h
+++ b/include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAI-List.h b/include/osmocom/ranap/RANAP_RAI-List.h
index 8f6933d..bc4f843 100644
--- a/include/osmocom/ranap/RANAP_RAI-List.h
+++ b/include/osmocom/ranap/RANAP_RAI-List.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI.h>
+#include <osmocom/ranap/RANAP_RAI.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RAI.h b/include/osmocom/ranap/RANAP_RAI.h
index 1ef63ec..eb822d1 100644
--- a/include/osmocom/ranap/RANAP_RAI.h
+++ b/include/osmocom/ranap/RANAP_RAI.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h
index 5291ac6..15dd881 100644
--- a/include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h>
 #include <NativeEnumerated.h>
 #include <constr_CHOICE.h>
 
diff --git a/include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h b/include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h
index 4db7c31..1b144f6 100644
--- a/include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h
+++ b/include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RAC.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h b/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h
index f1c69e7..8a75799 100644
--- a/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h
+++ b/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h b/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h
index 7fdf202..3175411 100644
--- a/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h
+++ b/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RANAP-PDU.h b/include/osmocom/ranap/RANAP_RANAP-PDU.h
index e6771a6..b2039bd 100644
--- a/include/osmocom/ranap/RANAP_RANAP-PDU.h
+++ b/include/osmocom/ranap/RANAP_RANAP-PDU.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_InitiatingMessage.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Outcome.h>
+#include <osmocom/ranap/RANAP_InitiatingMessage.h>
+#include <osmocom/ranap/RANAP_SuccessfulOutcome.h>
+#include <osmocom/ranap/RANAP_UnsuccessfulOutcome.h>
+#include <osmocom/ranap/RANAP_Outcome.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h b/include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h
index e63ebb7..3d28873 100644
--- a/include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h
+++ b/include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAofIdleModeUEs.h b/include/osmocom/ranap/RANAP_RAofIdleModeUEs.h
index de7ea46..66eb253 100644
--- a/include/osmocom/ranap/RANAP_RAofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_RAofIdleModeUEs.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RAC.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RIM-Transfer.h b/include/osmocom/ranap/RANAP_RIM-Transfer.h
index 81f08eb..12d9660 100644
--- a/include/osmocom/ranap/RANAP_RIM-Transfer.h
+++ b/include/osmocom/ranap/RANAP_RIM-Transfer.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RIMInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RIMRoutingAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RIMInformation.h>
+#include <osmocom/ranap/RANAP_RIMRoutingAddress.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RIMRoutingAddress.h b/include/osmocom/ranap/RANAP_RIMRoutingAddress.h
index 7a19744..841570d 100644
--- a/include/osmocom/ranap/RANAP_RIMRoutingAddress.h
+++ b/include/osmocom/ranap/RANAP_RIMRoutingAddress.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Cell-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetENB-ID.h>
+#include <osmocom/ranap/RANAP_TargetRNC-ID.h>
+#include <osmocom/ranap/RANAP_GERAN-Cell-ID.h>
+#include <osmocom/ranap/RANAP_TargetENB-ID.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RNCTraceInformation.h b/include/osmocom/ranap/RANAP_RNCTraceInformation.h
index 868b45c..0bfbaf5 100644
--- a/include/osmocom/ranap/RANAP_RNCTraceInformation.h
+++ b/include/osmocom/ranap/RANAP_RNCTraceInformation.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceReference.h>
+#include <osmocom/ranap/RANAP_TraceReference.h>
 #include <NativeEnumerated.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EquipmentsToBeTraced.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_EquipmentsToBeTraced.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h b/include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h
index 90b3bc3..a5dfd26 100644
--- a/include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h
+++ b/include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RABParametersList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationReportingTransferInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RABParametersList.h>
+#include <osmocom/ranap/RANAP_LocationReportingTransferInformation.h>
+#include <osmocom/ranap/RANAP_TraceInformation.h>
+#include <osmocom/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RSRVCC-Information.h b/include/osmocom/ranap/RANAP_RSRVCC-Information.h
index 223c08e..d4d8e79 100644
--- a/include/osmocom/ranap/RANAP_RSRVCC-Information.h
+++ b/include/osmocom/ranap/RANAP_RSRVCC-Information.h
@@ -13,7 +13,7 @@
 /* Including external dependencies */
 #include <BIT_STRING.h>
 #include <OCTET_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RedirectionIndication.h b/include/osmocom/ranap/RANAP_RedirectionIndication.h
index 081cb42..444d707 100644
--- a/include/osmocom/ranap/RANAP_RedirectionIndication.h
+++ b/include/osmocom/ranap/RANAP_RedirectionIndication.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationCancel.h b/include/osmocom/ranap/RANAP_RelocationCancel.h
index 42790ef..bddd051 100644
--- a/include/osmocom/ranap/RANAP_RelocationCancel.h
+++ b/include/osmocom/ranap/RANAP_RelocationCancel.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h b/include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h
index dea7365..4bbceb9 100644
--- a/include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h
+++ b/include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationCommand.h b/include/osmocom/ranap/RANAP_RelocationCommand.h
index 13376a1..d17d86b 100644
--- a/include/osmocom/ranap/RANAP_RelocationCommand.h
+++ b/include/osmocom/ranap/RANAP_RelocationCommand.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationComplete.h b/include/osmocom/ranap/RANAP_RelocationComplete.h
index 43a5e54..4e7b5d8 100644
--- a/include/osmocom/ranap/RANAP_RelocationComplete.h
+++ b/include/osmocom/ranap/RANAP_RelocationComplete.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationDetect.h b/include/osmocom/ranap/RANAP_RelocationDetect.h
index 59dc241..d06ba66 100644
--- a/include/osmocom/ranap/RANAP_RelocationDetect.h
+++ b/include/osmocom/ranap/RANAP_RelocationDetect.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationFailure.h b/include/osmocom/ranap/RANAP_RelocationFailure.h
index 148240c..76d3d57 100644
--- a/include/osmocom/ranap/RANAP_RelocationFailure.h
+++ b/include/osmocom/ranap/RANAP_RelocationFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationPreparationFailure.h b/include/osmocom/ranap/RANAP_RelocationPreparationFailure.h
index f192c4b..8781bbe 100644
--- a/include/osmocom/ranap/RANAP_RelocationPreparationFailure.h
+++ b/include/osmocom/ranap/RANAP_RelocationPreparationFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationRequest.h b/include/osmocom/ranap/RANAP_RelocationRequest.h
index b55d39f..06d4c07 100644
--- a/include/osmocom/ranap/RANAP_RelocationRequest.h
+++ b/include/osmocom/ranap/RANAP_RelocationRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h b/include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h
index 5662ebe..ba13e88 100644
--- a/include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h
+++ b/include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationRequired.h b/include/osmocom/ranap/RANAP_RelocationRequired.h
index 6d4c753..1187c90 100644
--- a/include/osmocom/ranap/RANAP_RelocationRequired.h
+++ b/include/osmocom/ranap/RANAP_RelocationRequired.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RequestType.h b/include/osmocom/ranap/RANAP_RequestType.h
index bae93ec..86ed875 100644
--- a/include/osmocom/ranap/RANAP_RequestType.h
+++ b/include/osmocom/ranap/RANAP_RequestType.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Event.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportArea.h>
+#include <osmocom/ranap/RANAP_Event.h>
+#include <osmocom/ranap/RANAP_ReportArea.h>
 #include <NativeInteger.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h
index cce5451..963d25a 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h
index 3fcd5c7..c878ec9 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h
index b55ed42..d2d39ad 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h
index 9f4509f..22047b7 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h
index 391fb7d..82352fd 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h b/include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h
index a0716f1..9ba0d86 100644
--- a/include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h
+++ b/include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h>
+#include <osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h b/include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h
index c2e71d4..9d0923c 100644
--- a/include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h
+++ b/include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_Reset.h b/include/osmocom/ranap/RANAP_Reset.h
index d535c34..f02a5fb 100644
--- a/include/osmocom/ranap/RANAP_Reset.h
+++ b/include/osmocom/ranap/RANAP_Reset.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetAcknowledge.h b/include/osmocom/ranap/RANAP_ResetAcknowledge.h
index 46822a9..dc5c643 100644
--- a/include/osmocom/ranap/RANAP_ResetAcknowledge.h
+++ b/include/osmocom/ranap/RANAP_ResetAcknowledge.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetResource.h b/include/osmocom/ranap/RANAP_ResetResource.h
index 1612165..ba35fa6 100644
--- a/include/osmocom/ranap/RANAP_ResetResource.h
+++ b/include/osmocom/ranap/RANAP_ResetResource.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetResourceAckItem.h b/include/osmocom/ranap/RANAP_ResetResourceAckItem.h
index f032bb2..94ae632 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceAckItem.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceAckItem.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IuSignallingConnectionIdentifier.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ResetResourceAckList.h b/include/osmocom/ranap/RANAP_ResetResourceAckList.h
index cd8d425..9d699b5 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceAckList.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceAckList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h b/include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h
index eb96f34..f268623 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetResourceItem.h b/include/osmocom/ranap/RANAP_ResetResourceItem.h
index e7b7f86..9482a16 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceItem.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceItem.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IuSignallingConnectionIdentifier.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ResetResourceList.h b/include/osmocom/ranap/RANAP_ResetResourceList.h
index 406e8b5..b840101 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceList.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h b/include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h
index d8ee403..5acfc8c 100644
--- a/include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h
+++ b/include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h
@@ -12,7 +12,7 @@
 
 /* Including external dependencies */
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SAI.h b/include/osmocom/ranap/RANAP_SAI.h
index 49afa03..1a8d622 100644
--- a/include/osmocom/ranap/RANAP_SAI.h
+++ b/include/osmocom/ranap/RANAP_SAI.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_SAC.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SDU-ErrorRatio.h b/include/osmocom/ranap/RANAP_SDU-ErrorRatio.h
index d3560f9..8835247 100644
--- a/include/osmocom/ranap/RANAP_SDU-ErrorRatio.h
+++ b/include/osmocom/ranap/RANAP_SDU-ErrorRatio.h
@@ -12,7 +12,7 @@
 
 /* Including external dependencies */
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h b/include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h
index 9c5ac84..ed966d2 100644
--- a/include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h
+++ b/include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SubflowSDU-Size.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SubflowCombinationBitRate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_SubflowSDU-Size.h>
+#include <osmocom/ranap/RANAP_RAB-SubflowCombinationBitRate.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h b/include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h
index 986b3d6..6eb520c 100644
--- a/include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h
+++ b/include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameterItem.h>
+#include <osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_SDU-ParameterItem.h b/include/osmocom/ranap/RANAP_SDU-ParameterItem.h
index c17d74f..dd700b8 100644
--- a/include/osmocom/ranap/RANAP_SDU-ParameterItem.h
+++ b/include/osmocom/ranap/RANAP_SDU-ParameterItem.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ErrorRatio.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResidualBitErrorRatio.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOfErroneousSDU.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_SDU-ErrorRatio.h>
+#include <osmocom/ranap/RANAP_ResidualBitErrorRatio.h>
+#include <osmocom/ranap/RANAP_DeliveryOfErroneousSDU.h>
+#include <osmocom/ranap/RANAP_SDU-FormatInformationParameters.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SDU-Parameters.h b/include/osmocom/ranap/RANAP_SDU-Parameters.h
index 456fe49..5fc7f8b 100644
--- a/include/osmocom/ranap/RANAP_SDU-Parameters.h
+++ b/include/osmocom/ranap/RANAP_SDU-Parameters.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ParameterItem.h>
+#include <osmocom/ranap/RANAP_SDU-ParameterItem.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_SNA-Access-Information.h b/include/osmocom/ranap/RANAP_SNA-Access-Information.h
index 96fd120..e98207a 100644
--- a/include/osmocom/ranap/RANAP_SNA-Access-Information.h
+++ b/include/osmocom/ranap/RANAP_SNA-Access-Information.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedPLMNs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_AuthorisedPLMNs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h b/include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h
index ed9f2ba..7cb3959 100644
--- a/include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h
+++ b/include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-TrCH-MappingItem.h>
+#include <osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h b/include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h
index 2f182a6..36032e9 100644
--- a/include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h
+++ b/include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_SRB-ID.h>
+#include <osmocom/ranap/RANAP_TrCH-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SRNS-ContextRequest.h b/include/osmocom/ranap/RANAP_SRNS-ContextRequest.h
index ae89b1a..168b9b5 100644
--- a/include/osmocom/ranap/RANAP_SRNS-ContextRequest.h
+++ b/include/osmocom/ranap/RANAP_SRNS-ContextRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRNS-ContextResponse.h b/include/osmocom/ranap/RANAP_SRNS-ContextResponse.h
index 387ece5..57fa412 100644
--- a/include/osmocom/ranap/RANAP_SRNS-ContextResponse.h
+++ b/include/osmocom/ranap/RANAP_SRNS-ContextResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h b/include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h
index 9aaa8a8..ab554fd 100644
--- a/include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h
+++ b/include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h b/include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h
index 41e2eca..d9c9093 100644
--- a/include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h
+++ b/include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h b/include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h
index 81e2cc4..b143eab 100644
--- a/include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h
+++ b/include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRVCC-Information.h b/include/osmocom/ranap/RANAP_SRVCC-Information.h
index dcfa755..ef851b1 100644
--- a/include/osmocom/ranap/RANAP_SRVCC-Information.h
+++ b/include/osmocom/ranap/RANAP_SRVCC-Information.h
@@ -12,7 +12,7 @@
 
 /* Including external dependencies */
 #include <BIT_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SecurityModeCommand.h b/include/osmocom/ranap/RANAP_SecurityModeCommand.h
index 82384a1..482b6ea 100644
--- a/include/osmocom/ranap/RANAP_SecurityModeCommand.h
+++ b/include/osmocom/ranap/RANAP_SecurityModeCommand.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SecurityModeComplete.h b/include/osmocom/ranap/RANAP_SecurityModeComplete.h
index b14d22f..5a99eb0 100644
--- a/include/osmocom/ranap/RANAP_SecurityModeComplete.h
+++ b/include/osmocom/ranap/RANAP_SecurityModeComplete.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SecurityModeReject.h b/include/osmocom/ranap/RANAP_SecurityModeReject.h
index f4e87db..1aa69da 100644
--- a/include/osmocom/ranap/RANAP_SecurityModeReject.h
+++ b/include/osmocom/ranap/RANAP_SecurityModeReject.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Shared-Network-Information.h b/include/osmocom/ranap/RANAP_Shared-Network-Information.h
index 1bfa3c1..74afbd1 100644
--- a/include/osmocom/ranap/RANAP_Shared-Network-Information.h
+++ b/include/osmocom/ranap/RANAP_Shared-Network-Information.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNs-in-shared-network.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNs-in-shared-network.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceCellID.h b/include/osmocom/ranap/RANAP_SourceCellID.h
index a21e3c2..2c4e679 100644
--- a/include/osmocom/ranap/RANAP_SourceCellID.h
+++ b/include/osmocom/ranap/RANAP_SourceCellID.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceUTRANCellID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CGI.h>
+#include <osmocom/ranap/RANAP_SourceUTRANCellID.h>
+#include <osmocom/ranap/RANAP_CGI.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceID.h b/include/osmocom/ranap/RANAP_SourceID.h
index d028439..ef4acc0 100644
--- a/include/osmocom/ranap/RANAP_SourceID.h
+++ b/include/osmocom/ranap/RANAP_SourceID.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_SourceRNC-ID.h>
+#include <osmocom/ranap/RANAP_SAI.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceRNC-ID.h b/include/osmocom/ranap/RANAP_SourceRNC-ID.h
index ad24ffd..17ed1c1 100644
--- a/include/osmocom/ranap/RANAP_SourceRNC-ID.h
+++ b/include/osmocom/ranap/RANAP_SourceRNC-ID.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_RNC-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h b/include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h
index 0c34fe7..8065a9a 100644
--- a/include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h
+++ b/include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h
@@ -11,17 +11,17 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RRC-Container.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NumberOfIuInstances.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ChosenEncryptionAlgorithm.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_D-RNTI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetCellId.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-Mapping.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RRC-Container.h>
+#include <osmocom/ranap/RANAP_NumberOfIuInstances.h>
+#include <osmocom/ranap/RANAP_RelocationType.h>
+#include <osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionKey.h>
+#include <osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_EncryptionKey.h>
+#include <osmocom/ranap/RANAP_D-RNTI.h>
+#include <osmocom/ranap/RANAP_TargetCellId.h>
+#include <osmocom/ranap/RANAP_RAB-TrCH-Mapping.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceUTRANCellID.h b/include/osmocom/ranap/RANAP_SourceUTRANCellID.h
index 57bc739..551a7f6 100644
--- a/include/osmocom/ranap/RANAP_SourceUTRANCellID.h
+++ b/include/osmocom/ranap/RANAP_SourceUTRANCellID.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetCellId.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_TargetCellId.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SuccessfulOutcome.h b/include/osmocom/ranap/RANAP_SuccessfulOutcome.h
index e7243c2..bd0364c 100644
--- a/include/osmocom/ranap/RANAP_SuccessfulOutcome.h
+++ b/include/osmocom/ranap/RANAP_SuccessfulOutcome.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h b/include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h
index 609cd41..3677899 100644
--- a/include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h
+++ b/include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedBitrate.h>
+#include <osmocom/ranap/RANAP_SupportedBitrate.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_TAI.h b/include/osmocom/ranap/RANAP_TAI.h
index 2aab416..8fbcb30 100644
--- a/include/osmocom/ranap/RANAP_TAI.h
+++ b/include/osmocom/ranap/RANAP_TAI.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_TAC.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TMGI.h b/include/osmocom/ranap/RANAP_TMGI.h
index 310b162..9697529 100644
--- a/include/osmocom/ranap/RANAP_TMGI.h
+++ b/include/osmocom/ranap/RANAP_TMGI.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
 #include <OCTET_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h b/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h
index cd5fedf..4f2e2e1 100644
--- a/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h
+++ b/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h b/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h
index c01c804..6b8efbb 100644
--- a/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h
+++ b/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TargetENB-ID.h b/include/osmocom/ranap/RANAP_TargetENB-ID.h
index d7f6d5c..0566213 100644
--- a/include/osmocom/ranap/RANAP_TargetENB-ID.h
+++ b/include/osmocom/ranap/RANAP_TargetENB-ID.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ENB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TAI.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_ENB-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TAI.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TargetID.h b/include/osmocom/ranap/RANAP_TargetID.h
index c6b6ff6..fa8a82f 100644
--- a/include/osmocom/ranap/RANAP_TargetID.h
+++ b/include/osmocom/ranap/RANAP_TargetID.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetENB-ID.h>
+#include <osmocom/ranap/RANAP_TargetRNC-ID.h>
+#include <osmocom/ranap/RANAP_CGI.h>
+#include <osmocom/ranap/RANAP_TargetENB-ID.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TargetRNC-ID.h b/include/osmocom/ranap/RANAP_TargetRNC-ID.h
index 1482c30..0d6dc98 100644
--- a/include/osmocom/ranap/RANAP_TargetRNC-ID.h
+++ b/include/osmocom/ranap/RANAP_TargetRNC-ID.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RNC-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h b/include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h
index 78ee67c..eb1d973 100644
--- a/include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h
+++ b/include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RRC-Container.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_D-RNTI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RRC-Container.h>
+#include <osmocom/ranap/RANAP_D-RNTI.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TemporaryUE-ID.h b/include/osmocom/ranap/RANAP_TemporaryUE-ID.h
index f440ed2..3d27c00 100644
--- a/include/osmocom/ranap/RANAP_TemporaryUE-ID.h
+++ b/include/osmocom/ranap/RANAP_TemporaryUE-ID.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TMSI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_P-TMSI.h>
+#include <osmocom/ranap/RANAP_TMSI.h>
+#include <osmocom/ranap/RANAP_P-TMSI.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TrCH-ID-List.h b/include/osmocom/ranap/RANAP_TrCH-ID-List.h
index fe0a8d9..77ca281 100644
--- a/include/osmocom/ranap/RANAP_TrCH-ID-List.h
+++ b/include/osmocom/ranap/RANAP_TrCH-ID-List.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID.h>
+#include <osmocom/ranap/RANAP_TrCH-ID.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_TrCH-ID.h b/include/osmocom/ranap/RANAP_TrCH-ID.h
index 3d7724d..2ab369b 100644
--- a/include/osmocom/ranap/RANAP_TrCH-ID.h
+++ b/include/osmocom/ranap/RANAP_TrCH-ID.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_DCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DSCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_USCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_DCH-ID.h>
+#include <osmocom/ranap/RANAP_DSCH-ID.h>
+#include <osmocom/ranap/RANAP_USCH-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TraceInformation.h b/include/osmocom/ranap/RANAP_TraceInformation.h
index 79ff8ea..6281c4e 100644
--- a/include/osmocom/ranap/RANAP_TraceInformation.h
+++ b/include/osmocom/ranap/RANAP_TraceInformation.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TracePropagationParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TraceReference.h>
+#include <osmocom/ranap/RANAP_UE-ID.h>
+#include <osmocom/ranap/RANAP_TracePropagationParameters.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TracePropagationParameters.h b/include/osmocom/ranap/RANAP_TracePropagationParameters.h
index 41789a8..271a352 100644
--- a/include/osmocom/ranap/RANAP_TracePropagationParameters.h
+++ b/include/osmocom/ranap/RANAP_TracePropagationParameters.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceDepth.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ListOfInterfacesToTrace.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TraceRecordingSessionReference.h>
+#include <osmocom/ranap/RANAP_TraceDepth.h>
+#include <osmocom/ranap/RANAP_ListOfInterfacesToTrace.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h b/include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h
index d006be2..aac7b89 100644
--- a/include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h
+++ b/include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TraceReference.h>
+#include <osmocom/ranap/RANAP_TraceRecordingSessionReference.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TransportLayerInformation.h b/include/osmocom/ranap/RANAP_TransportLayerInformation.h
index 27560c0..dd443c4 100644
--- a/include/osmocom/ranap/RANAP_TransportLayerInformation.h
+++ b/include/osmocom/ranap/RANAP_TransportLayerInformation.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TunnelInformation.h b/include/osmocom/ranap/RANAP_TunnelInformation.h
index 35dead3..679b41a 100644
--- a/include/osmocom/ranap/RANAP_TunnelInformation.h
+++ b/include/osmocom/ranap/RANAP_TunnelInformation.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Port-Number.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_Port-Number.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h b/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h
index 39b7510..2029073 100644
--- a/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h
+++ b/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_UE-ID.h b/include/osmocom/ranap/RANAP_UE-ID.h
index d0e957f..0bc2fc7 100644
--- a/include/osmocom/ranap/RANAP_UE-ID.h
+++ b/include/osmocom/ranap/RANAP_UE-ID.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMSI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISV.h>
+#include <osmocom/ranap/RANAP_IMSI.h>
+#include <osmocom/ranap/RANAP_IMEI.h>
+#include <osmocom/ranap/RANAP_IMEISV.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_UESBI-Iu.h b/include/osmocom/ranap/RANAP_UESBI-Iu.h
index adaf8e7..44057fa 100644
--- a/include/osmocom/ranap/RANAP_UESBI-Iu.h
+++ b/include/osmocom/ranap/RANAP_UESBI-Iu.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-IuA.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-IuB.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_UESBI-IuA.h>
+#include <osmocom/ranap/RANAP_UESBI-IuB.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_UESpecificInformationIndication.h b/include/osmocom/ranap/RANAP_UESpecificInformationIndication.h
index 76cc4f5..a4bad3a 100644
--- a/include/osmocom/ranap/RANAP_UESpecificInformationIndication.h
+++ b/include/osmocom/ranap/RANAP_UESpecificInformationIndication.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_UPInformation.h b/include/osmocom/ranap/RANAP_UPInformation.h
index bdbee63..8d0af41 100644
--- a/include/osmocom/ranap/RANAP_UPInformation.h
+++ b/include/osmocom/ranap/RANAP_UPInformation.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_FrameSequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDUType14FrameSequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataPDUType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UPInitialisationFrame.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_FrameSequenceNumber.h>
+#include <osmocom/ranap/RANAP_PDUType14FrameSequenceNumber.h>
+#include <osmocom/ranap/RANAP_DataPDUType.h>
+#include <osmocom/ranap/RANAP_UPInitialisationFrame.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_UTRAN-CellID.h b/include/osmocom/ranap/RANAP_UTRAN-CellID.h
index 95fed88..f86ce05 100644
--- a/include/osmocom/ranap/RANAP_UTRAN-CellID.h
+++ b/include/osmocom/ranap/RANAP_UTRAN-CellID.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetCellId.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_TargetCellId.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h b/include/osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h
index 7c5942b..735951b 100644
--- a/include/osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h
+++ b/include/osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h b/include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h
index 2703f5a..a589878 100644
--- a/include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h
+++ b/include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h b/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h
index 58d31a8..149db08 100644
--- a/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h
+++ b/include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h
@@ -12,9 +12,9 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h b/include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h
index d49f4a7..cbd7ee8 100644
--- a/include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h
+++ b/include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h b/include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h
index 914bdd3..817d5f5 100644
--- a/include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h
+++ b/include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h b/include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h
index 02f0559..d07a3a7 100644
--- a/include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h
+++ b/include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h b/include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h
index fc8625e..093acce 100644
--- a/include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h
+++ b/include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_UserPlaneInformation.h b/include/osmocom/ranap/RANAP_UserPlaneInformation.h
index f795fe5..3ae61ec 100644
--- a/include/osmocom/ranap/RANAP_UserPlaneInformation.h
+++ b/include/osmocom/ranap/RANAP_UserPlaneInformation.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneMode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UP-ModeVersions.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_UserPlaneMode.h>
+#include <osmocom/ranap/RANAP_UP-ModeVersions.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_VelocityEstimate.h b/include/osmocom/ranap/RANAP_VelocityEstimate.h
index b929f6a..69d41f4 100644
--- a/include/osmocom/ranap/RANAP_VelocityEstimate.h
+++ b/include/osmocom/ranap/RANAP_VelocityEstimate.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalWithVerticalVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalVelocityWithUncertainty.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h>
+#include <osmocom/ranap/RANAP_HorizontalVelocity.h>
+#include <osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h>
+#include <osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h>
+#include <osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_VerticalVelocity.h b/include/osmocom/ranap/RANAP_VerticalVelocity.h
index 5d2699e..15906f3 100644
--- a/include/osmocom/ranap/RANAP_VerticalVelocity.h
+++ b/include/osmocom/ranap/RANAP_VerticalVelocity.h
@@ -12,7 +12,7 @@
 
 /* Including external dependencies */
 #include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalSpeedDirection.h>
+#include <osmocom/ranap/RANAP_VerticalSpeedDirection.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/rua/RUA_Cause.h b/include/osmocom/rua/RUA_Cause.h
index 63f4007..97a1c1e 100644
--- a/include/osmocom/rua/RUA_Cause.h
+++ b/include/osmocom/rua/RUA_Cause.h
@@ -11,10 +11,10 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_CauseRadioNetwork.h>
-#include <osmocom/osmo-iuh/rua/RUA_CauseTransport.h>
-#include <osmocom/osmo-iuh/rua/RUA_CauseProtocol.h>
-#include <osmocom/osmo-iuh/rua/RUA_CauseMisc.h>
+#include <osmocom/rua/RUA_CauseRadioNetwork.h>
+#include <osmocom/rua/RUA_CauseTransport.h>
+#include <osmocom/rua/RUA_CauseProtocol.h>
+#include <osmocom/rua/RUA_CauseMisc.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/rua/RUA_Connect.h b/include/osmocom/rua/RUA_Connect.h
index b4182b0..63c071f 100644
--- a/include/osmocom/rua/RUA_Connect.h
+++ b/include/osmocom/rua/RUA_Connect.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/rua/RUA_ConnectionlessTransfer.h b/include/osmocom/rua/RUA_ConnectionlessTransfer.h
index b410471..2e2fed6 100644
--- a/include/osmocom/rua/RUA_ConnectionlessTransfer.h
+++ b/include/osmocom/rua/RUA_ConnectionlessTransfer.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
index fdf7654..c10dc14 100644
--- a/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h
@@ -12,10 +12,10 @@
 
 /* Including external dependencies */
 #include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/rua/RUA_Criticality.h>
-#include <osmocom/osmo-iuh/rua/RUA_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/rua/RUA_TypeOfError.h>
-#include <osmocom/osmo-iuh/rua/RUA_IE-Extensions.h>
+#include <osmocom/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_ProtocolIE-ID.h>
+#include <osmocom/rua/RUA_TypeOfError.h>
+#include <osmocom/rua/RUA_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/rua/RUA_CriticalityDiagnostics.h b/include/osmocom/rua/RUA_CriticalityDiagnostics.h
index 6e24ede..119893d 100644
--- a/include/osmocom/rua/RUA_CriticalityDiagnostics.h
+++ b/include/osmocom/rua/RUA_CriticalityDiagnostics.h
@@ -11,11 +11,11 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_ProcedureCode.h>
-#include <osmocom/osmo-iuh/rua/RUA_TriggeringMessage.h>
-#include <osmocom/osmo-iuh/rua/RUA_Criticality.h>
-#include <osmocom/osmo-iuh/rua/RUA_CriticalityDiagnostics-IE-List.h>
-#include <osmocom/osmo-iuh/rua/RUA_IE-Extensions.h>
+#include <osmocom/rua/RUA_ProcedureCode.h>
+#include <osmocom/rua/RUA_TriggeringMessage.h>
+#include <osmocom/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/rua/RUA_IE-Extensions.h>
 #include <constr_SEQUENCE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/rua/RUA_DirectTransfer.h b/include/osmocom/rua/RUA_DirectTransfer.h
index a0e0a3a..223bf83 100644
--- a/include/osmocom/rua/RUA_DirectTransfer.h
+++ b/include/osmocom/rua/RUA_DirectTransfer.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/rua/RUA_Disconnect.h b/include/osmocom/rua/RUA_Disconnect.h
index 028be8b..a20cf0d 100644
--- a/include/osmocom/rua/RUA_Disconnect.h
+++ b/include/osmocom/rua/RUA_Disconnect.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/rua/RUA_ErrorIndication.h b/include/osmocom/rua/RUA_ErrorIndication.h
index 748ff09..bdc997d 100644
--- a/include/osmocom/rua/RUA_ErrorIndication.h
+++ b/include/osmocom/rua/RUA_ErrorIndication.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h
index 04d2773..4d59481 100644
--- a/include/osmocom/rua/RUA_Gsm-map-IDNNS.h
+++ b/include/osmocom/rua/RUA_Gsm-map-IDNNS.h
@@ -12,7 +12,7 @@
 
 /* Including external dependencies */
 #include <BOOLEAN.h>
-#include <osmocom/osmo-iuh/rua/RUA_RoutingParameter.h>
+#include <osmocom/rua/RUA_RoutingParameter.h>
 #include <constr_SEQUENCE.h>
 #include <constr_CHOICE.h>
 
diff --git a/include/osmocom/rua/RUA_IE-Extensions.h b/include/osmocom/rua/RUA_IE-Extensions.h
index d843181..a7dee0f 100644
--- a/include/osmocom/rua/RUA_IE-Extensions.h
+++ b/include/osmocom/rua/RUA_IE-Extensions.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 
diff --git a/include/osmocom/rua/RUA_IE.h b/include/osmocom/rua/RUA_IE.h
index 3ab05e0..cd1266f 100644
--- a/include/osmocom/rua/RUA_IE.h
+++ b/include/osmocom/rua/RUA_IE.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_ProtocolIE-ID.h>
+#include <osmocom/rua/RUA_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/rua/RUA_InitiatingMessage.h b/include/osmocom/rua/RUA_InitiatingMessage.h
index 1b321af..a488a99 100644
--- a/include/osmocom/rua/RUA_InitiatingMessage.h
+++ b/include/osmocom/rua/RUA_InitiatingMessage.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_ProcedureCode.h>
-#include <osmocom/osmo-iuh/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_ProcedureCode.h>
+#include <osmocom/rua/RUA_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
index eb5b19d..a90ab26 100644
--- a/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
+++ b/include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_Gsm-map-IDNNS.h>
-#include <osmocom/osmo-iuh/rua/RUA_Ansi-41-IDNNS.h>
+#include <osmocom/rua/RUA_Gsm-map-IDNNS.h>
+#include <osmocom/rua/RUA_Ansi-41-IDNNS.h>
 #include <constr_CHOICE.h>
 #include <constr_SEQUENCE.h>
 #include <BIT_STRING.h>
diff --git a/include/osmocom/rua/RUA_PrivateMessage.h b/include/osmocom/rua/RUA_PrivateMessage.h
index e37bb19..4b18bfc 100644
--- a/include/osmocom/rua/RUA_PrivateMessage.h
+++ b/include/osmocom/rua/RUA_PrivateMessage.h
@@ -11,7 +11,7 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_IE.h>
 #include <asn_SEQUENCE_OF.h>
 #include <constr_SEQUENCE_OF.h>
 #include <constr_SEQUENCE.h>
diff --git a/include/osmocom/rua/RUA_RUA-PDU.h b/include/osmocom/rua/RUA_RUA-PDU.h
index 5feaa01..7f5bdb7 100644
--- a/include/osmocom/rua/RUA_RUA-PDU.h
+++ b/include/osmocom/rua/RUA_RUA-PDU.h
@@ -11,9 +11,9 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_InitiatingMessage.h>
-#include <osmocom/osmo-iuh/rua/RUA_SuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/rua/RUA_UnsuccessfulOutcome.h>
+#include <osmocom/rua/RUA_InitiatingMessage.h>
+#include <osmocom/rua/RUA_SuccessfulOutcome.h>
+#include <osmocom/rua/RUA_UnsuccessfulOutcome.h>
 #include <constr_CHOICE.h>
 
 #ifdef __cplusplus
diff --git a/include/osmocom/rua/RUA_SuccessfulOutcome.h b/include/osmocom/rua/RUA_SuccessfulOutcome.h
index 6f9c627..28938a3 100644
--- a/include/osmocom/rua/RUA_SuccessfulOutcome.h
+++ b/include/osmocom/rua/RUA_SuccessfulOutcome.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_ProcedureCode.h>
-#include <osmocom/osmo-iuh/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_ProcedureCode.h>
+#include <osmocom/rua/RUA_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h
index edec483..c9b6003 100644
--- a/include/osmocom/rua/RUA_UnsuccessfulOutcome.h
+++ b/include/osmocom/rua/RUA_UnsuccessfulOutcome.h
@@ -11,8 +11,8 @@
 #include <asn_application.h>
 
 /* Including external dependencies */
-#include <osmocom/osmo-iuh/rua/RUA_ProcedureCode.h>
-#include <osmocom/osmo-iuh/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_ProcedureCode.h>
+#include <osmocom/rua/RUA_Criticality.h>
 #include <ANY.h>
 #include <constr_SEQUENCE.h>
 
diff --git a/src/hnbap/Access-stratum-release-indicator.c b/src/hnbap/Access-stratum-release-indicator.c
index 746832e..cf16e39 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 <osmocom/osmo-iuh/hnbap/Access-stratum-release-indicator.h>
+#include <osmocom/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 e0cec05..705f6b2 100644
--- a/src/hnbap/AccessResult.c
+++ b/src/hnbap/AccessResult.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/AccessResult.h>
+#include <osmocom/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 5360e51..7049be2 100644
--- a/src/hnbap/AdditionalNeighbourInfoList.c
+++ b/src/hnbap/AdditionalNeighbourInfoList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/AdditionalNeighbourInfoList.h>
+#include <osmocom/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/AltitudeAndDirection.c b/src/hnbap/AltitudeAndDirection.c
index d1fceee..afc4f6e 100644
--- a/src/hnbap/AltitudeAndDirection.c
+++ b/src/hnbap/AltitudeAndDirection.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/AltitudeAndDirection.h>
+#include <osmocom/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 4057807..81f0b56 100644
--- a/src/hnbap/BackoffTimer.c
+++ b/src/hnbap/BackoffTimer.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/BackoffTimer.h>
+#include <osmocom/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 6ba857c..b806fdf 100644
--- a/src/hnbap/BindingID.c
+++ b/src/hnbap/BindingID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/BindingID.h>
+#include <osmocom/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 eb026c0..0ef8524 100644
--- a/src/hnbap/CELL-FACHMobilitySupport.c
+++ b/src/hnbap/CELL-FACHMobilitySupport.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CELL-FACHMobilitySupport.h>
+#include <osmocom/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 d7ea770..e4b5683 100644
--- a/src/hnbap/CGI.c
+++ b/src/hnbap/CGI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CGI.h>
+#include <osmocom/hnbap/CGI.h>
 
 static asn_TYPE_member_t asn_MBR_CGI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct CGI, pLMNidentity),
diff --git a/src/hnbap/CI.c b/src/hnbap/CI.c
index d028842..efe1b91 100644
--- a/src/hnbap/CI.c
+++ b/src/hnbap/CI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CI.h>
+#include <osmocom/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 effdf66..aad8d8f 100644
--- a/src/hnbap/CN-DomainIndicator.c
+++ b/src/hnbap/CN-DomainIndicator.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CN-DomainIndicator.h>
+#include <osmocom/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 acd31fd..b451923 100644
--- a/src/hnbap/CSG-Capability.c
+++ b/src/hnbap/CSG-Capability.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CSG-Capability.h>
+#include <osmocom/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 89720c3..2be0029 100644
--- a/src/hnbap/CSG-ID.c
+++ b/src/hnbap/CSG-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CSG-ID.h>
+#include <osmocom/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 2259429..9c672e4 100644
--- a/src/hnbap/CSGMembershipStatus.c
+++ b/src/hnbap/CSGMembershipStatus.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CSGMembershipStatus.h>
+#include <osmocom/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 6277a68..d33562a 100644
--- a/src/hnbap/CSGMembershipUpdate.c
+++ b/src/hnbap/CSGMembershipUpdate.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CSGMembershipUpdate.h>
+#include <osmocom/hnbap/CSGMembershipUpdate.h>
 
 static int
 memb_csgMembershipUpdate_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Cause.c b/src/hnbap/Cause.c
index b0498ab..229ef51 100644
--- a/src/hnbap/Cause.c
+++ b/src/hnbap/Cause.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Cause.h>
+#include <osmocom/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/CauseMisc.c b/src/hnbap/CauseMisc.c
index 9626ed7..3ab86d8 100644
--- a/src/hnbap/CauseMisc.c
+++ b/src/hnbap/CauseMisc.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CauseMisc.h>
+#include <osmocom/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 01fe69d..0529318 100644
--- a/src/hnbap/CauseProtocol.c
+++ b/src/hnbap/CauseProtocol.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CauseProtocol.h>
+#include <osmocom/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 13b83e2..c7c1fd3 100644
--- a/src/hnbap/CauseRadioNetwork.c
+++ b/src/hnbap/CauseRadioNetwork.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CauseRadioNetwork.h>
+#include <osmocom/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 92a8d28..5af93bd 100644
--- a/src/hnbap/CauseTransport.c
+++ b/src/hnbap/CauseTransport.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CauseTransport.h>
+#include <osmocom/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 88459ae..e03dabf 100644
--- a/src/hnbap/CellIdentity.c
+++ b/src/hnbap/CellIdentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
+#include <osmocom/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 bc9f9d8..b9b7be3 100644
--- a/src/hnbap/ConfigurationInformation.c
+++ b/src/hnbap/ConfigurationInformation.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ConfigurationInformation.h>
+#include <osmocom/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/Context-ID.c b/src/hnbap/Context-ID.c
index 5fca828..9204c4c 100644
--- a/src/hnbap/Context-ID.c
+++ b/src/hnbap/Context-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Context-ID.h>
+#include <osmocom/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 801a88d..5aacb69 100644
--- a/src/hnbap/Criticality.c
+++ b/src/hnbap/Criticality.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/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 f90a9fa..b3f48e8 100644
--- a/src/hnbap/CriticalityDiagnostics-IE-List.c
+++ b/src/hnbap/CriticalityDiagnostics-IE-List.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics-IE-List.h>
+#include <osmocom/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.c b/src/hnbap/CriticalityDiagnostics.c
index 5332086..289ae3c 100644
--- a/src/hnbap/CriticalityDiagnostics.c
+++ b/src/hnbap/CriticalityDiagnostics.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics.h>
+#include <osmocom/hnbap/CriticalityDiagnostics.h>
 
 static asn_TYPE_member_t asn_MBR_CriticalityDiagnostics_1[] = {
 	{ ATF_POINTER, 5, offsetof(struct CriticalityDiagnostics, procedureCode),
diff --git a/src/hnbap/ESN.c b/src/hnbap/ESN.c
index c442c25..1f04d0c 100644
--- a/src/hnbap/ESN.c
+++ b/src/hnbap/ESN.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ESN.h>
+#include <osmocom/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 f0ff6a7..9765617 100644
--- a/src/hnbap/ErrorIndication.c
+++ b/src/hnbap/ErrorIndication.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ErrorIndication.h>
+#include <osmocom/hnbap/ErrorIndication.h>
 
 static int
 memb_errorIndication_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/GTP-TEI.c b/src/hnbap/GTP-TEI.c
index 6e91ef7..e8cea0c 100644
--- a/src/hnbap/GTP-TEI.c
+++ b/src/hnbap/GTP-TEI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/GTP-TEI.h>
+#include <osmocom/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 7467dbd..329b709 100644
--- a/src/hnbap/GeographicalCoordinates.c
+++ b/src/hnbap/GeographicalCoordinates.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/GeographicalCoordinates.h>
+#include <osmocom/hnbap/GeographicalCoordinates.h>
 
 static int
 latitudeSign_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/GeographicalLocation.c b/src/hnbap/GeographicalLocation.c
index e4a07dc..a151db9 100644
--- a/src/hnbap/GeographicalLocation.c
+++ b/src/hnbap/GeographicalLocation.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/GeographicalLocation.h>
+#include <osmocom/hnbap/GeographicalLocation.h>
 
 static asn_TYPE_member_t asn_MBR_GeographicalLocation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct GeographicalLocation, geographicalCoordinates),
diff --git a/src/hnbap/HNB-Cell-Access-Mode.c b/src/hnbap/HNB-Cell-Access-Mode.c
index 1925813..ae2371b 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 <osmocom/osmo-iuh/hnbap/HNB-Cell-Access-Mode.h>
+#include <osmocom/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 0ee6816..20a4e5e 100644
--- a/src/hnbap/HNB-Cell-Identifier.c
+++ b/src/hnbap/HNB-Cell-Identifier.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Identifier.h>
+#include <osmocom/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-GWResponse.c b/src/hnbap/HNB-GWResponse.c
index a220d39..add7821 100644
--- a/src/hnbap/HNB-GWResponse.c
+++ b/src/hnbap/HNB-GWResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-GWResponse.h>
+#include <osmocom/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-Identity-Info.c b/src/hnbap/HNB-Identity-Info.c
index 163730d..51e9f0f 100644
--- a/src/hnbap/HNB-Identity-Info.c
+++ b/src/hnbap/HNB-Identity-Info.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-Identity-Info.h>
+#include <osmocom/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 2389407..a442f1a 100644
--- a/src/hnbap/HNB-Identity.c
+++ b/src/hnbap/HNB-Identity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-Identity.h>
+#include <osmocom/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-Location-Information.c b/src/hnbap/HNB-Location-Information.c
index a025eda..eba9787 100644
--- a/src/hnbap/HNB-Location-Information.c
+++ b/src/hnbap/HNB-Location-Information.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-Location-Information.h>
+#include <osmocom/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-RNL-Identity.c b/src/hnbap/HNB-RNL-Identity.c
index 23b0ed1..3a51832 100644
--- a/src/hnbap/HNB-RNL-Identity.c
+++ b/src/hnbap/HNB-RNL-Identity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/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/HNBAP-PDU.c b/src/hnbap/HNBAP-PDU.c
index 2661ba2..998a1d2 100644
--- a/src/hnbap/HNBAP-PDU.c
+++ b/src/hnbap/HNBAP-PDU.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBAP-PDU.h>
+#include <osmocom/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/HNBCapacity.c b/src/hnbap/HNBCapacity.c
index 535fab4..0d58c65 100644
--- a/src/hnbap/HNBCapacity.c
+++ b/src/hnbap/HNBCapacity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBCapacity.h>
+#include <osmocom/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 8cdd461..06c7798 100644
--- a/src/hnbap/HNBConfigInfo.c
+++ b/src/hnbap/HNBConfigInfo.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
+#include <osmocom/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/HNBConfigTransferRequest.c b/src/hnbap/HNBConfigTransferRequest.c
index 2e087ca..db119a2 100644
--- a/src/hnbap/HNBConfigTransferRequest.c
+++ b/src/hnbap/HNBConfigTransferRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferRequest.h>
+#include <osmocom/hnbap/HNBConfigTransferRequest.h>
 
 static int
 memb_hnbConfigTransferRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBConfigTransferResponse.c b/src/hnbap/HNBConfigTransferResponse.c
index 4630f0b..116758d 100644
--- a/src/hnbap/HNBConfigTransferResponse.c
+++ b/src/hnbap/HNBConfigTransferResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferResponse.h>
+#include <osmocom/hnbap/HNBConfigTransferResponse.h>
 
 static int
 memb_hnbConfigTransferResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBConfigurationInformationMissing.c b/src/hnbap/HNBConfigurationInformationMissing.c
index fec67a6..0b41f92 100644
--- a/src/hnbap/HNBConfigurationInformationMissing.c
+++ b/src/hnbap/HNBConfigurationInformationMissing.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationMissing.h>
+#include <osmocom/hnbap/HNBConfigurationInformationMissing.h>
 
 static asn_TYPE_member_t asn_MBR_HNBConfigurationInformationMissing_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct HNBConfigurationInformationMissing, cause),
diff --git a/src/hnbap/HNBConfigurationInformationProvided.c b/src/hnbap/HNBConfigurationInformationProvided.c
index baa6f71..4957fba 100644
--- a/src/hnbap/HNBConfigurationInformationProvided.c
+++ b/src/hnbap/HNBConfigurationInformationProvided.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationProvided.h>
+#include <osmocom/hnbap/HNBConfigurationInformationProvided.h>
 
 static asn_TYPE_member_t asn_MBR_HNBConfigurationInformationProvided_1[] = {
 	{ ATF_POINTER, 2, offsetof(struct HNBConfigurationInformationProvided, psc),
diff --git a/src/hnbap/HNBDe-Register.c b/src/hnbap/HNBDe-Register.c
index f99634c..f31e842 100644
--- a/src/hnbap/HNBDe-Register.c
+++ b/src/hnbap/HNBDe-Register.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBDe-Register.h>
+#include <osmocom/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/HNBRegisterAccept.c b/src/hnbap/HNBRegisterAccept.c
index 3dd7189..37f2332 100644
--- a/src/hnbap/HNBRegisterAccept.c
+++ b/src/hnbap/HNBRegisterAccept.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBRegisterAccept.h>
+#include <osmocom/hnbap/HNBRegisterAccept.h>
 
 static int
 memb_hnbRegisterAccept_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBRegisterReject.c b/src/hnbap/HNBRegisterReject.c
index 7447a28..077db72 100644
--- a/src/hnbap/HNBRegisterReject.c
+++ b/src/hnbap/HNBRegisterReject.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBRegisterReject.h>
+#include <osmocom/hnbap/HNBRegisterReject.h>
 
 static int
 memb_hnbRegisterReject_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBRegisterRequest.c b/src/hnbap/HNBRegisterRequest.c
index 92aa0a8..9b58f9c 100644
--- a/src/hnbap/HNBRegisterRequest.c
+++ b/src/hnbap/HNBRegisterRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBRegisterRequest.h>
+#include <osmocom/hnbap/HNBRegisterRequest.h>
 
 static int
 memb_hnbRegisterRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/IE-Extensions.c b/src/hnbap/IE-Extensions.c
index f8d3e10..67db752 100644
--- a/src/hnbap/IE-Extensions.c
+++ b/src/hnbap/IE-Extensions.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/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.c b/src/hnbap/IE.c
index fc9c45e..5e6763a 100644
--- a/src/hnbap/IE.c
+++ b/src/hnbap/IE.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
 
 static asn_TYPE_member_t asn_MBR_IE_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct IE, id),
diff --git a/src/hnbap/IMEI.c b/src/hnbap/IMEI.c
index 8e5ce2c..a920c59 100644
--- a/src/hnbap/IMEI.c
+++ b/src/hnbap/IMEI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IMEI.h>
+#include <osmocom/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 2bb1f3d..9b5f2da 100644
--- a/src/hnbap/IMSI.c
+++ b/src/hnbap/IMSI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IMSI.h>
+#include <osmocom/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 c7547c9..b2ebdbd 100644
--- a/src/hnbap/IMSIDS41.c
+++ b/src/hnbap/IMSIDS41.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
+#include <osmocom/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 19fd7b9..31425ea 100644
--- a/src/hnbap/IMSIESN.c
+++ b/src/hnbap/IMSIESN.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IMSIESN.h>
+#include <osmocom/hnbap/IMSIESN.h>
 
 static asn_TYPE_member_t asn_MBR_IMSIESN_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct IMSIESN, iMSIDS41),
diff --git a/src/hnbap/IP-Address.c b/src/hnbap/IP-Address.c
index 0b3b94e..ee977b4 100644
--- a/src/hnbap/IP-Address.c
+++ b/src/hnbap/IP-Address.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
+#include <osmocom/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/InitiatingMessage.c b/src/hnbap/InitiatingMessage.c
index 144f211..c165290 100644
--- a/src/hnbap/InitiatingMessage.c
+++ b/src/hnbap/InitiatingMessage.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/InitiatingMessage.h>
+#include <osmocom/hnbap/InitiatingMessage.h>
 
 static asn_TYPE_member_t asn_MBR_InitiatingMessage_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct InitiatingMessage, procedureCode),
diff --git a/src/hnbap/Ipv4Address.c b/src/hnbap/Ipv4Address.c
index 7bf96f8..b56a5a5 100644
--- a/src/hnbap/Ipv4Address.c
+++ b/src/hnbap/Ipv4Address.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Ipv4Address.h>
+#include <osmocom/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 f9b7e43..5be471f 100644
--- a/src/hnbap/Ipv6Address.c
+++ b/src/hnbap/Ipv6Address.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Ipv6Address.h>
+#include <osmocom/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 2ac7bb2..f418eb1 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 <osmocom/osmo-iuh/hnbap/Iurh-Signalling-TNL-AddressList.h>
+#include <osmocom/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/LAC.c b/src/hnbap/LAC.c
index 850fab5..a46147f 100644
--- a/src/hnbap/LAC.c
+++ b/src/hnbap/LAC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/LAC.h>
+#include <osmocom/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 43e20d2..1bb23c1 100644
--- a/src/hnbap/LAI.c
+++ b/src/hnbap/LAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/LAI.h>
+#include <osmocom/hnbap/LAI.h>
 
 static asn_TYPE_member_t asn_MBR_LAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct LAI, pLMNID),
diff --git a/src/hnbap/MacroCellID.c b/src/hnbap/MacroCellID.c
index 90e4b86..215a54e 100644
--- a/src/hnbap/MacroCellID.c
+++ b/src/hnbap/MacroCellID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/MacroCellID.h>
+#include <osmocom/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/MacroCoverageInformation.c b/src/hnbap/MacroCoverageInformation.c
index 40716ae..a60f41c 100644
--- a/src/hnbap/MacroCoverageInformation.c
+++ b/src/hnbap/MacroCoverageInformation.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/MacroCoverageInformation.h>
+#include <osmocom/hnbap/MacroCoverageInformation.h>
 
 static asn_TYPE_member_t asn_MBR_MacroCoverageInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct MacroCoverageInformation, cellIdentity),
diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am
index c918dc6..1b05050 100644
--- a/src/hnbap/Makefile.am
+++ b/src/hnbap/Makefile.am
@@ -245,4 +245,4 @@
 #	remove the local copy of the runtime code
 	-rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.*
 #	change include style to `#include <dir/foo.h>'
-	../../move-asn1-header-files.sh osmocom/osmo-iuh/hnbap $(ASN_MODULE_INC)
+	../../move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC)
diff --git a/src/hnbap/MuxPortNumber.c b/src/hnbap/MuxPortNumber.c
index 11045d1..32e88f8 100644
--- a/src/hnbap/MuxPortNumber.c
+++ b/src/hnbap/MuxPortNumber.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/MuxPortNumber.h>
+#include <osmocom/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 822c8c4..147780a 100644
--- a/src/hnbap/NeighbourCellIdentityList.c
+++ b/src/hnbap/NeighbourCellIdentityList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourCellIdentityList.h>
+#include <osmocom/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/NeighbourIdentity.c b/src/hnbap/NeighbourIdentity.c
index 7b91d61..0b23df9 100644
--- a/src/hnbap/NeighbourIdentity.c
+++ b/src/hnbap/NeighbourIdentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourIdentity.h>
+#include <osmocom/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/NeighbourInfoList.c b/src/hnbap/NeighbourInfoList.c
index 6ab0861..457a208 100644
--- a/src/hnbap/NeighbourInfoList.c
+++ b/src/hnbap/NeighbourInfoList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoList.h>
+#include <osmocom/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/NeighbourInfoRequestItem.c b/src/hnbap/NeighbourInfoRequestItem.c
index 3c9d323..0db194c 100644
--- a/src/hnbap/NeighbourInfoRequestItem.c
+++ b/src/hnbap/NeighbourInfoRequestItem.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestItem.h>
+#include <osmocom/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/NeighbourInfoRequestList.c b/src/hnbap/NeighbourInfoRequestList.c
index 7c44216..20c786e 100644
--- a/src/hnbap/NeighbourInfoRequestList.c
+++ b/src/hnbap/NeighbourInfoRequestList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestList.h>
+#include <osmocom/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/PLMNidentity.c b/src/hnbap/PLMNidentity.c
index 2e6ca1b..8356b6c 100644
--- a/src/hnbap/PLMNidentity.c
+++ b/src/hnbap/PLMNidentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
+#include <osmocom/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 1a3eb96..378f09f 100644
--- a/src/hnbap/PSC.c
+++ b/src/hnbap/PSC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PSC.h>
+#include <osmocom/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 9483033..3b37f57 100644
--- a/src/hnbap/PTMSI.c
+++ b/src/hnbap/PTMSI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PTMSI.h>
+#include <osmocom/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 100ce33..d592ee1 100644
--- a/src/hnbap/PTMSIRAI.c
+++ b/src/hnbap/PTMSIRAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PTMSIRAI.h>
+#include <osmocom/hnbap/PTMSIRAI.h>
 
 static asn_TYPE_member_t asn_MBR_PTMSIRAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct PTMSIRAI, pTMSI),
diff --git a/src/hnbap/Presence.c b/src/hnbap/Presence.c
index 0145b55..f27cca7 100644
--- a/src/hnbap/Presence.c
+++ b/src/hnbap/Presence.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Presence.h>
+#include <osmocom/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 d1abb8e..183852e 100644
--- a/src/hnbap/PrivateIE-ID.c
+++ b/src/hnbap/PrivateIE-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PrivateIE-ID.h>
+#include <osmocom/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 e977d28..52eb933 100644
--- a/src/hnbap/PrivateMessage.c
+++ b/src/hnbap/PrivateMessage.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PrivateMessage.h>
+#include <osmocom/hnbap/PrivateMessage.h>
 
 static int
 memb_privateMessage_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/ProcedureCode.c b/src/hnbap/ProcedureCode.c
index daa9700..2f95db7 100644
--- a/src/hnbap/ProcedureCode.c
+++ b/src/hnbap/ProcedureCode.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
+#include <osmocom/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 f354abe..c0a3681 100644
--- a/src/hnbap/ProtocolIE-ID.c
+++ b/src/hnbap/ProtocolIE-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
+#include <osmocom/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 2258617..47d8905 100644
--- a/src/hnbap/RAB-ID.c
+++ b/src/hnbap/RAB-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RAB-ID.h>
+#include <osmocom/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 095d758..393dcfb 100644
--- a/src/hnbap/RABList.c
+++ b/src/hnbap/RABList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RABList.h>
+#include <osmocom/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/RABListItem.c b/src/hnbap/RABListItem.c
index 9c9bc52..b4e3da7 100644
--- a/src/hnbap/RABListItem.c
+++ b/src/hnbap/RABListItem.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RABListItem.h>
+#include <osmocom/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/RAC.c b/src/hnbap/RAC.c
index aca374a..04f0601 100644
--- a/src/hnbap/RAC.c
+++ b/src/hnbap/RAC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RAC.h>
+#include <osmocom/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 2259163..3591129 100644
--- a/src/hnbap/RAI.c
+++ b/src/hnbap/RAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RAI.h>
+#include <osmocom/hnbap/RAI.h>
 
 static asn_TYPE_member_t asn_MBR_RAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RAI, lAI),
diff --git a/src/hnbap/RNC-ID.c b/src/hnbap/RNC-ID.c
index 1005f39..782a7e4 100644
--- a/src/hnbap/RNC-ID.c
+++ b/src/hnbap/RNC-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RNC-ID.h>
+#include <osmocom/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 00c3561..6b05441 100644
--- a/src/hnbap/Registration-Cause.c
+++ b/src/hnbap/Registration-Cause.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Registration-Cause.h>
+#include <osmocom/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 2fd8bce..5438cd0 100644
--- a/src/hnbap/RelocationComplete.c
+++ b/src/hnbap/RelocationComplete.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RelocationComplete.h>
+#include <osmocom/hnbap/RelocationComplete.h>
 
 static int
 memb_relocationComplete_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/S-RNTIPrefix.c b/src/hnbap/S-RNTIPrefix.c
index 042ce57..1601eb4 100644
--- a/src/hnbap/S-RNTIPrefix.c
+++ b/src/hnbap/S-RNTIPrefix.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/S-RNTIPrefix.h>
+#include <osmocom/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 0a5a023..f52edb9 100644
--- a/src/hnbap/SAC.c
+++ b/src/hnbap/SAC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/SAC.h>
+#include <osmocom/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 8c8f95b..910f5a9 100644
--- a/src/hnbap/SuccessfulOutcome.c
+++ b/src/hnbap/SuccessfulOutcome.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/SuccessfulOutcome.h>
+#include <osmocom/hnbap/SuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_SuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct SuccessfulOutcome, procedureCode),
diff --git a/src/hnbap/TMSIDS41.c b/src/hnbap/TMSIDS41.c
index 6e003a0..3e3c4b3 100644
--- a/src/hnbap/TMSIDS41.c
+++ b/src/hnbap/TMSIDS41.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TMSIDS41.h>
+#include <osmocom/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 8fe7cd6..83bbe0f 100644
--- a/src/hnbap/TMSILAI.c
+++ b/src/hnbap/TMSILAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TMSILAI.h>
+#include <osmocom/hnbap/TMSILAI.h>
 
 static int
 memb_tMSI_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TNLUpdateFailure.c b/src/hnbap/TNLUpdateFailure.c
index 8ba33b8..182de3d 100644
--- a/src/hnbap/TNLUpdateFailure.c
+++ b/src/hnbap/TNLUpdateFailure.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TNLUpdateFailure.h>
+#include <osmocom/hnbap/TNLUpdateFailure.h>
 
 static int
 memb_tnlUpdateFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TNLUpdateRequest.c b/src/hnbap/TNLUpdateRequest.c
index 9edfa65..b5583a6 100644
--- a/src/hnbap/TNLUpdateRequest.c
+++ b/src/hnbap/TNLUpdateRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TNLUpdateRequest.h>
+#include <osmocom/hnbap/TNLUpdateRequest.h>
 
 static int
 memb_tnlUpdateRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TNLUpdateResponse.c b/src/hnbap/TNLUpdateResponse.c
index 77123a7..ade010b 100644
--- a/src/hnbap/TNLUpdateResponse.c
+++ b/src/hnbap/TNLUpdateResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TNLUpdateResponse.h>
+#include <osmocom/hnbap/TNLUpdateResponse.h>
 
 static int
 memb_tnlUpdateResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TransportInfo.c b/src/hnbap/TransportInfo.c
index a1d383e..ee6ed1c 100644
--- a/src/hnbap/TransportInfo.c
+++ b/src/hnbap/TransportInfo.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TransportInfo.h>
+#include <osmocom/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/TransportLayerAddress.c b/src/hnbap/TransportLayerAddress.c
index d863b25..49de644 100644
--- a/src/hnbap/TransportLayerAddress.c
+++ b/src/hnbap/TransportLayerAddress.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TransportLayerAddress.h>
+#include <osmocom/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 a61090b..c50a487 100644
--- a/src/hnbap/TriggeringMessage.c
+++ b/src/hnbap/TriggeringMessage.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TriggeringMessage.h>
+#include <osmocom/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 6966335..4c52952 100644
--- a/src/hnbap/Tunnel-Information.c
+++ b/src/hnbap/Tunnel-Information.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Tunnel-Information.h>
+#include <osmocom/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/TypeOfError.c b/src/hnbap/TypeOfError.c
index f3e132e..8c234f3 100644
--- a/src/hnbap/TypeOfError.c
+++ b/src/hnbap/TypeOfError.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TypeOfError.h>
+#include <osmocom/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 3b1fd05..708bd87 100644
--- a/src/hnbap/U-RNTI.c
+++ b/src/hnbap/U-RNTI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/U-RNTI.h>
+#include <osmocom/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 986a083..f103d24 100644
--- a/src/hnbap/U-RNTIQueryRequest.c
+++ b/src/hnbap/U-RNTIQueryRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryRequest.h>
+#include <osmocom/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-RNTIQueryResponse.c b/src/hnbap/U-RNTIQueryResponse.c
index 0d00baa..121551d 100644
--- a/src/hnbap/U-RNTIQueryResponse.c
+++ b/src/hnbap/U-RNTIQueryResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryResponse.h>
+#include <osmocom/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/UDP-Port-Number.c b/src/hnbap/UDP-Port-Number.c
index 647e546..45a75bf 100644
--- a/src/hnbap/UDP-Port-Number.c
+++ b/src/hnbap/UDP-Port-Number.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UDP-Port-Number.h>
+#include <osmocom/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 7fc2384..041e99d 100644
--- a/src/hnbap/UE-Capabilities.c
+++ b/src/hnbap/UE-Capabilities.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UE-Capabilities.h>
+#include <osmocom/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-Identity.c b/src/hnbap/UE-Identity.c
index d354b76..604aba9 100644
--- a/src/hnbap/UE-Identity.c
+++ b/src/hnbap/UE-Identity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UE-Identity.h>
+#include <osmocom/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/UEDe-Register.c b/src/hnbap/UEDe-Register.c
index 0008839..3b06b8c 100644
--- a/src/hnbap/UEDe-Register.c
+++ b/src/hnbap/UEDe-Register.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UEDe-Register.h>
+#include <osmocom/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/UERegisterAccept.c b/src/hnbap/UERegisterAccept.c
index 87b15fd..1da47fe 100644
--- a/src/hnbap/UERegisterAccept.c
+++ b/src/hnbap/UERegisterAccept.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UERegisterAccept.h>
+#include <osmocom/hnbap/UERegisterAccept.h>
 
 static int
 memb_ueRegisterAccept_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UERegisterReject.c b/src/hnbap/UERegisterReject.c
index dd93ded..01b35d9 100644
--- a/src/hnbap/UERegisterReject.c
+++ b/src/hnbap/UERegisterReject.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UERegisterReject.h>
+#include <osmocom/hnbap/UERegisterReject.h>
 
 static int
 memb_ueRegisterReject_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UERegisterRequest.c b/src/hnbap/UERegisterRequest.c
index a0d51de..a076152 100644
--- a/src/hnbap/UERegisterRequest.c
+++ b/src/hnbap/UERegisterRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UERegisterRequest.h>
+#include <osmocom/hnbap/UERegisterRequest.h>
 
 static int
 memb_ueRegisterRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/URAIdentity.c b/src/hnbap/URAIdentity.c
index bdf7ea8..dd20ed6 100644
--- a/src/hnbap/URAIdentity.c
+++ b/src/hnbap/URAIdentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/URAIdentity.h>
+#include <osmocom/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 63f9702..0872cec 100644
--- a/src/hnbap/URAIdentityList.c
+++ b/src/hnbap/URAIdentityList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/URAIdentityList.h>
+#include <osmocom/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/UTRANCellID.c b/src/hnbap/UTRANCellID.c
index 2e61d55..c6b964c 100644
--- a/src/hnbap/UTRANCellID.c
+++ b/src/hnbap/UTRANCellID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UTRANCellID.h>
+#include <osmocom/hnbap/UTRANCellID.h>
 
 static asn_TYPE_member_t asn_MBR_UTRANCellID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct UTRANCellID, lAC),
diff --git a/src/hnbap/UnknownU-RNTIIndication.c b/src/hnbap/UnknownU-RNTIIndication.c
index 1dcbc16..c5d3613 100644
--- a/src/hnbap/UnknownU-RNTIIndication.c
+++ b/src/hnbap/UnknownU-RNTIIndication.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UnknownU-RNTIIndication.h>
+#include <osmocom/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 4689abb..4ea7963 100644
--- a/src/hnbap/UnsuccessfulOutcome.c
+++ b/src/hnbap/UnsuccessfulOutcome.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UnsuccessfulOutcome.h>
+#include <osmocom/hnbap/UnsuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_UnsuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct UnsuccessfulOutcome, procedureCode),
diff --git a/src/hnbap/Update-cause.c b/src/hnbap/Update-cause.c
index 60304fa..f49eae7 100644
--- a/src/hnbap/Update-cause.c
+++ b/src/hnbap/Update-cause.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Update-cause.h>
+#include <osmocom/hnbap/Update-cause.h>
 
 int
 Update_cause_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap_common.h b/src/hnbap_common.h
index bf92f20..25cb2f0 100644
--- a/src/hnbap_common.h
+++ b/src/hnbap_common.h
@@ -10,121 +10,121 @@
 #include <OBJECT_IDENTIFIER.h>
 #include <OCTET_STRING.h>
 
-#include <osmocom/osmo-iuh/hnbap/Access-stratum-release-indicator.h>
-#include <osmocom/osmo-iuh/hnbap/AccessResult.h>
-#include <osmocom/osmo-iuh/hnbap/AdditionalNeighbourInfoList.h>
-#include <osmocom/osmo-iuh/hnbap/AltitudeAndDirection.h>
-#include <osmocom/osmo-iuh/hnbap/BackoffTimer.h>
-#include <osmocom/osmo-iuh/hnbap/BindingID.h>
-#include <osmocom/osmo-iuh/hnbap/CELL-FACHMobilitySupport.h>
-#include <osmocom/osmo-iuh/hnbap/CGI.h>
-#include <osmocom/osmo-iuh/hnbap/CI.h>
-#include <osmocom/osmo-iuh/hnbap/CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/hnbap/CSG-Capability.h>
-#include <osmocom/osmo-iuh/hnbap/CSG-ID.h>
-#include <osmocom/osmo-iuh/hnbap/CSGMembershipStatus.h>
-#include <osmocom/osmo-iuh/hnbap/CSGMembershipUpdate.h>
-#include <osmocom/osmo-iuh/hnbap/Cause.h>
-#include <osmocom/osmo-iuh/hnbap/CauseMisc.h>
-#include <osmocom/osmo-iuh/hnbap/CauseProtocol.h>
-#include <osmocom/osmo-iuh/hnbap/CauseRadioNetwork.h>
-#include <osmocom/osmo-iuh/hnbap/CauseTransport.h>
-#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
-#include <osmocom/osmo-iuh/hnbap/ConfigurationInformation.h>
-#include <osmocom/osmo-iuh/hnbap/Context-ID.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
-#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics-IE-List.h>
-#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics.h>
-#include <osmocom/osmo-iuh/hnbap/ESN.h>
-#include <osmocom/osmo-iuh/hnbap/ErrorIndication.h>
-#include <osmocom/osmo-iuh/hnbap/GTP-TEI.h>
-#include <osmocom/osmo-iuh/hnbap/GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/hnbap/GeographicalLocation.h>
-#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Access-Mode.h>
-#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Identifier.h>
-#include <osmocom/osmo-iuh/hnbap/HNB-GWResponse.h>
-#include <osmocom/osmo-iuh/hnbap/HNB-Identity-Info.h>
-#include <osmocom/osmo-iuh/hnbap/HNB-Identity.h>
-#include <osmocom/osmo-iuh/hnbap/HNB-Location-Information.h>
-#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
-#include <osmocom/osmo-iuh/hnbap/HNBAP-PDU.h>
-#include <osmocom/osmo-iuh/hnbap/HNBCapacity.h>
-#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
-#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferRequest.h>
-#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferResponse.h>
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationMissing.h>
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationProvided.h>
-#include <osmocom/osmo-iuh/hnbap/HNBDe-Register.h>
-#include <osmocom/osmo-iuh/hnbap/HNBRegisterAccept.h>
-#include <osmocom/osmo-iuh/hnbap/HNBRegisterReject.h>
-#include <osmocom/osmo-iuh/hnbap/HNBRegisterRequest.h>
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
-#include <osmocom/osmo-iuh/hnbap/IE.h>
-#include <osmocom/osmo-iuh/hnbap/IMEI.h>
-#include <osmocom/osmo-iuh/hnbap/IMSI.h>
-#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
-#include <osmocom/osmo-iuh/hnbap/IMSIESN.h>
-#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
-#include <osmocom/osmo-iuh/hnbap/InitiatingMessage.h>
-#include <osmocom/osmo-iuh/hnbap/Ipv4Address.h>
-#include <osmocom/osmo-iuh/hnbap/Ipv6Address.h>
-#include <osmocom/osmo-iuh/hnbap/Iurh-Signalling-TNL-AddressList.h>
-#include <osmocom/osmo-iuh/hnbap/LAC.h>
-#include <osmocom/osmo-iuh/hnbap/LAI.h>
-#include <osmocom/osmo-iuh/hnbap/MacroCellID.h>
-#include <osmocom/osmo-iuh/hnbap/MacroCoverageInformation.h>
-#include <osmocom/osmo-iuh/hnbap/MuxPortNumber.h>
-#include <osmocom/osmo-iuh/hnbap/NeighbourCellIdentityList.h>
-#include <osmocom/osmo-iuh/hnbap/NeighbourIdentity.h>
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoList.h>
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestItem.h>
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestList.h>
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
-#include <osmocom/osmo-iuh/hnbap/PSC.h>
-#include <osmocom/osmo-iuh/hnbap/PTMSI.h>
-#include <osmocom/osmo-iuh/hnbap/PTMSIRAI.h>
-#include <osmocom/osmo-iuh/hnbap/Presence.h>
-#include <osmocom/osmo-iuh/hnbap/PrivateIE-ID.h>
-#include <osmocom/osmo-iuh/hnbap/PrivateMessage.h>
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
-#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/hnbap/RAB-ID.h>
-#include <osmocom/osmo-iuh/hnbap/RABList.h>
-#include <osmocom/osmo-iuh/hnbap/RABListItem.h>
-#include <osmocom/osmo-iuh/hnbap/RAC.h>
-#include <osmocom/osmo-iuh/hnbap/RAI.h>
-#include <osmocom/osmo-iuh/hnbap/RNC-ID.h>
-#include <osmocom/osmo-iuh/hnbap/Registration-Cause.h>
-#include <osmocom/osmo-iuh/hnbap/RelocationComplete.h>
-#include <osmocom/osmo-iuh/hnbap/S-RNTIPrefix.h>
-#include <osmocom/osmo-iuh/hnbap/SAC.h>
-#include <osmocom/osmo-iuh/hnbap/SuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/hnbap/TMSIDS41.h>
-#include <osmocom/osmo-iuh/hnbap/TMSILAI.h>
-#include <osmocom/osmo-iuh/hnbap/TNLUpdateFailure.h>
-#include <osmocom/osmo-iuh/hnbap/TNLUpdateRequest.h>
-#include <osmocom/osmo-iuh/hnbap/TNLUpdateResponse.h>
-#include <osmocom/osmo-iuh/hnbap/TransportInfo.h>
-#include <osmocom/osmo-iuh/hnbap/TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/hnbap/TriggeringMessage.h>
-#include <osmocom/osmo-iuh/hnbap/Tunnel-Information.h>
-#include <osmocom/osmo-iuh/hnbap/TypeOfError.h>
-#include <osmocom/osmo-iuh/hnbap/U-RNTI.h>
-#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryRequest.h>
-#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryResponse.h>
-#include <osmocom/osmo-iuh/hnbap/UDP-Port-Number.h>
-#include <osmocom/osmo-iuh/hnbap/UE-Capabilities.h>
-#include <osmocom/osmo-iuh/hnbap/UE-Identity.h>
-#include <osmocom/osmo-iuh/hnbap/UEDe-Register.h>
-#include <osmocom/osmo-iuh/hnbap/UERegisterAccept.h>
-#include <osmocom/osmo-iuh/hnbap/UERegisterReject.h>
-#include <osmocom/osmo-iuh/hnbap/UERegisterRequest.h>
-#include <osmocom/osmo-iuh/hnbap/URAIdentity.h>
-#include <osmocom/osmo-iuh/hnbap/URAIdentityList.h>
-#include <osmocom/osmo-iuh/hnbap/UTRANCellID.h>
-#include <osmocom/osmo-iuh/hnbap/UnknownU-RNTIIndication.h>
-#include <osmocom/osmo-iuh/hnbap/UnsuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/hnbap/Update-cause.h>
+#include <osmocom/hnbap/Access-stratum-release-indicator.h>
+#include <osmocom/hnbap/AccessResult.h>
+#include <osmocom/hnbap/AdditionalNeighbourInfoList.h>
+#include <osmocom/hnbap/AltitudeAndDirection.h>
+#include <osmocom/hnbap/BackoffTimer.h>
+#include <osmocom/hnbap/BindingID.h>
+#include <osmocom/hnbap/CELL-FACHMobilitySupport.h>
+#include <osmocom/hnbap/CGI.h>
+#include <osmocom/hnbap/CI.h>
+#include <osmocom/hnbap/CN-DomainIndicator.h>
+#include <osmocom/hnbap/CSG-Capability.h>
+#include <osmocom/hnbap/CSG-ID.h>
+#include <osmocom/hnbap/CSGMembershipStatus.h>
+#include <osmocom/hnbap/CSGMembershipUpdate.h>
+#include <osmocom/hnbap/Cause.h>
+#include <osmocom/hnbap/CauseMisc.h>
+#include <osmocom/hnbap/CauseProtocol.h>
+#include <osmocom/hnbap/CauseRadioNetwork.h>
+#include <osmocom/hnbap/CauseTransport.h>
+#include <osmocom/hnbap/CellIdentity.h>
+#include <osmocom/hnbap/ConfigurationInformation.h>
+#include <osmocom/hnbap/Context-ID.h>
+#include <osmocom/hnbap/Criticality.h>
+#include <osmocom/hnbap/CriticalityDiagnostics-IE-List.h>
+#include <osmocom/hnbap/CriticalityDiagnostics.h>
+#include <osmocom/hnbap/ESN.h>
+#include <osmocom/hnbap/ErrorIndication.h>
+#include <osmocom/hnbap/GTP-TEI.h>
+#include <osmocom/hnbap/GeographicalCoordinates.h>
+#include <osmocom/hnbap/GeographicalLocation.h>
+#include <osmocom/hnbap/HNB-Cell-Access-Mode.h>
+#include <osmocom/hnbap/HNB-Cell-Identifier.h>
+#include <osmocom/hnbap/HNB-GWResponse.h>
+#include <osmocom/hnbap/HNB-Identity-Info.h>
+#include <osmocom/hnbap/HNB-Identity.h>
+#include <osmocom/hnbap/HNB-Location-Information.h>
+#include <osmocom/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/hnbap/HNBAP-PDU.h>
+#include <osmocom/hnbap/HNBCapacity.h>
+#include <osmocom/hnbap/HNBConfigInfo.h>
+#include <osmocom/hnbap/HNBConfigTransferRequest.h>
+#include <osmocom/hnbap/HNBConfigTransferResponse.h>
+#include <osmocom/hnbap/HNBConfigurationInformationMissing.h>
+#include <osmocom/hnbap/HNBConfigurationInformationProvided.h>
+#include <osmocom/hnbap/HNBDe-Register.h>
+#include <osmocom/hnbap/HNBRegisterAccept.h>
+#include <osmocom/hnbap/HNBRegisterReject.h>
+#include <osmocom/hnbap/HNBRegisterRequest.h>
+#include <osmocom/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE.h>
+#include <osmocom/hnbap/IMEI.h>
+#include <osmocom/hnbap/IMSI.h>
+#include <osmocom/hnbap/IMSIDS41.h>
+#include <osmocom/hnbap/IMSIESN.h>
+#include <osmocom/hnbap/IP-Address.h>
+#include <osmocom/hnbap/InitiatingMessage.h>
+#include <osmocom/hnbap/Ipv4Address.h>
+#include <osmocom/hnbap/Ipv6Address.h>
+#include <osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h>
+#include <osmocom/hnbap/LAC.h>
+#include <osmocom/hnbap/LAI.h>
+#include <osmocom/hnbap/MacroCellID.h>
+#include <osmocom/hnbap/MacroCoverageInformation.h>
+#include <osmocom/hnbap/MuxPortNumber.h>
+#include <osmocom/hnbap/NeighbourCellIdentityList.h>
+#include <osmocom/hnbap/NeighbourIdentity.h>
+#include <osmocom/hnbap/NeighbourInfoList.h>
+#include <osmocom/hnbap/NeighbourInfoRequestItem.h>
+#include <osmocom/hnbap/NeighbourInfoRequestList.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/PSC.h>
+#include <osmocom/hnbap/PTMSI.h>
+#include <osmocom/hnbap/PTMSIRAI.h>
+#include <osmocom/hnbap/Presence.h>
+#include <osmocom/hnbap/PrivateIE-ID.h>
+#include <osmocom/hnbap/PrivateMessage.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/ProtocolIE-ID.h>
+#include <osmocom/hnbap/RAB-ID.h>
+#include <osmocom/hnbap/RABList.h>
+#include <osmocom/hnbap/RABListItem.h>
+#include <osmocom/hnbap/RAC.h>
+#include <osmocom/hnbap/RAI.h>
+#include <osmocom/hnbap/RNC-ID.h>
+#include <osmocom/hnbap/Registration-Cause.h>
+#include <osmocom/hnbap/RelocationComplete.h>
+#include <osmocom/hnbap/S-RNTIPrefix.h>
+#include <osmocom/hnbap/SAC.h>
+#include <osmocom/hnbap/SuccessfulOutcome.h>
+#include <osmocom/hnbap/TMSIDS41.h>
+#include <osmocom/hnbap/TMSILAI.h>
+#include <osmocom/hnbap/TNLUpdateFailure.h>
+#include <osmocom/hnbap/TNLUpdateRequest.h>
+#include <osmocom/hnbap/TNLUpdateResponse.h>
+#include <osmocom/hnbap/TransportInfo.h>
+#include <osmocom/hnbap/TransportLayerAddress.h>
+#include <osmocom/hnbap/TriggeringMessage.h>
+#include <osmocom/hnbap/Tunnel-Information.h>
+#include <osmocom/hnbap/TypeOfError.h>
+#include <osmocom/hnbap/U-RNTI.h>
+#include <osmocom/hnbap/U-RNTIQueryRequest.h>
+#include <osmocom/hnbap/U-RNTIQueryResponse.h>
+#include <osmocom/hnbap/UDP-Port-Number.h>
+#include <osmocom/hnbap/UE-Capabilities.h>
+#include <osmocom/hnbap/UE-Identity.h>
+#include <osmocom/hnbap/UEDe-Register.h>
+#include <osmocom/hnbap/UERegisterAccept.h>
+#include <osmocom/hnbap/UERegisterReject.h>
+#include <osmocom/hnbap/UERegisterRequest.h>
+#include <osmocom/hnbap/URAIdentity.h>
+#include <osmocom/hnbap/URAIdentityList.h>
+#include <osmocom/hnbap/UTRANCellID.h>
+#include <osmocom/hnbap/UnknownU-RNTIIndication.h>
+#include <osmocom/hnbap/UnsuccessfulOutcome.h>
+#include <osmocom/hnbap/Update-cause.h>
 
 #if (ASN1C_ENVIRONMENT_VERSION < 924)
 # error "You are compiling with the wrong version of ASN1C"
diff --git a/src/hnbgw_rua.h b/src/hnbgw_rua.h
index b775525..d170190 100644
--- a/src/hnbgw_rua.h
+++ b/src/hnbgw_rua.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "hnbgw.h"
-#include <osmocom/osmo-iuh/rua/RUA_Cause.h>
+#include <osmocom/rua/RUA_Cause.h>
 
 int hnbgw_rua_rx(struct hnb_context *hnb, struct msgb *msg);
 int hnbgw_rua_init(void);
diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am
index 316d760..5655dd0 100644
--- a/src/ranap/Makefile.am
+++ b/src/ranap/Makefile.am
@@ -1187,5 +1187,5 @@
 	sed -i 's/Member/MemberM/' RANAP_PLMNs-in-shared-network.[ch]
 	sed -i 's/Member/MemberN/' RANAP_RABDataVolumeReport.[ch]
 #	change include style to `#include <dir/foo.h>'
-	../../move-asn1-header-files.sh osmocom/osmo-iuh/ranap $(ASN_MODULE_INC)
+	../../move-asn1-header-files.sh osmocom/ranap $(ASN_MODULE_INC)
 
diff --git a/src/ranap/RANAP_APN.c b/src/ranap/RANAP_APN.c
index d95d882..d2024aa 100644
--- a/src/ranap/RANAP_APN.c
+++ b/src/ranap/RANAP_APN.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_APN.h>
+#include <osmocom/ranap/RANAP_APN.h>
 
 int
 RANAP_APN_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_AccuracyFulfilmentIndicator.c b/src/ranap/RANAP_AccuracyFulfilmentIndicator.c
index 5d636b0..d444558 100644
--- a/src/ranap/RANAP_AccuracyFulfilmentIndicator.c
+++ b/src/ranap/RANAP_AccuracyFulfilmentIndicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_AccuracyFulfilmentIndicator.h>
+#include <osmocom/ranap/RANAP_AccuracyFulfilmentIndicator.h>
 
 int
 RANAP_AccuracyFulfilmentIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_AllocationOrRetentionPriority.c b/src/ranap/RANAP_AllocationOrRetentionPriority.c
index 905a557..2997cd0 100644
--- a/src/ranap/RANAP_AllocationOrRetentionPriority.c
+++ b/src/ranap/RANAP_AllocationOrRetentionPriority.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_AllocationOrRetentionPriority.h>
+#include <osmocom/ranap/RANAP_AllocationOrRetentionPriority.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_AllocationOrRetentionPriority_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_AllocationOrRetentionPriority, priorityLevel),
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.c b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.c
index c65aa0e..d04fccf 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_Alt_RAB_Parameter_ExtendedGuaranteedBitrateInf, altExtendedGuaranteedBitrateType),
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.c b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.c
index 5370a1c..18b02f6 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_ExtendedGuaranteedBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.c b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.c
index bcdbd9a..2e35f50 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_ExtendedGuaranteedBitrates_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.c b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.c
index d8a89ae..4bab57d 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Alt_RAB_Parameter_ExtendedMaxBitrateInf_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_Alt_RAB_Parameter_ExtendedMaxBitrateInf, altExtendedMaxBitrateType),
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.c b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.c
index dfb178b..9eb3a2b 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_ExtendedMaxBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.c b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.c
index 7059065..dccb6c5 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_ExtendedMaxBitrates_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.c b/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.c
index 573d561..878b8d0 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Alt_RAB_Parameter_GuaranteedBitrateInf_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_Alt_RAB_Parameter_GuaranteedBitrateInf, altGuaranteedBitrateType),
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.c b/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.c
index 1d8458b..9e717cc 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_GuaranteedBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.c b/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.c
index 6564c4e..6d56142 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
 
 int
 RANAP_Alt_RAB_Parameter_GuaranteedBitrateType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.c b/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.c
index 7334b36..6fa5614 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_GuaranteedBitrates_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.c b/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.c
index 1888588..bc5633e 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Alt_RAB_Parameter_MaxBitrateInf_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_Alt_RAB_Parameter_MaxBitrateInf, altMaxBitrateType),
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.c b/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.c
index 2aef026..3e2271b 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_MaxBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.c b/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.c
index 3244d91..6899fe4 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
 
 int
 RANAP_Alt_RAB_Parameter_MaxBitrateType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.c b/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.c
index 76b19af..31bcbcd 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_MaxBitrates_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.c b/src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.c
index 6b752bd..c70e610 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Alt_RAB_Parameter_SupportedGuaranteedBitrateInf_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_Alt_RAB_Parameter_SupportedGuaranteedBitrateInf, altSupportedGuaranteedBitrateType),
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.c b/src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.c
index 33eefbf..6baa771 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_SupportedGuaranteedBitrates_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.c b/src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.c
index 5b46895..6a5ad4d 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Alt_RAB_Parameter_SupportedMaxBitrateInf_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_Alt_RAB_Parameter_SupportedMaxBitrateInf, altSupportedMaxBitrateType),
diff --git a/src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c b/src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c
index 0a8905c..1a9bb37 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Alt_RAB_Parameter_SupportedMaxBitrates_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Alt-RAB-Parameters.c b/src/ranap/RANAP_Alt-RAB-Parameters.c
index 5e1314a..f6da356 100644
--- a/src/ranap/RANAP_Alt-RAB-Parameters.c
+++ b/src/ranap/RANAP_Alt-RAB-Parameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameters.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Alt_RAB_Parameters_1[] = {
 	{ ATF_POINTER, 3, offsetof(struct RANAP_Alt_RAB_Parameters, altMaxBitrateInf),
diff --git a/src/ranap/RANAP_AlternativeRABConfigurationRequest.c b/src/ranap/RANAP_AlternativeRABConfigurationRequest.c
index 6ac1385..238d6e1 100644
--- a/src/ranap/RANAP_AlternativeRABConfigurationRequest.c
+++ b/src/ranap/RANAP_AlternativeRABConfigurationRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_AlternativeRABConfigurationRequest.h>
+#include <osmocom/ranap/RANAP_AlternativeRABConfigurationRequest.h>
 
 int
 RANAP_AlternativeRABConfigurationRequest_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_AreaIdentity.c b/src/ranap/RANAP_AreaIdentity.c
index b519101..c774c21 100644
--- a/src/ranap/RANAP_AreaIdentity.c
+++ b/src/ranap/RANAP_AreaIdentity.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_AreaIdentity.h>
+#include <osmocom/ranap/RANAP_AreaIdentity.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_AreaIdentity_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.c b/src/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.c
index d6d5609..3c97828 100644
--- a/src/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.c
+++ b/src/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Ass_RAB_Parameter_ExtendedGuaranteedBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.c b/src/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.c
index cdbf4bd..80d0ed8 100644
--- a/src/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.c
+++ b/src/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Ass_RAB_Parameter_ExtendedMaxBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c b/src/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c
index 308e747..0797012 100644
--- a/src/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c
+++ b/src/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Ass_RAB_Parameter_GuaranteedBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.c b/src/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.c
index a5f7c2c..e1f9f92 100644
--- a/src/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.c
+++ b/src/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Ass_RAB_Parameter_MaxBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Ass-RAB-Parameters.c b/src/ranap/RANAP_Ass-RAB-Parameters.c
index e3a0acf..18018ff 100644
--- a/src/ranap/RANAP_Ass-RAB-Parameters.c
+++ b/src/ranap/RANAP_Ass-RAB-Parameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameters.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Ass_RAB_Parameters_1[] = {
 	{ ATF_POINTER, 3, offsetof(struct RANAP_Ass_RAB_Parameters, assMaxBitrateInf),
diff --git a/src/ranap/RANAP_AuthorisedPLMNs.c b/src/ranap/RANAP_AuthorisedPLMNs.c
index b5357cd..b25c22e 100644
--- a/src/ranap/RANAP_AuthorisedPLMNs.c
+++ b/src/ranap/RANAP_AuthorisedPLMNs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedPLMNs.h>
+#include <osmocom/ranap/RANAP_AuthorisedPLMNs.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_AuthorisedPLMNs_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_AuthorisedSNAs.c b/src/ranap/RANAP_AuthorisedSNAs.c
index a3366a8..9514dc3 100644
--- a/src/ranap/RANAP_AuthorisedSNAs.c
+++ b/src/ranap/RANAP_AuthorisedSNAs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedSNAs.h>
+#include <osmocom/ranap/RANAP_AuthorisedSNAs.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_AuthorisedSNAs_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_BindingID.c b/src/ranap/RANAP_BindingID.c
index 7d43ab1..d79da49 100644
--- a/src/ranap/RANAP_BindingID.c
+++ b/src/ranap/RANAP_BindingID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_BindingID.h>
+#include <osmocom/ranap/RANAP_BindingID.h>
 
 int
 RANAP_BindingID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.c b/src/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.c
index 85ffa0d..e16fdbb 100644
--- a/src/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.c
+++ b/src/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h>
+#include <osmocom/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h>
 
 static int
 memb_cipheringKeyFlag_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CGI.c b/src/ranap/RANAP_CGI.c
index aad502a..2d08bce 100644
--- a/src/ranap/RANAP_CGI.c
+++ b/src/ranap/RANAP_CGI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CGI.h>
+#include <osmocom/ranap/RANAP_CGI.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_CGI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_CGI, pLMNidentity),
diff --git a/src/ranap/RANAP_CI.c b/src/ranap/RANAP_CI.c
index bd95258..ed83b75 100644
--- a/src/ranap/RANAP_CI.c
+++ b/src/ranap/RANAP_CI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CI.h>
+#include <osmocom/ranap/RANAP_CI.h>
 
 int
 RANAP_CI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CN-DeactivateTrace.c b/src/ranap/RANAP_CN-DeactivateTrace.c
index 50f5a60..ba7fb6f 100644
--- a/src/ranap/RANAP_CN-DeactivateTrace.c
+++ b/src/ranap/RANAP_CN-DeactivateTrace.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DeactivateTrace.h>
+#include <osmocom/ranap/RANAP_CN-DeactivateTrace.h>
 
 static int
 memb_cN_DeactivateTrace_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CN-DomainIndicator.c b/src/ranap/RANAP_CN-DomainIndicator.c
index f5e4443..b5b9d10 100644
--- a/src/ranap/RANAP_CN-DomainIndicator.c
+++ b/src/ranap/RANAP_CN-DomainIndicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
 
 int
 RANAP_CN_DomainIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CN-ID.c b/src/ranap/RANAP_CN-ID.c
index ba95ee8..f181580 100644
--- a/src/ranap/RANAP_CN-ID.c
+++ b/src/ranap/RANAP_CN-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-ID.h>
+#include <osmocom/ranap/RANAP_CN-ID.h>
 
 int
 RANAP_CN_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CN-InvokeTrace.c b/src/ranap/RANAP_CN-InvokeTrace.c
index 44a4c25..4e50b42 100644
--- a/src/ranap/RANAP_CN-InvokeTrace.c
+++ b/src/ranap/RANAP_CN-InvokeTrace.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-InvokeTrace.h>
+#include <osmocom/ranap/RANAP_CN-InvokeTrace.h>
 
 static int
 memb_cN_InvokeTrace_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CNMBMSLinkingInformation.c b/src/ranap/RANAP_CNMBMSLinkingInformation.c
index 1478648..3e724fe 100644
--- a/src/ranap/RANAP_CNMBMSLinkingInformation.c
+++ b/src/ranap/RANAP_CNMBMSLinkingInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CNMBMSLinkingInformation.h>
+#include <osmocom/ranap/RANAP_CNMBMSLinkingInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_CNMBMSLinkingInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_CNMBMSLinkingInformation, joinedMBMSBearerService_IEs),
diff --git a/src/ranap/RANAP_CSFB-Information.c b/src/ranap/RANAP_CSFB-Information.c
index c926b18..434b1ad 100644
--- a/src/ranap/RANAP_CSFB-Information.c
+++ b/src/ranap/RANAP_CSFB-Information.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CSFB-Information.h>
+#include <osmocom/ranap/RANAP_CSFB-Information.h>
 
 int
 RANAP_CSFB_Information_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CSG-Id-List.c b/src/ranap/RANAP_CSG-Id-List.c
index 4c11df2..5d58575 100644
--- a/src/ranap/RANAP_CSG-Id-List.c
+++ b/src/ranap/RANAP_CSG-Id-List.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Id-List.h>
+#include <osmocom/ranap/RANAP_CSG-Id-List.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_CSG_Id_List_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_CSG-Id.c b/src/ranap/RANAP_CSG-Id.c
index 1b1642c..0699dc6 100644
--- a/src/ranap/RANAP_CSG-Id.c
+++ b/src/ranap/RANAP_CSG-Id.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Id.h>
+#include <osmocom/ranap/RANAP_CSG-Id.h>
 
 int
 RANAP_CSG_Id_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CSG-Membership-Status.c b/src/ranap/RANAP_CSG-Membership-Status.c
index 3d68639..8ddf050 100644
--- a/src/ranap/RANAP_CSG-Membership-Status.c
+++ b/src/ranap/RANAP_CSG-Membership-Status.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Membership-Status.h>
+#include <osmocom/ranap/RANAP_CSG-Membership-Status.h>
 
 int
 RANAP_CSG_Membership_Status_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Cause.c b/src/ranap/RANAP_Cause.c
index 4bb87a5..3e688cc 100644
--- a/src/ranap/RANAP_Cause.c
+++ b/src/ranap/RANAP_Cause.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_Cause.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Cause_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0l,  5l }	/* (0..5,...) */,
diff --git a/src/ranap/RANAP_CauseMisc.c b/src/ranap/RANAP_CauseMisc.c
index c8bc916..262c462 100644
--- a/src/ranap/RANAP_CauseMisc.c
+++ b/src/ranap/RANAP_CauseMisc.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseMisc.h>
+#include <osmocom/ranap/RANAP_CauseMisc.h>
 
 int
 RANAP_CauseMisc_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CauseNAS.c b/src/ranap/RANAP_CauseNAS.c
index e3f27e0..ea6fb82 100644
--- a/src/ranap/RANAP_CauseNAS.c
+++ b/src/ranap/RANAP_CauseNAS.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseNAS.h>
+#include <osmocom/ranap/RANAP_CauseNAS.h>
 
 int
 RANAP_CauseNAS_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CauseNon-Standard.c b/src/ranap/RANAP_CauseNon-Standard.c
index 43b98eb..1e75804 100644
--- a/src/ranap/RANAP_CauseNon-Standard.c
+++ b/src/ranap/RANAP_CauseNon-Standard.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseNon-Standard.h>
+#include <osmocom/ranap/RANAP_CauseNon-Standard.h>
 
 int
 RANAP_CauseNon_Standard_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CauseProtocol.c b/src/ranap/RANAP_CauseProtocol.c
index 8deb710..47b03f3 100644
--- a/src/ranap/RANAP_CauseProtocol.c
+++ b/src/ranap/RANAP_CauseProtocol.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseProtocol.h>
+#include <osmocom/ranap/RANAP_CauseProtocol.h>
 
 int
 RANAP_CauseProtocol_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CauseRadioNetwork.c b/src/ranap/RANAP_CauseRadioNetwork.c
index 8e8fb7c..32f9965 100644
--- a/src/ranap/RANAP_CauseRadioNetwork.c
+++ b/src/ranap/RANAP_CauseRadioNetwork.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetwork.h>
+#include <osmocom/ranap/RANAP_CauseRadioNetwork.h>
 
 int
 RANAP_CauseRadioNetwork_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CauseRadioNetworkExtension.c b/src/ranap/RANAP_CauseRadioNetworkExtension.c
index 435ca92..233d6b6 100644
--- a/src/ranap/RANAP_CauseRadioNetworkExtension.c
+++ b/src/ranap/RANAP_CauseRadioNetworkExtension.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetworkExtension.h>
+#include <osmocom/ranap/RANAP_CauseRadioNetworkExtension.h>
 
 int
 RANAP_CauseRadioNetworkExtension_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CauseTransmissionNetwork.c b/src/ranap/RANAP_CauseTransmissionNetwork.c
index 400995c..887589e 100644
--- a/src/ranap/RANAP_CauseTransmissionNetwork.c
+++ b/src/ranap/RANAP_CauseTransmissionNetwork.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseTransmissionNetwork.h>
+#include <osmocom/ranap/RANAP_CauseTransmissionNetwork.h>
 
 int
 RANAP_CauseTransmissionNetwork_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Cell-Access-Mode.c b/src/ranap/RANAP_Cell-Access-Mode.c
index c0c0bce..b9af5d1 100644
--- a/src/ranap/RANAP_Cell-Access-Mode.c
+++ b/src/ranap/RANAP_Cell-Access-Mode.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Access-Mode.h>
+#include <osmocom/ranap/RANAP_Cell-Access-Mode.h>
 
 int
 RANAP_Cell_Access_Mode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Cell-Capacity-Class-Value.c b/src/ranap/RANAP_Cell-Capacity-Class-Value.c
index e7508e3..2537ab4 100644
--- a/src/ranap/RANAP_Cell-Capacity-Class-Value.c
+++ b/src/ranap/RANAP_Cell-Capacity-Class-Value.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Capacity-Class-Value.h>
+#include <osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h>
 
 int
 RANAP_Cell_Capacity_Class_Value_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Cell-Id.c b/src/ranap/RANAP_Cell-Id.c
index c516ba4..49225b7 100644
--- a/src/ranap/RANAP_Cell-Id.c
+++ b/src/ranap/RANAP_Cell-Id.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Id.h>
+#include <osmocom/ranap/RANAP_Cell-Id.h>
 
 int
 RANAP_Cell_Id_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CellBased.c b/src/ranap/RANAP_CellBased.c
index 6cbd702..0428a07 100644
--- a/src/ranap/RANAP_CellBased.c
+++ b/src/ranap/RANAP_CellBased.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CellBased.h>
+#include <osmocom/ranap/RANAP_CellBased.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_CellBased_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_CellBased, cellIdList),
diff --git a/src/ranap/RANAP_CellIdList.c b/src/ranap/RANAP_CellIdList.c
index b1e2561..7a91269 100644
--- a/src/ranap/RANAP_CellIdList.c
+++ b/src/ranap/RANAP_CellIdList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CellIdList.h>
+#include <osmocom/ranap/RANAP_CellIdList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_CellIdList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_CellLoadInformation.c b/src/ranap/RANAP_CellLoadInformation.c
index 0f4fec0..b086b3d 100644
--- a/src/ranap/RANAP_CellLoadInformation.c
+++ b/src/ranap/RANAP_CellLoadInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformation.h>
+#include <osmocom/ranap/RANAP_CellLoadInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_CellLoadInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_CellLoadInformation, cell_Capacity_Class_Value),
diff --git a/src/ranap/RANAP_CellLoadInformationGroup.c b/src/ranap/RANAP_CellLoadInformationGroup.c
index 22c48e9..5c12990 100644
--- a/src/ranap/RANAP_CellLoadInformationGroup.c
+++ b/src/ranap/RANAP_CellLoadInformationGroup.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformationGroup.h>
+#include <osmocom/ranap/RANAP_CellLoadInformationGroup.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_CellLoadInformationGroup_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_CellLoadInformationGroup, sourceCellID),
diff --git a/src/ranap/RANAP_CellType.c b/src/ranap/RANAP_CellType.c
index 6d46223..e7047da 100644
--- a/src/ranap/RANAP_CellType.c
+++ b/src/ranap/RANAP_CellType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CellType.h>
+#include <osmocom/ranap/RANAP_CellType.h>
 
 int
 RANAP_CellType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ChosenEncryptionAlgorithm.c b/src/ranap/RANAP_ChosenEncryptionAlgorithm.c
index 3377525..de8f55c 100644
--- a/src/ranap/RANAP_ChosenEncryptionAlgorithm.c
+++ b/src/ranap/RANAP_ChosenEncryptionAlgorithm.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ChosenEncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h>
 
 int
 RANAP_ChosenEncryptionAlgorithm_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.c b/src/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.c
index b4b469f..a1b7f92 100644
--- a/src/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.c
+++ b/src/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h>
 
 int
 RANAP_ChosenIntegrityProtectionAlgorithm_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ClassmarkInformation2.c b/src/ranap/RANAP_ClassmarkInformation2.c
index e23eccf..69409e1 100644
--- a/src/ranap/RANAP_ClassmarkInformation2.c
+++ b/src/ranap/RANAP_ClassmarkInformation2.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ClassmarkInformation2.h>
+#include <osmocom/ranap/RANAP_ClassmarkInformation2.h>
 
 int
 RANAP_ClassmarkInformation2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ClassmarkInformation3.c b/src/ranap/RANAP_ClassmarkInformation3.c
index af1b397..4ec6abe 100644
--- a/src/ranap/RANAP_ClassmarkInformation3.c
+++ b/src/ranap/RANAP_ClassmarkInformation3.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ClassmarkInformation3.h>
+#include <osmocom/ranap/RANAP_ClassmarkInformation3.h>
 
 int
 RANAP_ClassmarkInformation3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ClientType.c b/src/ranap/RANAP_ClientType.c
index 059a671..1f11e80 100644
--- a/src/ranap/RANAP_ClientType.c
+++ b/src/ranap/RANAP_ClientType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ClientType.h>
+#include <osmocom/ranap/RANAP_ClientType.h>
 
 int
 RANAP_ClientType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CommonID.c b/src/ranap/RANAP_CommonID.c
index f387538..6568b2d 100644
--- a/src/ranap/RANAP_CommonID.c
+++ b/src/ranap/RANAP_CommonID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CommonID.h>
+#include <osmocom/ranap/RANAP_CommonID.h>
 
 static int
 memb_commonID_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Correlation-ID.c b/src/ranap/RANAP_Correlation-ID.c
index 38e1248..e6f3b6d 100644
--- a/src/ranap/RANAP_Correlation-ID.c
+++ b/src/ranap/RANAP_Correlation-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Correlation-ID.h>
+#include <osmocom/ranap/RANAP_Correlation-ID.h>
 
 int
 RANAP_Correlation_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Criticality.c b/src/ranap/RANAP_Criticality.c
index a95d020..073f0dc 100644
--- a/src/ranap/RANAP_Criticality.c
+++ b/src/ranap/RANAP_Criticality.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
 
 int
 RANAP_Criticality_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c b/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c
index e931ffe..044a235 100644
--- a/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c
+++ b/src/ranap/RANAP_CriticalityDiagnostics-IE-List.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_CriticalityDiagnostics_IE_List_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_CriticalityDiagnostics.c b/src/ranap/RANAP_CriticalityDiagnostics.c
index 7d44731..5865d64 100644
--- a/src/ranap/RANAP_CriticalityDiagnostics.c
+++ b/src/ranap/RANAP_CriticalityDiagnostics.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_CriticalityDiagnostics.h>
+#include <osmocom/ranap/RANAP_CriticalityDiagnostics.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_CriticalityDiagnostics_1[] = {
 	{ ATF_POINTER, 5, offsetof(struct RANAP_CriticalityDiagnostics, procedureCode),
diff --git a/src/ranap/RANAP_D-RNTI.c b/src/ranap/RANAP_D-RNTI.c
index 77ad9cf..77dc4c8 100644
--- a/src/ranap/RANAP_D-RNTI.c
+++ b/src/ranap/RANAP_D-RNTI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_D-RNTI.h>
+#include <osmocom/ranap/RANAP_D-RNTI.h>
 
 int
 RANAP_D_RNTI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DCH-ID.c b/src/ranap/RANAP_DCH-ID.c
index 6dbffb8..73ec84f 100644
--- a/src/ranap/RANAP_DCH-ID.c
+++ b/src/ranap/RANAP_DCH-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DCH-ID.h>
+#include <osmocom/ranap/RANAP_DCH-ID.h>
 
 int
 RANAP_DCH_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DL-GTP-PDU-SequenceNumber.c b/src/ranap/RANAP_DL-GTP-PDU-SequenceNumber.c
index 8094c2a..87782ea 100644
--- a/src/ranap/RANAP_DL-GTP-PDU-SequenceNumber.c
+++ b/src/ranap/RANAP_DL-GTP-PDU-SequenceNumber.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
 
 int
 RANAP_DL_GTP_PDU_SequenceNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DL-N-PDU-SequenceNumber.c b/src/ranap/RANAP_DL-N-PDU-SequenceNumber.c
index 37a1828..d2c5583 100644
--- a/src/ranap/RANAP_DL-N-PDU-SequenceNumber.c
+++ b/src/ranap/RANAP_DL-N-PDU-SequenceNumber.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
 
 int
 RANAP_DL_N_PDU_SequenceNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DRX-CycleLengthCoefficient.c b/src/ranap/RANAP_DRX-CycleLengthCoefficient.c
index 374cbc3..b5e1699 100644
--- a/src/ranap/RANAP_DRX-CycleLengthCoefficient.c
+++ b/src/ranap/RANAP_DRX-CycleLengthCoefficient.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DRX-CycleLengthCoefficient.h>
+#include <osmocom/ranap/RANAP_DRX-CycleLengthCoefficient.h>
 
 int
 RANAP_DRX_CycleLengthCoefficient_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DSCH-ID.c b/src/ranap/RANAP_DSCH-ID.c
index fd27d87..7a73d37 100644
--- a/src/ranap/RANAP_DSCH-ID.c
+++ b/src/ranap/RANAP_DSCH-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DSCH-ID.h>
+#include <osmocom/ranap/RANAP_DSCH-ID.h>
 
 int
 RANAP_DSCH_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DataPDUType.c b/src/ranap/RANAP_DataPDUType.c
index 1b2443c..581130b 100644
--- a/src/ranap/RANAP_DataPDUType.c
+++ b/src/ranap/RANAP_DataPDUType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DataPDUType.h>
+#include <osmocom/ranap/RANAP_DataPDUType.h>
 
 int
 RANAP_DataPDUType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DataVolumeList.c b/src/ranap/RANAP_DataVolumeList.c
index e54c752..5be74e1 100644
--- a/src/ranap/RANAP_DataVolumeList.c
+++ b/src/ranap/RANAP_DataVolumeList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeList.h>
+#include <osmocom/ranap/RANAP_DataVolumeList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_DataVolumeList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_DataVolumeReference.c b/src/ranap/RANAP_DataVolumeReference.c
index ddb6765..0d88fb9 100644
--- a/src/ranap/RANAP_DataVolumeReference.c
+++ b/src/ranap/RANAP_DataVolumeReference.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReference.h>
+#include <osmocom/ranap/RANAP_DataVolumeReference.h>
 
 int
 RANAP_DataVolumeReference_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DataVolumeReport.c b/src/ranap/RANAP_DataVolumeReport.c
index 68df013..2c1d6b0 100644
--- a/src/ranap/RANAP_DataVolumeReport.c
+++ b/src/ranap/RANAP_DataVolumeReport.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReport.h>
+#include <osmocom/ranap/RANAP_DataVolumeReport.h>
 
 static int
 memb_dataVolumeReport_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DataVolumeReportList.c b/src/ranap/RANAP_DataVolumeReportList.c
index dd854e0..1476e7d 100644
--- a/src/ranap/RANAP_DataVolumeReportList.c
+++ b/src/ranap/RANAP_DataVolumeReportList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportList.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportList.h>
 
 static int
 memb_dataVolumeReportListe_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DataVolumeReportRequest.c b/src/ranap/RANAP_DataVolumeReportRequest.c
index 60e7dd5..2b0463a 100644
--- a/src/ranap/RANAP_DataVolumeReportRequest.c
+++ b/src/ranap/RANAP_DataVolumeReportRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportRequest.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportRequest.h>
 
 static int
 memb_dataVolumeReportRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DataVolumeReportingIndication.c b/src/ranap/RANAP_DataVolumeReportingIndication.c
index bb4d0e2..a549bcf 100644
--- a/src/ranap/RANAP_DataVolumeReportingIndication.c
+++ b/src/ranap/RANAP_DataVolumeReportingIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportingIndication.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportingIndication.h>
 
 int
 RANAP_DataVolumeReportingIndication_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DeliveryOfErroneousSDU.c b/src/ranap/RANAP_DeliveryOfErroneousSDU.c
index c81e98c..6da9d59 100644
--- a/src/ranap/RANAP_DeliveryOfErroneousSDU.c
+++ b/src/ranap/RANAP_DeliveryOfErroneousSDU.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOfErroneousSDU.h>
+#include <osmocom/ranap/RANAP_DeliveryOfErroneousSDU.h>
 
 int
 RANAP_DeliveryOfErroneousSDU_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DeliveryOrder.c b/src/ranap/RANAP_DeliveryOrder.c
index 93e9794..f8443f6 100644
--- a/src/ranap/RANAP_DeliveryOrder.c
+++ b/src/ranap/RANAP_DeliveryOrder.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOrder.h>
+#include <osmocom/ranap/RANAP_DeliveryOrder.h>
 
 int
 RANAP_DeliveryOrder_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DeltaRAListofIdleModeUEs.c b/src/ranap/RANAP_DeltaRAListofIdleModeUEs.c
index 6cd38ac..8ebd374 100644
--- a/src/ranap/RANAP_DeltaRAListofIdleModeUEs.c
+++ b/src/ranap/RANAP_DeltaRAListofIdleModeUEs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DeltaRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_DeltaRAListofIdleModeUEs_1[] = {
 	{ ATF_POINTER, 3, offsetof(struct RANAP_DeltaRAListofIdleModeUEs, newRAListofIdleModeUEs),
diff --git a/src/ranap/RANAP_DirectInformationTransfer.c b/src/ranap/RANAP_DirectInformationTransfer.c
index 8ad1d19..0f7d143 100644
--- a/src/ranap/RANAP_DirectInformationTransfer.c
+++ b/src/ranap/RANAP_DirectInformationTransfer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectInformationTransfer.h>
+#include <osmocom/ranap/RANAP_DirectInformationTransfer.h>
 
 static int
 memb_directInformationTransfer_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DirectReportingIndicator.c b/src/ranap/RANAP_DirectReportingIndicator.c
index 331e574..8b9c560 100644
--- a/src/ranap/RANAP_DirectReportingIndicator.c
+++ b/src/ranap/RANAP_DirectReportingIndicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectReportingIndicator.h>
+#include <osmocom/ranap/RANAP_DirectReportingIndicator.h>
 
 int
 RANAP_DirectReportingIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DirectTransfer-IE-ContainerList.c b/src/ranap/RANAP_DirectTransfer-IE-ContainerList.c
index 29cd204..a4fae90 100644
--- a/src/ranap/RANAP_DirectTransfer-IE-ContainerList.c
+++ b/src/ranap/RANAP_DirectTransfer-IE-ContainerList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectTransfer-IE-ContainerList.h>
+#include <osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_DirectTransfer_IE_ContainerList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_DirectTransfer.c b/src/ranap/RANAP_DirectTransfer.c
index 2bfb3ef..03fed10 100644
--- a/src/ranap/RANAP_DirectTransfer.c
+++ b/src/ranap/RANAP_DirectTransfer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectTransfer.h>
+#include <osmocom/ranap/RANAP_DirectTransfer.h>
 
 static int
 memb_directTransfer_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.c b/src/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.c
index 2ee8d5b..dca65f8 100644
--- a/src/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.c
+++ b/src/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h>
+#include <osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_DirectTransferInformationItem_RANAP_RelocInf_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_DirectTransferInformationItem_RANAP_RelocInf, nAS_PDU),
diff --git a/src/ranap/RANAP_E-DCH-MAC-d-Flow-ID.c b/src/ranap/RANAP_E-DCH-MAC-d-Flow-ID.c
index c834dcc..19a69ff 100644
--- a/src/ranap/RANAP_E-DCH-MAC-d-Flow-ID.c
+++ b/src/ranap/RANAP_E-DCH-MAC-d-Flow-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_E-DCH-MAC-d-Flow-ID.h>
+#include <osmocom/ranap/RANAP_E-DCH-MAC-d-Flow-ID.h>
 
 int
 RANAP_E_DCH_MAC_d_Flow_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_E-UTRAN-Service-Handover.c b/src/ranap/RANAP_E-UTRAN-Service-Handover.c
index fe4c647..8f964a3 100644
--- a/src/ranap/RANAP_E-UTRAN-Service-Handover.c
+++ b/src/ranap/RANAP_E-UTRAN-Service-Handover.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_E-UTRAN-Service-Handover.h>
+#include <osmocom/ranap/RANAP_E-UTRAN-Service-Handover.h>
 
 int
 RANAP_E_UTRAN_Service_Handover_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_EARFCN-Extended.c b/src/ranap/RANAP_EARFCN-Extended.c
index 8f1b7cf..09340d1 100644
--- a/src/ranap/RANAP_EARFCN-Extended.c
+++ b/src/ranap/RANAP_EARFCN-Extended.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EARFCN-Extended.h>
+#include <osmocom/ranap/RANAP_EARFCN-Extended.h>
 
 int
 RANAP_EARFCN_Extended_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ENB-ID.c b/src/ranap/RANAP_ENB-ID.c
index fbc9c2b..f7e855d 100644
--- a/src/ranap/RANAP_ENB-ID.c
+++ b/src/ranap/RANAP_ENB-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ENB-ID.h>
+#include <osmocom/ranap/RANAP_ENB-ID.h>
 
 static int
 memb_macroENB_ID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_EUTRANFrequencies.c b/src/ranap/RANAP_EUTRANFrequencies.c
index a83a5c7..f6faca6 100644
--- a/src/ranap/RANAP_EUTRANFrequencies.c
+++ b/src/ranap/RANAP_EUTRANFrequencies.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EUTRANFrequencies.h>
+#include <osmocom/ranap/RANAP_EUTRANFrequencies.h>
 
 static int
 memb_earfcn_constraint_2(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_EncryptionAlgorithm.c b/src/ranap/RANAP_EncryptionAlgorithm.c
index 45a0399..b8df715 100644
--- a/src/ranap/RANAP_EncryptionAlgorithm.c
+++ b/src/ranap/RANAP_EncryptionAlgorithm.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_EncryptionAlgorithm.h>
 
 int
 RANAP_EncryptionAlgorithm_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_EncryptionInformation.c b/src/ranap/RANAP_EncryptionInformation.c
index 405c917..0f2c650 100644
--- a/src/ranap/RANAP_EncryptionInformation.c
+++ b/src/ranap/RANAP_EncryptionInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionInformation.h>
+#include <osmocom/ranap/RANAP_EncryptionInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_EncryptionInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_EncryptionInformation, permittedAlgorithms),
diff --git a/src/ranap/RANAP_EncryptionKey.c b/src/ranap/RANAP_EncryptionKey.c
index 6b3004d..e451789 100644
--- a/src/ranap/RANAP_EncryptionKey.c
+++ b/src/ranap/RANAP_EncryptionKey.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionKey.h>
+#include <osmocom/ranap/RANAP_EncryptionKey.h>
 
 int
 RANAP_EncryptionKey_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_End-Of-CSFB.c b/src/ranap/RANAP_End-Of-CSFB.c
index 88e1c53..d409967 100644
--- a/src/ranap/RANAP_End-Of-CSFB.c
+++ b/src/ranap/RANAP_End-Of-CSFB.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_End-Of-CSFB.h>
+#include <osmocom/ranap/RANAP_End-Of-CSFB.h>
 
 int
 RANAP_End_Of_CSFB_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_EnhancedRelocationCompleteConfirm.c b/src/ranap/RANAP_EnhancedRelocationCompleteConfirm.c
index 1d6fd70..0c5d28b 100644
--- a/src/ranap/RANAP_EnhancedRelocationCompleteConfirm.c
+++ b/src/ranap/RANAP_EnhancedRelocationCompleteConfirm.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteConfirm.h>
+#include <osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h>
 
 static int
 memb_enhancedRelocationCompleteConfirm_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_EnhancedRelocationCompleteFailure.c b/src/ranap/RANAP_EnhancedRelocationCompleteFailure.c
index 3b26fe9..7201203 100644
--- a/src/ranap/RANAP_EnhancedRelocationCompleteFailure.c
+++ b/src/ranap/RANAP_EnhancedRelocationCompleteFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteFailure.h>
+#include <osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h>
 
 static int
 memb_enhancedRelocationCompleteFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_EnhancedRelocationCompleteRequest.c b/src/ranap/RANAP_EnhancedRelocationCompleteRequest.c
index da9f5a1..cd6a042 100644
--- a/src/ranap/RANAP_EnhancedRelocationCompleteRequest.c
+++ b/src/ranap/RANAP_EnhancedRelocationCompleteRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteRequest.h>
+#include <osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h>
 
 static int
 memb_enhancedRelocationCompleteRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_EnhancedRelocationCompleteResponse.c b/src/ranap/RANAP_EnhancedRelocationCompleteResponse.c
index 5597de2..ac1328e 100644
--- a/src/ranap/RANAP_EnhancedRelocationCompleteResponse.c
+++ b/src/ranap/RANAP_EnhancedRelocationCompleteResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteResponse.h>
+#include <osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h>
 
 static int
 memb_enhancedRelocationCompleteResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_EquipmentsToBeTraced.c b/src/ranap/RANAP_EquipmentsToBeTraced.c
index e0c1579..cf6e08f 100644
--- a/src/ranap/RANAP_EquipmentsToBeTraced.c
+++ b/src/ranap/RANAP_EquipmentsToBeTraced.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_EquipmentsToBeTraced.h>
+#include <osmocom/ranap/RANAP_EquipmentsToBeTraced.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_EquipmentsToBeTraced_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  3l }	/* (0..3,...) */,
diff --git a/src/ranap/RANAP_ErrorIndication.c b/src/ranap/RANAP_ErrorIndication.c
index c0573a1..4fcb502 100644
--- a/src/ranap/RANAP_ErrorIndication.c
+++ b/src/ranap/RANAP_ErrorIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ErrorIndication.h>
+#include <osmocom/ranap/RANAP_ErrorIndication.h>
 
 static int
 memb_errorIndication_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Event.c b/src/ranap/RANAP_Event.c
index bd0214a..07b2370 100644
--- a/src/ranap/RANAP_Event.c
+++ b/src/ranap/RANAP_Event.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Event.h>
+#include <osmocom/ranap/RANAP_Event.h>
 
 int
 RANAP_Event_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Event1F-Parameters.c b/src/ranap/RANAP_Event1F-Parameters.c
index 6a92c4d..550cc0e 100644
--- a/src/ranap/RANAP_Event1F-Parameters.c
+++ b/src/ranap/RANAP_Event1F-Parameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Event1F-Parameters.h>
+#include <osmocom/ranap/RANAP_Event1F-Parameters.h>
 
 static int
 memb_threshold_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Event1I-Parameters.c b/src/ranap/RANAP_Event1I-Parameters.c
index aa83ea5..606755f 100644
--- a/src/ranap/RANAP_Event1I-Parameters.c
+++ b/src/ranap/RANAP_Event1I-Parameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Event1I-Parameters.h>
+#include <osmocom/ranap/RANAP_Event1I-Parameters.h>
 
 static int
 memb_threshold_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ExtendedGuaranteedBitrate.c b/src/ranap/RANAP_ExtendedGuaranteedBitrate.c
index 20e7fc2..8891830 100644
--- a/src/ranap/RANAP_ExtendedGuaranteedBitrate.c
+++ b/src/ranap/RANAP_ExtendedGuaranteedBitrate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
 
 int
 RANAP_ExtendedGuaranteedBitrate_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ExtendedMaxBitrate.c b/src/ranap/RANAP_ExtendedMaxBitrate.c
index 73bb31f..3158e83 100644
--- a/src/ranap/RANAP_ExtendedMaxBitrate.c
+++ b/src/ranap/RANAP_ExtendedMaxBitrate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
 
 int
 RANAP_ExtendedMaxBitrate_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ExtendedRNC-ID.c b/src/ranap/RANAP_ExtendedRNC-ID.c
index 3dbeb64..10e1f6b 100644
--- a/src/ranap/RANAP_ExtendedRNC-ID.c
+++ b/src/ranap/RANAP_ExtendedRNC-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedRNC-ID.h>
+#include <osmocom/ranap/RANAP_ExtendedRNC-ID.h>
 
 int
 RANAP_ExtendedRNC_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ForwardSRNS-Context.c b/src/ranap/RANAP_ForwardSRNS-Context.c
index 1e35b3c..61f1a5b 100644
--- a/src/ranap/RANAP_ForwardSRNS-Context.c
+++ b/src/ranap/RANAP_ForwardSRNS-Context.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ForwardSRNS-Context.h>
+#include <osmocom/ranap/RANAP_ForwardSRNS-Context.h>
 
 static int
 memb_forwardSRNS_Context_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ForwardingIndication.c b/src/ranap/RANAP_ForwardingIndication.c
index e3e9981..11478b1 100644
--- a/src/ranap/RANAP_ForwardingIndication.c
+++ b/src/ranap/RANAP_ForwardingIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ForwardingIndication.h>
+#include <osmocom/ranap/RANAP_ForwardingIndication.h>
 
 int
 RANAP_ForwardingIndication_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_FrameSequenceNumber.c b/src/ranap/RANAP_FrameSequenceNumber.c
index 26d602c..a933552 100644
--- a/src/ranap/RANAP_FrameSequenceNumber.c
+++ b/src/ranap/RANAP_FrameSequenceNumber.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_FrameSequenceNumber.h>
+#include <osmocom/ranap/RANAP_FrameSequenceNumber.h>
 
 int
 RANAP_FrameSequenceNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_FrequenceLayerConvergenceFlag.c b/src/ranap/RANAP_FrequenceLayerConvergenceFlag.c
index 21deeac..f9b71ed 100644
--- a/src/ranap/RANAP_FrequenceLayerConvergenceFlag.c
+++ b/src/ranap/RANAP_FrequenceLayerConvergenceFlag.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_FrequenceLayerConvergenceFlag.h>
+#include <osmocom/ranap/RANAP_FrequenceLayerConvergenceFlag.h>
 
 int
 RANAP_FrequenceLayerConvergenceFlag_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GA-AltitudeAndDirection.c b/src/ranap/RANAP_GA-AltitudeAndDirection.c
index a83acfa..b707f1c 100644
--- a/src/ranap/RANAP_GA-AltitudeAndDirection.c
+++ b/src/ranap/RANAP_GA-AltitudeAndDirection.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-AltitudeAndDirection.h>
+#include <osmocom/ranap/RANAP_GA-AltitudeAndDirection.h>
 
 static int
 directionOfAltitude_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GA-EllipsoidArc.c b/src/ranap/RANAP_GA-EllipsoidArc.c
index e42e098..bf406ac 100644
--- a/src/ranap/RANAP_GA-EllipsoidArc.c
+++ b/src/ranap/RANAP_GA-EllipsoidArc.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-EllipsoidArc.h>
+#include <osmocom/ranap/RANAP_GA-EllipsoidArc.h>
 
 static int
 memb_innerRadius_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GA-Point.c b/src/ranap/RANAP_GA-Point.c
index cd29797..41e10d6 100644
--- a/src/ranap/RANAP_GA-Point.c
+++ b/src/ranap/RANAP_GA-Point.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-Point.h>
+#include <osmocom/ranap/RANAP_GA-Point.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_GA_Point_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_GA_Point, geographicalCoordinates),
diff --git a/src/ranap/RANAP_GA-PointWithAltitude.c b/src/ranap/RANAP_GA-PointWithAltitude.c
index 40741d5..b72fdd3 100644
--- a/src/ranap/RANAP_GA-PointWithAltitude.c
+++ b/src/ranap/RANAP_GA-PointWithAltitude.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitude.h>
+#include <osmocom/ranap/RANAP_GA-PointWithAltitude.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_GA_PointWithAltitude_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_GA_PointWithAltitude, geographicalCoordinates),
diff --git a/src/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.c b/src/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.c
index ad9fd53..29c3919 100644
--- a/src/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.c
+++ b/src/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h>
+#include <osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h>
 
 static int
 memb_uncertaintyAltitude_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GA-PointWithUnCertainty.c b/src/ranap/RANAP_GA-PointWithUnCertainty.c
index fe139ae..cc65d70 100644
--- a/src/ranap/RANAP_GA-PointWithUnCertainty.c
+++ b/src/ranap/RANAP_GA-PointWithUnCertainty.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertainty.h>
+#include <osmocom/ranap/RANAP_GA-PointWithUnCertainty.h>
 
 static int
 memb_uncertaintyCode_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GA-PointWithUnCertaintyEllipse.c b/src/ranap/RANAP_GA-PointWithUnCertaintyEllipse.c
index a87b4fb..f0e1115 100644
--- a/src/ranap/RANAP_GA-PointWithUnCertaintyEllipse.c
+++ b/src/ranap/RANAP_GA-PointWithUnCertaintyEllipse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h>
 
 static int
 memb_confidence_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GA-Polygon.c b/src/ranap/RANAP_GA-Polygon.c
index 993e521..0e9979f 100644
--- a/src/ranap/RANAP_GA-Polygon.c
+++ b/src/ranap/RANAP_GA-Polygon.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-Polygon.h>
+#include <osmocom/ranap/RANAP_GA-Polygon.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_GA_Polygon_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_GA-UncertaintyEllipse.c b/src/ranap/RANAP_GA-UncertaintyEllipse.c
index 5115c19..c88dd10 100644
--- a/src/ranap/RANAP_GA-UncertaintyEllipse.c
+++ b/src/ranap/RANAP_GA-UncertaintyEllipse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-UncertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GA-UncertaintyEllipse.h>
 
 static int
 memb_uncertaintySemi_major_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GANSS-PositioningDataSet.c b/src/ranap/RANAP_GANSS-PositioningDataSet.c
index 04f89c2..b427447 100644
--- a/src/ranap/RANAP_GANSS-PositioningDataSet.c
+++ b/src/ranap/RANAP_GANSS-PositioningDataSet.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GANSS-PositioningDataSet.h>
+#include <osmocom/ranap/RANAP_GANSS-PositioningDataSet.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_GANSS_PositioningDataSet_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_GANSS-PositioningMethodAndUsage.c b/src/ranap/RANAP_GANSS-PositioningMethodAndUsage.c
index 8711a37..a18b51d 100644
--- a/src/ranap/RANAP_GANSS-PositioningMethodAndUsage.c
+++ b/src/ranap/RANAP_GANSS-PositioningMethodAndUsage.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GANSS-PositioningMethodAndUsage.h>
+#include <osmocom/ranap/RANAP_GANSS-PositioningMethodAndUsage.h>
 
 int
 RANAP_GANSS_PositioningMethodAndUsage_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GERAN-BSC-Container.c b/src/ranap/RANAP_GERAN-BSC-Container.c
index 509dd09..b7205fc 100644
--- a/src/ranap/RANAP_GERAN-BSC-Container.c
+++ b/src/ranap/RANAP_GERAN-BSC-Container.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-BSC-Container.h>
+#include <osmocom/ranap/RANAP_GERAN-BSC-Container.h>
 
 int
 RANAP_GERAN_BSC_Container_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GERAN-Cell-ID.c b/src/ranap/RANAP_GERAN-Cell-ID.c
index 64f20e0..c0539f7 100644
--- a/src/ranap/RANAP_GERAN-Cell-ID.c
+++ b/src/ranap/RANAP_GERAN-Cell-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Cell-ID.h>
+#include <osmocom/ranap/RANAP_GERAN-Cell-ID.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_GERAN_Cell_ID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_GERAN_Cell_ID, lAI),
diff --git a/src/ranap/RANAP_GERAN-Classmark.c b/src/ranap/RANAP_GERAN-Classmark.c
index 7ced7b8..f499935 100644
--- a/src/ranap/RANAP_GERAN-Classmark.c
+++ b/src/ranap/RANAP_GERAN-Classmark.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Classmark.h>
+#include <osmocom/ranap/RANAP_GERAN-Classmark.h>
 
 int
 RANAP_GERAN_Classmark_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.c b/src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.c
index 23742b0..9cc7df2 100644
--- a/src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.c
+++ b/src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h>
+#include <osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_GERAN_Iumode_RAB_Failed_RABAssgntResponse_Item_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_GERAN_Iumode_RAB_Failed_RABAssgntResponse_Item, rAB_ID),
diff --git a/src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c b/src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c
index 724e199..f981c08 100644
--- a/src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c
+++ b/src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h>
+#include <osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h>
 
 static int
 memb_geraN_Iumode_RAB_Failed_RABAssgntResponse_List_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GTP-TEI.c b/src/ranap/RANAP_GTP-TEI.c
index 8c4e3cc..34e1e3f 100644
--- a/src/ranap/RANAP_GTP-TEI.c
+++ b/src/ranap/RANAP_GTP-TEI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GTP-TEI.h>
+#include <osmocom/ranap/RANAP_GTP-TEI.h>
 
 int
 RANAP_GTP_TEI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GeographicalArea.c b/src/ranap/RANAP_GeographicalArea.c
index 47bf031..a007c11 100644
--- a/src/ranap/RANAP_GeographicalArea.c
+++ b/src/ranap/RANAP_GeographicalArea.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalArea.h>
+#include <osmocom/ranap/RANAP_GeographicalArea.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_GeographicalArea_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  2l }	/* (0..2,...) */,
diff --git a/src/ranap/RANAP_GeographicalCoordinates.c b/src/ranap/RANAP_GeographicalCoordinates.c
index 098125d..1296794 100644
--- a/src/ranap/RANAP_GeographicalCoordinates.c
+++ b/src/ranap/RANAP_GeographicalCoordinates.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
 
 static int
 latitudeSign_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_GlobalCN-ID.c b/src/ranap/RANAP_GlobalCN-ID.c
index 0c87b41..4bd7ed0 100644
--- a/src/ranap/RANAP_GlobalCN-ID.c
+++ b/src/ranap/RANAP_GlobalCN-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GlobalCN-ID.h>
+#include <osmocom/ranap/RANAP_GlobalCN-ID.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_GlobalCN_ID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_GlobalCN_ID, pLMNidentity),
diff --git a/src/ranap/RANAP_GlobalRNC-ID.c b/src/ranap/RANAP_GlobalRNC-ID.c
index db33005..3858840 100644
--- a/src/ranap/RANAP_GlobalRNC-ID.c
+++ b/src/ranap/RANAP_GlobalRNC-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GlobalRNC-ID.h>
+#include <osmocom/ranap/RANAP_GlobalRNC-ID.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_GlobalRNC_ID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_GlobalRNC_ID, pLMNidentity),
diff --git a/src/ranap/RANAP_GuaranteedBitrate.c b/src/ranap/RANAP_GuaranteedBitrate.c
index 61ac592..e00bf5c 100644
--- a/src/ranap/RANAP_GuaranteedBitrate.c
+++ b/src/ranap/RANAP_GuaranteedBitrate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
 
 int
 RANAP_GuaranteedBitrate_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.c b/src/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.c
index 7df4a06..69e3d6f 100644
--- a/src/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.c
+++ b/src/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h>
+#include <osmocom/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h>
 
 int
 RANAP_HS_DSCH_MAC_d_Flow_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_HigherBitratesThan16MbpsFlag.c b/src/ranap/RANAP_HigherBitratesThan16MbpsFlag.c
index 244b7bb..c4291e5 100644
--- a/src/ranap/RANAP_HigherBitratesThan16MbpsFlag.c
+++ b/src/ranap/RANAP_HigherBitratesThan16MbpsFlag.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_HigherBitratesThan16MbpsFlag.h>
+#include <osmocom/ranap/RANAP_HigherBitratesThan16MbpsFlag.h>
 
 int
 RANAP_HigherBitratesThan16MbpsFlag_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_HorizontalSpeedAndBearing.c b/src/ranap/RANAP_HorizontalSpeedAndBearing.c
index 26732e2..02f8ab5 100644
--- a/src/ranap/RANAP_HorizontalSpeedAndBearing.c
+++ b/src/ranap/RANAP_HorizontalSpeedAndBearing.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
 
 static int
 memb_bearing_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_HorizontalVelocity.c b/src/ranap/RANAP_HorizontalVelocity.c
index ba56636..878ff66 100644
--- a/src/ranap/RANAP_HorizontalVelocity.c
+++ b/src/ranap/RANAP_HorizontalVelocity.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalVelocity.h>
+#include <osmocom/ranap/RANAP_HorizontalVelocity.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_HorizontalVelocity_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_HorizontalVelocity, horizontalSpeedAndBearing),
diff --git a/src/ranap/RANAP_HorizontalVelocityWithUncertainty.c b/src/ranap/RANAP_HorizontalVelocityWithUncertainty.c
index 31d4638..70ed4f3 100644
--- a/src/ranap/RANAP_HorizontalVelocityWithUncertainty.c
+++ b/src/ranap/RANAP_HorizontalVelocityWithUncertainty.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalVelocityWithUncertainty.h>
+#include <osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h>
 
 static int
 memb_uncertaintySpeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_HorizontalWithVerticalVelocity.c b/src/ranap/RANAP_HorizontalWithVerticalVelocity.c
index 2a6b760..0a2175e 100644
--- a/src/ranap/RANAP_HorizontalWithVerticalVelocity.c
+++ b/src/ranap/RANAP_HorizontalWithVerticalVelocity.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalWithVerticalVelocity.h>
+#include <osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_HorizontalWithVerticalVelocity_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_HorizontalWithVerticalVelocity, horizontalSpeedAndBearing),
diff --git a/src/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.c b/src/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.c
index 4e67cd7..0472005 100644
--- a/src/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.c
+++ b/src/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h>
+#include <osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h>
 
 static int
 memb_horizontalUncertaintySpeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IE-Extensions.c b/src/ranap/RANAP_IE-Extensions.c
index f080bdd..689058f 100644
--- a/src/ranap/RANAP_IE-Extensions.c
+++ b/src/ranap/RANAP_IE-Extensions.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_IE_Extensions_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_IE.c b/src/ranap/RANAP_IE.c
index 133b82f..47c54b7 100644
--- a/src/ranap/RANAP_IE.c
+++ b/src/ranap/RANAP_IE.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_IE_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_IE, id),
diff --git a/src/ranap/RANAP_IMEI.c b/src/ranap/RANAP_IMEI.c
index 403b425..a1bf807 100644
--- a/src/ranap/RANAP_IMEI.c
+++ b/src/ranap/RANAP_IMEI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEI.h>
+#include <osmocom/ranap/RANAP_IMEI.h>
 
 int
 RANAP_IMEI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IMEIGroup.c b/src/ranap/RANAP_IMEIGroup.c
index 44cc941..684fcdd 100644
--- a/src/ranap/RANAP_IMEIGroup.c
+++ b/src/ranap/RANAP_IMEIGroup.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEIGroup.h>
+#include <osmocom/ranap/RANAP_IMEIGroup.h>
 
 static int
 memb_iMEIMask_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IMEIList.c b/src/ranap/RANAP_IMEIList.c
index a524d12..f24ad4e 100644
--- a/src/ranap/RANAP_IMEIList.c
+++ b/src/ranap/RANAP_IMEIList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEIList.h>
+#include <osmocom/ranap/RANAP_IMEIList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_IMEIList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_IMEISV.c b/src/ranap/RANAP_IMEISV.c
index 3b93d70..1f9627d 100644
--- a/src/ranap/RANAP_IMEISV.c
+++ b/src/ranap/RANAP_IMEISV.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISV.h>
+#include <osmocom/ranap/RANAP_IMEISV.h>
 
 int
 RANAP_IMEISV_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IMEISVGroup.c b/src/ranap/RANAP_IMEISVGroup.c
index 33b1e5c..83ccbd8 100644
--- a/src/ranap/RANAP_IMEISVGroup.c
+++ b/src/ranap/RANAP_IMEISVGroup.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVGroup.h>
+#include <osmocom/ranap/RANAP_IMEISVGroup.h>
 
 static int
 memb_iMEISVMask_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IMEISVList.c b/src/ranap/RANAP_IMEISVList.c
index 09df158..25cb5e1 100644
--- a/src/ranap/RANAP_IMEISVList.c
+++ b/src/ranap/RANAP_IMEISVList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVList.h>
+#include <osmocom/ranap/RANAP_IMEISVList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_IMEISVList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_IMSI.c b/src/ranap/RANAP_IMSI.c
index dca28b3..cddcb8a 100644
--- a/src/ranap/RANAP_IMSI.c
+++ b/src/ranap/RANAP_IMSI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IMSI.h>
+#include <osmocom/ranap/RANAP_IMSI.h>
 
 int
 RANAP_IMSI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IPMulticastAddress.c b/src/ranap/RANAP_IPMulticastAddress.c
index 257e293..3a9ee2b 100644
--- a/src/ranap/RANAP_IPMulticastAddress.c
+++ b/src/ranap/RANAP_IPMulticastAddress.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IPMulticastAddress.h>
+#include <osmocom/ranap/RANAP_IPMulticastAddress.h>
 
 int
 RANAP_IPMulticastAddress_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IRAT-Measurement-Configuration.c b/src/ranap/RANAP_IRAT-Measurement-Configuration.c
index ccc9c65..766b8df 100644
--- a/src/ranap/RANAP_IRAT-Measurement-Configuration.c
+++ b/src/ranap/RANAP_IRAT-Measurement-Configuration.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IRAT-Measurement-Configuration.h>
+#include <osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h>
 
 static int
 memb_rSRP_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IRATmeasurementParameters.c b/src/ranap/RANAP_IRATmeasurementParameters.c
index 30ac6f0..b511b59 100644
--- a/src/ranap/RANAP_IRATmeasurementParameters.c
+++ b/src/ranap/RANAP_IRATmeasurementParameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IRATmeasurementParameters.h>
+#include <osmocom/ranap/RANAP_IRATmeasurementParameters.h>
 
 static int
 memb_measurementDuration_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ImmediateMDT.c b/src/ranap/RANAP_ImmediateMDT.c
index bd0bb2c..c007c09 100644
--- a/src/ranap/RANAP_ImmediateMDT.c
+++ b/src/ranap/RANAP_ImmediateMDT.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ImmediateMDT.h>
+#include <osmocom/ranap/RANAP_ImmediateMDT.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_ImmediateMDT_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_ImmediateMDT, measurementsToActivate),
diff --git a/src/ranap/RANAP_IncludeVelocity.c b/src/ranap/RANAP_IncludeVelocity.c
index b7d712f..c10b1cb 100644
--- a/src/ranap/RANAP_IncludeVelocity.c
+++ b/src/ranap/RANAP_IncludeVelocity.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IncludeVelocity.h>
+#include <osmocom/ranap/RANAP_IncludeVelocity.h>
 
 int
 RANAP_IncludeVelocity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_InformationExchangeID.c b/src/ranap/RANAP_InformationExchangeID.c
index c39882c..239c345 100644
--- a/src/ranap/RANAP_InformationExchangeID.c
+++ b/src/ranap/RANAP_InformationExchangeID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationExchangeID.h>
+#include <osmocom/ranap/RANAP_InformationExchangeID.h>
 
 int
 RANAP_InformationExchangeID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_InformationExchangeType.c b/src/ranap/RANAP_InformationExchangeType.c
index edc751f..fd8bb0f 100644
--- a/src/ranap/RANAP_InformationExchangeType.c
+++ b/src/ranap/RANAP_InformationExchangeType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationExchangeType.h>
+#include <osmocom/ranap/RANAP_InformationExchangeType.h>
 
 int
 RANAP_InformationExchangeType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_InformationRequestType.c b/src/ranap/RANAP_InformationRequestType.c
index 8df4df7..5775d89 100644
--- a/src/ranap/RANAP_InformationRequestType.c
+++ b/src/ranap/RANAP_InformationRequestType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationRequestType.h>
+#include <osmocom/ranap/RANAP_InformationRequestType.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_InformationRequestType_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_InformationRequested.c b/src/ranap/RANAP_InformationRequested.c
index c1be0ff..b01e726 100644
--- a/src/ranap/RANAP_InformationRequested.c
+++ b/src/ranap/RANAP_InformationRequested.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationRequested.h>
+#include <osmocom/ranap/RANAP_InformationRequested.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_InformationRequested_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_InformationTransferConfirmation.c b/src/ranap/RANAP_InformationTransferConfirmation.c
index e37bf57..846cb05 100644
--- a/src/ranap/RANAP_InformationTransferConfirmation.c
+++ b/src/ranap/RANAP_InformationTransferConfirmation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferConfirmation.h>
+#include <osmocom/ranap/RANAP_InformationTransferConfirmation.h>
 
 static int
 memb_informationTransferConfirmation_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_InformationTransferFailure.c b/src/ranap/RANAP_InformationTransferFailure.c
index 9961dae..fe3b40d 100644
--- a/src/ranap/RANAP_InformationTransferFailure.c
+++ b/src/ranap/RANAP_InformationTransferFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferFailure.h>
+#include <osmocom/ranap/RANAP_InformationTransferFailure.h>
 
 static int
 memb_informationTransferFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_InformationTransferID.c b/src/ranap/RANAP_InformationTransferID.c
index 7692de9..2a862a6 100644
--- a/src/ranap/RANAP_InformationTransferID.c
+++ b/src/ranap/RANAP_InformationTransferID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferID.h>
+#include <osmocom/ranap/RANAP_InformationTransferID.h>
 
 int
 RANAP_InformationTransferID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_InformationTransferIndication.c b/src/ranap/RANAP_InformationTransferIndication.c
index 5623e01..5956c5e 100644
--- a/src/ranap/RANAP_InformationTransferIndication.c
+++ b/src/ranap/RANAP_InformationTransferIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferIndication.h>
+#include <osmocom/ranap/RANAP_InformationTransferIndication.h>
 
 static int
 memb_informationTransferIndication_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_InformationTransferType.c b/src/ranap/RANAP_InformationTransferType.c
index dea1f0c..c73463d 100644
--- a/src/ranap/RANAP_InformationTransferType.c
+++ b/src/ranap/RANAP_InformationTransferType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferType.h>
+#include <osmocom/ranap/RANAP_InformationTransferType.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_InformationTransferType_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0l,  0l }	/* (0..0,...) */,
diff --git a/src/ranap/RANAP_InitialUE-Message.c b/src/ranap/RANAP_InitialUE-Message.c
index cc88713..45ff1e5 100644
--- a/src/ranap/RANAP_InitialUE-Message.c
+++ b/src/ranap/RANAP_InitialUE-Message.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InitialUE-Message.h>
+#include <osmocom/ranap/RANAP_InitialUE-Message.h>
 
 static int
 memb_initialUE_Message_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_InitiatingMessage.c b/src/ranap/RANAP_InitiatingMessage.c
index b972a81..a9a2e72 100644
--- a/src/ranap/RANAP_InitiatingMessage.c
+++ b/src/ranap/RANAP_InitiatingMessage.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InitiatingMessage.h>
+#include <osmocom/ranap/RANAP_InitiatingMessage.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_InitiatingMessage_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_InitiatingMessage, procedureCode),
diff --git a/src/ranap/RANAP_IntegrityProtectionAlgorithm.c b/src/ranap/RANAP_IntegrityProtectionAlgorithm.c
index e03e0fe..a402600 100644
--- a/src/ranap/RANAP_IntegrityProtectionAlgorithm.c
+++ b/src/ranap/RANAP_IntegrityProtectionAlgorithm.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h>
 
 int
 RANAP_IntegrityProtectionAlgorithm_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IntegrityProtectionInformation.c b/src/ranap/RANAP_IntegrityProtectionInformation.c
index 3c88119..4c4453a 100644
--- a/src/ranap/RANAP_IntegrityProtectionInformation.c
+++ b/src/ranap/RANAP_IntegrityProtectionInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionInformation.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_IntegrityProtectionInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_IntegrityProtectionInformation, permittedAlgorithms),
diff --git a/src/ranap/RANAP_IntegrityProtectionKey.c b/src/ranap/RANAP_IntegrityProtectionKey.c
index 59b04cc..fe42226 100644
--- a/src/ranap/RANAP_IntegrityProtectionKey.c
+++ b/src/ranap/RANAP_IntegrityProtectionKey.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionKey.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionKey.h>
 
 int
 RANAP_IntegrityProtectionKey_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_InterSystemInformation-TransparentContainer.c b/src/ranap/RANAP_InterSystemInformation-TransparentContainer.c
index fad6d15..3b77feb 100644
--- a/src/ranap/RANAP_InterSystemInformation-TransparentContainer.c
+++ b/src/ranap/RANAP_InterSystemInformation-TransparentContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InterSystemInformation-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_InterSystemInformation_TransparentContainer_1[] = {
 	{ ATF_POINTER, 3, offsetof(struct RANAP_InterSystemInformation_TransparentContainer, downlinkCellLoadInformation),
diff --git a/src/ranap/RANAP_InterSystemInformationTransferType.c b/src/ranap/RANAP_InterSystemInformationTransferType.c
index b1df33d..6d7ea90 100644
--- a/src/ranap/RANAP_InterSystemInformationTransferType.c
+++ b/src/ranap/RANAP_InterSystemInformationTransferType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InterSystemInformationTransferType.h>
+#include <osmocom/ranap/RANAP_InterSystemInformationTransferType.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_InterSystemInformationTransferType_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0l,  0l }	/* (0..0,...) */,
diff --git a/src/ranap/RANAP_InterfacesToTraceItem.c b/src/ranap/RANAP_InterfacesToTraceItem.c
index 509286d..f1d5aa0 100644
--- a/src/ranap/RANAP_InterfacesToTraceItem.c
+++ b/src/ranap/RANAP_InterfacesToTraceItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_InterfacesToTraceItem.h>
+#include <osmocom/ranap/RANAP_InterfacesToTraceItem.h>
 
 static int
 interface_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Iu-ReleaseCommand.c b/src/ranap/RANAP_Iu-ReleaseCommand.c
index 37ad439..8bb0fe5 100644
--- a/src/ranap/RANAP_Iu-ReleaseCommand.c
+++ b/src/ranap/RANAP_Iu-ReleaseCommand.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Iu-ReleaseCommand.h>
+#include <osmocom/ranap/RANAP_Iu-ReleaseCommand.h>
 
 static int
 memb_iu_ReleaseCommand_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Iu-ReleaseComplete.c b/src/ranap/RANAP_Iu-ReleaseComplete.c
index 7b962ae..7fd8aff 100644
--- a/src/ranap/RANAP_Iu-ReleaseComplete.c
+++ b/src/ranap/RANAP_Iu-ReleaseComplete.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Iu-ReleaseComplete.h>
+#include <osmocom/ranap/RANAP_Iu-ReleaseComplete.h>
 
 static int
 memb_iu_ReleaseComplete_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Iu-ReleaseRequest.c b/src/ranap/RANAP_Iu-ReleaseRequest.c
index fb3d859..f629f45 100644
--- a/src/ranap/RANAP_Iu-ReleaseRequest.c
+++ b/src/ranap/RANAP_Iu-ReleaseRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Iu-ReleaseRequest.h>
+#include <osmocom/ranap/RANAP_Iu-ReleaseRequest.h>
 
 static int
 memb_iu_ReleaseRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IuSigConId-IE-ContainerList.c b/src/ranap/RANAP_IuSigConId-IE-ContainerList.c
index bc66cf8..a3718ec 100644
--- a/src/ranap/RANAP_IuSigConId-IE-ContainerList.c
+++ b/src/ranap/RANAP_IuSigConId-IE-ContainerList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IuSigConId-IE-ContainerList.h>
+#include <osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_IuSigConId_IE_ContainerList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_IuSignallingConnectionIdentifier.c b/src/ranap/RANAP_IuSignallingConnectionIdentifier.c
index 5c47cd7..118f3ab 100644
--- a/src/ranap/RANAP_IuSignallingConnectionIdentifier.c
+++ b/src/ranap/RANAP_IuSignallingConnectionIdentifier.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IuSignallingConnectionIdentifier.h>
+#include <osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h>
 
 int
 RANAP_IuSignallingConnectionIdentifier_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_IuTransportAssociation.c b/src/ranap/RANAP_IuTransportAssociation.c
index d48a6bb..7da78f2 100644
--- a/src/ranap/RANAP_IuTransportAssociation.c
+++ b/src/ranap/RANAP_IuTransportAssociation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_IuTransportAssociation_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c b/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c
index cd8c59b..4055055 100644
--- a/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c
+++ b/src/ranap/RANAP_JoinedMBMSBearerService-IEs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_JoinedMBMSBearerService-IEs.h>
+#include <osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_JoinedMBMSBearerService_IEs_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_KeyStatus.c b/src/ranap/RANAP_KeyStatus.c
index 4e9fba2..5a7c058 100644
--- a/src/ranap/RANAP_KeyStatus.c
+++ b/src/ranap/RANAP_KeyStatus.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_KeyStatus.h>
+#include <osmocom/ranap/RANAP_KeyStatus.h>
 
 int
 RANAP_KeyStatus_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_L3-Information.c b/src/ranap/RANAP_L3-Information.c
index 1a02562..cf9e797 100644
--- a/src/ranap/RANAP_L3-Information.c
+++ b/src/ranap/RANAP_L3-Information.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_L3-Information.h>
+#include <osmocom/ranap/RANAP_L3-Information.h>
 
 int
 RANAP_L3_Information_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LA-LIST.c b/src/ranap/RANAP_LA-LIST.c
index 2275a85..59793d8 100644
--- a/src/ranap/RANAP_LA-LIST.c
+++ b/src/ranap/RANAP_LA-LIST.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LA-LIST.h>
+#include <osmocom/ranap/RANAP_LA-LIST.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_LA_LIST_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_LABased.c b/src/ranap/RANAP_LABased.c
index 6d0f714..4ba1a60 100644
--- a/src/ranap/RANAP_LABased.c
+++ b/src/ranap/RANAP_LABased.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LABased.h>
+#include <osmocom/ranap/RANAP_LABased.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_LABased_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LABased, laiList),
diff --git a/src/ranap/RANAP_LAC.c b/src/ranap/RANAP_LAC.c
index bacfbdc..8d3e6ed 100644
--- a/src/ranap/RANAP_LAC.c
+++ b/src/ranap/RANAP_LAC.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_LAC.h>
 
 int
 RANAP_LAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LAI-List.c b/src/ranap/RANAP_LAI-List.c
index 46d4452..4aa08c0 100644
--- a/src/ranap/RANAP_LAI-List.c
+++ b/src/ranap/RANAP_LAI-List.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI-List.h>
+#include <osmocom/ranap/RANAP_LAI-List.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_LAI_List_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_LAI.c b/src/ranap/RANAP_LAI.c
index 23df088..8a5aa0a 100644
--- a/src/ranap/RANAP_LAI.c
+++ b/src/ranap/RANAP_LAI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_LAI.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_LAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LAI, pLMNidentity),
diff --git a/src/ranap/RANAP_LAListofIdleModeUEs.c b/src/ranap/RANAP_LAListofIdleModeUEs.c
index 9918496..ff3a43d 100644
--- a/src/ranap/RANAP_LAListofIdleModeUEs.c
+++ b/src/ranap/RANAP_LAListofIdleModeUEs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_LAListofIdleModeUEs.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_LAListofIdleModeUEs_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_LHN-ID.c b/src/ranap/RANAP_LHN-ID.c
index 34921ec..c030c96 100644
--- a/src/ranap/RANAP_LHN-ID.c
+++ b/src/ranap/RANAP_LHN-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LHN-ID.h>
+#include <osmocom/ranap/RANAP_LHN-ID.h>
 
 int
 RANAP_LHN_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LastKnownServiceArea.c b/src/ranap/RANAP_LastKnownServiceArea.c
index 809615a..00983a2 100644
--- a/src/ranap/RANAP_LastKnownServiceArea.c
+++ b/src/ranap/RANAP_LastKnownServiceArea.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LastKnownServiceArea.h>
+#include <osmocom/ranap/RANAP_LastKnownServiceArea.h>
 
 static int
 memb_ageOfSAI_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LastVisitedUTRANCell-Item.c b/src/ranap/RANAP_LastVisitedUTRANCell-Item.c
index 31dc25c..5322aaa 100644
--- a/src/ranap/RANAP_LastVisitedUTRANCell-Item.c
+++ b/src/ranap/RANAP_LastVisitedUTRANCell-Item.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LastVisitedUTRANCell-Item.h>
+#include <osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_LastVisitedUTRANCell_Item_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LastVisitedUTRANCell_Item, uTRAN_CellID),
diff --git a/src/ranap/RANAP_LeftMBMSBearerService-IEs.c b/src/ranap/RANAP_LeftMBMSBearerService-IEs.c
index 2424762..b6f00f1 100644
--- a/src/ranap/RANAP_LeftMBMSBearerService-IEs.c
+++ b/src/ranap/RANAP_LeftMBMSBearerService-IEs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LeftMBMSBearerService-IEs.h>
+#include <osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_LeftMBMSBearerService_IEs_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Links-to-log.c b/src/ranap/RANAP_Links-to-log.c
index 71a76b8..a02d7be 100644
--- a/src/ranap/RANAP_Links-to-log.c
+++ b/src/ranap/RANAP_Links-to-log.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Links-to-log.h>
+#include <osmocom/ranap/RANAP_Links-to-log.h>
 
 int
 RANAP_Links_to_log_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ListOF-SNAs.c b/src/ranap/RANAP_ListOF-SNAs.c
index a1f6740..cba3a0c 100644
--- a/src/ranap/RANAP_ListOF-SNAs.c
+++ b/src/ranap/RANAP_ListOF-SNAs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ListOF-SNAs.h>
+#include <osmocom/ranap/RANAP_ListOF-SNAs.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_ListOF_SNAs_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_ListOfInterfacesToTrace.c b/src/ranap/RANAP_ListOfInterfacesToTrace.c
index f98a169..76a6a3f 100644
--- a/src/ranap/RANAP_ListOfInterfacesToTrace.c
+++ b/src/ranap/RANAP_ListOfInterfacesToTrace.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ListOfInterfacesToTrace.h>
+#include <osmocom/ranap/RANAP_ListOfInterfacesToTrace.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_ListOfInterfacesToTrace_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_LoadValue.c b/src/ranap/RANAP_LoadValue.c
index ab71166..f6449a9 100644
--- a/src/ranap/RANAP_LoadValue.c
+++ b/src/ranap/RANAP_LoadValue.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LoadValue.h>
+#include <osmocom/ranap/RANAP_LoadValue.h>
 
 int
 RANAP_LoadValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LocationRelatedDataFailure.c b/src/ranap/RANAP_LocationRelatedDataFailure.c
index 8a1ff05..1bdc865 100644
--- a/src/ranap/RANAP_LocationRelatedDataFailure.c
+++ b/src/ranap/RANAP_LocationRelatedDataFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataFailure.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataFailure.h>
 
 static int
 memb_locationRelatedDataFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LocationRelatedDataRequest.c b/src/ranap/RANAP_LocationRelatedDataRequest.c
index e8c6a3a..16cbfba 100644
--- a/src/ranap/RANAP_LocationRelatedDataRequest.c
+++ b/src/ranap/RANAP_LocationRelatedDataRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataRequest.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataRequest.h>
 
 static int
 memb_locationRelatedDataRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LocationRelatedDataRequestType.c b/src/ranap/RANAP_LocationRelatedDataRequestType.c
index 49e291a..2bab91d 100644
--- a/src/ranap/RANAP_LocationRelatedDataRequestType.c
+++ b/src/ranap/RANAP_LocationRelatedDataRequestType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataRequestType.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataRequestType.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_LocationRelatedDataRequestType_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LocationRelatedDataRequestType, requestedLocationRelatedDataType),
diff --git a/src/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.c b/src/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.c
index 79181ab..5ba2c8c 100644
--- a/src/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.c
+++ b/src/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h>
 
 int
 RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LocationRelatedDataResponse.c b/src/ranap/RANAP_LocationRelatedDataResponse.c
index 267608d..71ced5d 100644
--- a/src/ranap/RANAP_LocationRelatedDataResponse.c
+++ b/src/ranap/RANAP_LocationRelatedDataResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataResponse.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataResponse.h>
 
 static int
 memb_locationRelatedDataResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LocationReport.c b/src/ranap/RANAP_LocationReport.c
index df5c308..0e0d612 100644
--- a/src/ranap/RANAP_LocationReport.c
+++ b/src/ranap/RANAP_LocationReport.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationReport.h>
+#include <osmocom/ranap/RANAP_LocationReport.h>
 
 static int
 memb_locationReport_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LocationReportingControl.c b/src/ranap/RANAP_LocationReportingControl.c
index 7bdf929..d77be12 100644
--- a/src/ranap/RANAP_LocationReportingControl.c
+++ b/src/ranap/RANAP_LocationReportingControl.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationReportingControl.h>
+#include <osmocom/ranap/RANAP_LocationReportingControl.h>
 
 static int
 memb_locationReportingControl_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LocationReportingTransferInformation.c b/src/ranap/RANAP_LocationReportingTransferInformation.c
index 4e5ce94..3c01ed4 100644
--- a/src/ranap/RANAP_LocationReportingTransferInformation.c
+++ b/src/ranap/RANAP_LocationReportingTransferInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationReportingTransferInformation.h>
+#include <osmocom/ranap/RANAP_LocationReportingTransferInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_LocationReportingTransferInformation_1[] = {
 	{ ATF_POINTER, 12, offsetof(struct RANAP_LocationReportingTransferInformation, reportChangeOfSAI),
diff --git a/src/ranap/RANAP_LoggedMDT.c b/src/ranap/RANAP_LoggedMDT.c
index 8e24d2e..10bf814 100644
--- a/src/ranap/RANAP_LoggedMDT.c
+++ b/src/ranap/RANAP_LoggedMDT.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggedMDT.h>
+#include <osmocom/ranap/RANAP_LoggedMDT.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_LoggedMDT_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_LoggedMDT, loggingInterval),
diff --git a/src/ranap/RANAP_LoggingDuration.c b/src/ranap/RANAP_LoggingDuration.c
index 3465666..beed4bc 100644
--- a/src/ranap/RANAP_LoggingDuration.c
+++ b/src/ranap/RANAP_LoggingDuration.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggingDuration.h>
+#include <osmocom/ranap/RANAP_LoggingDuration.h>
 
 int
 RANAP_LoggingDuration_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_LoggingInterval.c b/src/ranap/RANAP_LoggingInterval.c
index 3048809..9859f4f 100644
--- a/src/ranap/RANAP_LoggingInterval.c
+++ b/src/ranap/RANAP_LoggingInterval.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggingInterval.h>
+#include <osmocom/ranap/RANAP_LoggingInterval.h>
 
 int
 RANAP_LoggingInterval_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_M1Report.c b/src/ranap/RANAP_M1Report.c
index ae3dcc7..5a489ed 100644
--- a/src/ranap/RANAP_M1Report.c
+++ b/src/ranap/RANAP_M1Report.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M1Report.h>
+#include <osmocom/ranap/RANAP_M1Report.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_M1Report_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_M2Report.c b/src/ranap/RANAP_M2Report.c
index 178afb5..1fda992 100644
--- a/src/ranap/RANAP_M2Report.c
+++ b/src/ranap/RANAP_M2Report.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M2Report.h>
+#include <osmocom/ranap/RANAP_M2Report.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_M2Report_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_M4-Collection-Parameters.c b/src/ranap/RANAP_M4-Collection-Parameters.c
index 4e46293..ea0f0c3 100644
--- a/src/ranap/RANAP_M4-Collection-Parameters.c
+++ b/src/ranap/RANAP_M4-Collection-Parameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Collection-Parameters.h>
+#include <osmocom/ranap/RANAP_M4-Collection-Parameters.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_M4_Collection_Parameters_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_M4_Collection_Parameters, m4_period),
diff --git a/src/ranap/RANAP_M4-Period.c b/src/ranap/RANAP_M4-Period.c
index 6fef4c0..f7ca873 100644
--- a/src/ranap/RANAP_M4-Period.c
+++ b/src/ranap/RANAP_M4-Period.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Period.h>
+#include <osmocom/ranap/RANAP_M4-Period.h>
 
 int
 RANAP_M4_Period_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_M4-Threshold.c b/src/ranap/RANAP_M4-Threshold.c
index 5ba328f..d2c6692 100644
--- a/src/ranap/RANAP_M4-Threshold.c
+++ b/src/ranap/RANAP_M4-Threshold.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Threshold.h>
+#include <osmocom/ranap/RANAP_M4-Threshold.h>
 
 int
 RANAP_M4_Threshold_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_M4Report.c b/src/ranap/RANAP_M4Report.c
index f17ee2c..9fe44b2 100644
--- a/src/ranap/RANAP_M4Report.c
+++ b/src/ranap/RANAP_M4Report.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M4Report.h>
+#include <osmocom/ranap/RANAP_M4Report.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_M4Report_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_M5-Period.c b/src/ranap/RANAP_M5-Period.c
index d10a5b3..d841ca0 100644
--- a/src/ranap/RANAP_M5-Period.c
+++ b/src/ranap/RANAP_M5-Period.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M5-Period.h>
+#include <osmocom/ranap/RANAP_M5-Period.h>
 
 int
 RANAP_M5_Period_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_M5Report.c b/src/ranap/RANAP_M5Report.c
index d6d9f5b..1551a35 100644
--- a/src/ranap/RANAP_M5Report.c
+++ b/src/ranap/RANAP_M5Report.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M5Report.h>
+#include <osmocom/ranap/RANAP_M5Report.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_M5Report_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_M6-Period.c b/src/ranap/RANAP_M6-Period.c
index 44ab39a..0802b47 100644
--- a/src/ranap/RANAP_M6-Period.c
+++ b/src/ranap/RANAP_M6-Period.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M6-Period.h>
+#include <osmocom/ranap/RANAP_M6-Period.h>
 
 int
 RANAP_M6_Period_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_M6Report.c b/src/ranap/RANAP_M6Report.c
index 7285de2..c30b430 100644
--- a/src/ranap/RANAP_M6Report.c
+++ b/src/ranap/RANAP_M6Report.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M6Report.h>
+#include <osmocom/ranap/RANAP_M6Report.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_M6Report_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_M6Report, m6_period),
diff --git a/src/ranap/RANAP_M7-Period.c b/src/ranap/RANAP_M7-Period.c
index bc8a947..a488ee3 100644
--- a/src/ranap/RANAP_M7-Period.c
+++ b/src/ranap/RANAP_M7-Period.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M7-Period.h>
+#include <osmocom/ranap/RANAP_M7-Period.h>
 
 int
 RANAP_M7_Period_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_M7Report.c b/src/ranap/RANAP_M7Report.c
index 625a380..fb16de4 100644
--- a/src/ranap/RANAP_M7Report.c
+++ b/src/ranap/RANAP_M7Report.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_M7Report.h>
+#include <osmocom/ranap/RANAP_M7Report.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_M7Report_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_M7Report, m7_period),
diff --git a/src/ranap/RANAP_MBMS-PTP-RAB-ID.c b/src/ranap/RANAP_MBMS-PTP-RAB-ID.c
index e048aed..2854c0b 100644
--- a/src/ranap/RANAP_MBMS-PTP-RAB-ID.c
+++ b/src/ranap/RANAP_MBMS-PTP-RAB-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMS-PTP-RAB-ID.h>
+#include <osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h>
 
 int
 RANAP_MBMS_PTP_RAB_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSBearerServiceType.c b/src/ranap/RANAP_MBMSBearerServiceType.c
index dc79237..bed0c28 100644
--- a/src/ranap/RANAP_MBMSBearerServiceType.c
+++ b/src/ranap/RANAP_MBMSBearerServiceType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSBearerServiceType.h>
+#include <osmocom/ranap/RANAP_MBMSBearerServiceType.h>
 
 int
 RANAP_MBMSBearerServiceType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSCNDe-Registration.c b/src/ranap/RANAP_MBMSCNDe-Registration.c
index 81cfa15..0d962b9 100644
--- a/src/ranap/RANAP_MBMSCNDe-Registration.c
+++ b/src/ranap/RANAP_MBMSCNDe-Registration.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCNDe-Registration.h>
+#include <osmocom/ranap/RANAP_MBMSCNDe-Registration.h>
 
 int
 RANAP_MBMSCNDe_Registration_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSCNDe-RegistrationRequest.c b/src/ranap/RANAP_MBMSCNDe-RegistrationRequest.c
index 8bec57f..c1773c3 100644
--- a/src/ranap/RANAP_MBMSCNDe-RegistrationRequest.c
+++ b/src/ranap/RANAP_MBMSCNDe-RegistrationRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCNDe-RegistrationRequest.h>
+#include <osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h>
 
 static int
 memb_mbmscnDe_RegistrationRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSCNDe-RegistrationResponse.c b/src/ranap/RANAP_MBMSCNDe-RegistrationResponse.c
index 0a45f63..85246a2 100644
--- a/src/ranap/RANAP_MBMSCNDe-RegistrationResponse.c
+++ b/src/ranap/RANAP_MBMSCNDe-RegistrationResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCNDe-RegistrationResponse.h>
+#include <osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h>
 
 static int
 memb_mbmscnDe_RegistrationResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSCountingInformation.c b/src/ranap/RANAP_MBMSCountingInformation.c
index 8451d56..cc92316 100644
--- a/src/ranap/RANAP_MBMSCountingInformation.c
+++ b/src/ranap/RANAP_MBMSCountingInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCountingInformation.h>
+#include <osmocom/ranap/RANAP_MBMSCountingInformation.h>
 
 int
 RANAP_MBMSCountingInformation_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSHCIndicator.c b/src/ranap/RANAP_MBMSHCIndicator.c
index 227f3bf..ec0f82c 100644
--- a/src/ranap/RANAP_MBMSHCIndicator.c
+++ b/src/ranap/RANAP_MBMSHCIndicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSHCIndicator.h>
+#include <osmocom/ranap/RANAP_MBMSHCIndicator.h>
 
 int
 RANAP_MBMSHCIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.c b/src/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.c
index ffb8ed1..d052585 100644
--- a/src/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.c
+++ b/src/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_MBMSIPMulticastAddressandAPNRequest_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.c b/src/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.c
index 051734d..e46166d 100644
--- a/src/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.c
+++ b/src/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h>
+#include <osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_MBMSIPMulticastAddressandAPNlist_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_MBMSIPMulticastAddressandAPNlist, tMGI),
diff --git a/src/ranap/RANAP_MBMSLinkingInformation.c b/src/ranap/RANAP_MBMSLinkingInformation.c
index f2e4c53..6e8e8e0 100644
--- a/src/ranap/RANAP_MBMSLinkingInformation.c
+++ b/src/ranap/RANAP_MBMSLinkingInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSLinkingInformation.h>
+#include <osmocom/ranap/RANAP_MBMSLinkingInformation.h>
 
 int
 RANAP_MBMSLinkingInformation_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSRABEstablishmentIndication.c b/src/ranap/RANAP_MBMSRABEstablishmentIndication.c
index f2e9448..e38dc54 100644
--- a/src/ranap/RANAP_MBMSRABEstablishmentIndication.c
+++ b/src/ranap/RANAP_MBMSRABEstablishmentIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABEstablishmentIndication.h>
+#include <osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h>
 
 static int
 memb_mbmsrabEstablishmentIndication_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSRABRelease.c b/src/ranap/RANAP_MBMSRABRelease.c
index 7e328d2..0ad3d80 100644
--- a/src/ranap/RANAP_MBMSRABRelease.c
+++ b/src/ranap/RANAP_MBMSRABRelease.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABRelease.h>
+#include <osmocom/ranap/RANAP_MBMSRABRelease.h>
 
 static int
 memb_mbmsrabRelease_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSRABReleaseFailure.c b/src/ranap/RANAP_MBMSRABReleaseFailure.c
index 8a374eb..620c586 100644
--- a/src/ranap/RANAP_MBMSRABReleaseFailure.c
+++ b/src/ranap/RANAP_MBMSRABReleaseFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABReleaseFailure.h>
+#include <osmocom/ranap/RANAP_MBMSRABReleaseFailure.h>
 
 static int
 memb_mbmsrabReleaseFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSRABReleaseRequest.c b/src/ranap/RANAP_MBMSRABReleaseRequest.c
index ae6c0dd..07380e1 100644
--- a/src/ranap/RANAP_MBMSRABReleaseRequest.c
+++ b/src/ranap/RANAP_MBMSRABReleaseRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABReleaseRequest.h>
+#include <osmocom/ranap/RANAP_MBMSRABReleaseRequest.h>
 
 static int
 memb_mbmsrabReleaseRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSRegistrationFailure.c b/src/ranap/RANAP_MBMSRegistrationFailure.c
index 1f68c87..63fb097 100644
--- a/src/ranap/RANAP_MBMSRegistrationFailure.c
+++ b/src/ranap/RANAP_MBMSRegistrationFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationFailure.h>
+#include <osmocom/ranap/RANAP_MBMSRegistrationFailure.h>
 
 static int
 memb_mbmsRegistrationFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSRegistrationRequest.c b/src/ranap/RANAP_MBMSRegistrationRequest.c
index 9367c25..568668e 100644
--- a/src/ranap/RANAP_MBMSRegistrationRequest.c
+++ b/src/ranap/RANAP_MBMSRegistrationRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationRequest.h>
+#include <osmocom/ranap/RANAP_MBMSRegistrationRequest.h>
 
 static int
 memb_mbmsRegistrationRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSRegistrationRequestType.c b/src/ranap/RANAP_MBMSRegistrationRequestType.c
index 7151117..374698b 100644
--- a/src/ranap/RANAP_MBMSRegistrationRequestType.c
+++ b/src/ranap/RANAP_MBMSRegistrationRequestType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationRequestType.h>
+#include <osmocom/ranap/RANAP_MBMSRegistrationRequestType.h>
 
 int
 RANAP_MBMSRegistrationRequestType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSRegistrationResponse.c b/src/ranap/RANAP_MBMSRegistrationResponse.c
index 368c14b..3302a3b 100644
--- a/src/ranap/RANAP_MBMSRegistrationResponse.c
+++ b/src/ranap/RANAP_MBMSRegistrationResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationResponse.h>
+#include <osmocom/ranap/RANAP_MBMSRegistrationResponse.h>
 
 static int
 memb_mbmsRegistrationResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSServiceArea.c b/src/ranap/RANAP_MBMSServiceArea.c
index bfc9703..eb0e118 100644
--- a/src/ranap/RANAP_MBMSServiceArea.c
+++ b/src/ranap/RANAP_MBMSServiceArea.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSServiceArea.h>
+#include <osmocom/ranap/RANAP_MBMSServiceArea.h>
 
 int
 RANAP_MBMSServiceArea_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionDuration.c b/src/ranap/RANAP_MBMSSessionDuration.c
index 5c4861c..b36c222 100644
--- a/src/ranap/RANAP_MBMSSessionDuration.c
+++ b/src/ranap/RANAP_MBMSSessionDuration.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionDuration.h>
+#include <osmocom/ranap/RANAP_MBMSSessionDuration.h>
 
 int
 RANAP_MBMSSessionDuration_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionIdentity.c b/src/ranap/RANAP_MBMSSessionIdentity.c
index 5e5f8b9..72070cb 100644
--- a/src/ranap/RANAP_MBMSSessionIdentity.c
+++ b/src/ranap/RANAP_MBMSSessionIdentity.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionIdentity.h>
+#include <osmocom/ranap/RANAP_MBMSSessionIdentity.h>
 
 int
 RANAP_MBMSSessionIdentity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionRepetitionNumber.c b/src/ranap/RANAP_MBMSSessionRepetitionNumber.c
index 6050846..a6c6ddf 100644
--- a/src/ranap/RANAP_MBMSSessionRepetitionNumber.c
+++ b/src/ranap/RANAP_MBMSSessionRepetitionNumber.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionRepetitionNumber.h>
+#include <osmocom/ranap/RANAP_MBMSSessionRepetitionNumber.h>
 
 int
 RANAP_MBMSSessionRepetitionNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionStart.c b/src/ranap/RANAP_MBMSSessionStart.c
index 07e5b4d..d239766 100644
--- a/src/ranap/RANAP_MBMSSessionStart.c
+++ b/src/ranap/RANAP_MBMSSessionStart.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStart.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStart.h>
 
 static int
 memb_mbmsSessionStart_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionStartFailure.c b/src/ranap/RANAP_MBMSSessionStartFailure.c
index 84875fd..3036fea 100644
--- a/src/ranap/RANAP_MBMSSessionStartFailure.c
+++ b/src/ranap/RANAP_MBMSSessionStartFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStartFailure.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStartFailure.h>
 
 static int
 memb_mbmsSessionStartFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionStartResponse.c b/src/ranap/RANAP_MBMSSessionStartResponse.c
index e4141da..79c9d74 100644
--- a/src/ranap/RANAP_MBMSSessionStartResponse.c
+++ b/src/ranap/RANAP_MBMSSessionStartResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStartResponse.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStartResponse.h>
 
 static int
 memb_mbmsSessionStartResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionStop.c b/src/ranap/RANAP_MBMSSessionStop.c
index 30c938b..a812966 100644
--- a/src/ranap/RANAP_MBMSSessionStop.c
+++ b/src/ranap/RANAP_MBMSSessionStop.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStop.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStop.h>
 
 static int
 memb_mbmsSessionStop_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionStopResponse.c b/src/ranap/RANAP_MBMSSessionStopResponse.c
index d328d05..8ce2bdf 100644
--- a/src/ranap/RANAP_MBMSSessionStopResponse.c
+++ b/src/ranap/RANAP_MBMSSessionStopResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStopResponse.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStopResponse.h>
 
 static int
 memb_mbmsSessionStopResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionUpdate.c b/src/ranap/RANAP_MBMSSessionUpdate.c
index e917058..d246b4a 100644
--- a/src/ranap/RANAP_MBMSSessionUpdate.c
+++ b/src/ranap/RANAP_MBMSSessionUpdate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionUpdate.h>
+#include <osmocom/ranap/RANAP_MBMSSessionUpdate.h>
 
 static int
 memb_mbmsSessionUpdate_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionUpdateFailure.c b/src/ranap/RANAP_MBMSSessionUpdateFailure.c
index 12c2fb9..5940672 100644
--- a/src/ranap/RANAP_MBMSSessionUpdateFailure.c
+++ b/src/ranap/RANAP_MBMSSessionUpdateFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionUpdateFailure.h>
+#include <osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h>
 
 static int
 memb_mbmsSessionUpdateFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSessionUpdateResponse.c b/src/ranap/RANAP_MBMSSessionUpdateResponse.c
index a1d28fb..5aa7eae 100644
--- a/src/ranap/RANAP_MBMSSessionUpdateResponse.c
+++ b/src/ranap/RANAP_MBMSSessionUpdateResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionUpdateResponse.h>
+#include <osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h>
 
 static int
 memb_mbmsSessionUpdateResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSSynchronisationInformation.c b/src/ranap/RANAP_MBMSSynchronisationInformation.c
index d870f93..2296501 100644
--- a/src/ranap/RANAP_MBMSSynchronisationInformation.c
+++ b/src/ranap/RANAP_MBMSSynchronisationInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSynchronisationInformation.h>
+#include <osmocom/ranap/RANAP_MBMSSynchronisationInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_MBMSSynchronisationInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_MBMSSynchronisationInformation, mBMSHCIndicator),
diff --git a/src/ranap/RANAP_MBMSUELinkingRequest.c b/src/ranap/RANAP_MBMSUELinkingRequest.c
index 859fe48..157d62b 100644
--- a/src/ranap/RANAP_MBMSUELinkingRequest.c
+++ b/src/ranap/RANAP_MBMSUELinkingRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSUELinkingRequest.h>
+#include <osmocom/ranap/RANAP_MBMSUELinkingRequest.h>
 
 static int
 memb_mbmsueLinkingRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MBMSUELinkingResponse.c b/src/ranap/RANAP_MBMSUELinkingResponse.c
index f3566a0..49a8cf1 100644
--- a/src/ranap/RANAP_MBMSUELinkingResponse.c
+++ b/src/ranap/RANAP_MBMSUELinkingResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSUELinkingResponse.h>
+#include <osmocom/ranap/RANAP_MBMSUELinkingResponse.h>
 
 static int
 memb_mbmsueLinkingResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MDT-Activation.c b/src/ranap/RANAP_MDT-Activation.c
index d9192bb..7412f7b 100644
--- a/src/ranap/RANAP_MDT-Activation.c
+++ b/src/ranap/RANAP_MDT-Activation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Activation.h>
+#include <osmocom/ranap/RANAP_MDT-Activation.h>
 
 int
 RANAP_MDT_Activation_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MDT-Configuration.c b/src/ranap/RANAP_MDT-Configuration.c
index ee6909b..9d532c4 100644
--- a/src/ranap/RANAP_MDT-Configuration.c
+++ b/src/ranap/RANAP_MDT-Configuration.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Configuration.h>
+#include <osmocom/ranap/RANAP_MDT-Configuration.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_MDT_Configuration_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_MDT_Configuration, mdtActivation),
diff --git a/src/ranap/RANAP_MDT-PLMN-List.c b/src/ranap/RANAP_MDT-PLMN-List.c
index f1a9c47..ef69ec3 100644
--- a/src/ranap/RANAP_MDT-PLMN-List.c
+++ b/src/ranap/RANAP_MDT-PLMN-List.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-PLMN-List.h>
+#include <osmocom/ranap/RANAP_MDT-PLMN-List.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_MDT_PLMN_List_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_MDT-Report-Parameters.c b/src/ranap/RANAP_MDT-Report-Parameters.c
index 39225d2..0b2b193 100644
--- a/src/ranap/RANAP_MDT-Report-Parameters.c
+++ b/src/ranap/RANAP_MDT-Report-Parameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Report-Parameters.h>
+#include <osmocom/ranap/RANAP_MDT-Report-Parameters.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_MDT_Report_Parameters_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_MDT_Report_Parameters, reportInterval),
diff --git a/src/ranap/RANAP_MDTAreaScope.c b/src/ranap/RANAP_MDTAreaScope.c
index 5700e7f..c0daddf 100644
--- a/src/ranap/RANAP_MDTAreaScope.c
+++ b/src/ranap/RANAP_MDTAreaScope.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MDTAreaScope.h>
+#include <osmocom/ranap/RANAP_MDTAreaScope.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_MDTAreaScope_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  3l }	/* (0..3,...) */,
diff --git a/src/ranap/RANAP_MDTMode.c b/src/ranap/RANAP_MDTMode.c
index 122f3d7..9ef4883 100644
--- a/src/ranap/RANAP_MDTMode.c
+++ b/src/ranap/RANAP_MDTMode.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MDTMode.h>
+#include <osmocom/ranap/RANAP_MDTMode.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_MDTMode_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_MSISDN.c b/src/ranap/RANAP_MSISDN.c
index bb42c6f..b0c358d 100644
--- a/src/ranap/RANAP_MSISDN.c
+++ b/src/ranap/RANAP_MSISDN.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MSISDN.h>
+#include <osmocom/ranap/RANAP_MSISDN.h>
 
 int
 RANAP_MSISDN_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Management-Based-MDT-Allowed.c b/src/ranap/RANAP_Management-Based-MDT-Allowed.c
index 854e007..a6832a5 100644
--- a/src/ranap/RANAP_Management-Based-MDT-Allowed.c
+++ b/src/ranap/RANAP_Management-Based-MDT-Allowed.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Management-Based-MDT-Allowed.h>
+#include <osmocom/ranap/RANAP_Management-Based-MDT-Allowed.h>
 
 int
 RANAP_Management_Based_MDT_Allowed_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MaxBitrate.c b/src/ranap/RANAP_MaxBitrate.c
index dbaf512..7b37b4a 100644
--- a/src/ranap/RANAP_MaxBitrate.c
+++ b/src/ranap/RANAP_MaxBitrate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
 
 int
 RANAP_MaxBitrate_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MaxSDU-Size.c b/src/ranap/RANAP_MaxSDU-Size.c
index 9bb82b2..963ec54 100644
--- a/src/ranap/RANAP_MaxSDU-Size.c
+++ b/src/ranap/RANAP_MaxSDU-Size.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxSDU-Size.h>
+#include <osmocom/ranap/RANAP_MaxSDU-Size.h>
 
 int
 RANAP_MaxSDU_Size_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MeasBand.c b/src/ranap/RANAP_MeasBand.c
index 9af88ac..550c847 100644
--- a/src/ranap/RANAP_MeasBand.c
+++ b/src/ranap/RANAP_MeasBand.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasBand.h>
+#include <osmocom/ranap/RANAP_MeasBand.h>
 
 int
 RANAP_MeasBand_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MeasurementQuantity.c b/src/ranap/RANAP_MeasurementQuantity.c
index 6982d4c..b2ed847 100644
--- a/src/ranap/RANAP_MeasurementQuantity.c
+++ b/src/ranap/RANAP_MeasurementQuantity.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementQuantity.h>
+#include <osmocom/ranap/RANAP_MeasurementQuantity.h>
 
 int
 RANAP_MeasurementQuantity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MeasurementsToActivate.c b/src/ranap/RANAP_MeasurementsToActivate.c
index 7b33242..c44f5a5 100644
--- a/src/ranap/RANAP_MeasurementsToActivate.c
+++ b/src/ranap/RANAP_MeasurementsToActivate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementsToActivate.h>
+#include <osmocom/ranap/RANAP_MeasurementsToActivate.h>
 
 int
 RANAP_MeasurementsToActivate_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_MessageStructure.c b/src/ranap/RANAP_MessageStructure.c
index 209185e..92dab9d 100644
--- a/src/ranap/RANAP_MessageStructure.c
+++ b/src/ranap/RANAP_MessageStructure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_MessageStructure.h>
+#include <osmocom/ranap/RANAP_MessageStructure.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_MessageStructure_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_NAS-PDU.c b/src/ranap/RANAP_NAS-PDU.c
index 1edd850..cb0d5f9 100644
--- a/src/ranap/RANAP_NAS-PDU.c
+++ b/src/ranap/RANAP_NAS-PDU.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-PDU.h>
+#include <osmocom/ranap/RANAP_NAS-PDU.h>
 
 int
 RANAP_NAS_PDU_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_NAS-SequenceNumber.c b/src/ranap/RANAP_NAS-SequenceNumber.c
index 5517fa1..a5b77e0 100644
--- a/src/ranap/RANAP_NAS-SequenceNumber.c
+++ b/src/ranap/RANAP_NAS-SequenceNumber.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_NAS-SequenceNumber.h>
 
 int
 RANAP_NAS_SequenceNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_NAS-SynchronisationIndicator.c b/src/ranap/RANAP_NAS-SynchronisationIndicator.c
index 755abdc..57b5074 100644
--- a/src/ranap/RANAP_NAS-SynchronisationIndicator.c
+++ b/src/ranap/RANAP_NAS-SynchronisationIndicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SynchronisationIndicator.h>
+#include <osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h>
 
 int
 RANAP_NAS_SynchronisationIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_NRTLoadInformationValue.c b/src/ranap/RANAP_NRTLoadInformationValue.c
index 928d871..5a53d24 100644
--- a/src/ranap/RANAP_NRTLoadInformationValue.c
+++ b/src/ranap/RANAP_NRTLoadInformationValue.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NRTLoadInformationValue.h>
+#include <osmocom/ranap/RANAP_NRTLoadInformationValue.h>
 
 int
 RANAP_NRTLoadInformationValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_NewBSS-To-OldBSS-Information.c b/src/ranap/RANAP_NewBSS-To-OldBSS-Information.c
index 85e4377..ad93f02 100644
--- a/src/ranap/RANAP_NewBSS-To-OldBSS-Information.c
+++ b/src/ranap/RANAP_NewBSS-To-OldBSS-Information.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NewBSS-To-OldBSS-Information.h>
+#include <osmocom/ranap/RANAP_NewBSS-To-OldBSS-Information.h>
 
 int
 RANAP_NewBSS_To_OldBSS_Information_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_NewRAListofIdleModeUEs.c b/src/ranap/RANAP_NewRAListofIdleModeUEs.c
index 20b9207..03bba51 100644
--- a/src/ranap/RANAP_NewRAListofIdleModeUEs.c
+++ b/src/ranap/RANAP_NewRAListofIdleModeUEs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NewRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_NewRAListofIdleModeUEs_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_NonSearchingIndication.c b/src/ranap/RANAP_NonSearchingIndication.c
index 9233f34..18d6015 100644
--- a/src/ranap/RANAP_NonSearchingIndication.c
+++ b/src/ranap/RANAP_NonSearchingIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NonSearchingIndication.h>
+#include <osmocom/ranap/RANAP_NonSearchingIndication.h>
 
 int
 RANAP_NonSearchingIndication_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_NotEmptyRAListofIdleModeUEs.c b/src/ranap/RANAP_NotEmptyRAListofIdleModeUEs.c
index 5988a61..13803f3 100644
--- a/src/ranap/RANAP_NotEmptyRAListofIdleModeUEs.c
+++ b/src/ranap/RANAP_NotEmptyRAListofIdleModeUEs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_NotEmptyRAListofIdleModeUEs_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_NotEmptyRAListofIdleModeUEs, rAofIdleModeUEs),
diff --git a/src/ranap/RANAP_NumberOfIuInstances.c b/src/ranap/RANAP_NumberOfIuInstances.c
index 69a7ba7..08af647 100644
--- a/src/ranap/RANAP_NumberOfIuInstances.c
+++ b/src/ranap/RANAP_NumberOfIuInstances.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NumberOfIuInstances.h>
+#include <osmocom/ranap/RANAP_NumberOfIuInstances.h>
 
 int
 RANAP_NumberOfIuInstances_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_NumberOfSteps.c b/src/ranap/RANAP_NumberOfSteps.c
index 99a50d3..7265264 100644
--- a/src/ranap/RANAP_NumberOfSteps.c
+++ b/src/ranap/RANAP_NumberOfSteps.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_NumberOfSteps.h>
+#include <osmocom/ranap/RANAP_NumberOfSteps.h>
 
 int
 RANAP_NumberOfSteps_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_OMC-ID.c b/src/ranap/RANAP_OMC-ID.c
index 323442c..a389129 100644
--- a/src/ranap/RANAP_OMC-ID.c
+++ b/src/ranap/RANAP_OMC-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_OMC-ID.h>
+#include <osmocom/ranap/RANAP_OMC-ID.h>
 
 int
 RANAP_OMC_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Offload-RAB-Parameters-APN.c b/src/ranap/RANAP_Offload-RAB-Parameters-APN.c
index f515e7d..46d9e96 100644
--- a/src/ranap/RANAP_Offload-RAB-Parameters-APN.c
+++ b/src/ranap/RANAP_Offload-RAB-Parameters-APN.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-APN.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters-APN.h>
 
 int
 RANAP_Offload_RAB_Parameters_APN_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.c b/src/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.c
index 4b15b2e..7708d5f 100644
--- a/src/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.c
+++ b/src/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h>
 
 int
 RANAP_Offload_RAB_Parameters_ChargingCharacteristics_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Offload-RAB-Parameters.c b/src/ranap/RANAP_Offload-RAB-Parameters.c
index d9ef641..73472fc 100644
--- a/src/ranap/RANAP_Offload-RAB-Parameters.c
+++ b/src/ranap/RANAP_Offload-RAB-Parameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Offload_RAB_Parameters_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_Offload_RAB_Parameters, accessPointName),
diff --git a/src/ranap/RANAP_OldBSS-ToNewBSS-Information.c b/src/ranap/RANAP_OldBSS-ToNewBSS-Information.c
index d097f7c..7d9763f 100644
--- a/src/ranap/RANAP_OldBSS-ToNewBSS-Information.c
+++ b/src/ranap/RANAP_OldBSS-ToNewBSS-Information.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_OldBSS-ToNewBSS-Information.h>
+#include <osmocom/ranap/RANAP_OldBSS-ToNewBSS-Information.h>
 
 int
 RANAP_OldBSS_ToNewBSS_Information_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Out-Of-UTRAN.c b/src/ranap/RANAP_Out-Of-UTRAN.c
index c51b1aa..6bd1be4 100644
--- a/src/ranap/RANAP_Out-Of-UTRAN.c
+++ b/src/ranap/RANAP_Out-Of-UTRAN.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Out-Of-UTRAN.h>
+#include <osmocom/ranap/RANAP_Out-Of-UTRAN.h>
 
 int
 RANAP_Out_Of_UTRAN_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Outcome.c b/src/ranap/RANAP_Outcome.c
index bfc181b..3ad872a 100644
--- a/src/ranap/RANAP_Outcome.c
+++ b/src/ranap/RANAP_Outcome.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Outcome.h>
+#include <osmocom/ranap/RANAP_Outcome.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Outcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_Outcome, procedureCode),
diff --git a/src/ranap/RANAP_Overload.c b/src/ranap/RANAP_Overload.c
index 507fb5f..b0cc47c 100644
--- a/src/ranap/RANAP_Overload.c
+++ b/src/ranap/RANAP_Overload.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Overload.h>
+#include <osmocom/ranap/RANAP_Overload.h>
 
 static int
 memb_overload_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_P-TMSI.c b/src/ranap/RANAP_P-TMSI.c
index a85b2e6..da5be7c 100644
--- a/src/ranap/RANAP_P-TMSI.c
+++ b/src/ranap/RANAP_P-TMSI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_P-TMSI.h>
+#include <osmocom/ranap/RANAP_P-TMSI.h>
 
 int
 RANAP_P_TMSI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PDP-Type-extension.c b/src/ranap/RANAP_PDP-Type-extension.c
index 6122ed7..4647ced 100644
--- a/src/ranap/RANAP_PDP-Type-extension.c
+++ b/src/ranap/RANAP_PDP-Type-extension.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type-extension.h>
+#include <osmocom/ranap/RANAP_PDP-Type-extension.h>
 
 int
 RANAP_PDP_Type_extension_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PDP-Type.c b/src/ranap/RANAP_PDP-Type.c
index 9db2af5..03d116e 100644
--- a/src/ranap/RANAP_PDP-Type.c
+++ b/src/ranap/RANAP_PDP-Type.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type.h>
+#include <osmocom/ranap/RANAP_PDP-Type.h>
 
 int
 RANAP_PDP_Type_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PDP-TypeInformation-extension.c b/src/ranap/RANAP_PDP-TypeInformation-extension.c
index a4dcd96..2a63070 100644
--- a/src/ranap/RANAP_PDP-TypeInformation-extension.c
+++ b/src/ranap/RANAP_PDP-TypeInformation-extension.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation-extension.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation-extension.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_PDP_TypeInformation_extension_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_PDP-TypeInformation.c b/src/ranap/RANAP_PDP-TypeInformation.c
index 9c41c2d..8808ec6 100644
--- a/src/ranap/RANAP_PDP-TypeInformation.c
+++ b/src/ranap/RANAP_PDP-TypeInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_PDP_TypeInformation_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_PDUType14FrameSequenceNumber.c b/src/ranap/RANAP_PDUType14FrameSequenceNumber.c
index 7e97e7b..8f5c3de 100644
--- a/src/ranap/RANAP_PDUType14FrameSequenceNumber.c
+++ b/src/ranap/RANAP_PDUType14FrameSequenceNumber.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PDUType14FrameSequenceNumber.h>
+#include <osmocom/ranap/RANAP_PDUType14FrameSequenceNumber.h>
 
 int
 RANAP_PDUType14FrameSequenceNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PLMNidentity.c b/src/ranap/RANAP_PLMNidentity.c
index 34db963..0664e9f 100644
--- a/src/ranap/RANAP_PLMNidentity.c
+++ b/src/ranap/RANAP_PLMNidentity.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
 
 int
 RANAP_PLMNidentity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PLMNs-in-shared-network.c b/src/ranap/RANAP_PLMNs-in-shared-network.c
index d1561c7..e98d5e2 100644
--- a/src/ranap/RANAP_PLMNs-in-shared-network.c
+++ b/src/ranap/RANAP_PLMNs-in-shared-network.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNs-in-shared-network.h>
+#include <osmocom/ranap/RANAP_PLMNs-in-shared-network.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_PLMNs_in_shared_network_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Paging.c b/src/ranap/RANAP_Paging.c
index d197f0a..18d232c 100644
--- a/src/ranap/RANAP_Paging.c
+++ b/src/ranap/RANAP_Paging.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Paging.h>
+#include <osmocom/ranap/RANAP_Paging.h>
 
 static int
 memb_paging_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PagingAreaID.c b/src/ranap/RANAP_PagingAreaID.c
index 4147bcf..84467f4 100644
--- a/src/ranap/RANAP_PagingAreaID.c
+++ b/src/ranap/RANAP_PagingAreaID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PagingAreaID.h>
+#include <osmocom/ranap/RANAP_PagingAreaID.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_PagingAreaID_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_PagingCause.c b/src/ranap/RANAP_PagingCause.c
index 164b3a6..9006147 100644
--- a/src/ranap/RANAP_PagingCause.c
+++ b/src/ranap/RANAP_PagingCause.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PagingCause.h>
+#include <osmocom/ranap/RANAP_PagingCause.h>
 
 int
 RANAP_PagingCause_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PeriodicLocationInfo.c b/src/ranap/RANAP_PeriodicLocationInfo.c
index dd43337..86ca3cd 100644
--- a/src/ranap/RANAP_PeriodicLocationInfo.c
+++ b/src/ranap/RANAP_PeriodicLocationInfo.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicLocationInfo.h>
+#include <osmocom/ranap/RANAP_PeriodicLocationInfo.h>
 
 static int
 memb_reportingAmount_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PeriodicReportingIndicator.c b/src/ranap/RANAP_PeriodicReportingIndicator.c
index d3df9ac..9b31305 100644
--- a/src/ranap/RANAP_PeriodicReportingIndicator.c
+++ b/src/ranap/RANAP_PeriodicReportingIndicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicReportingIndicator.h>
+#include <osmocom/ranap/RANAP_PeriodicReportingIndicator.h>
 
 int
 RANAP_PeriodicReportingIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PermanentNAS-UE-ID.c b/src/ranap/RANAP_PermanentNAS-UE-ID.c
index d968688..87e22fa 100644
--- a/src/ranap/RANAP_PermanentNAS-UE-ID.c
+++ b/src/ranap/RANAP_PermanentNAS-UE-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PermanentNAS-UE-ID.h>
+#include <osmocom/ranap/RANAP_PermanentNAS-UE-ID.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_PermanentNAS_UE_ID_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0l,  0l }	/* (0..0,...) */,
diff --git a/src/ranap/RANAP_PermittedEncryptionAlgorithms.c b/src/ranap/RANAP_PermittedEncryptionAlgorithms.c
index 796e52e..fe7d11d 100644
--- a/src/ranap/RANAP_PermittedEncryptionAlgorithms.c
+++ b/src/ranap/RANAP_PermittedEncryptionAlgorithms.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PermittedEncryptionAlgorithms.h>
+#include <osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_PermittedEncryptionAlgorithms_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.c b/src/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.c
index 7783fb1..5ab24af 100644
--- a/src/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.c
+++ b/src/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h>
+#include <osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_PermittedIntegrityProtectionAlgorithms_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Port-Number.c b/src/ranap/RANAP_Port-Number.c
index f74eb0d..e68b262 100644
--- a/src/ranap/RANAP_Port-Number.c
+++ b/src/ranap/RANAP_Port-Number.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Port-Number.h>
+#include <osmocom/ranap/RANAP_Port-Number.h>
 
 int
 RANAP_Port_Number_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PositionData.c b/src/ranap/RANAP_PositionData.c
index b136bb7..c96d2ed 100644
--- a/src/ranap/RANAP_PositionData.c
+++ b/src/ranap/RANAP_PositionData.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PositionData.h>
+#include <osmocom/ranap/RANAP_PositionData.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_PositionData_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_PositionData, positioningDataDiscriminator),
diff --git a/src/ranap/RANAP_PositionDataSpecificToGERANIuMode.c b/src/ranap/RANAP_PositionDataSpecificToGERANIuMode.c
index 0ec7a95..6338fa4 100644
--- a/src/ranap/RANAP_PositionDataSpecificToGERANIuMode.c
+++ b/src/ranap/RANAP_PositionDataSpecificToGERANIuMode.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PositionDataSpecificToGERANIuMode.h>
+#include <osmocom/ranap/RANAP_PositionDataSpecificToGERANIuMode.h>
 
 int
 RANAP_PositionDataSpecificToGERANIuMode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PositioningDataDiscriminator.c b/src/ranap/RANAP_PositioningDataDiscriminator.c
index e235480..5892f08 100644
--- a/src/ranap/RANAP_PositioningDataDiscriminator.c
+++ b/src/ranap/RANAP_PositioningDataDiscriminator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataDiscriminator.h>
+#include <osmocom/ranap/RANAP_PositioningDataDiscriminator.h>
 
 int
 RANAP_PositioningDataDiscriminator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PositioningDataSet.c b/src/ranap/RANAP_PositioningDataSet.c
index b2069fc..c978f1f 100644
--- a/src/ranap/RANAP_PositioningDataSet.c
+++ b/src/ranap/RANAP_PositioningDataSet.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataSet.h>
+#include <osmocom/ranap/RANAP_PositioningDataSet.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_PositioningDataSet_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_PositioningMethodAndUsage.c b/src/ranap/RANAP_PositioningMethodAndUsage.c
index 9c20d22..4b6a2f2 100644
--- a/src/ranap/RANAP_PositioningMethodAndUsage.c
+++ b/src/ranap/RANAP_PositioningMethodAndUsage.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningMethodAndUsage.h>
+#include <osmocom/ranap/RANAP_PositioningMethodAndUsage.h>
 
 int
 RANAP_PositioningMethodAndUsage_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PositioningPriority.c b/src/ranap/RANAP_PositioningPriority.c
index f5046cb..547e4f4 100644
--- a/src/ranap/RANAP_PositioningPriority.c
+++ b/src/ranap/RANAP_PositioningPriority.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningPriority.h>
+#include <osmocom/ranap/RANAP_PositioningPriority.h>
 
 int
 RANAP_PositioningPriority_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Pre-emptionCapability.c b/src/ranap/RANAP_Pre-emptionCapability.c
index d2116b9..0c4df99 100644
--- a/src/ranap/RANAP_Pre-emptionCapability.c
+++ b/src/ranap/RANAP_Pre-emptionCapability.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionCapability.h>
+#include <osmocom/ranap/RANAP_Pre-emptionCapability.h>
 
 int
 RANAP_Pre_emptionCapability_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Pre-emptionVulnerability.c b/src/ranap/RANAP_Pre-emptionVulnerability.c
index 9b63256..3b1fb1f 100644
--- a/src/ranap/RANAP_Pre-emptionVulnerability.c
+++ b/src/ranap/RANAP_Pre-emptionVulnerability.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionVulnerability.h>
+#include <osmocom/ranap/RANAP_Pre-emptionVulnerability.h>
 
 int
 RANAP_Pre_emptionVulnerability_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Presence.c b/src/ranap/RANAP_Presence.c
index 1bdad0a..5e8bf00 100644
--- a/src/ranap/RANAP_Presence.c
+++ b/src/ranap/RANAP_Presence.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Presence.h>
+#include <osmocom/ranap/RANAP_Presence.h>
 
 int
 RANAP_Presence_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Priority-Class-Indicator.c b/src/ranap/RANAP_Priority-Class-Indicator.c
index 9b04c72..ad02157 100644
--- a/src/ranap/RANAP_Priority-Class-Indicator.c
+++ b/src/ranap/RANAP_Priority-Class-Indicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Priority-Class-Indicator.h>
+#include <osmocom/ranap/RANAP_Priority-Class-Indicator.h>
 
 int
 RANAP_Priority_Class_Indicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PriorityLevel.c b/src/ranap/RANAP_PriorityLevel.c
index ebc3e58..399298a 100644
--- a/src/ranap/RANAP_PriorityLevel.c
+++ b/src/ranap/RANAP_PriorityLevel.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PriorityLevel.h>
+#include <osmocom/ranap/RANAP_PriorityLevel.h>
 
 int
 RANAP_PriorityLevel_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PrivateIE-ID.c b/src/ranap/RANAP_PrivateIE-ID.c
index c9822e7..1f1bd97 100644
--- a/src/ranap/RANAP_PrivateIE-ID.c
+++ b/src/ranap/RANAP_PrivateIE-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PrivateIE-ID.h>
+#include <osmocom/ranap/RANAP_PrivateIE-ID.h>
 
 static int
 memb_local_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_PrivateMessage.c b/src/ranap/RANAP_PrivateMessage.c
index fb8e3ee..d4c8cb6 100644
--- a/src/ranap/RANAP_PrivateMessage.c
+++ b/src/ranap/RANAP_PrivateMessage.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_PrivateMessage.h>
+#include <osmocom/ranap/RANAP_PrivateMessage.h>
 
 static int
 memb_privateMessage_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ProcedureCode.c b/src/ranap/RANAP_ProcedureCode.c
index 703fa42..8729ba0 100644
--- a/src/ranap/RANAP_ProcedureCode.c
+++ b/src/ranap/RANAP_ProcedureCode.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
 
 int
 RANAP_ProcedureCode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ProtocolError-IE-ContainerList.c b/src/ranap/RANAP_ProtocolError-IE-ContainerList.c
index 53a0670..8f2c0ab 100644
--- a/src/ranap/RANAP_ProtocolError-IE-ContainerList.c
+++ b/src/ranap/RANAP_ProtocolError-IE-ContainerList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolError-IE-ContainerList.h>
+#include <osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_ProtocolError_IE_ContainerList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_ProtocolExtensionContainer.c b/src/ranap/RANAP_ProtocolExtensionContainer.c
index d3f7184..55d8e5e 100644
--- a/src/ranap/RANAP_ProtocolExtensionContainer.c
+++ b/src/ranap/RANAP_ProtocolExtensionContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_ProtocolExtensionContainer_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_ProtocolExtensionField.c b/src/ranap/RANAP_ProtocolExtensionField.c
index b1ac626..7dc81c0 100644
--- a/src/ranap/RANAP_ProtocolExtensionField.c
+++ b/src/ranap/RANAP_ProtocolExtensionField.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionField.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionField.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_ProtocolExtensionField_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_ProtocolExtensionField, id),
diff --git a/src/ranap/RANAP_ProtocolExtensionID.c b/src/ranap/RANAP_ProtocolExtensionID.c
index f884c03..c3fdd0f 100644
--- a/src/ranap/RANAP_ProtocolExtensionID.c
+++ b/src/ranap/RANAP_ProtocolExtensionID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionID.h>
 
 int
 RANAP_ProtocolExtensionID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ProtocolIE-Container.c b/src/ranap/RANAP_ProtocolIE-Container.c
index 5c39a2f..592222d 100644
--- a/src/ranap/RANAP_ProtocolIE-Container.c
+++ b/src/ranap/RANAP_ProtocolIE-Container.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_ProtocolIE_Container_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_ProtocolIE-ContainerPair.c b/src/ranap/RANAP_ProtocolIE-ContainerPair.c
index 2880bd0..ce9cec3 100644
--- a/src/ranap/RANAP_ProtocolIE-ContainerPair.c
+++ b/src/ranap/RANAP_ProtocolIE-ContainerPair.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ContainerPair.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_ProtocolIE_ContainerPair_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_ProtocolIE-FieldPair.c b/src/ranap/RANAP_ProtocolIE-FieldPair.c
index 5b4bb02..5f1ab9a 100644
--- a/src/ranap/RANAP_ProtocolIE-FieldPair.c
+++ b/src/ranap/RANAP_ProtocolIE-FieldPair.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-FieldPair.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-FieldPair.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_ProtocolIE_FieldPair_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_ProtocolIE_FieldPair, id),
diff --git a/src/ranap/RANAP_ProtocolIE-ID.c b/src/ranap/RANAP_ProtocolIE-ID.c
index 9a956ae..b4fadb4 100644
--- a/src/ranap/RANAP_ProtocolIE-ID.c
+++ b/src/ranap/RANAP_ProtocolIE-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
 
 int
 RANAP_ProtocolIE_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ProvidedData.c b/src/ranap/RANAP_ProvidedData.c
index a4fb838..067f250 100644
--- a/src/ranap/RANAP_ProvidedData.c
+++ b/src/ranap/RANAP_ProvidedData.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ProvidedData.h>
+#include <osmocom/ranap/RANAP_ProvidedData.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_ProvidedData_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0l,  0l }	/* (0..0,...) */,
diff --git a/src/ranap/RANAP_QueuingAllowed.c b/src/ranap/RANAP_QueuingAllowed.c
index 2a2f8fe..62cf81b 100644
--- a/src/ranap/RANAP_QueuingAllowed.c
+++ b/src/ranap/RANAP_QueuingAllowed.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_QueuingAllowed.h>
+#include <osmocom/ranap/RANAP_QueuingAllowed.h>
 
 int
 RANAP_QueuingAllowed_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-AssignmentRequest.c b/src/ranap/RANAP_RAB-AssignmentRequest.c
index 225a5f4..65882ed 100644
--- a/src/ranap/RANAP_RAB-AssignmentRequest.c
+++ b/src/ranap/RANAP_RAB-AssignmentRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AssignmentRequest.h>
+#include <osmocom/ranap/RANAP_RAB-AssignmentRequest.h>
 
 static int
 memb_raB_AssignmentRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-AssignmentResponse.c b/src/ranap/RANAP_RAB-AssignmentResponse.c
index 95c9ef5..1d7914a 100644
--- a/src/ranap/RANAP_RAB-AssignmentResponse.c
+++ b/src/ranap/RANAP_RAB-AssignmentResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AssignmentResponse.h>
+#include <osmocom/ranap/RANAP_RAB-AssignmentResponse.h>
 
 static int
 memb_raB_AssignmentResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-AsymmetryIndicator.c b/src/ranap/RANAP_RAB-AsymmetryIndicator.c
index d6f9082..2828d2d 100644
--- a/src/ranap/RANAP_RAB-AsymmetryIndicator.c
+++ b/src/ranap/RANAP_RAB-AsymmetryIndicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AsymmetryIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-AsymmetryIndicator.h>
 
 int
 RANAP_RAB_AsymmetryIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.c b/src/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.c
index 23b8ba1..a219ee6 100644
--- a/src/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.c
+++ b/src/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h>
+#include <osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_ContextItem_RANAP_RelocInf_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_ContextItem_RANAP_RelocInf, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-ContextItem.c b/src/ranap/RANAP_RAB-ContextItem.c
index 0ef9721..abe94a9 100644
--- a/src/ranap/RANAP_RAB-ContextItem.c
+++ b/src/ranap/RANAP_RAB-ContextItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextItem.h>
+#include <osmocom/ranap/RANAP_RAB-ContextItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_ContextItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_ContextItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.c b/src/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.c
index 211df46..c0ec066 100644
--- a/src/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.c
+++ b/src/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h>
+#include <osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h>
 
 static int
 memb_raB_ContextList_RANAP_RelocInf_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ContextList.c b/src/ranap/RANAP_RAB-ContextList.c
index 60c11b4..8456109 100644
--- a/src/ranap/RANAP_RAB-ContextList.c
+++ b/src/ranap/RANAP_RAB-ContextList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextList.h>
+#include <osmocom/ranap/RANAP_RAB-ContextList.h>
 
 static int
 memb_raB_ContextList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.c b/src/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.c
index 5051be9..bee0d76 100644
--- a/src/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.c
+++ b/src/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h>
+#include <osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_DataForwardingItem_SRNS_CtxReq_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_DataForwardingItem_SRNS_CtxReq, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-DataForwardingItem.c b/src/ranap/RANAP_RAB-DataForwardingItem.c
index 920ff8a..2342301 100644
--- a/src/ranap/RANAP_RAB-DataForwardingItem.c
+++ b/src/ranap/RANAP_RAB-DataForwardingItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingItem.h>
+#include <osmocom/ranap/RANAP_RAB-DataForwardingItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_DataForwardingItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_DataForwardingItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.c b/src/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.c
index bd5b6ca..63eab28 100644
--- a/src/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.c
+++ b/src/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h>
+#include <osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h>
 
 static int
 memb_raB_DataForwardingList_SRNS_CtxReq_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-DataForwardingList.c b/src/ranap/RANAP_RAB-DataForwardingList.c
index 6ddc74c..a80d4cd 100644
--- a/src/ranap/RANAP_RAB-DataForwardingList.c
+++ b/src/ranap/RANAP_RAB-DataForwardingList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingList.h>
+#include <osmocom/ranap/RANAP_RAB-DataForwardingList.h>
 
 static int
 memb_raB_DataForwardingList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-DataVolumeReportItem.c b/src/ranap/RANAP_RAB-DataVolumeReportItem.c
index b0e8859..bf9a9fa 100644
--- a/src/ranap/RANAP_RAB-DataVolumeReportItem.c
+++ b/src/ranap/RANAP_RAB-DataVolumeReportItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportItem.h>
+#include <osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_DataVolumeReportItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_DataVolumeReportItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-DataVolumeReportList.c b/src/ranap/RANAP_RAB-DataVolumeReportList.c
index f2c0bc8..7730e59 100644
--- a/src/ranap/RANAP_RAB-DataVolumeReportList.c
+++ b/src/ranap/RANAP_RAB-DataVolumeReportList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportList.h>
+#include <osmocom/ranap/RANAP_RAB-DataVolumeReportList.h>
 
 static int
 memb_raB_DataVolumeReportList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-DataVolumeReportRequestItem.c b/src/ranap/RANAP_RAB-DataVolumeReportRequestItem.c
index de29284..a0fcba9 100644
--- a/src/ranap/RANAP_RAB-DataVolumeReportRequestItem.c
+++ b/src/ranap/RANAP_RAB-DataVolumeReportRequestItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportRequestItem.h>
+#include <osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_DataVolumeReportRequestItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_DataVolumeReportRequestItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-DataVolumeReportRequestList.c b/src/ranap/RANAP_RAB-DataVolumeReportRequestList.c
index 4c7e164..716f578 100644
--- a/src/ranap/RANAP_RAB-DataVolumeReportRequestList.c
+++ b/src/ranap/RANAP_RAB-DataVolumeReportRequestList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportRequestList.h>
+#include <osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h>
 
 static int
 memb_raB_DataVolumeReportRequestList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.c b/src/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.c
index addb680..c44192c 100644
--- a/src/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.c
+++ b/src/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h>
+#include <osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_FailedItem_EnhRelocInfoRes_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_FailedItem_EnhRelocInfoRes, cN_DomainIndicator),
diff --git a/src/ranap/RANAP_RAB-FailedItem.c b/src/ranap/RANAP_RAB-FailedItem.c
index b22a7ac..db248df 100644
--- a/src/ranap/RANAP_RAB-FailedItem.c
+++ b/src/ranap/RANAP_RAB-FailedItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedItem.h>
+#include <osmocom/ranap/RANAP_RAB-FailedItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_FailedItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_FailedItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.c b/src/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.c
index f214070..5fe38a7 100644
--- a/src/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.c
+++ b/src/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h>
+#include <osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h>
 
 static int
 memb_raB_FailedList_EnhRelocInfoRes_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-FailedList.c b/src/ranap/RANAP_RAB-FailedList.c
index d1937b6..8bea44d 100644
--- a/src/ranap/RANAP_RAB-FailedList.c
+++ b/src/ranap/RANAP_RAB-FailedList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedList.h>
+#include <osmocom/ranap/RANAP_RAB-FailedList.h>
 
 static int
 memb_raB_FailedList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ID.c b/src/ranap/RANAP_RAB-ID.c
index d57c088..6351672 100644
--- a/src/ranap/RANAP_RAB-ID.c
+++ b/src/ranap/RANAP_RAB-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
 
 int
 RANAP_RAB_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-IE-ContainerList.c b/src/ranap/RANAP_RAB-IE-ContainerList.c
index 6bd82dd..1f3009a 100644
--- a/src/ranap/RANAP_RAB-IE-ContainerList.c
+++ b/src/ranap/RANAP_RAB-IE-ContainerList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-IE-ContainerList.h>
+#include <osmocom/ranap/RANAP_RAB-IE-ContainerList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAB_IE_ContainerList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RAB-IE-ContainerPairList.c b/src/ranap/RANAP_RAB-IE-ContainerPairList.c
index 0add501..02b3182 100644
--- a/src/ranap/RANAP_RAB-IE-ContainerPairList.c
+++ b/src/ranap/RANAP_RAB-IE-ContainerPairList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-IE-ContainerPairList.h>
+#include <osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAB_IE_ContainerPairList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RAB-ModifyItem.c b/src/ranap/RANAP_RAB-ModifyItem.c
index c108e02..b8e6ec4 100644
--- a/src/ranap/RANAP_RAB-ModifyItem.c
+++ b/src/ranap/RANAP_RAB-ModifyItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ModifyItem.h>
+#include <osmocom/ranap/RANAP_RAB-ModifyItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_ModifyItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_ModifyItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-ModifyList.c b/src/ranap/RANAP_RAB-ModifyList.c
index 12d6cee..7312683 100644
--- a/src/ranap/RANAP_RAB-ModifyList.c
+++ b/src/ranap/RANAP_RAB-ModifyList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ModifyList.h>
+#include <osmocom/ranap/RANAP_RAB-ModifyList.h>
 
 static int
 memb_raB_ModifyList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ModifyRequest.c b/src/ranap/RANAP_RAB-ModifyRequest.c
index 4d119f1..49442d6 100644
--- a/src/ranap/RANAP_RAB-ModifyRequest.c
+++ b/src/ranap/RANAP_RAB-ModifyRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ModifyRequest.h>
+#include <osmocom/ranap/RANAP_RAB-ModifyRequest.h>
 
 static int
 memb_raB_ModifyRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c b/src/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c
index e9b3a28..c3bbe2e 100644
--- a/src/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c
+++ b/src/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAB_Parameter_ExtendedGuaranteedBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.c b/src/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.c
index d6016cf..84ce71a 100644
--- a/src/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.c
+++ b/src/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAB_Parameter_ExtendedMaxBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.c b/src/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.c
index 347c494..f674fb5 100644
--- a/src/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.c
+++ b/src/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAB_Parameter_GuaranteedBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RAB-Parameter-MaxBitrateList.c b/src/ranap/RANAP_RAB-Parameter-MaxBitrateList.c
index 1aa8cce..e60048a 100644
--- a/src/ranap/RANAP_RAB-Parameter-MaxBitrateList.c
+++ b/src/ranap/RANAP_RAB-Parameter-MaxBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAB_Parameter_MaxBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RAB-Parameters.c b/src/ranap/RANAP_RAB-Parameters.c
index 6dc7d2f..0a3fb45 100644
--- a/src/ranap/RANAP_RAB-Parameters.c
+++ b/src/ranap/RANAP_RAB-Parameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_Parameters_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_Parameters, trafficClass),
diff --git a/src/ranap/RANAP_RAB-QueuedItem.c b/src/ranap/RANAP_RAB-QueuedItem.c
index 8dde04e..75a75d7 100644
--- a/src/ranap/RANAP_RAB-QueuedItem.c
+++ b/src/ranap/RANAP_RAB-QueuedItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-QueuedItem.h>
+#include <osmocom/ranap/RANAP_RAB-QueuedItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_QueuedItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_QueuedItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-QueuedList.c b/src/ranap/RANAP_RAB-QueuedList.c
index d6c62f0..c60e7b9 100644
--- a/src/ranap/RANAP_RAB-QueuedList.c
+++ b/src/ranap/RANAP_RAB-QueuedList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-QueuedList.h>
+#include <osmocom/ranap/RANAP_RAB-QueuedList.h>
 
 static int
 memb_raB_QueuedList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ReleaseFailedList.c b/src/ranap/RANAP_RAB-ReleaseFailedList.c
index 6940f08..2652a12 100644
--- a/src/ranap/RANAP_RAB-ReleaseFailedList.c
+++ b/src/ranap/RANAP_RAB-ReleaseFailedList.c
@@ -5,7 +5,7 @@
  */
 #include <constr_CHOICE.h>
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseFailedList.h>
+#include <osmocom/ranap/RANAP_RAB-ReleaseFailedList.h>
 
 int
 RANAP_RAB_ReleaseFailedList_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ReleaseItem.c b/src/ranap/RANAP_RAB-ReleaseItem.c
index 811ff0e..ef17012 100644
--- a/src/ranap/RANAP_RAB-ReleaseItem.c
+++ b/src/ranap/RANAP_RAB-ReleaseItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseItem.h>
+#include <osmocom/ranap/RANAP_RAB-ReleaseItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_ReleaseItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_ReleaseItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-ReleaseList.c b/src/ranap/RANAP_RAB-ReleaseList.c
index ac618f5..dc88f8d 100644
--- a/src/ranap/RANAP_RAB-ReleaseList.c
+++ b/src/ranap/RANAP_RAB-ReleaseList.c
@@ -5,7 +5,7 @@
  */
 #include <constr_CHOICE.h>
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseList.h>
+#include <osmocom/ranap/RANAP_RAB-ReleaseList.h>
 
 static int
 memb_raB_ReleaseList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ReleaseRequest.c b/src/ranap/RANAP_RAB-ReleaseRequest.c
index 3cef084..db6dd26 100644
--- a/src/ranap/RANAP_RAB-ReleaseRequest.c
+++ b/src/ranap/RANAP_RAB-ReleaseRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseRequest.h>
+#include <osmocom/ranap/RANAP_RAB-ReleaseRequest.h>
 
 static int
 memb_raB_ReleaseRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ReleasedItem-IuRelComp.c b/src/ranap/RANAP_RAB-ReleasedItem-IuRelComp.c
index 94df3ad..9e73bf1 100644
--- a/src/ranap/RANAP_RAB-ReleasedItem-IuRelComp.c
+++ b/src/ranap/RANAP_RAB-ReleasedItem-IuRelComp.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h>
+#include <osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_ReleasedItem_IuRelComp_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_ReleasedItem_IuRelComp, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-ReleasedItem.c b/src/ranap/RANAP_RAB-ReleasedItem.c
index c784fbc..357e7ca 100644
--- a/src/ranap/RANAP_RAB-ReleasedItem.c
+++ b/src/ranap/RANAP_RAB-ReleasedItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedItem.h>
+#include <osmocom/ranap/RANAP_RAB-ReleasedItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_ReleasedItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_ReleasedItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-ReleasedList-IuRelComp.c b/src/ranap/RANAP_RAB-ReleasedList-IuRelComp.c
index 86435a3..cce2172 100644
--- a/src/ranap/RANAP_RAB-ReleasedList-IuRelComp.c
+++ b/src/ranap/RANAP_RAB-ReleasedList-IuRelComp.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedList-IuRelComp.h>
+#include <osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h>
 
 static int
 memb_raB_ReleasedList_IuRelComp_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ReleasedList.c b/src/ranap/RANAP_RAB-ReleasedList.c
index 82fbb8d..5311ece 100644
--- a/src/ranap/RANAP_RAB-ReleasedList.c
+++ b/src/ranap/RANAP_RAB-ReleasedList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedList.h>
+#include <osmocom/ranap/RANAP_RAB-ReleasedList.h>
 
 static int
 memb_raB_ReleasedList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-RelocationReleaseItem.c b/src/ranap/RANAP_RAB-RelocationReleaseItem.c
index 9e56de4..94c199f 100644
--- a/src/ranap/RANAP_RAB-RelocationReleaseItem.c
+++ b/src/ranap/RANAP_RAB-RelocationReleaseItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-RelocationReleaseItem.h>
+#include <osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_RelocationReleaseItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_RelocationReleaseItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-RelocationReleaseList.c b/src/ranap/RANAP_RAB-RelocationReleaseList.c
index 8785813..8af6229 100644
--- a/src/ranap/RANAP_RAB-RelocationReleaseList.c
+++ b/src/ranap/RANAP_RAB-RelocationReleaseList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-RelocationReleaseList.h>
+#include <osmocom/ranap/RANAP_RAB-RelocationReleaseList.h>
 
 static int
 memb_raB_RelocationReleaseList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.c b/src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.c
index 3b30666..3b0ef4e 100644
--- a/src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.c
+++ b/src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_SetupItem_EnhRelocInfoReq_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_SetupItem_EnhRelocInfoReq, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.c b/src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.c
index 740a8d6..473902a 100644
--- a/src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.c
+++ b/src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_SetupItem_EnhRelocInfoRes_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_SetupItem_EnhRelocInfoRes, cN_DomainIndicator),
diff --git a/src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.c b/src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.c
index a0acb41..acb0766 100644
--- a/src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.c
+++ b/src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_SetupItem_EnhancedRelocCompleteReq_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_SetupItem_EnhancedRelocCompleteReq, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.c b/src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.c
index 622e172..3e47cf7 100644
--- a/src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.c
+++ b/src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_SetupItem_EnhancedRelocCompleteRes_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_SetupItem_EnhancedRelocCompleteRes, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-SetupItem-RelocReq.c b/src/ranap/RANAP_RAB-SetupItem-RelocReq.c
index b9cdfd6..ff6c26a 100644
--- a/src/ranap/RANAP_RAB-SetupItem-RelocReq.c
+++ b/src/ranap/RANAP_RAB-SetupItem-RelocReq.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-RelocReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_SetupItem_RelocReq_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_SetupItem_RelocReq, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-SetupItem-RelocReqAck.c b/src/ranap/RANAP_RAB-SetupItem-RelocReqAck.c
index 1494831..2af68cf 100644
--- a/src/ranap/RANAP_RAB-SetupItem-RelocReqAck.c
+++ b/src/ranap/RANAP_RAB-SetupItem-RelocReqAck.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-RelocReqAck.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_SetupItem_RelocReqAck_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_SetupItem_RelocReqAck, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.c b/src/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.c
index a6557ec..8764f0b 100644
--- a/src/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.c
+++ b/src/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h>
 
 static int
 memb_raB_SetupList_EnhRelocInfoReq_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.c b/src/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.c
index a4c1bab..08b3c60 100644
--- a/src/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.c
+++ b/src/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h>
 
 static int
 memb_raB_SetupList_EnhRelocInfoRes_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.c b/src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.c
index f2dadc8..5668b72 100644
--- a/src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.c
+++ b/src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h>
 
 static int
 memb_raB_SetupList_EnhancedRelocCompleteReq_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.c b/src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.c
index 468df25..aba4e14 100644
--- a/src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.c
+++ b/src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h>
 
 static int
 memb_raB_SetupList_EnhancedRelocCompleteRes_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-SetupList-RelocReq.c b/src/ranap/RANAP_RAB-SetupList-RelocReq.c
index be6c4c6..85dc110 100644
--- a/src/ranap/RANAP_RAB-SetupList-RelocReq.c
+++ b/src/ranap/RANAP_RAB-SetupList-RelocReq.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-RelocReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h>
 
 static int
 memb_raB_SetupList_RelocReq_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-SetupList-RelocReqAck.c b/src/ranap/RANAP_RAB-SetupList-RelocReqAck.c
index 2a53690..181c5fc 100644
--- a/src/ranap/RANAP_RAB-SetupList-RelocReqAck.c
+++ b/src/ranap/RANAP_RAB-SetupList-RelocReqAck.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-RelocReqAck.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h>
 
 static int
 memb_raB_SetupList_RelocReqAck_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-SetupOrModifiedItem.c b/src/ranap/RANAP_RAB-SetupOrModifiedItem.c
index 550bbdd..940ee71 100644
--- a/src/ranap/RANAP_RAB-SetupOrModifiedItem.c
+++ b/src/ranap/RANAP_RAB-SetupOrModifiedItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifiedItem.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_SetupOrModifiedItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_SetupOrModifiedItem, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-SetupOrModifiedList.c b/src/ranap/RANAP_RAB-SetupOrModifiedList.c
index fd3aeb9..1bc52c8 100644
--- a/src/ranap/RANAP_RAB-SetupOrModifiedList.c
+++ b/src/ranap/RANAP_RAB-SetupOrModifiedList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifiedList.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h>
 
 static int
 memb_raB_SetupOrModifiedList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-SetupOrModifyItemFirst.c b/src/ranap/RANAP_RAB-SetupOrModifyItemFirst.c
index 6371872..172bea3 100644
--- a/src/ranap/RANAP_RAB-SetupOrModifyItemFirst.c
+++ b/src/ranap/RANAP_RAB-SetupOrModifyItemFirst.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifyItemFirst.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_SetupOrModifyItemFirst_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_SetupOrModifyItemFirst, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-SetupOrModifyItemSecond.c b/src/ranap/RANAP_RAB-SetupOrModifyItemSecond.c
index aef3149..6f09c00 100644
--- a/src/ranap/RANAP_RAB-SetupOrModifyItemSecond.c
+++ b/src/ranap/RANAP_RAB-SetupOrModifyItemSecond.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifyItemSecond.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_SetupOrModifyItemSecond_1[] = {
 	{ ATF_POINTER, 7, offsetof(struct RANAP_RAB_SetupOrModifyItemSecond, pDP_TypeInformation),
diff --git a/src/ranap/RANAP_RAB-SetupOrModifyList.c b/src/ranap/RANAP_RAB-SetupOrModifyList.c
index 2ad93c7..a4aac71 100644
--- a/src/ranap/RANAP_RAB-SetupOrModifyList.c
+++ b/src/ranap/RANAP_RAB-SetupOrModifyList.c
@@ -5,7 +5,7 @@
  */
 #include <constr_CHOICE.h>
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifyList.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifyList.h>
 
 int
 RANAP_RAB_SetupOrModifyList_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-SubflowCombinationBitRate.c b/src/ranap/RANAP_RAB-SubflowCombinationBitRate.c
index 2049dba..c0c0185 100644
--- a/src/ranap/RANAP_RAB-SubflowCombinationBitRate.c
+++ b/src/ranap/RANAP_RAB-SubflowCombinationBitRate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SubflowCombinationBitRate.h>
+#include <osmocom/ranap/RANAP_RAB-SubflowCombinationBitRate.h>
 
 int
 RANAP_RAB_SubflowCombinationBitRate_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.c b/src/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.c
index f0682fa..ea67d32 100644
--- a/src/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.c
+++ b/src/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_ToBeReleasedItem_EnhancedRelocCompleteRes_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_ToBeReleasedItem_EnhancedRelocCompleteRes, rAB_ID),
diff --git a/src/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.c b/src/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.c
index 90ff580..762ae25 100644
--- a/src/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.c
+++ b/src/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h>
 
 static int
 memb_raB_ToBeReleasedList_EnhancedRelocCompleteRes_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAB-TrCH-Mapping.c b/src/ranap/RANAP_RAB-TrCH-Mapping.c
index 0c47b21..df4fc25 100644
--- a/src/ranap/RANAP_RAB-TrCH-Mapping.c
+++ b/src/ranap/RANAP_RAB-TrCH-Mapping.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-Mapping.h>
+#include <osmocom/ranap/RANAP_RAB-TrCH-Mapping.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAB_TrCH_Mapping_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RAB-TrCH-MappingItem.c b/src/ranap/RANAP_RAB-TrCH-MappingItem.c
index 542a0e8..97352c0 100644
--- a/src/ranap/RANAP_RAB-TrCH-MappingItem.c
+++ b/src/ranap/RANAP_RAB-TrCH-MappingItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-MappingItem.h>
+#include <osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAB_TrCH_MappingItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAB_TrCH_MappingItem, rAB_ID),
diff --git a/src/ranap/RANAP_RABDataVolumeReport.c b/src/ranap/RANAP_RABDataVolumeReport.c
index 2c540a6..6be90da 100644
--- a/src/ranap/RANAP_RABDataVolumeReport.c
+++ b/src/ranap/RANAP_RABDataVolumeReport.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RABDataVolumeReport.h>
+#include <osmocom/ranap/RANAP_RABDataVolumeReport.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RABDataVolumeReport_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RABParametersList.c b/src/ranap/RANAP_RABParametersList.c
index 68c7fa5..89fe75b 100644
--- a/src/ranap/RANAP_RABParametersList.c
+++ b/src/ranap/RANAP_RABParametersList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RABParametersList.h>
+#include <osmocom/ranap/RANAP_RABParametersList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RABParametersList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RABased.c b/src/ranap/RANAP_RABased.c
index 860e65a..5a85b8f 100644
--- a/src/ranap/RANAP_RABased.c
+++ b/src/ranap/RANAP_RABased.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RABased.h>
+#include <osmocom/ranap/RANAP_RABased.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RABased_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RABased, raiList),
diff --git a/src/ranap/RANAP_RABs-ContextFailedtoTransferItem.c b/src/ranap/RANAP_RABs-ContextFailedtoTransferItem.c
index 73c4678..5381685 100644
--- a/src/ranap/RANAP_RABs-ContextFailedtoTransferItem.c
+++ b/src/ranap/RANAP_RABs-ContextFailedtoTransferItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RABs-ContextFailedtoTransferItem.h>
+#include <osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RABs_ContextFailedtoTransferItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RABs_ContextFailedtoTransferItem, rAB_ID),
diff --git a/src/ranap/RANAP_RABs-ContextFailedtoTransferList.c b/src/ranap/RANAP_RABs-ContextFailedtoTransferList.c
index 0e1f7ec..c1c9472 100644
--- a/src/ranap/RANAP_RABs-ContextFailedtoTransferList.c
+++ b/src/ranap/RANAP_RABs-ContextFailedtoTransferList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RABs-ContextFailedtoTransferList.h>
+#include <osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h>
 
 static int
 memb_raBs_ContextFailedtoTransferList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RABs-failed-to-reportItem.c b/src/ranap/RANAP_RABs-failed-to-reportItem.c
index b08f0b1..6b797c6 100644
--- a/src/ranap/RANAP_RABs-failed-to-reportItem.c
+++ b/src/ranap/RANAP_RABs-failed-to-reportItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RABs-failed-to-reportItem.h>
+#include <osmocom/ranap/RANAP_RABs-failed-to-reportItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RABs_failed_to_reportItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RABs_failed_to_reportItem, rAB_ID),
diff --git a/src/ranap/RANAP_RABs-failed-to-reportList.c b/src/ranap/RANAP_RABs-failed-to-reportList.c
index 3ca5eac..7d3107e 100644
--- a/src/ranap/RANAP_RABs-failed-to-reportList.c
+++ b/src/ranap/RANAP_RABs-failed-to-reportList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RABs-failed-to-reportList.h>
+#include <osmocom/ranap/RANAP_RABs-failed-to-reportList.h>
 
 static int
 memb_raBs_failed_to_reportList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAC.c b/src/ranap/RANAP_RAC.c
index 46d29c8..8a4cb02 100644
--- a/src/ranap/RANAP_RAC.c
+++ b/src/ranap/RANAP_RAC.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RAC.h>
 
 int
 RANAP_RAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAI-List.c b/src/ranap/RANAP_RAI-List.c
index babf138..a39ae97 100644
--- a/src/ranap/RANAP_RAI-List.c
+++ b/src/ranap/RANAP_RAI-List.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI-List.h>
+#include <osmocom/ranap/RANAP_RAI-List.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAI_List_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RAI.c b/src/ranap/RANAP_RAI.c
index a1cf9d0..58d02f7 100644
--- a/src/ranap/RANAP_RAI.c
+++ b/src/ranap/RANAP_RAI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI.h>
+#include <osmocom/ranap/RANAP_RAI.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RAI, lAI),
diff --git a/src/ranap/RANAP_RAListofIdleModeUEs.c b/src/ranap/RANAP_RAListofIdleModeUEs.c
index 83f7415..23ff016 100644
--- a/src/ranap/RANAP_RAListofIdleModeUEs.c
+++ b/src/ranap/RANAP_RAListofIdleModeUEs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_RAListofIdleModeUEs.h>
 
 static int
 emptyFullRAListofIdleModeUEs_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.c b/src/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.c
index c03958b..b59401a 100644
--- a/src/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.c
+++ b/src/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h>
+#include <osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAListwithNoIdleModeUEsAnyMore_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.c b/src/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.c
index b144729..a2b50fe 100644
--- a/src/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.c
+++ b/src/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h>
+#include <osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h>
 
 static int
 memb_ranaP_EnhancedRelocationInformationRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.c b/src/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.c
index ab933d0..a92b060 100644
--- a/src/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.c
+++ b/src/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h>
+#include <osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h>
 
 static int
 memb_ranaP_EnhancedRelocationInformationResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RANAP-PDU.c b/src/ranap/RANAP_RANAP-PDU.c
index e1d3440..16e3aa7 100644
--- a/src/ranap/RANAP_RANAP-PDU.c
+++ b/src/ranap/RANAP_RANAP-PDU.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-PDU.h>
+#include <osmocom/ranap/RANAP_RANAP-PDU.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RANAP_PDU_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  3l }	/* (0..3,...) */,
diff --git a/src/ranap/RANAP_RANAP-RelocationInformation.c b/src/ranap/RANAP_RANAP-RelocationInformation.c
index 3f2656c..898222d 100644
--- a/src/ranap/RANAP_RANAP-RelocationInformation.c
+++ b/src/ranap/RANAP_RANAP-RelocationInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-RelocationInformation.h>
+#include <osmocom/ranap/RANAP_RANAP-RelocationInformation.h>
 
 static int
 memb_ranaP_RelocationInformation_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAT-Type.c b/src/ranap/RANAP_RAT-Type.c
index 52c7140..b507ae9 100644
--- a/src/ranap/RANAP_RAT-Type.c
+++ b/src/ranap/RANAP_RAT-Type.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAT-Type.h>
+#include <osmocom/ranap/RANAP_RAT-Type.h>
 
 int
 RANAP_RAT_Type_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RAofIdleModeUEs.c b/src/ranap/RANAP_RAofIdleModeUEs.c
index c935d56..a9a30ef 100644
--- a/src/ranap/RANAP_RAofIdleModeUEs.c
+++ b/src/ranap/RANAP_RAofIdleModeUEs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RAofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_RAofIdleModeUEs.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RAofIdleModeUEs_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RIM-Transfer.c b/src/ranap/RANAP_RIM-Transfer.c
index 7d7788e..0a69898 100644
--- a/src/ranap/RANAP_RIM-Transfer.c
+++ b/src/ranap/RANAP_RIM-Transfer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RIM-Transfer.h>
+#include <osmocom/ranap/RANAP_RIM-Transfer.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RIM_Transfer_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RIM_Transfer, rIMInformation),
diff --git a/src/ranap/RANAP_RIMInformation.c b/src/ranap/RANAP_RIMInformation.c
index f02c575..32f8d8e 100644
--- a/src/ranap/RANAP_RIMInformation.c
+++ b/src/ranap/RANAP_RIMInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RIMInformation.h>
+#include <osmocom/ranap/RANAP_RIMInformation.h>
 
 int
 RANAP_RIMInformation_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RIMRoutingAddress.c b/src/ranap/RANAP_RIMRoutingAddress.c
index 3b8e813..bc5908c 100644
--- a/src/ranap/RANAP_RIMRoutingAddress.c
+++ b/src/ranap/RANAP_RIMRoutingAddress.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RIMRoutingAddress.h>
+#include <osmocom/ranap/RANAP_RIMRoutingAddress.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RIMRoutingAddress_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_RNC-ID.c b/src/ranap/RANAP_RNC-ID.c
index 159932e..da7ee36 100644
--- a/src/ranap/RANAP_RNC-ID.c
+++ b/src/ranap/RANAP_RNC-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RNC-ID.h>
+#include <osmocom/ranap/RANAP_RNC-ID.h>
 
 int
 RANAP_RNC_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RNCTraceInformation.c b/src/ranap/RANAP_RNCTraceInformation.c
index b6f531e..fc286ae 100644
--- a/src/ranap/RANAP_RNCTraceInformation.c
+++ b/src/ranap/RANAP_RNCTraceInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RNCTraceInformation.h>
+#include <osmocom/ranap/RANAP_RNCTraceInformation.h>
 
 static int
 traceActivationIndicato_3_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RNSAPRelocationParameters.c b/src/ranap/RANAP_RNSAPRelocationParameters.c
index 3a0daed..36f860d 100644
--- a/src/ranap/RANAP_RNSAPRelocationParameters.c
+++ b/src/ranap/RANAP_RNSAPRelocationParameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RNSAPRelocationParameters.h>
+#include <osmocom/ranap/RANAP_RNSAPRelocationParameters.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RNSAPRelocationParameters_1[] = {
 	{ ATF_POINTER, 5, offsetof(struct RANAP_RNSAPRelocationParameters, rabParmetersList),
diff --git a/src/ranap/RANAP_RRC-Container.c b/src/ranap/RANAP_RRC-Container.c
index 16c3790..f994c1f 100644
--- a/src/ranap/RANAP_RRC-Container.c
+++ b/src/ranap/RANAP_RRC-Container.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RRC-Container.h>
+#include <osmocom/ranap/RANAP_RRC-Container.h>
 
 int
 RANAP_RRC_Container_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RSRQ-Extension.c b/src/ranap/RANAP_RSRQ-Extension.c
index 7975dd7..0cc3591 100644
--- a/src/ranap/RANAP_RSRQ-Extension.c
+++ b/src/ranap/RANAP_RSRQ-Extension.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRQ-Extension.h>
+#include <osmocom/ranap/RANAP_RSRQ-Extension.h>
 
 int
 RANAP_RSRQ_Extension_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RSRQ-Type.c b/src/ranap/RANAP_RSRQ-Type.c
index cb2a14a..592c19b 100644
--- a/src/ranap/RANAP_RSRQ-Type.c
+++ b/src/ranap/RANAP_RSRQ-Type.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRQ-Type.h>
+#include <osmocom/ranap/RANAP_RSRQ-Type.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_RSRQ_Type_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_RSRQ_Type, allSymbols),
diff --git a/src/ranap/RANAP_RSRVCC-HO-Indication.c b/src/ranap/RANAP_RSRVCC-HO-Indication.c
index 4438b3e..0e6784d 100644
--- a/src/ranap/RANAP_RSRVCC-HO-Indication.c
+++ b/src/ranap/RANAP_RSRVCC-HO-Indication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRVCC-HO-Indication.h>
+#include <osmocom/ranap/RANAP_RSRVCC-HO-Indication.h>
 
 int
 RANAP_RSRVCC_HO_Indication_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RSRVCC-Information.c b/src/ranap/RANAP_RSRVCC-Information.c
index a82af4f..9993bcd 100644
--- a/src/ranap/RANAP_RSRVCC-Information.c
+++ b/src/ranap/RANAP_RSRVCC-Information.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRVCC-Information.h>
+#include <osmocom/ranap/RANAP_RSRVCC-Information.h>
 
 static int
 memb_nonce_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RSRVCC-Operation-Possible.c b/src/ranap/RANAP_RSRVCC-Operation-Possible.c
index 64ee9c8..b29659f 100644
--- a/src/ranap/RANAP_RSRVCC-Operation-Possible.c
+++ b/src/ranap/RANAP_RSRVCC-Operation-Possible.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRVCC-Operation-Possible.h>
+#include <osmocom/ranap/RANAP_RSRVCC-Operation-Possible.h>
 
 int
 RANAP_RSRVCC_Operation_Possible_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RTLoadValue.c b/src/ranap/RANAP_RTLoadValue.c
index 588e039..607d645 100644
--- a/src/ranap/RANAP_RTLoadValue.c
+++ b/src/ranap/RANAP_RTLoadValue.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RTLoadValue.h>
+#include <osmocom/ranap/RANAP_RTLoadValue.h>
 
 int
 RANAP_RTLoadValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RateControlAllowed.c b/src/ranap/RANAP_RateControlAllowed.c
index 1316b79..d6b04d9 100644
--- a/src/ranap/RANAP_RateControlAllowed.c
+++ b/src/ranap/RANAP_RateControlAllowed.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RateControlAllowed.h>
+#include <osmocom/ranap/RANAP_RateControlAllowed.h>
 
 int
 RANAP_RateControlAllowed_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RedirectAttemptFlag.c b/src/ranap/RANAP_RedirectAttemptFlag.c
index 908d780..0a822ff 100644
--- a/src/ranap/RANAP_RedirectAttemptFlag.c
+++ b/src/ranap/RANAP_RedirectAttemptFlag.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RedirectAttemptFlag.h>
+#include <osmocom/ranap/RANAP_RedirectAttemptFlag.h>
 
 int
 RANAP_RedirectAttemptFlag_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RedirectionCompleted.c b/src/ranap/RANAP_RedirectionCompleted.c
index 62a78bf..e3d370a 100644
--- a/src/ranap/RANAP_RedirectionCompleted.c
+++ b/src/ranap/RANAP_RedirectionCompleted.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RedirectionCompleted.h>
+#include <osmocom/ranap/RANAP_RedirectionCompleted.h>
 
 int
 RANAP_RedirectionCompleted_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RedirectionIndication.c b/src/ranap/RANAP_RedirectionIndication.c
index 0cbbda9..f3f7999 100644
--- a/src/ranap/RANAP_RedirectionIndication.c
+++ b/src/ranap/RANAP_RedirectionIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RedirectionIndication.h>
+#include <osmocom/ranap/RANAP_RedirectionIndication.h>
 
 static int
 memb_redirectionIndication_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RejectCauseValue.c b/src/ranap/RANAP_RejectCauseValue.c
index 44d7ce7..a2c23be 100644
--- a/src/ranap/RANAP_RejectCauseValue.c
+++ b/src/ranap/RANAP_RejectCauseValue.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RejectCauseValue.h>
+#include <osmocom/ranap/RANAP_RejectCauseValue.h>
 
 int
 RANAP_RejectCauseValue_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationCancel.c b/src/ranap/RANAP_RelocationCancel.c
index b761298..974d023 100644
--- a/src/ranap/RANAP_RelocationCancel.c
+++ b/src/ranap/RANAP_RelocationCancel.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationCancel.h>
+#include <osmocom/ranap/RANAP_RelocationCancel.h>
 
 static int
 memb_relocationCancel_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationCancelAcknowledge.c b/src/ranap/RANAP_RelocationCancelAcknowledge.c
index 27fa334..9df08cf 100644
--- a/src/ranap/RANAP_RelocationCancelAcknowledge.c
+++ b/src/ranap/RANAP_RelocationCancelAcknowledge.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationCancelAcknowledge.h>
+#include <osmocom/ranap/RANAP_RelocationCancelAcknowledge.h>
 
 static int
 memb_relocationCancelAcknowledge_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationCommand.c b/src/ranap/RANAP_RelocationCommand.c
index dbb8fd5..69d0d02 100644
--- a/src/ranap/RANAP_RelocationCommand.c
+++ b/src/ranap/RANAP_RelocationCommand.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationCommand.h>
+#include <osmocom/ranap/RANAP_RelocationCommand.h>
 
 static int
 memb_relocationCommand_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationComplete.c b/src/ranap/RANAP_RelocationComplete.c
index 39a899a..a854c0f 100644
--- a/src/ranap/RANAP_RelocationComplete.c
+++ b/src/ranap/RANAP_RelocationComplete.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationComplete.h>
+#include <osmocom/ranap/RANAP_RelocationComplete.h>
 
 static int
 memb_relocationComplete_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationDetect.c b/src/ranap/RANAP_RelocationDetect.c
index 198e069..0c51fd7 100644
--- a/src/ranap/RANAP_RelocationDetect.c
+++ b/src/ranap/RANAP_RelocationDetect.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationDetect.h>
+#include <osmocom/ranap/RANAP_RelocationDetect.h>
 
 static int
 memb_relocationDetect_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationFailure.c b/src/ranap/RANAP_RelocationFailure.c
index 4c7cb8c..7bed97e 100644
--- a/src/ranap/RANAP_RelocationFailure.c
+++ b/src/ranap/RANAP_RelocationFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationFailure.h>
+#include <osmocom/ranap/RANAP_RelocationFailure.h>
 
 static int
 memb_relocationFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationPreparationFailure.c b/src/ranap/RANAP_RelocationPreparationFailure.c
index 607e62b..17431ab 100644
--- a/src/ranap/RANAP_RelocationPreparationFailure.c
+++ b/src/ranap/RANAP_RelocationPreparationFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationPreparationFailure.h>
+#include <osmocom/ranap/RANAP_RelocationPreparationFailure.h>
 
 static int
 memb_relocationPreparationFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationRequest.c b/src/ranap/RANAP_RelocationRequest.c
index b02b58f..2218e44 100644
--- a/src/ranap/RANAP_RelocationRequest.c
+++ b/src/ranap/RANAP_RelocationRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequest.h>
+#include <osmocom/ranap/RANAP_RelocationRequest.h>
 
 static int
 memb_relocationRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationRequestAcknowledge.c b/src/ranap/RANAP_RelocationRequestAcknowledge.c
index c96b1af..383981e 100644
--- a/src/ranap/RANAP_RelocationRequestAcknowledge.c
+++ b/src/ranap/RANAP_RelocationRequestAcknowledge.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequestAcknowledge.h>
+#include <osmocom/ranap/RANAP_RelocationRequestAcknowledge.h>
 
 static int
 memb_relocationRequestAcknowledge_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationRequired.c b/src/ranap/RANAP_RelocationRequired.c
index decb98c..ec351f5 100644
--- a/src/ranap/RANAP_RelocationRequired.c
+++ b/src/ranap/RANAP_RelocationRequired.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequired.h>
+#include <osmocom/ranap/RANAP_RelocationRequired.h>
 
 static int
 memb_relocationRequired_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationRequirement.c b/src/ranap/RANAP_RelocationRequirement.c
index 57f4ed2..95b6bbf 100644
--- a/src/ranap/RANAP_RelocationRequirement.c
+++ b/src/ranap/RANAP_RelocationRequirement.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequirement.h>
+#include <osmocom/ranap/RANAP_RelocationRequirement.h>
 
 int
 RANAP_RelocationRequirement_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RelocationType.c b/src/ranap/RANAP_RelocationType.c
index 89e418f..bfb9d8d 100644
--- a/src/ranap/RANAP_RelocationType.c
+++ b/src/ranap/RANAP_RelocationType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationType.h>
+#include <osmocom/ranap/RANAP_RelocationType.h>
 
 int
 RANAP_RelocationType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RepetitionNumber0.c b/src/ranap/RANAP_RepetitionNumber0.c
index 8816d47..c42b055 100644
--- a/src/ranap/RANAP_RepetitionNumber0.c
+++ b/src/ranap/RANAP_RepetitionNumber0.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber0.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber0.h>
 
 int
 RANAP_RepetitionNumber0_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RepetitionNumber1.c b/src/ranap/RANAP_RepetitionNumber1.c
index b68e77b..01269f1 100644
--- a/src/ranap/RANAP_RepetitionNumber1.c
+++ b/src/ranap/RANAP_RepetitionNumber1.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber1.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber1.h>
 
 int
 RANAP_RepetitionNumber1_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ReportAmount.c b/src/ranap/RANAP_ReportAmount.c
index 7780552..ce6c411 100644
--- a/src/ranap/RANAP_ReportAmount.c
+++ b/src/ranap/RANAP_ReportAmount.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportAmount.h>
+#include <osmocom/ranap/RANAP_ReportAmount.h>
 
 int
 RANAP_ReportAmount_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ReportArea.c b/src/ranap/RANAP_ReportArea.c
index e26489e..d5a293c 100644
--- a/src/ranap/RANAP_ReportArea.c
+++ b/src/ranap/RANAP_ReportArea.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportArea.h>
+#include <osmocom/ranap/RANAP_ReportArea.h>
 
 int
 RANAP_ReportArea_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ReportChangeOfSAI.c b/src/ranap/RANAP_ReportChangeOfSAI.c
index df29079..f169890 100644
--- a/src/ranap/RANAP_ReportChangeOfSAI.c
+++ b/src/ranap/RANAP_ReportChangeOfSAI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportChangeOfSAI.h>
+#include <osmocom/ranap/RANAP_ReportChangeOfSAI.h>
 
 int
 RANAP_ReportChangeOfSAI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ReportInterval.c b/src/ranap/RANAP_ReportInterval.c
index 89d718e..1bee993 100644
--- a/src/ranap/RANAP_ReportInterval.c
+++ b/src/ranap/RANAP_ReportInterval.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportInterval.h>
+#include <osmocom/ranap/RANAP_ReportInterval.h>
 
 int
 RANAP_ReportInterval_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RequestType.c b/src/ranap/RANAP_RequestType.c
index 9c0a33d..ba6e1a8 100644
--- a/src/ranap/RANAP_RequestType.c
+++ b/src/ranap/RANAP_RequestType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestType.h>
+#include <osmocom/ranap/RANAP_RequestType.h>
 
 static int
 memb_accuracyCode_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.c b/src/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.c
index c23bfed..4c65e68 100644
--- a/src/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.c
+++ b/src/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Requested_RAB_Parameter_ExtendedGuaranteedBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.c b/src/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.c
index 629edd3..1150e5b 100644
--- a/src/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.c
+++ b/src/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Requested_RAB_Parameter_ExtendedMaxBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.c b/src/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.c
index ab57481..ad2b9ba 100644
--- a/src/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.c
+++ b/src/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Requested_RAB_Parameter_GuaranteedBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.c b/src/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.c
index 17a552a..2aad1ad 100644
--- a/src/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.c
+++ b/src/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_Requested_RAB_Parameter_MaxBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Requested-RAB-Parameter-Values.c b/src/ranap/RANAP_Requested-RAB-Parameter-Values.c
index be06d6b..0279887 100644
--- a/src/ranap/RANAP_Requested-RAB-Parameter-Values.c
+++ b/src/ranap/RANAP_Requested-RAB-Parameter-Values.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-Values.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Requested_RAB_Parameter_Values_1[] = {
 	{ ATF_POINTER, 3, offsetof(struct RANAP_Requested_RAB_Parameter_Values, requestedMaxBitrates),
diff --git a/src/ranap/RANAP_RequestedGANSSAssistanceData.c b/src/ranap/RANAP_RequestedGANSSAssistanceData.c
index 61f8d9e..e18a3bd 100644
--- a/src/ranap/RANAP_RequestedGANSSAssistanceData.c
+++ b/src/ranap/RANAP_RequestedGANSSAssistanceData.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedGANSSAssistanceData.h>
+#include <osmocom/ranap/RANAP_RequestedGANSSAssistanceData.h>
 
 int
 RANAP_RequestedGANSSAssistanceData_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RequestedGPSAssistanceData.c b/src/ranap/RANAP_RequestedGPSAssistanceData.c
index d91df27..139e0b9 100644
--- a/src/ranap/RANAP_RequestedGPSAssistanceData.c
+++ b/src/ranap/RANAP_RequestedGPSAssistanceData.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedGPSAssistanceData.h>
+#include <osmocom/ranap/RANAP_RequestedGPSAssistanceData.h>
 
 int
 RANAP_RequestedGPSAssistanceData_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RequestedLocationRelatedDataType.c b/src/ranap/RANAP_RequestedLocationRelatedDataType.c
index 62a1f17..ca84208 100644
--- a/src/ranap/RANAP_RequestedLocationRelatedDataType.c
+++ b/src/ranap/RANAP_RequestedLocationRelatedDataType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedLocationRelatedDataType.h>
+#include <osmocom/ranap/RANAP_RequestedLocationRelatedDataType.h>
 
 int
 RANAP_RequestedLocationRelatedDataType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.c b/src/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.c
index 19fd144..23262f9 100644
--- a/src/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.c
+++ b/src/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RequestedMBMSIPMulticastAddressandAPNRequest_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_RequestedMulticastServiceList.c b/src/ranap/RANAP_RequestedMulticastServiceList.c
index cea66d2..398b14d 100644
--- a/src/ranap/RANAP_RequestedMulticastServiceList.c
+++ b/src/ranap/RANAP_RequestedMulticastServiceList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMulticastServiceList.h>
+#include <osmocom/ranap/RANAP_RequestedMulticastServiceList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_RequestedMulticastServiceList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_Reset.c b/src/ranap/RANAP_Reset.c
index 7905e30..c8e20d8 100644
--- a/src/ranap/RANAP_Reset.c
+++ b/src/ranap/RANAP_Reset.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Reset.h>
+#include <osmocom/ranap/RANAP_Reset.h>
 
 static int
 memb_reset_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ResetAcknowledge.c b/src/ranap/RANAP_ResetAcknowledge.c
index f35ea06..e266309 100644
--- a/src/ranap/RANAP_ResetAcknowledge.c
+++ b/src/ranap/RANAP_ResetAcknowledge.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetAcknowledge.h>
+#include <osmocom/ranap/RANAP_ResetAcknowledge.h>
 
 static int
 memb_resetAcknowledge_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ResetResource.c b/src/ranap/RANAP_ResetResource.c
index 0dc252c..68cd027 100644
--- a/src/ranap/RANAP_ResetResource.c
+++ b/src/ranap/RANAP_ResetResource.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResource.h>
+#include <osmocom/ranap/RANAP_ResetResource.h>
 
 static int
 memb_resetResource_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ResetResourceAckItem.c b/src/ranap/RANAP_ResetResourceAckItem.c
index 20a7d97..db1a117 100644
--- a/src/ranap/RANAP_ResetResourceAckItem.c
+++ b/src/ranap/RANAP_ResetResourceAckItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceAckItem.h>
+#include <osmocom/ranap/RANAP_ResetResourceAckItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_ResetResourceAckItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_ResetResourceAckItem, iuSigConId),
diff --git a/src/ranap/RANAP_ResetResourceAckList.c b/src/ranap/RANAP_ResetResourceAckList.c
index 22b53a1..6a47218 100644
--- a/src/ranap/RANAP_ResetResourceAckList.c
+++ b/src/ranap/RANAP_ResetResourceAckList.c
@@ -5,7 +5,7 @@
  */
 #include <constr_CHOICE.h>
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceAckList.h>
+#include <osmocom/ranap/RANAP_ResetResourceAckList.h>
 
 static int
 memb_resetResourceAckList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ResetResourceAcknowledge.c b/src/ranap/RANAP_ResetResourceAcknowledge.c
index aa52445..116abb1 100644
--- a/src/ranap/RANAP_ResetResourceAcknowledge.c
+++ b/src/ranap/RANAP_ResetResourceAcknowledge.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceAcknowledge.h>
+#include <osmocom/ranap/RANAP_ResetResourceAcknowledge.h>
 
 static int
 memb_resetResourceAcknowledge_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ResetResourceItem.c b/src/ranap/RANAP_ResetResourceItem.c
index 5782631..f541b5b 100644
--- a/src/ranap/RANAP_ResetResourceItem.c
+++ b/src/ranap/RANAP_ResetResourceItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceItem.h>
+#include <osmocom/ranap/RANAP_ResetResourceItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_ResetResourceItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_ResetResourceItem, iuSigConId),
diff --git a/src/ranap/RANAP_ResetResourceList.c b/src/ranap/RANAP_ResetResourceList.c
index d8c7650..6d1faf8 100644
--- a/src/ranap/RANAP_ResetResourceList.c
+++ b/src/ranap/RANAP_ResetResourceList.c
@@ -5,7 +5,7 @@
  */
 #include <constr_CHOICE.h>
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceList.h>
+#include <osmocom/ranap/RANAP_ResetResourceList.h>
 
 static int
 memb_resetResourceList_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ResidualBitErrorRatio.c b/src/ranap/RANAP_ResidualBitErrorRatio.c
index 67d8e19..ae010ab 100644
--- a/src/ranap/RANAP_ResidualBitErrorRatio.c
+++ b/src/ranap/RANAP_ResidualBitErrorRatio.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ResidualBitErrorRatio.h>
+#include <osmocom/ranap/RANAP_ResidualBitErrorRatio.h>
 
 static int
 memb_mantissa_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_ResponseTime.c b/src/ranap/RANAP_ResponseTime.c
index 0ba6c10..4b1f270 100644
--- a/src/ranap/RANAP_ResponseTime.c
+++ b/src/ranap/RANAP_ResponseTime.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_ResponseTime.h>
+#include <osmocom/ranap/RANAP_ResponseTime.h>
 
 int
 RANAP_ResponseTime_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SAC.c b/src/ranap/RANAP_SAC.c
index 03e057d..70ae666 100644
--- a/src/ranap/RANAP_SAC.c
+++ b/src/ranap/RANAP_SAC.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SAC.h>
+#include <osmocom/ranap/RANAP_SAC.h>
 
 int
 RANAP_SAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SAI.c b/src/ranap/RANAP_SAI.c
index 034ff8f..786c4ed 100644
--- a/src/ranap/RANAP_SAI.c
+++ b/src/ranap/RANAP_SAI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_SAI.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_SAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_SAI, pLMNidentity),
diff --git a/src/ranap/RANAP_SAPI.c b/src/ranap/RANAP_SAPI.c
index e26b6d4..10761b3 100644
--- a/src/ranap/RANAP_SAPI.c
+++ b/src/ranap/RANAP_SAPI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SAPI.h>
+#include <osmocom/ranap/RANAP_SAPI.h>
 
 int
 RANAP_SAPI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SDU-ErrorRatio.c b/src/ranap/RANAP_SDU-ErrorRatio.c
index 81ae14b..84ebb05 100644
--- a/src/ranap/RANAP_SDU-ErrorRatio.c
+++ b/src/ranap/RANAP_SDU-ErrorRatio.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ErrorRatio.h>
+#include <osmocom/ranap/RANAP_SDU-ErrorRatio.h>
 
 static int
 memb_mantissa_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SDU-FormatInformationParameterItem.c b/src/ranap/RANAP_SDU-FormatInformationParameterItem.c
index 8175005..99a2ca6 100644
--- a/src/ranap/RANAP_SDU-FormatInformationParameterItem.c
+++ b/src/ranap/RANAP_SDU-FormatInformationParameterItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameterItem.h>
+#include <osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_SDU_FormatInformationParameterItem_1[] = {
 	{ ATF_POINTER, 3, offsetof(struct RANAP_SDU_FormatInformationParameterItem, subflowSDU_Size),
diff --git a/src/ranap/RANAP_SDU-FormatInformationParameters.c b/src/ranap/RANAP_SDU-FormatInformationParameters.c
index 22583b8..01248c6 100644
--- a/src/ranap/RANAP_SDU-FormatInformationParameters.c
+++ b/src/ranap/RANAP_SDU-FormatInformationParameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameters.h>
+#include <osmocom/ranap/RANAP_SDU-FormatInformationParameters.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_SDU_FormatInformationParameters_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_SDU-ParameterItem.c b/src/ranap/RANAP_SDU-ParameterItem.c
index 2bcda39..cba8fbe 100644
--- a/src/ranap/RANAP_SDU-ParameterItem.c
+++ b/src/ranap/RANAP_SDU-ParameterItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ParameterItem.h>
+#include <osmocom/ranap/RANAP_SDU-ParameterItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_SDU_ParameterItem_1[] = {
 	{ ATF_POINTER, 1, offsetof(struct RANAP_SDU_ParameterItem, sDU_ErrorRatio),
diff --git a/src/ranap/RANAP_SDU-Parameters.c b/src/ranap/RANAP_SDU-Parameters.c
index f3dedda..c8f27da 100644
--- a/src/ranap/RANAP_SDU-Parameters.c
+++ b/src/ranap/RANAP_SDU-Parameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-Parameters.h>
+#include <osmocom/ranap/RANAP_SDU-Parameters.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_SDU_Parameters_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_SNA-Access-Information.c b/src/ranap/RANAP_SNA-Access-Information.c
index defae17..f6867f0 100644
--- a/src/ranap/RANAP_SNA-Access-Information.c
+++ b/src/ranap/RANAP_SNA-Access-Information.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SNA-Access-Information.h>
+#include <osmocom/ranap/RANAP_SNA-Access-Information.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_SNA_Access_Information_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_SNA_Access_Information, authorisedPLMNs),
diff --git a/src/ranap/RANAP_SNAC.c b/src/ranap/RANAP_SNAC.c
index 74881d3..0bb1399 100644
--- a/src/ranap/RANAP_SNAC.c
+++ b/src/ranap/RANAP_SNAC.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SNAC.h>
+#include <osmocom/ranap/RANAP_SNAC.h>
 
 int
 RANAP_SNAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SRB-ID.c b/src/ranap/RANAP_SRB-ID.c
index ed19c21..777b117 100644
--- a/src/ranap/RANAP_SRB-ID.c
+++ b/src/ranap/RANAP_SRB-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-ID.h>
+#include <osmocom/ranap/RANAP_SRB-ID.h>
 
 int
 RANAP_SRB_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SRB-TrCH-Mapping.c b/src/ranap/RANAP_SRB-TrCH-Mapping.c
index dfbaa1b..3ff0d0f 100644
--- a/src/ranap/RANAP_SRB-TrCH-Mapping.c
+++ b/src/ranap/RANAP_SRB-TrCH-Mapping.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-TrCH-Mapping.h>
+#include <osmocom/ranap/RANAP_SRB-TrCH-Mapping.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_SRB_TrCH_Mapping_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_SRB-TrCH-MappingItem.c b/src/ranap/RANAP_SRB-TrCH-MappingItem.c
index b37394c..5de2fea 100644
--- a/src/ranap/RANAP_SRB-TrCH-MappingItem.c
+++ b/src/ranap/RANAP_SRB-TrCH-MappingItem.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-TrCH-MappingItem.h>
+#include <osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_SRB_TrCH_MappingItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_SRB_TrCH_MappingItem, sRB_ID),
diff --git a/src/ranap/RANAP_SRNS-ContextRequest.c b/src/ranap/RANAP_SRNS-ContextRequest.c
index b85770f..b701e34 100644
--- a/src/ranap/RANAP_SRNS-ContextRequest.c
+++ b/src/ranap/RANAP_SRNS-ContextRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRNS-ContextRequest.h>
+#include <osmocom/ranap/RANAP_SRNS-ContextRequest.h>
 
 static int
 memb_srnS_ContextRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SRNS-ContextResponse.c b/src/ranap/RANAP_SRNS-ContextResponse.c
index 9db724b..392ff04 100644
--- a/src/ranap/RANAP_SRNS-ContextResponse.c
+++ b/src/ranap/RANAP_SRNS-ContextResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRNS-ContextResponse.h>
+#include <osmocom/ranap/RANAP_SRNS-ContextResponse.h>
 
 static int
 memb_srnS_ContextResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SRNS-DataForwardCommand.c b/src/ranap/RANAP_SRNS-DataForwardCommand.c
index 54562e6..8044a32 100644
--- a/src/ranap/RANAP_SRNS-DataForwardCommand.c
+++ b/src/ranap/RANAP_SRNS-DataForwardCommand.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRNS-DataForwardCommand.h>
+#include <osmocom/ranap/RANAP_SRNS-DataForwardCommand.h>
 
 static int
 memb_srnS_DataForwardCommand_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SRVCC-CSKeysRequest.c b/src/ranap/RANAP_SRVCC-CSKeysRequest.c
index 57c8955..e7a6c14 100644
--- a/src/ranap/RANAP_SRVCC-CSKeysRequest.c
+++ b/src/ranap/RANAP_SRVCC-CSKeysRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-CSKeysRequest.h>
+#include <osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h>
 
 static int
 memb_srvcC_CSKeysRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SRVCC-CSKeysResponse.c b/src/ranap/RANAP_SRVCC-CSKeysResponse.c
index 4b2578a..c484f32 100644
--- a/src/ranap/RANAP_SRVCC-CSKeysResponse.c
+++ b/src/ranap/RANAP_SRVCC-CSKeysResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-CSKeysResponse.h>
+#include <osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h>
 
 static int
 memb_srvcC_CSKeysResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SRVCC-HO-Indication.c b/src/ranap/RANAP_SRVCC-HO-Indication.c
index 31d3e8d..7c77cb7 100644
--- a/src/ranap/RANAP_SRVCC-HO-Indication.c
+++ b/src/ranap/RANAP_SRVCC-HO-Indication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-HO-Indication.h>
+#include <osmocom/ranap/RANAP_SRVCC-HO-Indication.h>
 
 int
 RANAP_SRVCC_HO_Indication_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SRVCC-Information.c b/src/ranap/RANAP_SRVCC-Information.c
index 43bde81..bd781e0 100644
--- a/src/ranap/RANAP_SRVCC-Information.c
+++ b/src/ranap/RANAP_SRVCC-Information.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-Information.h>
+#include <osmocom/ranap/RANAP_SRVCC-Information.h>
 
 static int
 memb_nonce_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SRVCC-Operation-Possible.c b/src/ranap/RANAP_SRVCC-Operation-Possible.c
index 0deff50..6473456 100644
--- a/src/ranap/RANAP_SRVCC-Operation-Possible.c
+++ b/src/ranap/RANAP_SRVCC-Operation-Possible.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-Operation-Possible.h>
+#include <osmocom/ranap/RANAP_SRVCC-Operation-Possible.h>
 
 int
 RANAP_SRVCC_Operation_Possible_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SecurityModeCommand.c b/src/ranap/RANAP_SecurityModeCommand.c
index 8ce9b1e..b4eb8b1 100644
--- a/src/ranap/RANAP_SecurityModeCommand.c
+++ b/src/ranap/RANAP_SecurityModeCommand.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SecurityModeCommand.h>
+#include <osmocom/ranap/RANAP_SecurityModeCommand.h>
 
 static int
 memb_securityModeCommand_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SecurityModeComplete.c b/src/ranap/RANAP_SecurityModeComplete.c
index 35f88ba..36cf2bd 100644
--- a/src/ranap/RANAP_SecurityModeComplete.c
+++ b/src/ranap/RANAP_SecurityModeComplete.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SecurityModeComplete.h>
+#include <osmocom/ranap/RANAP_SecurityModeComplete.h>
 
 static int
 memb_securityModeComplete_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SecurityModeReject.c b/src/ranap/RANAP_SecurityModeReject.c
index b517360..778d327 100644
--- a/src/ranap/RANAP_SecurityModeReject.c
+++ b/src/ranap/RANAP_SecurityModeReject.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SecurityModeReject.h>
+#include <osmocom/ranap/RANAP_SecurityModeReject.h>
 
 static int
 memb_securityModeReject_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Service-Handover.c b/src/ranap/RANAP_Service-Handover.c
index a9b17d5..2acae33 100644
--- a/src/ranap/RANAP_Service-Handover.c
+++ b/src/ranap/RANAP_Service-Handover.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Service-Handover.h>
+#include <osmocom/ranap/RANAP_Service-Handover.h>
 
 int
 RANAP_Service_Handover_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Session-Re-establishment-Indicator.c b/src/ranap/RANAP_Session-Re-establishment-Indicator.c
index eba2a24..1223002 100644
--- a/src/ranap/RANAP_Session-Re-establishment-Indicator.c
+++ b/src/ranap/RANAP_Session-Re-establishment-Indicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Session-Re-establishment-Indicator.h>
+#include <osmocom/ranap/RANAP_Session-Re-establishment-Indicator.h>
 
 int
 RANAP_Session_Re_establishment_Indicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SessionUpdateID.c b/src/ranap/RANAP_SessionUpdateID.c
index a8c4530..2c5ade2 100644
--- a/src/ranap/RANAP_SessionUpdateID.c
+++ b/src/ranap/RANAP_SessionUpdateID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SessionUpdateID.h>
+#include <osmocom/ranap/RANAP_SessionUpdateID.h>
 
 int
 RANAP_SessionUpdateID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Shared-Network-Information.c b/src/ranap/RANAP_Shared-Network-Information.c
index 5a07fda..66ef42d 100644
--- a/src/ranap/RANAP_Shared-Network-Information.c
+++ b/src/ranap/RANAP_Shared-Network-Information.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Shared-Network-Information.h>
+#include <osmocom/ranap/RANAP_Shared-Network-Information.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_Shared_Network_Information_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_Shared_Network_Information, pLMNs_in_shared_network),
diff --git a/src/ranap/RANAP_SignallingIndication.c b/src/ranap/RANAP_SignallingIndication.c
index 9e314eb..4f494a6 100644
--- a/src/ranap/RANAP_SignallingIndication.c
+++ b/src/ranap/RANAP_SignallingIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SignallingIndication.h>
+#include <osmocom/ranap/RANAP_SignallingIndication.h>
 
 int
 RANAP_SignallingIndication_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Source-ToTarget-TransparentContainer.c b/src/ranap/RANAP_Source-ToTarget-TransparentContainer.c
index 4d75449..8831b93 100644
--- a/src/ranap/RANAP_Source-ToTarget-TransparentContainer.c
+++ b/src/ranap/RANAP_Source-ToTarget-TransparentContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Source-ToTarget-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_Source-ToTarget-TransparentContainer.h>
 
 int
 RANAP_Source_ToTarget_TransparentContainer_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.c b/src/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.c
index 2f3a604..5f45db0 100644
--- a/src/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.c
+++ b/src/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h>
 
 int
 RANAP_SourceBSS_ToTargetBSS_TransparentContainer_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SourceCellID.c b/src/ranap/RANAP_SourceCellID.c
index 17eeb82..888c8ee 100644
--- a/src/ranap/RANAP_SourceCellID.c
+++ b/src/ranap/RANAP_SourceCellID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceCellID.h>
+#include <osmocom/ranap/RANAP_SourceCellID.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_SourceCellID_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_SourceID.c b/src/ranap/RANAP_SourceID.c
index 7839e99..71b6232 100644
--- a/src/ranap/RANAP_SourceID.c
+++ b/src/ranap/RANAP_SourceID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceID.h>
+#include <osmocom/ranap/RANAP_SourceID.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_SourceID_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_SourceRNC-ID.c b/src/ranap/RANAP_SourceRNC-ID.c
index cb683f0..759ec62 100644
--- a/src/ranap/RANAP_SourceRNC-ID.c
+++ b/src/ranap/RANAP_SourceRNC-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceRNC-ID.h>
+#include <osmocom/ranap/RANAP_SourceRNC-ID.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_SourceRNC_ID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_SourceRNC_ID, pLMNidentity),
diff --git a/src/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.c b/src/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.c
index bd47065..c3b3bac 100644
--- a/src/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.c
+++ b/src/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_SourceRNC_ToTargetRNC_TransparentContainer_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_SourceRNC_ToTargetRNC_TransparentContainer, rRC_Container),
diff --git a/src/ranap/RANAP_SourceStatisticsDescriptor.c b/src/ranap/RANAP_SourceStatisticsDescriptor.c
index 788d8e6..d9a33f9 100644
--- a/src/ranap/RANAP_SourceStatisticsDescriptor.c
+++ b/src/ranap/RANAP_SourceStatisticsDescriptor.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceStatisticsDescriptor.h>
+#include <osmocom/ranap/RANAP_SourceStatisticsDescriptor.h>
 
 int
 RANAP_SourceStatisticsDescriptor_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SourceUTRANCellID.c b/src/ranap/RANAP_SourceUTRANCellID.c
index 4ed109b..f4eee8f 100644
--- a/src/ranap/RANAP_SourceUTRANCellID.c
+++ b/src/ranap/RANAP_SourceUTRANCellID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceUTRANCellID.h>
+#include <osmocom/ranap/RANAP_SourceUTRANCellID.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_SourceUTRANCellID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_SourceUTRANCellID, pLMNidentity),
diff --git a/src/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.c b/src/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.c
index c836615..1da35fe 100644
--- a/src/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.c
+++ b/src/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h>
 
 int
 RANAP_SourceeNodeB_ToTargeteNodeB_TransparentContainer_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SubflowSDU-Size.c b/src/ranap/RANAP_SubflowSDU-Size.c
index cfa0a5e..36282df 100644
--- a/src/ranap/RANAP_SubflowSDU-Size.c
+++ b/src/ranap/RANAP_SubflowSDU-Size.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SubflowSDU-Size.h>
+#include <osmocom/ranap/RANAP_SubflowSDU-Size.h>
 
 int
 RANAP_SubflowSDU_Size_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SubscriberProfileIDforRFP.c b/src/ranap/RANAP_SubscriberProfileIDforRFP.c
index 6cb612b..afda7a5 100644
--- a/src/ranap/RANAP_SubscriberProfileIDforRFP.c
+++ b/src/ranap/RANAP_SubscriberProfileIDforRFP.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SubscriberProfileIDforRFP.h>
+#include <osmocom/ranap/RANAP_SubscriberProfileIDforRFP.h>
 
 int
 RANAP_SubscriberProfileIDforRFP_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SuccessfulOutcome.c b/src/ranap/RANAP_SuccessfulOutcome.c
index b4f4e31..4becadb 100644
--- a/src/ranap/RANAP_SuccessfulOutcome.c
+++ b/src/ranap/RANAP_SuccessfulOutcome.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SuccessfulOutcome.h>
+#include <osmocom/ranap/RANAP_SuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_SuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_SuccessfulOutcome, procedureCode),
diff --git a/src/ranap/RANAP_SupportedBitrate.c b/src/ranap/RANAP_SupportedBitrate.c
index 7cc5b26..8e7ae21 100644
--- a/src/ranap/RANAP_SupportedBitrate.c
+++ b/src/ranap/RANAP_SupportedBitrate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedBitrate.h>
+#include <osmocom/ranap/RANAP_SupportedBitrate.h>
 
 int
 RANAP_SupportedBitrate_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_SupportedRAB-ParameterBitrateList.c b/src/ranap/RANAP_SupportedRAB-ParameterBitrateList.c
index a018388..f2056d9 100644
--- a/src/ranap/RANAP_SupportedRAB-ParameterBitrateList.c
+++ b/src/ranap/RANAP_SupportedRAB-ParameterBitrateList.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
+#include <osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_SupportedRAB_ParameterBitrateList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_TAC.c b/src/ranap/RANAP_TAC.c
index 86589f4..0987350 100644
--- a/src/ranap/RANAP_TAC.c
+++ b/src/ranap/RANAP_TAC.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TAC.h>
+#include <osmocom/ranap/RANAP_TAC.h>
 
 int
 RANAP_TAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TAI.c b/src/ranap/RANAP_TAI.c
index ea6dbdc..f1e62ba 100644
--- a/src/ranap/RANAP_TAI.c
+++ b/src/ranap/RANAP_TAI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TAI.h>
+#include <osmocom/ranap/RANAP_TAI.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TAI, pLMNidentity),
diff --git a/src/ranap/RANAP_TBCD-STRING.c b/src/ranap/RANAP_TBCD-STRING.c
index 845b042..2a42138 100644
--- a/src/ranap/RANAP_TBCD-STRING.c
+++ b/src/ranap/RANAP_TBCD-STRING.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TBCD-STRING.h>
+#include <osmocom/ranap/RANAP_TBCD-STRING.h>
 
 int
 RANAP_TBCD_STRING_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TMGI.c b/src/ranap/RANAP_TMGI.c
index f541466..07d1d68 100644
--- a/src/ranap/RANAP_TMGI.c
+++ b/src/ranap/RANAP_TMGI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
 
 static int
 memb_serviceID_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TMSI.c b/src/ranap/RANAP_TMSI.c
index dd8bec7..57b02cf 100644
--- a/src/ranap/RANAP_TMSI.c
+++ b/src/ranap/RANAP_TMSI.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TMSI.h>
+#include <osmocom/ranap/RANAP_TMSI.h>
 
 int
 RANAP_TMSI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TNLInformationEnhRelInfoReq.c b/src/ranap/RANAP_TNLInformationEnhRelInfoReq.c
index fbe0ecf..1a62c74 100644
--- a/src/ranap/RANAP_TNLInformationEnhRelInfoReq.c
+++ b/src/ranap/RANAP_TNLInformationEnhRelInfoReq.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoReq.h>
+#include <osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TNLInformationEnhRelInfoReq_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TNLInformationEnhRelInfoReq, transportLayerAddress),
diff --git a/src/ranap/RANAP_TNLInformationEnhRelInfoRes.c b/src/ranap/RANAP_TNLInformationEnhRelInfoRes.c
index eabe1e7..ab09d87 100644
--- a/src/ranap/RANAP_TNLInformationEnhRelInfoRes.c
+++ b/src/ranap/RANAP_TNLInformationEnhRelInfoRes.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoRes.h>
+#include <osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TNLInformationEnhRelInfoRes_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TNLInformationEnhRelInfoRes, dl_forwardingTransportLayerAddress),
diff --git a/src/ranap/RANAP_Target-ToSource-TransparentContainer.c b/src/ranap/RANAP_Target-ToSource-TransparentContainer.c
index 92219a3..f3964cd 100644
--- a/src/ranap/RANAP_Target-ToSource-TransparentContainer.c
+++ b/src/ranap/RANAP_Target-ToSource-TransparentContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Target-ToSource-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_Target-ToSource-TransparentContainer.h>
 
 int
 RANAP_Target_ToSource_TransparentContainer_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.c b/src/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.c
index 0523f55..a0fc0b7 100644
--- a/src/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.c
+++ b/src/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h>
 
 int
 RANAP_TargetBSS_ToSourceBSS_TransparentContainer_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TargetCellId.c b/src/ranap/RANAP_TargetCellId.c
index 6728349..9f8bcb1 100644
--- a/src/ranap/RANAP_TargetCellId.c
+++ b/src/ranap/RANAP_TargetCellId.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetCellId.h>
+#include <osmocom/ranap/RANAP_TargetCellId.h>
 
 int
 RANAP_TargetCellId_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TargetENB-ID.c b/src/ranap/RANAP_TargetENB-ID.c
index b1de197..7df701f 100644
--- a/src/ranap/RANAP_TargetENB-ID.c
+++ b/src/ranap/RANAP_TargetENB-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetENB-ID.h>
+#include <osmocom/ranap/RANAP_TargetENB-ID.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TargetENB_ID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TargetENB_ID, pLMNidentity),
diff --git a/src/ranap/RANAP_TargetID.c b/src/ranap/RANAP_TargetID.c
index 1b95514..5d27376 100644
--- a/src/ranap/RANAP_TargetID.c
+++ b/src/ranap/RANAP_TargetID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetID.h>
+#include <osmocom/ranap/RANAP_TargetID.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_TargetID_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_TargetRNC-ID.c b/src/ranap/RANAP_TargetRNC-ID.c
index 7de2280..ef48c54 100644
--- a/src/ranap/RANAP_TargetRNC-ID.c
+++ b/src/ranap/RANAP_TargetRNC-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ID.h>
+#include <osmocom/ranap/RANAP_TargetRNC-ID.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TargetRNC_ID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TargetRNC_ID, lAI),
diff --git a/src/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.c b/src/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.c
index c905014..c192beb 100644
--- a/src/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.c
+++ b/src/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TargetRNC_ToSourceRNC_TransparentContainer_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TargetRNC_ToSourceRNC_TransparentContainer, rRC_Container),
diff --git a/src/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.c b/src/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.c
index c1d081d..715b992 100644
--- a/src/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.c
+++ b/src/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h>
 
 int
 RANAP_TargeteNodeB_ToSourceeNodeB_TransparentContainer_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TemporaryUE-ID.c b/src/ranap/RANAP_TemporaryUE-ID.c
index 458e6fd..9cde280 100644
--- a/src/ranap/RANAP_TemporaryUE-ID.c
+++ b/src/ranap/RANAP_TemporaryUE-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TemporaryUE-ID.h>
+#include <osmocom/ranap/RANAP_TemporaryUE-ID.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_TemporaryUE_ID_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.c b/src/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.c
index 6ac0fff..1291b93 100644
--- a/src/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.c
+++ b/src/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h>
+#include <osmocom/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h>
 
 int
 RANAP_Time_UE_StayedInCell_EnhancedGranularity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_Time-UE-StayedInCell.c b/src/ranap/RANAP_Time-UE-StayedInCell.c
index 465c54b..1ac324f 100644
--- a/src/ranap/RANAP_Time-UE-StayedInCell.c
+++ b/src/ranap/RANAP_Time-UE-StayedInCell.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_Time-UE-StayedInCell.h>
+#include <osmocom/ranap/RANAP_Time-UE-StayedInCell.h>
 
 int
 RANAP_Time_UE_StayedInCell_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TimeToMBMSDataTransfer.c b/src/ranap/RANAP_TimeToMBMSDataTransfer.c
index d7a6fff..7108dbd 100644
--- a/src/ranap/RANAP_TimeToMBMSDataTransfer.c
+++ b/src/ranap/RANAP_TimeToMBMSDataTransfer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TimeToMBMSDataTransfer.h>
+#include <osmocom/ranap/RANAP_TimeToMBMSDataTransfer.h>
 
 int
 RANAP_TimeToMBMSDataTransfer_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TimingDifferenceULDL.c b/src/ranap/RANAP_TimingDifferenceULDL.c
index 1f20507..226c23a 100644
--- a/src/ranap/RANAP_TimingDifferenceULDL.c
+++ b/src/ranap/RANAP_TimingDifferenceULDL.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TimingDifferenceULDL.h>
+#include <osmocom/ranap/RANAP_TimingDifferenceULDL.h>
 
 int
 RANAP_TimingDifferenceULDL_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TrCH-ID-List.c b/src/ranap/RANAP_TrCH-ID-List.c
index 4e53257..1a4219c 100644
--- a/src/ranap/RANAP_TrCH-ID-List.c
+++ b/src/ranap/RANAP_TrCH-ID-List.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID-List.h>
+#include <osmocom/ranap/RANAP_TrCH-ID-List.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_TrCH_ID_List_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_TrCH-ID.c b/src/ranap/RANAP_TrCH-ID.c
index 00c1d00..b55ab2b 100644
--- a/src/ranap/RANAP_TrCH-ID.c
+++ b/src/ranap/RANAP_TrCH-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID.h>
+#include <osmocom/ranap/RANAP_TrCH-ID.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TrCH_ID_1[] = {
 	{ ATF_POINTER, 4, offsetof(struct RANAP_TrCH_ID, dCH_ID),
diff --git a/src/ranap/RANAP_TraceDepth.c b/src/ranap/RANAP_TraceDepth.c
index 17bb0c6..0a8e152 100644
--- a/src/ranap/RANAP_TraceDepth.c
+++ b/src/ranap/RANAP_TraceDepth.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceDepth.h>
+#include <osmocom/ranap/RANAP_TraceDepth.h>
 
 int
 RANAP_TraceDepth_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TraceInformation.c b/src/ranap/RANAP_TraceInformation.c
index 7cc4d74..7bce26b 100644
--- a/src/ranap/RANAP_TraceInformation.c
+++ b/src/ranap/RANAP_TraceInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceInformation.h>
+#include <osmocom/ranap/RANAP_TraceInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TraceInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TraceInformation, traceReference),
diff --git a/src/ranap/RANAP_TracePropagationParameters.c b/src/ranap/RANAP_TracePropagationParameters.c
index f29635f..2caf614 100644
--- a/src/ranap/RANAP_TracePropagationParameters.c
+++ b/src/ranap/RANAP_TracePropagationParameters.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TracePropagationParameters.h>
+#include <osmocom/ranap/RANAP_TracePropagationParameters.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TracePropagationParameters_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TracePropagationParameters, traceRecordingSessionReference),
diff --git a/src/ranap/RANAP_TraceRecordingSessionInformation.c b/src/ranap/RANAP_TraceRecordingSessionInformation.c
index 0746c36..ba88e32 100644
--- a/src/ranap/RANAP_TraceRecordingSessionInformation.c
+++ b/src/ranap/RANAP_TraceRecordingSessionInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionInformation.h>
+#include <osmocom/ranap/RANAP_TraceRecordingSessionInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TraceRecordingSessionInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TraceRecordingSessionInformation, traceReference),
diff --git a/src/ranap/RANAP_TraceRecordingSessionReference.c b/src/ranap/RANAP_TraceRecordingSessionReference.c
index da8b8f9..86b167f 100644
--- a/src/ranap/RANAP_TraceRecordingSessionReference.c
+++ b/src/ranap/RANAP_TraceRecordingSessionReference.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionReference.h>
+#include <osmocom/ranap/RANAP_TraceRecordingSessionReference.h>
 
 int
 RANAP_TraceRecordingSessionReference_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TraceReference.c b/src/ranap/RANAP_TraceReference.c
index 9dc8772..6e9b057 100644
--- a/src/ranap/RANAP_TraceReference.c
+++ b/src/ranap/RANAP_TraceReference.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceReference.h>
+#include <osmocom/ranap/RANAP_TraceReference.h>
 
 int
 RANAP_TraceReference_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TraceType.c b/src/ranap/RANAP_TraceType.c
index d0a1869..0bae3d4 100644
--- a/src/ranap/RANAP_TraceType.c
+++ b/src/ranap/RANAP_TraceType.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceType.h>
+#include <osmocom/ranap/RANAP_TraceType.h>
 
 int
 RANAP_TraceType_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TrafficClass.c b/src/ranap/RANAP_TrafficClass.c
index ed646c6..725adc5 100644
--- a/src/ranap/RANAP_TrafficClass.c
+++ b/src/ranap/RANAP_TrafficClass.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TrafficClass.h>
+#include <osmocom/ranap/RANAP_TrafficClass.h>
 
 int
 RANAP_TrafficClass_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TrafficHandlingPriority.c b/src/ranap/RANAP_TrafficHandlingPriority.c
index 7223a7f..504be51 100644
--- a/src/ranap/RANAP_TrafficHandlingPriority.c
+++ b/src/ranap/RANAP_TrafficHandlingPriority.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TrafficHandlingPriority.h>
+#include <osmocom/ranap/RANAP_TrafficHandlingPriority.h>
 
 int
 RANAP_TrafficHandlingPriority_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TransferDelay.c b/src/ranap/RANAP_TransferDelay.c
index 9013221..8d7c75a 100644
--- a/src/ranap/RANAP_TransferDelay.c
+++ b/src/ranap/RANAP_TransferDelay.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TransferDelay.h>
+#include <osmocom/ranap/RANAP_TransferDelay.h>
 
 int
 RANAP_TransferDelay_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TransportLayerAddress.c b/src/ranap/RANAP_TransportLayerAddress.c
index a2367ec..19d7ed5 100644
--- a/src/ranap/RANAP_TransportLayerAddress.c
+++ b/src/ranap/RANAP_TransportLayerAddress.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
 
 int
 RANAP_TransportLayerAddress_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TransportLayerInformation.c b/src/ranap/RANAP_TransportLayerInformation.c
index 93c4c2a..56a2ac4 100644
--- a/src/ranap/RANAP_TransportLayerInformation.c
+++ b/src/ranap/RANAP_TransportLayerInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerInformation.h>
+#include <osmocom/ranap/RANAP_TransportLayerInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TransportLayerInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TransportLayerInformation, transportLayerAddress),
diff --git a/src/ranap/RANAP_TriggerID.c b/src/ranap/RANAP_TriggerID.c
index 791d28f..a4a4da4 100644
--- a/src/ranap/RANAP_TriggerID.c
+++ b/src/ranap/RANAP_TriggerID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TriggerID.h>
+#include <osmocom/ranap/RANAP_TriggerID.h>
 
 int
 RANAP_TriggerID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TriggeringMessage.c b/src/ranap/RANAP_TriggeringMessage.c
index 7b22d41..27a6b8a 100644
--- a/src/ranap/RANAP_TriggeringMessage.c
+++ b/src/ranap/RANAP_TriggeringMessage.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TriggeringMessage.h>
+#include <osmocom/ranap/RANAP_TriggeringMessage.h>
 
 int
 RANAP_TriggeringMessage_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_TunnelInformation.c b/src/ranap/RANAP_TunnelInformation.c
index bb5708d..ee69543 100644
--- a/src/ranap/RANAP_TunnelInformation.c
+++ b/src/ranap/RANAP_TunnelInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TunnelInformation.h>
+#include <osmocom/ranap/RANAP_TunnelInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_TunnelInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_TunnelInformation, transportLayerAddress),
diff --git a/src/ranap/RANAP_TypeOfError.c b/src/ranap/RANAP_TypeOfError.c
index 9966a3e..be7417e 100644
--- a/src/ranap/RANAP_TypeOfError.c
+++ b/src/ranap/RANAP_TypeOfError.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_TypeOfError.h>
+#include <osmocom/ranap/RANAP_TypeOfError.h>
 
 int
 RANAP_TypeOfError_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UE-AggregateMaximumBitRate.c b/src/ranap/RANAP_UE-AggregateMaximumBitRate.c
index ebd412d..1ee0840 100644
--- a/src/ranap/RANAP_UE-AggregateMaximumBitRate.c
+++ b/src/ranap/RANAP_UE-AggregateMaximumBitRate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRate.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_UE_AggregateMaximumBitRate_1[] = {
 	{ ATF_POINTER, 2, offsetof(struct RANAP_UE_AggregateMaximumBitRate, uE_AggregateMaximumBitRateDownlink),
diff --git a/src/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.c b/src/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.c
index 230e887..800682e 100644
--- a/src/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.c
+++ b/src/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h>
 
 int
 RANAP_UE_AggregateMaximumBitRateDownlink_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UE-AggregateMaximumBitRateUplink.c b/src/ranap/RANAP_UE-AggregateMaximumBitRateUplink.c
index 0d50865..970f30b 100644
--- a/src/ranap/RANAP_UE-AggregateMaximumBitRateUplink.c
+++ b/src/ranap/RANAP_UE-AggregateMaximumBitRateUplink.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h>
 
 int
 RANAP_UE_AggregateMaximumBitRateUplink_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UE-History-Information.c b/src/ranap/RANAP_UE-History-Information.c
index 37f42cc..fd82b33 100644
--- a/src/ranap/RANAP_UE-History-Information.c
+++ b/src/ranap/RANAP_UE-History-Information.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-History-Information.h>
+#include <osmocom/ranap/RANAP_UE-History-Information.h>
 
 int
 RANAP_UE_History_Information_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UE-ID.c b/src/ranap/RANAP_UE-ID.c
index 14dadcf..7ef0d0c 100644
--- a/src/ranap/RANAP_UE-ID.c
+++ b/src/ranap/RANAP_UE-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-ID.h>
+#include <osmocom/ranap/RANAP_UE-ID.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_UE_ID_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/ranap/RANAP_UESBI-Iu.c b/src/ranap/RANAP_UESBI-Iu.c
index 01bef0e..360e8d9 100644
--- a/src/ranap/RANAP_UESBI-Iu.c
+++ b/src/ranap/RANAP_UESBI-Iu.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-Iu.h>
+#include <osmocom/ranap/RANAP_UESBI-Iu.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_UESBI_Iu_1[] = {
 	{ ATF_POINTER, 3, offsetof(struct RANAP_UESBI_Iu, uESBI_IuA),
diff --git a/src/ranap/RANAP_UESBI-IuA.c b/src/ranap/RANAP_UESBI-IuA.c
index d66295f..80d876f 100644
--- a/src/ranap/RANAP_UESBI-IuA.c
+++ b/src/ranap/RANAP_UESBI-IuA.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-IuA.h>
+#include <osmocom/ranap/RANAP_UESBI-IuA.h>
 
 int
 RANAP_UESBI_IuA_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UESBI-IuB.c b/src/ranap/RANAP_UESBI-IuB.c
index c358ce5..b9b5fa7 100644
--- a/src/ranap/RANAP_UESBI-IuB.c
+++ b/src/ranap/RANAP_UESBI-IuB.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-IuB.h>
+#include <osmocom/ranap/RANAP_UESBI-IuB.h>
 
 int
 RANAP_UESBI_IuB_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UESpecificInformationIndication.c b/src/ranap/RANAP_UESpecificInformationIndication.c
index ac52ba7..8a4b986 100644
--- a/src/ranap/RANAP_UESpecificInformationIndication.c
+++ b/src/ranap/RANAP_UESpecificInformationIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UESpecificInformationIndication.h>
+#include <osmocom/ranap/RANAP_UESpecificInformationIndication.h>
 
 static int
 memb_ueSpecificInformationIndication_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UL-GTP-PDU-SequenceNumber.c b/src/ranap/RANAP_UL-GTP-PDU-SequenceNumber.c
index a07a065..213fe1a 100644
--- a/src/ranap/RANAP_UL-GTP-PDU-SequenceNumber.c
+++ b/src/ranap/RANAP_UL-GTP-PDU-SequenceNumber.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
 
 int
 RANAP_UL_GTP_PDU_SequenceNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UL-N-PDU-SequenceNumber.c b/src/ranap/RANAP_UL-N-PDU-SequenceNumber.c
index fbe4c26..dd49cc9 100644
--- a/src/ranap/RANAP_UL-N-PDU-SequenceNumber.c
+++ b/src/ranap/RANAP_UL-N-PDU-SequenceNumber.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
 
 int
 RANAP_UL_N_PDU_SequenceNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UP-ModeVersions.c b/src/ranap/RANAP_UP-ModeVersions.c
index 50a9ebc..4345da9 100644
--- a/src/ranap/RANAP_UP-ModeVersions.c
+++ b/src/ranap/RANAP_UP-ModeVersions.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UP-ModeVersions.h>
+#include <osmocom/ranap/RANAP_UP-ModeVersions.h>
 
 int
 RANAP_UP_ModeVersions_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UPInformation.c b/src/ranap/RANAP_UPInformation.c
index 278e421..a997ae6 100644
--- a/src/ranap/RANAP_UPInformation.c
+++ b/src/ranap/RANAP_UPInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UPInformation.h>
+#include <osmocom/ranap/RANAP_UPInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_UPInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_UPInformation, frameSeqNoUL),
diff --git a/src/ranap/RANAP_UPInitialisationFrame.c b/src/ranap/RANAP_UPInitialisationFrame.c
index e7006e5..7ff360c 100644
--- a/src/ranap/RANAP_UPInitialisationFrame.c
+++ b/src/ranap/RANAP_UPInitialisationFrame.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UPInitialisationFrame.h>
+#include <osmocom/ranap/RANAP_UPInitialisationFrame.h>
 
 int
 RANAP_UPInitialisationFrame_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_USCH-ID.c b/src/ranap/RANAP_USCH-ID.c
index b3e4b94..4784926 100644
--- a/src/ranap/RANAP_USCH-ID.c
+++ b/src/ranap/RANAP_USCH-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_USCH-ID.h>
+#include <osmocom/ranap/RANAP_USCH-ID.h>
 
 int
 RANAP_USCH_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UTRAN-CellID.c b/src/ranap/RANAP_UTRAN-CellID.c
index 1dea73b..8735f20 100644
--- a/src/ranap/RANAP_UTRAN-CellID.c
+++ b/src/ranap/RANAP_UTRAN-CellID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UTRAN-CellID.h>
+#include <osmocom/ranap/RANAP_UTRAN-CellID.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_UTRAN_CellID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_UTRAN_CellID, pLMNidentity),
diff --git a/src/ranap/RANAP_UeRadioCapabilityMatchRequest.c b/src/ranap/RANAP_UeRadioCapabilityMatchRequest.c
index ebb98ed..d2b179b 100644
--- a/src/ranap/RANAP_UeRadioCapabilityMatchRequest.c
+++ b/src/ranap/RANAP_UeRadioCapabilityMatchRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UeRadioCapabilityMatchRequest.h>
+#include <osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h>
 
 static int
 memb_ueRadioCapabilityMatchRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UeRadioCapabilityMatchResponse.c b/src/ranap/RANAP_UeRadioCapabilityMatchResponse.c
index 15cf345..50be895 100644
--- a/src/ranap/RANAP_UeRadioCapabilityMatchResponse.c
+++ b/src/ranap/RANAP_UeRadioCapabilityMatchResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UeRadioCapabilityMatchResponse.h>
+#include <osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h>
 
 static int
 memb_ueRadioCapabilityMatchResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UnsuccessfulLinking-IEs.c b/src/ranap/RANAP_UnsuccessfulLinking-IEs.c
index d25cf6e..9b18171 100644
--- a/src/ranap/RANAP_UnsuccessfulLinking-IEs.c
+++ b/src/ranap/RANAP_UnsuccessfulLinking-IEs.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfulLinking-IEs.h>
+#include <osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_UnsuccessfulLinking_IEs_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/ranap/RANAP_UnsuccessfulOutcome.c b/src/ranap/RANAP_UnsuccessfulOutcome.c
index f829b8d..897d1af 100644
--- a/src/ranap/RANAP_UnsuccessfulOutcome.c
+++ b/src/ranap/RANAP_UnsuccessfulOutcome.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfulOutcome.h>
+#include <osmocom/ranap/RANAP_UnsuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_UnsuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_UnsuccessfulOutcome, procedureCode),
diff --git a/src/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.c b/src/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.c
index e242469..164712b 100644
--- a/src/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.c
+++ b/src/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
+#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
 
 int
 RANAP_UnsuccessfullyTransmittedDataVolume_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UplinkInformationExchangeFailure.c b/src/ranap/RANAP_UplinkInformationExchangeFailure.c
index 28ea3e8..ce7253a 100644
--- a/src/ranap/RANAP_UplinkInformationExchangeFailure.c
+++ b/src/ranap/RANAP_UplinkInformationExchangeFailure.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UplinkInformationExchangeFailure.h>
+#include <osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h>
 
 static int
 memb_uplinkInformationExchangeFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UplinkInformationExchangeRequest.c b/src/ranap/RANAP_UplinkInformationExchangeRequest.c
index e0f3124..1be1464 100644
--- a/src/ranap/RANAP_UplinkInformationExchangeRequest.c
+++ b/src/ranap/RANAP_UplinkInformationExchangeRequest.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UplinkInformationExchangeRequest.h>
+#include <osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h>
 
 static int
 memb_uplinkInformationExchangeRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UplinkInformationExchangeResponse.c b/src/ranap/RANAP_UplinkInformationExchangeResponse.c
index 0f09259..638a9d3 100644
--- a/src/ranap/RANAP_UplinkInformationExchangeResponse.c
+++ b/src/ranap/RANAP_UplinkInformationExchangeResponse.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UplinkInformationExchangeResponse.h>
+#include <osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h>
 
 static int
 memb_uplinkInformationExchangeResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_UserPlaneInformation.c b/src/ranap/RANAP_UserPlaneInformation.c
index 9f8369a..cf47b4a 100644
--- a/src/ranap/RANAP_UserPlaneInformation.c
+++ b/src/ranap/RANAP_UserPlaneInformation.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
 
 static asn_TYPE_member_t asn_MBR_RANAP_UserPlaneInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RANAP_UserPlaneInformation, userPlaneMode),
diff --git a/src/ranap/RANAP_UserPlaneMode.c b/src/ranap/RANAP_UserPlaneMode.c
index 6ddd945..2e6205a 100644
--- a/src/ranap/RANAP_UserPlaneMode.c
+++ b/src/ranap/RANAP_UserPlaneMode.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneMode.h>
+#include <osmocom/ranap/RANAP_UserPlaneMode.h>
 
 int
 RANAP_UserPlaneMode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_VelocityEstimate.c b/src/ranap/RANAP_VelocityEstimate.c
index eda7a7d..14d7ad4 100644
--- a/src/ranap/RANAP_VelocityEstimate.c
+++ b/src/ranap/RANAP_VelocityEstimate.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_VelocityEstimate.h>
+#include <osmocom/ranap/RANAP_VelocityEstimate.h>
 
 static asn_per_constraints_t asn_PER_type_RANAP_VelocityEstimate_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  3l }	/* (0..3,...) */,
diff --git a/src/ranap/RANAP_VerticalAccuracyCode.c b/src/ranap/RANAP_VerticalAccuracyCode.c
index 3ae6091..0843c05 100644
--- a/src/ranap/RANAP_VerticalAccuracyCode.c
+++ b/src/ranap/RANAP_VerticalAccuracyCode.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalAccuracyCode.h>
+#include <osmocom/ranap/RANAP_VerticalAccuracyCode.h>
 
 int
 RANAP_VerticalAccuracyCode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_VerticalSpeedDirection.c b/src/ranap/RANAP_VerticalSpeedDirection.c
index fc1f1a9..6806f9d 100644
--- a/src/ranap/RANAP_VerticalSpeedDirection.c
+++ b/src/ranap/RANAP_VerticalSpeedDirection.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalSpeedDirection.h>
+#include <osmocom/ranap/RANAP_VerticalSpeedDirection.h>
 
 int
 RANAP_VerticalSpeedDirection_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_VerticalVelocity.c b/src/ranap/RANAP_VerticalVelocity.c
index 372da10..c35778a 100644
--- a/src/ranap/RANAP_VerticalVelocity.c
+++ b/src/ranap/RANAP_VerticalVelocity.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalVelocity.h>
+#include <osmocom/ranap/RANAP_VerticalVelocity.h>
 
 static int
 memb_veritcalSpeed_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap/RANAP_VoiceSupportMatchIndicator.c b/src/ranap/RANAP_VoiceSupportMatchIndicator.c
index f1cf94e..2ad7a29 100644
--- a/src/ranap/RANAP_VoiceSupportMatchIndicator.c
+++ b/src/ranap/RANAP_VoiceSupportMatchIndicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/ranap/RANAP-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/ranap/RANAP_VoiceSupportMatchIndicator.h>
+#include <osmocom/ranap/RANAP_VoiceSupportMatchIndicator.h>
 
 int
 RANAP_VoiceSupportMatchIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/ranap_common.h b/src/ranap_common.h
index c832891..de38771 100644
--- a/src/ranap_common.h
+++ b/src/ranap_common.h
@@ -3,585 +3,585 @@
 #include <asn_application.h>
 
 /* for f in ranap/RANAP_*.h; printf "#include \"$f\"\n" */
-#include <osmocom/osmo-iuh/ranap/RANAP_APN.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AccuracyFulfilmentIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AllocationOrRetentionPriority.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AlternativeRABConfigurationRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AreaIdentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedPLMNs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedSNAs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_BindingID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DeactivateTrace.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-InvokeTrace.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CNMBMSLinkingInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CSFB-Information.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Id-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Id.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Membership-Status.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseMisc.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseNAS.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseNon-Standard.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseProtocol.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetwork.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetworkExtension.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseTransmissionNetwork.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Access-Mode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Capacity-Class-Value.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Id.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CellBased.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CellIdList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformationGroup.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CellType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ChosenEncryptionAlgorithm.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ClassmarkInformation2.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ClassmarkInformation3.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ClientType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CommonID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Correlation-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CriticalityDiagnostics-IE-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CriticalityDiagnostics.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_D-RNTI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DRX-CycleLengthCoefficient.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DSCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataPDUType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReport.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOfErroneousSDU.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOrder.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DeltaRAListofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectInformationTransfer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectReportingIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectTransfer-IE-ContainerList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectTransfer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_E-DCH-MAC-d-Flow-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_E-UTRAN-Service-Handover.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EARFCN-Extended.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ENB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EUTRANFrequencies.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionAlgorithm.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_End-Of-CSFB.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteConfirm.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EquipmentsToBeTraced.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ErrorIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Event.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Event1F-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Event1I-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ForwardSRNS-Context.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ForwardingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_FrameSequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_FrequenceLayerConvergenceFlag.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-AltitudeAndDirection.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-EllipsoidArc.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-Point.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitude.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertainty.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-Polygon.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-UncertaintyEllipse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GANSS-PositioningDataSet.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GANSS-PositioningMethodAndUsage.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-BSC-Container.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Cell-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Classmark.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GTP-TEI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalArea.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GlobalCN-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GlobalRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HigherBitratesThan16MbpsFlag.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalVelocityWithUncertainty.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalWithVerticalVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEIGroup.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEIList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISV.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVGroup.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMSI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IPMulticastAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IRAT-Measurement-Configuration.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IRATmeasurementParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ImmediateMDT.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IncludeVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationExchangeID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationExchangeType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationRequestType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationRequested.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferConfirmation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InitialUE-Message.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InitiatingMessage.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionAlgorithm.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InterSystemInformation-TransparentContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InterSystemInformationTransferType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_InterfacesToTraceItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Iu-ReleaseCommand.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Iu-ReleaseComplete.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Iu-ReleaseRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuSigConId-IE-ContainerList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuSignallingConnectionIdentifier.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_JoinedMBMSBearerService-IEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_KeyStatus.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_L3-Information.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LA-LIST.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LABased.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAListofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LHN-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LastKnownServiceArea.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LastVisitedUTRANCell-Item.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LeftMBMSBearerService-IEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Links-to-log.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ListOF-SNAs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ListOfInterfacesToTrace.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoadValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataRequestType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationReport.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationReportingControl.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationReportingTransferInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggedMDT.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggingDuration.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggingInterval.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M1Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M2Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Collection-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Threshold.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M4Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M5-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M5Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M6-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M6Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M7-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M7Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMS-PTP-RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSBearerServiceType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCNDe-Registration.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCNDe-RegistrationRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCNDe-RegistrationResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCountingInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSHCIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSLinkingInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABEstablishmentIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABRelease.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABReleaseFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABReleaseRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationRequestType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSServiceArea.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionDuration.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionIdentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionRepetitionNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStart.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStartFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStartResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStop.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStopResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionUpdate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionUpdateFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionUpdateResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSynchronisationInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSUELinkingRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSUELinkingResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Activation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Configuration.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-PLMN-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Report-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDTAreaScope.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDTMode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MSISDN.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Management-Based-MDT-Allowed.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxSDU-Size.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasBand.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementQuantity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementsToActivate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MessageStructure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-PDU.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SynchronisationIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NRTLoadInformationValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NewBSS-To-OldBSS-Information.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NewRAListofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NonSearchingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NumberOfIuInstances.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NumberOfSteps.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_OMC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-APN.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_OldBSS-ToNewBSS-Information.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Out-Of-UTRAN.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Outcome.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Overload.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_P-TMSI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type-extension.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation-extension.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDUType14FrameSequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNs-in-shared-network.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Paging.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PagingAreaID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PagingCause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicLocationInfo.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicReportingIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PermanentNAS-UE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PermittedEncryptionAlgorithms.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Port-Number.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositionData.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositionDataSpecificToGERANIuMode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataDiscriminator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataSet.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningMethodAndUsage.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningPriority.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionCapability.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionVulnerability.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Presence.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Priority-Class-Indicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PriorityLevel.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PrivateIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PrivateMessage.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolError-IE-ContainerList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionField.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ContainerPair.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-FieldPair.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProvidedData.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_QueuingAllowed.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AssignmentRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AssignmentResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AsymmetryIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportRequestItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportRequestList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-IE-ContainerList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-IE-ContainerPairList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ModifyItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ModifyList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ModifyRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-QueuedItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-QueuedList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseFailedList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedList-IuRelComp.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-RelocationReleaseItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-RelocationReleaseList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-RelocReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-RelocReqAck.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-RelocReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-RelocReqAck.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifiedItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifiedList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifyItemFirst.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifyItemSecond.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifyList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SubflowCombinationBitRate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-Mapping.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-MappingItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABDataVolumeReport.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABParametersList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABased.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABs-ContextFailedtoTransferItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABs-ContextFailedtoTransferList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABs-failed-to-reportItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABs-failed-to-reportList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAListofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-PDU.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-RelocationInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAT-Type.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RIM-Transfer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RIMInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RIMRoutingAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RNCTraceInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RNSAPRelocationParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RRC-Container.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRQ-Extension.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRQ-Type.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRVCC-HO-Indication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRVCC-Information.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RSRVCC-Operation-Possible.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RTLoadValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RateControlAllowed.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RedirectAttemptFlag.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RedirectionCompleted.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RedirectionIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RejectCauseValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationCancel.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationCancelAcknowledge.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationCommand.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationComplete.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationDetect.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationPreparationFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequestAcknowledge.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequired.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequirement.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber0.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber1.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportAmount.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportArea.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportChangeOfSAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportInterval.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-Values.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedGANSSAssistanceData.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedGPSAssistanceData.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedLocationRelatedDataType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMulticastServiceList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Reset.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetAcknowledge.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResource.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceAckItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceAckList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceAcknowledge.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResidualBitErrorRatio.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResponseTime.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAPI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ErrorRatio.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameterItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ParameterItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SNA-Access-Information.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SNAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-TrCH-Mapping.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-TrCH-MappingItem.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRNS-ContextRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRNS-ContextResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRNS-DataForwardCommand.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-CSKeysRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-CSKeysResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-HO-Indication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-Information.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-Operation-Possible.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SecurityModeCommand.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SecurityModeComplete.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SecurityModeReject.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Service-Handover.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Session-Re-establishment-Indicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SessionUpdateID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Shared-Network-Information.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SignallingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Source-ToTarget-TransparentContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceCellID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceStatisticsDescriptor.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceUTRANCellID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SubflowSDU-Size.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SubscriberProfileIDforRFP.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedBitrate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TBCD-STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TMSI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Target-ToSource-TransparentContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetCellId.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetENB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TemporaryUE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Time-UE-StayedInCell.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TimeToMBMSDataTransfer.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TimingDifferenceULDL.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceDepth.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TracePropagationParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrafficClass.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrafficHandlingPriority.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransferDelay.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TriggerID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TriggeringMessage.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TunnelInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TypeOfError.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-History-Information.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-Iu.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-IuA.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-IuB.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UESpecificInformationIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UP-ModeVersions.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UPInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UPInitialisationFrame.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_USCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UTRAN-CellID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UeRadioCapabilityMatchRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UeRadioCapabilityMatchResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfulLinking-IEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UplinkInformationExchangeFailure.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UplinkInformationExchangeRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UplinkInformationExchangeResponse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneMode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VelocityEstimate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalAccuracyCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalSpeedDirection.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VoiceSupportMatchIndicator.h>
+#include <osmocom/ranap/RANAP_APN.h>
+#include <osmocom/ranap/RANAP_AccuracyFulfilmentIndicator.h>
+#include <osmocom/ranap/RANAP_AllocationOrRetentionPriority.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_AlternativeRABConfigurationRequest.h>
+#include <osmocom/ranap/RANAP_AreaIdentity.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_AuthorisedPLMNs.h>
+#include <osmocom/ranap/RANAP_AuthorisedSNAs.h>
+#include <osmocom/ranap/RANAP_BindingID.h>
+#include <osmocom/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h>
+#include <osmocom/ranap/RANAP_CGI.h>
+#include <osmocom/ranap/RANAP_CI.h>
+#include <osmocom/ranap/RANAP_CN-DeactivateTrace.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_CN-ID.h>
+#include <osmocom/ranap/RANAP_CN-InvokeTrace.h>
+#include <osmocom/ranap/RANAP_CNMBMSLinkingInformation.h>
+#include <osmocom/ranap/RANAP_CSFB-Information.h>
+#include <osmocom/ranap/RANAP_CSG-Id-List.h>
+#include <osmocom/ranap/RANAP_CSG-Id.h>
+#include <osmocom/ranap/RANAP_CSG-Membership-Status.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_CauseMisc.h>
+#include <osmocom/ranap/RANAP_CauseNAS.h>
+#include <osmocom/ranap/RANAP_CauseNon-Standard.h>
+#include <osmocom/ranap/RANAP_CauseProtocol.h>
+#include <osmocom/ranap/RANAP_CauseRadioNetwork.h>
+#include <osmocom/ranap/RANAP_CauseRadioNetworkExtension.h>
+#include <osmocom/ranap/RANAP_CauseTransmissionNetwork.h>
+#include <osmocom/ranap/RANAP_Cell-Access-Mode.h>
+#include <osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h>
+#include <osmocom/ranap/RANAP_Cell-Id.h>
+#include <osmocom/ranap/RANAP_CellBased.h>
+#include <osmocom/ranap/RANAP_CellIdList.h>
+#include <osmocom/ranap/RANAP_CellLoadInformation.h>
+#include <osmocom/ranap/RANAP_CellLoadInformationGroup.h>
+#include <osmocom/ranap/RANAP_CellType.h>
+#include <osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_ClassmarkInformation2.h>
+#include <osmocom/ranap/RANAP_ClassmarkInformation3.h>
+#include <osmocom/ranap/RANAP_ClientType.h>
+#include <osmocom/ranap/RANAP_CommonID.h>
+#include <osmocom/ranap/RANAP_Correlation-ID.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/ranap/RANAP_CriticalityDiagnostics.h>
+#include <osmocom/ranap/RANAP_D-RNTI.h>
+#include <osmocom/ranap/RANAP_DCH-ID.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DRX-CycleLengthCoefficient.h>
+#include <osmocom/ranap/RANAP_DSCH-ID.h>
+#include <osmocom/ranap/RANAP_DataPDUType.h>
+#include <osmocom/ranap/RANAP_DataVolumeList.h>
+#include <osmocom/ranap/RANAP_DataVolumeReference.h>
+#include <osmocom/ranap/RANAP_DataVolumeReport.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportList.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportRequest.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportingIndication.h>
+#include <osmocom/ranap/RANAP_DeliveryOfErroneousSDU.h>
+#include <osmocom/ranap/RANAP_DeliveryOrder.h>
+#include <osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_DirectInformationTransfer.h>
+#include <osmocom/ranap/RANAP_DirectReportingIndicator.h>
+#include <osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h>
+#include <osmocom/ranap/RANAP_DirectTransfer.h>
+#include <osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h>
+#include <osmocom/ranap/RANAP_E-DCH-MAC-d-Flow-ID.h>
+#include <osmocom/ranap/RANAP_E-UTRAN-Service-Handover.h>
+#include <osmocom/ranap/RANAP_EARFCN-Extended.h>
+#include <osmocom/ranap/RANAP_ENB-ID.h>
+#include <osmocom/ranap/RANAP_EUTRANFrequencies.h>
+#include <osmocom/ranap/RANAP_EncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_EncryptionInformation.h>
+#include <osmocom/ranap/RANAP_EncryptionKey.h>
+#include <osmocom/ranap/RANAP_End-Of-CSFB.h>
+#include <osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h>
+#include <osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h>
+#include <osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h>
+#include <osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h>
+#include <osmocom/ranap/RANAP_EquipmentsToBeTraced.h>
+#include <osmocom/ranap/RANAP_ErrorIndication.h>
+#include <osmocom/ranap/RANAP_Event.h>
+#include <osmocom/ranap/RANAP_Event1F-Parameters.h>
+#include <osmocom/ranap/RANAP_Event1I-Parameters.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedRNC-ID.h>
+#include <osmocom/ranap/RANAP_ForwardSRNS-Context.h>
+#include <osmocom/ranap/RANAP_ForwardingIndication.h>
+#include <osmocom/ranap/RANAP_FrameSequenceNumber.h>
+#include <osmocom/ranap/RANAP_FrequenceLayerConvergenceFlag.h>
+#include <osmocom/ranap/RANAP_GA-AltitudeAndDirection.h>
+#include <osmocom/ranap/RANAP_GA-EllipsoidArc.h>
+#include <osmocom/ranap/RANAP_GA-Point.h>
+#include <osmocom/ranap/RANAP_GA-PointWithAltitude.h>
+#include <osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h>
+#include <osmocom/ranap/RANAP_GA-PointWithUnCertainty.h>
+#include <osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GA-Polygon.h>
+#include <osmocom/ranap/RANAP_GA-UncertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GANSS-PositioningDataSet.h>
+#include <osmocom/ranap/RANAP_GANSS-PositioningMethodAndUsage.h>
+#include <osmocom/ranap/RANAP_GERAN-BSC-Container.h>
+#include <osmocom/ranap/RANAP_GERAN-Cell-ID.h>
+#include <osmocom/ranap/RANAP_GERAN-Classmark.h>
+#include <osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h>
+#include <osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h>
+#include <osmocom/ranap/RANAP_GTP-TEI.h>
+#include <osmocom/ranap/RANAP_GeographicalArea.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GlobalCN-ID.h>
+#include <osmocom/ranap/RANAP_GlobalRNC-ID.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h>
+#include <osmocom/ranap/RANAP_HigherBitratesThan16MbpsFlag.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_HorizontalVelocity.h>
+#include <osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h>
+#include <osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h>
+#include <osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IMEI.h>
+#include <osmocom/ranap/RANAP_IMEIGroup.h>
+#include <osmocom/ranap/RANAP_IMEIList.h>
+#include <osmocom/ranap/RANAP_IMEISV.h>
+#include <osmocom/ranap/RANAP_IMEISVGroup.h>
+#include <osmocom/ranap/RANAP_IMEISVList.h>
+#include <osmocom/ranap/RANAP_IMSI.h>
+#include <osmocom/ranap/RANAP_IPMulticastAddress.h>
+#include <osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h>
+#include <osmocom/ranap/RANAP_IRATmeasurementParameters.h>
+#include <osmocom/ranap/RANAP_ImmediateMDT.h>
+#include <osmocom/ranap/RANAP_IncludeVelocity.h>
+#include <osmocom/ranap/RANAP_InformationExchangeID.h>
+#include <osmocom/ranap/RANAP_InformationExchangeType.h>
+#include <osmocom/ranap/RANAP_InformationRequestType.h>
+#include <osmocom/ranap/RANAP_InformationRequested.h>
+#include <osmocom/ranap/RANAP_InformationTransferConfirmation.h>
+#include <osmocom/ranap/RANAP_InformationTransferFailure.h>
+#include <osmocom/ranap/RANAP_InformationTransferID.h>
+#include <osmocom/ranap/RANAP_InformationTransferIndication.h>
+#include <osmocom/ranap/RANAP_InformationTransferType.h>
+#include <osmocom/ranap/RANAP_InitialUE-Message.h>
+#include <osmocom/ranap/RANAP_InitiatingMessage.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionInformation.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionKey.h>
+#include <osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_InterSystemInformationTransferType.h>
+#include <osmocom/ranap/RANAP_InterfacesToTraceItem.h>
+#include <osmocom/ranap/RANAP_Iu-ReleaseCommand.h>
+#include <osmocom/ranap/RANAP_Iu-ReleaseComplete.h>
+#include <osmocom/ranap/RANAP_Iu-ReleaseRequest.h>
+#include <osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h>
+#include <osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h>
+#include <osmocom/ranap/RANAP_KeyStatus.h>
+#include <osmocom/ranap/RANAP_L3-Information.h>
+#include <osmocom/ranap/RANAP_LA-LIST.h>
+#include <osmocom/ranap/RANAP_LABased.h>
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_LAI-List.h>
+#include <osmocom/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_LAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_LHN-ID.h>
+#include <osmocom/ranap/RANAP_LastKnownServiceArea.h>
+#include <osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h>
+#include <osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h>
+#include <osmocom/ranap/RANAP_Links-to-log.h>
+#include <osmocom/ranap/RANAP_ListOF-SNAs.h>
+#include <osmocom/ranap/RANAP_ListOfInterfacesToTrace.h>
+#include <osmocom/ranap/RANAP_LoadValue.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataFailure.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataRequest.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataRequestType.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h>
+#include <osmocom/ranap/RANAP_LocationRelatedDataResponse.h>
+#include <osmocom/ranap/RANAP_LocationReport.h>
+#include <osmocom/ranap/RANAP_LocationReportingControl.h>
+#include <osmocom/ranap/RANAP_LocationReportingTransferInformation.h>
+#include <osmocom/ranap/RANAP_LoggedMDT.h>
+#include <osmocom/ranap/RANAP_LoggingDuration.h>
+#include <osmocom/ranap/RANAP_LoggingInterval.h>
+#include <osmocom/ranap/RANAP_M1Report.h>
+#include <osmocom/ranap/RANAP_M2Report.h>
+#include <osmocom/ranap/RANAP_M4-Collection-Parameters.h>
+#include <osmocom/ranap/RANAP_M4-Period.h>
+#include <osmocom/ranap/RANAP_M4-Threshold.h>
+#include <osmocom/ranap/RANAP_M4Report.h>
+#include <osmocom/ranap/RANAP_M5-Period.h>
+#include <osmocom/ranap/RANAP_M5Report.h>
+#include <osmocom/ranap/RANAP_M6-Period.h>
+#include <osmocom/ranap/RANAP_M6Report.h>
+#include <osmocom/ranap/RANAP_M7-Period.h>
+#include <osmocom/ranap/RANAP_M7Report.h>
+#include <osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h>
+#include <osmocom/ranap/RANAP_MBMSBearerServiceType.h>
+#include <osmocom/ranap/RANAP_MBMSCNDe-Registration.h>
+#include <osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h>
+#include <osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h>
+#include <osmocom/ranap/RANAP_MBMSCountingInformation.h>
+#include <osmocom/ranap/RANAP_MBMSHCIndicator.h>
+#include <osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h>
+#include <osmocom/ranap/RANAP_MBMSLinkingInformation.h>
+#include <osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h>
+#include <osmocom/ranap/RANAP_MBMSRABRelease.h>
+#include <osmocom/ranap/RANAP_MBMSRABReleaseFailure.h>
+#include <osmocom/ranap/RANAP_MBMSRABReleaseRequest.h>
+#include <osmocom/ranap/RANAP_MBMSRegistrationFailure.h>
+#include <osmocom/ranap/RANAP_MBMSRegistrationRequest.h>
+#include <osmocom/ranap/RANAP_MBMSRegistrationRequestType.h>
+#include <osmocom/ranap/RANAP_MBMSRegistrationResponse.h>
+#include <osmocom/ranap/RANAP_MBMSServiceArea.h>
+#include <osmocom/ranap/RANAP_MBMSSessionDuration.h>
+#include <osmocom/ranap/RANAP_MBMSSessionIdentity.h>
+#include <osmocom/ranap/RANAP_MBMSSessionRepetitionNumber.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStart.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStartFailure.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStartResponse.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStop.h>
+#include <osmocom/ranap/RANAP_MBMSSessionStopResponse.h>
+#include <osmocom/ranap/RANAP_MBMSSessionUpdate.h>
+#include <osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h>
+#include <osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h>
+#include <osmocom/ranap/RANAP_MBMSSynchronisationInformation.h>
+#include <osmocom/ranap/RANAP_MBMSUELinkingRequest.h>
+#include <osmocom/ranap/RANAP_MBMSUELinkingResponse.h>
+#include <osmocom/ranap/RANAP_MDT-Activation.h>
+#include <osmocom/ranap/RANAP_MDT-Configuration.h>
+#include <osmocom/ranap/RANAP_MDT-PLMN-List.h>
+#include <osmocom/ranap/RANAP_MDT-Report-Parameters.h>
+#include <osmocom/ranap/RANAP_MDTAreaScope.h>
+#include <osmocom/ranap/RANAP_MDTMode.h>
+#include <osmocom/ranap/RANAP_MSISDN.h>
+#include <osmocom/ranap/RANAP_Management-Based-MDT-Allowed.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxSDU-Size.h>
+#include <osmocom/ranap/RANAP_MeasBand.h>
+#include <osmocom/ranap/RANAP_MeasurementQuantity.h>
+#include <osmocom/ranap/RANAP_MeasurementsToActivate.h>
+#include <osmocom/ranap/RANAP_MessageStructure.h>
+#include <osmocom/ranap/RANAP_NAS-PDU.h>
+#include <osmocom/ranap/RANAP_NAS-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h>
+#include <osmocom/ranap/RANAP_NRTLoadInformationValue.h>
+#include <osmocom/ranap/RANAP_NewBSS-To-OldBSS-Information.h>
+#include <osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_NonSearchingIndication.h>
+#include <osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_NumberOfIuInstances.h>
+#include <osmocom/ranap/RANAP_NumberOfSteps.h>
+#include <osmocom/ranap/RANAP_OMC-ID.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters-APN.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_OldBSS-ToNewBSS-Information.h>
+#include <osmocom/ranap/RANAP_Out-Of-UTRAN.h>
+#include <osmocom/ranap/RANAP_Outcome.h>
+#include <osmocom/ranap/RANAP_Overload.h>
+#include <osmocom/ranap/RANAP_P-TMSI.h>
+#include <osmocom/ranap/RANAP_PDP-Type-extension.h>
+#include <osmocom/ranap/RANAP_PDP-Type.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation-extension.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation.h>
+#include <osmocom/ranap/RANAP_PDUType14FrameSequenceNumber.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_PLMNs-in-shared-network.h>
+#include <osmocom/ranap/RANAP_Paging.h>
+#include <osmocom/ranap/RANAP_PagingAreaID.h>
+#include <osmocom/ranap/RANAP_PagingCause.h>
+#include <osmocom/ranap/RANAP_PeriodicLocationInfo.h>
+#include <osmocom/ranap/RANAP_PeriodicReportingIndicator.h>
+#include <osmocom/ranap/RANAP_PermanentNAS-UE-ID.h>
+#include <osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h>
+#include <osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h>
+#include <osmocom/ranap/RANAP_Port-Number.h>
+#include <osmocom/ranap/RANAP_PositionData.h>
+#include <osmocom/ranap/RANAP_PositionDataSpecificToGERANIuMode.h>
+#include <osmocom/ranap/RANAP_PositioningDataDiscriminator.h>
+#include <osmocom/ranap/RANAP_PositioningDataSet.h>
+#include <osmocom/ranap/RANAP_PositioningMethodAndUsage.h>
+#include <osmocom/ranap/RANAP_PositioningPriority.h>
+#include <osmocom/ranap/RANAP_Pre-emptionCapability.h>
+#include <osmocom/ranap/RANAP_Pre-emptionVulnerability.h>
+#include <osmocom/ranap/RANAP_Presence.h>
+#include <osmocom/ranap/RANAP_Priority-Class-Indicator.h>
+#include <osmocom/ranap/RANAP_PriorityLevel.h>
+#include <osmocom/ranap/RANAP_PrivateIE-ID.h>
+#include <osmocom/ranap/RANAP_PrivateMessage.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionField.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionID.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-FieldPair.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_ProvidedData.h>
+#include <osmocom/ranap/RANAP_QueuingAllowed.h>
+#include <osmocom/ranap/RANAP_RAB-AssignmentRequest.h>
+#include <osmocom/ranap/RANAP_RAB-AssignmentResponse.h>
+#include <osmocom/ranap/RANAP_RAB-AsymmetryIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h>
+#include <osmocom/ranap/RANAP_RAB-ContextItem.h>
+#include <osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h>
+#include <osmocom/ranap/RANAP_RAB-ContextList.h>
+#include <osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h>
+#include <osmocom/ranap/RANAP_RAB-DataForwardingItem.h>
+#include <osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h>
+#include <osmocom/ranap/RANAP_RAB-DataForwardingList.h>
+#include <osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h>
+#include <osmocom/ranap/RANAP_RAB-DataVolumeReportList.h>
+#include <osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h>
+#include <osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h>
+#include <osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h>
+#include <osmocom/ranap/RANAP_RAB-FailedItem.h>
+#include <osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h>
+#include <osmocom/ranap/RANAP_RAB-FailedList.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_RAB-IE-ContainerList.h>
+#include <osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h>
+#include <osmocom/ranap/RANAP_RAB-ModifyItem.h>
+#include <osmocom/ranap/RANAP_RAB-ModifyList.h>
+#include <osmocom/ranap/RANAP_RAB-ModifyRequest.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_RAB-QueuedItem.h>
+#include <osmocom/ranap/RANAP_RAB-QueuedList.h>
+#include <osmocom/ranap/RANAP_RAB-ReleaseFailedList.h>
+#include <osmocom/ranap/RANAP_RAB-ReleaseItem.h>
+#include <osmocom/ranap/RANAP_RAB-ReleaseList.h>
+#include <osmocom/ranap/RANAP_RAB-ReleaseRequest.h>
+#include <osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h>
+#include <osmocom/ranap/RANAP_RAB-ReleasedItem.h>
+#include <osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h>
+#include <osmocom/ranap/RANAP_RAB-ReleasedList.h>
+#include <osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h>
+#include <osmocom/ranap/RANAP_RAB-RelocationReleaseList.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h>
+#include <osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h>
+#include <osmocom/ranap/RANAP_RAB-SetupOrModifyList.h>
+#include <osmocom/ranap/RANAP_RAB-SubflowCombinationBitRate.h>
+#include <osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_RAB-TrCH-Mapping.h>
+#include <osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h>
+#include <osmocom/ranap/RANAP_RABDataVolumeReport.h>
+#include <osmocom/ranap/RANAP_RABParametersList.h>
+#include <osmocom/ranap/RANAP_RABased.h>
+#include <osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h>
+#include <osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h>
+#include <osmocom/ranap/RANAP_RABs-failed-to-reportItem.h>
+#include <osmocom/ranap/RANAP_RABs-failed-to-reportList.h>
+#include <osmocom/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RAI-List.h>
+#include <osmocom/ranap/RANAP_RAI.h>
+#include <osmocom/ranap/RANAP_RAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h>
+#include <osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h>
+#include <osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h>
+#include <osmocom/ranap/RANAP_RANAP-PDU.h>
+#include <osmocom/ranap/RANAP_RANAP-RelocationInformation.h>
+#include <osmocom/ranap/RANAP_RAT-Type.h>
+#include <osmocom/ranap/RANAP_RAofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_RIM-Transfer.h>
+#include <osmocom/ranap/RANAP_RIMInformation.h>
+#include <osmocom/ranap/RANAP_RIMRoutingAddress.h>
+#include <osmocom/ranap/RANAP_RNC-ID.h>
+#include <osmocom/ranap/RANAP_RNCTraceInformation.h>
+#include <osmocom/ranap/RANAP_RNSAPRelocationParameters.h>
+#include <osmocom/ranap/RANAP_RRC-Container.h>
+#include <osmocom/ranap/RANAP_RSRQ-Extension.h>
+#include <osmocom/ranap/RANAP_RSRQ-Type.h>
+#include <osmocom/ranap/RANAP_RSRVCC-HO-Indication.h>
+#include <osmocom/ranap/RANAP_RSRVCC-Information.h>
+#include <osmocom/ranap/RANAP_RSRVCC-Operation-Possible.h>
+#include <osmocom/ranap/RANAP_RTLoadValue.h>
+#include <osmocom/ranap/RANAP_RateControlAllowed.h>
+#include <osmocom/ranap/RANAP_RedirectAttemptFlag.h>
+#include <osmocom/ranap/RANAP_RedirectionCompleted.h>
+#include <osmocom/ranap/RANAP_RedirectionIndication.h>
+#include <osmocom/ranap/RANAP_RejectCauseValue.h>
+#include <osmocom/ranap/RANAP_RelocationCancel.h>
+#include <osmocom/ranap/RANAP_RelocationCancelAcknowledge.h>
+#include <osmocom/ranap/RANAP_RelocationCommand.h>
+#include <osmocom/ranap/RANAP_RelocationComplete.h>
+#include <osmocom/ranap/RANAP_RelocationDetect.h>
+#include <osmocom/ranap/RANAP_RelocationFailure.h>
+#include <osmocom/ranap/RANAP_RelocationPreparationFailure.h>
+#include <osmocom/ranap/RANAP_RelocationRequest.h>
+#include <osmocom/ranap/RANAP_RelocationRequestAcknowledge.h>
+#include <osmocom/ranap/RANAP_RelocationRequired.h>
+#include <osmocom/ranap/RANAP_RelocationRequirement.h>
+#include <osmocom/ranap/RANAP_RelocationType.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber0.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber1.h>
+#include <osmocom/ranap/RANAP_ReportAmount.h>
+#include <osmocom/ranap/RANAP_ReportArea.h>
+#include <osmocom/ranap/RANAP_ReportChangeOfSAI.h>
+#include <osmocom/ranap/RANAP_ReportInterval.h>
+#include <osmocom/ranap/RANAP_RequestType.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h>
+#include <osmocom/ranap/RANAP_RequestedGANSSAssistanceData.h>
+#include <osmocom/ranap/RANAP_RequestedGPSAssistanceData.h>
+#include <osmocom/ranap/RANAP_RequestedLocationRelatedDataType.h>
+#include <osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/ranap/RANAP_RequestedMulticastServiceList.h>
+#include <osmocom/ranap/RANAP_Reset.h>
+#include <osmocom/ranap/RANAP_ResetAcknowledge.h>
+#include <osmocom/ranap/RANAP_ResetResource.h>
+#include <osmocom/ranap/RANAP_ResetResourceAckItem.h>
+#include <osmocom/ranap/RANAP_ResetResourceAckList.h>
+#include <osmocom/ranap/RANAP_ResetResourceAcknowledge.h>
+#include <osmocom/ranap/RANAP_ResetResourceItem.h>
+#include <osmocom/ranap/RANAP_ResetResourceList.h>
+#include <osmocom/ranap/RANAP_ResidualBitErrorRatio.h>
+#include <osmocom/ranap/RANAP_ResponseTime.h>
+#include <osmocom/ranap/RANAP_SAC.h>
+#include <osmocom/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_SAPI.h>
+#include <osmocom/ranap/RANAP_SDU-ErrorRatio.h>
+#include <osmocom/ranap/RANAP_SDU-FormatInformationParameters.h>
+#include <osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h>
+#include <osmocom/ranap/RANAP_SDU-Parameters.h>
+#include <osmocom/ranap/RANAP_SDU-ParameterItem.h>
+#include <osmocom/ranap/RANAP_SNA-Access-Information.h>
+#include <osmocom/ranap/RANAP_SNAC.h>
+#include <osmocom/ranap/RANAP_SRB-ID.h>
+#include <osmocom/ranap/RANAP_SRB-TrCH-Mapping.h>
+#include <osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h>
+#include <osmocom/ranap/RANAP_SRNS-ContextRequest.h>
+#include <osmocom/ranap/RANAP_SRNS-ContextResponse.h>
+#include <osmocom/ranap/RANAP_SRNS-DataForwardCommand.h>
+#include <osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h>
+#include <osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h>
+#include <osmocom/ranap/RANAP_SRVCC-HO-Indication.h>
+#include <osmocom/ranap/RANAP_SRVCC-Information.h>
+#include <osmocom/ranap/RANAP_SRVCC-Operation-Possible.h>
+#include <osmocom/ranap/RANAP_SecurityModeCommand.h>
+#include <osmocom/ranap/RANAP_SecurityModeComplete.h>
+#include <osmocom/ranap/RANAP_SecurityModeReject.h>
+#include <osmocom/ranap/RANAP_Service-Handover.h>
+#include <osmocom/ranap/RANAP_Session-Re-establishment-Indicator.h>
+#include <osmocom/ranap/RANAP_SessionUpdateID.h>
+#include <osmocom/ranap/RANAP_Shared-Network-Information.h>
+#include <osmocom/ranap/RANAP_SignallingIndication.h>
+#include <osmocom/ranap/RANAP_Source-ToTarget-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_SourceCellID.h>
+#include <osmocom/ranap/RANAP_SourceID.h>
+#include <osmocom/ranap/RANAP_SourceRNC-ID.h>
+#include <osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_SourceStatisticsDescriptor.h>
+#include <osmocom/ranap/RANAP_SourceUTRANCellID.h>
+#include <osmocom/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_SubflowSDU-Size.h>
+#include <osmocom/ranap/RANAP_SubscriberProfileIDforRFP.h>
+#include <osmocom/ranap/RANAP_SuccessfulOutcome.h>
+#include <osmocom/ranap/RANAP_SupportedBitrate.h>
+#include <osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
+#include <osmocom/ranap/RANAP_TAC.h>
+#include <osmocom/ranap/RANAP_TAI.h>
+#include <osmocom/ranap/RANAP_TBCD-STRING.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_TMSI.h>
+#include <osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h>
+#include <osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h>
+#include <osmocom/ranap/RANAP_Target-ToSource-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_TargetCellId.h>
+#include <osmocom/ranap/RANAP_TargetENB-ID.h>
+#include <osmocom/ranap/RANAP_TargetID.h>
+#include <osmocom/ranap/RANAP_TargetRNC-ID.h>
+#include <osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h>
+#include <osmocom/ranap/RANAP_TemporaryUE-ID.h>
+#include <osmocom/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h>
+#include <osmocom/ranap/RANAP_Time-UE-StayedInCell.h>
+#include <osmocom/ranap/RANAP_TimeToMBMSDataTransfer.h>
+#include <osmocom/ranap/RANAP_TimingDifferenceULDL.h>
+#include <osmocom/ranap/RANAP_TrCH-ID-List.h>
+#include <osmocom/ranap/RANAP_TrCH-ID.h>
+#include <osmocom/ranap/RANAP_TraceDepth.h>
+#include <osmocom/ranap/RANAP_TraceInformation.h>
+#include <osmocom/ranap/RANAP_TracePropagationParameters.h>
+#include <osmocom/ranap/RANAP_TraceRecordingSessionInformation.h>
+#include <osmocom/ranap/RANAP_TraceRecordingSessionReference.h>
+#include <osmocom/ranap/RANAP_TraceReference.h>
+#include <osmocom/ranap/RANAP_TraceType.h>
+#include <osmocom/ranap/RANAP_TrafficClass.h>
+#include <osmocom/ranap/RANAP_TrafficHandlingPriority.h>
+#include <osmocom/ranap/RANAP_TransferDelay.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_TransportLayerInformation.h>
+#include <osmocom/ranap/RANAP_TriggerID.h>
+#include <osmocom/ranap/RANAP_TriggeringMessage.h>
+#include <osmocom/ranap/RANAP_TunnelInformation.h>
+#include <osmocom/ranap/RANAP_TypeOfError.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h>
+#include <osmocom/ranap/RANAP_UE-History-Information.h>
+#include <osmocom/ranap/RANAP_UE-ID.h>
+#include <osmocom/ranap/RANAP_UESBI-Iu.h>
+#include <osmocom/ranap/RANAP_UESBI-IuA.h>
+#include <osmocom/ranap/RANAP_UESBI-IuB.h>
+#include <osmocom/ranap/RANAP_UESpecificInformationIndication.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UP-ModeVersions.h>
+#include <osmocom/ranap/RANAP_UPInformation.h>
+#include <osmocom/ranap/RANAP_UPInitialisationFrame.h>
+#include <osmocom/ranap/RANAP_USCH-ID.h>
+#include <osmocom/ranap/RANAP_UTRAN-CellID.h>
+#include <osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h>
+#include <osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h>
+#include <osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h>
+#include <osmocom/ranap/RANAP_UnsuccessfulOutcome.h>
+#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
+#include <osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h>
+#include <osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h>
+#include <osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_UserPlaneMode.h>
+#include <osmocom/ranap/RANAP_VelocityEstimate.h>
+#include <osmocom/ranap/RANAP_VerticalAccuracyCode.h>
+#include <osmocom/ranap/RANAP_VerticalSpeedDirection.h>
+#include <osmocom/ranap/RANAP_VerticalVelocity.h>
+#include <osmocom/ranap/RANAP_VoiceSupportMatchIndicator.h>
 
 #if (ASN1C_ENVIRONMENT_VERSION < 924)
 # error "You are compiling with the wrong version of ASN1C"
diff --git a/src/ranap_msg_factory.h b/src/ranap_msg_factory.h
index 99c7777..7a9f3d2 100644
--- a/src/ranap_msg_factory.h
+++ b/src/ranap_msg_factory.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <stdint.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GlobalRNC-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_GlobalRNC-ID.h>
 
 /*! \brief generate RANAP DIRECT TRANSFER message */
 struct msgb *ranap_new_msg_dt(uint8_t sapi, const uint8_t *nas, unsigned int nas_len);
diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am
index 87f1940..908fc8e 100644
--- a/src/rua/Makefile.am
+++ b/src/rua/Makefile.am
@@ -85,5 +85,5 @@
 #	remove the local copy of the runtime code
 	@rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.*
 #	change include style to `#include <dir/foo.h>'
-	../../move-asn1-header-files.sh osmocom/osmo-iuh/rua $(ASN_MODULE_INC)
+	../../move-asn1-header-files.sh osmocom/rua $(ASN_MODULE_INC)
 
diff --git a/src/rua/RUA_Ansi-41-IDNNS.c b/src/rua/RUA_Ansi-41-IDNNS.c
index 1130fc6..3895632 100644
--- a/src/rua/RUA_Ansi-41-IDNNS.c
+++ b/src/rua/RUA_Ansi-41-IDNNS.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_Ansi-41-IDNNS.h>
+#include <osmocom/rua/RUA_Ansi-41-IDNNS.h>
 
 int
 RUA_Ansi_41_IDNNS_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_CN-DomainIndicator.c b/src/rua/RUA_CN-DomainIndicator.c
index 4a8812c..e7e137e 100644
--- a/src/rua/RUA_CN-DomainIndicator.c
+++ b/src/rua/RUA_CN-DomainIndicator.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_CN-DomainIndicator.h>
+#include <osmocom/rua/RUA_CN-DomainIndicator.h>
 
 int
 RUA_CN_DomainIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_CSGMembershipStatus.c b/src/rua/RUA_CSGMembershipStatus.c
index 91df987..718bd76 100644
--- a/src/rua/RUA_CSGMembershipStatus.c
+++ b/src/rua/RUA_CSGMembershipStatus.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_CSGMembershipStatus.h>
+#include <osmocom/rua/RUA_CSGMembershipStatus.h>
 
 int
 RUA_CSGMembershipStatus_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_Cause.c b/src/rua/RUA_Cause.c
index 7b580ae..abd2b40 100644
--- a/src/rua/RUA_Cause.c
+++ b/src/rua/RUA_Cause.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_Cause.h>
+#include <osmocom/rua/RUA_Cause.h>
 
 static asn_per_constraints_t asn_PER_type_RUA_Cause_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  3l }	/* (0..3,...) */,
diff --git a/src/rua/RUA_CauseMisc.c b/src/rua/RUA_CauseMisc.c
index ff4945b..ab68490 100644
--- a/src/rua/RUA_CauseMisc.c
+++ b/src/rua/RUA_CauseMisc.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_CauseMisc.h>
+#include <osmocom/rua/RUA_CauseMisc.h>
 
 int
 RUA_CauseMisc_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_CauseProtocol.c b/src/rua/RUA_CauseProtocol.c
index 010cfa2..0c03177 100644
--- a/src/rua/RUA_CauseProtocol.c
+++ b/src/rua/RUA_CauseProtocol.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_CauseProtocol.h>
+#include <osmocom/rua/RUA_CauseProtocol.h>
 
 int
 RUA_CauseProtocol_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_CauseRadioNetwork.c b/src/rua/RUA_CauseRadioNetwork.c
index 69f426c..b098555 100644
--- a/src/rua/RUA_CauseRadioNetwork.c
+++ b/src/rua/RUA_CauseRadioNetwork.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_CauseRadioNetwork.h>
+#include <osmocom/rua/RUA_CauseRadioNetwork.h>
 
 int
 RUA_CauseRadioNetwork_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_CauseTransport.c b/src/rua/RUA_CauseTransport.c
index a0e6e4a..95ccbcc 100644
--- a/src/rua/RUA_CauseTransport.c
+++ b/src/rua/RUA_CauseTransport.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_CauseTransport.h>
+#include <osmocom/rua/RUA_CauseTransport.h>
 
 int
 RUA_CauseTransport_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_Connect.c b/src/rua/RUA_Connect.c
index e8f4afa..19d56a1 100644
--- a/src/rua/RUA_Connect.c
+++ b/src/rua/RUA_Connect.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_Connect.h>
+#include <osmocom/rua/RUA_Connect.h>
 
 static int
 memb_connect_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_ConnectionlessTransfer.c b/src/rua/RUA_ConnectionlessTransfer.c
index 4a8df71..086a240 100644
--- a/src/rua/RUA_ConnectionlessTransfer.c
+++ b/src/rua/RUA_ConnectionlessTransfer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_ConnectionlessTransfer.h>
+#include <osmocom/rua/RUA_ConnectionlessTransfer.h>
 
 static int
 memb_connectionlessTransfer_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_Context-ID.c b/src/rua/RUA_Context-ID.c
index ea08305..e6d7780 100644
--- a/src/rua/RUA_Context-ID.c
+++ b/src/rua/RUA_Context-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_Context-ID.h>
+#include <osmocom/rua/RUA_Context-ID.h>
 
 int
 RUA_Context_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_Criticality.c b/src/rua/RUA_Criticality.c
index 464236e..9e3a1f2 100644
--- a/src/rua/RUA_Criticality.c
+++ b/src/rua/RUA_Criticality.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_Criticality.h>
 
 int
 RUA_Criticality_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_CriticalityDiagnostics-IE-List.c b/src/rua/RUA_CriticalityDiagnostics-IE-List.c
index f707540..55e4657 100644
--- a/src/rua/RUA_CriticalityDiagnostics-IE-List.c
+++ b/src/rua/RUA_CriticalityDiagnostics-IE-List.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h>
 
 static asn_per_constraints_t asn_PER_type_RUA_CriticalityDiagnostics_IE_List_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/rua/RUA_CriticalityDiagnostics.c b/src/rua/RUA_CriticalityDiagnostics.c
index 757415b..a279f5a 100644
--- a/src/rua/RUA_CriticalityDiagnostics.c
+++ b/src/rua/RUA_CriticalityDiagnostics.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_CriticalityDiagnostics.h>
+#include <osmocom/rua/RUA_CriticalityDiagnostics.h>
 
 static asn_TYPE_member_t asn_MBR_RUA_CriticalityDiagnostics_1[] = {
 	{ ATF_POINTER, 5, offsetof(struct RUA_CriticalityDiagnostics, procedureCode),
diff --git a/src/rua/RUA_DirectTransfer.c b/src/rua/RUA_DirectTransfer.c
index bdc2e77..8036517 100644
--- a/src/rua/RUA_DirectTransfer.c
+++ b/src/rua/RUA_DirectTransfer.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_DirectTransfer.h>
+#include <osmocom/rua/RUA_DirectTransfer.h>
 
 static int
 memb_directTransfer_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_Disconnect.c b/src/rua/RUA_Disconnect.c
index 956f4c6..898bd90 100644
--- a/src/rua/RUA_Disconnect.c
+++ b/src/rua/RUA_Disconnect.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_Disconnect.h>
+#include <osmocom/rua/RUA_Disconnect.h>
 
 static int
 memb_disconnect_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_ErrorIndication.c b/src/rua/RUA_ErrorIndication.c
index 2d7fc89..d95ff32 100644
--- a/src/rua/RUA_ErrorIndication.c
+++ b/src/rua/RUA_ErrorIndication.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_ErrorIndication.h>
+#include <osmocom/rua/RUA_ErrorIndication.h>
 
 static int
 memb_errorIndication_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_Establishment-Cause.c b/src/rua/RUA_Establishment-Cause.c
index 0bec81c..2bdace5 100644
--- a/src/rua/RUA_Establishment-Cause.c
+++ b/src/rua/RUA_Establishment-Cause.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_Establishment-Cause.h>
+#include <osmocom/rua/RUA_Establishment-Cause.h>
 
 int
 RUA_Establishment_Cause_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_Gsm-map-IDNNS.c b/src/rua/RUA_Gsm-map-IDNNS.c
index bdf8880..75bdb96 100644
--- a/src/rua/RUA_Gsm-map-IDNNS.c
+++ b/src/rua/RUA_Gsm-map-IDNNS.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_Gsm-map-IDNNS.h>
+#include <osmocom/rua/RUA_Gsm-map-IDNNS.h>
 
 static asn_per_constraints_t asn_PER_type_routingbasis_constr_2 GCC_NOTUSED = {
 	{ APC_CONSTRAINED,	 3,  3,  0l,  7l }	/* (0..7) */,
diff --git a/src/rua/RUA_IE-Extensions.c b/src/rua/RUA_IE-Extensions.c
index 6c287eb..80fa907 100644
--- a/src/rua/RUA_IE-Extensions.c
+++ b/src/rua/RUA_IE-Extensions.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_IE-Extensions.h>
+#include <osmocom/rua/RUA_IE-Extensions.h>
 
 static asn_per_constraints_t asn_PER_type_RUA_IE_Extensions_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/rua/RUA_IE.c b/src/rua/RUA_IE.c
index 1f978e9..77378f4 100644
--- a/src/rua/RUA_IE.c
+++ b/src/rua/RUA_IE.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_IE.h>
 
 static asn_TYPE_member_t asn_MBR_RUA_IE_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RUA_IE, id),
diff --git a/src/rua/RUA_InitiatingMessage.c b/src/rua/RUA_InitiatingMessage.c
index e1a7d6f..bcadd0f 100644
--- a/src/rua/RUA_InitiatingMessage.c
+++ b/src/rua/RUA_InitiatingMessage.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_InitiatingMessage.h>
+#include <osmocom/rua/RUA_InitiatingMessage.h>
 
 static asn_TYPE_member_t asn_MBR_RUA_InitiatingMessage_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RUA_InitiatingMessage, procedureCode),
diff --git a/src/rua/RUA_IntraDomainNasNodeSelector.c b/src/rua/RUA_IntraDomainNasNodeSelector.c
index f8d9007..b266c6f 100644
--- a/src/rua/RUA_IntraDomainNasNodeSelector.c
+++ b/src/rua/RUA_IntraDomainNasNodeSelector.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_IntraDomainNasNodeSelector.h>
+#include <osmocom/rua/RUA_IntraDomainNasNodeSelector.h>
 
 static int
 memb_futurecoding_constraint_7(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_Presence.c b/src/rua/RUA_Presence.c
index 42fec3f..6da824c 100644
--- a/src/rua/RUA_Presence.c
+++ b/src/rua/RUA_Presence.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_Presence.h>
+#include <osmocom/rua/RUA_Presence.h>
 
 int
 RUA_Presence_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_PrivateIE-ID.c b/src/rua/RUA_PrivateIE-ID.c
index c20efe4..729333e 100644
--- a/src/rua/RUA_PrivateIE-ID.c
+++ b/src/rua/RUA_PrivateIE-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_PrivateIE-ID.h>
+#include <osmocom/rua/RUA_PrivateIE-ID.h>
 
 static int
 memb_local_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_PrivateMessage.c b/src/rua/RUA_PrivateMessage.c
index 7d32db2..c549409 100644
--- a/src/rua/RUA_PrivateMessage.c
+++ b/src/rua/RUA_PrivateMessage.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_PrivateMessage.h>
+#include <osmocom/rua/RUA_PrivateMessage.h>
 
 static int
 memb_privateMessage_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_ProcedureCode.c b/src/rua/RUA_ProcedureCode.c
index a661b77..61b31ff 100644
--- a/src/rua/RUA_ProcedureCode.c
+++ b/src/rua/RUA_ProcedureCode.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_ProcedureCode.h>
+#include <osmocom/rua/RUA_ProcedureCode.h>
 
 int
 RUA_ProcedureCode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_ProtocolIE-ID.c b/src/rua/RUA_ProtocolIE-ID.c
index c89d413..5260eed 100644
--- a/src/rua/RUA_ProtocolIE-ID.c
+++ b/src/rua/RUA_ProtocolIE-ID.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_ProtocolIE-ID.h>
+#include <osmocom/rua/RUA_ProtocolIE-ID.h>
 
 int
 RUA_ProtocolIE_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_RANAP-Message.c b/src/rua/RUA_RANAP-Message.c
index e4bf8f5..28911c6 100644
--- a/src/rua/RUA_RANAP-Message.c
+++ b/src/rua/RUA_RANAP-Message.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_RANAP-Message.h>
+#include <osmocom/rua/RUA_RANAP-Message.h>
 
 int
 RUA_RANAP_Message_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_RUA-PDU.c b/src/rua/RUA_RUA-PDU.c
index 6f329a7..92215f6 100644
--- a/src/rua/RUA_RUA-PDU.c
+++ b/src/rua/RUA_RUA-PDU.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_RUA-PDU.h>
+#include <osmocom/rua/RUA_RUA-PDU.h>
 
 static asn_per_constraints_t asn_PER_type_RUA_RUA_PDU_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  2l }	/* (0..2,...) */,
diff --git a/src/rua/RUA_RoutingParameter.c b/src/rua/RUA_RoutingParameter.c
index cd574f8..be2e102 100644
--- a/src/rua/RUA_RoutingParameter.c
+++ b/src/rua/RUA_RoutingParameter.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_RoutingParameter.h>
+#include <osmocom/rua/RUA_RoutingParameter.h>
 
 int
 RUA_RoutingParameter_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_SuccessfulOutcome.c b/src/rua/RUA_SuccessfulOutcome.c
index 0471197..f446ec8 100644
--- a/src/rua/RUA_SuccessfulOutcome.c
+++ b/src/rua/RUA_SuccessfulOutcome.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_SuccessfulOutcome.h>
+#include <osmocom/rua/RUA_SuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_RUA_SuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RUA_SuccessfulOutcome, procedureCode),
diff --git a/src/rua/RUA_TriggeringMessage.c b/src/rua/RUA_TriggeringMessage.c
index 3a17f79..8b2de60 100644
--- a/src/rua/RUA_TriggeringMessage.c
+++ b/src/rua/RUA_TriggeringMessage.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-CommonDataTypes.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_TriggeringMessage.h>
+#include <osmocom/rua/RUA_TriggeringMessage.h>
 
 int
 RUA_TriggeringMessage_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_TypeOfError.c b/src/rua/RUA_TypeOfError.c
index 699d84d..c48d852 100644
--- a/src/rua/RUA_TypeOfError.c
+++ b/src/rua/RUA_TypeOfError.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-IEs.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_TypeOfError.h>
+#include <osmocom/rua/RUA_TypeOfError.h>
 
 int
 RUA_TypeOfError_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/rua/RUA_UnsuccessfulOutcome.c b/src/rua/RUA_UnsuccessfulOutcome.c
index f3e8843..95e6dd5 100644
--- a/src/rua/RUA_UnsuccessfulOutcome.c
+++ b/src/rua/RUA_UnsuccessfulOutcome.c
@@ -4,7 +4,7 @@
  * 	found in "../../asn1/rua/RUA-PDU.asn"
  */
 
-#include <osmocom/osmo-iuh/rua/RUA_UnsuccessfulOutcome.h>
+#include <osmocom/rua/RUA_UnsuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_RUA_UnsuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RUA_UnsuccessfulOutcome, procedureCode),
diff --git a/src/rua_common.h b/src/rua_common.h
index 03c1383..9b3a65c 100644
--- a/src/rua_common.h
+++ b/src/rua_common.h
@@ -2,41 +2,41 @@
 
 #include <asn_application.h>
 
-#include <osmocom/osmo-iuh/rua/RUA_Ansi-41-IDNNS.h>
-#include <osmocom/osmo-iuh/rua/RUA_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/rua/RUA_CSGMembershipStatus.h>
-#include <osmocom/osmo-iuh/rua/RUA_Cause.h>
-#include <osmocom/osmo-iuh/rua/RUA_CauseMisc.h>
-#include <osmocom/osmo-iuh/rua/RUA_CauseProtocol.h>
-#include <osmocom/osmo-iuh/rua/RUA_CauseRadioNetwork.h>
-#include <osmocom/osmo-iuh/rua/RUA_CauseTransport.h>
-#include <osmocom/osmo-iuh/rua/RUA_Connect.h>
-#include <osmocom/osmo-iuh/rua/RUA_ConnectionlessTransfer.h>
-#include <osmocom/osmo-iuh/rua/RUA_Context-ID.h>
-#include <osmocom/osmo-iuh/rua/RUA_Criticality.h>
-#include <osmocom/osmo-iuh/rua/RUA_CriticalityDiagnostics-IE-List.h>
-#include <osmocom/osmo-iuh/rua/RUA_CriticalityDiagnostics.h>
-#include <osmocom/osmo-iuh/rua/RUA_DirectTransfer.h>
-#include <osmocom/osmo-iuh/rua/RUA_Disconnect.h>
-#include <osmocom/osmo-iuh/rua/RUA_ErrorIndication.h>
-#include <osmocom/osmo-iuh/rua/RUA_Establishment-Cause.h>
-#include <osmocom/osmo-iuh/rua/RUA_Gsm-map-IDNNS.h>
-#include <osmocom/osmo-iuh/rua/RUA_IE-Extensions.h>
-#include <osmocom/osmo-iuh/rua/RUA_IE.h>
-#include <osmocom/osmo-iuh/rua/RUA_InitiatingMessage.h>
-#include <osmocom/osmo-iuh/rua/RUA_IntraDomainNasNodeSelector.h>
-#include <osmocom/osmo-iuh/rua/RUA_Presence.h>
-#include <osmocom/osmo-iuh/rua/RUA_PrivateIE-ID.h>
-#include <osmocom/osmo-iuh/rua/RUA_PrivateMessage.h>
-#include <osmocom/osmo-iuh/rua/RUA_ProcedureCode.h>
-#include <osmocom/osmo-iuh/rua/RUA_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/rua/RUA_RANAP-Message.h>
-#include <osmocom/osmo-iuh/rua/RUA_RUA-PDU.h>
-#include <osmocom/osmo-iuh/rua/RUA_RoutingParameter.h>
-#include <osmocom/osmo-iuh/rua/RUA_SuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/rua/RUA_TriggeringMessage.h>
-#include <osmocom/osmo-iuh/rua/RUA_TypeOfError.h>
-#include <osmocom/osmo-iuh/rua/RUA_UnsuccessfulOutcome.h>
+#include <osmocom/rua/RUA_Ansi-41-IDNNS.h>
+#include <osmocom/rua/RUA_CN-DomainIndicator.h>
+#include <osmocom/rua/RUA_CSGMembershipStatus.h>
+#include <osmocom/rua/RUA_Cause.h>
+#include <osmocom/rua/RUA_CauseMisc.h>
+#include <osmocom/rua/RUA_CauseProtocol.h>
+#include <osmocom/rua/RUA_CauseRadioNetwork.h>
+#include <osmocom/rua/RUA_CauseTransport.h>
+#include <osmocom/rua/RUA_Connect.h>
+#include <osmocom/rua/RUA_ConnectionlessTransfer.h>
+#include <osmocom/rua/RUA_Context-ID.h>
+#include <osmocom/rua/RUA_Criticality.h>
+#include <osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/rua/RUA_CriticalityDiagnostics.h>
+#include <osmocom/rua/RUA_DirectTransfer.h>
+#include <osmocom/rua/RUA_Disconnect.h>
+#include <osmocom/rua/RUA_ErrorIndication.h>
+#include <osmocom/rua/RUA_Establishment-Cause.h>
+#include <osmocom/rua/RUA_Gsm-map-IDNNS.h>
+#include <osmocom/rua/RUA_IE-Extensions.h>
+#include <osmocom/rua/RUA_IE.h>
+#include <osmocom/rua/RUA_InitiatingMessage.h>
+#include <osmocom/rua/RUA_IntraDomainNasNodeSelector.h>
+#include <osmocom/rua/RUA_Presence.h>
+#include <osmocom/rua/RUA_PrivateIE-ID.h>
+#include <osmocom/rua/RUA_PrivateMessage.h>
+#include <osmocom/rua/RUA_ProcedureCode.h>
+#include <osmocom/rua/RUA_ProtocolIE-ID.h>
+#include <osmocom/rua/RUA_RANAP-Message.h>
+#include <osmocom/rua/RUA_RUA-PDU.h>
+#include <osmocom/rua/RUA_RoutingParameter.h>
+#include <osmocom/rua/RUA_SuccessfulOutcome.h>
+#include <osmocom/rua/RUA_TriggeringMessage.h>
+#include <osmocom/rua/RUA_TypeOfError.h>
+#include <osmocom/rua/RUA_UnsuccessfulOutcome.h>
 
 #if (ASN1C_ENVIRONMENT_VERSION < 924)
 # error "You are compiling with the wrong version of ASN1C"