diff --git a/Makefile.am b/Makefile.am
index 320294f3..7dee8864 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -91,20 +91,20 @@ LIBEVENT_PKGCONFIG=libevent.pc
 # These sources are conditionally added by configure.in or conditionally
 # included from other files.
 PLATFORM_DEPENDENT_SRC = \
-	epoll_sub.c \
-	arc4random.c
+	arc4random.c \
+	epoll_sub.c
 
 EXTRA_DIST = \
+	ChangeLog-1.4 \
+	ChangeLog-2.0 \
+	Doxyfile \
 	LICENSE \
+	Makefile.nmake test/Makefile.nmake \
 	autogen.sh \
 	event_rpcgen.py \
 	libevent.pc.in \
-	Doxyfile \
 	whatsnew-2.0.txt \
 	whatsnew-2.1.txt \
-	Makefile.nmake test/Makefile.nmake \
-	ChangeLog-2.0 \
-	ChangeLog-1.4 \
 	$(PLATFORM_DEPENDENT_SRC)
 
 LIBEVENT_LIBS_LA = libevent.la libevent_core.la libevent_extra.la
@@ -185,11 +185,28 @@ BUILT_SOURCES = ./include/event2/event-config.h
 	    -e 's/#ifndef /#ifndef EVENT__/' < config.h >> $@
 	echo "#endif" >> $@
 
-CORE_SRC = event.c evthread.c buffer.c \
-	bufferevent.c bufferevent_sock.c bufferevent_filter.c \
-	bufferevent_pair.c listener.c bufferevent_ratelim.c \
-	evmap.c	log.c evutil.c evutil_rand.c strlcpy.c $(SYS_SRC)
-EXTRA_SRC = event_tagging.c http.c evdns.c evrpc.c
+CORE_SRC =					\
+	buffer.c				\
+	bufferevent.c				\
+	bufferevent_filter.c			\
+	bufferevent_pair.c			\
+	bufferevent_ratelim.c			\
+	bufferevent_sock.c			\
+	event.c					\
+	evmap.c					\
+	evthread.c				\
+	evutil.c				\
+	evutil_rand.c				\
+	listener.c				\
+	log.c					\
+	strlcpy.c				\
+	$(SYS_SRC)
+
+EXTRA_SRC =					\
+	evdns.c					\
+	event_tagging.c				\
+	evrpc.c					\
+	http.c
 
 if BUILD_WITH_NO_UNDEFINED
 NO_UNDEFINED = -no-undefined
@@ -226,25 +243,38 @@ libevent_openssl_la_LDFLAGS = $(GENERIC_LDFLAGS)
 libevent_openssl_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENSSL_INCS)
 endif
 
-noinst_HEADERS = util-internal.h mm-internal.h ipv6-internal.h \
-	evrpc-internal.h strlcpy-internal.h evbuffer-internal.h \
-	bufferevent-internal.h http-internal.h event-internal.h \
-	evthread-internal.h ht-internal.h defer-internal.h \
-	minheap-internal.h log-internal.h evsignal-internal.h evmap-internal.h \
-	changelist-internal.h iocp-internal.h \
-	ratelim-internal.h \
-	evconfig-private.h \
-	ratelim-internal.h \
-	kqueue-internal.h \
-	WIN32-Code/event2/event-config.h \
-	WIN32-Code/evconfig-private.h \
-	WIN32-Code/tree.h \
-	compat/sys/queue.h
+noinst_HEADERS =				\
+	WIN32-Code/evconfig-private.h		\
+	WIN32-Code/event2/event-config.h	\
+	WIN32-Code/tree.h			\
+	bufferevent-internal.h			\
+	changelist-internal.h			\
+	compat/sys/queue.h			\
+	defer-internal.h			\
+	evbuffer-internal.h			\
+	evconfig-private.h			\
+	event-internal.h			\
+	evmap-internal.h			\
+	evrpc-internal.h			\
+	evsignal-internal.h			\
+	evthread-internal.h			\
+	ht-internal.h				\
+	http-internal.h				\
+	iocp-internal.h				\
+	ipv6-internal.h				\
+	kqueue-internal.h			\
+	log-internal.h				\
+	minheap-internal.h			\
+	mm-internal.h				\
+	ratelim-internal.h			\
+	ratelim-internal.h			\
+	strlcpy-internal.h			\
+	util-internal.h
 
 EVENT1_HDRS = \
+	include/evdns.h \
 	include/event.h \
 	include/evhttp.h \
-	include/evdns.h \
 	include/evrpc.h \
 	include/evutil.h
 
diff --git a/sample/Makefile.am b/sample/Makefile.am
index f35040cb..b5904ffe 100644
--- a/sample/Makefile.am
+++ b/sample/Makefile.am
@@ -9,7 +9,13 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
 LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include
 
-noinst_PROGRAMS = event-read-fifo time-test signal-test dns-example hello-world http-server
+noinst_PROGRAMS =				\
+	dns-example				\
+	event-read-fifo				\
+	hello-world				\
+	http-server				\
+	signal-test				\
+	time-test
 
 event_read_fifo_SOURCES = event-read-fifo.c
 time_test_SOURCES = time-test.c
diff --git a/test/Makefile.am b/test/Makefile.am
index 8dfba0c0..a953edca 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -8,17 +8,38 @@ AUTOMAKE_OPTIONS = foreign
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include -DTINYTEST_LOCAL
 
-EXTRA_DIST = regress.rpc regress.gen.h regress.gen.c rpcgen_wrapper.sh \
-	test.sh check-dumpevents.py
+EXTRA_DIST =					\
+	check-dumpevents.py			\
+	regress.gen.c				\
+	regress.gen.h				\
+	regress.rpc				\
+	rpcgen_wrapper.sh			\
+	test.sh
+
+noinst_PROGRAMS = \
+	bench					\
+	bench_cascade				\
+	bench_http				\
+	bench_httpclient			\
+	test-changelist				\
+	test-dumpevents				\
+	test-eof				\
+	test-fdleak				\
+	test-init				\
+	test-ratelim				\
+	test-time				\
+	test-weof
 
-noinst_PROGRAMS = test-init test-eof test-weof test-time test-dumpevents \
-	bench bench_cascade bench_http bench_httpclient test-ratelim \
-	test-changelist test-fdleak
 if BUILD_REGRESS
 noinst_PROGRAMS += regress
 endif
 EXTRA_PROGRAMS = regress
-noinst_HEADERS = tinytest.h tinytest_macros.h regress.h tinytest_local.h
+
+noinst_HEADERS =				\
+	regress.h				\
+	tinytest.h				\
+	tinytest_local.h			\
+	tinytest_macros.h
 
 TESTS = $(top_srcdir)/test/test.sh
 
@@ -44,12 +65,26 @@ test_ratelim_LDADD = ../libevent_core.la -lm
 test_fdleak_SOURCES = test-fdleak.c
 test_fdleak_LDADD = ../libevent_core.la
 
-regress_SOURCES = regress.c regress_buffer.c regress_http.c regress_dns.c \
-	regress_testutils.c regress_testutils.h \
-	regress_rpc.c regress.gen.c regress.gen.h regress_et.c \
-	regress_bufferevent.c regress_listener.c \
-	regress_util.c tinytest.c regress_main.c regress_minheap.c \
-	$(regress_thread_SOURCES) $(regress_zlib_SOURCES)
+regress_SOURCES = 				\
+	regress.c				\
+	regress.gen.c				\
+	regress.gen.h				\
+	regress_buffer.c			\
+	regress_bufferevent.c			\
+	regress_dns.c				\
+	regress_et.c				\
+	regress_http.c				\
+	regress_listener.c			\
+	regress_main.c				\
+	regress_minheap.c			\
+	regress_rpc.c				\
+	regress_testutils.c			\
+	regress_testutils.h			\
+	regress_util.c				\
+	tinytest.c				\
+	$(regress_thread_SOURCES)		\
+	$(regress_zlib_SOURCES)
+
 if PTHREADS
 regress_thread_SOURCES = regress_thread.c
 PTHREAD_LIBS += ../libevent_pthreads.la