From f1f2d7ca19ec11531c9c5d37355789046025200e Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Tue, 5 Jan 2016 12:00:06 +0100
Subject: Remove osmo-iuh subdir level from include/ (2/2)

Make all changes to #include statements and build files.
---
 src/hnbap/Access-stratum-release-indicator.c    | 2 +-
 src/hnbap/AccessResult.c                        | 2 +-
 src/hnbap/AdditionalNeighbourInfoList.c         | 2 +-
 src/hnbap/AltitudeAndDirection.c                | 2 +-
 src/hnbap/BackoffTimer.c                        | 2 +-
 src/hnbap/BindingID.c                           | 2 +-
 src/hnbap/CELL-FACHMobilitySupport.c            | 2 +-
 src/hnbap/CGI.c                                 | 2 +-
 src/hnbap/CI.c                                  | 2 +-
 src/hnbap/CN-DomainIndicator.c                  | 2 +-
 src/hnbap/CSG-Capability.c                      | 2 +-
 src/hnbap/CSG-ID.c                              | 2 +-
 src/hnbap/CSGMembershipStatus.c                 | 2 +-
 src/hnbap/CSGMembershipUpdate.c                 | 2 +-
 src/hnbap/Cause.c                               | 2 +-
 src/hnbap/CauseMisc.c                           | 2 +-
 src/hnbap/CauseProtocol.c                       | 2 +-
 src/hnbap/CauseRadioNetwork.c                   | 2 +-
 src/hnbap/CauseTransport.c                      | 2 +-
 src/hnbap/CellIdentity.c                        | 2 +-
 src/hnbap/ConfigurationInformation.c            | 2 +-
 src/hnbap/Context-ID.c                          | 2 +-
 src/hnbap/Criticality.c                         | 2 +-
 src/hnbap/CriticalityDiagnostics-IE-List.c      | 2 +-
 src/hnbap/CriticalityDiagnostics.c              | 2 +-
 src/hnbap/ESN.c                                 | 2 +-
 src/hnbap/ErrorIndication.c                     | 2 +-
 src/hnbap/GTP-TEI.c                             | 2 +-
 src/hnbap/GeographicalCoordinates.c             | 2 +-
 src/hnbap/GeographicalLocation.c                | 2 +-
 src/hnbap/HNB-Cell-Access-Mode.c                | 2 +-
 src/hnbap/HNB-Cell-Identifier.c                 | 2 +-
 src/hnbap/HNB-GWResponse.c                      | 2 +-
 src/hnbap/HNB-Identity-Info.c                   | 2 +-
 src/hnbap/HNB-Identity.c                        | 2 +-
 src/hnbap/HNB-Location-Information.c            | 2 +-
 src/hnbap/HNB-RNL-Identity.c                    | 2 +-
 src/hnbap/HNBAP-PDU.c                           | 2 +-
 src/hnbap/HNBCapacity.c                         | 2 +-
 src/hnbap/HNBConfigInfo.c                       | 2 +-
 src/hnbap/HNBConfigTransferRequest.c            | 2 +-
 src/hnbap/HNBConfigTransferResponse.c           | 2 +-
 src/hnbap/HNBConfigurationInformationMissing.c  | 2 +-
 src/hnbap/HNBConfigurationInformationProvided.c | 2 +-
 src/hnbap/HNBDe-Register.c                      | 2 +-
 src/hnbap/HNBRegisterAccept.c                   | 2 +-
 src/hnbap/HNBRegisterReject.c                   | 2 +-
 src/hnbap/HNBRegisterRequest.c                  | 2 +-
 src/hnbap/IE-Extensions.c                       | 2 +-
 src/hnbap/IE.c                                  | 2 +-
 src/hnbap/IMEI.c                                | 2 +-
 src/hnbap/IMSI.c                                | 2 +-
 src/hnbap/IMSIDS41.c                            | 2 +-
 src/hnbap/IMSIESN.c                             | 2 +-
 src/hnbap/IP-Address.c                          | 2 +-
 src/hnbap/InitiatingMessage.c                   | 2 +-
 src/hnbap/Ipv4Address.c                         | 2 +-
 src/hnbap/Ipv6Address.c                         | 2 +-
 src/hnbap/Iurh-Signalling-TNL-AddressList.c     | 2 +-
 src/hnbap/LAC.c                                 | 2 +-
 src/hnbap/LAI.c                                 | 2 +-
 src/hnbap/MacroCellID.c                         | 2 +-
 src/hnbap/MacroCoverageInformation.c            | 2 +-
 src/hnbap/Makefile.am                           | 2 +-
 src/hnbap/MuxPortNumber.c                       | 2 +-
 src/hnbap/NeighbourCellIdentityList.c           | 2 +-
 src/hnbap/NeighbourIdentity.c                   | 2 +-
 src/hnbap/NeighbourInfoList.c                   | 2 +-
 src/hnbap/NeighbourInfoRequestItem.c            | 2 +-
 src/hnbap/NeighbourInfoRequestList.c            | 2 +-
 src/hnbap/PLMNidentity.c                        | 2 +-
 src/hnbap/PSC.c                                 | 2 +-
 src/hnbap/PTMSI.c                               | 2 +-
 src/hnbap/PTMSIRAI.c                            | 2 +-
 src/hnbap/Presence.c                            | 2 +-
 src/hnbap/PrivateIE-ID.c                        | 2 +-
 src/hnbap/PrivateMessage.c                      | 2 +-
 src/hnbap/ProcedureCode.c                       | 2 +-
 src/hnbap/ProtocolIE-ID.c                       | 2 +-
 src/hnbap/RAB-ID.c                              | 2 +-
 src/hnbap/RABList.c                             | 2 +-
 src/hnbap/RABListItem.c                         | 2 +-
 src/hnbap/RAC.c                                 | 2 +-
 src/hnbap/RAI.c                                 | 2 +-
 src/hnbap/RNC-ID.c                              | 2 +-
 src/hnbap/Registration-Cause.c                  | 2 +-
 src/hnbap/RelocationComplete.c                  | 2 +-
 src/hnbap/S-RNTIPrefix.c                        | 2 +-
 src/hnbap/SAC.c                                 | 2 +-
 src/hnbap/SuccessfulOutcome.c                   | 2 +-
 src/hnbap/TMSIDS41.c                            | 2 +-
 src/hnbap/TMSILAI.c                             | 2 +-
 src/hnbap/TNLUpdateFailure.c                    | 2 +-
 src/hnbap/TNLUpdateRequest.c                    | 2 +-
 src/hnbap/TNLUpdateResponse.c                   | 2 +-
 src/hnbap/TransportInfo.c                       | 2 +-
 src/hnbap/TransportLayerAddress.c               | 2 +-
 src/hnbap/TriggeringMessage.c                   | 2 +-
 src/hnbap/Tunnel-Information.c                  | 2 +-
 src/hnbap/TypeOfError.c                         | 2 +-
 src/hnbap/U-RNTI.c                              | 2 +-
 src/hnbap/U-RNTIQueryRequest.c                  | 2 +-
 src/hnbap/U-RNTIQueryResponse.c                 | 2 +-
 src/hnbap/UDP-Port-Number.c                     | 2 +-
 src/hnbap/UE-Capabilities.c                     | 2 +-
 src/hnbap/UE-Identity.c                         | 2 +-
 src/hnbap/UEDe-Register.c                       | 2 +-
 src/hnbap/UERegisterAccept.c                    | 2 +-
 src/hnbap/UERegisterReject.c                    | 2 +-
 src/hnbap/UERegisterRequest.c                   | 2 +-
 src/hnbap/URAIdentity.c                         | 2 +-
 src/hnbap/URAIdentityList.c                     | 2 +-
 src/hnbap/UTRANCellID.c                         | 2 +-
 src/hnbap/UnknownU-RNTIIndication.c             | 2 +-
 src/hnbap/UnsuccessfulOutcome.c                 | 2 +-
 src/hnbap/Update-cause.c                        | 2 +-
 116 files changed, 116 insertions(+), 116 deletions(-)

(limited to 'src/hnbap')

diff --git a/src/hnbap/Access-stratum-release-indicator.c b/src/hnbap/Access-stratum-release-indicator.c
index 746832e..cf16e39 100644
--- a/src/hnbap/Access-stratum-release-indicator.c
+++ b/src/hnbap/Access-stratum-release-indicator.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Access-stratum-release-indicator.h>
+#include <osmocom/hnbap/Access-stratum-release-indicator.h>
 
 int
 Access_stratum_release_indicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/AccessResult.c b/src/hnbap/AccessResult.c
index e0cec05..705f6b2 100644
--- a/src/hnbap/AccessResult.c
+++ b/src/hnbap/AccessResult.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/AccessResult.h>
+#include <osmocom/hnbap/AccessResult.h>
 
 int
 AccessResult_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/AdditionalNeighbourInfoList.c b/src/hnbap/AdditionalNeighbourInfoList.c
index 5360e51..7049be2 100644
--- a/src/hnbap/AdditionalNeighbourInfoList.c
+++ b/src/hnbap/AdditionalNeighbourInfoList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/AdditionalNeighbourInfoList.h>
+#include <osmocom/hnbap/AdditionalNeighbourInfoList.h>
 
 static asn_per_constraints_t asn_PER_type_AdditionalNeighbourInfoList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/AltitudeAndDirection.c b/src/hnbap/AltitudeAndDirection.c
index d1fceee..afc4f6e 100644
--- a/src/hnbap/AltitudeAndDirection.c
+++ b/src/hnbap/AltitudeAndDirection.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/AltitudeAndDirection.h>
+#include <osmocom/hnbap/AltitudeAndDirection.h>
 
 static int
 directionOfAltitude_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/BackoffTimer.c b/src/hnbap/BackoffTimer.c
index 4057807..81f0b56 100644
--- a/src/hnbap/BackoffTimer.c
+++ b/src/hnbap/BackoffTimer.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/BackoffTimer.h>
+#include <osmocom/hnbap/BackoffTimer.h>
 
 int
 BackoffTimer_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/BindingID.c b/src/hnbap/BindingID.c
index 6ba857c..b806fdf 100644
--- a/src/hnbap/BindingID.c
+++ b/src/hnbap/BindingID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/BindingID.h>
+#include <osmocom/hnbap/BindingID.h>
 
 int
 BindingID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CELL-FACHMobilitySupport.c b/src/hnbap/CELL-FACHMobilitySupport.c
index eb026c0..0ef8524 100644
--- a/src/hnbap/CELL-FACHMobilitySupport.c
+++ b/src/hnbap/CELL-FACHMobilitySupport.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CELL-FACHMobilitySupport.h>
+#include <osmocom/hnbap/CELL-FACHMobilitySupport.h>
 
 int
 CELL_FACHMobilitySupport_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CGI.c b/src/hnbap/CGI.c
index d7ea770..e4b5683 100644
--- a/src/hnbap/CGI.c
+++ b/src/hnbap/CGI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CGI.h>
+#include <osmocom/hnbap/CGI.h>
 
 static asn_TYPE_member_t asn_MBR_CGI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct CGI, pLMNidentity),
diff --git a/src/hnbap/CI.c b/src/hnbap/CI.c
index d028842..efe1b91 100644
--- a/src/hnbap/CI.c
+++ b/src/hnbap/CI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CI.h>
+#include <osmocom/hnbap/CI.h>
 
 int
 CI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CN-DomainIndicator.c b/src/hnbap/CN-DomainIndicator.c
index effdf66..aad8d8f 100644
--- a/src/hnbap/CN-DomainIndicator.c
+++ b/src/hnbap/CN-DomainIndicator.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CN-DomainIndicator.h>
+#include <osmocom/hnbap/CN-DomainIndicator.h>
 
 int
 CN_DomainIndicator_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CSG-Capability.c b/src/hnbap/CSG-Capability.c
index acd31fd..b451923 100644
--- a/src/hnbap/CSG-Capability.c
+++ b/src/hnbap/CSG-Capability.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CSG-Capability.h>
+#include <osmocom/hnbap/CSG-Capability.h>
 
 int
 CSG_Capability_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CSG-ID.c b/src/hnbap/CSG-ID.c
index 89720c3..2be0029 100644
--- a/src/hnbap/CSG-ID.c
+++ b/src/hnbap/CSG-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CSG-ID.h>
+#include <osmocom/hnbap/CSG-ID.h>
 
 int
 CSG_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CSGMembershipStatus.c b/src/hnbap/CSGMembershipStatus.c
index 2259429..9c672e4 100644
--- a/src/hnbap/CSGMembershipStatus.c
+++ b/src/hnbap/CSGMembershipStatus.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CSGMembershipStatus.h>
+#include <osmocom/hnbap/CSGMembershipStatus.h>
 
 int
 CSGMembershipStatus_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CSGMembershipUpdate.c b/src/hnbap/CSGMembershipUpdate.c
index 6277a68..d33562a 100644
--- a/src/hnbap/CSGMembershipUpdate.c
+++ b/src/hnbap/CSGMembershipUpdate.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CSGMembershipUpdate.h>
+#include <osmocom/hnbap/CSGMembershipUpdate.h>
 
 static int
 memb_csgMembershipUpdate_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Cause.c b/src/hnbap/Cause.c
index b0498ab..229ef51 100644
--- a/src/hnbap/Cause.c
+++ b/src/hnbap/Cause.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Cause.h>
+#include <osmocom/hnbap/Cause.h>
 
 static asn_per_constraints_t asn_PER_type_Cause_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  3l }	/* (0..3,...) */,
diff --git a/src/hnbap/CauseMisc.c b/src/hnbap/CauseMisc.c
index 9626ed7..3ab86d8 100644
--- a/src/hnbap/CauseMisc.c
+++ b/src/hnbap/CauseMisc.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CauseMisc.h>
+#include <osmocom/hnbap/CauseMisc.h>
 
 int
 CauseMisc_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CauseProtocol.c b/src/hnbap/CauseProtocol.c
index 01fe69d..0529318 100644
--- a/src/hnbap/CauseProtocol.c
+++ b/src/hnbap/CauseProtocol.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CauseProtocol.h>
+#include <osmocom/hnbap/CauseProtocol.h>
 
 int
 CauseProtocol_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CauseRadioNetwork.c b/src/hnbap/CauseRadioNetwork.c
index 13b83e2..c7c1fd3 100644
--- a/src/hnbap/CauseRadioNetwork.c
+++ b/src/hnbap/CauseRadioNetwork.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CauseRadioNetwork.h>
+#include <osmocom/hnbap/CauseRadioNetwork.h>
 
 int
 CauseRadioNetwork_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CauseTransport.c b/src/hnbap/CauseTransport.c
index 92a8d28..5af93bd 100644
--- a/src/hnbap/CauseTransport.c
+++ b/src/hnbap/CauseTransport.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CauseTransport.h>
+#include <osmocom/hnbap/CauseTransport.h>
 
 int
 CauseTransport_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CellIdentity.c b/src/hnbap/CellIdentity.c
index 88459ae..e03dabf 100644
--- a/src/hnbap/CellIdentity.c
+++ b/src/hnbap/CellIdentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CellIdentity.h>
+#include <osmocom/hnbap/CellIdentity.h>
 
 int
 CellIdentity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/ConfigurationInformation.c b/src/hnbap/ConfigurationInformation.c
index bc9f9d8..b9b7be3 100644
--- a/src/hnbap/ConfigurationInformation.c
+++ b/src/hnbap/ConfigurationInformation.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ConfigurationInformation.h>
+#include <osmocom/hnbap/ConfigurationInformation.h>
 
 static asn_per_constraints_t asn_PER_type_ConfigurationInformation_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/Context-ID.c b/src/hnbap/Context-ID.c
index 5fca828..9204c4c 100644
--- a/src/hnbap/Context-ID.c
+++ b/src/hnbap/Context-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Context-ID.h>
+#include <osmocom/hnbap/Context-ID.h>
 
 int
 Context_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Criticality.c b/src/hnbap/Criticality.c
index 801a88d..5aacb69 100644
--- a/src/hnbap/Criticality.c
+++ b/src/hnbap/Criticality.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Criticality.h>
+#include <osmocom/hnbap/Criticality.h>
 
 int
 Criticality_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/CriticalityDiagnostics-IE-List.c b/src/hnbap/CriticalityDiagnostics-IE-List.c
index f90a9fa..b3f48e8 100644
--- a/src/hnbap/CriticalityDiagnostics-IE-List.c
+++ b/src/hnbap/CriticalityDiagnostics-IE-List.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics-IE-List.h>
+#include <osmocom/hnbap/CriticalityDiagnostics-IE-List.h>
 
 static asn_per_constraints_t asn_PER_type_CriticalityDiagnostics_IE_List_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/CriticalityDiagnostics.c b/src/hnbap/CriticalityDiagnostics.c
index 5332086..289ae3c 100644
--- a/src/hnbap/CriticalityDiagnostics.c
+++ b/src/hnbap/CriticalityDiagnostics.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/CriticalityDiagnostics.h>
+#include <osmocom/hnbap/CriticalityDiagnostics.h>
 
 static asn_TYPE_member_t asn_MBR_CriticalityDiagnostics_1[] = {
 	{ ATF_POINTER, 5, offsetof(struct CriticalityDiagnostics, procedureCode),
diff --git a/src/hnbap/ESN.c b/src/hnbap/ESN.c
index c442c25..1f04d0c 100644
--- a/src/hnbap/ESN.c
+++ b/src/hnbap/ESN.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ESN.h>
+#include <osmocom/hnbap/ESN.h>
 
 int
 ESN_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/ErrorIndication.c b/src/hnbap/ErrorIndication.c
index f0ff6a7..9765617 100644
--- a/src/hnbap/ErrorIndication.c
+++ b/src/hnbap/ErrorIndication.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ErrorIndication.h>
+#include <osmocom/hnbap/ErrorIndication.h>
 
 static int
 memb_errorIndication_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/GTP-TEI.c b/src/hnbap/GTP-TEI.c
index 6e91ef7..e8cea0c 100644
--- a/src/hnbap/GTP-TEI.c
+++ b/src/hnbap/GTP-TEI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/GTP-TEI.h>
+#include <osmocom/hnbap/GTP-TEI.h>
 
 int
 GTP_TEI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/GeographicalCoordinates.c b/src/hnbap/GeographicalCoordinates.c
index 7467dbd..329b709 100644
--- a/src/hnbap/GeographicalCoordinates.c
+++ b/src/hnbap/GeographicalCoordinates.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/GeographicalCoordinates.h>
+#include <osmocom/hnbap/GeographicalCoordinates.h>
 
 static int
 latitudeSign_2_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/GeographicalLocation.c b/src/hnbap/GeographicalLocation.c
index e4a07dc..a151db9 100644
--- a/src/hnbap/GeographicalLocation.c
+++ b/src/hnbap/GeographicalLocation.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/GeographicalLocation.h>
+#include <osmocom/hnbap/GeographicalLocation.h>
 
 static asn_TYPE_member_t asn_MBR_GeographicalLocation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct GeographicalLocation, geographicalCoordinates),
diff --git a/src/hnbap/HNB-Cell-Access-Mode.c b/src/hnbap/HNB-Cell-Access-Mode.c
index 1925813..ae2371b 100644
--- a/src/hnbap/HNB-Cell-Access-Mode.c
+++ b/src/hnbap/HNB-Cell-Access-Mode.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Access-Mode.h>
+#include <osmocom/hnbap/HNB-Cell-Access-Mode.h>
 
 int
 HNB_Cell_Access_Mode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNB-Cell-Identifier.c b/src/hnbap/HNB-Cell-Identifier.c
index 0ee6816..20a4e5e 100644
--- a/src/hnbap/HNB-Cell-Identifier.c
+++ b/src/hnbap/HNB-Cell-Identifier.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-Cell-Identifier.h>
+#include <osmocom/hnbap/HNB-Cell-Identifier.h>
 
 static asn_TYPE_member_t asn_MBR_HNB_Cell_Identifier_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct HNB_Cell_Identifier, pLMNidentity),
diff --git a/src/hnbap/HNB-GWResponse.c b/src/hnbap/HNB-GWResponse.c
index a220d39..add7821 100644
--- a/src/hnbap/HNB-GWResponse.c
+++ b/src/hnbap/HNB-GWResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-GWResponse.h>
+#include <osmocom/hnbap/HNB-GWResponse.h>
 
 static asn_per_constraints_t asn_PER_type_HNB_GWResponse_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  2l }	/* (0..2,...) */,
diff --git a/src/hnbap/HNB-Identity-Info.c b/src/hnbap/HNB-Identity-Info.c
index 163730d..51e9f0f 100644
--- a/src/hnbap/HNB-Identity-Info.c
+++ b/src/hnbap/HNB-Identity-Info.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-Identity-Info.h>
+#include <osmocom/hnbap/HNB-Identity-Info.h>
 
 int
 HNB_Identity_Info_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNB-Identity.c b/src/hnbap/HNB-Identity.c
index 2389407..a442f1a 100644
--- a/src/hnbap/HNB-Identity.c
+++ b/src/hnbap/HNB-Identity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-Identity.h>
+#include <osmocom/hnbap/HNB-Identity.h>
 
 static asn_TYPE_member_t asn_MBR_HNB_Identity_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct HNB_Identity, hNB_Identity_Info),
diff --git a/src/hnbap/HNB-Location-Information.c b/src/hnbap/HNB-Location-Information.c
index a025eda..eba9787 100644
--- a/src/hnbap/HNB-Location-Information.c
+++ b/src/hnbap/HNB-Location-Information.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-Location-Information.h>
+#include <osmocom/hnbap/HNB-Location-Information.h>
 
 static asn_TYPE_member_t asn_MBR_HNB_Location_Information_1[] = {
 	{ ATF_POINTER, 3, offsetof(struct HNB_Location_Information, macroCoverageInfo),
diff --git a/src/hnbap/HNB-RNL-Identity.c b/src/hnbap/HNB-RNL-Identity.c
index 23b0ed1..3a51832 100644
--- a/src/hnbap/HNB-RNL-Identity.c
+++ b/src/hnbap/HNB-RNL-Identity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNB-RNL-Identity.h>
+#include <osmocom/hnbap/HNB-RNL-Identity.h>
 
 static asn_per_constraints_t asn_PER_type_HNB_RNL_Identity_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  0,  0,  0l,  0l }	/* (0..0,...) */,
diff --git a/src/hnbap/HNBAP-PDU.c b/src/hnbap/HNBAP-PDU.c
index 2661ba2..998a1d2 100644
--- a/src/hnbap/HNBAP-PDU.c
+++ b/src/hnbap/HNBAP-PDU.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBAP-PDU.h>
+#include <osmocom/hnbap/HNBAP-PDU.h>
 
 static asn_per_constraints_t asn_PER_type_HNBAP_PDU_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  2,  2,  0l,  2l }	/* (0..2,...) */,
diff --git a/src/hnbap/HNBCapacity.c b/src/hnbap/HNBCapacity.c
index 535fab4..0d58c65 100644
--- a/src/hnbap/HNBCapacity.c
+++ b/src/hnbap/HNBCapacity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBCapacity.h>
+#include <osmocom/hnbap/HNBCapacity.h>
 
 int
 HNBCapacity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBConfigInfo.c b/src/hnbap/HNBConfigInfo.c
index 8cdd461..06c7798 100644
--- a/src/hnbap/HNBConfigInfo.c
+++ b/src/hnbap/HNBConfigInfo.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigInfo.h>
+#include <osmocom/hnbap/HNBConfigInfo.h>
 
 static asn_TYPE_member_t asn_MBR_HNBConfigInfo_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct HNBConfigInfo, hnb_RNL_Identity),
diff --git a/src/hnbap/HNBConfigTransferRequest.c b/src/hnbap/HNBConfigTransferRequest.c
index 2e087ca..db119a2 100644
--- a/src/hnbap/HNBConfigTransferRequest.c
+++ b/src/hnbap/HNBConfigTransferRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferRequest.h>
+#include <osmocom/hnbap/HNBConfigTransferRequest.h>
 
 static int
 memb_hnbConfigTransferRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBConfigTransferResponse.c b/src/hnbap/HNBConfigTransferResponse.c
index 4630f0b..116758d 100644
--- a/src/hnbap/HNBConfigTransferResponse.c
+++ b/src/hnbap/HNBConfigTransferResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigTransferResponse.h>
+#include <osmocom/hnbap/HNBConfigTransferResponse.h>
 
 static int
 memb_hnbConfigTransferResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBConfigurationInformationMissing.c b/src/hnbap/HNBConfigurationInformationMissing.c
index fec67a6..0b41f92 100644
--- a/src/hnbap/HNBConfigurationInformationMissing.c
+++ b/src/hnbap/HNBConfigurationInformationMissing.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationMissing.h>
+#include <osmocom/hnbap/HNBConfigurationInformationMissing.h>
 
 static asn_TYPE_member_t asn_MBR_HNBConfigurationInformationMissing_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct HNBConfigurationInformationMissing, cause),
diff --git a/src/hnbap/HNBConfigurationInformationProvided.c b/src/hnbap/HNBConfigurationInformationProvided.c
index baa6f71..4957fba 100644
--- a/src/hnbap/HNBConfigurationInformationProvided.c
+++ b/src/hnbap/HNBConfigurationInformationProvided.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBConfigurationInformationProvided.h>
+#include <osmocom/hnbap/HNBConfigurationInformationProvided.h>
 
 static asn_TYPE_member_t asn_MBR_HNBConfigurationInformationProvided_1[] = {
 	{ ATF_POINTER, 2, offsetof(struct HNBConfigurationInformationProvided, psc),
diff --git a/src/hnbap/HNBDe-Register.c b/src/hnbap/HNBDe-Register.c
index f99634c..f31e842 100644
--- a/src/hnbap/HNBDe-Register.c
+++ b/src/hnbap/HNBDe-Register.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBDe-Register.h>
+#include <osmocom/hnbap/HNBDe-Register.h>
 
 static int
 memb_hnbDe_Register_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBRegisterAccept.c b/src/hnbap/HNBRegisterAccept.c
index 3dd7189..37f2332 100644
--- a/src/hnbap/HNBRegisterAccept.c
+++ b/src/hnbap/HNBRegisterAccept.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBRegisterAccept.h>
+#include <osmocom/hnbap/HNBRegisterAccept.h>
 
 static int
 memb_hnbRegisterAccept_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBRegisterReject.c b/src/hnbap/HNBRegisterReject.c
index 7447a28..077db72 100644
--- a/src/hnbap/HNBRegisterReject.c
+++ b/src/hnbap/HNBRegisterReject.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBRegisterReject.h>
+#include <osmocom/hnbap/HNBRegisterReject.h>
 
 static int
 memb_hnbRegisterReject_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/HNBRegisterRequest.c b/src/hnbap/HNBRegisterRequest.c
index 92aa0a8..9b58f9c 100644
--- a/src/hnbap/HNBRegisterRequest.c
+++ b/src/hnbap/HNBRegisterRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/HNBRegisterRequest.h>
+#include <osmocom/hnbap/HNBRegisterRequest.h>
 
 static int
 memb_hnbRegisterRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/IE-Extensions.c b/src/hnbap/IE-Extensions.c
index f8d3e10..67db752 100644
--- a/src/hnbap/IE-Extensions.c
+++ b/src/hnbap/IE-Extensions.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IE-Extensions.h>
+#include <osmocom/hnbap/IE-Extensions.h>
 
 static asn_per_constraints_t asn_PER_type_IE_Extensions_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/IE.c b/src/hnbap/IE.c
index fc9c45e..5e6763a 100644
--- a/src/hnbap/IE.c
+++ b/src/hnbap/IE.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IE.h>
+#include <osmocom/hnbap/IE.h>
 
 static asn_TYPE_member_t asn_MBR_IE_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct IE, id),
diff --git a/src/hnbap/IMEI.c b/src/hnbap/IMEI.c
index 8e5ce2c..a920c59 100644
--- a/src/hnbap/IMEI.c
+++ b/src/hnbap/IMEI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IMEI.h>
+#include <osmocom/hnbap/IMEI.h>
 
 int
 IMEI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/IMSI.c b/src/hnbap/IMSI.c
index 2bb1f3d..9b5f2da 100644
--- a/src/hnbap/IMSI.c
+++ b/src/hnbap/IMSI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IMSI.h>
+#include <osmocom/hnbap/IMSI.h>
 
 int
 IMSI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/IMSIDS41.c b/src/hnbap/IMSIDS41.c
index c7547c9..b2ebdbd 100644
--- a/src/hnbap/IMSIDS41.c
+++ b/src/hnbap/IMSIDS41.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IMSIDS41.h>
+#include <osmocom/hnbap/IMSIDS41.h>
 
 int
 IMSIDS41_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/IMSIESN.c b/src/hnbap/IMSIESN.c
index 19fd7b9..31425ea 100644
--- a/src/hnbap/IMSIESN.c
+++ b/src/hnbap/IMSIESN.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IMSIESN.h>
+#include <osmocom/hnbap/IMSIESN.h>
 
 static asn_TYPE_member_t asn_MBR_IMSIESN_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct IMSIESN, iMSIDS41),
diff --git a/src/hnbap/IP-Address.c b/src/hnbap/IP-Address.c
index 0b3b94e..ee977b4 100644
--- a/src/hnbap/IP-Address.c
+++ b/src/hnbap/IP-Address.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/IP-Address.h>
+#include <osmocom/hnbap/IP-Address.h>
 
 static asn_per_constraints_t asn_PER_type_ipaddress_constr_2 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/InitiatingMessage.c b/src/hnbap/InitiatingMessage.c
index 144f211..c165290 100644
--- a/src/hnbap/InitiatingMessage.c
+++ b/src/hnbap/InitiatingMessage.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/InitiatingMessage.h>
+#include <osmocom/hnbap/InitiatingMessage.h>
 
 static asn_TYPE_member_t asn_MBR_InitiatingMessage_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct InitiatingMessage, procedureCode),
diff --git a/src/hnbap/Ipv4Address.c b/src/hnbap/Ipv4Address.c
index 7bf96f8..b56a5a5 100644
--- a/src/hnbap/Ipv4Address.c
+++ b/src/hnbap/Ipv4Address.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Ipv4Address.h>
+#include <osmocom/hnbap/Ipv4Address.h>
 
 int
 Ipv4Address_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Ipv6Address.c b/src/hnbap/Ipv6Address.c
index f9b7e43..5be471f 100644
--- a/src/hnbap/Ipv6Address.c
+++ b/src/hnbap/Ipv6Address.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Ipv6Address.h>
+#include <osmocom/hnbap/Ipv6Address.h>
 
 int
 Ipv6Address_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Iurh-Signalling-TNL-AddressList.c b/src/hnbap/Iurh-Signalling-TNL-AddressList.c
index 2ac7bb2..f418eb1 100644
--- a/src/hnbap/Iurh-Signalling-TNL-AddressList.c
+++ b/src/hnbap/Iurh-Signalling-TNL-AddressList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Iurh-Signalling-TNL-AddressList.h>
+#include <osmocom/hnbap/Iurh-Signalling-TNL-AddressList.h>
 
 static asn_per_constraints_t asn_PER_type_Iurh_Signalling_TNL_AddressList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/LAC.c b/src/hnbap/LAC.c
index 850fab5..a46147f 100644
--- a/src/hnbap/LAC.c
+++ b/src/hnbap/LAC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/LAC.h>
+#include <osmocom/hnbap/LAC.h>
 
 int
 LAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/LAI.c b/src/hnbap/LAI.c
index 43e20d2..1bb23c1 100644
--- a/src/hnbap/LAI.c
+++ b/src/hnbap/LAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/LAI.h>
+#include <osmocom/hnbap/LAI.h>
 
 static asn_TYPE_member_t asn_MBR_LAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct LAI, pLMNID),
diff --git a/src/hnbap/MacroCellID.c b/src/hnbap/MacroCellID.c
index 90e4b86..215a54e 100644
--- a/src/hnbap/MacroCellID.c
+++ b/src/hnbap/MacroCellID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/MacroCellID.h>
+#include <osmocom/hnbap/MacroCellID.h>
 
 static asn_per_constraints_t asn_PER_type_MacroCellID_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/MacroCoverageInformation.c b/src/hnbap/MacroCoverageInformation.c
index 40716ae..a60f41c 100644
--- a/src/hnbap/MacroCoverageInformation.c
+++ b/src/hnbap/MacroCoverageInformation.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/MacroCoverageInformation.h>
+#include <osmocom/hnbap/MacroCoverageInformation.h>
 
 static asn_TYPE_member_t asn_MBR_MacroCoverageInformation_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct MacroCoverageInformation, cellIdentity),
diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am
index c918dc6..1b05050 100644
--- a/src/hnbap/Makefile.am
+++ b/src/hnbap/Makefile.am
@@ -245,4 +245,4 @@ regenerate-from-asn1-source:
 #	remove the local copy of the runtime code
 	-rm ANY.* BOOLEAN.* INTEGER.* NativeEnumerated.* NativeInteger.* OBJECT_IDENTIFIER.* asn_* OCTET_STRING.* converter-sample.c per_* xer_* constr* der_* ber_* BIT_STRING.*
 #	change include style to `#include <dir/foo.h>'
-	../../move-asn1-header-files.sh osmocom/osmo-iuh/hnbap $(ASN_MODULE_INC)
+	../../move-asn1-header-files.sh osmocom/hnbap $(ASN_MODULE_INC)
diff --git a/src/hnbap/MuxPortNumber.c b/src/hnbap/MuxPortNumber.c
index 11045d1..32e88f8 100644
--- a/src/hnbap/MuxPortNumber.c
+++ b/src/hnbap/MuxPortNumber.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/MuxPortNumber.h>
+#include <osmocom/hnbap/MuxPortNumber.h>
 
 int
 MuxPortNumber_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/NeighbourCellIdentityList.c b/src/hnbap/NeighbourCellIdentityList.c
index 822c8c4..147780a 100644
--- a/src/hnbap/NeighbourCellIdentityList.c
+++ b/src/hnbap/NeighbourCellIdentityList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourCellIdentityList.h>
+#include <osmocom/hnbap/NeighbourCellIdentityList.h>
 
 static asn_per_constraints_t asn_PER_type_NeighbourCellIdentityList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/NeighbourIdentity.c b/src/hnbap/NeighbourIdentity.c
index 7b91d61..0b23df9 100644
--- a/src/hnbap/NeighbourIdentity.c
+++ b/src/hnbap/NeighbourIdentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourIdentity.h>
+#include <osmocom/hnbap/NeighbourIdentity.h>
 
 static asn_per_constraints_t asn_PER_type_NeighbourIdentity_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/NeighbourInfoList.c b/src/hnbap/NeighbourInfoList.c
index 6ab0861..457a208 100644
--- a/src/hnbap/NeighbourInfoList.c
+++ b/src/hnbap/NeighbourInfoList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoList.h>
+#include <osmocom/hnbap/NeighbourInfoList.h>
 
 static asn_per_constraints_t asn_PER_type_NeighbourInfoList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/NeighbourInfoRequestItem.c b/src/hnbap/NeighbourInfoRequestItem.c
index 3c9d323..0db194c 100644
--- a/src/hnbap/NeighbourInfoRequestItem.c
+++ b/src/hnbap/NeighbourInfoRequestItem.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestItem.h>
+#include <osmocom/hnbap/NeighbourInfoRequestItem.h>
 
 static asn_TYPE_member_t asn_MBR_NeighbourInfoRequestItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct NeighbourInfoRequestItem, hnb_RNL_Identity),
diff --git a/src/hnbap/NeighbourInfoRequestList.c b/src/hnbap/NeighbourInfoRequestList.c
index 7c44216..20c786e 100644
--- a/src/hnbap/NeighbourInfoRequestList.c
+++ b/src/hnbap/NeighbourInfoRequestList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/NeighbourInfoRequestList.h>
+#include <osmocom/hnbap/NeighbourInfoRequestList.h>
 
 static asn_per_constraints_t asn_PER_type_NeighbourInfoRequestList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/PLMNidentity.c b/src/hnbap/PLMNidentity.c
index 2e6ca1b..8356b6c 100644
--- a/src/hnbap/PLMNidentity.c
+++ b/src/hnbap/PLMNidentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PLMNidentity.h>
+#include <osmocom/hnbap/PLMNidentity.h>
 
 int
 PLMNidentity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PSC.c b/src/hnbap/PSC.c
index 1a3eb96..378f09f 100644
--- a/src/hnbap/PSC.c
+++ b/src/hnbap/PSC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PSC.h>
+#include <osmocom/hnbap/PSC.h>
 
 int
 PSC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PTMSI.c b/src/hnbap/PTMSI.c
index 9483033..3b37f57 100644
--- a/src/hnbap/PTMSI.c
+++ b/src/hnbap/PTMSI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PTMSI.h>
+#include <osmocom/hnbap/PTMSI.h>
 
 int
 PTMSI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PTMSIRAI.c b/src/hnbap/PTMSIRAI.c
index 100ce33..d592ee1 100644
--- a/src/hnbap/PTMSIRAI.c
+++ b/src/hnbap/PTMSIRAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PTMSIRAI.h>
+#include <osmocom/hnbap/PTMSIRAI.h>
 
 static asn_TYPE_member_t asn_MBR_PTMSIRAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct PTMSIRAI, pTMSI),
diff --git a/src/hnbap/Presence.c b/src/hnbap/Presence.c
index 0145b55..f27cca7 100644
--- a/src/hnbap/Presence.c
+++ b/src/hnbap/Presence.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Presence.h>
+#include <osmocom/hnbap/Presence.h>
 
 int
 Presence_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PrivateIE-ID.c b/src/hnbap/PrivateIE-ID.c
index d1abb8e..183852e 100644
--- a/src/hnbap/PrivateIE-ID.c
+++ b/src/hnbap/PrivateIE-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PrivateIE-ID.h>
+#include <osmocom/hnbap/PrivateIE-ID.h>
 
 static int
 memb_local_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/PrivateMessage.c b/src/hnbap/PrivateMessage.c
index e977d28..52eb933 100644
--- a/src/hnbap/PrivateMessage.c
+++ b/src/hnbap/PrivateMessage.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/PrivateMessage.h>
+#include <osmocom/hnbap/PrivateMessage.h>
 
 static int
 memb_privateMessage_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/ProcedureCode.c b/src/hnbap/ProcedureCode.c
index daa9700..2f95db7 100644
--- a/src/hnbap/ProcedureCode.c
+++ b/src/hnbap/ProcedureCode.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ProcedureCode.h>
+#include <osmocom/hnbap/ProcedureCode.h>
 
 int
 ProcedureCode_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/ProtocolIE-ID.c b/src/hnbap/ProtocolIE-ID.c
index f354abe..c0a3681 100644
--- a/src/hnbap/ProtocolIE-ID.c
+++ b/src/hnbap/ProtocolIE-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/ProtocolIE-ID.h>
+#include <osmocom/hnbap/ProtocolIE-ID.h>
 
 int
 ProtocolIE_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/RAB-ID.c b/src/hnbap/RAB-ID.c
index 2258617..47d8905 100644
--- a/src/hnbap/RAB-ID.c
+++ b/src/hnbap/RAB-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RAB-ID.h>
+#include <osmocom/hnbap/RAB-ID.h>
 
 int
 RAB_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/RABList.c b/src/hnbap/RABList.c
index 095d758..393dcfb 100644
--- a/src/hnbap/RABList.c
+++ b/src/hnbap/RABList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RABList.h>
+#include <osmocom/hnbap/RABList.h>
 
 static asn_per_constraints_t asn_PER_type_RABList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/RABListItem.c b/src/hnbap/RABListItem.c
index 9c9bc52..b4e3da7 100644
--- a/src/hnbap/RABListItem.c
+++ b/src/hnbap/RABListItem.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RABListItem.h>
+#include <osmocom/hnbap/RABListItem.h>
 
 static asn_TYPE_member_t asn_MBR_RABListItem_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RABListItem, rAB_ID),
diff --git a/src/hnbap/RAC.c b/src/hnbap/RAC.c
index aca374a..04f0601 100644
--- a/src/hnbap/RAC.c
+++ b/src/hnbap/RAC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RAC.h>
+#include <osmocom/hnbap/RAC.h>
 
 int
 RAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/RAI.c b/src/hnbap/RAI.c
index 2259163..3591129 100644
--- a/src/hnbap/RAI.c
+++ b/src/hnbap/RAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RAI.h>
+#include <osmocom/hnbap/RAI.h>
 
 static asn_TYPE_member_t asn_MBR_RAI_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct RAI, lAI),
diff --git a/src/hnbap/RNC-ID.c b/src/hnbap/RNC-ID.c
index 1005f39..782a7e4 100644
--- a/src/hnbap/RNC-ID.c
+++ b/src/hnbap/RNC-ID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RNC-ID.h>
+#include <osmocom/hnbap/RNC-ID.h>
 
 int
 RNC_ID_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Registration-Cause.c b/src/hnbap/Registration-Cause.c
index 00c3561..6b05441 100644
--- a/src/hnbap/Registration-Cause.c
+++ b/src/hnbap/Registration-Cause.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Registration-Cause.h>
+#include <osmocom/hnbap/Registration-Cause.h>
 
 int
 Registration_Cause_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/RelocationComplete.c b/src/hnbap/RelocationComplete.c
index 2fd8bce..5438cd0 100644
--- a/src/hnbap/RelocationComplete.c
+++ b/src/hnbap/RelocationComplete.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/RelocationComplete.h>
+#include <osmocom/hnbap/RelocationComplete.h>
 
 static int
 memb_relocationComplete_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/S-RNTIPrefix.c b/src/hnbap/S-RNTIPrefix.c
index 042ce57..1601eb4 100644
--- a/src/hnbap/S-RNTIPrefix.c
+++ b/src/hnbap/S-RNTIPrefix.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/S-RNTIPrefix.h>
+#include <osmocom/hnbap/S-RNTIPrefix.h>
 
 int
 S_RNTIPrefix_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/SAC.c b/src/hnbap/SAC.c
index 0a5a023..f52edb9 100644
--- a/src/hnbap/SAC.c
+++ b/src/hnbap/SAC.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/SAC.h>
+#include <osmocom/hnbap/SAC.h>
 
 int
 SAC_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/SuccessfulOutcome.c b/src/hnbap/SuccessfulOutcome.c
index 8c8f95b..910f5a9 100644
--- a/src/hnbap/SuccessfulOutcome.c
+++ b/src/hnbap/SuccessfulOutcome.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/SuccessfulOutcome.h>
+#include <osmocom/hnbap/SuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_SuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct SuccessfulOutcome, procedureCode),
diff --git a/src/hnbap/TMSIDS41.c b/src/hnbap/TMSIDS41.c
index 6e003a0..3e3c4b3 100644
--- a/src/hnbap/TMSIDS41.c
+++ b/src/hnbap/TMSIDS41.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TMSIDS41.h>
+#include <osmocom/hnbap/TMSIDS41.h>
 
 int
 TMSIDS41_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TMSILAI.c b/src/hnbap/TMSILAI.c
index 8fe7cd6..83bbe0f 100644
--- a/src/hnbap/TMSILAI.c
+++ b/src/hnbap/TMSILAI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TMSILAI.h>
+#include <osmocom/hnbap/TMSILAI.h>
 
 static int
 memb_tMSI_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TNLUpdateFailure.c b/src/hnbap/TNLUpdateFailure.c
index 8ba33b8..182de3d 100644
--- a/src/hnbap/TNLUpdateFailure.c
+++ b/src/hnbap/TNLUpdateFailure.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TNLUpdateFailure.h>
+#include <osmocom/hnbap/TNLUpdateFailure.h>
 
 static int
 memb_tnlUpdateFailure_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TNLUpdateRequest.c b/src/hnbap/TNLUpdateRequest.c
index 9edfa65..b5583a6 100644
--- a/src/hnbap/TNLUpdateRequest.c
+++ b/src/hnbap/TNLUpdateRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TNLUpdateRequest.h>
+#include <osmocom/hnbap/TNLUpdateRequest.h>
 
 static int
 memb_tnlUpdateRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TNLUpdateResponse.c b/src/hnbap/TNLUpdateResponse.c
index 77123a7..ade010b 100644
--- a/src/hnbap/TNLUpdateResponse.c
+++ b/src/hnbap/TNLUpdateResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TNLUpdateResponse.h>
+#include <osmocom/hnbap/TNLUpdateResponse.h>
 
 static int
 memb_tnlUpdateResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TransportInfo.c b/src/hnbap/TransportInfo.c
index a1d383e..ee6ed1c 100644
--- a/src/hnbap/TransportInfo.c
+++ b/src/hnbap/TransportInfo.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TransportInfo.h>
+#include <osmocom/hnbap/TransportInfo.h>
 
 static asn_per_constraints_t asn_PER_type_transportAssociation_constr_3 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  1,  1,  0l,  1l }	/* (0..1,...) */,
diff --git a/src/hnbap/TransportLayerAddress.c b/src/hnbap/TransportLayerAddress.c
index d863b25..49de644 100644
--- a/src/hnbap/TransportLayerAddress.c
+++ b/src/hnbap/TransportLayerAddress.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TransportLayerAddress.h>
+#include <osmocom/hnbap/TransportLayerAddress.h>
 
 int
 TransportLayerAddress_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/TriggeringMessage.c b/src/hnbap/TriggeringMessage.c
index a61090b..c50a487 100644
--- a/src/hnbap/TriggeringMessage.c
+++ b/src/hnbap/TriggeringMessage.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TriggeringMessage.h>
+#include <osmocom/hnbap/TriggeringMessage.h>
 
 int
 TriggeringMessage_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/Tunnel-Information.c b/src/hnbap/Tunnel-Information.c
index 6966335..4c52952 100644
--- a/src/hnbap/Tunnel-Information.c
+++ b/src/hnbap/Tunnel-Information.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Tunnel-Information.h>
+#include <osmocom/hnbap/Tunnel-Information.h>
 
 static asn_TYPE_member_t asn_MBR_Tunnel_Information_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct Tunnel_Information, iP_Address),
diff --git a/src/hnbap/TypeOfError.c b/src/hnbap/TypeOfError.c
index f3e132e..8c234f3 100644
--- a/src/hnbap/TypeOfError.c
+++ b/src/hnbap/TypeOfError.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/TypeOfError.h>
+#include <osmocom/hnbap/TypeOfError.h>
 
 int
 TypeOfError_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/U-RNTI.c b/src/hnbap/U-RNTI.c
index 3b1fd05..708bd87 100644
--- a/src/hnbap/U-RNTI.c
+++ b/src/hnbap/U-RNTI.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/U-RNTI.h>
+#include <osmocom/hnbap/U-RNTI.h>
 
 int
 U_RNTI_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/U-RNTIQueryRequest.c b/src/hnbap/U-RNTIQueryRequest.c
index 986a083..f103d24 100644
--- a/src/hnbap/U-RNTIQueryRequest.c
+++ b/src/hnbap/U-RNTIQueryRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryRequest.h>
+#include <osmocom/hnbap/U-RNTIQueryRequest.h>
 
 static int
 memb_u_RNTIQueryRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/U-RNTIQueryResponse.c b/src/hnbap/U-RNTIQueryResponse.c
index 0d00baa..121551d 100644
--- a/src/hnbap/U-RNTIQueryResponse.c
+++ b/src/hnbap/U-RNTIQueryResponse.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/U-RNTIQueryResponse.h>
+#include <osmocom/hnbap/U-RNTIQueryResponse.h>
 
 static int
 memb_u_RNTIQueryResponse_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UDP-Port-Number.c b/src/hnbap/UDP-Port-Number.c
index 647e546..45a75bf 100644
--- a/src/hnbap/UDP-Port-Number.c
+++ b/src/hnbap/UDP-Port-Number.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UDP-Port-Number.h>
+#include <osmocom/hnbap/UDP-Port-Number.h>
 
 int
 UDP_Port_Number_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UE-Capabilities.c b/src/hnbap/UE-Capabilities.c
index 7fc2384..041e99d 100644
--- a/src/hnbap/UE-Capabilities.c
+++ b/src/hnbap/UE-Capabilities.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UE-Capabilities.h>
+#include <osmocom/hnbap/UE-Capabilities.h>
 
 static asn_TYPE_member_t asn_MBR_UE_Capabilities_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct UE_Capabilities, access_stratum_release_indicator),
diff --git a/src/hnbap/UE-Identity.c b/src/hnbap/UE-Identity.c
index d354b76..604aba9 100644
--- a/src/hnbap/UE-Identity.c
+++ b/src/hnbap/UE-Identity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UE-Identity.h>
+#include <osmocom/hnbap/UE-Identity.h>
 
 static asn_per_constraints_t asn_PER_type_UE_Identity_constr_1 GCC_NOTUSED = {
 	{ APC_CONSTRAINED | APC_EXTENSIBLE,  3,  3,  0l,  7l }	/* (0..7,...) */,
diff --git a/src/hnbap/UEDe-Register.c b/src/hnbap/UEDe-Register.c
index 0008839..3b06b8c 100644
--- a/src/hnbap/UEDe-Register.c
+++ b/src/hnbap/UEDe-Register.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UEDe-Register.h>
+#include <osmocom/hnbap/UEDe-Register.h>
 
 static int
 memb_ueDe_Register_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UERegisterAccept.c b/src/hnbap/UERegisterAccept.c
index 87b15fd..1da47fe 100644
--- a/src/hnbap/UERegisterAccept.c
+++ b/src/hnbap/UERegisterAccept.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UERegisterAccept.h>
+#include <osmocom/hnbap/UERegisterAccept.h>
 
 static int
 memb_ueRegisterAccept_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UERegisterReject.c b/src/hnbap/UERegisterReject.c
index dd93ded..01b35d9 100644
--- a/src/hnbap/UERegisterReject.c
+++ b/src/hnbap/UERegisterReject.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UERegisterReject.h>
+#include <osmocom/hnbap/UERegisterReject.h>
 
 static int
 memb_ueRegisterReject_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UERegisterRequest.c b/src/hnbap/UERegisterRequest.c
index a0d51de..a076152 100644
--- a/src/hnbap/UERegisterRequest.c
+++ b/src/hnbap/UERegisterRequest.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UERegisterRequest.h>
+#include <osmocom/hnbap/UERegisterRequest.h>
 
 static int
 memb_ueRegisterRequest_ies_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/URAIdentity.c b/src/hnbap/URAIdentity.c
index bdf7ea8..dd20ed6 100644
--- a/src/hnbap/URAIdentity.c
+++ b/src/hnbap/URAIdentity.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/URAIdentity.h>
+#include <osmocom/hnbap/URAIdentity.h>
 
 int
 URAIdentity_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/URAIdentityList.c b/src/hnbap/URAIdentityList.c
index 63f9702..0872cec 100644
--- a/src/hnbap/URAIdentityList.c
+++ b/src/hnbap/URAIdentityList.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/URAIdentityList.h>
+#include <osmocom/hnbap/URAIdentityList.h>
 
 static asn_per_constraints_t asn_PER_type_URAIdentityList_constr_1 GCC_NOTUSED = {
 	{ APC_UNCONSTRAINED,	-1, -1,  0,  0 },
diff --git a/src/hnbap/UTRANCellID.c b/src/hnbap/UTRANCellID.c
index 2e61d55..c6b964c 100644
--- a/src/hnbap/UTRANCellID.c
+++ b/src/hnbap/UTRANCellID.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UTRANCellID.h>
+#include <osmocom/hnbap/UTRANCellID.h>
 
 static asn_TYPE_member_t asn_MBR_UTRANCellID_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct UTRANCellID, lAC),
diff --git a/src/hnbap/UnknownU-RNTIIndication.c b/src/hnbap/UnknownU-RNTIIndication.c
index 1dcbc16..c5d3613 100644
--- a/src/hnbap/UnknownU-RNTIIndication.c
+++ b/src/hnbap/UnknownU-RNTIIndication.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UnknownU-RNTIIndication.h>
+#include <osmocom/hnbap/UnknownU-RNTIIndication.h>
 
 int
 UnknownU_RNTIIndication_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
diff --git a/src/hnbap/UnsuccessfulOutcome.c b/src/hnbap/UnsuccessfulOutcome.c
index 4689abb..4ea7963 100644
--- a/src/hnbap/UnsuccessfulOutcome.c
+++ b/src/hnbap/UnsuccessfulOutcome.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/UnsuccessfulOutcome.h>
+#include <osmocom/hnbap/UnsuccessfulOutcome.h>
 
 static asn_TYPE_member_t asn_MBR_UnsuccessfulOutcome_1[] = {
 	{ ATF_NOFLAGS, 0, offsetof(struct UnsuccessfulOutcome, procedureCode),
diff --git a/src/hnbap/Update-cause.c b/src/hnbap/Update-cause.c
index 60304fa..f49eae7 100644
--- a/src/hnbap/Update-cause.c
+++ b/src/hnbap/Update-cause.c
@@ -5,7 +5,7 @@
  * 	`asn1c -gen-PER`
  */
 
-#include <osmocom/osmo-iuh/hnbap/Update-cause.h>
+#include <osmocom/hnbap/Update-cause.h>
 
 int
 Update_cause_constraint(asn_TYPE_descriptor_t *td, const void *sptr,
-- 
cgit v1.2.3