---
 Makefile.am          |    2 +-
 src/core/Makefile.am |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

--- a/Makefile.am
+++ b/Makefile.am
@@ -123,7 +123,7 @@ if WITHDOC
 EXTRA_DIST += doc/user_manual.tex
 endif #WITHDOC
 
-include_HEADERS = src/pptrace/types.h \
+noinst_HEADERS = src/pptrace/types.h \
 		  src/pptrace/pptrace.h \
 		  src/pptrace/opcodes.h \
 		  src/pptrace/memory.h \
--- a/src/core/Makefile.am
+++ b/src/core/Makefile.am
@@ -15,7 +15,7 @@ GTGLIBADD=$(GTG_LIB)
 bin_PROGRAMS = eztrace_convert eztrace_avail eztrace_loaded eztrace_stats
 
 generated_scripts = eztrace_create_plugin eztrace_plugin_generator eztrace.preload
-bin_SCRIPTS = $(generated_scripts) input/Makefile.template eztrace_indent_fortran
+bin_SCRIPTS = $(generated_scripts) eztrace_indent_fortran
 
 lib_LTLIBRARIES = libeztrace.la \
 		  libeztrace-autostart.la \
@@ -163,10 +163,12 @@ input_DATA = input/example.c.template\
 EXTRA_DIST = $(input_DATA) eztrace_create_plugin.in eztrace_plugin_generator function.pm eztrace.c.in  eztrace.preload.in eztrace_indent_fortran
 CLEANFILES = $(generated_scripts) eztrace eztrace_config.h
 
+noinst_HEADERS = \
+		  ../pptrace/pptrace.h
+
 include_HEADERS = eztrace.h\
 		  eztrace_litl_packed.h \
 		  eztrace_litl.h \
-		  ../pptrace/pptrace.h \
 		  eztrace_config.h \
 		  ev_codes.h \
 		  eztrace_list.h \
