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"