diff --git a/Makefile.am b/Makefile.am
index ba08556b..f52f0a66 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,9 @@ EXTRA_DIST = eurotext.tif phototest.tif ReleaseNotes \
 
 #EXTRA_DIST = doc/html doc/@PACKAGE_NAME@_@PACKAGE_VERSION@.pdf doc/@PACKAGE_NAME@_@PACKAGE_VERSION@.ps.gz
 
+uninstall:
+	rm -rf $(DESTDIR)$(includedir)
+
 dist-hook:
 # Need to remove .svn directories from directories
 # added using EXTRA_DIST. $(distdir)/tessdata would in
diff --git a/api/Makefile.am b/api/Makefile.am
index cc758717..271ef828 100644
--- a/api/Makefile.am
+++ b/api/Makefile.am
@@ -9,8 +9,8 @@ if VISIBILITY
 AM_CPPFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
-    apitypes.h baseapi.h tesseractmain.h
+include_HEADERS = apitypes.h baseapi.h
+noinst_HEADERS =  tesseractmain.h
 lib_LTLIBRARIES = 
 
 if !USING_MULTIPLELIBS
diff --git a/api/tesseractmain.cpp b/api/tesseractmain.cpp
index 943b707e..c5853469 100644
--- a/api/tesseractmain.cpp
+++ b/api/tesseractmain.cpp
@@ -17,9 +17,9 @@
 *
 **********************************************************************/
 
-#include "mfcpch.h"
 // #define USE_VLD //Uncomment for Visual Leak Detector.
 #if (defined _MSC_VER && defined USE_VLD)
+#include "mfcpch.h"
 #include <vld.h>
 #endif
 
diff --git a/ccmain/Makefile.am b/ccmain/Makefile.am
index e1e7f7a7..e93d8684 100644
--- a/ccmain/Makefile.am
+++ b/ccmain/Makefile.am
@@ -12,7 +12,8 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+include_HEADERS = thresholder.h
+noinst_HEADERS = \
     control.h cube_reco_context.h cubeclassifier.h \
     docqual.h equationdetect.h fixspace.h \
     imgscale.h ltrresultiterator.h mutableiterator.h osdetect.h output.h \
@@ -20,8 +21,7 @@ include_HEADERS = \
     reject.h resultiterator.h scaleimg.h \
     tessbox.h tessedit.h tesseractclass.h \
     tesseract_cube_combiner.h \
-    tessvars.h tfacep.h tfacepp.h thresholder.h \
-    werdit.h
+    tessvars.h tfacep.h tfacepp.h werdit.h
 
 if !USING_MULTIPLELIBS
 noinst_LTLIBRARIES = libtesseract_main.la
diff --git a/ccstruct/Makefile.am b/ccstruct/Makefile.am
index c273c38a..cde2b376 100644
--- a/ccstruct/Makefile.am
+++ b/ccstruct/Makefile.am
@@ -7,14 +7,14 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+include_HEADERS = publictypes.h
+noinst_HEADERS = \
     blckerr.h blobbox.h blobs.h blread.h boxread.h boxword.h ccstruct.h coutln.h crakedge.h \
     detlinefit.h dppoint.h fontinfo.h genblob.h hpddef.h hpdsizes.h ipoints.h \
     linlsq.h matrix.h mod128.h normalis.h \
     ocrblock.h ocrpara.h ocrrow.h otsuthr.h \
     pageres.h params_training_featdef.h \
     pdblock.h points.h polyaprx.h polyblk.h \
-    publictypes.h \
     quadlsq.h quadratc.h quspline.h ratngs.h rect.h rejctmap.h \
     seam.h split.h statistc.h stepblob.h vecfuncs.h werd.h
 
diff --git a/ccutil/Makefile.am b/ccutil/Makefile.am
index 87db8cb8..2e6e59c7 100644
--- a/ccutil/Makefile.am
+++ b/ccutil/Makefile.am
@@ -8,19 +8,15 @@ endif
 
 EXTRA_DIST = mfcpch.cpp
 
-include_HEADERS = \
-    ambigs.h basedir.h bits16.h bitvector.h \
-    tesscallback.h ccutil.h clst.h \
-    elst2.h elst.h errcode.h \
-    fileerr.h genericvector.h globaloc.h \
-    hashfn.h helpers.h host.h hosthplb.h indexmapbidi.h lsterr.h \
-    memry.h mfcpch.h \
-    ndminx.h notdll.h nwmain.h \
-    ocrclass.h platform.h qrsequence.h \
-    secname.h serialis.h sorthelper.h stderr.h strngs.h \
-    tessdatamanager.h tprintf.h \
-    unichar.h unicharmap.h unicharset.h unicity_table.h unicodes.h \
-    params.h
+include_HEADERS = errcode.h fileerr.h host.h memry.h \
+    platform.h serialis.h strngs.h tesscallback.h unichar.h
+noinst_HEADERS = \
+    ambigs.h basedir.h bits16.h bitvector.h ccutil.h clst.h \
+    elst2.h elst.h genericvector.h globaloc.h hashfn.h helpers.h \
+    hosthplb.h indexmapbidi.h lsterr.h mfcpch.h ndminx.h notdll.h \
+    nwmain.h ocrclass.h qrsequence.h secname.h sorthelper.h stderr.h \
+    tessdatamanager.h tprintf.h unicharmap.h unicharset.h \
+    unicity_table.h unicodes.h params.h
 
 if !USING_MULTIPLELIBS
 noinst_LTLIBRARIES = libtesseract_ccutil.la
diff --git a/classify/Makefile.am b/classify/Makefile.am
index 5b1e5201..729bc3c3 100644
--- a/classify/Makefile.am
+++ b/classify/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+noinst_HEADERS = \
     adaptive.h baseline.h blobclass.h chartoname.h \
     classify.h cluster.h clusttool.h cutoffs.h \
     errorcounter.h extern.h extract.h \
diff --git a/cube/Makefile.am b/cube/Makefile.am
index fe60c6bd..cf48be8a 100644
--- a/cube/Makefile.am
+++ b/cube/Makefile.am
@@ -12,7 +12,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+noinst_HEADERS = \
     altlist.h beam_search.h bmp_8.h cached_file.h \
     char_altlist.h char_bigrams.h char_samp.h char_samp_enum.h \
     char_samp_set.h char_set.h classifier_base.h classifier_factory.h \
diff --git a/cutil/Makefile.am b/cutil/Makefile.am
index 30861e55..2c861d97 100644
--- a/cutil/Makefile.am
+++ b/cutil/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+noinst_HEADERS = \
     bitvec.h callcpp.h const.h cutil.h cutil_class.h danerror.h efio.h \
     emalloc.h freelist.h globals.h listio.h \
     oldheap.h oldlist.h structures.h tessarray.h
diff --git a/dict/Makefile.am b/dict/Makefile.am
index cfc584b5..288d41fd 100644
--- a/dict/Makefile.am
+++ b/dict/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+noinst_HEADERS = \
     dawg.h dict.h matchdefs.h \
     permute.h states.h stopper.h trie.h
 
diff --git a/image/Makefile.am b/image/Makefile.am
index d26d0247..9722c549 100644
--- a/image/Makefile.am
+++ b/image/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+noinst_HEADERS = \
     image.h img.h imgerrs.h imgs.h \
     imgtiff.h imgunpk.h svshowim.h
 
diff --git a/neural_networks/runtime/Makefile.am b/neural_networks/runtime/Makefile.am
index fb098c57..856bcf2a 100644
--- a/neural_networks/runtime/Makefile.am
+++ b/neural_networks/runtime/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+noinst_HEADERS = \
     input_file_buffer.h neural_net.h neuron.h
 
 if !USING_MULTIPLELIBS
diff --git a/textord/Makefile.am b/textord/Makefile.am
index 774c0f94..17cf729f 100644
--- a/textord/Makefile.am
+++ b/textord/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
 endif
 
 
-include_HEADERS = \
+noinst_HEADERS = \
     alignedblob.h bbgrid.h blkocc.h blobgrid.h \
     ccnontextdetect.h cjkpitch.h colfind.h colpartition.h colpartitionset.h \
     colpartitiongrid.h \
diff --git a/training/Makefile.am b/training/Makefile.am
index 8b66d5c4..62070d32 100644
--- a/training/Makefile.am
+++ b/training/Makefile.am
@@ -1,4 +1,3 @@
-SUBDIRS =
 AM_CPPFLAGS = \
     -DUSE_STD_NAMESPACE \
     -I$(top_srcdir)/ccmain -I$(top_srcdir)/api \
@@ -8,7 +7,7 @@ AM_CPPFLAGS = \
     -I$(top_srcdir)/classify -I$(top_srcdir)/display \
     -I$(top_srcdir)/wordrec -I$(top_srcdir)/cutil
 
-include_HEADERS = \
+noinst_HEADERS = \
     commontraining.h tessopt.h mergenf.h
 
 noinst_LTLIBRARIES = libtesseract_training.la libtesseract_tessopt.la
diff --git a/viewer/Makefile.am b/viewer/Makefile.am
index 8e8fcd2a..e6389ffe 100644
--- a/viewer/Makefile.am
+++ b/viewer/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+noinst_HEADERS = \
     scrollview.h svmnode.h svutil.h
 
 if !USING_MULTIPLELIBS
diff --git a/wordrec/Makefile.am b/wordrec/Makefile.am
index a3acada5..bcddcb24 100644
--- a/wordrec/Makefile.am
+++ b/wordrec/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS += -DTESS_EXPORTS \
     -fvisibility=hidden -fvisibility-inlines-hidden
 endif
 
-include_HEADERS = \
+noinst_HEADERS = \
     associate.h bestfirst.h chop.h \
     chopper.h closed.h drawfx.h findseam.h gradechop.h \
     language_model.h makechop.h matchtab.h measure.h \
@@ -39,5 +39,3 @@ libtesseract_wordrec_la_SOURCES = \
     olutil.cpp outlines.cpp pieces.cpp \
     plotedges.cpp plotseg.cpp render.cpp segsearch.cpp \
     tface.cpp wordclass.cpp wordrec.cpp
-
-