diff --git a/openbsc/include/openbsc/Makefile.am b/openbsc/include/openbsc/Makefile.am
index 3689175..0226c2d 100644
--- a/openbsc/include/openbsc/Makefile.am
+++ b/openbsc/include/openbsc/Makefile.am
@@ -1,4 +1,4 @@
-noinst_HEADERS = abis_nm.h abis_rsl.h debug.h db.h gsm_04_08.h gsm_data.h \
+noinst_HEADERS = abis_nm.h abis_rsl.h db.h gsm_04_08.h gsm_data.h \
 		 gsm_subscriber.h gsm_04_11.h \
 		 timer.h misdn.h chan_alloc.h telnet_interface.h paging.h \
 		 subchan_demux.h trau_frame.h e1_input.h trau_mux.h \
@@ -7,5 +7,6 @@
 		 silent_call.h mgcp.h meas_rep.h bitvec.h rest_octets.h \
 		 system_information.h handover.h statistics.h
 
-laforge_HEADERS = signal.h linuxlist.h timer.h talloc.h msgb.h select.h tlv.h
+laforge_HEADERS = signal.h linuxlist.h timer.h talloc.h msgb.h select.h tlv.h \
+		  debug.h
 laforgedir= $(includedir)/laf0rge1
diff --git a/openbsc/src/Makefile.am b/openbsc/src/Makefile.am
index d17a4be..ba3d280 100644
--- a/openbsc/src/Makefile.am
+++ b/openbsc/src/Makefile.am
@@ -9,10 +9,10 @@
 bscdir = $(libdir)
 bsc_LIBRARIES = liblaf0rge1.a libsccp.a
 
-liblaf0rge1_a_SOURCES = msgb.c timer.c talloc.c select.c signal.c
+liblaf0rge1_a_SOURCES = msgb.c timer.c talloc.c select.c signal.c debug.c
 
 libbsc_a_SOURCES = abis_rsl.c abis_nm.c gsm_data.c gsm_04_08_utils.c \
-		chan_alloc.c debug.c \
+		chan_alloc.c \
 		gsm_subscriber_base.c subchan_demux.c bsc_rll.c transaction.c \
 		trau_frame.c trau_mux.c paging.c e1_config.c e1_input.c tlv_parser.c \
 		input/misdn.c input/ipaccess.c signal.c gsm_utils.c \