diff --git a/classify/Makefile.am b/classify/Makefile.am
index 59450fa1..f620e3bf 100644
--- a/classify/Makefile.am
+++ b/classify/Makefile.am
@@ -11,15 +11,15 @@ endif
 noinst_HEADERS = \
     adaptive.h blobclass.h \
     classify.h cluster.h clusttool.h cutoffs.h \
-    errorcounter.h extern.h extract.h \
-    featdefs.h flexfx.h float2int.h fpoint.h fxdefs.h \
+    errorcounter.h \
+    featdefs.h float2int.h fpoint.h \
     intfeaturedist.h intfeaturemap.h intfeaturespace.h \
     intfx.h intmatcher.h intproto.h kdtree.h \
     mastertrainer.h mf.h mfdefs.h mfoutline.h mfx.h \
     normfeat.h normmatch.h \
     ocrfeatures.h outfeat.h picofeat.h protos.h \
     sampleiterator.h shapeclassifier.h shapetable.h \
-    tessclassifier.h trainingsample.h trainingsampleset.h xform2d.h
+    tessclassifier.h trainingsample.h trainingsampleset.h
 
 if !USING_MULTIPLELIBS
 noinst_LTLIBRARIES = libtesseract_classify.la
@@ -37,14 +37,14 @@ endif
 libtesseract_classify_la_SOURCES = \
     adaptive.cpp adaptmatch.cpp blobclass.cpp \
     classify.cpp cluster.cpp clusttool.cpp cutoffs.cpp \
-    errorcounter.cpp extract.cpp \
-    featdefs.cpp flexfx.cpp float2int.cpp fpoint.cpp fxdefs.cpp \
+    errorcounter.cpp \
+    featdefs.cpp float2int.cpp fpoint.cpp \
     intfeaturedist.cpp intfeaturemap.cpp intfeaturespace.cpp \
     intfx.cpp intmatcher.cpp intproto.cpp kdtree.cpp \
     mastertrainer.cpp mf.cpp mfdefs.cpp mfoutline.cpp mfx.cpp \
     normfeat.cpp normmatch.cpp \
     ocrfeatures.cpp outfeat.cpp picofeat.cpp protos.cpp \
     sampleiterator.cpp shapeclassifier.cpp shapetable.cpp \
-    tessclassifier.cpp trainingsample.cpp trainingsampleset.cpp xform2d.cpp
+    tessclassifier.cpp trainingsample.cpp trainingsampleset.cpp