diff --git a/gtp/Makefile.am b/gtp/Makefile.am
index f96f429..666befe 100644
--- a/gtp/Makefile.am
+++ b/gtp/Makefile.am
@@ -15,6 +15,20 @@ AM_CFLAGS = \
 	    $(LIBOSMOCORE_CFLAGS) \
 	    $(NULL)
 
-libgtp_la_SOURCES = gtp.c gtp.h gsn.c gsn.h gtpie.c gtpie.h pdp.c pdp.h lookupa.c lookupa.h queue.c queue.h
+libgtp_la_SOURCES = \
+		    gsn.c \
+		    gsn.h \
+		    gtp.c \
+		    gtp.h \
+		    gtpie.c \
+		    gtpie.h \
+		    lookupa.c \
+		    lookupa.h \
+		    pdp.c \
+		    pdp.h \
+		    queue.c \
+		    queue.h \
+		    $(NULL)
+
 libgtp_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined
 libgtp_la_LIBADD = $(LIBOSMOCORE_LIBS)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9dfd456..bef8962 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,19 @@
 noinst_LIBRARIES = libmisc.a
 
-noinst_HEADERS = gnugetopt.h ippool.h lookup.h syserr.h tun.h in46_addr.h netdev.h gtp-kernel.h netns.h util.h icmpv6.h checksum.h
+noinst_HEADERS = \
+		 checksum.h \
+		 gnugetopt.h \
+		 gtp-kernel.h \
+		 icmpv6.h \
+		 in46_addr.h \
+		 ippool.h \
+		 lookup.h \
+		 netdev.h \
+		 netns.h \
+		 syserr.h \
+		 tun.h \
+		 util.h \
+		 $(NULL)
 
 AM_CFLAGS = \
 	    -fno-builtin \
@@ -9,7 +22,20 @@ AM_CFLAGS = \
 	    $(LIBOSMOCORE_CFLAGS) \
 	    $(NULL)
 
-libmisc_a_SOURCES = getopt1.c getopt.c ippool.c lookup.c tun.c debug.c in46_addr.c netdev.c netns.c util.c icmpv6.c checksum.c
+libmisc_a_SOURCES = \
+		    checksum.c \
+		    debug.c \
+		    getopt.c \
+		    getopt1.c \
+		    icmpv6.c \
+		    in46_addr.c \
+		    ippool.c \
+		    lookup.c \
+		    netdev.c \
+		    netns.c \
+		    tun.c \
+		    util.c \
+		    $(NULL)
 
 if ENABLE_GTP_KERNEL
 AM_CFLAGS += -DGTP_KERNEL $(LIBGTPNL_CFLAGS)