diff --git a/Makefile.am b/Makefile.am
index f7b2293b..302b58e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -52,11 +52,11 @@ pkgconfig_DATA = tesseract.pc
 pkginclude_HEADERS = $(top_builddir)/include/tesseract/version.h
 pkginclude_HEADERS += include/tesseract/baseapi.h
 pkginclude_HEADERS += include/tesseract/capi.h
+pkginclude_HEADERS += include/tesseract/export.h
 pkginclude_HEADERS += include/tesseract/ltrresultiterator.h
 pkginclude_HEADERS += include/tesseract/ocrclass.h
 pkginclude_HEADERS += include/tesseract/osdetect.h
 pkginclude_HEADERS += include/tesseract/pageiterator.h
-pkginclude_HEADERS += include/tesseract/export.h
 pkginclude_HEADERS += include/tesseract/publictypes.h
 pkginclude_HEADERS += include/tesseract/renderer.h
 pkginclude_HEADERS += include/tesseract/resultiterator.h
@@ -801,18 +801,18 @@ noinst_HEADERS += src/training/pango/boxchar.h
 noinst_HEADERS += src/training/common/commandlineflags.h
 noinst_HEADERS += src/training/common/commontraining.h
 noinst_HEADERS += src/training/common/ctc.h
-noinst_HEADERS += src/training/degradeimage.h
-noinst_HEADERS += src/training/unicharset/icuerrorcode.h
-noinst_HEADERS += src/training/unicharset/fileio.h
-noinst_HEADERS += src/training/unicharset/lang_model_helpers.h
-noinst_HEADERS += src/training/pango/ligature_table.h
-noinst_HEADERS += src/training/unicharset/lstmtester.h
-noinst_HEADERS += src/training/unicharset/lstmtrainer.h
 noinst_HEADERS += src/training/common/networkbuilder.h
-noinst_HEADERS += src/training/unicharset/normstrngs.h
+noinst_HEADERS += src/training/degradeimage.h
+noinst_HEADERS += src/training/pango/ligature_table.h
 noinst_HEADERS += src/training/pango/pango_font_info.h
 noinst_HEADERS += src/training/pango/stringrenderer.h
 noinst_HEADERS += src/training/pango/tlog.h
+noinst_HEADERS += src/training/unicharset/icuerrorcode.h
+noinst_HEADERS += src/training/unicharset/fileio.h
+noinst_HEADERS += src/training/unicharset/lang_model_helpers.h
+noinst_HEADERS += src/training/unicharset/lstmtester.h
+noinst_HEADERS += src/training/unicharset/lstmtrainer.h
+noinst_HEADERS += src/training/unicharset/normstrngs.h
 noinst_HEADERS += src/training/unicharset/unicharset_training_utils.h
 noinst_HEADERS += src/training/unicharset/validate_grapheme.h
 noinst_HEADERS += src/training/unicharset/validate_indic.h
@@ -825,9 +825,9 @@ noinst_HEADERS += src/training/common/errorcounter.h
 noinst_HEADERS += src/training/common/intfeaturedist.h
 noinst_HEADERS += src/training/common/intfeaturemap.h
 noinst_HEADERS += src/training/common/mastertrainer.h
-noinst_HEADERS += src/training/mergenf.h
 noinst_HEADERS += src/training/common/sampleiterator.h
 noinst_HEADERS += src/training/common/trainingsampleset.h
+noinst_HEADERS += src/training/mergenf.h
 endif
 
 
@@ -838,18 +838,18 @@ libtesseract_training_la_SOURCES = src/training/pango/boxchar.cpp
 libtesseract_training_la_SOURCES += src/training/common/commandlineflags.cpp
 libtesseract_training_la_SOURCES += src/training/common/commontraining.cpp
 libtesseract_training_la_SOURCES += src/training/common/ctc.cpp
-libtesseract_training_la_SOURCES += src/training/degradeimage.cpp
-libtesseract_training_la_SOURCES += src/training/unicharset/icuerrorcode.cpp
-libtesseract_training_la_SOURCES += src/training/unicharset/fileio.cpp
-libtesseract_training_la_SOURCES += src/training/unicharset/lang_model_helpers.cpp
-libtesseract_training_la_SOURCES += src/training/pango/ligature_table.cpp
-libtesseract_training_la_SOURCES += src/training/unicharset/lstmtester.cpp
-libtesseract_training_la_SOURCES += src/training/unicharset/lstmtrainer.cpp
 libtesseract_training_la_SOURCES += src/training/common/networkbuilder.cpp
-libtesseract_training_la_SOURCES += src/training/unicharset/normstrngs.cpp
+libtesseract_training_la_SOURCES += src/training/degradeimage.cpp
+libtesseract_training_la_SOURCES += src/training/pango/ligature_table.cpp
 libtesseract_training_la_SOURCES += src/training/pango/pango_font_info.cpp
 libtesseract_training_la_SOURCES += src/training/pango/stringrenderer.cpp
 libtesseract_training_la_SOURCES += src/training/pango/tlog.cpp
+libtesseract_training_la_SOURCES += src/training/unicharset/icuerrorcode.cpp
+libtesseract_training_la_SOURCES += src/training/unicharset/fileio.cpp
+libtesseract_training_la_SOURCES += src/training/unicharset/lang_model_helpers.cpp
+libtesseract_training_la_SOURCES += src/training/unicharset/lstmtester.cpp
+libtesseract_training_la_SOURCES += src/training/unicharset/lstmtrainer.cpp
+libtesseract_training_la_SOURCES += src/training/unicharset/normstrngs.cpp
 libtesseract_training_la_SOURCES += src/training/unicharset/unicharset_training_utils.cpp
 libtesseract_training_la_SOURCES += src/training/unicharset/validate_grapheme.cpp
 libtesseract_training_la_SOURCES += src/training/unicharset/validate_indic.cpp