Remove genericvector.h from public API

Signed-off-by: Stefan Weil <sw@weil.de>

CMakeLists.txt

@@ -718,7 +718,6 @@ install(FILES
     include/tesseract/publictypes.h
 
     #from ccutil/makefile.am
-    include/tesseract/genericvector.h
     include/tesseract/helpers.h
     include/tesseract/ocrclass.h
     include/tesseract/platform.h

Makefile.am

@@ -49,7 +49,6 @@ pkginclude_HEADERS = $(top_builddir)/include/tesseract/version.h
 pkginclude_HEADERS += include/tesseract/apitypes.h
 pkginclude_HEADERS += include/tesseract/baseapi.h
 pkginclude_HEADERS += include/tesseract/capi.h
-pkginclude_HEADERS += include/tesseract/genericvector.h
 pkginclude_HEADERS += include/tesseract/helpers.h
 pkginclude_HEADERS += include/tesseract/ltrresultiterator.h
 pkginclude_HEADERS += include/tesseract/ocrclass.h
@@ -327,6 +326,7 @@ noinst_HEADERS += src/ccutil/elst.h
 noinst_HEADERS += src/ccutil/errcode.h
 noinst_HEADERS += src/ccutil/fileerr.h
 noinst_HEADERS += src/ccutil/genericheap.h
+noinst_HEADERS += src/ccutil/genericvector.h
 noinst_HEADERS += src/ccutil/host.h
 noinst_HEADERS += src/ccutil/kdpair.h
 noinst_HEADERS += src/ccutil/lsterr.h

src/api/capi.cpp

@@ -20,7 +20,7 @@
 #endif
 
 #include <tesseract/capi.h>
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/strngs.h>
 
 namespace tesseract {

src/api/renderer.cpp

@@ -23,7 +23,7 @@
 #include <memory>  // std::unique_ptr
 #include <string>  // std::string
 #include <tesseract/baseapi.h>
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/renderer.h>
 
 namespace tesseract {

src/arch/intsimdmatrix.cpp

@@ -16,7 +16,7 @@
 ///////////////////////////////////////////////////////////////////////
 
 #include "intsimdmatrix.h"
-#include <tesseract/genericvector.h>      // for GenericVector
+#include "genericvector.h"      // for GenericVector
 #include "matrix.h"             // for GENERIC_2D_ARRAY
 #include "simddetect.h"         // for SIMDDetect
 

src/ccmain/applybox.cpp

@@ -27,7 +27,7 @@
 #include <tesseract/unichar.h>
 #include "unicharset.h"
 #include "tesseractclass.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 #ifndef DISABLED_LEGACY_ENGINE
 /** Max number of blobs to classify together in FindSegmentation. */

src/ccmain/equationdetect.h

@@ -21,7 +21,7 @@
 
 #include "blobbox.h"             // for BLOBNBOX (ptr only), BlobSpecialText...
 #include "equationdetectbase.h"  // for EquationDetectBase
-#include <tesseract/genericvector.h>       // for GenericVector
+#include "genericvector.h"       // for GenericVector
 #include "tesseractclass.h"      // for Tesseract
 #include <tesseract/unichar.h>             // for UNICHAR_ID
 

src/ccmain/paragraphs.cpp

@@ -24,7 +24,7 @@
 #include <cstring>                // for strchr, strlen
 #include <algorithm>              // for max
 #include <memory>                 // for unique_ptr
-#include <tesseract/genericvector.h>        // for GenericVector, GenericVectorEqEq
+#include "genericvector.h"        // for GenericVector, GenericVectorEqEq
 #include <tesseract/helpers.h>              // for UpdateRange, ClipToRange
 #include "host.h"                 // for NearlyEqual
 #include "mutableiterator.h"      // for MutableIterator

src/ccmain/paramsd.cpp

@@ -32,7 +32,7 @@
 #include "svmnode.h"         // for SVMenuNode
 #include "tesseractclass.h"  // for Tesseract
 
-#include <tesseract/genericvector.h>   // for GenericVector
+#include "genericvector.h"   // for GenericVector
 
 #include <cstdio>            // for fclose, fopen, fprintf, sprintf, FILE
 #include <cstdlib>           // for atoi

src/ccmain/reject.cpp

@@ -43,7 +43,7 @@ int16_t Tesseract::safe_dict_word(const WERD_RES *werd_res) {
 #include "docqual.h"
 #include "tesseractclass.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/helpers.h>
 
 #include <cctype>

src/ccmain/tesseractclass.h

@@ -43,7 +43,7 @@
 #include "textord.h"                // for Textord
 #include "wordrec.h"                // for Wordrec
 
-#include <tesseract/genericvector.h>          // for GenericVector, PointerVector
+#include "genericvector.h"          // for GenericVector, PointerVector
 #include <tesseract/publictypes.h>            // for OcrEngineMode, PageSegMode, OEM_L...
 #include <tesseract/strngs.h>                 // for STRING
 #include <tesseract/unichar.h>                // for UNICHAR_ID

src/ccstruct/blamer.h

@@ -31,7 +31,7 @@
 #include "rect.h"                     // for TBOX
 #include "tprintf.h"                  // for tprintf
 
-#include <tesseract/genericvector.h>            // for GenericVector
+#include "genericvector.h"            // for GenericVector
 #include <tesseract/unichar.h>                  // for UNICHAR_ID
 #include <tesseract/strngs.h>                   // for STRING
 

src/ccstruct/blobs.h

@@ -26,7 +26,7 @@
 #include "rect.h"              // for TBOX
 #include "scrollview.h"        // for ScrollView, ScrollView::Color
 
-#include <tesseract/genericvector.h>     // for GenericVector
+#include "genericvector.h"     // for GenericVector
 #include <tesseract/publictypes.h>       // for OcrEngineMode
 
 #include <cstdint>             // for int16_t

src/ccstruct/boxword.h

@@ -22,7 +22,7 @@
 
 #include "rect.h"           // for TBOX
 
-#include <tesseract/genericvector.h>  // for GenericVector
+#include "genericvector.h"  // for GenericVector
 
 #include <functional>       // for std::function
 

src/ccstruct/detlinefit.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCSTRUCT_DETLINEFIT_H_
 #define TESSERACT_CCSTRUCT_DETLINEFIT_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "kdpair.h"
 #include "points.h"
 

src/ccstruct/fontinfo.h

@@ -22,7 +22,7 @@
 
 #include "errcode.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/unichar.h>
 
 #include <cstdint>         // for uint16_t, uint32_t

src/ccstruct/imagedata.h

@@ -21,7 +21,7 @@
 
 #include "points.h"             // for FCOORD
 
-#include <tesseract/genericvector.h>      // for GenericVector, PointerVector, FileReader
+#include "genericvector.h"      // for GenericVector, PointerVector, FileReader
 #include <tesseract/strngs.h>   // for STRING
 
 #include <mutex>                // for std::mutex

src/ccstruct/pageres.h

@@ -30,7 +30,7 @@
 #include "unicharset.h"        // for UNICHARSET, UNICHARSET::Direction, UNI...
 #include "werd.h"              // for WERD, W_BOL, W_EOL
 
-#include <tesseract/genericvector.h>     // for GenericVector, PointerVector (ptr only)
+#include "genericvector.h"     // for GenericVector, PointerVector (ptr only)
 #include <tesseract/strngs.h>            // for STRING
 #include <tesseract/unichar.h>           // for UNICHAR_ID, INVALID_UNICHAR_ID
 

src/ccstruct/params_training_featdef.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_WORDREC_PARAMS_TRAINING_FEATDEF_H_
 #define TESSERACT_WORDREC_PARAMS_TRAINING_FEATDEF_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/strngs.h>
 
 namespace tesseract {

src/ccstruct/ratngs.cpp

@@ -27,7 +27,7 @@
 #include "normalis.h"  // kBlnBaselineOffset.
 #include "unicharset.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 #include <algorithm>
 #include <string>

src/ccstruct/ratngs.h

@@ -32,7 +32,7 @@
 #include "unicharset.h"
 #include "werd.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/unichar.h>
 
 #include <cassert>

src/ccstruct/stepblob.cpp

@@ -25,7 +25,7 @@
 
 #include "points.h"         // for operator+=, FCOORD, ICOORD
 
-#include <tesseract/genericvector.h>  // for GenericVector
+#include "genericvector.h"  // for GenericVector
 
 #include "allheaders.h"     // for pixCreate, pixGetDepth
 

src/ccutil/ambigs.h

@@ -30,7 +30,7 @@
 #include "tprintf.h"
 #include <tesseract/unichar.h>
 #include "unicharset.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 #define MAX_AMBIG_SIZE    10
 

src/ccutil/genericheap.h

@@ -24,7 +24,7 @@
 
 #include "errcode.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/ccutil/genericvector.h

@@ -19,8 +19,8 @@
 #ifndef TESSERACT_CCUTIL_GENERICVECTOR_H_
 #define TESSERACT_CCUTIL_GENERICVECTOR_H_
 
-#include "helpers.h"
-#include "serialis.h"
+#include <tesseract/helpers.h>
+#include <tesseract/serialis.h>
 
 #include <algorithm>
 #include <cassert>

src/ccutil/indexmapbidi.h

@@ -21,7 +21,7 @@
 #define TESSERACT_CCUTIL_INDEXMAPBIDI_H_
 
 #include <cstdio>
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/ccutil/kdpair.h

@@ -24,7 +24,7 @@
 #ifndef TESSERACT_CCUTIL_KDPAIR_H_
 #define TESSERACT_CCUTIL_KDPAIR_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/ccutil/object_cache.h

@@ -24,7 +24,7 @@
 #include <string>
 #include "ccutil.h"
 #include "errcode.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/ccutil/params.cpp

@@ -21,7 +21,7 @@
 #include "host.h"           // tesseract/platform.h, windows.h for MAX_PATH
 #include "tprintf.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 #include <climits>          // for INT_MIN, INT_MAX
 #include <cmath>            // for NAN, std::isnan

src/ccutil/params.h

@@ -19,7 +19,7 @@
 #ifndef PARAMS_H
 #define PARAMS_H
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/strngs.h>
 
 #include <cstdio>

src/ccutil/sorthelper.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCUTIL_SORTHELPER_H_
 #define TESSERACT_CCUTIL_SORTHELPER_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 #include <cstdlib>
 

src/ccutil/tessdatamanager.h

@@ -20,7 +20,7 @@
 #define TESSERACT_CCUTIL_TESSDATAMANAGER_H_
 
 #include <string>
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/strngs.h>             // for STRING
 
 static const char kTrainedDataSuffix[] = "traineddata";

src/ccutil/unichar.cpp

@@ -18,7 +18,7 @@
 
 #include <tesseract/unichar.h>
 #include "errcode.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "tprintf.h"
 
 #define UNI_MAX_LEGAL_UTF32 0x0010FFFF

src/ccutil/unicharset.h

@@ -22,7 +22,7 @@
 #include "errcode.h"
 #include "unicharmap.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/helpers.h>
 #include <tesseract/serialis.h>
 #include <tesseract/strngs.h>

src/ccutil/unicity_table.h

@@ -22,7 +22,7 @@
 
 #include "errcode.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 #include <functional>           // for std::function
 

src/classify/adaptmatch.cpp

@@ -59,7 +59,7 @@
 #include "unicharset.h"         // for UNICHARSET, CHAR_FRAGMENT, UNICHAR_SPACE
 #include "unicity_table.h"      // for UnicityTable
 
-#include <tesseract/genericvector.h>      // for GenericVector
+#include "genericvector.h"      // for GenericVector
 #include <tesseract/helpers.h>            // for IntCastRounded, ClipToRange
 #include <tesseract/serialis.h>           // for TFile
 #include <tesseract/strngs.h>             // for STRING

src/classify/intfeaturespace.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CLASSIFY_INTFEATURESPACE_H_
 #define TESSERACT_CLASSIFY_INTFEATURESPACE_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "intproto.h"
 
 // Extent of x,y,theta in the input feature space. [0,255].

src/classify/intproto.cpp

@@ -36,7 +36,7 @@
 #include "shapetable.h"
 #include "svmnode.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/helpers.h>
 
 #include <algorithm>

src/classify/intproto.h

@@ -28,7 +28,7 @@
 #include "scrollview.h"
 #include "unicharset.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/classify/shapeclassifier.cpp

@@ -31,7 +31,7 @@
 #include "trainingsample.h"
 #include "tprintf.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/classify/shapetable.h

@@ -27,7 +27,7 @@
 #include "genericheap.h"
 #include "intmatcher.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/dict/stopper.h

@@ -21,7 +21,7 @@
 #include "params.h"
 #include "ratngs.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/unichar.h>
 
 namespace tesseract {

src/dict/trie.cpp

@@ -24,7 +24,7 @@
 
 #include "dawg.h"
 #include "dict.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/helpers.h>
 #include "kdpair.h"
 

src/dict/trie.h

@@ -21,7 +21,7 @@
 
 #include "dawg.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/lstm/convolve.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_LSTM_CONVOLVE_H_
 #define TESSERACT_LSTM_CONVOLVE_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "matrix.h"
 #include "network.h"
 

src/lstm/network.h

@@ -25,7 +25,7 @@
 
 #include <tesseract/serialis.h>
 #include <tesseract/strngs.h>             // for STRING
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/helpers.h>
 
 #include <cstdio>

src/lstm/networkio.h

@@ -23,7 +23,7 @@
 #include <cstdio>
 #include <vector>
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/helpers.h>
 #include "static_shape.h"
 #include "stridemap.h"

src/lstm/networkscratch.h

@@ -20,7 +20,7 @@
 #define TESSERACT_LSTM_NETWORKSCRATCH_H_
 
 #include <mutex>
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "matrix.h"
 #include "networkio.h"
 

src/lstm/plumbing.h

@@ -19,7 +19,7 @@
 #ifndef TESSERACT_LSTM_PLUMBING_H_
 #define TESSERACT_LSTM_PLUMBING_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "matrix.h"
 #include "network.h"
 

src/lstm/reconfig.h

@@ -19,7 +19,7 @@
 #ifndef TESSERACT_LSTM_RECONFIG_H_
 #define TESSERACT_LSTM_RECONFIG_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "matrix.h"
 #include "network.h"
 

src/textord/baselinedetect.h

@@ -24,7 +24,7 @@
 #include "points.h"
 #include "rect.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/strngs.h>
 
 struct Pix;

src/textord/cjkpitch.cpp

@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////////////
 
 #include "cjkpitch.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "topitch.h"
 #include "tovars.h"
 

src/textord/colpartitionset.h

@@ -21,7 +21,7 @@
 #define TESSERACT_TEXTORD_COLPARTITIONSET_H_
 
 #include "colpartition.h"   // For ColPartition_LIST.
-#include <tesseract/genericvector.h>  // For GenericVector.
+#include "genericvector.h"  // For GenericVector.
 #include "rect.h"           // For TBOX.
 #include "tabvector.h"      // For BLOBNBOX_CLIST.
 

src/textord/tablerecog.h

@@ -21,7 +21,7 @@
 #define TABLERECOG_H_
 
 #include "colpartitiongrid.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/textord/tordmain.cpp

@@ -49,7 +49,7 @@
 #include "tprintf.h"            // for tprintf
 #include "werd.h"               // for WERD_IT, WERD, WERD_LIST, W_DONT_CHOP
 
-#include <tesseract/genericvector.h>      // for PointerVector, GenericVector
+#include "genericvector.h"      // for PointerVector, GenericVector
 
 #include "allheaders.h"         // for pixDestroy, pixGetHeight, boxCreate
 

src/training/boxchar.cpp

@@ -26,7 +26,7 @@
 #include <vector>
 
 #include "fileio.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "normstrngs.h"
 #include "tprintf.h"
 #include "unicharset.h"

src/training/ctc.cpp

@@ -21,7 +21,7 @@
 #include <cfloat>      // for FLT_MAX
 #include <memory>
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "matrix.h"
 #include "networkio.h"
 

src/training/ctc.h

@@ -19,7 +19,7 @@
 #ifndef TESSERACT_LSTM_CTC_H_
 #define TESSERACT_LSTM_CTC_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "network.h"
 #include "networkio.h"
 #include "scrollview.h"

src/training/degradeimage.cpp

@@ -22,7 +22,7 @@
 
 #include <cstdlib>
 #include "allheaders.h"   // from leptonica
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/helpers.h>  // For TRand.
 #include "rect.h"
 

src/training/degradeimage.h

@@ -21,7 +21,7 @@
 #define TESSERACT_TRAINING_DEGRADEIMAGE_H_
 
 #include "allheaders.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/helpers.h>  // For TRand.
 #include "rect.h"
 

src/training/errorcounter.h

@@ -19,7 +19,7 @@
 #include "matrix.h"
 #include "statistc.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 struct Pix;
 

src/training/fileio.h

@@ -20,7 +20,7 @@
 #include <cstdio>
 #include <string>
 
-#include <tesseract/genericvector.h>      // for GenericVector
+#include "genericvector.h"      // for GenericVector
 #include <tesseract/platform.h>
 #include <tesseract/strngs.h>             // for STRING
 

src/training/intfeaturedist.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CLASSIFY_INTFEATUREDIST_H_
 #define TESSERACT_CLASSIFY_INTFEATUREDIST_H_
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/training/lang_model_helpers.h

@@ -16,7 +16,7 @@
 #define TESSERACT_TRAINING_LANG_MODEL_HELPERS_H_
 
 #include <string>
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/serialis.h>
 #include <tesseract/strngs.h>
 #include "tessdatamanager.h"

src/training/lstmeval.cpp

@@ -19,7 +19,7 @@
 #include "base/commandlineflags.h"
 #endif
 #include "commontraining.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "lstmtester.h"
 #include <tesseract/strngs.h>
 #include "tprintf.h"

src/training/lstmtester.cpp

@@ -18,7 +18,7 @@
 #include <thread>               // for std::thread
 #include "fileio.h"             // for LoadFileLinesToStrings
 #include "lstmtester.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/training/lstmtester.h

@@ -19,7 +19,7 @@
 #define TESSERACT_TRAINING_LSTMTESTER_H_
 
 #include <mutex>
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "lstmtrainer.h"
 #include <tesseract/strngs.h>
 

src/training/mftraining.cpp

@@ -36,7 +36,7 @@
 #include "commontraining.h"
 #include "featdefs.h"
 #include "fontinfo.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "indexmapbidi.h"
 #include "intproto.h"
 #include "mastertrainer.h"

src/training/trainingsampleset.h

@@ -22,7 +22,7 @@
 #include "shapetable.h"
 #include "trainingsample.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 
 namespace tesseract {
 

src/training/unicharset_extractor.cpp

@@ -24,7 +24,7 @@
 #include "boxread.h"
 #include "commandlineflags.h"
 #include "commontraining.h"     // CheckSharedLibraryVersion
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "lang_model_helpers.h"
 #include "normstrngs.h"
 #include <tesseract/strngs.h>

src/wordrec/lm_state.h

@@ -23,7 +23,7 @@
 #include "associate.h"       // for AssociateStats
 #include "dawg.h"            // for DawgPositionVector
 #include "elst.h"            // for ELIST_ITERATOR, ELISTIZEH, ELIST_LINK
-#include <tesseract/genericvector.h>   // for PointerVector
+#include "genericvector.h"   // for PointerVector
 #include "lm_consistency.h"  // for LMConsistencyInfo
 #include "ratngs.h"          // for BLOB_CHOICE, PermuterType
 #include "stopper.h"         // for DANGERR

src/wordrec/params_model.h

@@ -19,7 +19,7 @@
 #ifndef TESSERACT_WORDREC_PARAMS_MODEL_H_
 #define TESSERACT_WORDREC_PARAMS_MODEL_H_
 
-#include <tesseract/genericvector.h>              // for GenericVector
+#include "genericvector.h"              // for GenericVector
 #include "params_training_featdef.h"    // for PTRAIN_NUM_FEATURE_TYPES
 #include <tesseract/strngs.h>                     // for STRING
 

src/wordrec/segsearch.cpp

@@ -19,7 +19,7 @@
 #include <cstdint>           // for INT32_MAX
 #include "blamer.h"          // for BlamerBundle
 #include "errcode.h"         // for ASSERT_HOST
-#include <tesseract/genericvector.h>   // for GenericVector
+#include "genericvector.h"   // for GenericVector
 #include "lm_pain_points.h"  // for LMPainPoints, LM_PPTYPE_SHAPE, LMPainPoi...
 #include "lm_state.h"        // for BestChoiceBundle, ViterbiStateEntry
 #include "matrix.h"          // for MATRIX_COORD, MATRIX

src/wordrec/wordrec.h

@@ -79,7 +79,7 @@ class Wordrec : public Classify {
 #include "seam.h"              // for SEAM (ptr only), PRIORITY
 #include "stopper.h"           // for DANGERR
 
-#include <tesseract/genericvector.h>     // for GenericVector
+#include "genericvector.h"     // for GenericVector
 
 #include <cstdint>             // for int16_t, int32_t
 

unittest/heap_test.cc

@@ -14,10 +14,9 @@
 
 #include "doubleptr.h"
 #include "genericheap.h"
+#include "genericvector.h"
 #include "kdpair.h"
 
-#include <tesseract/genericvector.h>
-
 #include <string>
 #include <utility>
 

unittest/mastertrainer_test.cc

@@ -30,7 +30,7 @@
 
 #include "include_gunit.h"
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "log.h"                        // for LOG
 #include "unicharset.h"
 #include "errorcounter.h"

unittest/matrix_test.cc

@@ -15,7 +15,7 @@
 ///////////////////////////////////////////////////////////////////////
 
 #include "matrix.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "include_gunit.h"
 
 namespace tesseract {

unittest/nthitem_test.cc

@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "kdpair.h"
 
 #include "include_gunit.h"

unittest/paragraphs_test.cc

@@ -18,7 +18,7 @@
 #include "include_gunit.h"              // for TEST
 #include "log.h"                        // for LOG
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 // ccmain
 #include "paragraphs.h"
 #include "paragraphs_internal.h"

unittest/recodebeam_test.cc

@@ -13,6 +13,7 @@
 #include "include_gunit.h"
 #include "log.h"                        // for LOG
 
+#include "genericvector.h"
 #include "recodebeam.h"
 #include "matrix.h"
 #include "pageres.h"
@@ -21,7 +22,6 @@
 #include "normstrngs.h"
 #include "unicharset_training_utils.h"
 
-#include <tesseract/genericvector.h>
 #include <tesseract/helpers.h>
 
 #include "absl/strings/str_format.h"        // for absl::StrFormat

unittest/resultiterator_test.cc

@@ -3,7 +3,7 @@
 #include <string>
 #include "allheaders.h"
 #include <tesseract/baseapi.h>
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "scrollview.h"
 
 #include "include_gunit.h"

unittest/stats_test.cc

@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "kdpair.h"
 #include "statistc.h"
 

unittest/stringrenderer_test.cc

@@ -18,7 +18,7 @@
 #include "boxchar.h"
 #include "boxread.h"
 #include "commandlineflags.h"
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include "include_gunit.h"
 #include "stringrenderer.h"
 #include <tesseract/strngs.h>

unittest/tfile_test.cc

@@ -9,7 +9,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <tesseract/genericvector.h>
+#include "genericvector.h"
 #include <tesseract/serialis.h>
 
 #include "include_gunit.h"