diff --git a/src/Makefile.am b/src/Makefile.am
index c6bb440..b30b17f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,3 +50,11 @@
 		   $(ASN1C_LIBS) $(OSMOSIGTRAN_LIBS) $(COMMON_LDADD) \
 		   hnbap/libosmo-asn1-hnbap.a rua/libosmo-asn1-rua.a \
 		   libosmo-ranap.la
+
+
+regen: regenerate-from-asn1-source
+
+regenerate-from-asn1-source:
+	make -C hnbap regen
+	make -C ranap regen
+	make -C rua regen
diff --git a/src/hnbap/Makefile.am b/src/hnbap/Makefile.am
index 0362871..274a30b 100644
--- a/src/hnbap/Makefile.am
+++ b/src/hnbap/Makefile.am
@@ -232,7 +232,7 @@
 	PrivateMessage.h	\
 	IE.h
 
-AM_CFLAGS = $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -I.
+AM_CFLAGS = $(ASN1C_CFLAGS) $(OSMOCORE_CFLAGS) -I../../include
 
 noinst_LIBRARIES=libosmo-asn1-hnbap.a
 libosmo_asn1_hnbap_a_SOURCES=$(ASN_MODULE_SOURCES)
@@ -244,4 +244,6 @@
 regenerate-from-asn1-source:
 	asn1c -gen-PER -fnative-types ../../asn1/hnbap/HNBAP-CommonDataTypes.asn ../../asn1/hnbap/HNBAP-Constants.asn ../../asn1/hnbap/HNBAP-IEs.asn ../../asn1/hnbap/HNBAP-PDU.asn
 #	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.*
+	-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)
diff --git a/src/ranap/Makefile.am b/src/ranap/Makefile.am
index 567da87..76aaaaf 100644
--- a/src/ranap/Makefile.am
+++ b/src/ranap/Makefile.am
@@ -1188,4 +1188,6 @@
 	sed -i 's/Member/MemberL/' RANAP_MessageStructure.[ch]
 	sed -i 's/Member/MemberM/' RANAP_PLMNs-in-shared-network.[ch]
 	sed -i 's/Member/MemberN/' RANAP_RABDataVolumeReport.[ch]
+#	change include style to `#include <dir/foo.h>'
+	../../move-asn1-header-files.sh osmocom/osmo-iuh/ranap $(ASN_MODULE_INC)
 
diff --git a/src/rua/Makefile.am b/src/rua/Makefile.am
index 9e3cfb6..aad5a67 100644
--- a/src/rua/Makefile.am
+++ b/src/rua/Makefile.am
@@ -85,4 +85,6 @@
 	ASN1C_PREFIX="RUA_" asn1c -gen-PER ../../asn1/rua/RUA-CommonDataTypes.asn ../../asn1/rua/RUA-Constants.asn ../../asn1/rua/RUA-IEs.asn ../../asn1/rua/RUA-PDU.asn
 #	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/rua $(ASN_MODULE_INC)