diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 2717dc541..d8a71e291 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -66,7 +66,8 @@ noinst_HEADERS = \
 	minidriver.h \
 	jtag.h \
 	minidriver/minidriver_imp.h \
-	minidummy/jtag_minidriver.h
+	minidummy/jtag_minidriver.h \
+	swd.h
 
 EXTRA_DIST = startup.tcl
 
diff --git a/src/rtos/Makefile.am b/src/rtos/Makefile.am
index fba9d47c1..6f17a5f93 100644
--- a/src/rtos/Makefile.am
+++ b/src/rtos/Makefile.am
@@ -22,10 +22,9 @@ include $(top_srcdir)/common.mk
 
 METASOURCES = AUTO
 noinst_LTLIBRARIES = librtos.la
-noinst_HEADERS = rtos.h
+noinst_HEADERS = rtos.h rtos_standard_stackings.h rtos_ecos_stackings.h 
 librtos_la_SOURCES = rtos.c rtos_standard_stackings.c rtos_ecos_stackings.c FreeRTOS.c ThreadX.c eCos.c
 
-
 librtos_la_CFLAGS =
 if IS_MINGW
 # FD_* macros are sloppy with their signs on MinGW32 platform
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index eb1e6dbfd..02bf0f42c 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -157,7 +157,12 @@ noinst_HEADERS = \
 	target_request.h \
 	trace.h \
 	xscale.h \
-	xscale_debug.h
+	xscale_debug.h \
+	smp.h \
+	avr32_ap7k.h \
+	avr32_jtag.h \
+	avr32_mem.h \
+	avr32_regs.h
 
 nobase_dist_pkglib_DATA =
 nobase_dist_pkglib_DATA += ecos/at91eb40a.elf