Revert d6cdc52. Fixes #3412.

src/ccmain/tesseractclass.h

@@ -35,6 +35,7 @@
 #ifndef DISABLED_LEGACY_ENGINE
 #  include "docqual.h" // for GARBAGE_LEVEL
 #endif
+#include "genericvector.h"   // for PointerVector
 #include "pageres.h"         // for WERD_RES (ptr only), PAGE_RES (pt...
 #include "params.h"          // for BOOL_VAR_H, BoolParam, DoubleParam
 #include "points.h"          // for FCOORD

src/ccstruct/pageres.h

@@ -21,6 +21,7 @@
 
 #include "blamer.h"     // for BlamerBundle (ptr only), IRR_NUM_REASONS
 #include "clst.h"       // for CLIST_ITERATOR, CLISTIZEH
+#include "genericvector.h" // for PointerVector
 #include "elst.h"       // for ELIST_ITERATOR, ELIST_LINK, ELISTIZEH
 #include "matrix.h"     // for MATRIX
 #include "normalis.h"   // for DENORM
@@ -32,12 +33,13 @@
 
 #include <tesseract/unichar.h> // for UNICHAR_ID, INVALID_UNICHAR_ID
 
-#include <sys/types.h> // for int8_t
 #include <cstdint>     // for int32_t, int16_t
 #include <functional>  // for std::function
 #include <set>         // for std::pair
 #include <vector>      // for std::vector
 
+#include <sys/types.h> // for int8_t
+
 struct Pix;
 
 namespace tesseract {

src/lstm/recodebeam.h

@@ -20,18 +20,20 @@
 #ifndef THIRD_PARTY_TESSERACT_LSTM_RECODEBEAM_H_
 #define THIRD_PARTY_TESSERACT_LSTM_RECODEBEAM_H_
 
+#include "dawg.h"
+#include "dict.h"
+#include "genericheap.h"
+#include "genericvector.h"
+#include "kdpair.h"
+#include "networkio.h"
+#include "ratngs.h"
+#include "unicharcompress.h"
+
 #include <deque>
 #include <set>
 #include <tuple>
 #include <unordered_set>
 #include <vector>
-#include "dawg.h"
-#include "dict.h"
-#include "genericheap.h"
-#include "kdpair.h"
-#include "networkio.h"
-#include "ratngs.h"
-#include "unicharcompress.h"
 
 namespace tesseract {