diff --git a/src/flash/Makefile.am b/src/flash/Makefile.am
index 64fc54f53..2e532a8e3 100644
--- a/src/flash/Makefile.am
+++ b/src/flash/Makefile.am
@@ -6,14 +6,56 @@ AM_CPPFLAGS = \
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libflash.la
 libflash_la_SOURCES = \
-	flash.c lpc2000.c cfi.c non_cfi.c at91sam7.c davinci_nand.c \
-	str7x.c str9x.c aduc702x.c nand.c nand_ecc.c nand_ecc_kw.c \
-	lpc3180_nand_controller.c stellaris.c str9xpec.c stm32x.c tms470.c \
-	ecos.c orion_nand.c s3c24xx_nand.c s3c2410_nand.c s3c2412_nand.c \
-	s3c2440_nand.c s3c2443_nand.c lpc288x.c ocl.c mflash.c pic32mx.c avrf.c
+	flash.c \
+	lpc2000.c \
+	cfi.c \
+	non_cfi.c \
+	at91sam7.c \
+	davinci_nand.c \
+	str7x.c \
+	str9x.c \
+	aduc702x.c \
+	nand.c \
+	nand_ecc.c \
+	nand_ecc_kw.c \
+	lpc3180_nand_controller.c \
+	stellaris.c \
+	str9xpec.c \
+	stm32x.c \
+	tms470.c \
+	ecos.c \
+	orion_nand.c \
+	s3c24xx_nand.c \
+	s3c2410_nand.c \
+	s3c2412_nand.c \
+	s3c2440_nand.c \
+	s3c2443_nand.c \
+	lpc288x.c \
+	ocl.c \
+	mflash.c \
+	pic32mx.c \
+	avrf.c
+
 noinst_HEADERS = \
-	flash.h lpc2000.h cfi.h non_cfi.h at91sam7.h str7x.h \
-	str9x.h nand.h lpc3180_nand_controller.h stellaris.h str9xpec.h \
-	stm32x.h tms470.h s3c24xx_nand.h s3c24xx_regs_nand.h lpc288x.h \
-	mflash.h ocl.h pic32mx.h avrf.h
+	flash.h \
+	lpc2000.h \
+	cfi.h \
+	non_cfi.h \
+	at91sam7.h \
+	str7x.h \
+	str9x.h \
+	nand.h \
+	lpc3180_nand_controller.h \
+	stellaris.h \
+	str9xpec.h \
+	stm32x.h \
+	tms470.h \
+	s3c24xx_nand.h \
+	s3c24xx_regs_nand.h \
+	lpc288x.h \
+	mflash.h \
+	ocl.h \
+	pic32mx.h \
+	avrf.h
+
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/helper/Makefile.am b/src/helper/Makefile.am
index 5e2d32241..15a27c3af 100644
--- a/src/helper/Makefile.am
+++ b/src/helper/Makefile.am
@@ -15,9 +15,15 @@ endif
 
 
 libhelper_la_SOURCES = \
-	binarybuffer.c $(CONFIGFILES) configuration.c \
-	log.c command.c time_support.c \
-	replacements.c fileio.c startup_tcl.c
+	binarybuffer.c \
+	$(CONFIGFILES) \
+	configuration.c \
+	log.c \
+	command.c \
+	time_support.c \
+	replacements.c \
+	fileio.c \
+	startup_tcl.c
 
 if IOUTIL
 libhelper_la_SOURCES += ioutil.c
@@ -29,9 +35,20 @@ if IS_MINGW
 libhelper_la_CFLAGS += -Wno-sign-compare
 endif
 
-noinst_HEADERS = binarybuffer.h configuration.h types.h log.h command.h \
-	time_support.h replacements.h fileio.h jim.h jim-eventloop.h \
-	system.h startup.tcl bin2char.c
+noinst_HEADERS = \
+	binarybuffer.h \
+	configuration.h \
+	types.h \
+	log.h \
+	command.h \
+	time_support.h \
+	replacements.h \
+	fileio.h \
+	jim.h \
+	jim-eventloop.h \
+	system.h \
+	startup.tcl \
+	bin2char.c
 
 bin2char$(EXEEXT_FOR_BUILD): bin2char.c
 	${CC_FOR_BUILD} ${CFLAGS_FOR_BUILD} $(srcdir)/bin2char.c -o $@
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 7ee59076b..3163b245e 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -110,12 +110,30 @@ ARMJTAGEWFILES =
 endif
 
 libjtag_la_SOURCES = jtag.c \
-	$(BITBANGFILES) $(PARPORTFILES) $(DUMMYFILES) \
-	$(FT2232FILES) $(AMTJTAGACCELFILES) $(EP93XXFILES) \
-	$(AT91RM9200FILES) $(GW16012FILES) $(BITQFILES) \
-	$(PRESTOFILES) $(USBPROGFILES) $(ECOSBOARDFILES) \
-	$(JLINKFILES) $(RLINKFILES) $(VSLLINKFILES) $(ARMJTAGEWFILES)
+	$(BITBANGFILES) \
+	$(PARPORTFILES) \
+	$(DUMMYFILES) \
+	$(FT2232FILES) \
+	$(AMTJTAGACCELFILES) \
+	$(EP93XXFILES) \
+	$(AT91RM9200FILES) \
+	$(GW16012FILES) \
+	$(BITQFILES) \
+	$(PRESTOFILES) \
+	$(USBPROGFILES) \
+	$(ECOSBOARDFILES) \
+	$(JLINKFILES) \
+	$(RLINKFILES) \
+	$(VSLLINKFILES) \
+	$(ARMJTAGEWFILES)
 
-noinst_HEADERS = bitbang.h jtag.h bitq.h rlink/dtc_cmd.h rlink/ep1_cmd.h rlink/rlink.h rlink/st7.h
+noinst_HEADERS = \
+	bitbang.h \
+	jtag.h \
+	bitq.h \
+	rlink/dtc_cmd.h \
+	rlink/ep1_cmd.h \
+	rlink/rlink.h \
+	rlink/st7.h
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 28a2981a9..132ac50b3 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -12,16 +12,86 @@ AM_CPPFLAGS = \
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libtarget.la
-libtarget_la_SOURCES = target.c register.c breakpoints.c \
-	armv4_5.c embeddedice.c etm.c arm7tdmi.c arm9tdmi.c \
-	arm_jtag.c arm7_9_common.c algorithm.c arm920t.c arm720t.c armv4_5_mmu.c armv4_5_cache.c arm_disassembler.c \
-	arm966e.c arm926ejs.c feroceon.c etb.c xscale.c arm_simulator.c image.c armv7m.c cortex_m3.c cortex_a8.c arm_adi_v5.c \
-	etm_dummy.c $(OOCD_TRACE_FILES) target_request.c trace.c arm11.c arm11_dbgtap.c mips32.c mips_m4k.c \
-	mips32_pracc.c mips32_dmaacc.c mips_ejtag.c avrt.c
-noinst_HEADERS = target.h trace.h register.h armv4_5.h embeddedice.h etm.h arm7tdmi.h arm9tdmi.h \
-	arm_jtag.h arm7_9_common.h arm920t.h arm720t.h armv4_5_mmu.h armv4_5_cache.h breakpoints.h algorithm.h \
-	arm_disassembler.h arm966e.h arm926ejs.h etb.h xscale.h arm_simulator.h image.h armv7m.h cortex_m3.h cortex_a8.h arm_adi_v5.h \
-	etm_dummy.h oocd_trace.h target_request.h trace.h arm11.h mips32.h mips_m4k.h mips_ejtag.h mips32_pracc.h mips32_dmaacc.h avrt.h
+libtarget_la_SOURCES = \
+	target.c \
+	register.c \
+	breakpoints.c \
+	armv4_5.c \
+	embeddedice.c \
+	etm.c \
+	arm7tdmi.c \
+	arm9tdmi.c \
+	arm_jtag.c \
+	arm7_9_common.c \
+	algorithm.c \
+	arm920t.c \
+	arm720t.c \
+	armv4_5_mmu.c \
+	armv4_5_cache.c \
+	arm_disassembler.c \
+	arm966e.c \
+	arm926ejs.c \
+	feroceon.c \
+	etb.c \
+	xscale.c \
+	arm_simulator.c \
+	image.c \
+	armv7m.c \
+	cortex_m3.c \
+	cortex_a8.c \
+	arm_adi_v5.c \
+	etm_dummy.c \
+	$(OOCD_TRACE_FILES) \
+	target_request.c \
+	trace.c \
+	arm11.c \
+	arm11_dbgtap.c \
+	mips32.c \
+	mips_m4k.c \
+	mips32_pracc.c \
+	mips32_dmaacc.c \
+	mips_ejtag.c \
+	avrt.c
+
+noinst_HEADERS = \
+	target.h \
+	trace.h \
+	register.h \
+	armv4_5.h \
+	embeddedice.h \
+	etm.h \
+	arm7tdmi.h \
+	arm9tdmi.h \
+	arm_jtag.h \
+	arm7_9_common.h \
+	arm920t.h \
+	arm720t.h \
+	armv4_5_mmu.h \
+	armv4_5_cache.h \
+	breakpoints.h \
+	algorithm.h \
+	arm_disassembler.h \
+	arm966e.h \
+	arm926ejs.h \
+	etb.h \
+	xscale.h \
+	arm_simulator.h \
+	image.h \
+	armv7m.h \
+	cortex_m3.h \
+	cortex_a8.h \
+	arm_adi_v5.h \
+	etm_dummy.h \
+	oocd_trace.h \
+	target_request.h \
+	trace.h \
+	arm11.h \
+	mips32.h \
+	mips_m4k.h \
+	mips_ejtag.h \
+	mips32_pracc.h \
+	mips32_dmaacc.h \
+	avrt.h
 
 nobase_dist_pkglib_DATA =
 nobase_dist_pkglib_DATA += xscale/debug_handler.bin