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