diff --git a/Makefile.am b/Makefile.am
index 8cb3142..c2167d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign dist-bzip2
 
-SUBDIRS = src
+SUBDIRS = src include
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libosmo-ranap.pc
diff --git a/configure.ac b/configure.ac
index 8341d5d..0fafb7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,4 +35,11 @@
 	src/ranap/Makefile
 	src/rua/Makefile
 	src/tests/Makefile
-	Makefile)
+	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
+	)
diff --git a/include/Makefile.am b/include/Makefile.am
new file mode 100644
index 0000000..3e32d0f
--- /dev/null
+++ b/include/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = osmocom
+
diff --git a/include/osmocom/Makefile.am b/include/osmocom/Makefile.am
new file mode 100644
index 0000000..97d088d
--- /dev/null
+++ b/include/osmocom/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = osmo-iuh
+
diff --git a/include/osmocom/osmo-iuh/Makefile.am b/include/osmocom/osmo-iuh/Makefile.am
new file mode 100644
index 0000000..f89b5dc
--- /dev/null
+++ b/include/osmocom/osmo-iuh/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = hnbap ranap rua
+
diff --git a/include/osmocom/osmo-iuh/hnbap/Makefile.am b/include/osmocom/osmo-iuh/hnbap/Makefile.am
new file mode 100644
index 0000000..b00ce95
--- /dev/null
+++ b/include/osmocom/osmo-iuh/hnbap/Makefile.am
@@ -0,0 +1,118 @@
+hnbap_HEADERS = \
+	AccessResult.h \
+	Access-stratum-release-indicator.h \
+	AdditionalNeighbourInfoList.h \
+	AltitudeAndDirection.h \
+	BackoffTimer.h \
+	BindingID.h \
+	Cause.h \
+	CauseMisc.h \
+	CauseProtocol.h \
+	CauseRadioNetwork.h \
+	CauseTransport.h \
+	CELL-FACHMobilitySupport.h \
+	CellIdentity.h \
+	CGI.h \
+	CI.h \
+	CN-DomainIndicator.h \
+	ConfigurationInformation.h \
+	Context-ID.h \
+	CriticalityDiagnostics.h \
+	CriticalityDiagnostics-IE-List.h \
+	Criticality.h \
+	CSG-Capability.h \
+	CSG-ID.h \
+	CSGMembershipStatus.h \
+	CSGMembershipUpdate.h \
+	ErrorIndication.h \
+	ESN.h \
+	GeographicalCoordinates.h \
+	GeographicalLocation.h \
+	GTP-TEI.h \
+	HNBAP-PDU.h \
+	HNBCapacity.h \
+	HNB-Cell-Access-Mode.h \
+	HNB-Cell-Identifier.h \
+	HNBConfigInfo.h \
+	HNBConfigTransferRequest.h \
+	HNBConfigTransferResponse.h \
+	HNBConfigurationInformationMissing.h \
+	HNBConfigurationInformationProvided.h \
+	HNBDe-Register.h \
+	HNB-GWResponse.h \
+	HNB-Identity.h \
+	HNB-Identity-Info.h \
+	HNB-Location-Information.h \
+	HNBRegisterAccept.h \
+	HNBRegisterReject.h \
+	HNBRegisterRequest.h \
+	HNB-RNL-Identity.h \
+	IE-Extensions.h \
+	IE.h \
+	IMEI.h \
+	IMSIDS41.h \
+	IMSIESN.h \
+	IMSI.h \
+	InitiatingMessage.h \
+	IP-Address.h \
+	Ipv4Address.h \
+	Ipv6Address.h \
+	Iurh-Signalling-TNL-AddressList.h \
+	LAC.h \
+	LAI.h \
+	MacroCellID.h \
+	MacroCoverageInformation.h \
+	MuxPortNumber.h \
+	NeighbourCellIdentityList.h \
+	NeighbourIdentity.h \
+	NeighbourInfoList.h \
+	NeighbourInfoRequestItem.h \
+	NeighbourInfoRequestList.h \
+	PLMNidentity.h \
+	Presence.h \
+	PrivateIE-ID.h \
+	PrivateMessage.h \
+	ProcedureCode.h \
+	ProtocolIE-ID.h \
+	PSC.h \
+	PTMSI.h \
+	PTMSIRAI.h \
+	RAB-ID.h \
+	RABList.h \
+	RABListItem.h \
+	RAC.h \
+	RAI.h \
+	Registration-Cause.h \
+	RelocationComplete.h \
+	RNC-ID.h \
+	SAC.h \
+	S-RNTIPrefix.h \
+	SuccessfulOutcome.h \
+	TMSIDS41.h \
+	TMSILAI.h \
+	TNLUpdateFailure.h \
+	TNLUpdateRequest.h \
+	TNLUpdateResponse.h \
+	TransportInfo.h \
+	TransportLayerAddress.h \
+	TriggeringMessage.h \
+	Tunnel-Information.h \
+	TypeOfError.h \
+	UDP-Port-Number.h \
+	UE-Capabilities.h \
+	UEDe-Register.h \
+	UE-Identity.h \
+	UERegisterAccept.h \
+	UERegisterReject.h \
+	UERegisterRequest.h \
+	UnknownU-RNTIIndication.h \
+	UnsuccessfulOutcome.h \
+	Update-cause.h \
+	URAIdentity.h \
+	URAIdentityList.h \
+	U-RNTI.h \
+	U-RNTIQueryRequest.h \
+	U-RNTIQueryResponse.h \
+	UTRANCellID.h
+
+hnbapdir = $(includedir)/osmocom/osmo-iuh/hnbap
diff --git a/include/osmocom/osmo-iuh/ranap/Makefile.am b/include/osmocom/osmo-iuh/ranap/Makefile.am
new file mode 100644
index 0000000..7308611
--- /dev/null
+++ b/include/osmocom/osmo-iuh/ranap/Makefile.am
@@ -0,0 +1,582 @@
+ranap_HEADERS = \
+	RANAP_AccuracyFulfilmentIndicator.h \
+	RANAP_AllocationOrRetentionPriority.h \
+	RANAP_AlternativeRABConfigurationRequest.h \
+	RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h \
+	RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h \
+	RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h \
+	RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h \
+	RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h \
+	RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h \
+	RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h \
+	RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h \
+	RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h \
+	RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h \
+	RANAP_Alt-RAB-Parameter-MaxBitrateInf.h \
+	RANAP_Alt-RAB-Parameter-MaxBitrateList.h \
+	RANAP_Alt-RAB-Parameter-MaxBitrates.h \
+	RANAP_Alt-RAB-Parameter-MaxBitrateType.h \
+	RANAP_Alt-RAB-Parameters.h \
+	RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h \
+	RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h \
+	RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h \
+	RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h \
+	RANAP_APN.h \
+	RANAP_AreaIdentity.h \
+	RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h \
+	RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h \
+	RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h \
+	RANAP_Ass-RAB-Parameter-MaxBitrateList.h \
+	RANAP_Ass-RAB-Parameters.h \
+	RANAP_AuthorisedPLMNs.h \
+	RANAP_AuthorisedSNAs.h \
+	RANAP_BindingID.h \
+	RANAP_BroadcastAssistanceDataDecipheringKeys.h \
+	RANAP_Cause.h \
+	RANAP_CauseMisc.h \
+	RANAP_CauseNAS.h \
+	RANAP_CauseNon-Standard.h \
+	RANAP_CauseProtocol.h \
+	RANAP_CauseRadioNetworkExtension.h \
+	RANAP_CauseRadioNetwork.h \
+	RANAP_CauseTransmissionNetwork.h \
+	RANAP_Cell-Access-Mode.h \
+	RANAP_CellBased.h \
+	RANAP_Cell-Capacity-Class-Value.h \
+	RANAP_Cell-Id.h \
+	RANAP_CellIdList.h \
+	RANAP_CellLoadInformationGroup.h \
+	RANAP_CellLoadInformation.h \
+	RANAP_CellType.h \
+	RANAP_CGI.h \
+	RANAP_ChosenEncryptionAlgorithm.h \
+	RANAP_ChosenIntegrityProtectionAlgorithm.h \
+	RANAP_CI.h \
+	RANAP_ClassmarkInformation2.h \
+	RANAP_ClassmarkInformation3.h \
+	RANAP_ClientType.h \
+	RANAP_CN-DeactivateTrace.h \
+	RANAP_CN-DomainIndicator.h \
+	RANAP_CN-ID.h \
+	RANAP_CN-InvokeTrace.h \
+	RANAP_CNMBMSLinkingInformation.h \
+	RANAP_CommonID.h \
+	RANAP_Correlation-ID.h \
+	RANAP_CriticalityDiagnostics.h \
+	RANAP_CriticalityDiagnostics-IE-List.h \
+	RANAP_Criticality.h \
+	RANAP_CSFB-Information.h \
+	RANAP_CSG-Id.h \
+	RANAP_CSG-Id-List.h \
+	RANAP_CSG-Membership-Status.h \
+	RANAP_DataPDUType.h \
+	RANAP_DataVolumeList.h \
+	RANAP_DataVolumeReference.h \
+	RANAP_DataVolumeReport.h \
+	RANAP_DataVolumeReportingIndication.h \
+	RANAP_DataVolumeReportList.h \
+	RANAP_DataVolumeReportRequest.h \
+	RANAP_DCH-ID.h \
+	RANAP_DeliveryOfErroneousSDU.h \
+	RANAP_DeliveryOrder.h \
+	RANAP_DeltaRAListofIdleModeUEs.h \
+	RANAP_DirectInformationTransfer.h \
+	RANAP_DirectReportingIndicator.h \
+	RANAP_DirectTransfer.h \
+	RANAP_DirectTransfer-IE-ContainerList.h \
+	RANAP_DirectTransferInformationItem-RANAP-RelocInf.h \
+	RANAP_DL-GTP-PDU-SequenceNumber.h \
+	RANAP_DL-N-PDU-SequenceNumber.h \
+	RANAP_D-RNTI.h \
+	RANAP_DRX-CycleLengthCoefficient.h \
+	RANAP_DSCH-ID.h \
+	RANAP_EARFCN-Extended.h \
+	RANAP_E-DCH-MAC-d-Flow-ID.h \
+	RANAP_ENB-ID.h \
+	RANAP_EncryptionAlgorithm.h \
+	RANAP_EncryptionInformation.h \
+	RANAP_EncryptionKey.h \
+	RANAP_End-Of-CSFB.h \
+	RANAP_EnhancedRelocationCompleteConfirm.h \
+	RANAP_EnhancedRelocationCompleteFailure.h \
+	RANAP_EnhancedRelocationCompleteRequest.h \
+	RANAP_EnhancedRelocationCompleteResponse.h \
+	RANAP_EquipmentsToBeTraced.h \
+	RANAP_ErrorIndication.h \
+	RANAP_EUTRANFrequencies.h \
+	RANAP_E-UTRAN-Service-Handover.h \
+	RANAP_Event1F-Parameters.h \
+	RANAP_Event1I-Parameters.h \
+	RANAP_Event.h \
+	RANAP_ExtendedGuaranteedBitrate.h \
+	RANAP_ExtendedMaxBitrate.h \
+	RANAP_ExtendedRNC-ID.h \
+	RANAP_ForwardingIndication.h \
+	RANAP_ForwardSRNS-Context.h \
+	RANAP_FrameSequenceNumber.h \
+	RANAP_FrequenceLayerConvergenceFlag.h \
+	RANAP_GA-AltitudeAndDirection.h \
+	RANAP_GA-EllipsoidArc.h \
+	RANAP_GANSS-PositioningDataSet.h \
+	RANAP_GANSS-PositioningMethodAndUsage.h \
+	RANAP_GA-Point.h \
+	RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h \
+	RANAP_GA-PointWithAltitude.h \
+	RANAP_GA-PointWithUnCertaintyEllipse.h \
+	RANAP_GA-PointWithUnCertainty.h \
+	RANAP_GA-Polygon.h \
+	RANAP_GA-UncertaintyEllipse.h \
+	RANAP_GeographicalArea.h \
+	RANAP_GeographicalCoordinates.h \
+	RANAP_GERAN-BSC-Container.h \
+	RANAP_GERAN-Cell-ID.h \
+	RANAP_GERAN-Classmark.h \
+	RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h \
+	RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h \
+	RANAP_GlobalCN-ID.h \
+	RANAP_GlobalRNC-ID.h \
+	RANAP_GTP-TEI.h \
+	RANAP_GuaranteedBitrate.h \
+	RANAP_HigherBitratesThan16MbpsFlag.h \
+	RANAP_HorizontalSpeedAndBearing.h \
+	RANAP_HorizontalVelocity.h \
+	RANAP_HorizontalVelocityWithUncertainty.h \
+	RANAP_HorizontalWithVerticalVelocityAndUncertainty.h \
+	RANAP_HorizontalWithVerticalVelocity.h \
+	RANAP_HS-DSCH-MAC-d-Flow-ID.h \
+	RANAP_IE-Extensions.h \
+	RANAP_IE.h \
+	RANAP_IMEIGroup.h \
+	RANAP_IMEI.h \
+	RANAP_IMEIList.h \
+	RANAP_IMEISVGroup.h \
+	RANAP_IMEISV.h \
+	RANAP_IMEISVList.h \
+	RANAP_ImmediateMDT.h \
+	RANAP_IMSI.h \
+	RANAP_IncludeVelocity.h \
+	RANAP_InformationExchangeID.h \
+	RANAP_InformationExchangeType.h \
+	RANAP_InformationRequested.h \
+	RANAP_InformationRequestType.h \
+	RANAP_InformationTransferConfirmation.h \
+	RANAP_InformationTransferFailure.h \
+	RANAP_InformationTransferID.h \
+	RANAP_InformationTransferIndication.h \
+	RANAP_InformationTransferType.h \
+	RANAP_InitialUE-Message.h \
+	RANAP_InitiatingMessage.h \
+	RANAP_IntegrityProtectionAlgorithm.h \
+	RANAP_IntegrityProtectionInformation.h \
+	RANAP_IntegrityProtectionKey.h \
+	RANAP_InterfacesToTraceItem.h \
+	RANAP_InterSystemInformationTransferType.h \
+	RANAP_InterSystemInformation-TransparentContainer.h \
+	RANAP_IPMulticastAddress.h \
+	RANAP_IRAT-Measurement-Configuration.h \
+	RANAP_IRATmeasurementParameters.h \
+	RANAP_Iu-ReleaseCommand.h \
+	RANAP_Iu-ReleaseComplete.h \
+	RANAP_Iu-ReleaseRequest.h \
+	RANAP_IuSigConId-IE-ContainerList.h \
+	RANAP_IuSignallingConnectionIdentifier.h \
+	RANAP_IuTransportAssociation.h \
+	RANAP_JoinedMBMSBearerService-IEs.h \
+	RANAP_KeyStatus.h \
+	RANAP_L3-Information.h \
+	RANAP_LABased.h \
+	RANAP_LAC.h \
+	RANAP_LAI.h \
+	RANAP_LAI-List.h \
+	RANAP_LA-LIST.h \
+	RANAP_LAListofIdleModeUEs.h \
+	RANAP_LastKnownServiceArea.h \
+	RANAP_LastVisitedUTRANCell-Item.h \
+	RANAP_LeftMBMSBearerService-IEs.h \
+	RANAP_LHN-ID.h \
+	RANAP_Links-to-log.h \
+	RANAP_ListOfInterfacesToTrace.h \
+	RANAP_ListOF-SNAs.h \
+	RANAP_LoadValue.h \
+	RANAP_LocationRelatedDataFailure.h \
+	RANAP_LocationRelatedDataRequest.h \
+	RANAP_LocationRelatedDataRequestType.h \
+	RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h \
+	RANAP_LocationRelatedDataResponse.h \
+	RANAP_LocationReport.h \
+	RANAP_LocationReportingControl.h \
+	RANAP_LocationReportingTransferInformation.h \
+	RANAP_LoggedMDT.h \
+	RANAP_LoggingDuration.h \
+	RANAP_LoggingInterval.h \
+	RANAP_M1Report.h \
+	RANAP_M2Report.h \
+	RANAP_M4-Collection-Parameters.h \
+	RANAP_M4-Period.h \
+	RANAP_M4Report.h \
+	RANAP_M4-Threshold.h \
+	RANAP_M5-Period.h \
+	RANAP_M5Report.h \
+	RANAP_M6-Period.h \
+	RANAP_M6Report.h \
+	RANAP_M7-Period.h \
+	RANAP_M7Report.h \
+	RANAP_Management-Based-MDT-Allowed.h \
+	RANAP_MaxBitrate.h \
+	RANAP_MaxSDU-Size.h \
+	RANAP_MBMSBearerServiceType.h \
+	RANAP_MBMSCNDe-Registration.h \
+	RANAP_MBMSCNDe-RegistrationRequest.h \
+	RANAP_MBMSCNDe-RegistrationResponse.h \
+	RANAP_MBMSCountingInformation.h \
+	RANAP_MBMSHCIndicator.h \
+	RANAP_MBMSIPMulticastAddressandAPNlist.h \
+	RANAP_MBMSIPMulticastAddressandAPNRequest.h \
+	RANAP_MBMSLinkingInformation.h \
+	RANAP_MBMS-PTP-RAB-ID.h \
+	RANAP_MBMSRABEstablishmentIndication.h \
+	RANAP_MBMSRABReleaseFailure.h \
+	RANAP_MBMSRABRelease.h \
+	RANAP_MBMSRABReleaseRequest.h \
+	RANAP_MBMSRegistrationFailure.h \
+	RANAP_MBMSRegistrationRequest.h \
+	RANAP_MBMSRegistrationRequestType.h \
+	RANAP_MBMSRegistrationResponse.h \
+	RANAP_MBMSServiceArea.h \
+	RANAP_MBMSSessionDuration.h \
+	RANAP_MBMSSessionIdentity.h \
+	RANAP_MBMSSessionRepetitionNumber.h \
+	RANAP_MBMSSessionStartFailure.h \
+	RANAP_MBMSSessionStart.h \
+	RANAP_MBMSSessionStartResponse.h \
+	RANAP_MBMSSessionStop.h \
+	RANAP_MBMSSessionStopResponse.h \
+	RANAP_MBMSSessionUpdateFailure.h \
+	RANAP_MBMSSessionUpdate.h \
+	RANAP_MBMSSessionUpdateResponse.h \
+	RANAP_MBMSSynchronisationInformation.h \
+	RANAP_MBMSUELinkingRequest.h \
+	RANAP_MBMSUELinkingResponse.h \
+	RANAP_MDT-Activation.h \
+	RANAP_MDTAreaScope.h \
+	RANAP_MDT-Configuration.h \
+	RANAP_MDTMode.h \
+	RANAP_MDT-PLMN-List.h \
+	RANAP_MDT-Report-Parameters.h \
+	RANAP_MeasBand.h \
+	RANAP_MeasurementQuantity.h \
+	RANAP_MeasurementsToActivate.h \
+	RANAP_MessageStructure.h \
+	RANAP_MSISDN.h \
+	RANAP_NAS-PDU.h \
+	RANAP_NAS-SequenceNumber.h \
+	RANAP_NAS-SynchronisationIndicator.h \
+	RANAP_NewBSS-To-OldBSS-Information.h \
+	RANAP_NewRAListofIdleModeUEs.h \
+	RANAP_NonSearchingIndication.h \
+	RANAP_NotEmptyRAListofIdleModeUEs.h \
+	RANAP_NRTLoadInformationValue.h \
+	RANAP_NumberOfIuInstances.h \
+	RANAP_NumberOfSteps.h \
+	RANAP_Offload-RAB-Parameters-APN.h \
+	RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h \
+	RANAP_Offload-RAB-Parameters.h \
+	RANAP_OldBSS-ToNewBSS-Information.h \
+	RANAP_OMC-ID.h \
+	RANAP_Outcome.h \
+	RANAP_Out-Of-UTRAN.h \
+	RANAP_Overload.h \
+	RANAP_PagingAreaID.h \
+	RANAP_PagingCause.h \
+	RANAP_Paging.h \
+	RANAP_PDP-Type-extension.h \
+	RANAP_PDP-Type.h \
+	RANAP_PDP-TypeInformation-extension.h \
+	RANAP_PDP-TypeInformation.h \
+	RANAP_PDUType14FrameSequenceNumber.h \
+	RANAP_PeriodicLocationInfo.h \
+	RANAP_PeriodicReportingIndicator.h \
+	RANAP_PermanentNAS-UE-ID.h \
+	RANAP_PermittedEncryptionAlgorithms.h \
+	RANAP_PermittedIntegrityProtectionAlgorithms.h \
+	RANAP_PLMNidentity.h \
+	RANAP_PLMNs-in-shared-network.h \
+	RANAP_Port-Number.h \
+	RANAP_PositionData.h \
+	RANAP_PositionDataSpecificToGERANIuMode.h \
+	RANAP_PositioningDataDiscriminator.h \
+	RANAP_PositioningDataSet.h \
+	RANAP_PositioningMethodAndUsage.h \
+	RANAP_PositioningPriority.h \
+	RANAP_Pre-emptionCapability.h \
+	RANAP_Pre-emptionVulnerability.h \
+	RANAP_Presence.h \
+	RANAP_Priority-Class-Indicator.h \
+	RANAP_PriorityLevel.h \
+	RANAP_PrivateIE-ID.h \
+	RANAP_PrivateMessage.h \
+	RANAP_ProcedureCode.h \
+	RANAP_ProtocolError-IE-ContainerList.h \
+	RANAP_ProtocolExtensionContainer.h \
+	RANAP_ProtocolExtensionField.h \
+	RANAP_ProtocolExtensionID.h \
+	RANAP_ProtocolIE-Container.h \
+	RANAP_ProtocolIE-ContainerPair.h \
+	RANAP_ProtocolIE-FieldPair.h \
+	RANAP_ProtocolIE-ID.h \
+	RANAP_ProvidedData.h \
+	RANAP_P-TMSI.h \
+	RANAP_QueuingAllowed.h \
+	RANAP_RABased.h \
+	RANAP_RAB-AssignmentRequest.h \
+	RANAP_RAB-AssignmentResponse.h \
+	RANAP_RAB-AsymmetryIndicator.h \
+	RANAP_RAB-ContextItem.h \
+	RANAP_RAB-ContextItem-RANAP-RelocInf.h \
+	RANAP_RAB-ContextList.h \
+	RANAP_RAB-ContextList-RANAP-RelocInf.h \
+	RANAP_RAB-DataForwardingItem.h \
+	RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h \
+	RANAP_RAB-DataForwardingList.h \
+	RANAP_RAB-DataForwardingList-SRNS-CtxReq.h \
+	RANAP_RABDataVolumeReport.h \
+	RANAP_RAB-DataVolumeReportItem.h \
+	RANAP_RAB-DataVolumeReportList.h \
+	RANAP_RAB-DataVolumeReportRequestItem.h \
+	RANAP_RAB-DataVolumeReportRequestList.h \
+	RANAP_RAB-FailedItem-EnhRelocInfoRes.h \
+	RANAP_RAB-FailedItem.h \
+	RANAP_RAB-FailedList-EnhRelocInfoRes.h \
+	RANAP_RAB-FailedList.h \
+	RANAP_RAB-ID.h \
+	RANAP_RAB-IE-ContainerList.h \
+	RANAP_RAB-IE-ContainerPairList.h \
+	RANAP_RAB-ModifyItem.h \
+	RANAP_RAB-ModifyList.h \
+	RANAP_RAB-ModifyRequest.h \
+	RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h \
+	RANAP_RAB-Parameter-ExtendedMaxBitrateList.h \
+	RANAP_RAB-Parameter-GuaranteedBitrateList.h \
+	RANAP_RAB-Parameter-MaxBitrateList.h \
+	RANAP_RAB-Parameters.h \
+	RANAP_RABParametersList.h \
+	RANAP_RAB-QueuedItem.h \
+	RANAP_RAB-QueuedList.h \
+	RANAP_RAB-ReleasedItem.h \
+	RANAP_RAB-ReleasedItem-IuRelComp.h \
+	RANAP_RAB-ReleasedList.h \
+	RANAP_RAB-ReleasedList-IuRelComp.h \
+	RANAP_RAB-ReleaseFailedList.h \
+	RANAP_RAB-ReleaseItem.h \
+	RANAP_RAB-ReleaseList.h \
+	RANAP_RAB-ReleaseRequest.h \
+	RANAP_RAB-RelocationReleaseItem.h \
+	RANAP_RAB-RelocationReleaseList.h \
+	RANAP_RABs-ContextFailedtoTransferItem.h \
+	RANAP_RABs-ContextFailedtoTransferList.h \
+	RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h \
+	RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h \
+	RANAP_RAB-SetupItem-EnhRelocInfoReq.h \
+	RANAP_RAB-SetupItem-EnhRelocInfoRes.h \
+	RANAP_RAB-SetupItem-RelocReqAck.h \
+	RANAP_RAB-SetupItem-RelocReq.h \
+	RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h \
+	RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h \
+	RANAP_RAB-SetupList-EnhRelocInfoReq.h \
+	RANAP_RAB-SetupList-EnhRelocInfoRes.h \
+	RANAP_RAB-SetupList-RelocReqAck.h \
+	RANAP_RAB-SetupList-RelocReq.h \
+	RANAP_RAB-SetupOrModifiedItem.h \
+	RANAP_RAB-SetupOrModifiedList.h \
+	RANAP_RAB-SetupOrModifyItemFirst.h \
+	RANAP_RAB-SetupOrModifyItemSecond.h \
+	RANAP_RAB-SetupOrModifyList.h \
+	RANAP_RABs-failed-to-reportItem.h \
+	RANAP_RABs-failed-to-reportList.h \
+	RANAP_RAB-SubflowCombinationBitRate.h \
+	RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h \
+	RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h \
+	RANAP_RAB-TrCH-Mapping.h \
+	RANAP_RAB-TrCH-MappingItem.h \
+	RANAP_RAC.h \
+	RANAP_RAI.h \
+	RANAP_RAI-List.h \
+	RANAP_RAListofIdleModeUEs.h \
+	RANAP_RAListwithNoIdleModeUEsAnyMore.h \
+	RANAP_RANAP-EnhancedRelocationInformationRequest.h \
+	RANAP_RANAP-EnhancedRelocationInformationResponse.h \
+	RANAP_RANAP-PDU.h \
+	RANAP_RANAP-RelocationInformation.h \
+	RANAP_RAofIdleModeUEs.h \
+	RANAP_RateControlAllowed.h \
+	RANAP_RAT-Type.h \
+	RANAP_RedirectAttemptFlag.h \
+	RANAP_RedirectionCompleted.h \
+	RANAP_RedirectionIndication.h \
+	RANAP_RejectCauseValue.h \
+	RANAP_RelocationCancelAcknowledge.h \
+	RANAP_RelocationCancel.h \
+	RANAP_RelocationCommand.h \
+	RANAP_RelocationComplete.h \
+	RANAP_RelocationDetect.h \
+	RANAP_RelocationFailure.h \
+	RANAP_RelocationPreparationFailure.h \
+	RANAP_RelocationRequestAcknowledge.h \
+	RANAP_RelocationRequest.h \
+	RANAP_RelocationRequired.h \
+	RANAP_RelocationRequirement.h \
+	RANAP_RelocationType.h \
+	RANAP_RepetitionNumber0.h \
+	RANAP_RepetitionNumber1.h \
+	RANAP_ReportAmount.h \
+	RANAP_ReportArea.h \
+	RANAP_ReportChangeOfSAI.h \
+	RANAP_ReportInterval.h \
+	RANAP_RequestedGANSSAssistanceData.h \
+	RANAP_RequestedGPSAssistanceData.h \
+	RANAP_RequestedLocationRelatedDataType.h \
+	RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h \
+	RANAP_RequestedMulticastServiceList.h \
+	RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h \
+	RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h \
+	RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h \
+	RANAP_Requested-RAB-Parameter-MaxBitrateList.h \
+	RANAP_Requested-RAB-Parameter-Values.h \
+	RANAP_RequestType.h \
+	RANAP_ResetAcknowledge.h \
+	RANAP_Reset.h \
+	RANAP_ResetResourceAckItem.h \
+	RANAP_ResetResourceAckList.h \
+	RANAP_ResetResourceAcknowledge.h \
+	RANAP_ResetResource.h \
+	RANAP_ResetResourceItem.h \
+	RANAP_ResetResourceList.h \
+	RANAP_ResidualBitErrorRatio.h \
+	RANAP_ResponseTime.h \
+	RANAP_RIMInformation.h \
+	RANAP_RIMRoutingAddress.h \
+	RANAP_RIM-Transfer.h \
+	RANAP_RNC-ID.h \
+	RANAP_RNCTraceInformation.h \
+	RANAP_RNSAPRelocationParameters.h \
+	RANAP_RRC-Container.h \
+	RANAP_RSRQ-Extension.h \
+	RANAP_RSRQ-Type.h \
+	RANAP_RSRVCC-HO-Indication.h \
+	RANAP_RSRVCC-Information.h \
+	RANAP_RSRVCC-Operation-Possible.h \
+	RANAP_RTLoadValue.h \
+	RANAP_SAC.h \
+	RANAP_SAI.h \
+	RANAP_SAPI.h \
+	RANAP_SDU-ErrorRatio.h \
+	RANAP_SDU-FormatInformationParameterItem.h \
+	RANAP_SDU-FormatInformationParameters.h \
+	RANAP_SDU-ParameterItem.h \
+	RANAP_SDU-Parameters.h \
+	RANAP_SecurityModeCommand.h \
+	RANAP_SecurityModeComplete.h \
+	RANAP_SecurityModeReject.h \
+	RANAP_Service-Handover.h \
+	RANAP_Session-Re-establishment-Indicator.h \
+	RANAP_SessionUpdateID.h \
+	RANAP_Shared-Network-Information.h \
+	RANAP_SignallingIndication.h \
+	RANAP_SNA-Access-Information.h \
+	RANAP_SNAC.h \
+	RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h \
+	RANAP_SourceCellID.h \
+	RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h \
+	RANAP_SourceID.h \
+	RANAP_SourceRNC-ID.h \
+	RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h \
+	RANAP_SourceStatisticsDescriptor.h \
+	RANAP_Source-ToTarget-TransparentContainer.h \
+	RANAP_SourceUTRANCellID.h \
+	RANAP_SRB-ID.h \
+	RANAP_SRB-TrCH-Mapping.h \
+	RANAP_SRB-TrCH-MappingItem.h \
+	RANAP_SRNS-ContextRequest.h \
+	RANAP_SRNS-ContextResponse.h \
+	RANAP_SRNS-DataForwardCommand.h \
+	RANAP_SRVCC-CSKeysRequest.h \
+	RANAP_SRVCC-CSKeysResponse.h \
+	RANAP_SRVCC-HO-Indication.h \
+	RANAP_SRVCC-Information.h \
+	RANAP_SRVCC-Operation-Possible.h \
+	RANAP_SubflowSDU-Size.h \
+	RANAP_SubscriberProfileIDforRFP.h \
+	RANAP_SuccessfulOutcome.h \
+	RANAP_SupportedBitrate.h \
+	RANAP_SupportedRAB-ParameterBitrateList.h \
+	RANAP_TAC.h \
+	RANAP_TAI.h \
+	RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h \
+	RANAP_TargetCellId.h \
+	RANAP_TargetENB-ID.h \
+	RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h \
+	RANAP_TargetID.h \
+	RANAP_TargetRNC-ID.h \
+	RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h \
+	RANAP_Target-ToSource-TransparentContainer.h \
+	RANAP_TBCD-STRING.h \
+	RANAP_TemporaryUE-ID.h \
+	RANAP_TimeToMBMSDataTransfer.h \
+	RANAP_Time-UE-StayedInCell-EnhancedGranularity.h \
+	RANAP_Time-UE-StayedInCell.h \
+	RANAP_TimingDifferenceULDL.h \
+	RANAP_TMGI.h \
+	RANAP_TMSI.h \
+	RANAP_TNLInformationEnhRelInfoReq.h \
+	RANAP_TNLInformationEnhRelInfoRes.h \
+	RANAP_TraceDepth.h \
+	RANAP_TraceInformation.h \
+	RANAP_TracePropagationParameters.h \
+	RANAP_TraceRecordingSessionInformation.h \
+	RANAP_TraceRecordingSessionReference.h \
+	RANAP_TraceReference.h \
+	RANAP_TraceType.h \
+	RANAP_TrafficClass.h \
+	RANAP_TrafficHandlingPriority.h \
+	RANAP_TransferDelay.h \
+	RANAP_TransportLayerAddress.h \
+	RANAP_TransportLayerInformation.h \
+	RANAP_TrCH-ID.h \
+	RANAP_TrCH-ID-List.h \
+	RANAP_TriggerID.h \
+	RANAP_TriggeringMessage.h \
+	RANAP_TunnelInformation.h \
+	RANAP_TypeOfError.h \
+	RANAP_UE-AggregateMaximumBitRateDownlink.h \
+	RANAP_UE-AggregateMaximumBitRate.h \
+	RANAP_UE-AggregateMaximumBitRateUplink.h \
+	RANAP_UE-History-Information.h \
+	RANAP_UE-ID.h \
+	RANAP_UeRadioCapabilityMatchRequest.h \
+	RANAP_UeRadioCapabilityMatchResponse.h \
+	RANAP_UESBI-IuA.h \
+	RANAP_UESBI-IuB.h \
+	RANAP_UESBI-Iu.h \
+	RANAP_UESpecificInformationIndication.h \
+	RANAP_UL-GTP-PDU-SequenceNumber.h \
+	RANAP_UL-N-PDU-SequenceNumber.h \
+	RANAP_UnsuccessfulLinking-IEs.h \
+	RANAP_UnsuccessfullyTransmittedDataVolume.h \
+	RANAP_UnsuccessfulOutcome.h \
+	RANAP_UPInformation.h \
+	RANAP_UPInitialisationFrame.h \
+	RANAP_UplinkInformationExchangeFailure.h \
+	RANAP_UplinkInformationExchangeRequest.h \
+	RANAP_UplinkInformationExchangeResponse.h \
+	RANAP_UP-ModeVersions.h \
+	RANAP_USCH-ID.h \
+	RANAP_UserPlaneInformation.h \
+	RANAP_UserPlaneMode.h \
+	RANAP_UTRAN-CellID.h \
+	RANAP_VelocityEstimate.h \
+	RANAP_VerticalAccuracyCode.h \
+	RANAP_VerticalSpeedDirection.h \
+	RANAP_VerticalVelocity.h \
+	RANAP_VoiceSupportMatchIndicator.h
+
+ranapdir = $(includedir)/osmocom/osmo-iuh/ranap
diff --git a/include/osmocom/osmo-iuh/rua/Makefile.am b/include/osmocom/osmo-iuh/rua/Makefile.am
new file mode 100644
index 0000000..977a7bd
--- /dev/null
+++ b/include/osmocom/osmo-iuh/rua/Makefile.am
@@ -0,0 +1,39 @@
+rua_HEADERS = \
+	RUA_Ansi-41-IDNNS.h \
+	RUA_Cause.h \
+	RUA_CauseMisc.h \
+	RUA_CauseProtocol.h \
+	RUA_CauseRadioNetwork.h \
+	RUA_CauseTransport.h \
+	RUA_CN-DomainIndicator.h \
+	RUA_Connect.h \
+	RUA_ConnectionlessTransfer.h \
+	RUA_Context-ID.h \
+	RUA_CriticalityDiagnostics.h \
+	RUA_CriticalityDiagnostics-IE-List.h \
+	RUA_Criticality.h \
+	RUA_CSGMembershipStatus.h \
+	RUA_DirectTransfer.h \
+	RUA_Disconnect.h \
+	RUA_ErrorIndication.h \
+	RUA_Establishment-Cause.h \
+	RUA_Gsm-map-IDNNS.h \
+	RUA_IE-Extensions.h \
+	RUA_IE.h \
+	RUA_InitiatingMessage.h \
+	RUA_IntraDomainNasNodeSelector.h \
+	RUA_Presence.h \
+	RUA_PrivateIE-ID.h \
+	RUA_PrivateMessage.h \
+	RUA_ProcedureCode.h \
+	RUA_ProtocolIE-ID.h \
+	RUA_RANAP-Message.h \
+	RUA_RoutingParameter.h \
+	RUA_RUA-PDU.h \
+	RUA_SuccessfulOutcome.h \
+	RUA_TriggeringMessage.h \
+	RUA_TypeOfError.h \
+	RUA_UnsuccessfulOutcome.h
+
+ruadir = $(includedir)/osmocom/osmo-iuh/rua
+
diff --git a/src/Makefile.am b/src/Makefile.am
index b30b17f..0887b40 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,7 +15,7 @@
 	$(ASN1TOSTRUCT) -p RANAP_ -f $<
 
 
-AM_CFLAGS = $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -Ihnbap/
+AM_CFLAGS = $(OSMOCORE_CFLAGS) $(OSMOVTY_CFLAGS) $(OSMOGSM_CFLAGS) $(OSMONETIF_CFLAGS) $(ASN1C_CFLAGS) $(OSMOSIGTRAN_CFLAGS) -I../include
 COMMON_LDADD = -lsctp
 
 # build the shared RANAP library
diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am
index 274a30b..c918dc6 100644
--- a/src/hnbap/Makefile.am
+++ b/src/hnbap/Makefile.am
@@ -236,7 +236,6 @@
 
 noinst_LIBRARIES=libosmo-asn1-hnbap.a
 libosmo_asn1_hnbap_a_SOURCES=$(ASN_MODULE_SOURCES)
-noinst_HEADERS = $(ASN_MODULE_INC)
 libosmo_asn1_hnbap_a_LIBADD=$(ASN1C_LDADD)
 
 regen: regenerate-from-asn1-source
diff --git a/src/hnbap_common.h b/src/hnbap_common.h
index ec214e9..bf92f20 100644
--- a/src/hnbap_common.h
+++ b/src/hnbap_common.h
@@ -2,128 +2,129 @@
 
 #include "asn_application.h"
 
-#include "ANY.h"
-#include "Access-stratum-release-indicator.h"
-#include "AccessResult.h"
-#include "AdditionalNeighbourInfoList.h"
-#include "AltitudeAndDirection.h"
-#include "BIT_STRING.h"
-#include "BackoffTimer.h"
-#include "BindingID.h"
-#include "CELL-FACHMobilitySupport.h"
-#include "CGI.h"
-#include "CI.h"
-#include "CN-DomainIndicator.h"
-#include "CSG-Capability.h"
-#include "CSG-ID.h"
-#include "CSGMembershipStatus.h"
-#include "CSGMembershipUpdate.h"
-#include "Cause.h"
-#include "CauseMisc.h"
-#include "CauseProtocol.h"
-#include "CauseRadioNetwork.h"
-#include "CauseTransport.h"
-#include "CellIdentity.h"
-#include "ConfigurationInformation.h"
-#include "Context-ID.h"
-#include "Criticality.h"
-#include "CriticalityDiagnostics-IE-List.h"
-#include "CriticalityDiagnostics.h"
-#include "ESN.h"
-#include "ErrorIndication.h"
-#include "GTP-TEI.h"
-#include "GeographicalCoordinates.h"
-#include "GeographicalLocation.h"
-#include "HNB-Cell-Access-Mode.h"
-#include "HNB-Cell-Identifier.h"
-#include "HNB-GWResponse.h"
-#include "HNB-Identity-Info.h"
-#include "HNB-Identity.h"
-#include "HNB-Location-Information.h"
-#include "HNB-RNL-Identity.h"
-#include "HNBAP-PDU.h"
-#include "HNBCapacity.h"
-#include "HNBConfigInfo.h"
-#include "HNBConfigTransferRequest.h"
-#include "HNBConfigTransferResponse.h"
-#include "HNBConfigurationInformationMissing.h"
-#include "HNBConfigurationInformationProvided.h"
-#include "HNBDe-Register.h"
-#include "HNBRegisterAccept.h"
-#include "HNBRegisterReject.h"
-#include "HNBRegisterRequest.h"
-#include "IE-Extensions.h"
-#include "IE.h"
-#include "IMEI.h"
-#include "IMSI.h"
-#include "IMSIDS41.h"
-#include "IMSIESN.h"
-#include "INTEGER.h"
-#include "IP-Address.h"
-#include "InitiatingMessage.h"
-#include "Ipv4Address.h"
-#include "Ipv6Address.h"
-#include "Iurh-Signalling-TNL-AddressList.h"
-#include "LAC.h"
-#include "LAI.h"
-#include "MacroCellID.h"
-#include "MacroCoverageInformation.h"
-#include "MuxPortNumber.h"
-#include "NativeEnumerated.h"
-#include "NativeInteger.h"
-#include "NeighbourCellIdentityList.h"
-#include "NeighbourIdentity.h"
-#include "NeighbourInfoList.h"
-#include "NeighbourInfoRequestItem.h"
-#include "NeighbourInfoRequestList.h"
-#include "OBJECT_IDENTIFIER.h"
-#include "OCTET_STRING.h"
-#include "PLMNidentity.h"
-#include "PSC.h"
-#include "PTMSI.h"
-#include "PTMSIRAI.h"
-#include "Presence.h"
-#include "PrivateIE-ID.h"
-#include "PrivateMessage.h"
-#include "ProcedureCode.h"
-#include "ProtocolIE-ID.h"
-#include "RAB-ID.h"
-#include "RABList.h"
-#include "RABListItem.h"
-#include "RAC.h"
-#include "RAI.h"
-#include "RNC-ID.h"
-#include "Registration-Cause.h"
-#include "RelocationComplete.h"
-#include "S-RNTIPrefix.h"
-#include "SAC.h"
-#include "SuccessfulOutcome.h"
-#include "TMSIDS41.h"
-#include "TMSILAI.h"
-#include "TNLUpdateFailure.h"
-#include "TNLUpdateRequest.h"
-#include "TNLUpdateResponse.h"
-#include "TransportInfo.h"
-#include "TransportLayerAddress.h"
-#include "TriggeringMessage.h"
-#include "Tunnel-Information.h"
-#include "TypeOfError.h"
-#include "U-RNTI.h"
-#include "U-RNTIQueryRequest.h"
-#include "U-RNTIQueryResponse.h"
-#include "UDP-Port-Number.h"
-#include "UE-Capabilities.h"
-#include "UE-Identity.h"
-#include "UEDe-Register.h"
-#include "UERegisterAccept.h"
-#include "UERegisterReject.h"
-#include "UERegisterRequest.h"
-#include "URAIdentity.h"
-#include "URAIdentityList.h"
-#include "UTRANCellID.h"
-#include "UnknownU-RNTIIndication.h"
-#include "UnsuccessfulOutcome.h"
-#include "Update-cause.h"
+#include <ANY.h>
+#include <BIT_STRING.h>
+#include <INTEGER.h>
+#include <NativeEnumerated.h>
+#include <NativeInteger.h>
+#include <OBJECT_IDENTIFIER.h>
+#include <OCTET_STRING.h>
+
+#include <osmocom/osmo-iuh/hnbap/Access-stratum-release-indicator.h>
+#include <osmocom/osmo-iuh/hnbap/AccessResult.h>
+#include <osmocom/osmo-iuh/hnbap/AdditionalNeighbourInfoList.h>
+#include <osmocom/osmo-iuh/hnbap/AltitudeAndDirection.h>
+#include <osmocom/osmo-iuh/hnbap/BackoffTimer.h>
+#include <osmocom/osmo-iuh/hnbap/BindingID.h>
+#include <osmocom/osmo-iuh/hnbap/CELL-FACHMobilitySupport.h>
+#include <osmocom/osmo-iuh/hnbap/CGI.h>
+#include <osmocom/osmo-iuh/hnbap/CI.h>
+#include <osmocom/osmo-iuh/hnbap/CN-DomainIndicator.h>
+#include <osmocom/osmo-iuh/hnbap/CSG-Capability.h>
+#include <osmocom/osmo-iuh/hnbap/CSG-ID.h>
+#include <osmocom/osmo-iuh/hnbap/CSGMembershipStatus.h>
+#include <osmocom/osmo-iuh/hnbap/CSGMembershipUpdate.h>
+#include <osmocom/osmo-iuh/hnbap/Cause.h>
+#include <osmocom/osmo-iuh/hnbap/CauseMisc.h>
+#include <osmocom/osmo-iuh/hnbap/CauseProtocol.h>
+#include <osmocom/osmo-iuh/hnbap/CauseRadioNetwork.h>
+#include <osmocom/osmo-iuh/hnbap/CauseTransport.h>
+#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
+#include <osmocom/osmo-iuh/hnbap/ConfigurationInformation.h>
+#include <osmocom/osmo-iuh/hnbap/Context-ID.h>
+#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics-IE-List.h>
+#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics.h>
+#include <osmocom/osmo-iuh/hnbap/ESN.h>
+#include <osmocom/osmo-iuh/hnbap/ErrorIndication.h>
+#include <osmocom/osmo-iuh/hnbap/GTP-TEI.h>
+#include <osmocom/osmo-iuh/hnbap/GeographicalCoordinates.h>
+#include <osmocom/osmo-iuh/hnbap/GeographicalLocation.h>
+#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Access-Mode.h>
+#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Identifier.h>
+#include <osmocom/osmo-iuh/hnbap/HNB-GWResponse.h>
+#include <osmocom/osmo-iuh/hnbap/HNB-Identity-Info.h>
+#include <osmocom/osmo-iuh/hnbap/HNB-Identity.h>
+#include <osmocom/osmo-iuh/hnbap/HNB-Location-Information.h>
+#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/osmo-iuh/hnbap/HNBAP-PDU.h>
+#include <osmocom/osmo-iuh/hnbap/HNBCapacity.h>
+#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
+#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferRequest.h>
+#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferResponse.h>
+#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationMissing.h>
+#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationProvided.h>
+#include <osmocom/osmo-iuh/hnbap/HNBDe-Register.h>
+#include <osmocom/osmo-iuh/hnbap/HNBRegisterAccept.h>
+#include <osmocom/osmo-iuh/hnbap/HNBRegisterReject.h>
+#include <osmocom/osmo-iuh/hnbap/HNBRegisterRequest.h>
+#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/osmo-iuh/hnbap/IMEI.h>
+#include <osmocom/osmo-iuh/hnbap/IMSI.h>
+#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
+#include <osmocom/osmo-iuh/hnbap/IMSIESN.h>
+#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
+#include <osmocom/osmo-iuh/hnbap/InitiatingMessage.h>
+#include <osmocom/osmo-iuh/hnbap/Ipv4Address.h>
+#include <osmocom/osmo-iuh/hnbap/Ipv6Address.h>
+#include <osmocom/osmo-iuh/hnbap/Iurh-Signalling-TNL-AddressList.h>
+#include <osmocom/osmo-iuh/hnbap/LAC.h>
+#include <osmocom/osmo-iuh/hnbap/LAI.h>
+#include <osmocom/osmo-iuh/hnbap/MacroCellID.h>
+#include <osmocom/osmo-iuh/hnbap/MacroCoverageInformation.h>
+#include <osmocom/osmo-iuh/hnbap/MuxPortNumber.h>
+#include <osmocom/osmo-iuh/hnbap/NeighbourCellIdentityList.h>
+#include <osmocom/osmo-iuh/hnbap/NeighbourIdentity.h>
+#include <osmocom/osmo-iuh/hnbap/NeighbourInfoList.h>
+#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestItem.h>
+#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestList.h>
+#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
+#include <osmocom/osmo-iuh/hnbap/PSC.h>
+#include <osmocom/osmo-iuh/hnbap/PTMSI.h>
+#include <osmocom/osmo-iuh/hnbap/PTMSIRAI.h>
+#include <osmocom/osmo-iuh/hnbap/Presence.h>
+#include <osmocom/osmo-iuh/hnbap/PrivateIE-ID.h>
+#include <osmocom/osmo-iuh/hnbap/PrivateMessage.h>
+#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
+#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
+#include <osmocom/osmo-iuh/hnbap/RAB-ID.h>
+#include <osmocom/osmo-iuh/hnbap/RABList.h>
+#include <osmocom/osmo-iuh/hnbap/RABListItem.h>
+#include <osmocom/osmo-iuh/hnbap/RAC.h>
+#include <osmocom/osmo-iuh/hnbap/RAI.h>
+#include <osmocom/osmo-iuh/hnbap/RNC-ID.h>
+#include <osmocom/osmo-iuh/hnbap/Registration-Cause.h>
+#include <osmocom/osmo-iuh/hnbap/RelocationComplete.h>
+#include <osmocom/osmo-iuh/hnbap/S-RNTIPrefix.h>
+#include <osmocom/osmo-iuh/hnbap/SAC.h>
+#include <osmocom/osmo-iuh/hnbap/SuccessfulOutcome.h>
+#include <osmocom/osmo-iuh/hnbap/TMSIDS41.h>
+#include <osmocom/osmo-iuh/hnbap/TMSILAI.h>
+#include <osmocom/osmo-iuh/hnbap/TNLUpdateFailure.h>
+#include <osmocom/osmo-iuh/hnbap/TNLUpdateRequest.h>
+#include <osmocom/osmo-iuh/hnbap/TNLUpdateResponse.h>
+#include <osmocom/osmo-iuh/hnbap/TransportInfo.h>
+#include <osmocom/osmo-iuh/hnbap/TransportLayerAddress.h>
+#include <osmocom/osmo-iuh/hnbap/TriggeringMessage.h>
+#include <osmocom/osmo-iuh/hnbap/Tunnel-Information.h>
+#include <osmocom/osmo-iuh/hnbap/TypeOfError.h>
+#include <osmocom/osmo-iuh/hnbap/U-RNTI.h>
+#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryRequest.h>
+#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryResponse.h>
+#include <osmocom/osmo-iuh/hnbap/UDP-Port-Number.h>
+#include <osmocom/osmo-iuh/hnbap/UE-Capabilities.h>
+#include <osmocom/osmo-iuh/hnbap/UE-Identity.h>
+#include <osmocom/osmo-iuh/hnbap/UEDe-Register.h>
+#include <osmocom/osmo-iuh/hnbap/UERegisterAccept.h>
+#include <osmocom/osmo-iuh/hnbap/UERegisterReject.h>
+#include <osmocom/osmo-iuh/hnbap/UERegisterRequest.h>
+#include <osmocom/osmo-iuh/hnbap/URAIdentity.h>
+#include <osmocom/osmo-iuh/hnbap/URAIdentityList.h>
+#include <osmocom/osmo-iuh/hnbap/UTRANCellID.h>
+#include <osmocom/osmo-iuh/hnbap/UnknownU-RNTIIndication.h>
+#include <osmocom/osmo-iuh/hnbap/UnsuccessfulOutcome.h>
+#include <osmocom/osmo-iuh/hnbap/Update-cause.h>
 
 #if (ASN1C_ENVIRONMENT_VERSION < 924)
 # error "You are compiling with the wrong version of ASN1C"
diff --git a/src/hnbgw_rua.h b/src/hnbgw_rua.h
index 88e6fe6..b775525 100644
--- a/src/hnbgw_rua.h
+++ b/src/hnbgw_rua.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "hnbgw.h"
-#include "rua/RUA_Cause.h"
+#include <osmocom/osmo-iuh/rua/RUA_Cause.h>
 
 int hnbgw_rua_rx(struct hnb_context *hnb, struct msgb *msg);
 int hnbgw_rua_init(void);
diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am
index 76aaaaf..316d760 100644
--- a/src/ranap/Makefile.am
+++ b/src/ranap/Makefile.am
@@ -1160,12 +1160,10 @@
 	RANAP_LeftMBMSBearerService-IEs.h	\
 	RANAP_UnsuccessfulLinking-IEs.h
 
-AM_CFLAGS = $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -I.
+AM_CFLAGS = $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -I../../include
 
 noinst_LTLIBRARIES=libosmo-asn1-ranap.la
 libosmo_asn1_ranap_la_SOURCES=$(ASN_MODULE_SRC)
-osmoranap_HEADERS=$(ASN_MODULE_INC)
-osmoranapdir = $(includedir)/osmocom/ranap
 libosmo_asn1_ranap_la_LIBADD=$(ASN1C_LDADD)
 
 regen: regenerate-from-asn1-source
diff --git a/src/ranap_common.h b/src/ranap_common.h
index 88bdfcc..c832891 100644
--- a/src/ranap_common.h
+++ b/src/ranap_common.h
@@ -3,585 +3,585 @@
 #include <asn_application.h>
 
 /* for f in ranap/RANAP_*.h; printf "#include \"$f\"\n" */
-#include "ranap/RANAP_APN.h"
-#include "ranap/RANAP_AccuracyFulfilmentIndicator.h"
-#include "ranap/RANAP_AllocationOrRetentionPriority.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h"
-#include "ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h"
-#include "ranap/RANAP_Alt-RAB-Parameters.h"
-#include "ranap/RANAP_AlternativeRABConfigurationRequest.h"
-#include "ranap/RANAP_AreaIdentity.h"
-#include "ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h"
-#include "ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h"
-#include "ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h"
-#include "ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h"
-#include "ranap/RANAP_Ass-RAB-Parameters.h"
-#include "ranap/RANAP_AuthorisedPLMNs.h"
-#include "ranap/RANAP_AuthorisedSNAs.h"
-#include "ranap/RANAP_BindingID.h"
-#include "ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h"
-#include "ranap/RANAP_CGI.h"
-#include "ranap/RANAP_CI.h"
-#include "ranap/RANAP_CN-DeactivateTrace.h"
-#include "ranap/RANAP_CN-DomainIndicator.h"
-#include "ranap/RANAP_CN-ID.h"
-#include "ranap/RANAP_CN-InvokeTrace.h"
-#include "ranap/RANAP_CNMBMSLinkingInformation.h"
-#include "ranap/RANAP_CSFB-Information.h"
-#include "ranap/RANAP_CSG-Id-List.h"
-#include "ranap/RANAP_CSG-Id.h"
-#include "ranap/RANAP_CSG-Membership-Status.h"
-#include "ranap/RANAP_Cause.h"
-#include "ranap/RANAP_CauseMisc.h"
-#include "ranap/RANAP_CauseNAS.h"
-#include "ranap/RANAP_CauseNon-Standard.h"
-#include "ranap/RANAP_CauseProtocol.h"
-#include "ranap/RANAP_CauseRadioNetwork.h"
-#include "ranap/RANAP_CauseRadioNetworkExtension.h"
-#include "ranap/RANAP_CauseTransmissionNetwork.h"
-#include "ranap/RANAP_Cell-Access-Mode.h"
-#include "ranap/RANAP_Cell-Capacity-Class-Value.h"
-#include "ranap/RANAP_Cell-Id.h"
-#include "ranap/RANAP_CellBased.h"
-#include "ranap/RANAP_CellIdList.h"
-#include "ranap/RANAP_CellLoadInformation.h"
-#include "ranap/RANAP_CellLoadInformationGroup.h"
-#include "ranap/RANAP_CellType.h"
-#include "ranap/RANAP_ChosenEncryptionAlgorithm.h"
-#include "ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h"
-#include "ranap/RANAP_ClassmarkInformation2.h"
-#include "ranap/RANAP_ClassmarkInformation3.h"
-#include "ranap/RANAP_ClientType.h"
-#include "ranap/RANAP_CommonID.h"
-#include "ranap/RANAP_Correlation-ID.h"
-#include "ranap/RANAP_Criticality.h"
-#include "ranap/RANAP_CriticalityDiagnostics-IE-List.h"
-#include "ranap/RANAP_CriticalityDiagnostics.h"
-#include "ranap/RANAP_D-RNTI.h"
-#include "ranap/RANAP_DCH-ID.h"
-#include "ranap/RANAP_DL-GTP-PDU-SequenceNumber.h"
-#include "ranap/RANAP_DL-N-PDU-SequenceNumber.h"
-#include "ranap/RANAP_DRX-CycleLengthCoefficient.h"
-#include "ranap/RANAP_DSCH-ID.h"
-#include "ranap/RANAP_DataPDUType.h"
-#include "ranap/RANAP_DataVolumeList.h"
-#include "ranap/RANAP_DataVolumeReference.h"
-#include "ranap/RANAP_DataVolumeReport.h"
-#include "ranap/RANAP_DataVolumeReportList.h"
-#include "ranap/RANAP_DataVolumeReportRequest.h"
-#include "ranap/RANAP_DataVolumeReportingIndication.h"
-#include "ranap/RANAP_DeliveryOfErroneousSDU.h"
-#include "ranap/RANAP_DeliveryOrder.h"
-#include "ranap/RANAP_DeltaRAListofIdleModeUEs.h"
-#include "ranap/RANAP_DirectInformationTransfer.h"
-#include "ranap/RANAP_DirectReportingIndicator.h"
-#include "ranap/RANAP_DirectTransfer-IE-ContainerList.h"
-#include "ranap/RANAP_DirectTransfer.h"
-#include "ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h"
-#include "ranap/RANAP_E-DCH-MAC-d-Flow-ID.h"
-#include "ranap/RANAP_E-UTRAN-Service-Handover.h"
-#include "ranap/RANAP_EARFCN-Extended.h"
-#include "ranap/RANAP_ENB-ID.h"
-#include "ranap/RANAP_EUTRANFrequencies.h"
-#include "ranap/RANAP_EncryptionAlgorithm.h"
-#include "ranap/RANAP_EncryptionInformation.h"
-#include "ranap/RANAP_EncryptionKey.h"
-#include "ranap/RANAP_End-Of-CSFB.h"
-#include "ranap/RANAP_EnhancedRelocationCompleteConfirm.h"
-#include "ranap/RANAP_EnhancedRelocationCompleteFailure.h"
-#include "ranap/RANAP_EnhancedRelocationCompleteRequest.h"
-#include "ranap/RANAP_EnhancedRelocationCompleteResponse.h"
-#include "ranap/RANAP_EquipmentsToBeTraced.h"
-#include "ranap/RANAP_ErrorIndication.h"
-#include "ranap/RANAP_Event.h"
-#include "ranap/RANAP_Event1F-Parameters.h"
-#include "ranap/RANAP_Event1I-Parameters.h"
-#include "ranap/RANAP_ExtendedGuaranteedBitrate.h"
-#include "ranap/RANAP_ExtendedMaxBitrate.h"
-#include "ranap/RANAP_ExtendedRNC-ID.h"
-#include "ranap/RANAP_ForwardSRNS-Context.h"
-#include "ranap/RANAP_ForwardingIndication.h"
-#include "ranap/RANAP_FrameSequenceNumber.h"
-#include "ranap/RANAP_FrequenceLayerConvergenceFlag.h"
-#include "ranap/RANAP_GA-AltitudeAndDirection.h"
-#include "ranap/RANAP_GA-EllipsoidArc.h"
-#include "ranap/RANAP_GA-Point.h"
-#include "ranap/RANAP_GA-PointWithAltitude.h"
-#include "ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h"
-#include "ranap/RANAP_GA-PointWithUnCertainty.h"
-#include "ranap/RANAP_GA-PointWithUnCertaintyEllipse.h"
-#include "ranap/RANAP_GA-Polygon.h"
-#include "ranap/RANAP_GA-UncertaintyEllipse.h"
-#include "ranap/RANAP_GANSS-PositioningDataSet.h"
-#include "ranap/RANAP_GANSS-PositioningMethodAndUsage.h"
-#include "ranap/RANAP_GERAN-BSC-Container.h"
-#include "ranap/RANAP_GERAN-Cell-ID.h"
-#include "ranap/RANAP_GERAN-Classmark.h"
-#include "ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h"
-#include "ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h"
-#include "ranap/RANAP_GTP-TEI.h"
-#include "ranap/RANAP_GeographicalArea.h"
-#include "ranap/RANAP_GeographicalCoordinates.h"
-#include "ranap/RANAP_GlobalCN-ID.h"
-#include "ranap/RANAP_GlobalRNC-ID.h"
-#include "ranap/RANAP_GuaranteedBitrate.h"
-#include "ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h"
-#include "ranap/RANAP_HigherBitratesThan16MbpsFlag.h"
-#include "ranap/RANAP_HorizontalSpeedAndBearing.h"
-#include "ranap/RANAP_HorizontalVelocity.h"
-#include "ranap/RANAP_HorizontalVelocityWithUncertainty.h"
-#include "ranap/RANAP_HorizontalWithVerticalVelocity.h"
-#include "ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h"
-#include "ranap/RANAP_IE-Extensions.h"
-#include "ranap/RANAP_IE.h"
-#include "ranap/RANAP_IMEI.h"
-#include "ranap/RANAP_IMEIGroup.h"
-#include "ranap/RANAP_IMEIList.h"
-#include "ranap/RANAP_IMEISV.h"
-#include "ranap/RANAP_IMEISVGroup.h"
-#include "ranap/RANAP_IMEISVList.h"
-#include "ranap/RANAP_IMSI.h"
-#include "ranap/RANAP_IPMulticastAddress.h"
-#include "ranap/RANAP_IRAT-Measurement-Configuration.h"
-#include "ranap/RANAP_IRATmeasurementParameters.h"
-#include "ranap/RANAP_ImmediateMDT.h"
-#include "ranap/RANAP_IncludeVelocity.h"
-#include "ranap/RANAP_InformationExchangeID.h"
-#include "ranap/RANAP_InformationExchangeType.h"
-#include "ranap/RANAP_InformationRequestType.h"
-#include "ranap/RANAP_InformationRequested.h"
-#include "ranap/RANAP_InformationTransferConfirmation.h"
-#include "ranap/RANAP_InformationTransferFailure.h"
-#include "ranap/RANAP_InformationTransferID.h"
-#include "ranap/RANAP_InformationTransferIndication.h"
-#include "ranap/RANAP_InformationTransferType.h"
-#include "ranap/RANAP_InitialUE-Message.h"
-#include "ranap/RANAP_InitiatingMessage.h"
-#include "ranap/RANAP_IntegrityProtectionAlgorithm.h"
-#include "ranap/RANAP_IntegrityProtectionInformation.h"
-#include "ranap/RANAP_IntegrityProtectionKey.h"
-#include "ranap/RANAP_InterSystemInformation-TransparentContainer.h"
-#include "ranap/RANAP_InterSystemInformationTransferType.h"
-#include "ranap/RANAP_InterfacesToTraceItem.h"
-#include "ranap/RANAP_Iu-ReleaseCommand.h"
-#include "ranap/RANAP_Iu-ReleaseComplete.h"
-#include "ranap/RANAP_Iu-ReleaseRequest.h"
-#include "ranap/RANAP_IuSigConId-IE-ContainerList.h"
-#include "ranap/RANAP_IuSignallingConnectionIdentifier.h"
-#include "ranap/RANAP_IuTransportAssociation.h"
-#include "ranap/RANAP_JoinedMBMSBearerService-IEs.h"
-#include "ranap/RANAP_KeyStatus.h"
-#include "ranap/RANAP_L3-Information.h"
-#include "ranap/RANAP_LA-LIST.h"
-#include "ranap/RANAP_LABased.h"
-#include "ranap/RANAP_LAC.h"
-#include "ranap/RANAP_LAI-List.h"
-#include "ranap/RANAP_LAI.h"
-#include "ranap/RANAP_LAListofIdleModeUEs.h"
-#include "ranap/RANAP_LHN-ID.h"
-#include "ranap/RANAP_LastKnownServiceArea.h"
-#include "ranap/RANAP_LastVisitedUTRANCell-Item.h"
-#include "ranap/RANAP_LeftMBMSBearerService-IEs.h"
-#include "ranap/RANAP_Links-to-log.h"
-#include "ranap/RANAP_ListOF-SNAs.h"
-#include "ranap/RANAP_ListOfInterfacesToTrace.h"
-#include "ranap/RANAP_LoadValue.h"
-#include "ranap/RANAP_LocationRelatedDataFailure.h"
-#include "ranap/RANAP_LocationRelatedDataRequest.h"
-#include "ranap/RANAP_LocationRelatedDataRequestType.h"
-#include "ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h"
-#include "ranap/RANAP_LocationRelatedDataResponse.h"
-#include "ranap/RANAP_LocationReport.h"
-#include "ranap/RANAP_LocationReportingControl.h"
-#include "ranap/RANAP_LocationReportingTransferInformation.h"
-#include "ranap/RANAP_LoggedMDT.h"
-#include "ranap/RANAP_LoggingDuration.h"
-#include "ranap/RANAP_LoggingInterval.h"
-#include "ranap/RANAP_M1Report.h"
-#include "ranap/RANAP_M2Report.h"
-#include "ranap/RANAP_M4-Collection-Parameters.h"
-#include "ranap/RANAP_M4-Period.h"
-#include "ranap/RANAP_M4-Threshold.h"
-#include "ranap/RANAP_M4Report.h"
-#include "ranap/RANAP_M5-Period.h"
-#include "ranap/RANAP_M5Report.h"
-#include "ranap/RANAP_M6-Period.h"
-#include "ranap/RANAP_M6Report.h"
-#include "ranap/RANAP_M7-Period.h"
-#include "ranap/RANAP_M7Report.h"
-#include "ranap/RANAP_MBMS-PTP-RAB-ID.h"
-#include "ranap/RANAP_MBMSBearerServiceType.h"
-#include "ranap/RANAP_MBMSCNDe-Registration.h"
-#include "ranap/RANAP_MBMSCNDe-RegistrationRequest.h"
-#include "ranap/RANAP_MBMSCNDe-RegistrationResponse.h"
-#include "ranap/RANAP_MBMSCountingInformation.h"
-#include "ranap/RANAP_MBMSHCIndicator.h"
-#include "ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h"
-#include "ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h"
-#include "ranap/RANAP_MBMSLinkingInformation.h"
-#include "ranap/RANAP_MBMSRABEstablishmentIndication.h"
-#include "ranap/RANAP_MBMSRABRelease.h"
-#include "ranap/RANAP_MBMSRABReleaseFailure.h"
-#include "ranap/RANAP_MBMSRABReleaseRequest.h"
-#include "ranap/RANAP_MBMSRegistrationFailure.h"
-#include "ranap/RANAP_MBMSRegistrationRequest.h"
-#include "ranap/RANAP_MBMSRegistrationRequestType.h"
-#include "ranap/RANAP_MBMSRegistrationResponse.h"
-#include "ranap/RANAP_MBMSServiceArea.h"
-#include "ranap/RANAP_MBMSSessionDuration.h"
-#include "ranap/RANAP_MBMSSessionIdentity.h"
-#include "ranap/RANAP_MBMSSessionRepetitionNumber.h"
-#include "ranap/RANAP_MBMSSessionStart.h"
-#include "ranap/RANAP_MBMSSessionStartFailure.h"
-#include "ranap/RANAP_MBMSSessionStartResponse.h"
-#include "ranap/RANAP_MBMSSessionStop.h"
-#include "ranap/RANAP_MBMSSessionStopResponse.h"
-#include "ranap/RANAP_MBMSSessionUpdate.h"
-#include "ranap/RANAP_MBMSSessionUpdateFailure.h"
-#include "ranap/RANAP_MBMSSessionUpdateResponse.h"
-#include "ranap/RANAP_MBMSSynchronisationInformation.h"
-#include "ranap/RANAP_MBMSUELinkingRequest.h"
-#include "ranap/RANAP_MBMSUELinkingResponse.h"
-#include "ranap/RANAP_MDT-Activation.h"
-#include "ranap/RANAP_MDT-Configuration.h"
-#include "ranap/RANAP_MDT-PLMN-List.h"
-#include "ranap/RANAP_MDT-Report-Parameters.h"
-#include "ranap/RANAP_MDTAreaScope.h"
-#include "ranap/RANAP_MDTMode.h"
-#include "ranap/RANAP_MSISDN.h"
-#include "ranap/RANAP_Management-Based-MDT-Allowed.h"
-#include "ranap/RANAP_MaxBitrate.h"
-#include "ranap/RANAP_MaxSDU-Size.h"
-#include "ranap/RANAP_MeasBand.h"
-#include "ranap/RANAP_MeasurementQuantity.h"
-#include "ranap/RANAP_MeasurementsToActivate.h"
-#include "ranap/RANAP_MessageStructure.h"
-#include "ranap/RANAP_NAS-PDU.h"
-#include "ranap/RANAP_NAS-SequenceNumber.h"
-#include "ranap/RANAP_NAS-SynchronisationIndicator.h"
-#include "ranap/RANAP_NRTLoadInformationValue.h"
-#include "ranap/RANAP_NewBSS-To-OldBSS-Information.h"
-#include "ranap/RANAP_NewRAListofIdleModeUEs.h"
-#include "ranap/RANAP_NonSearchingIndication.h"
-#include "ranap/RANAP_NotEmptyRAListofIdleModeUEs.h"
-#include "ranap/RANAP_NumberOfIuInstances.h"
-#include "ranap/RANAP_NumberOfSteps.h"
-#include "ranap/RANAP_OMC-ID.h"
-#include "ranap/RANAP_Offload-RAB-Parameters-APN.h"
-#include "ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h"
-#include "ranap/RANAP_Offload-RAB-Parameters.h"
-#include "ranap/RANAP_OldBSS-ToNewBSS-Information.h"
-#include "ranap/RANAP_Out-Of-UTRAN.h"
-#include "ranap/RANAP_Outcome.h"
-#include "ranap/RANAP_Overload.h"
-#include "ranap/RANAP_P-TMSI.h"
-#include "ranap/RANAP_PDP-Type-extension.h"
-#include "ranap/RANAP_PDP-Type.h"
-#include "ranap/RANAP_PDP-TypeInformation-extension.h"
-#include "ranap/RANAP_PDP-TypeInformation.h"
-#include "ranap/RANAP_PDUType14FrameSequenceNumber.h"
-#include "ranap/RANAP_PLMNidentity.h"
-#include "ranap/RANAP_PLMNs-in-shared-network.h"
-#include "ranap/RANAP_Paging.h"
-#include "ranap/RANAP_PagingAreaID.h"
-#include "ranap/RANAP_PagingCause.h"
-#include "ranap/RANAP_PeriodicLocationInfo.h"
-#include "ranap/RANAP_PeriodicReportingIndicator.h"
-#include "ranap/RANAP_PermanentNAS-UE-ID.h"
-#include "ranap/RANAP_PermittedEncryptionAlgorithms.h"
-#include "ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h"
-#include "ranap/RANAP_Port-Number.h"
-#include "ranap/RANAP_PositionData.h"
-#include "ranap/RANAP_PositionDataSpecificToGERANIuMode.h"
-#include "ranap/RANAP_PositioningDataDiscriminator.h"
-#include "ranap/RANAP_PositioningDataSet.h"
-#include "ranap/RANAP_PositioningMethodAndUsage.h"
-#include "ranap/RANAP_PositioningPriority.h"
-#include "ranap/RANAP_Pre-emptionCapability.h"
-#include "ranap/RANAP_Pre-emptionVulnerability.h"
-#include "ranap/RANAP_Presence.h"
-#include "ranap/RANAP_Priority-Class-Indicator.h"
-#include "ranap/RANAP_PriorityLevel.h"
-#include "ranap/RANAP_PrivateIE-ID.h"
-#include "ranap/RANAP_PrivateMessage.h"
-#include "ranap/RANAP_ProcedureCode.h"
-#include "ranap/RANAP_ProtocolError-IE-ContainerList.h"
-#include "ranap/RANAP_ProtocolExtensionContainer.h"
-#include "ranap/RANAP_ProtocolExtensionField.h"
-#include "ranap/RANAP_ProtocolExtensionID.h"
-#include "ranap/RANAP_ProtocolIE-Container.h"
-#include "ranap/RANAP_ProtocolIE-ContainerPair.h"
-#include "ranap/RANAP_ProtocolIE-FieldPair.h"
-#include "ranap/RANAP_ProtocolIE-ID.h"
-#include "ranap/RANAP_ProvidedData.h"
-#include "ranap/RANAP_QueuingAllowed.h"
-#include "ranap/RANAP_RAB-AssignmentRequest.h"
-#include "ranap/RANAP_RAB-AssignmentResponse.h"
-#include "ranap/RANAP_RAB-AsymmetryIndicator.h"
-#include "ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h"
-#include "ranap/RANAP_RAB-ContextItem.h"
-#include "ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h"
-#include "ranap/RANAP_RAB-ContextList.h"
-#include "ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h"
-#include "ranap/RANAP_RAB-DataForwardingItem.h"
-#include "ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h"
-#include "ranap/RANAP_RAB-DataForwardingList.h"
-#include "ranap/RANAP_RAB-DataVolumeReportItem.h"
-#include "ranap/RANAP_RAB-DataVolumeReportList.h"
-#include "ranap/RANAP_RAB-DataVolumeReportRequestItem.h"
-#include "ranap/RANAP_RAB-DataVolumeReportRequestList.h"
-#include "ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h"
-#include "ranap/RANAP_RAB-FailedItem.h"
-#include "ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h"
-#include "ranap/RANAP_RAB-FailedList.h"
-#include "ranap/RANAP_RAB-ID.h"
-#include "ranap/RANAP_RAB-IE-ContainerList.h"
-#include "ranap/RANAP_RAB-IE-ContainerPairList.h"
-#include "ranap/RANAP_RAB-ModifyItem.h"
-#include "ranap/RANAP_RAB-ModifyList.h"
-#include "ranap/RANAP_RAB-ModifyRequest.h"
-#include "ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h"
-#include "ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h"
-#include "ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h"
-#include "ranap/RANAP_RAB-Parameter-MaxBitrateList.h"
-#include "ranap/RANAP_RAB-Parameters.h"
-#include "ranap/RANAP_RAB-QueuedItem.h"
-#include "ranap/RANAP_RAB-QueuedList.h"
-#include "ranap/RANAP_RAB-ReleaseFailedList.h"
-#include "ranap/RANAP_RAB-ReleaseItem.h"
-#include "ranap/RANAP_RAB-ReleaseList.h"
-#include "ranap/RANAP_RAB-ReleaseRequest.h"
-#include "ranap/RANAP_RAB-ReleasedItem-IuRelComp.h"
-#include "ranap/RANAP_RAB-ReleasedItem.h"
-#include "ranap/RANAP_RAB-ReleasedList-IuRelComp.h"
-#include "ranap/RANAP_RAB-ReleasedList.h"
-#include "ranap/RANAP_RAB-RelocationReleaseItem.h"
-#include "ranap/RANAP_RAB-RelocationReleaseList.h"
-#include "ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h"
-#include "ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h"
-#include "ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h"
-#include "ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h"
-#include "ranap/RANAP_RAB-SetupItem-RelocReq.h"
-#include "ranap/RANAP_RAB-SetupItem-RelocReqAck.h"
-#include "ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h"
-#include "ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h"
-#include "ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h"
-#include "ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h"
-#include "ranap/RANAP_RAB-SetupList-RelocReq.h"
-#include "ranap/RANAP_RAB-SetupList-RelocReqAck.h"
-#include "ranap/RANAP_RAB-SetupOrModifiedItem.h"
-#include "ranap/RANAP_RAB-SetupOrModifiedList.h"
-#include "ranap/RANAP_RAB-SetupOrModifyItemFirst.h"
-#include "ranap/RANAP_RAB-SetupOrModifyItemSecond.h"
-#include "ranap/RANAP_RAB-SetupOrModifyList.h"
-#include "ranap/RANAP_RAB-SubflowCombinationBitRate.h"
-#include "ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h"
-#include "ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h"
-#include "ranap/RANAP_RAB-TrCH-Mapping.h"
-#include "ranap/RANAP_RAB-TrCH-MappingItem.h"
-#include "ranap/RANAP_RABDataVolumeReport.h"
-#include "ranap/RANAP_RABParametersList.h"
-#include "ranap/RANAP_RABased.h"
-#include "ranap/RANAP_RABs-ContextFailedtoTransferItem.h"
-#include "ranap/RANAP_RABs-ContextFailedtoTransferList.h"
-#include "ranap/RANAP_RABs-failed-to-reportItem.h"
-#include "ranap/RANAP_RABs-failed-to-reportList.h"
-#include "ranap/RANAP_RAC.h"
-#include "ranap/RANAP_RAI-List.h"
-#include "ranap/RANAP_RAI.h"
-#include "ranap/RANAP_RAListofIdleModeUEs.h"
-#include "ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h"
-#include "ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h"
-#include "ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h"
-#include "ranap/RANAP_RANAP-PDU.h"
-#include "ranap/RANAP_RANAP-RelocationInformation.h"
-#include "ranap/RANAP_RAT-Type.h"
-#include "ranap/RANAP_RAofIdleModeUEs.h"
-#include "ranap/RANAP_RIM-Transfer.h"
-#include "ranap/RANAP_RIMInformation.h"
-#include "ranap/RANAP_RIMRoutingAddress.h"
-#include "ranap/RANAP_RNC-ID.h"
-#include "ranap/RANAP_RNCTraceInformation.h"
-#include "ranap/RANAP_RNSAPRelocationParameters.h"
-#include "ranap/RANAP_RRC-Container.h"
-#include "ranap/RANAP_RSRQ-Extension.h"
-#include "ranap/RANAP_RSRQ-Type.h"
-#include "ranap/RANAP_RSRVCC-HO-Indication.h"
-#include "ranap/RANAP_RSRVCC-Information.h"
-#include "ranap/RANAP_RSRVCC-Operation-Possible.h"
-#include "ranap/RANAP_RTLoadValue.h"
-#include "ranap/RANAP_RateControlAllowed.h"
-#include "ranap/RANAP_RedirectAttemptFlag.h"
-#include "ranap/RANAP_RedirectionCompleted.h"
-#include "ranap/RANAP_RedirectionIndication.h"
-#include "ranap/RANAP_RejectCauseValue.h"
-#include "ranap/RANAP_RelocationCancel.h"
-#include "ranap/RANAP_RelocationCancelAcknowledge.h"
-#include "ranap/RANAP_RelocationCommand.h"
-#include "ranap/RANAP_RelocationComplete.h"
-#include "ranap/RANAP_RelocationDetect.h"
-#include "ranap/RANAP_RelocationFailure.h"
-#include "ranap/RANAP_RelocationPreparationFailure.h"
-#include "ranap/RANAP_RelocationRequest.h"
-#include "ranap/RANAP_RelocationRequestAcknowledge.h"
-#include "ranap/RANAP_RelocationRequired.h"
-#include "ranap/RANAP_RelocationRequirement.h"
-#include "ranap/RANAP_RelocationType.h"
-#include "ranap/RANAP_RepetitionNumber0.h"
-#include "ranap/RANAP_RepetitionNumber1.h"
-#include "ranap/RANAP_ReportAmount.h"
-#include "ranap/RANAP_ReportArea.h"
-#include "ranap/RANAP_ReportChangeOfSAI.h"
-#include "ranap/RANAP_ReportInterval.h"
-#include "ranap/RANAP_RequestType.h"
-#include "ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h"
-#include "ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h"
-#include "ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h"
-#include "ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h"
-#include "ranap/RANAP_Requested-RAB-Parameter-Values.h"
-#include "ranap/RANAP_RequestedGANSSAssistanceData.h"
-#include "ranap/RANAP_RequestedGPSAssistanceData.h"
-#include "ranap/RANAP_RequestedLocationRelatedDataType.h"
-#include "ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h"
-#include "ranap/RANAP_RequestedMulticastServiceList.h"
-#include "ranap/RANAP_Reset.h"
-#include "ranap/RANAP_ResetAcknowledge.h"
-#include "ranap/RANAP_ResetResource.h"
-#include "ranap/RANAP_ResetResourceAckItem.h"
-#include "ranap/RANAP_ResetResourceAckList.h"
-#include "ranap/RANAP_ResetResourceAcknowledge.h"
-#include "ranap/RANAP_ResetResourceItem.h"
-#include "ranap/RANAP_ResetResourceList.h"
-#include "ranap/RANAP_ResidualBitErrorRatio.h"
-#include "ranap/RANAP_ResponseTime.h"
-#include "ranap/RANAP_SAC.h"
-#include "ranap/RANAP_SAI.h"
-#include "ranap/RANAP_SAPI.h"
-#include "ranap/RANAP_SDU-ErrorRatio.h"
-#include "ranap/RANAP_SDU-FormatInformationParameters.h"
-#include "ranap/RANAP_SDU-FormatInformationParameterItem.h"
-#include "ranap/RANAP_SDU-Parameters.h"
-#include "ranap/RANAP_SDU-ParameterItem.h"
-#include "ranap/RANAP_SNA-Access-Information.h"
-#include "ranap/RANAP_SNAC.h"
-#include "ranap/RANAP_SRB-ID.h"
-#include "ranap/RANAP_SRB-TrCH-Mapping.h"
-#include "ranap/RANAP_SRB-TrCH-MappingItem.h"
-#include "ranap/RANAP_SRNS-ContextRequest.h"
-#include "ranap/RANAP_SRNS-ContextResponse.h"
-#include "ranap/RANAP_SRNS-DataForwardCommand.h"
-#include "ranap/RANAP_SRVCC-CSKeysRequest.h"
-#include "ranap/RANAP_SRVCC-CSKeysResponse.h"
-#include "ranap/RANAP_SRVCC-HO-Indication.h"
-#include "ranap/RANAP_SRVCC-Information.h"
-#include "ranap/RANAP_SRVCC-Operation-Possible.h"
-#include "ranap/RANAP_SecurityModeCommand.h"
-#include "ranap/RANAP_SecurityModeComplete.h"
-#include "ranap/RANAP_SecurityModeReject.h"
-#include "ranap/RANAP_Service-Handover.h"
-#include "ranap/RANAP_Session-Re-establishment-Indicator.h"
-#include "ranap/RANAP_SessionUpdateID.h"
-#include "ranap/RANAP_Shared-Network-Information.h"
-#include "ranap/RANAP_SignallingIndication.h"
-#include "ranap/RANAP_Source-ToTarget-TransparentContainer.h"
-#include "ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h"
-#include "ranap/RANAP_SourceCellID.h"
-#include "ranap/RANAP_SourceID.h"
-#include "ranap/RANAP_SourceRNC-ID.h"
-#include "ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h"
-#include "ranap/RANAP_SourceStatisticsDescriptor.h"
-#include "ranap/RANAP_SourceUTRANCellID.h"
-#include "ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h"
-#include "ranap/RANAP_SubflowSDU-Size.h"
-#include "ranap/RANAP_SubscriberProfileIDforRFP.h"
-#include "ranap/RANAP_SuccessfulOutcome.h"
-#include "ranap/RANAP_SupportedBitrate.h"
-#include "ranap/RANAP_SupportedRAB-ParameterBitrateList.h"
-#include "ranap/RANAP_TAC.h"
-#include "ranap/RANAP_TAI.h"
-#include "ranap/RANAP_TBCD-STRING.h"
-#include "ranap/RANAP_TMGI.h"
-#include "ranap/RANAP_TMSI.h"
-#include "ranap/RANAP_TNLInformationEnhRelInfoReq.h"
-#include "ranap/RANAP_TNLInformationEnhRelInfoRes.h"
-#include "ranap/RANAP_Target-ToSource-TransparentContainer.h"
-#include "ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h"
-#include "ranap/RANAP_TargetCellId.h"
-#include "ranap/RANAP_TargetENB-ID.h"
-#include "ranap/RANAP_TargetID.h"
-#include "ranap/RANAP_TargetRNC-ID.h"
-#include "ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h"
-#include "ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h"
-#include "ranap/RANAP_TemporaryUE-ID.h"
-#include "ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h"
-#include "ranap/RANAP_Time-UE-StayedInCell.h"
-#include "ranap/RANAP_TimeToMBMSDataTransfer.h"
-#include "ranap/RANAP_TimingDifferenceULDL.h"
-#include "ranap/RANAP_TrCH-ID-List.h"
-#include "ranap/RANAP_TrCH-ID.h"
-#include "ranap/RANAP_TraceDepth.h"
-#include "ranap/RANAP_TraceInformation.h"
-#include "ranap/RANAP_TracePropagationParameters.h"
-#include "ranap/RANAP_TraceRecordingSessionInformation.h"
-#include "ranap/RANAP_TraceRecordingSessionReference.h"
-#include "ranap/RANAP_TraceReference.h"
-#include "ranap/RANAP_TraceType.h"
-#include "ranap/RANAP_TrafficClass.h"
-#include "ranap/RANAP_TrafficHandlingPriority.h"
-#include "ranap/RANAP_TransferDelay.h"
-#include "ranap/RANAP_TransportLayerAddress.h"
-#include "ranap/RANAP_TransportLayerInformation.h"
-#include "ranap/RANAP_TriggerID.h"
-#include "ranap/RANAP_TriggeringMessage.h"
-#include "ranap/RANAP_TunnelInformation.h"
-#include "ranap/RANAP_TypeOfError.h"
-#include "ranap/RANAP_UE-AggregateMaximumBitRate.h"
-#include "ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h"
-#include "ranap/RANAP_UE-AggregateMaximumBitRateUplink.h"
-#include "ranap/RANAP_UE-History-Information.h"
-#include "ranap/RANAP_UE-ID.h"
-#include "ranap/RANAP_UESBI-Iu.h"
-#include "ranap/RANAP_UESBI-IuA.h"
-#include "ranap/RANAP_UESBI-IuB.h"
-#include "ranap/RANAP_UESpecificInformationIndication.h"
-#include "ranap/RANAP_UL-GTP-PDU-SequenceNumber.h"
-#include "ranap/RANAP_UL-N-PDU-SequenceNumber.h"
-#include "ranap/RANAP_UP-ModeVersions.h"
-#include "ranap/RANAP_UPInformation.h"
-#include "ranap/RANAP_UPInitialisationFrame.h"
-#include "ranap/RANAP_USCH-ID.h"
-#include "ranap/RANAP_UTRAN-CellID.h"
-#include "ranap/RANAP_UeRadioCapabilityMatchRequest.h"
-#include "ranap/RANAP_UeRadioCapabilityMatchResponse.h"
-#include "ranap/RANAP_UnsuccessfulLinking-IEs.h"
-#include "ranap/RANAP_UnsuccessfulOutcome.h"
-#include "ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h"
-#include "ranap/RANAP_UplinkInformationExchangeFailure.h"
-#include "ranap/RANAP_UplinkInformationExchangeRequest.h"
-#include "ranap/RANAP_UplinkInformationExchangeResponse.h"
-#include "ranap/RANAP_UserPlaneInformation.h"
-#include "ranap/RANAP_UserPlaneMode.h"
-#include "ranap/RANAP_VelocityEstimate.h"
-#include "ranap/RANAP_VerticalAccuracyCode.h"
-#include "ranap/RANAP_VerticalSpeedDirection.h"
-#include "ranap/RANAP_VerticalVelocity.h"
-#include "ranap/RANAP_VoiceSupportMatchIndicator.h"
+#include <osmocom/osmo-iuh/ranap/RANAP_APN.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_AccuracyFulfilmentIndicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_AllocationOrRetentionPriority.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateInf.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedGuaranteedBitrates.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateInf.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-ExtendedMaxBitrates.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateInf.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrateType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-GuaranteedBitrates.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateInf.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrateType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-MaxBitrates.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrateInf.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedGuaranteedBitrates.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrateInf.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameter-SupportedMaxBitrates.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Alt-RAB-Parameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_AlternativeRABConfigurationRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_AreaIdentity.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Ass-RAB-Parameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedPLMNs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_AuthorisedSNAs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_BindingID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_BroadcastAssistanceDataDecipheringKeys.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CGI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CN-DeactivateTrace.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CN-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CN-InvokeTrace.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CNMBMSLinkingInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CSFB-Information.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Id-List.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Id.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CSG-Membership-Status.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CauseMisc.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CauseNAS.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CauseNon-Standard.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CauseProtocol.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetwork.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CauseRadioNetworkExtension.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CauseTransmissionNetwork.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Access-Mode.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Capacity-Class-Value.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Cell-Id.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CellBased.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CellIdList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CellLoadInformationGroup.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CellType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ChosenEncryptionAlgorithm.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ChosenIntegrityProtectionAlgorithm.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ClassmarkInformation2.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ClassmarkInformation3.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ClientType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CommonID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Correlation-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Criticality.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CriticalityDiagnostics.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_D-RNTI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DCH-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DL-N-PDU-SequenceNumber.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DRX-CycleLengthCoefficient.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DSCH-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DataPDUType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReference.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReport.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DataVolumeReportingIndication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOfErroneousSDU.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DeliveryOrder.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DeltaRAListofIdleModeUEs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DirectInformationTransfer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DirectReportingIndicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DirectTransfer-IE-ContainerList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DirectTransfer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_DirectTransferInformationItem-RANAP-RelocInf.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_E-DCH-MAC-d-Flow-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_E-UTRAN-Service-Handover.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EARFCN-Extended.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ENB-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EUTRANFrequencies.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionAlgorithm.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EncryptionKey.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_End-Of-CSFB.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteConfirm.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EnhancedRelocationCompleteResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_EquipmentsToBeTraced.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ErrorIndication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Event.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Event1F-Parameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Event1I-Parameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedGuaranteedBitrate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedMaxBitrate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ExtendedRNC-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ForwardSRNS-Context.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ForwardingIndication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_FrameSequenceNumber.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_FrequenceLayerConvergenceFlag.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GA-AltitudeAndDirection.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GA-EllipsoidArc.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GA-Point.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitude.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithAltitudeAndUncertaintyEllipsoid.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertainty.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GA-PointWithUnCertaintyEllipse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GA-Polygon.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GA-UncertaintyEllipse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GANSS-PositioningDataSet.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GANSS-PositioningMethodAndUsage.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-BSC-Container.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Cell-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Classmark.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-Item.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GERAN-Iumode-RAB-Failed-RABAssgntResponse-List.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GTP-TEI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalArea.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GeographicalCoordinates.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GlobalCN-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GlobalRNC-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GuaranteedBitrate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_HS-DSCH-MAC-d-Flow-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_HigherBitratesThan16MbpsFlag.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalSpeedAndBearing.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalVelocity.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalVelocityWithUncertainty.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalWithVerticalVelocity.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_HorizontalWithVerticalVelocityAndUncertainty.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IE-Extensions.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IE.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IMEI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IMEIGroup.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IMEIList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IMEISV.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVGroup.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IMEISVList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IMSI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IPMulticastAddress.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IRAT-Measurement-Configuration.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IRATmeasurementParameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ImmediateMDT.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IncludeVelocity.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InformationExchangeID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InformationExchangeType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InformationRequestType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InformationRequested.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferConfirmation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferIndication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InformationTransferType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InitialUE-Message.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InitiatingMessage.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionAlgorithm.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IntegrityProtectionKey.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InterSystemInformation-TransparentContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InterSystemInformationTransferType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_InterfacesToTraceItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Iu-ReleaseCommand.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Iu-ReleaseComplete.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Iu-ReleaseRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IuSigConId-IE-ContainerList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IuSignallingConnectionIdentifier.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_IuTransportAssociation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_JoinedMBMSBearerService-IEs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_KeyStatus.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_L3-Information.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LA-LIST.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LABased.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LAC.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LAI-List.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LAI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LAListofIdleModeUEs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LHN-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LastKnownServiceArea.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LastVisitedUTRANCell-Item.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LeftMBMSBearerService-IEs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Links-to-log.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ListOF-SNAs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ListOfInterfacesToTrace.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LoadValue.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataRequestType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataRequestTypeSpecificToGERANIuMode.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LocationRelatedDataResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LocationReport.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LocationReportingControl.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LocationReportingTransferInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LoggedMDT.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LoggingDuration.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_LoggingInterval.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M1Report.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M2Report.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M4-Collection-Parameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M4-Period.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M4-Threshold.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M4Report.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M5-Period.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M5Report.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M6-Period.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M6Report.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M7-Period.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_M7Report.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMS-PTP-RAB-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSBearerServiceType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCNDe-Registration.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCNDe-RegistrationRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCNDe-RegistrationResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSCountingInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSHCIndicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSIPMulticastAddressandAPNlist.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSLinkingInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABEstablishmentIndication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABRelease.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABReleaseFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRABReleaseRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationRequestType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSRegistrationResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSServiceArea.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionDuration.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionIdentity.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionRepetitionNumber.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStart.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStartFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStartResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStop.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionStopResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionUpdate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionUpdateFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSessionUpdateResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSSynchronisationInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSUELinkingRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MBMSUELinkingResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Activation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Configuration.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MDT-PLMN-List.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MDT-Report-Parameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MDTAreaScope.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MDTMode.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MSISDN.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Management-Based-MDT-Allowed.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MaxBitrate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MaxSDU-Size.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MeasBand.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementQuantity.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MeasurementsToActivate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_MessageStructure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NAS-PDU.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SequenceNumber.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NAS-SynchronisationIndicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NRTLoadInformationValue.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NewBSS-To-OldBSS-Information.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NewRAListofIdleModeUEs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NonSearchingIndication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NotEmptyRAListofIdleModeUEs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NumberOfIuInstances.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_NumberOfSteps.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_OMC-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-APN.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters-ChargingCharacteristics.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Offload-RAB-Parameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_OldBSS-ToNewBSS-Information.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Out-Of-UTRAN.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Outcome.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Overload.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_P-TMSI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type-extension.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PDP-Type.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation-extension.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PDP-TypeInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PDUType14FrameSequenceNumber.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PLMNidentity.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PLMNs-in-shared-network.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Paging.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PagingAreaID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PagingCause.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicLocationInfo.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PeriodicReportingIndicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PermanentNAS-UE-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PermittedEncryptionAlgorithms.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PermittedIntegrityProtectionAlgorithms.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Port-Number.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PositionData.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PositionDataSpecificToGERANIuMode.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataDiscriminator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PositioningDataSet.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PositioningMethodAndUsage.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PositioningPriority.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionCapability.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Pre-emptionVulnerability.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Presence.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Priority-Class-Indicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PriorityLevel.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PrivateIE-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_PrivateMessage.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProcedureCode.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolError-IE-ContainerList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionField.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolExtensionID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-Container.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ContainerPair.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-FieldPair.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProtocolIE-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ProvidedData.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_QueuingAllowed.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AssignmentRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AssignmentResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-AsymmetryIndicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextItem-RANAP-RelocInf.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextList-RANAP-RelocInf.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ContextList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingItem-SRNS-CtxReq.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingList-SRNS-CtxReq.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataForwardingList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportRequestItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-DataVolumeReportRequestList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedItem-EnhRelocInfoRes.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedList-EnhRelocInfoRes.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-FailedList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-IE-ContainerList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-IE-ContainerPairList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ModifyItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ModifyList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ModifyRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-Parameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-QueuedItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-QueuedList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseFailedList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleaseRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedItem-IuRelComp.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedList-IuRelComp.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ReleasedList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-RelocationReleaseItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-RelocationReleaseList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhRelocInfoReq.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhRelocInfoRes.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteReq.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-EnhancedRelocCompleteRes.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-RelocReq.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupItem-RelocReqAck.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhRelocInfoReq.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhRelocInfoRes.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteReq.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-EnhancedRelocCompleteRes.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-RelocReq.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupList-RelocReqAck.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifiedItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifiedList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifyItemFirst.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifyItemSecond.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SetupOrModifyList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-SubflowCombinationBitRate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ToBeReleasedItem-EnhancedRelocCompleteRes.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-ToBeReleasedList-EnhancedRelocCompleteRes.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-Mapping.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAB-TrCH-MappingItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RABDataVolumeReport.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RABParametersList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RABased.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RABs-ContextFailedtoTransferItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RABs-ContextFailedtoTransferList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RABs-failed-to-reportItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RABs-failed-to-reportList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAC.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAI-List.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAListofIdleModeUEs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAListwithNoIdleModeUEsAnyMore.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-EnhancedRelocationInformationRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-EnhancedRelocationInformationResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-PDU.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RANAP-RelocationInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAT-Type.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RAofIdleModeUEs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RIM-Transfer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RIMInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RIMRoutingAddress.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RNC-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RNCTraceInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RNSAPRelocationParameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RRC-Container.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RSRQ-Extension.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RSRQ-Type.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RSRVCC-HO-Indication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RSRVCC-Information.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RSRVCC-Operation-Possible.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RTLoadValue.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RateControlAllowed.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RedirectAttemptFlag.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RedirectionCompleted.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RedirectionIndication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RejectCauseValue.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationCancel.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationCancelAcknowledge.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationCommand.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationComplete.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationDetect.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationPreparationFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequestAcknowledge.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequired.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationRequirement.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RelocationType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber0.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RepetitionNumber1.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ReportAmount.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ReportArea.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ReportChangeOfSAI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ReportInterval.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RequestType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-ExtendedGuaranteedBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-ExtendedMaxBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-GuaranteedBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-MaxBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Requested-RAB-Parameter-Values.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RequestedGANSSAssistanceData.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RequestedGPSAssistanceData.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RequestedLocationRelatedDataType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMBMSIPMulticastAddressandAPNRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_RequestedMulticastServiceList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Reset.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ResetAcknowledge.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ResetResource.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceAckItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceAckList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceAcknowledge.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ResetResourceList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ResidualBitErrorRatio.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_ResponseTime.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SAC.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SAI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SAPI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ErrorRatio.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SDU-FormatInformationParameterItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SDU-Parameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SDU-ParameterItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SNA-Access-Information.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SNAC.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRB-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRB-TrCH-Mapping.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRB-TrCH-MappingItem.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRNS-ContextRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRNS-ContextResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRNS-DataForwardCommand.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-CSKeysRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-CSKeysResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-HO-Indication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-Information.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SRVCC-Operation-Possible.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SecurityModeCommand.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SecurityModeComplete.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SecurityModeReject.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Service-Handover.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Session-Re-establishment-Indicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SessionUpdateID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Shared-Network-Information.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SignallingIndication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Source-ToTarget-TransparentContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SourceBSS-ToTargetBSS-TransparentContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SourceCellID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SourceID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SourceRNC-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SourceRNC-ToTargetRNC-TransparentContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SourceStatisticsDescriptor.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SourceUTRANCellID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SourceeNodeB-ToTargeteNodeB-TransparentContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SubflowSDU-Size.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SubscriberProfileIDforRFP.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SuccessfulOutcome.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SupportedBitrate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_SupportedRAB-ParameterBitrateList.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TAC.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TAI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TBCD-STRING.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TMGI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TMSI.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoReq.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TNLInformationEnhRelInfoRes.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Target-ToSource-TransparentContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TargetBSS-ToSourceBSS-TransparentContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TargetCellId.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TargetENB-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TargetID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TargetRNC-ToSourceRNC-TransparentContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TargeteNodeB-ToSourceeNodeB-TransparentContainer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TemporaryUE-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Time-UE-StayedInCell-EnhancedGranularity.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_Time-UE-StayedInCell.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TimeToMBMSDataTransfer.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TimingDifferenceULDL.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID-List.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TrCH-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TraceDepth.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TraceInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TracePropagationParameters.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TraceRecordingSessionReference.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TraceReference.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TraceType.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TrafficClass.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TrafficHandlingPriority.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TransferDelay.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerAddress.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TransportLayerInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TriggerID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TriggeringMessage.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TunnelInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_TypeOfError.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateDownlink.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UE-AggregateMaximumBitRateUplink.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UE-History-Information.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UE-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-Iu.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-IuA.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UESBI-IuB.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UESpecificInformationIndication.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UL-GTP-PDU-SequenceNumber.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UL-N-PDU-SequenceNumber.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UP-ModeVersions.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UPInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UPInitialisationFrame.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_USCH-ID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UTRAN-CellID.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UeRadioCapabilityMatchRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UeRadioCapabilityMatchResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfulLinking-IEs.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfulOutcome.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UnsuccessfullyTransmittedDataVolume.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UplinkInformationExchangeFailure.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UplinkInformationExchangeRequest.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UplinkInformationExchangeResponse.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneInformation.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_UserPlaneMode.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_VelocityEstimate.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_VerticalAccuracyCode.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_VerticalSpeedDirection.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_VerticalVelocity.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_VoiceSupportMatchIndicator.h>
 
 #if (ASN1C_ENVIRONMENT_VERSION < 924)
 # error "You are compiling with the wrong version of ASN1C"
diff --git a/src/ranap_msg_factory.h b/src/ranap_msg_factory.h
index 2344b05..99c7777 100644
--- a/src/ranap_msg_factory.h
+++ b/src/ranap_msg_factory.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <stdint.h>
-#include "ranap/RANAP_Cause.h"
-#include "ranap/RANAP_CN-DomainIndicator.h"
-#include "ranap/RANAP_GlobalRNC-ID.h"
+#include <osmocom/osmo-iuh/ranap/RANAP_Cause.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_CN-DomainIndicator.h>
+#include <osmocom/osmo-iuh/ranap/RANAP_GlobalRNC-ID.h>
 
 /*! \brief generate RANAP DIRECT TRANSFER message */
 struct msgb *ranap_new_msg_dt(uint8_t sapi, const uint8_t *nas, unsigned int nas_len);
diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am
index aad5a67..87f1940 100644
--- a/src/rua/Makefile.am
+++ b/src/rua/Makefile.am
@@ -72,11 +72,10 @@
 	RUA_PrivateMessage.h	\
 	RUA_IE.h
 
-AM_CFLAGS = $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -I.
+AM_CFLAGS = $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -I../../include
 
 noinst_LIBRARIES=libosmo-asn1-rua.a
 libosmo_asn1_rua_a_SOURCES=$(ASN_MODULE_SOURCES)
-noinst_HEADERS=$(ASN_MODULE_INC)
 libosmo_asn1_rua_a_LIBADD=$(ASN1C_LDADD)
 
 regen: regenerate-from-asn1-source
diff --git a/src/rua_common.h b/src/rua_common.h
index fa4ba83..03c1383 100644
--- a/src/rua_common.h
+++ b/src/rua_common.h
@@ -2,41 +2,41 @@
 
 #include <asn_application.h>
 
-#include "rua/RUA_Ansi-41-IDNNS.h"
-#include "rua/RUA_CN-DomainIndicator.h"
-#include "rua/RUA_CSGMembershipStatus.h"
-#include "rua/RUA_Cause.h"
-#include "rua/RUA_CauseMisc.h"
-#include "rua/RUA_CauseProtocol.h"
-#include "rua/RUA_CauseRadioNetwork.h"
-#include "rua/RUA_CauseTransport.h"
-#include "rua/RUA_Connect.h"
-#include "rua/RUA_ConnectionlessTransfer.h"
-#include "rua/RUA_Context-ID.h"
-#include "rua/RUA_Criticality.h"
-#include "rua/RUA_CriticalityDiagnostics-IE-List.h"
-#include "rua/RUA_CriticalityDiagnostics.h"
-#include "rua/RUA_DirectTransfer.h"
-#include "rua/RUA_Disconnect.h"
-#include "rua/RUA_ErrorIndication.h"
-#include "rua/RUA_Establishment-Cause.h"
-#include "rua/RUA_Gsm-map-IDNNS.h"
-#include "rua/RUA_IE-Extensions.h"
-#include "rua/RUA_IE.h"
-#include "rua/RUA_InitiatingMessage.h"
-#include "rua/RUA_IntraDomainNasNodeSelector.h"
-#include "rua/RUA_Presence.h"
-#include "rua/RUA_PrivateIE-ID.h"
-#include "rua/RUA_PrivateMessage.h"
-#include "rua/RUA_ProcedureCode.h"
-#include "rua/RUA_ProtocolIE-ID.h"
-#include "rua/RUA_RANAP-Message.h"
-#include "rua/RUA_RUA-PDU.h"
-#include "rua/RUA_RoutingParameter.h"
-#include "rua/RUA_SuccessfulOutcome.h"
-#include "rua/RUA_TriggeringMessage.h"
-#include "rua/RUA_TypeOfError.h"
-#include "rua/RUA_UnsuccessfulOutcome.h"
+#include <osmocom/osmo-iuh/rua/RUA_Ansi-41-IDNNS.h>
+#include <osmocom/osmo-iuh/rua/RUA_CN-DomainIndicator.h>
+#include <osmocom/osmo-iuh/rua/RUA_CSGMembershipStatus.h>
+#include <osmocom/osmo-iuh/rua/RUA_Cause.h>
+#include <osmocom/osmo-iuh/rua/RUA_CauseMisc.h>
+#include <osmocom/osmo-iuh/rua/RUA_CauseProtocol.h>
+#include <osmocom/osmo-iuh/rua/RUA_CauseRadioNetwork.h>
+#include <osmocom/osmo-iuh/rua/RUA_CauseTransport.h>
+#include <osmocom/osmo-iuh/rua/RUA_Connect.h>
+#include <osmocom/osmo-iuh/rua/RUA_ConnectionlessTransfer.h>
+#include <osmocom/osmo-iuh/rua/RUA_Context-ID.h>
+#include <osmocom/osmo-iuh/rua/RUA_Criticality.h>
+#include <osmocom/osmo-iuh/rua/RUA_CriticalityDiagnostics-IE-List.h>
+#include <osmocom/osmo-iuh/rua/RUA_CriticalityDiagnostics.h>
+#include <osmocom/osmo-iuh/rua/RUA_DirectTransfer.h>
+#include <osmocom/osmo-iuh/rua/RUA_Disconnect.h>
+#include <osmocom/osmo-iuh/rua/RUA_ErrorIndication.h>
+#include <osmocom/osmo-iuh/rua/RUA_Establishment-Cause.h>
+#include <osmocom/osmo-iuh/rua/RUA_Gsm-map-IDNNS.h>
+#include <osmocom/osmo-iuh/rua/RUA_IE-Extensions.h>
+#include <osmocom/osmo-iuh/rua/RUA_IE.h>
+#include <osmocom/osmo-iuh/rua/RUA_InitiatingMessage.h>
+#include <osmocom/osmo-iuh/rua/RUA_IntraDomainNasNodeSelector.h>
+#include <osmocom/osmo-iuh/rua/RUA_Presence.h>
+#include <osmocom/osmo-iuh/rua/RUA_PrivateIE-ID.h>
+#include <osmocom/osmo-iuh/rua/RUA_PrivateMessage.h>
+#include <osmocom/osmo-iuh/rua/RUA_ProcedureCode.h>
+#include <osmocom/osmo-iuh/rua/RUA_ProtocolIE-ID.h>
+#include <osmocom/osmo-iuh/rua/RUA_RANAP-Message.h>
+#include <osmocom/osmo-iuh/rua/RUA_RUA-PDU.h>
+#include <osmocom/osmo-iuh/rua/RUA_RoutingParameter.h>
+#include <osmocom/osmo-iuh/rua/RUA_SuccessfulOutcome.h>
+#include <osmocom/osmo-iuh/rua/RUA_TriggeringMessage.h>
+#include <osmocom/osmo-iuh/rua/RUA_TypeOfError.h>
+#include <osmocom/osmo-iuh/rua/RUA_UnsuccessfulOutcome.h>
 
 #if (ASN1C_ENVIRONMENT_VERSION < 924)
 # error "You are compiling with the wrong version of ASN1C"