diff --git a/include/Makefile.am b/include/Makefile.am
index a234014..3578a80 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,225 +1 @@
-BUILT_SOURCES = osmocom/gsm/gsm0503.h
-
-nobase_include_HEADERS = \
-                       osmocom/codec/ecu.h \
-                       osmocom/codec/codec.h \
-                       osmocom/codec/gsm610_bits.h \
-                       osmocom/core/application.h \
-                       osmocom/core/backtrace.h \
-                       osmocom/core/base64.h \
-                       osmocom/core/bit16gen.h \
-                       osmocom/core/bit32gen.h \
-                       osmocom/core/bit64gen.h \
-                       osmocom/core/bits.h \
-                       osmocom/core/bitvec.h \
-                       osmocom/core/bitcomp.h \
-                       osmocom/core/byteswap.h \
-                       osmocom/core/conv.h \
-                       osmocom/core/counter.h \
-                       osmocom/core/crc16.h \
-                       osmocom/core/crc16gen.h \
-                       osmocom/core/crc32gen.h \
-                       osmocom/core/crc64gen.h \
-                       osmocom/core/crc8gen.h \
-                       osmocom/core/crcgen.h \
-                       osmocom/core/endian.h \
-                       osmocom/core/defs.h \
-                       osmocom/core/exec.h \
-                       osmocom/core/fsm.h \
-                       osmocom/core/gsmtap.h \
-                       osmocom/core/gsmtap_util.h \
-                       osmocom/core/hash.h \
-                       osmocom/core/hashtable.h \
-                       osmocom/core/isdnhdlc.h \
-                       osmocom/core/it_q.h \
-                       osmocom/core/linuxlist.h \
-                       osmocom/core/linuxrbtree.h \
-                       osmocom/core/log2.h \
-                       osmocom/core/logging.h \
-                       osmocom/core/loggingrb.h \
-                       osmocom/core/stats.h \
-                       osmocom/core/macaddr.h \
-                       osmocom/core/msgb.h \
-                       osmocom/core/panic.h \
-                       osmocom/core/prbs.h \
-                       osmocom/core/prim.h \
-                       osmocom/core/process.h \
-                       osmocom/core/rate_ctr.h \
-                       osmocom/core/stat_item.h \
-                       osmocom/core/stats_tcp.h \
-                       osmocom/core/select.h \
-                       osmocom/core/sercomm.h \
-                       osmocom/core/signal.h \
-                       osmocom/core/socket.h \
-                       osmocom/core/statistics.h \
-                       osmocom/core/strrb.h \
-                       osmocom/core/talloc.h \
-                       osmocom/core/tdef.h \
-		       osmocom/core/thread.h \
-                       osmocom/core/timer.h \
-                       osmocom/core/timer_compat.h \
-                       osmocom/core/utils.h \
-                       osmocom/core/write_queue.h \
-                       osmocom/core/sockaddr_str.h \
-                       osmocom/core/time_cc.h \
-                       osmocom/core/use_count.h \
-                       osmocom/crypt/auth.h \
-                       osmocom/crypt/gprs_cipher.h \
-                       osmocom/crypt/kdf.h \
-                       osmocom/crypt/utran_cipher.h \
-		       osmocom/ctrl/control_cmd.h \
-		       osmocom/ctrl/control_if.h \
-		       osmocom/ctrl/ports.h \
-                       osmocom/gprs/frame_relay.h \
-                       osmocom/gprs/bssgp_bvc_fsm.h \
-                       osmocom/gprs/gprs_bssgp.h \
-                       osmocom/gprs/gprs_bssgp2.h \
-                       osmocom/gprs/gprs_bssgp_bss.h \
-                       osmocom/gprs/gprs_bssgp_rim.h \
-                       osmocom/gprs/gprs_msgb.h \
-                       osmocom/gprs/gprs_ns.h \
-                       osmocom/gprs/gprs_ns_frgre.h \
-                       osmocom/gprs/gprs_ns2.h \
-                       osmocom/gprs/gprs_rlc.h \
-                       osmocom/gprs/protocol/gsm_04_60.h \
-                       osmocom/gprs/protocol/gsm_08_16.h \
-                       osmocom/gprs/protocol/gsm_08_18.h \
-                       osmocom/gprs/protocol/gsm_24_301.h \
-                       osmocom/gsm/a5.h \
-                       osmocom/gsm/abis_nm.h \
-                       osmocom/gsm/apn.h \
-                       osmocom/gsm/bts_features.h \
-                       osmocom/gsm/cbsp.h \
-                       osmocom/gsm/comp128.h \
-                       osmocom/gsm/comp128v23.h \
-                       osmocom/gsm/bitvec_gsm.h \
-                       osmocom/gsm/gan.h \
-                       osmocom/gsm/gsm0341.h \
-                       osmocom/gsm/gsm0411_smc.h \
-                       osmocom/gsm/gsm0411_smr.h \
-                       osmocom/gsm/gsm0411_utils.h \
-                       osmocom/gsm/gsm0480.h \
-                       osmocom/gsm/gsm0502.h \
-                       osmocom/gsm/gsm0503.h \
-                       osmocom/coding/gsm0503_tables.h \
-                       osmocom/coding/gsm0503_parity.h \
-                       osmocom/coding/gsm0503_mapping.h \
-                       osmocom/coding/gsm0503_interleaving.h \
-                       osmocom/coding/gsm0503_coding.h \
-                       osmocom/coding/gsm0503_amr_dtx.h \
-                       osmocom/gsm/bsslap.h \
-                       osmocom/gsm/bssmap_le.h \
-                       osmocom/gsm/gad.h \
-                       osmocom/gsm/gsm0808.h \
-                       osmocom/gsm/gsm0808_lcs.h \
-                       osmocom/gsm/gsm29205.h \
-                       osmocom/gsm/gsm0808_utils.h \
-                       osmocom/gsm/gsm23003.h \
-                       osmocom/gsm/gsm23236.h \
-                       osmocom/gsm/gsm29118.h \
-                       osmocom/gsm/gsm48.h \
-                       osmocom/gsm/gsm48_arfcn_range_encode.h \
-                       osmocom/gsm/gsm48_ie.h \
-                       osmocom/gsm/gsm48_rest_octets.h \
-                       osmocom/gsm/gsm_utils.h \
-                       osmocom/gsm/gsup.h \
-                       osmocom/gsm/gsup_sms.h \
-                       osmocom/gsm/i460_mux.h \
-                       osmocom/gsm/ipa.h \
-                       osmocom/gsm/iuup.h \
-                       osmocom/gsm/lapd_core.h \
-                       osmocom/gsm/lapdm.h \
-                       osmocom/gsm/meas_rep.h \
-                       osmocom/gsm/mncc.h \
-                       osmocom/gsm/prim.h \
-                       osmocom/gsm/l1sap.h \
-                       osmocom/gsm/oap.h \
-                       osmocom/gsm/oap_client.h \
-                       osmocom/gsm/protocol/gsm_23_032.h \
-                       osmocom/gsm/protocol/gsm_03_40.h \
-                       osmocom/gsm/protocol/gsm_03_41.h \
-                       osmocom/gsm/protocol/gsm_04_08.h \
-                       osmocom/gsm/protocol/gsm_04_08_gprs.h \
-                       osmocom/gsm/protocol/gsm_04_11.h \
-                       osmocom/gsm/protocol/gsm_04_12.h \
-                       osmocom/gsm/protocol/gsm_04_14.h \
-                       osmocom/gsm/protocol/gsm_04_80.h \
-                       osmocom/gsm/protocol/gsm_08_08.h \
-                       osmocom/gsm/protocol/gsm_08_58.h \
-                       osmocom/gsm/protocol/gsm_09_02.h \
-                       osmocom/gsm/protocol/gsm_12_21.h \
-		       osmocom/gsm/protocol/gsm_23_003.h \
-		       osmocom/gsm/protocol/gsm_23_041.h \
-		       osmocom/gsm/protocol/gsm_25_415.h \
-		       osmocom/gsm/protocol/gsm_29_118.h \
-		       osmocom/gsm/protocol/gsm_44_004.h \
-                       osmocom/gsm/protocol/gsm_44_318.h \
-                       osmocom/gsm/protocol/gsm_48_049.h \
-                       osmocom/gsm/protocol/gsm_48_071.h \
-                       osmocom/gsm/protocol/gsm_49_031.h \
-                       osmocom/gsm/protocol/ipaccess.h \
-                       osmocom/gsm/protocol/smpp34_osmocom.h \
-                       osmocom/gsm/rsl.h \
-                       osmocom/gsm/rxlev_stat.h \
-                       osmocom/gsm/sysinfo.h \
-                       osmocom/gsm/tlv.h \
-		       osmocom/sim/class_tables.h \
-		       osmocom/sim/sim.h
-
-if ENABLE_PLUGIN
-nobase_include_HEADERS += osmocom/core/plugin.h
-endif
-
-if ENABLE_MSGFILE
-nobase_include_HEADERS += osmocom/core/msgfile.h
-endif
-
-if ENABLE_SERIAL
-nobase_include_HEADERS += osmocom/core/serial.h
-endif
-
-
-if ENABLE_VTY
-nobase_include_HEADERS += \
-                          osmocom/vty/buffer.h \
-                          osmocom/vty/command.h \
-                          osmocom/vty/logging.h \
-                          osmocom/vty/stats.h \
-                          osmocom/vty/misc.h \
-                          osmocom/vty/telnet_interface.h \
-                          osmocom/vty/vector.h \
-                          osmocom/vty/vty.h \
-                          osmocom/vty/ports.h \
-                          osmocom/vty/cpu_sched_vty.h \
-                          osmocom/vty/tdef_vty.h \
-                          osmocom/ctrl/control_vty.h
-endif
-
-if ENABLE_LIBUSB
-nobase_include_HEADERS += \
-			  osmocom/usb/libusb.h
-endif
-
-if ENABLE_LIBMNL
-nobase_include_HEADERS += osmocom/core/mnl.h
-endif
-
-noinst_HEADERS = \
-	osmocom/gsm/kasumi.h \
-	osmocom/gsm/gea.h \
-	osmocom/core/logging_internal.h \
-	$(NULL)
-
-osmocom/core/bit%gen.h: osmocom/core/bitXXgen.h.tpl
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
-
-osmocom/core/crc%gen.h: osmocom/core/crcXXgen.h.tpl
-	$(AM_V_GEN)$(MKDIR_P) $(dir $@)
-	$(AM_V_GEN)sed -e's/XX/$*/g' $< > $@
-
-osmocom/gsm/gsm0503.h: $(top_srcdir)/utils/conv_gen.py $(top_srcdir)/utils/conv_codes_gsm.py
-	$(AM_V_GEN)python3 $(top_srcdir)/utils/conv_gen.py gen_header gsm \
-		--target-path $(builddir)/osmocom/gsm
-
-CLEANFILES = osmocom/gsm/gsm0503.h
+SUBDIRS = osmocom