aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeels Hofmeyr <neels@hofmeyr.de>2016-01-05 12:00:06 +0100
committerNeels Hofmeyr <neels@hofmeyr.de>2016-01-05 12:00:06 +0100
commitf1f2d7ca19ec11531c9c5d37355789046025200e (patch)
tree72be9e0720da45279a31478578789dd6d15aafd2
parentaca8f197e737bca0521d5bbc483459825415926f (diff)
Remove osmo-iuh subdir level from include/ (2/2)
Make all changes to #include statements and build files.
-rw-r--r--configure.ac7
-rw-r--r--include/osmocom/hnbap/AdditionalNeighbourInfoList.h2
-rw-r--r--include/osmocom/hnbap/CGI.h8
-rw-r--r--include/osmocom/hnbap/CSGMembershipUpdate.h2
-rw-r--r--include/osmocom/hnbap/Cause.h8
-rw-r--r--include/osmocom/hnbap/ConfigurationInformation.h4
-rw-r--r--include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h8
-rw-r--r--include/osmocom/hnbap/CriticalityDiagnostics.h10
-rw-r--r--include/osmocom/hnbap/ErrorIndication.h2
-rw-r--r--include/osmocom/hnbap/GeographicalCoordinates.h2
-rw-r--r--include/osmocom/hnbap/GeographicalLocation.h6
-rw-r--r--include/osmocom/hnbap/HNB-Cell-Identifier.h6
-rw-r--r--include/osmocom/hnbap/HNB-GWResponse.h6
-rw-r--r--include/osmocom/hnbap/HNB-Identity.h4
-rw-r--r--include/osmocom/hnbap/HNB-Location-Information.h6
-rw-r--r--include/osmocom/hnbap/HNB-RNL-Identity.h2
-rw-r--r--include/osmocom/hnbap/HNBAP-PDU.h6
-rw-r--r--include/osmocom/hnbap/HNBConfigInfo.h6
-rw-r--r--include/osmocom/hnbap/HNBConfigTransferRequest.h2
-rw-r--r--include/osmocom/hnbap/HNBConfigTransferResponse.h2
-rw-r--r--include/osmocom/hnbap/HNBConfigurationInformationMissing.h4
-rw-r--r--include/osmocom/hnbap/HNBConfigurationInformationProvided.h10
-rw-r--r--include/osmocom/hnbap/HNBDe-Register.h2
-rw-r--r--include/osmocom/hnbap/HNBRegisterAccept.h2
-rw-r--r--include/osmocom/hnbap/HNBRegisterReject.h2
-rw-r--r--include/osmocom/hnbap/HNBRegisterRequest.h2
-rw-r--r--include/osmocom/hnbap/IE-Extensions.h2
-rw-r--r--include/osmocom/hnbap/IE.h4
-rw-r--r--include/osmocom/hnbap/IMSIESN.h4
-rw-r--r--include/osmocom/hnbap/IP-Address.h6
-rw-r--r--include/osmocom/hnbap/InitiatingMessage.h4
-rw-r--r--include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h2
-rw-r--r--include/osmocom/hnbap/LAI.h4
-rw-r--r--include/osmocom/hnbap/MacroCellID.h4
-rw-r--r--include/osmocom/hnbap/MacroCoverageInformation.h4
-rw-r--r--include/osmocom/hnbap/NeighbourCellIdentityList.h2
-rw-r--r--include/osmocom/hnbap/NeighbourIdentity.h4
-rw-r--r--include/osmocom/hnbap/NeighbourInfoList.h2
-rw-r--r--include/osmocom/hnbap/NeighbourInfoRequestItem.h4
-rw-r--r--include/osmocom/hnbap/NeighbourInfoRequestList.h2
-rw-r--r--include/osmocom/hnbap/PTMSIRAI.h4
-rw-r--r--include/osmocom/hnbap/PrivateMessage.h2
-rw-r--r--include/osmocom/hnbap/RABList.h2
-rw-r--r--include/osmocom/hnbap/RABListItem.h8
-rw-r--r--include/osmocom/hnbap/RAI.h4
-rw-r--r--include/osmocom/hnbap/RelocationComplete.h2
-rw-r--r--include/osmocom/hnbap/SuccessfulOutcome.h4
-rw-r--r--include/osmocom/hnbap/TMSILAI.h2
-rw-r--r--include/osmocom/hnbap/TNLUpdateFailure.h2
-rw-r--r--include/osmocom/hnbap/TNLUpdateRequest.h2
-rw-r--r--include/osmocom/hnbap/TNLUpdateResponse.h2
-rw-r--r--include/osmocom/hnbap/TransportInfo.h8
-rw-r--r--include/osmocom/hnbap/Tunnel-Information.h6
-rw-r--r--include/osmocom/hnbap/U-RNTIQueryRequest.h2
-rw-r--r--include/osmocom/hnbap/U-RNTIQueryResponse.h2
-rw-r--r--include/osmocom/hnbap/UE-Capabilities.h6
-rw-r--r--include/osmocom/hnbap/UE-Identity.h16
-rw-r--r--include/osmocom/hnbap/UEDe-Register.h2
-rw-r--r--include/osmocom/hnbap/UERegisterAccept.h2
-rw-r--r--include/osmocom/hnbap/UERegisterReject.h2
-rw-r--r--include/osmocom/hnbap/UERegisterRequest.h2
-rw-r--r--include/osmocom/hnbap/URAIdentityList.h2
-rw-r--r--include/osmocom/hnbap/UTRANCellID.h10
-rw-r--r--include/osmocom/hnbap/UnsuccessfulOutcome.h4
-rw-r--r--include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h10
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h4
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h4
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h4
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h4
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h6
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h6
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h2
-rw-r--r--include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h6
-rw-r--r--include/osmocom/ranap/RANAP_AreaIdentity.h4
-rw-r--r--include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h6
-rw-r--r--include/osmocom/ranap/RANAP_AuthorisedPLMNs.h6
-rw-r--r--include/osmocom/ranap/RANAP_AuthorisedSNAs.h2
-rw-r--r--include/osmocom/ranap/RANAP_CGI.h8
-rw-r--r--include/osmocom/ranap/RANAP_CN-DeactivateTrace.h2
-rw-r--r--include/osmocom/ranap/RANAP_CN-InvokeTrace.h2
-rw-r--r--include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h4
-rw-r--r--include/osmocom/ranap/RANAP_CSG-Id-List.h2
-rw-r--r--include/osmocom/ranap/RANAP_Cause.h14
-rw-r--r--include/osmocom/ranap/RANAP_CellBased.h4
-rw-r--r--include/osmocom/ranap/RANAP_CellIdList.h2
-rw-r--r--include/osmocom/ranap/RANAP_CellLoadInformation.h10
-rw-r--r--include/osmocom/ranap/RANAP_CellLoadInformationGroup.h6
-rw-r--r--include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h2
-rw-r--r--include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h2
-rw-r--r--include/osmocom/ranap/RANAP_CommonID.h2
-rw-r--r--include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h8
-rw-r--r--include/osmocom/ranap/RANAP_CriticalityDiagnostics.h10
-rw-r--r--include/osmocom/ranap/RANAP_DataVolumeList.h6
-rw-r--r--include/osmocom/ranap/RANAP_DataVolumeReport.h2
-rw-r--r--include/osmocom/ranap/RANAP_DataVolumeReportList.h2
-rw-r--r--include/osmocom/ranap/RANAP_DataVolumeReportRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h6
-rw-r--r--include/osmocom/ranap/RANAP_DirectInformationTransfer.h2
-rw-r--r--include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h2
-rw-r--r--include/osmocom/ranap/RANAP_DirectTransfer.h2
-rw-r--r--include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h8
-rw-r--r--include/osmocom/ranap/RANAP_EUTRANFrequencies.h4
-rw-r--r--include/osmocom/ranap/RANAP_EncryptionInformation.h6
-rw-r--r--include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h2
-rw-r--r--include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h8
-rw-r--r--include/osmocom/ranap/RANAP_ErrorIndication.h2
-rw-r--r--include/osmocom/ranap/RANAP_Event1F-Parameters.h2
-rw-r--r--include/osmocom/ranap/RANAP_ForwardSRNS-Context.h2
-rw-r--r--include/osmocom/ranap/RANAP_GA-EllipsoidArc.h4
-rw-r--r--include/osmocom/ranap/RANAP_GA-Point.h4
-rw-r--r--include/osmocom/ranap/RANAP_GA-PointWithAltitude.h6
-rw-r--r--include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h8
-rw-r--r--include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h4
-rw-r--r--include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h6
-rw-r--r--include/osmocom/ranap/RANAP_GA-Polygon.h4
-rw-r--r--include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h2
-rw-r--r--include/osmocom/ranap/RANAP_GERAN-Cell-ID.h8
-rw-r--r--include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h8
-rw-r--r--include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h2
-rw-r--r--include/osmocom/ranap/RANAP_GeographicalArea.h14
-rw-r--r--include/osmocom/ranap/RANAP_GeographicalCoordinates.h2
-rw-r--r--include/osmocom/ranap/RANAP_GlobalCN-ID.h4
-rw-r--r--include/osmocom/ranap/RANAP_GlobalRNC-ID.h4
-rw-r--r--include/osmocom/ranap/RANAP_HorizontalVelocity.h4
-rw-r--r--include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h4
-rw-r--r--include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h6
-rw-r--r--include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h6
-rw-r--r--include/osmocom/ranap/RANAP_IE-Extensions.h2
-rw-r--r--include/osmocom/ranap/RANAP_IE.h4
-rw-r--r--include/osmocom/ranap/RANAP_IMEIGroup.h4
-rw-r--r--include/osmocom/ranap/RANAP_IMEIList.h2
-rw-r--r--include/osmocom/ranap/RANAP_IMEISVGroup.h4
-rw-r--r--include/osmocom/ranap/RANAP_IMEISVList.h2
-rw-r--r--include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h4
-rw-r--r--include/osmocom/ranap/RANAP_IRATmeasurementParameters.h4
-rw-r--r--include/osmocom/ranap/RANAP_ImmediateMDT.h8
-rw-r--r--include/osmocom/ranap/RANAP_InformationRequestType.h4
-rw-r--r--include/osmocom/ranap/RANAP_InformationRequested.h4
-rw-r--r--include/osmocom/ranap/RANAP_InformationTransferConfirmation.h2
-rw-r--r--include/osmocom/ranap/RANAP_InformationTransferFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_InformationTransferIndication.h2
-rw-r--r--include/osmocom/ranap/RANAP_InformationTransferType.h2
-rw-r--r--include/osmocom/ranap/RANAP_InitialUE-Message.h2
-rw-r--r--include/osmocom/ranap/RANAP_InitiatingMessage.h4
-rw-r--r--include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h6
-rw-r--r--include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h4
-rw-r--r--include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h2
-rw-r--r--include/osmocom/ranap/RANAP_InterfacesToTraceItem.h2
-rw-r--r--include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h2
-rw-r--r--include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h2
-rw-r--r--include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h2
-rw-r--r--include/osmocom/ranap/RANAP_IuTransportAssociation.h4
-rw-r--r--include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h6
-rw-r--r--include/osmocom/ranap/RANAP_LA-LIST.h6
-rw-r--r--include/osmocom/ranap/RANAP_LABased.h4
-rw-r--r--include/osmocom/ranap/RANAP_LAI-List.h2
-rw-r--r--include/osmocom/ranap/RANAP_LAI.h6
-rw-r--r--include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h2
-rw-r--r--include/osmocom/ranap/RANAP_LastKnownServiceArea.h4
-rw-r--r--include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h8
-rw-r--r--include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h4
-rw-r--r--include/osmocom/ranap/RANAP_ListOF-SNAs.h2
-rw-r--r--include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h2
-rw-r--r--include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h4
-rw-r--r--include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_LocationReport.h2
-rw-r--r--include/osmocom/ranap/RANAP_LocationReportingControl.h2
-rw-r--r--include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h20
-rw-r--r--include/osmocom/ranap/RANAP_LoggedMDT.h6
-rw-r--r--include/osmocom/ranap/RANAP_M1Report.h4
-rw-r--r--include/osmocom/ranap/RANAP_M2Report.h4
-rw-r--r--include/osmocom/ranap/RANAP_M4-Collection-Parameters.h6
-rw-r--r--include/osmocom/ranap/RANAP_M4Report.h2
-rw-r--r--include/osmocom/ranap/RANAP_M5Report.h2
-rw-r--r--include/osmocom/ranap/RANAP_M6Report.h6
-rw-r--r--include/osmocom/ranap/RANAP_M7Report.h6
-rw-r--r--include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h8
-rw-r--r--include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSRABRelease.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSSessionStart.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSSessionStop.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSSessionUpdate.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h8
-rw-r--r--include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_MDT-Configuration.h8
-rw-r--r--include/osmocom/ranap/RANAP_MDT-PLMN-List.h2
-rw-r--r--include/osmocom/ranap/RANAP_MDT-Report-Parameters.h4
-rw-r--r--include/osmocom/ranap/RANAP_MDTAreaScope.h6
-rw-r--r--include/osmocom/ranap/RANAP_MDTMode.h4
-rw-r--r--include/osmocom/ranap/RANAP_MessageStructure.h6
-rw-r--r--include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h2
-rw-r--r--include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h4
-rw-r--r--include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h6
-rw-r--r--include/osmocom/ranap/RANAP_Outcome.h4
-rw-r--r--include/osmocom/ranap/RANAP_Overload.h2
-rw-r--r--include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h2
-rw-r--r--include/osmocom/ranap/RANAP_PDP-TypeInformation.h2
-rw-r--r--include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h6
-rw-r--r--include/osmocom/ranap/RANAP_Paging.h2
-rw-r--r--include/osmocom/ranap/RANAP_PagingAreaID.h4
-rw-r--r--include/osmocom/ranap/RANAP_PeriodicLocationInfo.h2
-rw-r--r--include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h2
-rw-r--r--include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h2
-rw-r--r--include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h2
-rw-r--r--include/osmocom/ranap/RANAP_PositionData.h6
-rw-r--r--include/osmocom/ranap/RANAP_PositioningDataSet.h2
-rw-r--r--include/osmocom/ranap/RANAP_PrivateMessage.h2
-rw-r--r--include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h2
-rw-r--r--include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h2
-rw-r--r--include/osmocom/ranap/RANAP_ProtocolExtensionField.h4
-rw-r--r--include/osmocom/ranap/RANAP_ProtocolIE-Container.h2
-rw-r--r--include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h2
-rw-r--r--include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h4
-rw-r--r--include/osmocom/ranap/RANAP_ProvidedData.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h12
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ContextItem.h12
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ContextList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h4
-rw-r--r--include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h8
-rw-r--r--include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-DataForwardingList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h6
-rw-r--r--include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h4
-rw-r--r--include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h8
-rw-r--r--include/osmocom/ranap/RANAP_RAB-FailedItem.h6
-rw-r--r--include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-FailedList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ModifyItem.h6
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ModifyList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ModifyRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-Parameters.h26
-rw-r--r--include/osmocom/ranap/RANAP_RAB-QueuedItem.h4
-rw-r--r--include/osmocom/ranap/RANAP_RAB-QueuedList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ReleaseItem.h6
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ReleaseList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h8
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ReleasedItem.h10
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ReleasedList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h4
-rw-r--r--include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h20
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h10
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h10
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h14
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h20
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h8
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h10
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h14
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h14
-rw-r--r--include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h6
-rw-r--r--include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h6
-rw-r--r--include/osmocom/ranap/RANAP_RABDataVolumeReport.h6
-rw-r--r--include/osmocom/ranap/RANAP_RABParametersList.h10
-rw-r--r--include/osmocom/ranap/RANAP_RABased.h4
-rw-r--r--include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h6
-rw-r--r--include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h6
-rw-r--r--include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAI-List.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAI.h6
-rw-r--r--include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h2
-rw-r--r--include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_RANAP-PDU.h8
-rw-r--r--include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h2
-rw-r--r--include/osmocom/ranap/RANAP_RAofIdleModeUEs.h2
-rw-r--r--include/osmocom/ranap/RANAP_RIM-Transfer.h6
-rw-r--r--include/osmocom/ranap/RANAP_RIMRoutingAddress.h6
-rw-r--r--include/osmocom/ranap/RANAP_RNCTraceInformation.h6
-rw-r--r--include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h10
-rw-r--r--include/osmocom/ranap/RANAP_RSRVCC-Information.h2
-rw-r--r--include/osmocom/ranap/RANAP_RedirectionIndication.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationCancel.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationCommand.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationComplete.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationDetect.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationPreparationFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h2
-rw-r--r--include/osmocom/ranap/RANAP_RelocationRequired.h2
-rw-r--r--include/osmocom/ranap/RANAP_RequestType.h4
-rw-r--r--include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h6
-rw-r--r--include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h2
-rw-r--r--include/osmocom/ranap/RANAP_Reset.h2
-rw-r--r--include/osmocom/ranap/RANAP_ResetAcknowledge.h2
-rw-r--r--include/osmocom/ranap/RANAP_ResetResource.h2
-rw-r--r--include/osmocom/ranap/RANAP_ResetResourceAckItem.h4
-rw-r--r--include/osmocom/ranap/RANAP_ResetResourceAckList.h2
-rw-r--r--include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h2
-rw-r--r--include/osmocom/ranap/RANAP_ResetResourceItem.h4
-rw-r--r--include/osmocom/ranap/RANAP_ResetResourceList.h2
-rw-r--r--include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h2
-rw-r--r--include/osmocom/ranap/RANAP_SAI.h8
-rw-r--r--include/osmocom/ranap/RANAP_SDU-ErrorRatio.h2
-rw-r--r--include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h6
-rw-r--r--include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h2
-rw-r--r--include/osmocom/ranap/RANAP_SDU-ParameterItem.h10
-rw-r--r--include/osmocom/ranap/RANAP_SDU-Parameters.h2
-rw-r--r--include/osmocom/ranap/RANAP_SNA-Access-Information.h4
-rw-r--r--include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h2
-rw-r--r--include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h6
-rw-r--r--include/osmocom/ranap/RANAP_SRNS-ContextRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_SRNS-ContextResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h2
-rw-r--r--include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_SRVCC-Information.h2
-rw-r--r--include/osmocom/ranap/RANAP_SecurityModeCommand.h2
-rw-r--r--include/osmocom/ranap/RANAP_SecurityModeComplete.h2
-rw-r--r--include/osmocom/ranap/RANAP_SecurityModeReject.h2
-rw-r--r--include/osmocom/ranap/RANAP_Shared-Network-Information.h4
-rw-r--r--include/osmocom/ranap/RANAP_SourceCellID.h4
-rw-r--r--include/osmocom/ranap/RANAP_SourceID.h4
-rw-r--r--include/osmocom/ranap/RANAP_SourceRNC-ID.h6
-rw-r--r--include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h22
-rw-r--r--include/osmocom/ranap/RANAP_SourceUTRANCellID.h6
-rw-r--r--include/osmocom/ranap/RANAP_SuccessfulOutcome.h4
-rw-r--r--include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h2
-rw-r--r--include/osmocom/ranap/RANAP_TAI.h6
-rw-r--r--include/osmocom/ranap/RANAP_TMGI.h4
-rw-r--r--include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h6
-rw-r--r--include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h6
-rw-r--r--include/osmocom/ranap/RANAP_TargetENB-ID.h8
-rw-r--r--include/osmocom/ranap/RANAP_TargetID.h6
-rw-r--r--include/osmocom/ranap/RANAP_TargetRNC-ID.h8
-rw-r--r--include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h6
-rw-r--r--include/osmocom/ranap/RANAP_TemporaryUE-ID.h4
-rw-r--r--include/osmocom/ranap/RANAP_TrCH-ID-List.h2
-rw-r--r--include/osmocom/ranap/RANAP_TrCH-ID.h8
-rw-r--r--include/osmocom/ranap/RANAP_TraceInformation.h8
-rw-r--r--include/osmocom/ranap/RANAP_TracePropagationParameters.h8
-rw-r--r--include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h6
-rw-r--r--include/osmocom/ranap/RANAP_TransportLayerInformation.h6
-rw-r--r--include/osmocom/ranap/RANAP_TunnelInformation.h6
-rw-r--r--include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h4
-rw-r--r--include/osmocom/ranap/RANAP_UE-ID.h6
-rw-r--r--include/osmocom/ranap/RANAP_UESBI-Iu.h6
-rw-r--r--include/osmocom/ranap/RANAP_UESpecificInformationIndication.h2
-rw-r--r--include/osmocom/ranap/RANAP_UPInformation.h10
-rw-r--r--include/osmocom/ranap/RANAP_UTRAN-CellID.h6
-rw-r--r--include/osmocom/ranap/RANAP_UeRadioCapabilityMatchRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_UeRadioCapabilityMatchResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_UnsuccessfulLinking-IEs.h6
-rw-r--r--include/osmocom/ranap/RANAP_UnsuccessfulOutcome.h4
-rw-r--r--include/osmocom/ranap/RANAP_UplinkInformationExchangeFailure.h2
-rw-r--r--include/osmocom/ranap/RANAP_UplinkInformationExchangeRequest.h2
-rw-r--r--include/osmocom/ranap/RANAP_UplinkInformationExchangeResponse.h2
-rw-r--r--include/osmocom/ranap/RANAP_UserPlaneInformation.h6
-rw-r--r--include/osmocom/ranap/RANAP_VelocityEstimate.h8
-rw-r--r--include/osmocom/ranap/RANAP_VerticalVelocity.h2
-rw-r--r--include/osmocom/rua/RUA_Cause.h8
-rw-r--r--include/osmocom/rua/RUA_Connect.h2
-rw-r--r--include/osmocom/rua/RUA_ConnectionlessTransfer.h2
-rw-r--r--include/osmocom/rua/RUA_CriticalityDiagnostics-IE-List.h8
-rw-r--r--include/osmocom/rua/RUA_CriticalityDiagnostics.h10
-rw-r--r--include/osmocom/rua/RUA_DirectTransfer.h2
-rw-r--r--include/osmocom/rua/RUA_Disconnect.h2
-rw-r--r--include/osmocom/rua/RUA_ErrorIndication.h2
-rw-r--r--include/osmocom/rua/RUA_Gsm-map-IDNNS.h2
-rw-r--r--include/osmocom/rua/RUA_IE-Extensions.h2
-rw-r--r--include/osmocom/rua/RUA_IE.h4
-rw-r--r--include/osmocom/rua/RUA_InitiatingMessage.h4
-rw-r--r--include/osmocom/rua/RUA_IntraDomainNasNodeSelector.h4
-rw-r--r--include/osmocom/rua/RUA_PrivateMessage.h2
-rw-r--r--include/osmocom/rua/RUA_RUA-PDU.h6
-rw-r--r--include/osmocom/rua/RUA_SuccessfulOutcome.h4
-rw-r--r--include/osmocom/rua/RUA_UnsuccessfulOutcome.h4
-rw-r--r--src/hnbap/Access-stratum-release-indicator.c2
-rw-r--r--src/hnbap/AccessResult.c2
-rw-r--r--src/hnbap/AdditionalNeighbourInfoList.c2
-rw-r--r--src/hnbap/AltitudeAndDirection.c2
-rw-r--r--src/hnbap/BackoffTimer.c2
-rw-r--r--src/hnbap/BindingID.c2
-rw-r--r--src/hnbap/CELL-FACHMobilitySupport.c2
-rw-r--r--src/hnbap/CGI.c2
-rw-r--r--src/hnbap/CI.c2
-rw-r--r--src/hnbap/CN-DomainIndicator.c2
-rw-r--r--src/hnbap/CSG-Capability.c2
-rw-r--r--src/hnbap/CSG-ID.c2
-rw-r--r--src/hnbap/CSGMembershipStatus.c2
-rw-r--r--src/hnbap/CSGMembershipUpdate.c2
-rw-r--r--src/hnbap/Cause.c2
-rw-r--r--src/hnbap/CauseMisc.c2
-rw-r--r--src/hnbap/CauseProtocol.c2
-rw-r--r--src/hnbap/CauseRadioNetwork.c2
-rw-r--r--src/hnbap/CauseTransport.c2
-rw-r--r--src/hnbap/CellIdentity.c2
-rw-r--r--src/hnbap/ConfigurationInformation.c2
-rw-r--r--src/hnbap/Context-ID.c2
-rw-r--r--src/hnbap/Criticality.c2
-rw-r--r--src/hnbap/CriticalityDiagnostics-IE-List.c2
-rw-r--r--src/hnbap/CriticalityDiagnostics.c2
-rw-r--r--src/hnbap/ESN.c2
-rw-r--r--src/hnbap/ErrorIndication.c2
-rw-r--r--src/hnbap/GTP-TEI.c2
-rw-r--r--src/hnbap/GeographicalCoordinates.c2
-rw-r--r--src/hnbap/GeographicalLocation.c2
-rw-r--r--src/hnbap/HNB-Cell-Access-Mode.c2
-rw-r--r--src/hnbap/HNB-Cell-Identifier.c2
-rw-r--r--src/hnbap/HNB-GWResponse.c2
-rw-r--r--src/hnbap/HNB-Identity-Info.c2
-rw-r--r--src/hnbap/HNB-Identity.c2
-rw-r--r--src/hnbap/HNB-Location-Information.c2
-rw-r--r--src/hnbap/HNB-RNL-Identity.c2
-rw-r--r--src/hnbap/HNBAP-PDU.c2
-rw-r--r--src/hnbap/HNBCapacity.c2
-rw-r--r--src/hnbap/HNBConfigInfo.c2
-rw-r--r--src/hnbap/HNBConfigTransferRequest.c2
-rw-r--r--src/hnbap/HNBConfigTransferResponse.c2
-rw-r--r--src/hnbap/HNBConfigurationInformationMissing.c2
-rw-r--r--src/hnbap/HNBConfigurationInformationProvided.c2
-rw-r--r--src/hnbap/HNBDe-Register.c2
-rw-r--r--src/hnbap/HNBRegisterAccept.c2
-rw-r--r--src/hnbap/HNBRegisterReject.c2
-rw-r--r--src/hnbap/HNBRegisterRequest.c2
-rw-r--r--src/hnbap/IE-Extensions.c2
-rw-r--r--src/hnbap/IE.c2
-rw-r--r--src/hnbap/IMEI.c2
-rw-r--r--src/hnbap/IMSI.c2
-rw-r--r--src/hnbap/IMSIDS41.c2
-rw-r--r--src/hnbap/IMSIESN.c2
-rw-r--r--src/hnbap/IP-Address.c2
-rw-r--r--src/hnbap/InitiatingMessage.c2
-rw-r--r--src/hnbap/Ipv4Address.c2
-rw-r--r--src/hnbap/Ipv6Address.c2
-rw-r--r--src/hnbap/Iurh-Signalling-TNL-AddressList.c2
-rw-r--r--src/hnbap/LAC.c2
-rw-r--r--src/hnbap/LAI.c2
-rw-r--r--src/hnbap/MacroCellID.c2
-rw-r--r--src/hnbap/MacroCoverageInformation.c2
-rw-r--r--src/hnbap/Makefile.am2
-rw-r--r--src/hnbap/MuxPortNumber.c2
-rw-r--r--src/hnbap/NeighbourCellIdentityList.c2
-rw-r--r--src/hnbap/NeighbourIdentity.c2
-rw-r--r--src/hnbap/NeighbourInfoList.c2
-rw-r--r--src/hnbap/NeighbourInfoRequestItem.c2
-rw-r--r--src/hnbap/NeighbourInfoRequestList.c2
-rw-r--r--src/hnbap/PLMNidentity.c2
-rw-r--r--src/hnbap/PSC.c2
-rw-r--r--src/hnbap/PTMSI.c2
-rw-r--r--src/hnbap/PTMSIRAI.c2
-rw-r--r--src/hnbap/Presence.c2
-rw-r--r--src/hnbap/PrivateIE-ID.c2
-rw-r--r--src/hnbap/PrivateMessage.c2
-rw-r--r--src/hnbap/ProcedureCode.c2
-rw-r--r--src/hnbap/ProtocolIE-ID.c2
-rw-r--r--src/hnbap/RAB-ID.c2
-rw-r--r--src/hnbap/RABList.c2
-rw-r--r--src/hnbap/RABListItem.c2
-rw-r--r--src/hnbap/RAC.c2
-rw-r--r--src/hnbap/RAI.c2
-rw-r--r--src/hnbap/RNC-ID.c2
-rw-r--r--src/hnbap/Registration-Cause.c2
-rw-r--r--src/hnbap/RelocationComplete.c2
-rw-r--r--src/hnbap/S-RNTIPrefix.c2
-rw-r--r--src/hnbap/SAC.c2
-rw-r--r--src/hnbap/SuccessfulOutcome.c2
-rw-r--r--src/hnbap/TMSIDS41.c2
-rw-r--r--src/hnbap/TMSILAI.c2
-rw-r--r--src/hnbap/TNLUpdateFailure.c2
-rw-r--r--src/hnbap/TNLUpdateRequest.c2
-rw-r--r--src/hnbap/TNLUpdateResponse.c2
-rw-r--r--src/hnbap/TransportInfo.c2
-rw-r--r--src/hnbap/TransportLayerAddress.c2
-rw-r--r--src/hnbap/TriggeringMessage.c2
-rw-r--r--src/hnbap/Tunnel-Information.c2
-rw-r--r--src/hnbap/TypeOfError.c2
-rw-r--r--src/hnbap/U-RNTI.c2
-rw-r--r--src/hnbap/U-RNTIQueryRequest.c2
-rw-r--r--src/hnbap/U-RNTIQueryResponse.c2
-rw-r--r--src/hnbap/UDP-Port-Number.c2
-rw-r--r--src/hnbap/UE-Capabilities.c2
-rw-r--r--src/hnbap/UE-Identity.c2
-rw-r--r--src/hnbap/UEDe-Register.c2
-rw-r--r--src/hnbap/UERegisterAccept.c2
-rw-r--r--src/hnbap/UERegisterReject.c2
-rw-r--r--src/hnbap/UERegisterRequest.c2
-rw-r--r--src/hnbap/URAIdentity.c2
-rw-r--r--src/hnbap/URAIdentityList.c2
-rw-r--r--src/hnbap/UTRANCellID.c2
-rw-r--r--src/hnbap/UnknownU-RNTIIndication.c2
-rw-r--r--src/hnbap/UnsuccessfulOutcome.c2
-rw-r--r--src/hnbap/Update-cause.c2
-rw-r--r--src/hnbap_common.h230
-rw-r--r--src/hnbgw_rua.h2
-rw-r--r--src/ranap/Makefile.am2
-rw-r--r--src/ranap/RANAP_APN.c2
-rw-r--r--src/ranap/RANAP_AccuracyFulfilmentIndicator.c2
-rw-r--r--src/ranap/RANAP_AllocationOrRetentionPriority.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.c2
-rw-r--r--src/ranap/RANAP_Alt-RAB-Parameters.c2
-rw-r--r--src/ranap/RANAP_AlternativeRABConfigurationRequest.c2
-rw-r--r--src/ranap/RANAP_AreaIdentity.c2
-rw-r--r--src/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.c2
-rw-r--r--src/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.c2
-rw-r--r--src/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.c2
-rw-r--r--src/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.c2
-rw-r--r--src/ranap/RANAP_Ass-RAB-Parameters.c2
-rw-r--r--src/ranap/RANAP_AuthorisedPLMNs.c2
-rw-r--r--src/ranap/RANAP_AuthorisedSNAs.c2
-rw-r--r--src/ranap/RANAP_BindingID.c2
-rw-r--r--src/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.c2
-rw-r--r--src/ranap/RANAP_CGI.c2
-rw-r--r--src/ranap/RANAP_CI.c2
-rw-r--r--src/ranap/RANAP_CN-DeactivateTrace.c2
-rw-r--r--src/ranap/RANAP_CN-DomainIndicator.c2
-rw-r--r--src/ranap/RANAP_CN-ID.c2
-rw-r--r--src/ranap/RANAP_CN-InvokeTrace.c2
-rw-r--r--src/ranap/RANAP_CNMBMSLinkingInformation.c2
-rw-r--r--src/ranap/RANAP_CSFB-Information.c2
-rw-r--r--src/ranap/RANAP_CSG-Id-List.c2
-rw-r--r--src/ranap/RANAP_CSG-Id.c2
-rw-r--r--src/ranap/RANAP_CSG-Membership-Status.c2
-rw-r--r--src/ranap/RANAP_Cause.c2
-rw-r--r--src/ranap/RANAP_CauseMisc.c2
-rw-r--r--src/ranap/RANAP_CauseNAS.c2
-rw-r--r--src/ranap/RANAP_CauseNon-Standard.c2
-rw-r--r--src/ranap/RANAP_CauseProtocol.c2
-rw-r--r--src/ranap/RANAP_CauseRadioNetwork.c2
-rw-r--r--src/ranap/RANAP_CauseRadioNetworkExtension.c2
-rw-r--r--src/ranap/RANAP_CauseTransmissionNetwork.c2
-rw-r--r--src/ranap/RANAP_Cell-Access-Mode.c2
-rw-r--r--src/ranap/RANAP_Cell-Capacity-Class-Value.c2
-rw-r--r--src/ranap/RANAP_Cell-Id.c2
-rw-r--r--src/ranap/RANAP_CellBased.c2
-rw-r--r--src/ranap/RANAP_CellIdList.c2
-rw-r--r--src/ranap/RANAP_CellLoadInformation.c2
-rw-r--r--src/ranap/RANAP_CellLoadInformationGroup.c2
-rw-r--r--src/ranap/RANAP_CellType.c2
-rw-r--r--src/ranap/RANAP_ChosenEncryptionAlgorithm.c2
-rw-r--r--src/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.c2
-rw-r--r--src/ranap/RANAP_ClassmarkInformation2.c2
-rw-r--r--src/ranap/RANAP_ClassmarkInformation3.c2
-rw-r--r--src/ranap/RANAP_ClientType.c2
-rw-r--r--src/ranap/RANAP_CommonID.c2
-rw-r--r--src/ranap/RANAP_Correlation-ID.c2
-rw-r--r--src/ranap/RANAP_Criticality.c2
-rw-r--r--src/ranap/RANAP_CriticalityDiagnostics-IE-List.c2
-rw-r--r--src/ranap/RANAP_CriticalityDiagnostics.c2
-rw-r--r--src/ranap/RANAP_D-RNTI.c2
-rw-r--r--src/ranap/RANAP_DCH-ID.c2
-rw-r--r--src/ranap/RANAP_DL-GTP-PDU-SequenceNumber.c2
-rw-r--r--src/ranap/RANAP_DL-N-PDU-SequenceNumber.c2
-rw-r--r--src/ranap/RANAP_DRX-CycleLengthCoefficient.c2
-rw-r--r--src/ranap/RANAP_DSCH-ID.c2
-rw-r--r--src/ranap/RANAP_DataPDUType.c2
-rw-r--r--src/ranap/RANAP_DataVolumeList.c2
-rw-r--r--src/ranap/RANAP_DataVolumeReference.c2
-rw-r--r--src/ranap/RANAP_DataVolumeReport.c2
-rw-r--r--src/ranap/RANAP_DataVolumeReportList.c2
-rw-r--r--src/ranap/RANAP_DataVolumeReportRequest.c2
-rw-r--r--src/ranap/RANAP_DataVolumeReportingIndication.c2
-rw-r--r--src/ranap/RANAP_DeliveryOfErroneousSDU.c2
-rw-r--r--src/ranap/RANAP_DeliveryOrder.c2
-rw-r--r--src/ranap/RANAP_DeltaRAListofIdleModeUEs.c2
-rw-r--r--src/ranap/RANAP_DirectInformationTransfer.c2
-rw-r--r--src/ranap/RANAP_DirectReportingIndicator.c2
-rw-r--r--src/ranap/RANAP_DirectTransfer-IE-ContainerList.c2
-rw-r--r--src/ranap/RANAP_DirectTransfer.c2
-rw-r--r--src/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.c2
-rw-r--r--src/ranap/RANAP_E-DCH-MAC-d-Flow-ID.c2
-rw-r--r--src/ranap/RANAP_E-UTRAN-Service-Handover.c2
-rw-r--r--src/ranap/RANAP_EARFCN-Extended.c2
-rw-r--r--src/ranap/RANAP_ENB-ID.c2
-rw-r--r--src/ranap/RANAP_EUTRANFrequencies.c2
-rw-r--r--src/ranap/RANAP_EncryptionAlgorithm.c2
-rw-r--r--src/ranap/RANAP_EncryptionInformation.c2
-rw-r--r--src/ranap/RANAP_EncryptionKey.c2
-rw-r--r--src/ranap/RANAP_End-Of-CSFB.c2
-rw-r--r--src/ranap/RANAP_EnhancedRelocationCompleteConfirm.c2
-rw-r--r--src/ranap/RANAP_EnhancedRelocationCompleteFailure.c2
-rw-r--r--src/ranap/RANAP_EnhancedRelocationCompleteRequest.c2
-rw-r--r--src/ranap/RANAP_EnhancedRelocationCompleteResponse.c2
-rw-r--r--src/ranap/RANAP_EquipmentsToBeTraced.c2
-rw-r--r--src/ranap/RANAP_ErrorIndication.c2
-rw-r--r--src/ranap/RANAP_Event.c2
-rw-r--r--src/ranap/RANAP_Event1F-Parameters.c2
-rw-r--r--src/ranap/RANAP_Event1I-Parameters.c2
-rw-r--r--src/ranap/RANAP_ExtendedGuaranteedBitrate.c2
-rw-r--r--src/ranap/RANAP_ExtendedMaxBitrate.c2
-rw-r--r--src/ranap/RANAP_ExtendedRNC-ID.c2
-rw-r--r--src/ranap/RANAP_ForwardSRNS-Context.c2
-rw-r--r--src/ranap/RANAP_ForwardingIndication.c2
-rw-r--r--src/ranap/RANAP_FrameSequenceNumber.c2
-rw-r--r--src/ranap/RANAP_FrequenceLayerConvergenceFlag.c2
-rw-r--r--src/ranap/RANAP_GA-AltitudeAndDirection.c2
-rw-r--r--src/ranap/RANAP_GA-EllipsoidArc.c2
-rw-r--r--src/ranap/RANAP_GA-Point.c2
-rw-r--r--src/ranap/RANAP_GA-PointWithAltitude.c2
-rw-r--r--src/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.c2
-rw-r--r--src/ranap/RANAP_GA-PointWithUnCertainty.c2
-rw-r--r--src/ranap/RANAP_GA-PointWithUnCertaintyEllipse.c2
-rw-r--r--src/ranap/RANAP_GA-Polygon.c2
-rw-r--r--src/ranap/RANAP_GA-UncertaintyEllipse.c2
-rw-r--r--src/ranap/RANAP_GANSS-PositioningDataSet.c2
-rw-r--r--src/ranap/RANAP_GANSS-PositioningMethodAndUsage.c2
-rw-r--r--src/ranap/RANAP_GERAN-BSC-Container.c2
-rw-r--r--src/ranap/RANAP_GERAN-Cell-ID.c2
-rw-r--r--src/ranap/RANAP_GERAN-Classmark.c2
-rw-r--r--src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.c2
-rw-r--r--src/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.c2
-rw-r--r--src/ranap/RANAP_GTP-TEI.c2
-rw-r--r--src/ranap/RANAP_GeographicalArea.c2
-rw-r--r--src/ranap/RANAP_GeographicalCoordinates.c2
-rw-r--r--src/ranap/RANAP_GlobalCN-ID.c2
-rw-r--r--src/ranap/RANAP_GlobalRNC-ID.c2
-rw-r--r--src/ranap/RANAP_GuaranteedBitrate.c2
-rw-r--r--src/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.c2
-rw-r--r--src/ranap/RANAP_HigherBitratesThan16MbpsFlag.c2
-rw-r--r--src/ranap/RANAP_HorizontalSpeedAndBearing.c2
-rw-r--r--src/ranap/RANAP_HorizontalVelocity.c2
-rw-r--r--src/ranap/RANAP_HorizontalVelocityWithUncertainty.c2
-rw-r--r--src/ranap/RANAP_HorizontalWithVerticalVelocity.c2
-rw-r--r--src/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.c2
-rw-r--r--src/ranap/RANAP_IE-Extensions.c2
-rw-r--r--src/ranap/RANAP_IE.c2
-rw-r--r--src/ranap/RANAP_IMEI.c2
-rw-r--r--src/ranap/RANAP_IMEIGroup.c2
-rw-r--r--src/ranap/RANAP_IMEIList.c2
-rw-r--r--src/ranap/RANAP_IMEISV.c2
-rw-r--r--src/ranap/RANAP_IMEISVGroup.c2
-rw-r--r--src/ranap/RANAP_IMEISVList.c2
-rw-r--r--src/ranap/RANAP_IMSI.c2
-rw-r--r--src/ranap/RANAP_IPMulticastAddress.c2
-rw-r--r--src/ranap/RANAP_IRAT-Measurement-Configuration.c2
-rw-r--r--src/ranap/RANAP_IRATmeasurementParameters.c2
-rw-r--r--src/ranap/RANAP_ImmediateMDT.c2
-rw-r--r--src/ranap/RANAP_IncludeVelocity.c2
-rw-r--r--src/ranap/RANAP_InformationExchangeID.c2
-rw-r--r--src/ranap/RANAP_InformationExchangeType.c2
-rw-r--r--src/ranap/RANAP_InformationRequestType.c2
-rw-r--r--src/ranap/RANAP_InformationRequested.c2
-rw-r--r--src/ranap/RANAP_InformationTransferConfirmation.c2
-rw-r--r--src/ranap/RANAP_InformationTransferFailure.c2
-rw-r--r--src/ranap/RANAP_InformationTransferID.c2
-rw-r--r--src/ranap/RANAP_InformationTransferIndication.c2
-rw-r--r--src/ranap/RANAP_InformationTransferType.c2
-rw-r--r--src/ranap/RANAP_InitialUE-Message.c2
-rw-r--r--src/ranap/RANAP_InitiatingMessage.c2
-rw-r--r--src/ranap/RANAP_IntegrityProtectionAlgorithm.c2
-rw-r--r--src/ranap/RANAP_IntegrityProtectionInformation.c2
-rw-r--r--src/ranap/RANAP_IntegrityProtectionKey.c2
-rw-r--r--src/ranap/RANAP_InterSystemInformation-TransparentContainer.c2
-rw-r--r--src/ranap/RANAP_InterSystemInformationTransferType.c2
-rw-r--r--src/ranap/RANAP_InterfacesToTraceItem.c2
-rw-r--r--src/ranap/RANAP_Iu-ReleaseCommand.c2
-rw-r--r--src/ranap/RANAP_Iu-ReleaseComplete.c2
-rw-r--r--src/ranap/RANAP_Iu-ReleaseRequest.c2
-rw-r--r--src/ranap/RANAP_IuSigConId-IE-ContainerList.c2
-rw-r--r--src/ranap/RANAP_IuSignallingConnectionIdentifier.c2
-rw-r--r--src/ranap/RANAP_IuTransportAssociation.c2
-rw-r--r--src/ranap/RANAP_JoinedMBMSBearerService-IEs.c2
-rw-r--r--src/ranap/RANAP_KeyStatus.c2
-rw-r--r--src/ranap/RANAP_L3-Information.c2
-rw-r--r--src/ranap/RANAP_LA-LIST.c2
-rw-r--r--src/ranap/RANAP_LABased.c2
-rw-r--r--src/ranap/RANAP_LAC.c2
-rw-r--r--src/ranap/RANAP_LAI-List.c2
-rw-r--r--src/ranap/RANAP_LAI.c2
-rw-r--r--src/ranap/RANAP_LAListofIdleModeUEs.c2
-rw-r--r--src/ranap/RANAP_LHN-ID.c2
-rw-r--r--src/ranap/RANAP_LastKnownServiceArea.c2
-rw-r--r--src/ranap/RANAP_LastVisitedUTRANCell-Item.c2
-rw-r--r--src/ranap/RANAP_LeftMBMSBearerService-IEs.c2
-rw-r--r--src/ranap/RANAP_Links-to-log.c2
-rw-r--r--src/ranap/RANAP_ListOF-SNAs.c2
-rw-r--r--src/ranap/RANAP_ListOfInterfacesToTrace.c2
-rw-r--r--src/ranap/RANAP_LoadValue.c2
-rw-r--r--src/ranap/RANAP_LocationRelatedDataFailure.c2
-rw-r--r--src/ranap/RANAP_LocationRelatedDataRequest.c2
-rw-r--r--src/ranap/RANAP_LocationRelatedDataRequestType.c2
-rw-r--r--src/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.c2
-rw-r--r--src/ranap/RANAP_LocationRelatedDataResponse.c2
-rw-r--r--src/ranap/RANAP_LocationReport.c2
-rw-r--r--src/ranap/RANAP_LocationReportingControl.c2
-rw-r--r--src/ranap/RANAP_LocationReportingTransferInformation.c2
-rw-r--r--src/ranap/RANAP_LoggedMDT.c2
-rw-r--r--src/ranap/RANAP_LoggingDuration.c2
-rw-r--r--src/ranap/RANAP_LoggingInterval.c2
-rw-r--r--src/ranap/RANAP_M1Report.c2
-rw-r--r--src/ranap/RANAP_M2Report.c2
-rw-r--r--src/ranap/RANAP_M4-Collection-Parameters.c2
-rw-r--r--src/ranap/RANAP_M4-Period.c2
-rw-r--r--src/ranap/RANAP_M4-Threshold.c2
-rw-r--r--src/ranap/RANAP_M4Report.c2
-rw-r--r--src/ranap/RANAP_M5-Period.c2
-rw-r--r--src/ranap/RANAP_M5Report.c2
-rw-r--r--src/ranap/RANAP_M6-Period.c2
-rw-r--r--src/ranap/RANAP_M6Report.c2
-rw-r--r--src/ranap/RANAP_M7-Period.c2
-rw-r--r--src/ranap/RANAP_M7Report.c2
-rw-r--r--src/ranap/RANAP_MBMS-PTP-RAB-ID.c2
-rw-r--r--src/ranap/RANAP_MBMSBearerServiceType.c2
-rw-r--r--src/ranap/RANAP_MBMSCNDe-Registration.c2
-rw-r--r--src/ranap/RANAP_MBMSCNDe-RegistrationRequest.c2
-rw-r--r--src/ranap/RANAP_MBMSCNDe-RegistrationResponse.c2
-rw-r--r--src/ranap/RANAP_MBMSCountingInformation.c2
-rw-r--r--src/ranap/RANAP_MBMSHCIndicator.c2
-rw-r--r--src/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.c2
-rw-r--r--src/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.c2
-rw-r--r--src/ranap/RANAP_MBMSLinkingInformation.c2
-rw-r--r--src/ranap/RANAP_MBMSRABEstablishmentIndication.c2
-rw-r--r--src/ranap/RANAP_MBMSRABRelease.c2
-rw-r--r--src/ranap/RANAP_MBMSRABReleaseFailure.c2
-rw-r--r--src/ranap/RANAP_MBMSRABReleaseRequest.c2
-rw-r--r--src/ranap/RANAP_MBMSRegistrationFailure.c2
-rw-r--r--src/ranap/RANAP_MBMSRegistrationRequest.c2
-rw-r--r--src/ranap/RANAP_MBMSRegistrationRequestType.c2
-rw-r--r--src/ranap/RANAP_MBMSRegistrationResponse.c2
-rw-r--r--src/ranap/RANAP_MBMSServiceArea.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionDuration.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionIdentity.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionRepetitionNumber.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionStart.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionStartFailure.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionStartResponse.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionStop.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionStopResponse.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionUpdate.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionUpdateFailure.c2
-rw-r--r--src/ranap/RANAP_MBMSSessionUpdateResponse.c2
-rw-r--r--src/ranap/RANAP_MBMSSynchronisationInformation.c2
-rw-r--r--src/ranap/RANAP_MBMSUELinkingRequest.c2
-rw-r--r--src/ranap/RANAP_MBMSUELinkingResponse.c2
-rw-r--r--src/ranap/RANAP_MDT-Activation.c2
-rw-r--r--src/ranap/RANAP_MDT-Configuration.c2
-rw-r--r--src/ranap/RANAP_MDT-PLMN-List.c2
-rw-r--r--src/ranap/RANAP_MDT-Report-Parameters.c2
-rw-r--r--src/ranap/RANAP_MDTAreaScope.c2
-rw-r--r--src/ranap/RANAP_MDTMode.c2
-rw-r--r--src/ranap/RANAP_MSISDN.c2
-rw-r--r--src/ranap/RANAP_Management-Based-MDT-Allowed.c2
-rw-r--r--src/ranap/RANAP_MaxBitrate.c2
-rw-r--r--src/ranap/RANAP_MaxSDU-Size.c2
-rw-r--r--src/ranap/RANAP_MeasBand.c2
-rw-r--r--src/ranap/RANAP_MeasurementQuantity.c2
-rw-r--r--src/ranap/RANAP_MeasurementsToActivate.c2
-rw-r--r--src/ranap/RANAP_MessageStructure.c2
-rw-r--r--src/ranap/RANAP_NAS-PDU.c2
-rw-r--r--src/ranap/RANAP_NAS-SequenceNumber.c2
-rw-r--r--src/ranap/RANAP_NAS-SynchronisationIndicator.c2
-rw-r--r--src/ranap/RANAP_NRTLoadInformationValue.c2
-rw-r--r--src/ranap/RANAP_NewBSS-To-OldBSS-Information.c2
-rw-r--r--src/ranap/RANAP_NewRAListofIdleModeUEs.c2
-rw-r--r--src/ranap/RANAP_NonSearchingIndication.c2
-rw-r--r--src/ranap/RANAP_NotEmptyRAListofIdleModeUEs.c2
-rw-r--r--src/ranap/RANAP_NumberOfIuInstances.c2
-rw-r--r--src/ranap/RANAP_NumberOfSteps.c2
-rw-r--r--src/ranap/RANAP_OMC-ID.c2
-rw-r--r--src/ranap/RANAP_Offload-RAB-Parameters-APN.c2
-rw-r--r--src/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.c2
-rw-r--r--src/ranap/RANAP_Offload-RAB-Parameters.c2
-rw-r--r--src/ranap/RANAP_OldBSS-ToNewBSS-Information.c2
-rw-r--r--src/ranap/RANAP_Out-Of-UTRAN.c2
-rw-r--r--src/ranap/RANAP_Outcome.c2
-rw-r--r--src/ranap/RANAP_Overload.c2
-rw-r--r--src/ranap/RANAP_P-TMSI.c2
-rw-r--r--src/ranap/RANAP_PDP-Type-extension.c2
-rw-r--r--src/ranap/RANAP_PDP-Type.c2
-rw-r--r--src/ranap/RANAP_PDP-TypeInformation-extension.c2
-rw-r--r--src/ranap/RANAP_PDP-TypeInformation.c2
-rw-r--r--src/ranap/RANAP_PDUType14FrameSequenceNumber.c2
-rw-r--r--src/ranap/RANAP_PLMNidentity.c2
-rw-r--r--src/ranap/RANAP_PLMNs-in-shared-network.c2
-rw-r--r--src/ranap/RANAP_Paging.c2
-rw-r--r--src/ranap/RANAP_PagingAreaID.c2
-rw-r--r--src/ranap/RANAP_PagingCause.c2
-rw-r--r--src/ranap/RANAP_PeriodicLocationInfo.c2
-rw-r--r--src/ranap/RANAP_PeriodicReportingIndicator.c2
-rw-r--r--src/ranap/RANAP_PermanentNAS-UE-ID.c2
-rw-r--r--src/ranap/RANAP_PermittedEncryptionAlgorithms.c2
-rw-r--r--src/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.c2
-rw-r--r--src/ranap/RANAP_Port-Number.c2
-rw-r--r--src/ranap/RANAP_PositionData.c2
-rw-r--r--src/ranap/RANAP_PositionDataSpecificToGERANIuMode.c2
-rw-r--r--src/ranap/RANAP_PositioningDataDiscriminator.c2
-rw-r--r--src/ranap/RANAP_PositioningDataSet.c2
-rw-r--r--src/ranap/RANAP_PositioningMethodAndUsage.c2
-rw-r--r--src/ranap/RANAP_PositioningPriority.c2
-rw-r--r--src/ranap/RANAP_Pre-emptionCapability.c2
-rw-r--r--src/ranap/RANAP_Pre-emptionVulnerability.c2
-rw-r--r--src/ranap/RANAP_Presence.c2
-rw-r--r--src/ranap/RANAP_Priority-Class-Indicator.c2
-rw-r--r--src/ranap/RANAP_PriorityLevel.c2
-rw-r--r--src/ranap/RANAP_PrivateIE-ID.c2
-rw-r--r--src/ranap/RANAP_PrivateMessage.c2
-rw-r--r--src/ranap/RANAP_ProcedureCode.c2
-rw-r--r--src/ranap/RANAP_ProtocolError-IE-ContainerList.c2
-rw-r--r--src/ranap/RANAP_ProtocolExtensionContainer.c2
-rw-r--r--src/ranap/RANAP_ProtocolExtensionField.c2
-rw-r--r--src/ranap/RANAP_ProtocolExtensionID.c2
-rw-r--r--src/ranap/RANAP_ProtocolIE-Container.c2
-rw-r--r--src/ranap/RANAP_ProtocolIE-ContainerPair.c2
-rw-r--r--src/ranap/RANAP_ProtocolIE-FieldPair.c2
-rw-r--r--src/ranap/RANAP_ProtocolIE-ID.c2
-rw-r--r--src/ranap/RANAP_ProvidedData.c2
-rw-r--r--src/ranap/RANAP_QueuingAllowed.c2
-rw-r--r--src/ranap/RANAP_RAB-AssignmentRequest.c2
-rw-r--r--src/ranap/RANAP_RAB-AssignmentResponse.c2
-rw-r--r--src/ranap/RANAP_RAB-AsymmetryIndicator.c2
-rw-r--r--src/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.c2
-rw-r--r--src/ranap/RANAP_RAB-ContextItem.c2
-rw-r--r--src/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.c2
-rw-r--r--src/ranap/RANAP_RAB-ContextList.c2
-rw-r--r--src/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.c2
-rw-r--r--src/ranap/RANAP_RAB-DataForwardingItem.c2
-rw-r--r--src/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.c2
-rw-r--r--src/ranap/RANAP_RAB-DataForwardingList.c2
-rw-r--r--src/ranap/RANAP_RAB-DataVolumeReportItem.c2
-rw-r--r--src/ranap/RANAP_RAB-DataVolumeReportList.c2
-rw-r--r--src/ranap/RANAP_RAB-DataVolumeReportRequestItem.c2
-rw-r--r--src/ranap/RANAP_RAB-DataVolumeReportRequestList.c2
-rw-r--r--src/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.c2
-rw-r--r--src/ranap/RANAP_RAB-FailedItem.c2
-rw-r--r--src/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.c2
-rw-r--r--src/ranap/RANAP_RAB-FailedList.c2
-rw-r--r--src/ranap/RANAP_RAB-ID.c2
-rw-r--r--src/ranap/RANAP_RAB-IE-ContainerList.c2
-rw-r--r--src/ranap/RANAP_RAB-IE-ContainerPairList.c2
-rw-r--r--src/ranap/RANAP_RAB-ModifyItem.c2
-rw-r--r--src/ranap/RANAP_RAB-ModifyList.c2
-rw-r--r--src/ranap/RANAP_RAB-ModifyRequest.c2
-rw-r--r--src/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.c2
-rw-r--r--src/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.c2
-rw-r--r--src/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.c2
-rw-r--r--src/ranap/RANAP_RAB-Parameter-MaxBitrateList.c2
-rw-r--r--src/ranap/RANAP_RAB-Parameters.c2
-rw-r--r--src/ranap/RANAP_RAB-QueuedItem.c2
-rw-r--r--src/ranap/RANAP_RAB-QueuedList.c2
-rw-r--r--src/ranap/RANAP_RAB-ReleaseFailedList.c2
-rw-r--r--src/ranap/RANAP_RAB-ReleaseItem.c2
-rw-r--r--src/ranap/RANAP_RAB-ReleaseList.c2
-rw-r--r--src/ranap/RANAP_RAB-ReleaseRequest.c2
-rw-r--r--src/ranap/RANAP_RAB-ReleasedItem-IuRelComp.c2
-rw-r--r--src/ranap/RANAP_RAB-ReleasedItem.c2
-rw-r--r--src/ranap/RANAP_RAB-ReleasedList-IuRelComp.c2
-rw-r--r--src/ranap/RANAP_RAB-ReleasedList.c2
-rw-r--r--src/ranap/RANAP_RAB-RelocationReleaseItem.c2
-rw-r--r--src/ranap/RANAP_RAB-RelocationReleaseList.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupItem-RelocReq.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupItem-RelocReqAck.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupList-RelocReq.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupList-RelocReqAck.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupOrModifiedItem.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupOrModifiedList.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupOrModifyItemFirst.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupOrModifyItemSecond.c2
-rw-r--r--src/ranap/RANAP_RAB-SetupOrModifyList.c2
-rw-r--r--src/ranap/RANAP_RAB-SubflowCombinationBitRate.c2
-rw-r--r--src/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.c2
-rw-r--r--src/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.c2
-rw-r--r--src/ranap/RANAP_RAB-TrCH-Mapping.c2
-rw-r--r--src/ranap/RANAP_RAB-TrCH-MappingItem.c2
-rw-r--r--src/ranap/RANAP_RABDataVolumeReport.c2
-rw-r--r--src/ranap/RANAP_RABParametersList.c2
-rw-r--r--src/ranap/RANAP_RABased.c2
-rw-r--r--src/ranap/RANAP_RABs-ContextFailedtoTransferItem.c2
-rw-r--r--src/ranap/RANAP_RABs-ContextFailedtoTransferList.c2
-rw-r--r--src/ranap/RANAP_RABs-failed-to-reportItem.c2
-rw-r--r--src/ranap/RANAP_RABs-failed-to-reportList.c2
-rw-r--r--src/ranap/RANAP_RAC.c2
-rw-r--r--src/ranap/RANAP_RAI-List.c2
-rw-r--r--src/ranap/RANAP_RAI.c2
-rw-r--r--src/ranap/RANAP_RAListofIdleModeUEs.c2
-rw-r--r--src/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.c2
-rw-r--r--src/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.c2
-rw-r--r--src/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.c2
-rw-r--r--src/ranap/RANAP_RANAP-PDU.c2
-rw-r--r--src/ranap/RANAP_RANAP-RelocationInformation.c2
-rw-r--r--src/ranap/RANAP_RAT-Type.c2
-rw-r--r--src/ranap/RANAP_RAofIdleModeUEs.c2
-rw-r--r--src/ranap/RANAP_RIM-Transfer.c2
-rw-r--r--src/ranap/RANAP_RIMInformation.c2
-rw-r--r--src/ranap/RANAP_RIMRoutingAddress.c2
-rw-r--r--src/ranap/RANAP_RNC-ID.c2
-rw-r--r--src/ranap/RANAP_RNCTraceInformation.c2
-rw-r--r--src/ranap/RANAP_RNSAPRelocationParameters.c2
-rw-r--r--src/ranap/RANAP_RRC-Container.c2
-rw-r--r--src/ranap/RANAP_RSRQ-Extension.c2
-rw-r--r--src/ranap/RANAP_RSRQ-Type.c2
-rw-r--r--src/ranap/RANAP_RSRVCC-HO-Indication.c2
-rw-r--r--src/ranap/RANAP_RSRVCC-Information.c2
-rw-r--r--src/ranap/RANAP_RSRVCC-Operation-Possible.c2
-rw-r--r--src/ranap/RANAP_RTLoadValue.c2
-rw-r--r--src/ranap/RANAP_RateControlAllowed.c2
-rw-r--r--src/ranap/RANAP_RedirectAttemptFlag.c2
-rw-r--r--src/ranap/RANAP_RedirectionCompleted.c2
-rw-r--r--src/ranap/RANAP_RedirectionIndication.c2
-rw-r--r--src/ranap/RANAP_RejectCauseValue.c2
-rw-r--r--src/ranap/RANAP_RelocationCancel.c2
-rw-r--r--src/ranap/RANAP_RelocationCancelAcknowledge.c2
-rw-r--r--src/ranap/RANAP_RelocationCommand.c2
-rw-r--r--src/ranap/RANAP_RelocationComplete.c2
-rw-r--r--src/ranap/RANAP_RelocationDetect.c2
-rw-r--r--src/ranap/RANAP_RelocationFailure.c2
-rw-r--r--src/ranap/RANAP_RelocationPreparationFailure.c2
-rw-r--r--src/ranap/RANAP_RelocationRequest.c2
-rw-r--r--src/ranap/RANAP_RelocationRequestAcknowledge.c2
-rw-r--r--src/ranap/RANAP_RelocationRequired.c2
-rw-r--r--src/ranap/RANAP_RelocationRequirement.c2
-rw-r--r--src/ranap/RANAP_RelocationType.c2
-rw-r--r--src/ranap/RANAP_RepetitionNumber0.c2
-rw-r--r--src/ranap/RANAP_RepetitionNumber1.c2
-rw-r--r--src/ranap/RANAP_ReportAmount.c2
-rw-r--r--src/ranap/RANAP_ReportArea.c2
-rw-r--r--src/ranap/RANAP_ReportChangeOfSAI.c2
-rw-r--r--src/ranap/RANAP_ReportInterval.c2
-rw-r--r--src/ranap/RANAP_RequestType.c2
-rw-r--r--src/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.c2
-rw-r--r--src/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.c2
-rw-r--r--src/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.c2
-rw-r--r--src/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.c2
-rw-r--r--src/ranap/RANAP_Requested-RAB-Parameter-Values.c2
-rw-r--r--src/ranap/RANAP_RequestedGANSSAssistanceData.c2
-rw-r--r--src/ranap/RANAP_RequestedGPSAssistanceData.c2
-rw-r--r--src/ranap/RANAP_RequestedLocationRelatedDataType.c2
-rw-r--r--src/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.c2
-rw-r--r--src/ranap/RANAP_RequestedMulticastServiceList.c2
-rw-r--r--src/ranap/RANAP_Reset.c2
-rw-r--r--src/ranap/RANAP_ResetAcknowledge.c2
-rw-r--r--src/ranap/RANAP_ResetResource.c2
-rw-r--r--src/ranap/RANAP_ResetResourceAckItem.c2
-rw-r--r--src/ranap/RANAP_ResetResourceAckList.c2
-rw-r--r--src/ranap/RANAP_ResetResourceAcknowledge.c2
-rw-r--r--src/ranap/RANAP_ResetResourceItem.c2
-rw-r--r--src/ranap/RANAP_ResetResourceList.c2
-rw-r--r--src/ranap/RANAP_ResidualBitErrorRatio.c2
-rw-r--r--src/ranap/RANAP_ResponseTime.c2
-rw-r--r--src/ranap/RANAP_SAC.c2
-rw-r--r--src/ranap/RANAP_SAI.c2
-rw-r--r--src/ranap/RANAP_SAPI.c2
-rw-r--r--src/ranap/RANAP_SDU-ErrorRatio.c2
-rw-r--r--src/ranap/RANAP_SDU-FormatInformationParameterItem.c2
-rw-r--r--src/ranap/RANAP_SDU-FormatInformationParameters.c2
-rw-r--r--src/ranap/RANAP_SDU-ParameterItem.c2
-rw-r--r--src/ranap/RANAP_SDU-Parameters.c2
-rw-r--r--src/ranap/RANAP_SNA-Access-Information.c2
-rw-r--r--src/ranap/RANAP_SNAC.c2
-rw-r--r--src/ranap/RANAP_SRB-ID.c2
-rw-r--r--src/ranap/RANAP_SRB-TrCH-Mapping.c2
-rw-r--r--src/ranap/RANAP_SRB-TrCH-MappingItem.c2
-rw-r--r--src/ranap/RANAP_SRNS-ContextRequest.c2
-rw-r--r--src/ranap/RANAP_SRNS-ContextResponse.c2
-rw-r--r--src/ranap/RANAP_SRNS-DataForwardCommand.c2
-rw-r--r--src/ranap/RANAP_SRVCC-CSKeysRequest.c2
-rw-r--r--src/ranap/RANAP_SRVCC-CSKeysResponse.c2
-rw-r--r--src/ranap/RANAP_SRVCC-HO-Indication.c2
-rw-r--r--src/ranap/RANAP_SRVCC-Information.c2
-rw-r--r--src/ranap/RANAP_SRVCC-Operation-Possible.c2
-rw-r--r--src/ranap/RANAP_SecurityModeCommand.c2
-rw-r--r--src/ranap/RANAP_SecurityModeComplete.c2
-rw-r--r--src/ranap/RANAP_SecurityModeReject.c2
-rw-r--r--src/ranap/RANAP_Service-Handover.c2
-rw-r--r--src/ranap/RANAP_Session-Re-establishment-Indicator.c2
-rw-r--r--src/ranap/RANAP_SessionUpdateID.c2
-rw-r--r--src/ranap/RANAP_Shared-Network-Information.c2
-rw-r--r--src/ranap/RANAP_SignallingIndication.c2
-rw-r--r--src/ranap/RANAP_Source-ToTarget-TransparentContainer.c2
-rw-r--r--src/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.c2
-rw-r--r--src/ranap/RANAP_SourceCellID.c2
-rw-r--r--src/ranap/RANAP_SourceID.c2
-rw-r--r--src/ranap/RANAP_SourceRNC-ID.c2
-rw-r--r--src/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.c2
-rw-r--r--src/ranap/RANAP_SourceStatisticsDescriptor.c2
-rw-r--r--src/ranap/RANAP_SourceUTRANCellID.c2
-rw-r--r--src/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.c2
-rw-r--r--src/ranap/RANAP_SubflowSDU-Size.c2
-rw-r--r--src/ranap/RANAP_SubscriberProfileIDforRFP.c2
-rw-r--r--src/ranap/RANAP_SuccessfulOutcome.c2
-rw-r--r--src/ranap/RANAP_SupportedBitrate.c2
-rw-r--r--src/ranap/RANAP_SupportedRAB-ParameterBitrateList.c2
-rw-r--r--src/ranap/RANAP_TAC.c2
-rw-r--r--src/ranap/RANAP_TAI.c2
-rw-r--r--src/ranap/RANAP_TBCD-STRING.c2
-rw-r--r--src/ranap/RANAP_TMGI.c2
-rw-r--r--src/ranap/RANAP_TMSI.c2
-rw-r--r--src/ranap/RANAP_TNLInformationEnhRelInfoReq.c2
-rw-r--r--src/ranap/RANAP_TNLInformationEnhRelInfoRes.c2
-rw-r--r--src/ranap/RANAP_Target-ToSource-TransparentContainer.c2
-rw-r--r--src/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.c2
-rw-r--r--src/ranap/RANAP_TargetCellId.c2
-rw-r--r--src/ranap/RANAP_TargetENB-ID.c2
-rw-r--r--src/ranap/RANAP_TargetID.c2
-rw-r--r--src/ranap/RANAP_TargetRNC-ID.c2
-rw-r--r--src/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.c2
-rw-r--r--src/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.c2
-rw-r--r--src/ranap/RANAP_TemporaryUE-ID.c2
-rw-r--r--src/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.c2
-rw-r--r--src/ranap/RANAP_Time-UE-StayedInCell.c2
-rw-r--r--src/ranap/RANAP_TimeToMBMSDataTransfer.c2
-rw-r--r--src/ranap/RANAP_TimingDifferenceULDL.c2
-rw-r--r--src/ranap/RANAP_TrCH-ID-List.c2
-rw-r--r--src/ranap/RANAP_TrCH-ID.c2
-rw-r--r--src/ranap/RANAP_TraceDepth.c2
-rw-r--r--src/ranap/RANAP_TraceInformation.c2
-rw-r--r--src/ranap/RANAP_TracePropagationParameters.c2
-rw-r--r--src/ranap/RANAP_TraceRecordingSessionInformation.c2
-rw-r--r--src/ranap/RANAP_TraceRecordingSessionReference.c2
-rw-r--r--src/ranap/RANAP_TraceReference.c2
-rw-r--r--src/ranap/RANAP_TraceType.c2
-rw-r--r--src/ranap/RANAP_TrafficClass.c2
-rw-r--r--src/ranap/RANAP_TrafficHandlingPriority.c2
-rw-r--r--src/ranap/RANAP_TransferDelay.c2
-rw-r--r--src/ranap/RANAP_TransportLayerAddress.c2
-rw-r--r--src/ranap/RANAP_TransportLayerInformation.c2
-rw-r--r--src/ranap/RANAP_TriggerID.c2
-rw-r--r--src/ranap/RANAP_TriggeringMessage.c2
-rw-r--r--src/ranap/RANAP_TunnelInformation.c2
-rw-r--r--src/ranap/RANAP_TypeOfError.c2
-rw-r--r--src/ranap/RANAP_UE-AggregateMaximumBitRate.c2
-rw-r--r--src/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.c2
-rw-r--r--src/ranap/RANAP_UE-AggregateMaximumBitRateUplink.c2
-rw-r--r--src/ranap/RANAP_UE-History-Information.c2
-rw-r--r--src/ranap/RANAP_UE-ID.c2
-rw-r--r--src/ranap/RANAP_UESBI-Iu.c2
-rw-r--r--src/ranap/RANAP_UESBI-IuA.c2
-rw-r--r--src/ranap/RANAP_UESBI-IuB.c2
-rw-r--r--src/ranap/RANAP_UESpecificInformationIndication.c2
-rw-r--r--src/ranap/RANAP_UL-GTP-PDU-SequenceNumber.c2
-rw-r--r--src/ranap/RANAP_UL-N-PDU-SequenceNumber.c2
-rw-r--r--src/ranap/RANAP_UP-ModeVersions.c2
-rw-r--r--src/ranap/RANAP_UPInformation.c2
-rw-r--r--src/ranap/RANAP_UPInitialisationFrame.c2
-rw-r--r--src/ranap/RANAP_USCH-ID.c2
-rw-r--r--src/ranap/RANAP_UTRAN-CellID.c2
-rw-r--r--src/ranap/RANAP_UeRadioCapabilityMatchRequest.c2
-rw-r--r--src/ranap/RANAP_UeRadioCapabilityMatchResponse.c2
-rw-r--r--src/ranap/RANAP_UnsuccessfulLinking-IEs.c2
-rw-r--r--src/ranap/RANAP_UnsuccessfulOutcome.c2
-rw-r--r--src/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.c2
-rw-r--r--src/ranap/RANAP_UplinkInformationExchangeFailure.c2
-rw-r--r--src/ranap/RANAP_UplinkInformationExchangeRequest.c2
-rw-r--r--src/ranap/RANAP_UplinkInformationExchangeResponse.c2
-rw-r--r--src/ranap/RANAP_UserPlaneInformation.c2
-rw-r--r--src/ranap/RANAP_UserPlaneMode.c2
-rw-r--r--src/ranap/RANAP_VelocityEstimate.c2
-rw-r--r--src/ranap/RANAP_VerticalAccuracyCode.c2
-rw-r--r--src/ranap/RANAP_VerticalSpeedDirection.c2
-rw-r--r--src/ranap/RANAP_VerticalVelocity.c2
-rw-r--r--src/ranap/RANAP_VoiceSupportMatchIndicator.c2
-rw-r--r--src/ranap_common.h1158
-rw-r--r--src/ranap_msg_factory.h6
-rw-r--r--src/rua/Makefile.am2
-rw-r--r--src/rua/RUA_Ansi-41-IDNNS.c2
-rw-r--r--src/rua/RUA_CN-DomainIndicator.c2
-rw-r--r--src/rua/RUA_CSGMembershipStatus.c2
-rw-r--r--src/rua/RUA_Cause.c2
-rw-r--r--src/rua/RUA_CauseMisc.c2
-rw-r--r--src/rua/RUA_CauseProtocol.c2
-rw-r--r--src/rua/RUA_CauseRadioNetwork.c2
-rw-r--r--src/rua/RUA_CauseTransport.c2
-rw-r--r--src/rua/RUA_Connect.c2
-rw-r--r--src/rua/RUA_ConnectionlessTransfer.c2
-rw-r--r--src/rua/RUA_Context-ID.c2
-rw-r--r--src/rua/RUA_Criticality.c2
-rw-r--r--src/rua/RUA_CriticalityDiagnostics-IE-List.c2
-rw-r--r--src/rua/RUA_CriticalityDiagnostics.c2
-rw-r--r--src/rua/RUA_DirectTransfer.c2
-rw-r--r--src/rua/RUA_Disconnect.c2
-rw-r--r--src/rua/RUA_ErrorIndication.c2
-rw-r--r--src/rua/RUA_Establishment-Cause.c2
-rw-r--r--src/rua/RUA_Gsm-map-IDNNS.c2
-rw-r--r--src/rua/RUA_IE-Extensions.c2
-rw-r--r--src/rua/RUA_IE.c2
-rw-r--r--src/rua/RUA_InitiatingMessage.c2
-rw-r--r--src/rua/RUA_IntraDomainNasNodeSelector.c2
-rw-r--r--src/rua/RUA_Presence.c2
-rw-r--r--src/rua/RUA_PrivateIE-ID.c2
-rw-r--r--src/rua/RUA_PrivateMessage.c2
-rw-r--r--src/rua/RUA_ProcedureCode.c2
-rw-r--r--src/rua/RUA_ProtocolIE-ID.c2
-rw-r--r--src/rua/RUA_RANAP-Message.c2
-rw-r--r--src/rua/RUA_RUA-PDU.c2
-rw-r--r--src/rua/RUA_RoutingParameter.c2
-rw-r--r--src/rua/RUA_SuccessfulOutcome.c2
-rw-r--r--src/rua/RUA_TriggeringMessage.c2
-rw-r--r--src/rua/RUA_TypeOfError.c2
-rw-r--r--src/rua/RUA_UnsuccessfulOutcome.c2
-rw-r--r--src/rua_common.h70
1169 files changed, 2358 insertions, 2359 deletions
diff --git a/configure.ac b/configure.ac
index 0fafb7f..fc8c737 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,7 @@ AC_OUTPUT(
Makefile
include/Makefile
include/osmocom/Makefile
- include/osmocom/osmo-iuh/Makefile
- include/osmocom/osmo-iuh/hnbap/Makefile
- include/osmocom/osmo-iuh/ranap/Makefile
- include/osmocom/osmo-iuh/rua/Makefile
+ include/osmocom/hnbap/Makefile
+ include/osmocom/ranap/Makefile
+ include/osmocom/rua/Makefile
)
diff --git a/include/osmocom/hnbap/AdditionalNeighbourInfoList.h b/include/osmocom/hnbap/AdditionalNeighbourInfoList.h
index 8098eab..7f1691d 100644
--- a/include/osmocom/hnbap/AdditionalNeighbourInfoList.h
+++ b/include/osmocom/hnbap/AdditionalNeighbourInfoList.h
@@ -38,7 +38,7 @@ extern asn_TYPE_descriptor_t asn_DEF_AdditionalNeighbourInfoList;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
+#include <osmocom/hnbap/HNBConfigInfo.h>
#endif /* _AdditionalNeighbourInfoList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/CGI.h b/include/osmocom/hnbap/CGI.h
index 7971442..d588d01 100644
--- a/include/osmocom/hnbap/CGI.h
+++ b/include/osmocom/hnbap/CGI.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
-#include <osmocom/osmo-iuh/hnbap/LAC.h>
-#include <osmocom/osmo-iuh/hnbap/CI.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/LAC.h>
+#include <osmocom/hnbap/CI.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@ extern asn_TYPE_descriptor_t asn_DEF_CGI;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _CGI_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/CSGMembershipUpdate.h b/include/osmocom/hnbap/CSGMembershipUpdate.h
index dca4d2f..93e0248 100644
--- a/include/osmocom/hnbap/CSGMembershipUpdate.h
+++ b/include/osmocom/hnbap/CSGMembershipUpdate.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_CSGMembershipUpdate;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _CSGMembershipUpdate_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/Cause.h b/include/osmocom/hnbap/Cause.h
index 549cc79..1ce4c23 100644
--- a/include/osmocom/hnbap/Cause.h
+++ b/include/osmocom/hnbap/Cause.h
@@ -12,10 +12,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/CauseRadioNetwork.h>
-#include <osmocom/osmo-iuh/hnbap/CauseTransport.h>
-#include <osmocom/osmo-iuh/hnbap/CauseProtocol.h>
-#include <osmocom/osmo-iuh/hnbap/CauseMisc.h>
+#include <osmocom/hnbap/CauseRadioNetwork.h>
+#include <osmocom/hnbap/CauseTransport.h>
+#include <osmocom/hnbap/CauseProtocol.h>
+#include <osmocom/hnbap/CauseMisc.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/ConfigurationInformation.h b/include/osmocom/hnbap/ConfigurationInformation.h
index 0c33b02..4cd2bda 100644
--- a/include/osmocom/hnbap/ConfigurationInformation.h
+++ b/include/osmocom/hnbap/ConfigurationInformation.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationProvided.h>
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationMissing.h>
+#include <osmocom/hnbap/HNBConfigurationInformationProvided.h>
+#include <osmocom/hnbap/HNBConfigurationInformationMissing.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
index ae5a777..3e24ec9 100644
--- a/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/hnbap/CriticalityDiagnostics-IE-List.h
@@ -13,9 +13,9 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
-#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/hnbap/TypeOfError.h>
+#include <osmocom/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProtocolIE-ID.h>
+#include <osmocom/hnbap/TypeOfError.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
@@ -54,7 +54,7 @@ extern asn_TYPE_descriptor_t asn_DEF_CriticalityDiagnostics_IE_List;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _CriticalityDiagnostics_IE_List_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/CriticalityDiagnostics.h b/include/osmocom/hnbap/CriticalityDiagnostics.h
index 782da7b..d6595a1 100644
--- a/include/osmocom/hnbap/CriticalityDiagnostics.h
+++ b/include/osmocom/hnbap/CriticalityDiagnostics.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
-#include <osmocom/osmo-iuh/hnbap/TriggeringMessage.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/TriggeringMessage.h>
+#include <osmocom/hnbap/Criticality.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -49,8 +49,8 @@ extern asn_TYPE_descriptor_t asn_DEF_CriticalityDiagnostics;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics-IE-List.h>
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/CriticalityDiagnostics-IE-List.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _CriticalityDiagnostics_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/ErrorIndication.h b/include/osmocom/hnbap/ErrorIndication.h
index e2fd5cf..110934c 100644
--- a/include/osmocom/hnbap/ErrorIndication.h
+++ b/include/osmocom/hnbap/ErrorIndication.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_ErrorIndication;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _ErrorIndication_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/GeographicalCoordinates.h b/include/osmocom/hnbap/GeographicalCoordinates.h
index bc4cde3..cf0650b 100644
--- a/include/osmocom/hnbap/GeographicalCoordinates.h
+++ b/include/osmocom/hnbap/GeographicalCoordinates.h
@@ -53,7 +53,7 @@ extern asn_TYPE_descriptor_t asn_DEF_GeographicalCoordinates;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _GeographicalCoordinates_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/GeographicalLocation.h b/include/osmocom/hnbap/GeographicalLocation.h
index c6ce2ca..bf228e7 100644
--- a/include/osmocom/hnbap/GeographicalLocation.h
+++ b/include/osmocom/hnbap/GeographicalLocation.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/hnbap/AltitudeAndDirection.h>
+#include <osmocom/hnbap/GeographicalCoordinates.h>
+#include <osmocom/hnbap/AltitudeAndDirection.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@ extern asn_TYPE_descriptor_t asn_DEF_GeographicalLocation;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _GeographicalLocation_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNB-Cell-Identifier.h b/include/osmocom/hnbap/HNB-Cell-Identifier.h
index e5feebf..66e63f5 100644
--- a/include/osmocom/hnbap/HNB-Cell-Identifier.h
+++ b/include/osmocom/hnbap/HNB-Cell-Identifier.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
-#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/CellIdentity.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNB_Cell_Identifier;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNB_Cell_Identifier_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNB-GWResponse.h b/include/osmocom/hnbap/HNB-GWResponse.h
index d2d99fa..436cf55 100644
--- a/include/osmocom/hnbap/HNB-GWResponse.h
+++ b/include/osmocom/hnbap/HNB-GWResponse.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
-#include <osmocom/osmo-iuh/hnbap/RNC-ID.h>
-#include <osmocom/osmo-iuh/hnbap/UnknownU-RNTIIndication.h>
+#include <osmocom/hnbap/HNBConfigInfo.h>
+#include <osmocom/hnbap/RNC-ID.h>
+#include <osmocom/hnbap/UnknownU-RNTIIndication.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/HNB-Identity.h b/include/osmocom/hnbap/HNB-Identity.h
index 30448d9..9fc83d5 100644
--- a/include/osmocom/hnbap/HNB-Identity.h
+++ b/include/osmocom/hnbap/HNB-Identity.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-Identity-Info.h>
+#include <osmocom/hnbap/HNB-Identity-Info.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNB_Identity;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNB_Identity_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNB-Location-Information.h b/include/osmocom/hnbap/HNB-Location-Information.h
index 1846a26..0416b59 100644
--- a/include/osmocom/hnbap/HNB-Location-Information.h
+++ b/include/osmocom/hnbap/HNB-Location-Information.h
@@ -45,9 +45,9 @@ extern asn_TYPE_descriptor_t asn_DEF_HNB_Location_Information;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/MacroCoverageInformation.h>
-#include <osmocom/osmo-iuh/hnbap/GeographicalLocation.h>
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/MacroCoverageInformation.h>
+#include <osmocom/hnbap/GeographicalLocation.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNB_Location_Information_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNB-RNL-Identity.h b/include/osmocom/hnbap/HNB-RNL-Identity.h
index 5e843d9..1256f16 100644
--- a/include/osmocom/hnbap/HNB-RNL-Identity.h
+++ b/include/osmocom/hnbap/HNB-RNL-Identity.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Identifier.h>
+#include <osmocom/hnbap/HNB-Cell-Identifier.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/HNBAP-PDU.h b/include/osmocom/hnbap/HNBAP-PDU.h
index 18017ae..4026a8e 100644
--- a/include/osmocom/hnbap/HNBAP-PDU.h
+++ b/include/osmocom/hnbap/HNBAP-PDU.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/InitiatingMessage.h>
-#include <osmocom/osmo-iuh/hnbap/SuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/hnbap/UnsuccessfulOutcome.h>
+#include <osmocom/hnbap/InitiatingMessage.h>
+#include <osmocom/hnbap/SuccessfulOutcome.h>
+#include <osmocom/hnbap/UnsuccessfulOutcome.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/HNBConfigInfo.h b/include/osmocom/hnbap/HNBConfigInfo.h
index 39b2802..95c4fb9 100644
--- a/include/osmocom/hnbap/HNBConfigInfo.h
+++ b/include/osmocom/hnbap/HNBConfigInfo.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
-#include <osmocom/osmo-iuh/hnbap/ConfigurationInformation.h>
+#include <osmocom/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/hnbap/ConfigurationInformation.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNBConfigInfo;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNBConfigInfo_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBConfigTransferRequest.h b/include/osmocom/hnbap/HNBConfigTransferRequest.h
index ae42e47..89229ca 100644
--- a/include/osmocom/hnbap/HNBConfigTransferRequest.h
+++ b/include/osmocom/hnbap/HNBConfigTransferRequest.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNBConfigTransferRequest;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBConfigTransferRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBConfigTransferResponse.h b/include/osmocom/hnbap/HNBConfigTransferResponse.h
index dbcfa1e..edfb327 100644
--- a/include/osmocom/hnbap/HNBConfigTransferResponse.h
+++ b/include/osmocom/hnbap/HNBConfigTransferResponse.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNBConfigTransferResponse;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBConfigTransferResponse_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBConfigurationInformationMissing.h b/include/osmocom/hnbap/HNBConfigurationInformationMissing.h
index 0833454..9f928f8 100644
--- a/include/osmocom/hnbap/HNBConfigurationInformationMissing.h
+++ b/include/osmocom/hnbap/HNBConfigurationInformationMissing.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/Cause.h>
+#include <osmocom/hnbap/Cause.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNBConfigurationInformationMissing;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNBConfigurationInformationMissing_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBConfigurationInformationProvided.h b/include/osmocom/hnbap/HNBConfigurationInformationProvided.h
index 5eae3a3..5d8b8fe 100644
--- a/include/osmocom/hnbap/HNBConfigurationInformationProvided.h
+++ b/include/osmocom/hnbap/HNBConfigurationInformationProvided.h
@@ -12,10 +12,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/PSC.h>
-#include <osmocom/osmo-iuh/hnbap/CSG-ID.h>
-#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Access-Mode.h>
-#include <osmocom/osmo-iuh/hnbap/Iurh-Signalling-TNL-AddressList.h>
+#include <osmocom/hnbap/PSC.h>
+#include <osmocom/hnbap/CSG-ID.h>
+#include <osmocom/hnbap/HNB-Cell-Access-Mode.h>
+#include <osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -49,7 +49,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNBConfigurationInformationProvided;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _HNBConfigurationInformationProvided_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBDe-Register.h b/include/osmocom/hnbap/HNBDe-Register.h
index 23423f0..5cc8cce 100644
--- a/include/osmocom/hnbap/HNBDe-Register.h
+++ b/include/osmocom/hnbap/HNBDe-Register.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNBDe_Register;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBDe_Register_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBRegisterAccept.h b/include/osmocom/hnbap/HNBRegisterAccept.h
index 41a7040..0d7719b 100644
--- a/include/osmocom/hnbap/HNBRegisterAccept.h
+++ b/include/osmocom/hnbap/HNBRegisterAccept.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNBRegisterAccept;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBRegisterAccept_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBRegisterReject.h b/include/osmocom/hnbap/HNBRegisterReject.h
index 2e77521..e39e01d 100644
--- a/include/osmocom/hnbap/HNBRegisterReject.h
+++ b/include/osmocom/hnbap/HNBRegisterReject.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNBRegisterReject;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBRegisterReject_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/HNBRegisterRequest.h b/include/osmocom/hnbap/HNBRegisterRequest.h
index 2d59145..181ef3c 100644
--- a/include/osmocom/hnbap/HNBRegisterRequest.h
+++ b/include/osmocom/hnbap/HNBRegisterRequest.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_HNBRegisterRequest;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _HNBRegisterRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/IE-Extensions.h b/include/osmocom/hnbap/IE-Extensions.h
index d56c93e..5236df0 100644
--- a/include/osmocom/hnbap/IE-Extensions.h
+++ b/include/osmocom/hnbap/IE-Extensions.h
@@ -38,7 +38,7 @@ extern asn_TYPE_descriptor_t asn_DEF_IE_Extensions;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _IE_Extensions_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/IE.h b/include/osmocom/hnbap/IE.h
index 8193b57..291932a 100644
--- a/include/osmocom/hnbap/IE.h
+++ b/include/osmocom/hnbap/IE.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProtocolIE-ID.h>
+#include <osmocom/hnbap/Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/hnbap/IMSIESN.h b/include/osmocom/hnbap/IMSIESN.h
index f81ecb9..e68989a 100644
--- a/include/osmocom/hnbap/IMSIESN.h
+++ b/include/osmocom/hnbap/IMSIESN.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
-#include <osmocom/osmo-iuh/hnbap/ESN.h>
+#include <osmocom/hnbap/IMSIDS41.h>
+#include <osmocom/hnbap/ESN.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/IP-Address.h b/include/osmocom/hnbap/IP-Address.h
index 26a4cb5..501dab1 100644
--- a/include/osmocom/hnbap/IP-Address.h
+++ b/include/osmocom/hnbap/IP-Address.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/Ipv4Address.h>
-#include <osmocom/osmo-iuh/hnbap/Ipv6Address.h>
+#include <osmocom/hnbap/Ipv4Address.h>
+#include <osmocom/hnbap/Ipv6Address.h>
#include <constr_CHOICE.h>
#include <constr_SEQUENCE.h>
@@ -67,7 +67,7 @@ extern asn_TYPE_descriptor_t asn_DEF_IP_Address;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _IP_Address_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/InitiatingMessage.h b/include/osmocom/hnbap/InitiatingMessage.h
index c3080b7..e3c958b 100644
--- a/include/osmocom/hnbap/InitiatingMessage.h
+++ b/include/osmocom/hnbap/InitiatingMessage.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h b/include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h
index 934203c..784f7c9 100644
--- a/include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h
+++ b/include/osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h
@@ -38,7 +38,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Iurh_Signalling_TNL_AddressList;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
+#include <osmocom/hnbap/IP-Address.h>
#endif /* _Iurh_Signalling_TNL_AddressList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/LAI.h b/include/osmocom/hnbap/LAI.h
index e0cd2ea..7537fe3 100644
--- a/include/osmocom/hnbap/LAI.h
+++ b/include/osmocom/hnbap/LAI.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
-#include <osmocom/osmo-iuh/hnbap/LAC.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/LAC.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/MacroCellID.h b/include/osmocom/hnbap/MacroCellID.h
index 04ed95f..88b4a62 100644
--- a/include/osmocom/hnbap/MacroCellID.h
+++ b/include/osmocom/hnbap/MacroCellID.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/UTRANCellID.h>
-#include <osmocom/osmo-iuh/hnbap/CGI.h>
+#include <osmocom/hnbap/UTRANCellID.h>
+#include <osmocom/hnbap/CGI.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/MacroCoverageInformation.h b/include/osmocom/hnbap/MacroCoverageInformation.h
index 9785267..1d3f915 100644
--- a/include/osmocom/hnbap/MacroCoverageInformation.h
+++ b/include/osmocom/hnbap/MacroCoverageInformation.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/MacroCellID.h>
+#include <osmocom/hnbap/MacroCellID.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@ extern asn_TYPE_descriptor_t asn_DEF_MacroCoverageInformation;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _MacroCoverageInformation_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/NeighbourCellIdentityList.h b/include/osmocom/hnbap/NeighbourCellIdentityList.h
index 4f8060c..5b013cc 100644
--- a/include/osmocom/hnbap/NeighbourCellIdentityList.h
+++ b/include/osmocom/hnbap/NeighbourCellIdentityList.h
@@ -38,7 +38,7 @@ extern asn_TYPE_descriptor_t asn_DEF_NeighbourCellIdentityList;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/NeighbourIdentity.h>
+#include <osmocom/hnbap/NeighbourIdentity.h>
#endif /* _NeighbourCellIdentityList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/NeighbourIdentity.h b/include/osmocom/hnbap/NeighbourIdentity.h
index 29f77db..290b09d 100644
--- a/include/osmocom/hnbap/NeighbourIdentity.h
+++ b/include/osmocom/hnbap/NeighbourIdentity.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
-#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
+#include <osmocom/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/hnbap/CellIdentity.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/NeighbourInfoList.h b/include/osmocom/hnbap/NeighbourInfoList.h
index cb0c83e..0581af4 100644
--- a/include/osmocom/hnbap/NeighbourInfoList.h
+++ b/include/osmocom/hnbap/NeighbourInfoList.h
@@ -38,7 +38,7 @@ extern asn_TYPE_descriptor_t asn_DEF_NeighbourInfoList;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
+#include <osmocom/hnbap/HNBConfigInfo.h>
#endif /* _NeighbourInfoList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/NeighbourInfoRequestItem.h b/include/osmocom/hnbap/NeighbourInfoRequestItem.h
index 02ffd34..39fd6d7 100644
--- a/include/osmocom/hnbap/NeighbourInfoRequestItem.h
+++ b/include/osmocom/hnbap/NeighbourInfoRequestItem.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/hnbap/HNB-RNL-Identity.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -43,7 +43,7 @@ extern asn_TYPE_descriptor_t asn_DEF_NeighbourInfoRequestItem;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _NeighbourInfoRequestItem_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/NeighbourInfoRequestList.h b/include/osmocom/hnbap/NeighbourInfoRequestList.h
index b8d4c51..4944272 100644
--- a/include/osmocom/hnbap/NeighbourInfoRequestList.h
+++ b/include/osmocom/hnbap/NeighbourInfoRequestList.h
@@ -38,7 +38,7 @@ extern asn_TYPE_descriptor_t asn_DEF_NeighbourInfoRequestList;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestItem.h>
+#include <osmocom/hnbap/NeighbourInfoRequestItem.h>
#endif /* _NeighbourInfoRequestList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/PTMSIRAI.h b/include/osmocom/hnbap/PTMSIRAI.h
index 570bc35..3564393 100644
--- a/include/osmocom/hnbap/PTMSIRAI.h
+++ b/include/osmocom/hnbap/PTMSIRAI.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/PTMSI.h>
-#include <osmocom/osmo-iuh/hnbap/RAI.h>
+#include <osmocom/hnbap/PTMSI.h>
+#include <osmocom/hnbap/RAI.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/PrivateMessage.h b/include/osmocom/hnbap/PrivateMessage.h
index 5a5d7d4..a9e65bb 100644
--- a/include/osmocom/hnbap/PrivateMessage.h
+++ b/include/osmocom/hnbap/PrivateMessage.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_PrivateMessage;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _PrivateMessage_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/RABList.h b/include/osmocom/hnbap/RABList.h
index 9b05ecc..9dff419 100644
--- a/include/osmocom/hnbap/RABList.h
+++ b/include/osmocom/hnbap/RABList.h
@@ -38,7 +38,7 @@ extern asn_TYPE_descriptor_t asn_DEF_RABList;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/RABListItem.h>
+#include <osmocom/hnbap/RABListItem.h>
#endif /* _RABList_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/RABListItem.h b/include/osmocom/hnbap/RABListItem.h
index 18e1b29..3d5a9e9 100644
--- a/include/osmocom/hnbap/RABListItem.h
+++ b/include/osmocom/hnbap/RABListItem.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/RAB-ID.h>
-#include <osmocom/osmo-iuh/hnbap/TransportInfo.h>
-#include <osmocom/osmo-iuh/hnbap/CN-DomainIndicator.h>
+#include <osmocom/hnbap/RAB-ID.h>
+#include <osmocom/hnbap/TransportInfo.h>
+#include <osmocom/hnbap/CN-DomainIndicator.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_RABListItem;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _RABListItem_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/RAI.h b/include/osmocom/hnbap/RAI.h
index 6ecd006..a044246 100644
--- a/include/osmocom/hnbap/RAI.h
+++ b/include/osmocom/hnbap/RAI.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/LAI.h>
-#include <osmocom/osmo-iuh/hnbap/RAC.h>
+#include <osmocom/hnbap/LAI.h>
+#include <osmocom/hnbap/RAC.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/RelocationComplete.h b/include/osmocom/hnbap/RelocationComplete.h
index 74ca101..4dd2a2d 100644
--- a/include/osmocom/hnbap/RelocationComplete.h
+++ b/include/osmocom/hnbap/RelocationComplete.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_RelocationComplete;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _RelocationComplete_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/SuccessfulOutcome.h b/include/osmocom/hnbap/SuccessfulOutcome.h
index 90d798d..fc53d89 100644
--- a/include/osmocom/hnbap/SuccessfulOutcome.h
+++ b/include/osmocom/hnbap/SuccessfulOutcome.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/hnbap/TMSILAI.h b/include/osmocom/hnbap/TMSILAI.h
index 2ba0a1a..ee38a24 100644
--- a/include/osmocom/hnbap/TMSILAI.h
+++ b/include/osmocom/hnbap/TMSILAI.h
@@ -13,7 +13,7 @@
/* Including external dependencies */
#include <BIT_STRING.h>
-#include <osmocom/osmo-iuh/hnbap/LAI.h>
+#include <osmocom/hnbap/LAI.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/TNLUpdateFailure.h b/include/osmocom/hnbap/TNLUpdateFailure.h
index eb942e5..91ea963 100644
--- a/include/osmocom/hnbap/TNLUpdateFailure.h
+++ b/include/osmocom/hnbap/TNLUpdateFailure.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_TNLUpdateFailure;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _TNLUpdateFailure_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/TNLUpdateRequest.h b/include/osmocom/hnbap/TNLUpdateRequest.h
index 129a35a..c87702c 100644
--- a/include/osmocom/hnbap/TNLUpdateRequest.h
+++ b/include/osmocom/hnbap/TNLUpdateRequest.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_TNLUpdateRequest;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _TNLUpdateRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/TNLUpdateResponse.h b/include/osmocom/hnbap/TNLUpdateResponse.h
index 304cbe6..01ca4c6 100644
--- a/include/osmocom/hnbap/TNLUpdateResponse.h
+++ b/include/osmocom/hnbap/TNLUpdateResponse.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_TNLUpdateResponse;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _TNLUpdateResponse_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/TransportInfo.h b/include/osmocom/hnbap/TransportInfo.h
index d81936d..dcd6420 100644
--- a/include/osmocom/hnbap/TransportInfo.h
+++ b/include/osmocom/hnbap/TransportInfo.h
@@ -12,9 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/hnbap/GTP-TEI.h>
-#include <osmocom/osmo-iuh/hnbap/BindingID.h>
+#include <osmocom/hnbap/TransportLayerAddress.h>
+#include <osmocom/hnbap/GTP-TEI.h>
+#include <osmocom/hnbap/BindingID.h>
#include <constr_CHOICE.h>
#include <constr_SEQUENCE.h>
@@ -69,7 +69,7 @@ extern asn_TYPE_descriptor_t asn_DEF_TransportInfo;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _TransportInfo_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/Tunnel-Information.h b/include/osmocom/hnbap/Tunnel-Information.h
index 5d87aba..e01de71 100644
--- a/include/osmocom/hnbap/Tunnel-Information.h
+++ b/include/osmocom/hnbap/Tunnel-Information.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
-#include <osmocom/osmo-iuh/hnbap/UDP-Port-Number.h>
+#include <osmocom/hnbap/IP-Address.h>
+#include <osmocom/hnbap/UDP-Port-Number.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@ extern asn_TYPE_descriptor_t asn_DEF_Tunnel_Information;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _Tunnel_Information_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/U-RNTIQueryRequest.h b/include/osmocom/hnbap/U-RNTIQueryRequest.h
index 2568963..7403c0a 100644
--- a/include/osmocom/hnbap/U-RNTIQueryRequest.h
+++ b/include/osmocom/hnbap/U-RNTIQueryRequest.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_U_RNTIQueryRequest;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _U_RNTIQueryRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/U-RNTIQueryResponse.h b/include/osmocom/hnbap/U-RNTIQueryResponse.h
index ed411ab..730144f 100644
--- a/include/osmocom/hnbap/U-RNTIQueryResponse.h
+++ b/include/osmocom/hnbap/U-RNTIQueryResponse.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_U_RNTIQueryResponse;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _U_RNTIQueryResponse_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UE-Capabilities.h b/include/osmocom/hnbap/UE-Capabilities.h
index 1d4cf41..1274bbf 100644
--- a/include/osmocom/hnbap/UE-Capabilities.h
+++ b/include/osmocom/hnbap/UE-Capabilities.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/Access-stratum-release-indicator.h>
-#include <osmocom/osmo-iuh/hnbap/CSG-Capability.h>
+#include <osmocom/hnbap/Access-stratum-release-indicator.h>
+#include <osmocom/hnbap/CSG-Capability.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@ extern asn_TYPE_descriptor_t asn_DEF_UE_Capabilities;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _UE_Capabilities_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UE-Identity.h b/include/osmocom/hnbap/UE-Identity.h
index 90852f9..f0f012a 100644
--- a/include/osmocom/hnbap/UE-Identity.h
+++ b/include/osmocom/hnbap/UE-Identity.h
@@ -12,14 +12,14 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/IMSI.h>
-#include <osmocom/osmo-iuh/hnbap/TMSILAI.h>
-#include <osmocom/osmo-iuh/hnbap/PTMSIRAI.h>
-#include <osmocom/osmo-iuh/hnbap/IMEI.h>
-#include <osmocom/osmo-iuh/hnbap/ESN.h>
-#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
-#include <osmocom/osmo-iuh/hnbap/IMSIESN.h>
-#include <osmocom/osmo-iuh/hnbap/TMSIDS41.h>
+#include <osmocom/hnbap/IMSI.h>
+#include <osmocom/hnbap/TMSILAI.h>
+#include <osmocom/hnbap/PTMSIRAI.h>
+#include <osmocom/hnbap/IMEI.h>
+#include <osmocom/hnbap/ESN.h>
+#include <osmocom/hnbap/IMSIDS41.h>
+#include <osmocom/hnbap/IMSIESN.h>
+#include <osmocom/hnbap/TMSIDS41.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/hnbap/UEDe-Register.h b/include/osmocom/hnbap/UEDe-Register.h
index 818491a..dab4334 100644
--- a/include/osmocom/hnbap/UEDe-Register.h
+++ b/include/osmocom/hnbap/UEDe-Register.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_UEDe_Register;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _UEDe_Register_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UERegisterAccept.h b/include/osmocom/hnbap/UERegisterAccept.h
index d6884bf..de630b1 100644
--- a/include/osmocom/hnbap/UERegisterAccept.h
+++ b/include/osmocom/hnbap/UERegisterAccept.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_UERegisterAccept;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _UERegisterAccept_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UERegisterReject.h b/include/osmocom/hnbap/UERegisterReject.h
index fe697b4..abda80d 100644
--- a/include/osmocom/hnbap/UERegisterReject.h
+++ b/include/osmocom/hnbap/UERegisterReject.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_UERegisterReject;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _UERegisterReject_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UERegisterRequest.h b/include/osmocom/hnbap/UERegisterRequest.h
index e718945..09d6a29 100644
--- a/include/osmocom/hnbap/UERegisterRequest.h
+++ b/include/osmocom/hnbap/UERegisterRequest.h
@@ -48,7 +48,7 @@ extern asn_TYPE_descriptor_t asn_DEF_UERegisterRequest;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
#endif /* _UERegisterRequest_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/URAIdentityList.h b/include/osmocom/hnbap/URAIdentityList.h
index 12c3bb5..b4c8a36 100644
--- a/include/osmocom/hnbap/URAIdentityList.h
+++ b/include/osmocom/hnbap/URAIdentityList.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/URAIdentity.h>
+#include <osmocom/hnbap/URAIdentity.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/hnbap/UTRANCellID.h b/include/osmocom/hnbap/UTRANCellID.h
index b034165..39c5b84 100644
--- a/include/osmocom/hnbap/UTRANCellID.h
+++ b/include/osmocom/hnbap/UTRANCellID.h
@@ -12,10 +12,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/LAC.h>
-#include <osmocom/osmo-iuh/hnbap/RAC.h>
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
-#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
+#include <osmocom/hnbap/LAC.h>
+#include <osmocom/hnbap/RAC.h>
+#include <osmocom/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/CellIdentity.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -45,7 +45,7 @@ extern asn_TYPE_descriptor_t asn_DEF_UTRANCellID;
#endif
/* Referred external types */
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
#endif /* _UTRANCellID_H_ */
#include <asn_internal.h>
diff --git a/include/osmocom/hnbap/UnsuccessfulOutcome.h b/include/osmocom/hnbap/UnsuccessfulOutcome.h
index bae3125..5fd9bd0 100644
--- a/include/osmocom/hnbap/UnsuccessfulOutcome.h
+++ b/include/osmocom/hnbap/UnsuccessfulOutcome.h
@@ -12,8 +12,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h b/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h
index 56526ae..ec73d30 100644
--- a/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h
+++ b/include/osmocom/ranap/RANAP_AllocationOrRetentionPriority.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PriorityLevel.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionCapability.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionVulnerability.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_QueuingAllowed.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PriorityLevel.h>
+#include <osmocom/ranap/RANAP_Pre-emptionCapability.h>
+#include <osmocom/ranap/RANAP_Pre-emptionVulnerability.h>
+#include <osmocom/ranap/RANAP_QueuingAllowed.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h
index 9003723..7d209d5 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h
index 5d72191..d6105a2 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h
index ff54257..dff57a7 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h
index 6c2d8b7..cc56279 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h
index 59146e4..518acbe 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h
index e4f15c1..d22f7fd 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h
index 716e128..262c742 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h
index 970cfa1..b7099d0 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h
index 35cd221..e8e2f8d 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h
index 29bceae..5d7a8c9 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h
index 1e36c19..4ff9287 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h
index 9b9f4da..9d26566 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h
index 5dec296..3dcaf55 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h
index 7936bf2..d712b9a 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
+#include <osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h
index b19b33c..3e6a1cf 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h
index d8fa544..c2a462b 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
+#include <osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h b/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h
index 87383dd..855cfcf 100644
--- a/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Alt-RAB-Parameters.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_AreaIdentity.h b/include/osmocom/ranap/RANAP_AreaIdentity.h
index 15529f2..a57bc5b 100644
--- a/include/osmocom/ranap/RANAP_AreaIdentity.h
+++ b/include/osmocom/ranap/RANAP_AreaIdentity.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalArea.h>
+#include <osmocom/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_GeographicalArea.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h
index 4994e50..6445665 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h
index ee5ce75..994102b 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h
index 8674e12..716733e 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h
index 377f623..a808288 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h b/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h
index 227b242..dbbe10a 100644
--- a/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Ass-RAB-Parameters.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
index 93c96c5..77b65a7 100644
--- a/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
+++ b/include/osmocom/ranap/RANAP_AuthorisedPLMNs.h
@@ -12,9 +12,9 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedSNAs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_AuthorisedSNAs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_AuthorisedSNAs.h b/include/osmocom/ranap/RANAP_AuthorisedSNAs.h
index 16aaa74..2cad6d9 100644
--- a/include/osmocom/ranap/RANAP_AuthorisedSNAs.h
+++ b/include/osmocom/ranap/RANAP_AuthorisedSNAs.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SNAC.h>
+#include <osmocom/ranap/RANAP_SNAC.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_CGI.h b/include/osmocom/ranap/RANAP_CGI.h
index 312ff7f..9e03e28 100644
--- a/include/osmocom/ranap/RANAP_CGI.h
+++ b/include/osmocom/ranap/RANAP_CGI.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_CI.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h b/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h
index e43efd3..fa42126 100644
--- a/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h
+++ b/include/osmocom/ranap/RANAP_CN-DeactivateTrace.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_CN-InvokeTrace.h b/include/osmocom/ranap/RANAP_CN-InvokeTrace.h
index 0d1f570..6b51611 100644
--- a/include/osmocom/ranap/RANAP_CN-InvokeTrace.h
+++ b/include/osmocom/ranap/RANAP_CN-InvokeTrace.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h b/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h
index c7fd7ca..93e9342 100644
--- a/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h
+++ b/include/osmocom/ranap/RANAP_CNMBMSLinkingInformation.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_JoinedMBMSBearerService-IEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CSG-Id-List.h b/include/osmocom/ranap/RANAP_CSG-Id-List.h
index b6cb0d1..2ea2274 100644
--- a/include/osmocom/ranap/RANAP_CSG-Id-List.h
+++ b/include/osmocom/ranap/RANAP_CSG-Id-List.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Id.h>
+#include <osmocom/ranap/RANAP_CSG-Id.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Cause.h b/include/osmocom/ranap/RANAP_Cause.h
index 277a5fb..82ec137 100644
--- a/include/osmocom/ranap/RANAP_Cause.h
+++ b/include/osmocom/ranap/RANAP_Cause.h
@@ -11,13 +11,13 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetwork.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseTransmissionNetwork.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseNAS.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseProtocol.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseMisc.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseNon-Standard.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetworkExtension.h>
+#include <osmocom/ranap/RANAP_CauseRadioNetwork.h>
+#include <osmocom/ranap/RANAP_CauseTransmissionNetwork.h>
+#include <osmocom/ranap/RANAP_CauseNAS.h>
+#include <osmocom/ranap/RANAP_CauseProtocol.h>
+#include <osmocom/ranap/RANAP_CauseMisc.h>
+#include <osmocom/ranap/RANAP_CauseNon-Standard.h>
+#include <osmocom/ranap/RANAP_CauseRadioNetworkExtension.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CellBased.h b/include/osmocom/ranap/RANAP_CellBased.h
index ecf930f..09edeeb 100644
--- a/include/osmocom/ranap/RANAP_CellBased.h
+++ b/include/osmocom/ranap/RANAP_CellBased.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CellIdList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_CellIdList.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CellIdList.h b/include/osmocom/ranap/RANAP_CellIdList.h
index 4096006..9b5779f 100644
--- a/include/osmocom/ranap/RANAP_CellIdList.h
+++ b/include/osmocom/ranap/RANAP_CellIdList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Id.h>
+#include <osmocom/ranap/RANAP_Cell-Id.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_CellLoadInformation.h b/include/osmocom/ranap/RANAP_CellLoadInformation.h
index 550a909..b4f3753 100644
--- a/include/osmocom/ranap/RANAP_CellLoadInformation.h
+++ b/include/osmocom/ranap/RANAP_CellLoadInformation.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Capacity-Class-Value.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoadValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RTLoadValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NRTLoadInformationValue.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Cell-Capacity-Class-Value.h>
+#include <osmocom/ranap/RANAP_LoadValue.h>
+#include <osmocom/ranap/RANAP_RTLoadValue.h>
+#include <osmocom/ranap/RANAP_NRTLoadInformationValue.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h b/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h
index 5e17daf..092b5b0 100644
--- a/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h
+++ b/include/osmocom/ranap/RANAP_CellLoadInformationGroup.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceCellID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_SourceCellID.h>
+#include <osmocom/ranap/RANAP_CellLoadInformation.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h b/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h
index 16327e9..6d4b8fe 100644
--- a/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h
+++ b/include/osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_EncryptionAlgorithm.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h b/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h
index ad4d52a..d3d4963 100644
--- a/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h
+++ b/include/osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/osmocom/ranap/RANAP_CommonID.h b/include/osmocom/ranap/RANAP_CommonID.h
index f46cf37..0eb0e41 100644
--- a/include/osmocom/ranap/RANAP_CommonID.h
+++ b/include/osmocom/ranap/RANAP_CommonID.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
index 51322ee..0eaeb3e 100644
--- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
+++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h
@@ -12,10 +12,10 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber0.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber0.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h b/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h
index 06a8b40..a247953 100644
--- a/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h
+++ b/include/osmocom/ranap/RANAP_CriticalityDiagnostics.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TriggeringMessage.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CriticalityDiagnostics-IE-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_TriggeringMessage.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_DataVolumeList.h b/include/osmocom/ranap/RANAP_DataVolumeList.h
index 83e0f87..459c2d5 100644
--- a/include/osmocom/ranap/RANAP_DataVolumeList.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeList.h
@@ -12,9 +12,9 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
+#include <osmocom/ranap/RANAP_DataVolumeReference.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_DataVolumeReport.h b/include/osmocom/ranap/RANAP_DataVolumeReport.h
index aeff753..1018cd7 100644
--- a/include/osmocom/ranap/RANAP_DataVolumeReport.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReport.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DataVolumeReportList.h b/include/osmocom/ranap/RANAP_DataVolumeReportList.h
index 8f0f52d..9a26ba7 100644
--- a/include/osmocom/ranap/RANAP_DataVolumeReportList.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReportList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h b/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h
index 764593b..cf76036 100644
--- a/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h
+++ b/include/osmocom/ranap/RANAP_DataVolumeReportRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h
index 71225fc..209e61c 100644
--- a/include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_DeltaRAListofIdleModeUEs.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_NewRAListofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_DirectInformationTransfer.h b/include/osmocom/ranap/RANAP_DirectInformationTransfer.h
index 065bb3e..08478d5 100644
--- a/include/osmocom/ranap/RANAP_DirectInformationTransfer.h
+++ b/include/osmocom/ranap/RANAP_DirectInformationTransfer.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h b/include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h
index 0b2af58..cc7d096 100644
--- a/include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h
+++ b/include/osmocom/ranap/RANAP_DirectTransfer-IE-ContainerList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_DirectTransfer.h b/include/osmocom/ranap/RANAP_DirectTransfer.h
index a6005b4..2a8a1ff 100644
--- a/include/osmocom/ranap/RANAP_DirectTransfer.h
+++ b/include/osmocom/ranap/RANAP_DirectTransfer.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h b/include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h
index b55dbf9..59dd639 100644
--- a/include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h
+++ b/include/osmocom/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-PDU.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAPI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_NAS-PDU.h>
+#include <osmocom/ranap/RANAP_SAPI.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_EUTRANFrequencies.h b/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
index b71948d..f6c653c 100644
--- a/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
+++ b/include/osmocom/ranap/RANAP_EUTRANFrequencies.h
@@ -13,8 +13,8 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasBand.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_MeasBand.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_EncryptionInformation.h b/include/osmocom/ranap/RANAP_EncryptionInformation.h
index ac52f75..6f3c91e 100644
--- a/include/osmocom/ranap/RANAP_EncryptionInformation.h
+++ b/include/osmocom/ranap/RANAP_EncryptionInformation.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PermittedEncryptionAlgorithms.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h>
+#include <osmocom/ranap/RANAP_EncryptionKey.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h
index 0fbca3f..fa5b0f5 100644
--- a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h
+++ b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteConfirm.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h
index ed239e1..2e0b586 100644
--- a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h
+++ b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteFailure.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h
index f01ae99..91a6ac3 100644
--- a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h
+++ b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h
index 66086b7..26126c2 100644
--- a/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h
+++ b/include/osmocom/ranap/RANAP_EnhancedRelocationCompleteResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h b/include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h
index e7894a2..e9084ec 100644
--- a/include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h
+++ b/include/osmocom/ranap/RANAP_EquipmentsToBeTraced.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEIList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEIGroup.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVGroup.h>
+#include <osmocom/ranap/RANAP_IMEIList.h>
+#include <osmocom/ranap/RANAP_IMEISVList.h>
+#include <osmocom/ranap/RANAP_IMEIGroup.h>
+#include <osmocom/ranap/RANAP_IMEISVGroup.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ErrorIndication.h b/include/osmocom/ranap/RANAP_ErrorIndication.h
index e4ca344..5bad287 100644
--- a/include/osmocom/ranap/RANAP_ErrorIndication.h
+++ b/include/osmocom/ranap/RANAP_ErrorIndication.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Event1F-Parameters.h b/include/osmocom/ranap/RANAP_Event1F-Parameters.h
index 6180f8b..96fd004 100644
--- a/include/osmocom/ranap/RANAP_Event1F-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Event1F-Parameters.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementQuantity.h>
+#include <osmocom/ranap/RANAP_MeasurementQuantity.h>
#include <NativeInteger.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ForwardSRNS-Context.h b/include/osmocom/ranap/RANAP_ForwardSRNS-Context.h
index 2050ae5..da74458 100644
--- a/include/osmocom/ranap/RANAP_ForwardSRNS-Context.h
+++ b/include/osmocom/ranap/RANAP_ForwardSRNS-Context.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_GA-EllipsoidArc.h b/include/osmocom/ranap/RANAP_GA-EllipsoidArc.h
index 7956cfb..5f2442b 100644
--- a/include/osmocom/ranap/RANAP_GA-EllipsoidArc.h
+++ b/include/osmocom/ranap/RANAP_GA-EllipsoidArc.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-Point.h b/include/osmocom/ranap/RANAP_GA-Point.h
index 65b4c83..5aebf02 100644
--- a/include/osmocom/ranap/RANAP_GA-Point.h
+++ b/include/osmocom/ranap/RANAP_GA-Point.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-PointWithAltitude.h b/include/osmocom/ranap/RANAP_GA-PointWithAltitude.h
index 9d3258d..a709c8d 100644
--- a/include/osmocom/ranap/RANAP_GA-PointWithAltitude.h
+++ b/include/osmocom/ranap/RANAP_GA-PointWithAltitude.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-AltitudeAndDirection.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GA-AltitudeAndDirection.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h b/include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h
index 6963746..76663f5 100644
--- a/include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h
+++ b/include/osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-AltitudeAndDirection.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-UncertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GA-AltitudeAndDirection.h>
+#include <osmocom/ranap/RANAP_GA-UncertaintyEllipse.h>
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h b/include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h
index 8c3cdc1..a498393 100644
--- a/include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h
+++ b/include/osmocom/ranap/RANAP_GA-PointWithUnCertainty.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <NativeInteger.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h b/include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h
index 4ca74ae..0ed80e7 100644
--- a/include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h
+++ b/include/osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-UncertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_GA-UncertaintyEllipse.h>
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GA-Polygon.h b/include/osmocom/ranap/RANAP_GA-Polygon.h
index 5c4e057..200d0a4 100644
--- a/include/osmocom/ranap/RANAP_GA-Polygon.h
+++ b/include/osmocom/ranap/RANAP_GA-Polygon.h
@@ -12,8 +12,8 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h b/include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h
index ea252dc..5f1784f 100644
--- a/include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h
+++ b/include/osmocom/ranap/RANAP_GANSS-PositioningDataSet.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GANSS-PositioningMethodAndUsage.h>
+#include <osmocom/ranap/RANAP_GANSS-PositioningMethodAndUsage.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_GERAN-Cell-ID.h b/include/osmocom/ranap/RANAP_GERAN-Cell-ID.h
index 4b44bba..c161a39 100644
--- a/include/osmocom/ranap/RANAP_GERAN-Cell-ID.h
+++ b/include/osmocom/ranap/RANAP_GERAN-Cell-ID.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_CI.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h b/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h
index 3d76a77..7466bc5 100644
--- a/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h
+++ b/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Classmark.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_GERAN-Classmark.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h b/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h
index b5c5e05..1d8ea3b 100644
--- a/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h
+++ b/include/osmocom/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_GeographicalArea.h b/include/osmocom/ranap/RANAP_GeographicalArea.h
index 7908b1c..66474d2 100644
--- a/include/osmocom/ranap/RANAP_GeographicalArea.h
+++ b/include/osmocom/ranap/RANAP_GeographicalArea.h
@@ -11,13 +11,13 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-Point.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertainty.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-Polygon.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitude.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GA-EllipsoidArc.h>
+#include <osmocom/ranap/RANAP_GA-Point.h>
+#include <osmocom/ranap/RANAP_GA-PointWithUnCertainty.h>
+#include <osmocom/ranap/RANAP_GA-Polygon.h>
+#include <osmocom/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h>
+#include <osmocom/ranap/RANAP_GA-PointWithAltitude.h>
+#include <osmocom/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h>
+#include <osmocom/ranap/RANAP_GA-EllipsoidArc.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GeographicalCoordinates.h b/include/osmocom/ranap/RANAP_GeographicalCoordinates.h
index 35ee9a6..48a638e 100644
--- a/include/osmocom/ranap/RANAP_GeographicalCoordinates.h
+++ b/include/osmocom/ranap/RANAP_GeographicalCoordinates.h
@@ -13,7 +13,7 @@
/* Including external dependencies */
#include <NativeEnumerated.h>
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GlobalCN-ID.h b/include/osmocom/ranap/RANAP_GlobalCN-ID.h
index deff72a..09b43e0 100644
--- a/include/osmocom/ranap/RANAP_GlobalCN-ID.h
+++ b/include/osmocom/ranap/RANAP_GlobalCN-ID.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-ID.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_CN-ID.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_GlobalRNC-ID.h b/include/osmocom/ranap/RANAP_GlobalRNC-ID.h
index e873cb1..90c1264 100644
--- a/include/osmocom/ranap/RANAP_GlobalRNC-ID.h
+++ b/include/osmocom/ranap/RANAP_GlobalRNC-ID.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RNC-ID.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_RNC-ID.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_HorizontalVelocity.h b/include/osmocom/ranap/RANAP_HorizontalVelocity.h
index e30a0e9..802941c 100644
--- a/include/osmocom/ranap/RANAP_HorizontalVelocity.h
+++ b/include/osmocom/ranap/RANAP_HorizontalVelocity.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h b/include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h
index 40a650c..5570c8c 100644
--- a/include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h
+++ b/include/osmocom/ranap/RANAP_HorizontalVelocityWithUncertainty.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h b/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h
index d7bfd9b..e0a03eb 100644
--- a/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h
+++ b/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocity.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_VerticalVelocity.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h b/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h
index c04c936..b100f38 100644
--- a/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h
+++ b/include/osmocom/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalVelocity.h>
+#include <osmocom/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/ranap/RANAP_VerticalVelocity.h>
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_IE-Extensions.h b/include/osmocom/ranap/RANAP_IE-Extensions.h
index 64dd651..c310803 100644
--- a/include/osmocom/ranap/RANAP_IE-Extensions.h
+++ b/include/osmocom/ranap/RANAP_IE-Extensions.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_IE.h b/include/osmocom/ranap/RANAP_IE.h
index 15a55a4..3ac83c0 100644
--- a/include/osmocom/ranap/RANAP_IE.h
+++ b/include/osmocom/ranap/RANAP_IE.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_IMEIGroup.h b/include/osmocom/ranap/RANAP_IMEIGroup.h
index 2d83e36..a3bd9d0 100644
--- a/include/osmocom/ranap/RANAP_IMEIGroup.h
+++ b/include/osmocom/ranap/RANAP_IMEIGroup.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEI.h>
+#include <osmocom/ranap/RANAP_IMEI.h>
#include <BIT_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_IMEIList.h b/include/osmocom/ranap/RANAP_IMEIList.h
index c6d4c5c..5e1246c 100644
--- a/include/osmocom/ranap/RANAP_IMEIList.h
+++ b/include/osmocom/ranap/RANAP_IMEIList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEI.h>
+#include <osmocom/ranap/RANAP_IMEI.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_IMEISVGroup.h b/include/osmocom/ranap/RANAP_IMEISVGroup.h
index 8e4c63c..92a3836 100644
--- a/include/osmocom/ranap/RANAP_IMEISVGroup.h
+++ b/include/osmocom/ranap/RANAP_IMEISVGroup.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISV.h>
+#include <osmocom/ranap/RANAP_IMEISV.h>
#include <BIT_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_IMEISVList.h b/include/osmocom/ranap/RANAP_IMEISVList.h
index 6ac8c57..8eb1996 100644
--- a/include/osmocom/ranap/RANAP_IMEISVList.h
+++ b/include/osmocom/ranap/RANAP_IMEISVList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMEISV.h>
+#include <osmocom/ranap/RANAP_IMEISV.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h b/include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h
index 597da0c..e2d1321 100644
--- a/include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h
+++ b/include/osmocom/ranap/RANAP_IRAT-Measurement-Configuration.h
@@ -12,8 +12,8 @@
/* Including external dependencies */
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IRATmeasurementParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IRATmeasurementParameters.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_IRATmeasurementParameters.h b/include/osmocom/ranap/RANAP_IRATmeasurementParameters.h
index d9b90b1..e52b0e2 100644
--- a/include/osmocom/ranap/RANAP_IRATmeasurementParameters.h
+++ b/include/osmocom/ranap/RANAP_IRATmeasurementParameters.h
@@ -12,8 +12,8 @@
/* Including external dependencies */
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EUTRANFrequencies.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_EUTRANFrequencies.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ImmediateMDT.h b/include/osmocom/ranap/RANAP_ImmediateMDT.h
index 7bffa56..2399e42 100644
--- a/include/osmocom/ranap/RANAP_ImmediateMDT.h
+++ b/include/osmocom/ranap/RANAP_ImmediateMDT.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementsToActivate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M1Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M2Report.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_MeasurementsToActivate.h>
+#include <osmocom/ranap/RANAP_M1Report.h>
+#include <osmocom/ranap/RANAP_M2Report.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InformationRequestType.h b/include/osmocom/ranap/RANAP_InformationRequestType.h
index 9069e26..03ccc15 100644
--- a/include/osmocom/ranap/RANAP_InformationRequestType.h
+++ b/include/osmocom/ranap/RANAP_InformationRequestType.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PermanentNAS-UE-ID.h>
+#include <osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/ranap/RANAP_PermanentNAS-UE-ID.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InformationRequested.h b/include/osmocom/ranap/RANAP_InformationRequested.h
index 912101d..0b195b1 100644
--- a/include/osmocom/ranap/RANAP_InformationRequested.h
+++ b/include/osmocom/ranap/RANAP_InformationRequested.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMulticastServiceList.h>
+#include <osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/ranap/RANAP_RequestedMulticastServiceList.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InformationTransferConfirmation.h b/include/osmocom/ranap/RANAP_InformationTransferConfirmation.h
index e4ec50a..eab0930 100644
--- a/include/osmocom/ranap/RANAP_InformationTransferConfirmation.h
+++ b/include/osmocom/ranap/RANAP_InformationTransferConfirmation.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_InformationTransferFailure.h b/include/osmocom/ranap/RANAP_InformationTransferFailure.h
index 612dacb..3e11e6d 100644
--- a/include/osmocom/ranap/RANAP_InformationTransferFailure.h
+++ b/include/osmocom/ranap/RANAP_InformationTransferFailure.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_InformationTransferIndication.h b/include/osmocom/ranap/RANAP_InformationTransferIndication.h
index 5861eeb..0a2dcaf 100644
--- a/include/osmocom/ranap/RANAP_InformationTransferIndication.h
+++ b/include/osmocom/ranap/RANAP_InformationTransferIndication.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_InformationTransferType.h b/include/osmocom/ranap/RANAP_InformationTransferType.h
index 22cb651..5214ad5 100644
--- a/include/osmocom/ranap/RANAP_InformationTransferType.h
+++ b/include/osmocom/ranap/RANAP_InformationTransferType.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RNCTraceInformation.h>
+#include <osmocom/ranap/RANAP_RNCTraceInformation.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InitialUE-Message.h b/include/osmocom/ranap/RANAP_InitialUE-Message.h
index b382794..f535cd9 100644
--- a/include/osmocom/ranap/RANAP_InitialUE-Message.h
+++ b/include/osmocom/ranap/RANAP_InitialUE-Message.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_InitiatingMessage.h b/include/osmocom/ranap/RANAP_InitiatingMessage.h
index faf3a94..62e0667 100644
--- a/include/osmocom/ranap/RANAP_InitiatingMessage.h
+++ b/include/osmocom/ranap/RANAP_InitiatingMessage.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h b/include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h
index 1bf702c..a907df2 100644
--- a/include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h
+++ b/include/osmocom/ranap/RANAP_IntegrityProtectionInformation.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionKey.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h b/include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h
index 53a209f..d6b1039 100644
--- a/include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h
+++ b/include/osmocom/ranap/RANAP_InterSystemInformation-TransparentContainer.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_CellLoadInformation.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h b/include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h
index 5c0bbd4..605967e 100644
--- a/include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h
+++ b/include/osmocom/ranap/RANAP_InterSystemInformationTransferType.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RIM-Transfer.h>
+#include <osmocom/ranap/RANAP_RIM-Transfer.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_InterfacesToTraceItem.h b/include/osmocom/ranap/RANAP_InterfacesToTraceItem.h
index 771aa55..e690f90 100644
--- a/include/osmocom/ranap/RANAP_InterfacesToTraceItem.h
+++ b/include/osmocom/ranap/RANAP_InterfacesToTraceItem.h
@@ -12,7 +12,7 @@
/* Including external dependencies */
#include <NativeEnumerated.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h b/include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h
index d6071f6..bbe20ec 100644
--- a/include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h
+++ b/include/osmocom/ranap/RANAP_Iu-ReleaseCommand.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h b/include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h
index f81a3ed..b9a7507 100644
--- a/include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h
+++ b/include/osmocom/ranap/RANAP_Iu-ReleaseComplete.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h b/include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h
index 1c94e8c..6f07090 100644
--- a/include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h
+++ b/include/osmocom/ranap/RANAP_Iu-ReleaseRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h b/include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h
index 1e81c4b..7654441 100644
--- a/include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h
+++ b/include/osmocom/ranap/RANAP_IuSigConId-IE-ContainerList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_IuTransportAssociation.h b/include/osmocom/ranap/RANAP_IuTransportAssociation.h
index 50dc107..450c644 100644
--- a/include/osmocom/ranap/RANAP_IuTransportAssociation.h
+++ b/include/osmocom/ranap/RANAP_IuTransportAssociation.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GTP-TEI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_BindingID.h>
+#include <osmocom/ranap/RANAP_GTP-TEI.h>
+#include <osmocom/ranap/RANAP_BindingID.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
index 4b84a4d..b27cde4 100644
--- a/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
+++ b/include/osmocom/ranap/RANAP_JoinedMBMSBearerService-IEs.h
@@ -12,9 +12,9 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMS-PTP-RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_MBMS-PTP-RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_LA-LIST.h b/include/osmocom/ranap/RANAP_LA-LIST.h
index f109393..08e76ed 100644
--- a/include/osmocom/ranap/RANAP_LA-LIST.h
+++ b/include/osmocom/ranap/RANAP_LA-LIST.h
@@ -12,9 +12,9 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ListOF-SNAs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_ListOF-SNAs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_LABased.h b/include/osmocom/ranap/RANAP_LABased.h
index edd9b30..49de171 100644
--- a/include/osmocom/ranap/RANAP_LABased.h
+++ b/include/osmocom/ranap/RANAP_LABased.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAI-List.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LAI-List.h b/include/osmocom/ranap/RANAP_LAI-List.h
index cafb3d4..ba2ddf3 100644
--- a/include/osmocom/ranap/RANAP_LAI-List.h
+++ b/include/osmocom/ranap/RANAP_LAI-List.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_LAI.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_LAI.h b/include/osmocom/ranap/RANAP_LAI.h
index 6f93b48..f66b324 100644
--- a/include/osmocom/ranap/RANAP_LAI.h
+++ b/include/osmocom/ranap/RANAP_LAI.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h
index 2463a29..4332963 100644
--- a/include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_LAListofIdleModeUEs.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_LAI.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_LastKnownServiceArea.h b/include/osmocom/ranap/RANAP_LastKnownServiceArea.h
index eff3688..9fa72cd 100644
--- a/include/osmocom/ranap/RANAP_LastKnownServiceArea.h
+++ b/include/osmocom/ranap/RANAP_LastKnownServiceArea.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_SAI.h>
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h b/include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h
index 8376a9d..1adfd3e 100644
--- a/include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h
+++ b/include/osmocom/ranap/RANAP_LastVisitedUTRANCell-Item.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_UTRAN-CellID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CellType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Time-UE-StayedInCell.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_UTRAN-CellID.h>
+#include <osmocom/ranap/RANAP_CellType.h>
+#include <osmocom/ranap/RANAP_Time-UE-StayedInCell.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
index b47d1d3..f348739 100644
--- a/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
+++ b/include/osmocom/ranap/RANAP_LeftMBMSBearerService-IEs.h
@@ -12,8 +12,8 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_ListOF-SNAs.h b/include/osmocom/ranap/RANAP_ListOF-SNAs.h
index 77f927c..beeb609 100644
--- a/include/osmocom/ranap/RANAP_ListOF-SNAs.h
+++ b/include/osmocom/ranap/RANAP_ListOF-SNAs.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SNAC.h>
+#include <osmocom/ranap/RANAP_SNAC.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h b/include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h
index 8ccedd7..3be571b 100644
--- a/include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h
+++ b/include/osmocom/ranap/RANAP_ListOfInterfacesToTrace.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_InterfacesToTraceItem.h>
+#include <osmocom/ranap/RANAP_InterfacesToTraceItem.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h b/include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h
index b710726..6ac119b 100644
--- a/include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h
+++ b/include/osmocom/ranap/RANAP_LocationRelatedDataFailure.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h b/include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h
index ea3914f..3192de2 100644
--- a/include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h
+++ b/include/osmocom/ranap/RANAP_LocationRelatedDataRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h b/include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h
index c0ee9e6..7ed1e3c 100644
--- a/include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h
+++ b/include/osmocom/ranap/RANAP_LocationRelatedDataRequestType.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedLocationRelatedDataType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RequestedGPSAssistanceData.h>
+#include <osmocom/ranap/RANAP_RequestedLocationRelatedDataType.h>
+#include <osmocom/ranap/RANAP_RequestedGPSAssistanceData.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h b/include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h
index 90c3fc6..222e9b7 100644
--- a/include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h
+++ b/include/osmocom/ranap/RANAP_LocationRelatedDataResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationReport.h b/include/osmocom/ranap/RANAP_LocationReport.h
index 385417e..e2e8700 100644
--- a/include/osmocom/ranap/RANAP_LocationReport.h
+++ b/include/osmocom/ranap/RANAP_LocationReport.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationReportingControl.h b/include/osmocom/ranap/RANAP_LocationReportingControl.h
index 050e3d6..8909093 100644
--- a/include/osmocom/ranap/RANAP_LocationReportingControl.h
+++ b/include/osmocom/ranap/RANAP_LocationReportingControl.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h b/include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h
index fa5c618..dcdcbc2 100644
--- a/include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h
+++ b/include/osmocom/ranap/RANAP_LocationReportingTransferInformation.h
@@ -11,16 +11,16 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportChangeOfSAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicReportingIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DirectReportingIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_VerticalAccuracyCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningPriority.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ClientType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResponseTime.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IncludeVelocity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicLocationInfo.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_ReportChangeOfSAI.h>
+#include <osmocom/ranap/RANAP_PeriodicReportingIndicator.h>
+#include <osmocom/ranap/RANAP_DirectReportingIndicator.h>
+#include <osmocom/ranap/RANAP_VerticalAccuracyCode.h>
+#include <osmocom/ranap/RANAP_PositioningPriority.h>
+#include <osmocom/ranap/RANAP_ClientType.h>
+#include <osmocom/ranap/RANAP_ResponseTime.h>
+#include <osmocom/ranap/RANAP_IncludeVelocity.h>
+#include <osmocom/ranap/RANAP_PeriodicLocationInfo.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_LoggedMDT.h b/include/osmocom/ranap/RANAP_LoggedMDT.h
index 65b3d2a..83f86e5 100644
--- a/include/osmocom/ranap/RANAP_LoggedMDT.h
+++ b/include/osmocom/ranap/RANAP_LoggedMDT.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggingInterval.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggingDuration.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LoggingInterval.h>
+#include <osmocom/ranap/RANAP_LoggingDuration.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M1Report.h b/include/osmocom/ranap/RANAP_M1Report.h
index c4ec2ed..0773dd5 100644
--- a/include/osmocom/ranap/RANAP_M1Report.h
+++ b/include/osmocom/ranap/RANAP_M1Report.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Report-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Event1F-Parameters.h>
+#include <osmocom/ranap/RANAP_MDT-Report-Parameters.h>
+#include <osmocom/ranap/RANAP_Event1F-Parameters.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M2Report.h b/include/osmocom/ranap/RANAP_M2Report.h
index 7a593f1..b38126d 100644
--- a/include/osmocom/ranap/RANAP_M2Report.h
+++ b/include/osmocom/ranap/RANAP_M2Report.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Report-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Event1I-Parameters.h>
+#include <osmocom/ranap/RANAP_MDT-Report-Parameters.h>
+#include <osmocom/ranap/RANAP_Event1I-Parameters.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M4-Collection-Parameters.h b/include/osmocom/ranap/RANAP_M4-Collection-Parameters.h
index eb8351c..40084ca 100644
--- a/include/osmocom/ranap/RANAP_M4-Collection-Parameters.h
+++ b/include/osmocom/ranap/RANAP_M4-Collection-Parameters.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Threshold.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_M4-Period.h>
+#include <osmocom/ranap/RANAP_M4-Threshold.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M4Report.h b/include/osmocom/ranap/RANAP_M4Report.h
index f96d443..cafd394 100644
--- a/include/osmocom/ranap/RANAP_M4Report.h
+++ b/include/osmocom/ranap/RANAP_M4Report.h
@@ -12,7 +12,7 @@
/* Including external dependencies */
#include <NULL.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M4-Collection-Parameters.h>
+#include <osmocom/ranap/RANAP_M4-Collection-Parameters.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M5Report.h b/include/osmocom/ranap/RANAP_M5Report.h
index 878ec42..1e20feb 100644
--- a/include/osmocom/ranap/RANAP_M5Report.h
+++ b/include/osmocom/ranap/RANAP_M5Report.h
@@ -12,7 +12,7 @@
/* Including external dependencies */
#include <NULL.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_M5-Period.h>
+#include <osmocom/ranap/RANAP_M5-Period.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M6Report.h b/include/osmocom/ranap/RANAP_M6Report.h
index 8c16728..46b8336 100644
--- a/include/osmocom/ranap/RANAP_M6Report.h
+++ b/include/osmocom/ranap/RANAP_M6Report.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_M6-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Links-to-log.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_M6-Period.h>
+#include <osmocom/ranap/RANAP_Links-to-log.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_M7Report.h b/include/osmocom/ranap/RANAP_M7Report.h
index 4b6e85a..e0587f5 100644
--- a/include/osmocom/ranap/RANAP_M7Report.h
+++ b/include/osmocom/ranap/RANAP_M7Report.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_M7-Period.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Links-to-log.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_M7-Period.h>
+#include <osmocom/ranap/RANAP_Links-to-log.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h b/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h
index 43e7e13..dfd1188 100644
--- a/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h b/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h
index f56429d..4c5d1ca 100644
--- a/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSCNDe-RegistrationResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h b/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h
index 6365ae8..329e54e 100644
--- a/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h b/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h
index 525f52d..8dba5c2 100644
--- a/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h
+++ b/include/osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IPMulticastAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_APN.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_IPMulticastAddress.h>
+#include <osmocom/ranap/RANAP_APN.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h b/include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h
index 190f75e..80bacec 100644
--- a/include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h
+++ b/include/osmocom/ranap/RANAP_MBMSRABEstablishmentIndication.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRABRelease.h b/include/osmocom/ranap/RANAP_MBMSRABRelease.h
index e4063f5..6f12d37 100644
--- a/include/osmocom/ranap/RANAP_MBMSRABRelease.h
+++ b/include/osmocom/ranap/RANAP_MBMSRABRelease.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h b/include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h
index a619a15..43d55ef 100644
--- a/include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h
+++ b/include/osmocom/ranap/RANAP_MBMSRABReleaseFailure.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h b/include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h
index 075fc65..369aee0 100644
--- a/include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSRABReleaseRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h b/include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h
index 6a9dfaf..76e07d4 100644
--- a/include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h
+++ b/include/osmocom/ranap/RANAP_MBMSRegistrationFailure.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h b/include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h
index 25e818c..7db35d0 100644
--- a/include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSRegistrationRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h b/include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h
index 4589ffc..72bb393 100644
--- a/include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSRegistrationResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStart.h b/include/osmocom/ranap/RANAP_MBMSSessionStart.h
index ffc2006..de6ccd7 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStart.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStart.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h b/include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h
index 2f06d16..ebae2d2 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStartFailure.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h b/include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h
index 0750412..4171e68 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStartResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStop.h b/include/osmocom/ranap/RANAP_MBMSSessionStop.h
index 0cfca3f..b5d3119 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStop.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStop.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h b/include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h
index 058d2bb..0c0acd1 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionStopResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionUpdate.h b/include/osmocom/ranap/RANAP_MBMSSessionUpdate.h
index 09c520d..58b3a98 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionUpdate.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionUpdate.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h b/include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h
index 16b2fab..16829b9 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionUpdateFailure.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h b/include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h
index b005e97..7736961 100644
--- a/include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSSessionUpdateResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h b/include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h
index 63003b1..66704f6 100644
--- a/include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h
+++ b/include/osmocom/ranap/RANAP_MBMSSynchronisationInformation.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSHCIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IPMulticastAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GTP-TEI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_MBMSHCIndicator.h>
+#include <osmocom/ranap/RANAP_IPMulticastAddress.h>
+#include <osmocom/ranap/RANAP_GTP-TEI.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h b/include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h
index af5d0cc..f1ea76a 100644
--- a/include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h
+++ b/include/osmocom/ranap/RANAP_MBMSUELinkingRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h b/include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h
index 2418d36..61e411f 100644
--- a/include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h
+++ b/include/osmocom/ranap/RANAP_MBMSUELinkingResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_MDT-Configuration.h b/include/osmocom/ranap/RANAP_MDT-Configuration.h
index 87d84a8..d2c980d 100644
--- a/include/osmocom/ranap/RANAP_MDT-Configuration.h
+++ b/include/osmocom/ranap/RANAP_MDT-Configuration.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Activation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDTAreaScope.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MDTMode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_MDT-Activation.h>
+#include <osmocom/ranap/RANAP_MDTAreaScope.h>
+#include <osmocom/ranap/RANAP_MDTMode.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MDT-PLMN-List.h b/include/osmocom/ranap/RANAP_MDT-PLMN-List.h
index d186239..8e9884c 100644
--- a/include/osmocom/ranap/RANAP_MDT-PLMN-List.h
+++ b/include/osmocom/ranap/RANAP_MDT-PLMN-List.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_MDT-Report-Parameters.h b/include/osmocom/ranap/RANAP_MDT-Report-Parameters.h
index 66f5a08..93a98a0 100644
--- a/include/osmocom/ranap/RANAP_MDT-Report-Parameters.h
+++ b/include/osmocom/ranap/RANAP_MDT-Report-Parameters.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportInterval.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportAmount.h>
+#include <osmocom/ranap/RANAP_ReportInterval.h>
+#include <osmocom/ranap/RANAP_ReportAmount.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MDTAreaScope.h b/include/osmocom/ranap/RANAP_MDTAreaScope.h
index c2b911a..ad94533 100644
--- a/include/osmocom/ranap/RANAP_MDTAreaScope.h
+++ b/include/osmocom/ranap/RANAP_MDTAreaScope.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CellBased.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LABased.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABased.h>
+#include <osmocom/ranap/RANAP_CellBased.h>
+#include <osmocom/ranap/RANAP_LABased.h>
+#include <osmocom/ranap/RANAP_RABased.h>
#include <NULL.h>
#include <constr_CHOICE.h>
diff --git a/include/osmocom/ranap/RANAP_MDTMode.h b/include/osmocom/ranap/RANAP_MDTMode.h
index 97657a4..79f39f2 100644
--- a/include/osmocom/ranap/RANAP_MDTMode.h
+++ b/include/osmocom/ranap/RANAP_MDTMode.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ImmediateMDT.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LoggedMDT.h>
+#include <osmocom/ranap/RANAP_ImmediateMDT.h>
+#include <osmocom/ranap/RANAP_LoggedMDT.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_MessageStructure.h b/include/osmocom/ranap/RANAP_MessageStructure.h
index 0cf9623..f44d0b4 100644
--- a/include/osmocom/ranap/RANAP_MessageStructure.h
+++ b/include/osmocom/ranap/RANAP_MessageStructure.h
@@ -12,9 +12,9 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber1.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_RepetitionNumber1.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h
index 9645e18..384213c 100644
--- a/include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_NewRAListofIdleModeUEs.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RAC.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h
index 0b59ab6..70e9005 100644
--- a/include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAofIdleModeUEs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RAofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h b/include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h
index 4d348a3..825bcf2 100644
--- a/include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_Offload-RAB-Parameters.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-APN.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters-APN.h>
+#include <osmocom/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_Outcome.h b/include/osmocom/ranap/RANAP_Outcome.h
index 0c17792..ded1fe5 100644
--- a/include/osmocom/ranap/RANAP_Outcome.h
+++ b/include/osmocom/ranap/RANAP_Outcome.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Overload.h b/include/osmocom/ranap/RANAP_Overload.h
index a00cd40..817d44c 100644
--- a/include/osmocom/ranap/RANAP_Overload.h
+++ b/include/osmocom/ranap/RANAP_Overload.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h b/include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h
index 8b2e4ce..3b7521d 100644
--- a/include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h
+++ b/include/osmocom/ranap/RANAP_PDP-TypeInformation-extension.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type-extension.h>
+#include <osmocom/ranap/RANAP_PDP-Type-extension.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_PDP-TypeInformation.h b/include/osmocom/ranap/RANAP_PDP-TypeInformation.h
index 583a104..0c81cff 100644
--- a/include/osmocom/ranap/RANAP_PDP-TypeInformation.h
+++ b/include/osmocom/ranap/RANAP_PDP-TypeInformation.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type.h>
+#include <osmocom/ranap/RANAP_PDP-Type.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
index 8ba24d5..d335490 100644
--- a/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
+++ b/include/osmocom/ranap/RANAP_PLMNs-in-shared-network.h
@@ -12,9 +12,9 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LA-LIST.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_LA-LIST.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Paging.h b/include/osmocom/ranap/RANAP_Paging.h
index 6b17550..cf96a39 100644
--- a/include/osmocom/ranap/RANAP_Paging.h
+++ b/include/osmocom/ranap/RANAP_Paging.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_PagingAreaID.h b/include/osmocom/ranap/RANAP_PagingAreaID.h
index 03efe6f..40ac1cb 100644
--- a/include/osmocom/ranap/RANAP_PagingAreaID.h
+++ b/include/osmocom/ranap/RANAP_PagingAreaID.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI.h>
+#include <osmocom/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_RAI.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_PeriodicLocationInfo.h b/include/osmocom/ranap/RANAP_PeriodicLocationInfo.h
index 0f8f5af..358ee7f 100644
--- a/include/osmocom/ranap/RANAP_PeriodicLocationInfo.h
+++ b/include/osmocom/ranap/RANAP_PeriodicLocationInfo.h
@@ -12,7 +12,7 @@
/* Including external dependencies */
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h b/include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h
index 644f2ea..7292f28 100644
--- a/include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h
+++ b/include/osmocom/ranap/RANAP_PermanentNAS-UE-ID.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IMSI.h>
+#include <osmocom/ranap/RANAP_IMSI.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h b/include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h
index 4b2d56f..062182f 100644
--- a/include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h
+++ b/include/osmocom/ranap/RANAP_PermittedEncryptionAlgorithms.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_EncryptionAlgorithm.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h b/include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h
index faff381..22d87f4 100644
--- a/include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h
+++ b/include/osmocom/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionAlgorithm.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_PositionData.h b/include/osmocom/ranap/RANAP_PositionData.h
index 98703c0..a1365c2 100644
--- a/include/osmocom/ranap/RANAP_PositionData.h
+++ b/include/osmocom/ranap/RANAP_PositionData.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataDiscriminator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataSet.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PositioningDataDiscriminator.h>
+#include <osmocom/ranap/RANAP_PositioningDataSet.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_PositioningDataSet.h b/include/osmocom/ranap/RANAP_PositioningDataSet.h
index d2a5569..7b6372b 100644
--- a/include/osmocom/ranap/RANAP_PositioningDataSet.h
+++ b/include/osmocom/ranap/RANAP_PositioningDataSet.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PositioningMethodAndUsage.h>
+#include <osmocom/ranap/RANAP_PositioningMethodAndUsage.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_PrivateMessage.h b/include/osmocom/ranap/RANAP_PrivateMessage.h
index 7295890..a783e37 100644
--- a/include/osmocom/ranap/RANAP_PrivateMessage.h
+++ b/include/osmocom/ranap/RANAP_PrivateMessage.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h b/include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h
index 0681a90..3090462 100644
--- a/include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h
+++ b/include/osmocom/ranap/RANAP_ProtocolError-IE-ContainerList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h b/include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h
index 11c67f3..ce7e39a 100644
--- a/include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h
+++ b/include/osmocom/ranap/RANAP_ProtocolExtensionContainer.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionField.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionField.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_ProtocolExtensionField.h b/include/osmocom/ranap/RANAP_ProtocolExtensionField.h
index e962c94..110eeae 100644
--- a/include/osmocom/ranap/RANAP_ProtocolExtensionField.h
+++ b/include/osmocom/ranap/RANAP_ProtocolExtensionField.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ProtocolIE-Container.h b/include/osmocom/ranap/RANAP_ProtocolIE-Container.h
index b210328..4987e62 100644
--- a/include/osmocom/ranap/RANAP_ProtocolIE-Container.h
+++ b/include/osmocom/ranap/RANAP_ProtocolIE-Container.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h b/include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h
index f4f76e2..79d0676 100644
--- a/include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h
+++ b/include/osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-FieldPair.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-FieldPair.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h b/include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h
index c8e99f9..0b5e3e0 100644
--- a/include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h
+++ b/include/osmocom/ranap/RANAP_ProtocolIE-FieldPair.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ProvidedData.h b/include/osmocom/ranap/RANAP_ProvidedData.h
index 2f6012e..4d17369 100644
--- a/include/osmocom/ranap/RANAP_ProvidedData.h
+++ b/include/osmocom/ranap/RANAP_ProvidedData.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Shared-Network-Information.h>
+#include <osmocom/ranap/RANAP_Shared-Network-Information.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h b/include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h
index 1fbe112..508b56d 100644
--- a/include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h
+++ b/include/osmocom/ranap/RANAP_RAB-AssignmentRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h b/include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h
index 4565d98..181da05 100644
--- a/include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h
+++ b/include/osmocom/ranap/RANAP_RAB-AssignmentResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h b/include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h
index 19ecdc4..3bac5ec 100644
--- a/include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h
+++ b/include/osmocom/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h
@@ -11,12 +11,12 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ContextItem.h b/include/osmocom/ranap/RANAP_RAB-ContextItem.h
index 595ff43..ddd0265 100644
--- a/include/osmocom/ranap/RANAP_RAB-ContextItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-ContextItem.h
@@ -11,12 +11,12 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h b/include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h
index a02c58b..79f3432 100644
--- a/include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h
+++ b/include/osmocom/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ContextList.h b/include/osmocom/ranap/RANAP_RAB-ContextList.h
index 88c006f..68bc6cd 100644
--- a/include/osmocom/ranap/RANAP_RAB-ContextList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ContextList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h b/include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h
index 7d40910..4ebe04b 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h b/include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h
index 7346e07..dd96d6e 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataForwardingItem.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h b/include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h
index e0ee98b..4659a09 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-DataForwardingList.h b/include/osmocom/ranap/RANAP_RAB-DataForwardingList.h
index 29a8edf..79b6724 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataForwardingList.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataForwardingList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h
index f55f11d..2c500ac 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportItem.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DataVolumeList.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h
index 497c11a..fd1a5a9 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h
index de6101f..f928e0a 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestItem.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h
index 5f68a9d..cda59bb 100644
--- a/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h
+++ b/include/osmocom/ranap/RANAP_RAB-DataVolumeReportRequestList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h b/include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h
index 8e8b0e1..cfcf0f0 100644
--- a/include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-FailedItem.h b/include/osmocom/ranap/RANAP_RAB-FailedItem.h
index 201383f..f7a6416 100644
--- a/include/osmocom/ranap/RANAP_RAB-FailedItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-FailedItem.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h b/include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h
index 74766d4..310dddb 100644
--- a/include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-FailedList.h b/include/osmocom/ranap/RANAP_RAB-FailedList.h
index ba7628d..333fe89 100644
--- a/include/osmocom/ranap/RANAP_RAB-FailedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-FailedList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h b/include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h
index 5b5d166..9371d29 100644
--- a/include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h
+++ b/include/osmocom/ranap/RANAP_RAB-IE-ContainerList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-Container.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h b/include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h
index a2eec78..10db90a 100644
--- a/include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h
+++ b/include/osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ContainerPair.h>
+#include <osmocom/ranap/RANAP_ProtocolIE-ContainerPair.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ModifyItem.h b/include/osmocom/ranap/RANAP_RAB-ModifyItem.h
index 91e86eb..0b2d5da 100644
--- a/include/osmocom/ranap/RANAP_RAB-ModifyItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-ModifyItem.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-Values.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ModifyList.h b/include/osmocom/ranap/RANAP_RAB-ModifyList.h
index d1a809f..45c4ab9 100644
--- a/include/osmocom/ranap/RANAP_RAB-ModifyList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ModifyList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ModifyRequest.h b/include/osmocom/ranap/RANAP_RAB-ModifyRequest.h
index 91d46a2..2a358a6 100644
--- a/include/osmocom/ranap/RANAP_RAB-ModifyRequest.h
+++ b/include/osmocom/ranap/RANAP_RAB-ModifyRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h
index 151d0e4..e5dd173 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h b/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h
index 2f523bd..414c33a 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h
index 8ce2b6f..af13305 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h b/include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h
index 5cf089c..5557a45 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-Parameters.h b/include/osmocom/ranap/RANAP_RAB-Parameters.h
index 9ac9f02..7c37ad9 100644
--- a/include/osmocom/ranap/RANAP_RAB-Parameters.h
+++ b/include/osmocom/ranap/RANAP_RAB-Parameters.h
@@ -11,19 +11,19 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TrafficClass.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AsymmetryIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOrder.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxSDU-Size.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransferDelay.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrafficHandlingPriority.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_AllocationOrRetentionPriority.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceStatisticsDescriptor.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequirement.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TrafficClass.h>
+#include <osmocom/ranap/RANAP_RAB-AsymmetryIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_DeliveryOrder.h>
+#include <osmocom/ranap/RANAP_MaxSDU-Size.h>
+#include <osmocom/ranap/RANAP_SDU-Parameters.h>
+#include <osmocom/ranap/RANAP_TransferDelay.h>
+#include <osmocom/ranap/RANAP_TrafficHandlingPriority.h>
+#include <osmocom/ranap/RANAP_AllocationOrRetentionPriority.h>
+#include <osmocom/ranap/RANAP_SourceStatisticsDescriptor.h>
+#include <osmocom/ranap/RANAP_RelocationRequirement.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-QueuedItem.h b/include/osmocom/ranap/RANAP_RAB-QueuedItem.h
index bd0d3f7..c67d6c1 100644
--- a/include/osmocom/ranap/RANAP_RAB-QueuedItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-QueuedItem.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-QueuedList.h b/include/osmocom/ranap/RANAP_RAB-QueuedList.h
index 9c001c4..94439ef 100644
--- a/include/osmocom/ranap/RANAP_RAB-QueuedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-QueuedList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h b/include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h
index afd3937..808c42a 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleaseFailedList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedList.h>
+#include <osmocom/ranap/RANAP_RAB-FailedList.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleaseItem.h b/include/osmocom/ranap/RANAP_RAB-ReleaseItem.h
index d1547eb..28934cb 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleaseItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleaseItem.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleaseList.h b/include/osmocom/ranap/RANAP_RAB-ReleaseList.h
index 5c537f0..4ac68bd 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleaseList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleaseList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h b/include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h
index 8207ecb..0b09f38 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleaseRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h b/include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h
index 9147a22..1d73866 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleasedItem.h b/include/osmocom/ranap/RANAP_RAB-ReleasedItem.h
index 7a9748e..14bd8fa 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleasedItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleasedItem.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_DataVolumeList.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h b/include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h
index f7918ec..98bb6c7 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleasedList-IuRelComp.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-ReleasedList.h b/include/osmocom/ranap/RANAP_RAB-ReleasedList.h
index cd4e2d6..9f047c7 100644
--- a/include/osmocom/ranap/RANAP_RAB-ReleasedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-ReleasedList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h b/include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h
index fb696a4..ab8cf40 100644
--- a/include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-RelocationReleaseItem.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h b/include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h
index b6abfb9..f008a3b 100644
--- a/include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h
+++ b/include/osmocom/ranap/RANAP_RAB-RelocationReleaseList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h
index 08b5208..ed6cb11 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h
@@ -11,16 +11,16 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoReq.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Service-Handover.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportingIndication.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h>
+#include <osmocom/ranap/RANAP_Service-Handover.h>
+#include <osmocom/ranap/RANAP_Alt-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h
index 09c4f98..8de47bb 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h
index 798fa4e..16e4e94 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_Ass-RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h
index 768eb1f..b20556f 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h
@@ -11,13 +11,13 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h
index 7a4e9cb..fd2b921 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReq.h
@@ -11,16 +11,16 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SynchronisationIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Service-Handover.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportingIndication.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_Service-Handover.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h b/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h
index 0b7d275..c520c66 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupItem-RelocReqAck.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h
index 8b78502..074f88b 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h
index 72016e4..3c054bd 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h
index 12d3078..87dc504 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h
index ac7e4a5..cc32d0c 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h b/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h
index 7b50ccc..1004ed5 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReq.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h b/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h
index 54c3e81..8df1869 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupList-RelocReqAck.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h
index 4b8ee09..bebf2c7 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedItem.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_DataVolumeList.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h
index 299749e..81dd128 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifiedList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h
index 743cf72..d613698 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemFirst.h
@@ -11,13 +11,13 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SynchronisationIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Service-Handover.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_NAS-SynchronisationIndicator.h>
+#include <osmocom/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/ranap/RANAP_TransportLayerInformation.h>
+#include <osmocom/ranap/RANAP_Service-Handover.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h
index bd79baf..c2270d5 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyItemSecond.h
@@ -11,13 +11,13 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportingIndication.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_PDP-TypeInformation.h>
+#include <osmocom/ranap/RANAP_DataVolumeReportingIndication.h>
+#include <osmocom/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h
index 7efdada..58c1759 100644
--- a/include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h
+++ b/include/osmocom/ranap/RANAP_RAB-SetupOrModifyList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-IE-ContainerPairList.h>
+#include <osmocom/ranap/RANAP_RAB-IE-ContainerPairList.h>
#ifdef __cplusplus
extern "C" {
diff --git a/include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h b/include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h
index a39c3eb..7884317 100644
--- a/include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h b/include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h
index 46d994b..a9d4fd9 100644
--- a/include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h
+++ b/include/osmocom/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h b/include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h
index 4548dc7..3e69734 100644
--- a/include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h
+++ b/include/osmocom/ranap/RANAP_RAB-TrCH-Mapping.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-MappingItem.h>
+#include <osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h b/include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h
index 259967c..d84a86c 100644
--- a/include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h
+++ b/include/osmocom/ranap/RANAP_RAB-TrCH-MappingItem.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_TrCH-ID-List.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RABDataVolumeReport.h b/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
index afb09e8..ab671d5 100644
--- a/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
+++ b/include/osmocom/ranap/RANAP_RABDataVolumeReport.h
@@ -12,9 +12,9 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
+#include <osmocom/ranap/RANAP_DataVolumeReference.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RABParametersList.h b/include/osmocom/ranap/RANAP_RABParametersList.h
index 93fbbee..f3bec06 100644
--- a/include/osmocom/ranap/RANAP_RABParametersList.h
+++ b/include/osmocom/ranap/RANAP_RABParametersList.h
@@ -12,11 +12,11 @@
/* Including external dependencies */
#include <asn_SEQUENCE_OF.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RABDataVolumeReport.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UPInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/ranap/RANAP_RABDataVolumeReport.h>
+#include <osmocom/ranap/RANAP_UPInformation.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RABased.h b/include/osmocom/ranap/RANAP_RABased.h
index a23d29e..5ddfaa4 100644
--- a/include/osmocom/ranap/RANAP_RABased.h
+++ b/include/osmocom/ranap/RANAP_RABased.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI-List.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RAI-List.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h b/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h
index 2db97c2..09ba8b6 100644
--- a/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h
+++ b/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferItem.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h b/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h
index 9abd29a..6dae24e 100644
--- a/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h
+++ b/include/osmocom/ranap/RANAP_RABs-ContextFailedtoTransferList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h b/include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h
index 5069f62..c3032e5 100644
--- a/include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h
+++ b/include/osmocom/ranap/RANAP_RABs-failed-to-reportItem.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_RAB-ID.h>
+#include <osmocom/ranap/RANAP_Cause.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h b/include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h
index 32425fe..33e3943 100644
--- a/include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h
+++ b/include/osmocom/ranap/RANAP_RABs-failed-to-reportList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAI-List.h b/include/osmocom/ranap/RANAP_RAI-List.h
index 8f6933d..bc4f843 100644
--- a/include/osmocom/ranap/RANAP_RAI-List.h
+++ b/include/osmocom/ranap/RANAP_RAI-List.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAI.h>
+#include <osmocom/ranap/RANAP_RAI.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RAI.h b/include/osmocom/ranap/RANAP_RAI.h
index 1ef63ec..eb822d1 100644
--- a/include/osmocom/ranap/RANAP_RAI.h
+++ b/include/osmocom/ranap/RANAP_RAI.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h b/include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h
index 5291ac6..15dd881 100644
--- a/include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_RAListofIdleModeUEs.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h>
+#include <osmocom/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h>
#include <NativeEnumerated.h>
#include <constr_CHOICE.h>
diff --git a/include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h b/include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h
index 4db7c31..1b144f6 100644
--- a/include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h
+++ b/include/osmocom/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RAC.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h b/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h
index f1c69e7..8a75799 100644
--- a/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h
+++ b/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h b/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h
index 7fdf202..3175411 100644
--- a/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h
+++ b/include/osmocom/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RANAP-PDU.h b/include/osmocom/ranap/RANAP_RANAP-PDU.h
index e6771a6..b2039bd 100644
--- a/include/osmocom/ranap/RANAP_RANAP-PDU.h
+++ b/include/osmocom/ranap/RANAP_RANAP-PDU.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_InitiatingMessage.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfulOutcome.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Outcome.h>
+#include <osmocom/ranap/RANAP_InitiatingMessage.h>
+#include <osmocom/ranap/RANAP_SuccessfulOutcome.h>
+#include <osmocom/ranap/RANAP_UnsuccessfulOutcome.h>
+#include <osmocom/ranap/RANAP_Outcome.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h b/include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h
index e63ebb7..3d28873 100644
--- a/include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h
+++ b/include/osmocom/ranap/RANAP_RANAP-RelocationInformation.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RAofIdleModeUEs.h b/include/osmocom/ranap/RANAP_RAofIdleModeUEs.h
index de7ea46..66eb253 100644
--- a/include/osmocom/ranap/RANAP_RAofIdleModeUEs.h
+++ b/include/osmocom/ranap/RANAP_RAofIdleModeUEs.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RAC.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RIM-Transfer.h b/include/osmocom/ranap/RANAP_RIM-Transfer.h
index 81f08eb..12d9660 100644
--- a/include/osmocom/ranap/RANAP_RIM-Transfer.h
+++ b/include/osmocom/ranap/RANAP_RIM-Transfer.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RIMInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RIMRoutingAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RIMInformation.h>
+#include <osmocom/ranap/RANAP_RIMRoutingAddress.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RIMRoutingAddress.h b/include/osmocom/ranap/RANAP_RIMRoutingAddress.h
index 7a19744..841570d 100644
--- a/include/osmocom/ranap/RANAP_RIMRoutingAddress.h
+++ b/include/osmocom/ranap/RANAP_RIMRoutingAddress.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Cell-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetENB-ID.h>
+#include <osmocom/ranap/RANAP_TargetRNC-ID.h>
+#include <osmocom/ranap/RANAP_GERAN-Cell-ID.h>
+#include <osmocom/ranap/RANAP_TargetENB-ID.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RNCTraceInformation.h b/include/osmocom/ranap/RANAP_RNCTraceInformation.h
index 868b45c..0bfbaf5 100644
--- a/include/osmocom/ranap/RANAP_RNCTraceInformation.h
+++ b/include/osmocom/ranap/RANAP_RNCTraceInformation.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceReference.h>
+#include <osmocom/ranap/RANAP_TraceReference.h>
#include <NativeEnumerated.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EquipmentsToBeTraced.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_EquipmentsToBeTraced.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h b/include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h
index 90b3bc3..a5dfd26 100644
--- a/include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h
+++ b/include/osmocom/ranap/RANAP_RNSAPRelocationParameters.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RABParametersList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LocationReportingTransferInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceInformation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RABParametersList.h>
+#include <osmocom/ranap/RANAP_LocationReportingTransferInformation.h>
+#include <osmocom/ranap/RANAP_TraceInformation.h>
+#include <osmocom/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RSRVCC-Information.h b/include/osmocom/ranap/RANAP_RSRVCC-Information.h
index 223c08e..d4d8e79 100644
--- a/include/osmocom/ranap/RANAP_RSRVCC-Information.h
+++ b/include/osmocom/ranap/RANAP_RSRVCC-Information.h
@@ -13,7 +13,7 @@
/* Including external dependencies */
#include <BIT_STRING.h>
#include <OCTET_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RedirectionIndication.h b/include/osmocom/ranap/RANAP_RedirectionIndication.h
index 081cb42..444d707 100644
--- a/include/osmocom/ranap/RANAP_RedirectionIndication.h
+++ b/include/osmocom/ranap/RANAP_RedirectionIndication.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationCancel.h b/include/osmocom/ranap/RANAP_RelocationCancel.h
index 42790ef..bddd051 100644
--- a/include/osmocom/ranap/RANAP_RelocationCancel.h
+++ b/include/osmocom/ranap/RANAP_RelocationCancel.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h b/include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h
index dea7365..4bbceb9 100644
--- a/include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h
+++ b/include/osmocom/ranap/RANAP_RelocationCancelAcknowledge.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationCommand.h b/include/osmocom/ranap/RANAP_RelocationCommand.h
index 13376a1..d17d86b 100644
--- a/include/osmocom/ranap/RANAP_RelocationCommand.h
+++ b/include/osmocom/ranap/RANAP_RelocationCommand.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationComplete.h b/include/osmocom/ranap/RANAP_RelocationComplete.h
index 43a5e54..4e7b5d8 100644
--- a/include/osmocom/ranap/RANAP_RelocationComplete.h
+++ b/include/osmocom/ranap/RANAP_RelocationComplete.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationDetect.h b/include/osmocom/ranap/RANAP_RelocationDetect.h
index 59dc241..d06ba66 100644
--- a/include/osmocom/ranap/RANAP_RelocationDetect.h
+++ b/include/osmocom/ranap/RANAP_RelocationDetect.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationFailure.h b/include/osmocom/ranap/RANAP_RelocationFailure.h
index 148240c..76d3d57 100644
--- a/include/osmocom/ranap/RANAP_RelocationFailure.h
+++ b/include/osmocom/ranap/RANAP_RelocationFailure.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationPreparationFailure.h b/include/osmocom/ranap/RANAP_RelocationPreparationFailure.h
index f192c4b..8781bbe 100644
--- a/include/osmocom/ranap/RANAP_RelocationPreparationFailure.h
+++ b/include/osmocom/ranap/RANAP_RelocationPreparationFailure.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationRequest.h b/include/osmocom/ranap/RANAP_RelocationRequest.h
index b55d39f..06d4c07 100644
--- a/include/osmocom/ranap/RANAP_RelocationRequest.h
+++ b/include/osmocom/ranap/RANAP_RelocationRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h b/include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h
index 5662ebe..ba13e88 100644
--- a/include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h
+++ b/include/osmocom/ranap/RANAP_RelocationRequestAcknowledge.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RelocationRequired.h b/include/osmocom/ranap/RANAP_RelocationRequired.h
index 6d4c753..1187c90 100644
--- a/include/osmocom/ranap/RANAP_RelocationRequired.h
+++ b/include/osmocom/ranap/RANAP_RelocationRequired.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_RequestType.h b/include/osmocom/ranap/RANAP_RequestType.h
index bae93ec..86ed875 100644
--- a/include/osmocom/ranap/RANAP_RequestType.h
+++ b/include/osmocom/ranap/RANAP_RequestType.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Event.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ReportArea.h>
+#include <osmocom/ranap/RANAP_Event.h>
+#include <osmocom/ranap/RANAP_ReportArea.h>
#include <NativeInteger.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h
index cce5451..963d25a 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedGuaranteedBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h
index 3fcd5c7..c878ec9 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/ranap/RANAP_ExtendedMaxBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h
index b55ed42..d2d39ad 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/ranap/RANAP_GuaranteedBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h
index 9f4509f..22047b7 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/ranap/RANAP_MaxBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h
index 391fb7d..82352fd 100644
--- a/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h
+++ b/include/osmocom/ranap/RANAP_Requested-RAB-Parameter-Values.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h b/include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h
index a0716f1..9ba0d86 100644
--- a/include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h
+++ b/include/osmocom/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h>
+#include <osmocom/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h b/include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h
index c2e71d4..9d0923c 100644
--- a/include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h
+++ b/include/osmocom/ranap/RANAP_RequestedMulticastServiceList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
+#include <osmocom/ranap/RANAP_TMGI.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_Reset.h b/include/osmocom/ranap/RANAP_Reset.h
index d535c34..f02a5fb 100644
--- a/include/osmocom/ranap/RANAP_Reset.h
+++ b/include/osmocom/ranap/RANAP_Reset.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetAcknowledge.h b/include/osmocom/ranap/RANAP_ResetAcknowledge.h
index 46822a9..dc5c643 100644
--- a/include/osmocom/ranap/RANAP_ResetAcknowledge.h
+++ b/include/osmocom/ranap/RANAP_ResetAcknowledge.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetResource.h b/include/osmocom/ranap/RANAP_ResetResource.h
index 1612165..ba35fa6 100644
--- a/include/osmocom/ranap/RANAP_ResetResource.h
+++ b/include/osmocom/ranap/RANAP_ResetResource.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetResourceAckItem.h b/include/osmocom/ranap/RANAP_ResetResourceAckItem.h
index f032bb2..94ae632 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceAckItem.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceAckItem.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IuSignallingConnectionIdentifier.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ResetResourceAckList.h b/include/osmocom/ranap/RANAP_ResetResourceAckList.h
index cd8d425..9d699b5 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceAckList.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceAckList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h b/include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h
index eb96f34..f268623 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceAcknowledge.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResetResourceItem.h b/include/osmocom/ranap/RANAP_ResetResourceItem.h
index e7b7f86..9482a16 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceItem.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceItem.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IuSignallingConnectionIdentifier.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_IuSignallingConnectionIdentifier.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_ResetResourceList.h b/include/osmocom/ranap/RANAP_ResetResourceList.h
index 406e8b5..b840101 100644
--- a/include/osmocom/ranap/RANAP_ResetResourceList.h
+++ b/include/osmocom/ranap/RANAP_ResetResourceList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h b/include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h
index d8ee403..5acfc8c 100644
--- a/include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h
+++ b/include/osmocom/ranap/RANAP_ResidualBitErrorRatio.h
@@ -12,7 +12,7 @@
/* Including external dependencies */
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SAI.h b/include/osmocom/ranap/RANAP_SAI.h
index 49afa03..1a8d622 100644
--- a/include/osmocom/ranap/RANAP_SAI.h
+++ b/include/osmocom/ranap/RANAP_SAI.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_LAC.h>
+#include <osmocom/ranap/RANAP_SAC.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SDU-ErrorRatio.h b/include/osmocom/ranap/RANAP_SDU-ErrorRatio.h
index d3560f9..8835247 100644
--- a/include/osmocom/ranap/RANAP_SDU-ErrorRatio.h
+++ b/include/osmocom/ranap/RANAP_SDU-ErrorRatio.h
@@ -12,7 +12,7 @@
/* Including external dependencies */
#include <NativeInteger.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h b/include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h
index 9c5ac84..ed966d2 100644
--- a/include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h
+++ b/include/osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SubflowSDU-Size.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SubflowCombinationBitRate.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_SubflowSDU-Size.h>
+#include <osmocom/ranap/RANAP_RAB-SubflowCombinationBitRate.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h b/include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h
index 986b3d6..6eb520c 100644
--- a/include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h
+++ b/include/osmocom/ranap/RANAP_SDU-FormatInformationParameters.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameterItem.h>
+#include <osmocom/ranap/RANAP_SDU-FormatInformationParameterItem.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_SDU-ParameterItem.h b/include/osmocom/ranap/RANAP_SDU-ParameterItem.h
index c17d74f..dd700b8 100644
--- a/include/osmocom/ranap/RANAP_SDU-ParameterItem.h
+++ b/include/osmocom/ranap/RANAP_SDU-ParameterItem.h
@@ -11,11 +11,11 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ErrorRatio.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ResidualBitErrorRatio.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOfErroneousSDU.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_SDU-ErrorRatio.h>
+#include <osmocom/ranap/RANAP_ResidualBitErrorRatio.h>
+#include <osmocom/ranap/RANAP_DeliveryOfErroneousSDU.h>
+#include <osmocom/ranap/RANAP_SDU-FormatInformationParameters.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SDU-Parameters.h b/include/osmocom/ranap/RANAP_SDU-Parameters.h
index 456fe49..5fc7f8b 100644
--- a/include/osmocom/ranap/RANAP_SDU-Parameters.h
+++ b/include/osmocom/ranap/RANAP_SDU-Parameters.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ParameterItem.h>
+#include <osmocom/ranap/RANAP_SDU-ParameterItem.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_SNA-Access-Information.h b/include/osmocom/ranap/RANAP_SNA-Access-Information.h
index 96fd120..e98207a 100644
--- a/include/osmocom/ranap/RANAP_SNA-Access-Information.h
+++ b/include/osmocom/ranap/RANAP_SNA-Access-Information.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedPLMNs.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_AuthorisedPLMNs.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h b/include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h
index ed9f2ba..7cb3959 100644
--- a/include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h
+++ b/include/osmocom/ranap/RANAP_SRB-TrCH-Mapping.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-TrCH-MappingItem.h>
+#include <osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h b/include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h
index 2f182a6..36032e9 100644
--- a/include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h
+++ b/include/osmocom/ranap/RANAP_SRB-TrCH-MappingItem.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SRB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_SRB-ID.h>
+#include <osmocom/ranap/RANAP_TrCH-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SRNS-ContextRequest.h b/include/osmocom/ranap/RANAP_SRNS-ContextRequest.h
index ae89b1a..168b9b5 100644
--- a/include/osmocom/ranap/RANAP_SRNS-ContextRequest.h
+++ b/include/osmocom/ranap/RANAP_SRNS-ContextRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRNS-ContextResponse.h b/include/osmocom/ranap/RANAP_SRNS-ContextResponse.h
index 387ece5..57fa412 100644
--- a/include/osmocom/ranap/RANAP_SRNS-ContextResponse.h
+++ b/include/osmocom/ranap/RANAP_SRNS-ContextResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h b/include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h
index 9aaa8a8..ab554fd 100644
--- a/include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h
+++ b/include/osmocom/ranap/RANAP_SRNS-DataForwardCommand.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h b/include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h
index 41e2eca..d9c9093 100644
--- a/include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h
+++ b/include/osmocom/ranap/RANAP_SRVCC-CSKeysRequest.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h b/include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h
index 81e2cc4..b143eab 100644
--- a/include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h
+++ b/include/osmocom/ranap/RANAP_SRVCC-CSKeysResponse.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SRVCC-Information.h b/include/osmocom/ranap/RANAP_SRVCC-Information.h
index dcfa755..ef851b1 100644
--- a/include/osmocom/ranap/RANAP_SRVCC-Information.h
+++ b/include/osmocom/ranap/RANAP_SRVCC-Information.h
@@ -12,7 +12,7 @@
/* Including external dependencies */
#include <BIT_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SecurityModeCommand.h b/include/osmocom/ranap/RANAP_SecurityModeCommand.h
index 82384a1..482b6ea 100644
--- a/include/osmocom/ranap/RANAP_SecurityModeCommand.h
+++ b/include/osmocom/ranap/RANAP_SecurityModeCommand.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SecurityModeComplete.h b/include/osmocom/ranap/RANAP_SecurityModeComplete.h
index b14d22f..5a99eb0 100644
--- a/include/osmocom/ranap/RANAP_SecurityModeComplete.h
+++ b/include/osmocom/ranap/RANAP_SecurityModeComplete.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SecurityModeReject.h b/include/osmocom/ranap/RANAP_SecurityModeReject.h
index f4e87db..1aa69da 100644
--- a/include/osmocom/ranap/RANAP_SecurityModeReject.h
+++ b/include/osmocom/ranap/RANAP_SecurityModeReject.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/ranap/RANAP_IE.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_Shared-Network-Information.h b/include/osmocom/ranap/RANAP_Shared-Network-Information.h
index 1bfa3c1..74afbd1 100644
--- a/include/osmocom/ranap/RANAP_Shared-Network-Information.h
+++ b/include/osmocom/ranap/RANAP_Shared-Network-Information.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNs-in-shared-network.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNs-in-shared-network.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceCellID.h b/include/osmocom/ranap/RANAP_SourceCellID.h
index a21e3c2..2c4e679 100644
--- a/include/osmocom/ranap/RANAP_SourceCellID.h
+++ b/include/osmocom/ranap/RANAP_SourceCellID.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceUTRANCellID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CGI.h>
+#include <osmocom/ranap/RANAP_SourceUTRANCellID.h>
+#include <osmocom/ranap/RANAP_CGI.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceID.h b/include/osmocom/ranap/RANAP_SourceID.h
index d028439..ef4acc0 100644
--- a/include/osmocom/ranap/RANAP_SourceID.h
+++ b/include/osmocom/ranap/RANAP_SourceID.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SourceRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
+#include <osmocom/ranap/RANAP_SourceRNC-ID.h>
+#include <osmocom/ranap/RANAP_SAI.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceRNC-ID.h b/include/osmocom/ranap/RANAP_SourceRNC-ID.h
index ad24ffd..17ed1c1 100644
--- a/include/osmocom/ranap/RANAP_SourceRNC-ID.h
+++ b/include/osmocom/ranap/RANAP_SourceRNC-ID.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_RNC-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h b/include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h
index 0c34fe7..8065a9a 100644
--- a/include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h
+++ b/include/osmocom/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h
@@ -11,17 +11,17 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RRC-Container.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_NumberOfIuInstances.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RelocationType.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ChosenEncryptionAlgorithm.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionKey.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_D-RNTI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetCellId.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-Mapping.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RRC-Container.h>
+#include <osmocom/ranap/RANAP_NumberOfIuInstances.h>
+#include <osmocom/ranap/RANAP_RelocationType.h>
+#include <osmocom/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h>
+#include <osmocom/ranap/RANAP_IntegrityProtectionKey.h>
+#include <osmocom/ranap/RANAP_ChosenEncryptionAlgorithm.h>
+#include <osmocom/ranap/RANAP_EncryptionKey.h>
+#include <osmocom/ranap/RANAP_D-RNTI.h>
+#include <osmocom/ranap/RANAP_TargetCellId.h>
+#include <osmocom/ranap/RANAP_RAB-TrCH-Mapping.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SourceUTRANCellID.h b/include/osmocom/ranap/RANAP_SourceUTRANCellID.h
index 57bc739..551a7f6 100644
--- a/include/osmocom/ranap/RANAP_SourceUTRANCellID.h
+++ b/include/osmocom/ranap/RANAP_SourceUTRANCellID.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetCellId.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_TargetCellId.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_SuccessfulOutcome.h b/include/osmocom/ranap/RANAP_SuccessfulOutcome.h
index e7243c2..bd0364c 100644
--- a/include/osmocom/ranap/RANAP_SuccessfulOutcome.h
+++ b/include/osmocom/ranap/RANAP_SuccessfulOutcome.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/ranap/RANAP_Criticality.h>
#include <ANY.h>
#include <constr_SEQUENCE.h>
diff --git a/include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h b/include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h
index 609cd41..3677899 100644
--- a/include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h
+++ b/include/osmocom/ranap/RANAP_SupportedRAB-ParameterBitrateList.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_SupportedBitrate.h>
+#include <osmocom/ranap/RANAP_SupportedBitrate.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_TAI.h b/include/osmocom/ranap/RANAP_TAI.h
index 2aab416..8fbcb30 100644
--- a/include/osmocom/ranap/RANAP_TAI.h
+++ b/include/osmocom/ranap/RANAP_TAI.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_TAC.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TMGI.h b/include/osmocom/ranap/RANAP_TMGI.h
index 310b162..9697529 100644
--- a/include/osmocom/ranap/RANAP_TMGI.h
+++ b/include/osmocom/ranap/RANAP_TMGI.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
#include <OCTET_STRING.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h b/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h
index cd5fedf..4f2e2e1 100644
--- a/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h
+++ b/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoReq.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h b/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h
index c01c804..6b8efbb 100644
--- a/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h
+++ b/include/osmocom/ranap/RANAP_TNLInformationEnhRelInfoRes.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TargetENB-ID.h b/include/osmocom/ranap/RANAP_TargetENB-ID.h
index d7f6d5c..0566213 100644
--- a/include/osmocom/ranap/RANAP_TargetENB-ID.h
+++ b/include/osmocom/ranap/RANAP_TargetENB-ID.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ENB-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TAI.h>
+#include <osmocom/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/ranap/RANAP_ENB-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TAI.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TargetID.h b/include/osmocom/ranap/RANAP_TargetID.h
index c6b6ff6..fa8a82f 100644
--- a/include/osmocom/ranap/RANAP_TargetID.h
+++ b/include/osmocom/ranap/RANAP_TargetID.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_CGI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TargetENB-ID.h>
+#include <osmocom/ranap/RANAP_TargetRNC-ID.h>
+#include <osmocom/ranap/RANAP_CGI.h>
+#include <osmocom/ranap/RANAP_TargetENB-ID.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TargetRNC-ID.h b/include/osmocom/ranap/RANAP_TargetRNC-ID.h
index 1482c30..0d6dc98 100644
--- a/include/osmocom/ranap/RANAP_TargetRNC-ID.h
+++ b/include/osmocom/ranap/RANAP_TargetRNC-ID.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_RNC-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_LAI.h>
+#include <osmocom/ranap/RANAP_RAC.h>
+#include <osmocom/ranap/RANAP_RNC-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h b/include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h
index 78ee67c..eb1d973 100644
--- a/include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h
+++ b/include/osmocom/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_RRC-Container.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_D-RNTI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_RRC-Container.h>
+#include <osmocom/ranap/RANAP_D-RNTI.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TemporaryUE-ID.h b/include/osmocom/ranap/RANAP_TemporaryUE-ID.h
index f440ed2..3d27c00 100644
--- a/include/osmocom/ranap/RANAP_TemporaryUE-ID.h
+++ b/include/osmocom/ranap/RANAP_TemporaryUE-ID.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TMSI.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_P-TMSI.h>
+#include <osmocom/ranap/RANAP_TMSI.h>
+#include <osmocom/ranap/RANAP_P-TMSI.h>
#include <constr_CHOICE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TrCH-ID-List.h b/include/osmocom/ranap/RANAP_TrCH-ID-List.h
index fe0a8d9..77ca281 100644
--- a/include/osmocom/ranap/RANAP_TrCH-ID-List.h
+++ b/include/osmocom/ranap/RANAP_TrCH-ID-List.h
@@ -11,7 +11,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID.h>
+#include <osmocom/ranap/RANAP_TrCH-ID.h>
#include <asn_SEQUENCE_OF.h>
#include <constr_SEQUENCE_OF.h>
diff --git a/include/osmocom/ranap/RANAP_TrCH-ID.h b/include/osmocom/ranap/RANAP_TrCH-ID.h
index 3d7724d..2ab369b 100644
--- a/include/osmocom/ranap/RANAP_TrCH-ID.h
+++ b/include/osmocom/ranap/RANAP_TrCH-ID.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_DCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_DSCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_USCH-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_DCH-ID.h>
+#include <osmocom/ranap/RANAP_DSCH-ID.h>
+#include <osmocom/ranap/RANAP_USCH-ID.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TraceInformation.h b/include/osmocom/ranap/RANAP_TraceInformation.h
index 79ff8ea..6281c4e 100644
--- a/include/osmocom/ranap/RANAP_TraceInformation.h
+++ b/include/osmocom/ranap/RANAP_TraceInformation.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-ID.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TracePropagationParameters.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TraceReference.h>
+#include <osmocom/ranap/RANAP_UE-ID.h>
+#include <osmocom/ranap/RANAP_TracePropagationParameters.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TracePropagationParameters.h b/include/osmocom/ranap/RANAP_TracePropagationParameters.h
index 41789a8..271a352 100644
--- a/include/osmocom/ranap/RANAP_TracePropagationParameters.h
+++ b/include/osmocom/ranap/RANAP_TracePropagationParameters.h
@@ -11,10 +11,10 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceDepth.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ListOfInterfacesToTrace.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TraceRecordingSessionReference.h>
+#include <osmocom/ranap/RANAP_TraceDepth.h>
+#include <osmocom/ranap/RANAP_ListOfInterfacesToTrace.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h b/include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h
index d006be2..aac7b89 100644
--- a/include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h
+++ b/include/osmocom/ranap/RANAP_TraceRecordingSessionInformation.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionReference.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TraceReference.h>
+#include <osmocom/ranap/RANAP_TraceRecordingSessionReference.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TransportLayerInformation.h b/include/osmocom/ranap/RANAP_TransportLayerInformation.h
index 27560c0..dd443c4 100644
--- a/include/osmocom/ranap/RANAP_TransportLayerInformation.h
+++ b/include/osmocom/ranap/RANAP_TransportLayerInformation.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/ranap/RANAP_ProtocolExtensionContainer.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_TunnelInformation.h b/include/osmocom/ranap/RANAP_TunnelInformation.h
index 35dead3..679b41a 100644
--- a/include/osmocom/ranap/RANAP_TunnelInformation.h
+++ b/include/osmocom/ranap/RANAP_TunnelInformation.h
@@ -11,9 +11,9 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_Port-Number.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/ranap/RANAP_Port-Number.h>
+#include <osmocom/ranap/RANAP_IE-Extensions.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h b/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h
index 39b7510..2029073 100644
--- a/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h
+++ b/include/osmocom/ranap/RANAP_UE-AggregateMaximumBitRate.h
@@ -11,8 +11,8 @@
#include <asn_application.h>
/* Including external dependencies */
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h>
-#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h>
+#include <osmocom/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h>
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
diff --git a/include/osmocom/ranap/RANAP_UE-ID.h b/include/osmocom/ranap/RANAP_UE-ID.h
index d0e957f..0bc2fc7 100644
--- a/