diff --git a/include/tesseract/apitypes.h b/include/tesseract/apitypes.h
index 7278b3ad47..2c0e85c9dd 100644
--- a/include/tesseract/apitypes.h
+++ b/include/tesseract/apitypes.h
@@ -20,7 +20,7 @@
 #ifndef TESSERACT_API_APITYPES_H_
 #define TESSERACT_API_APITYPES_H_
 
-#include <tesseract/publictypes.h>
+#include "publictypes.h"
 
 // The types used by the API and Page/ResultIterator can be found in:
 //   ccstruct/publictypes.h
diff --git a/include/tesseract/baseapi.h b/include/tesseract/baseapi.h
index ba5a958187..27986b4900 100644
--- a/include/tesseract/baseapi.h
+++ b/include/tesseract/baseapi.h
@@ -25,14 +25,14 @@
 // To avoid collision with other typenames include the ABSOLUTE MINIMUM
 // complexity of includes here. Use forward declarations wherever possible
 // and hide includes of complex types in baseapi.cpp.
-#include <tesseract/apitypes.h>
-#include <tesseract/pageiterator.h>
-#include <tesseract/platform.h>
-#include <tesseract/publictypes.h>
-#include <tesseract/resultiterator.h>
-#include <tesseract/serialis.h>
-#include <tesseract/thresholder.h>
-#include <tesseract/unichar.h>
+#include "apitypes.h"
+#include "pageiterator.h"
+#include "platform.h"
+#include "publictypes.h"
+#include "resultiterator.h"
+#include "serialis.h"
+#include "thresholder.h"
+#include "unichar.h"
 #include <tesseract/version.h>
 
 template <typename T> class GenericVector;
diff --git a/include/tesseract/capi.h b/include/tesseract/capi.h
index 21ecdfd5d2..5c922642ca 100644
--- a/include/tesseract/capi.h
+++ b/include/tesseract/capi.h
@@ -23,15 +23,15 @@
 #endif
 
 #ifdef TESS_CAPI_INCLUDE_BASEAPI
-#  include <tesseract/baseapi.h>
-#  include <tesseract/ocrclass.h>
-#  include <tesseract/pageiterator.h>
-#  include <tesseract/renderer.h>
-#  include <tesseract/resultiterator.h>
+#  include "baseapi.h"
+#  include "ocrclass.h"
+#  include "pageiterator.h"
+#  include "renderer.h"
+#  include "resultiterator.h"
 #else
 #  include <stdbool.h>
 #  include <stdio.h>
-#  include <tesseract/platform.h>
+#  include "platform.h"
 #endif
 
 #ifdef __cplusplus
diff --git a/include/tesseract/genericvector.h b/include/tesseract/genericvector.h
index d264b2ed1e..5f1d44c6c3 100644
--- a/include/tesseract/genericvector.h
+++ b/include/tesseract/genericvector.h
@@ -27,8 +27,8 @@
 #include <cstdlib>
 #include <functional>   // for std::function
 
-#include <tesseract/helpers.h>
-#include <tesseract/serialis.h>
+#include "helpers.h"
+#include "serialis.h"
 
 // Use PointerVector<T> below in preference to GenericVector<T*>, as that
 // provides automatic deletion of pointers, [De]Serialize that works, and
diff --git a/include/tesseract/ltrresultiterator.h b/include/tesseract/ltrresultiterator.h
index c7db150835..2a3c02c084 100644
--- a/include/tesseract/ltrresultiterator.h
+++ b/include/tesseract/ltrresultiterator.h
@@ -20,10 +20,10 @@
 #ifndef TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_
 #define TESSERACT_CCMAIN_LTR_RESULT_ITERATOR_H_
 
-#include <tesseract/pageiterator.h>  // for PageIterator
-#include <tesseract/platform.h>      // for TESS_API
-#include <tesseract/publictypes.h>   // for PageIteratorLevel
-#include <tesseract/unichar.h>       // for StrongScriptDirection
+#include "pageiterator.h"  // for PageIterator
+#include "platform.h"      // for TESS_API
+#include "publictypes.h"   // for PageIteratorLevel
+#include "unichar.h"       // for StrongScriptDirection
 
 class BLOB_CHOICE_IT;
 class PAGE_RES;
diff --git a/include/tesseract/osdetect.h b/include/tesseract/osdetect.h
index 89ed19e69c..c0864c4048 100644
--- a/include/tesseract/osdetect.h
+++ b/include/tesseract/osdetect.h
@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCMAIN_OSDETECT_H_
 #define TESSERACT_CCMAIN_OSDETECT_H_
 
-#include <tesseract/platform.h>  // for TESS_API
+#include "platform.h"  // for TESS_API
 
 class BLOBNBOX;
 class BLOBNBOX_CLIST;
diff --git a/include/tesseract/pageiterator.h b/include/tesseract/pageiterator.h
index 37d06e8a93..53581428eb 100644
--- a/include/tesseract/pageiterator.h
+++ b/include/tesseract/pageiterator.h
@@ -21,8 +21,8 @@
 #ifndef TESSERACT_CCMAIN_PAGEITERATOR_H_
 #define TESSERACT_CCMAIN_PAGEITERATOR_H_
 
-#include <tesseract/platform.h>
-#include <tesseract/publictypes.h>
+#include "platform.h"
+#include "publictypes.h"
 
 struct BlamerBundle;
 class C_BLOB_IT;
diff --git a/include/tesseract/renderer.h b/include/tesseract/renderer.h
index e789af078e..177fd5ff96 100644
--- a/include/tesseract/renderer.h
+++ b/include/tesseract/renderer.h
@@ -22,9 +22,9 @@
 // complexity of includes here. Use forward declarations wherever possible
 // and hide includes of complex types in baseapi.cpp.
 #include <string>  // for std::string
-#include <tesseract/genericvector.h>
-#include <tesseract/platform.h>
-#include <tesseract/strngs.h>             // for STRING
+#include "genericvector.h"
+#include "platform.h"
+#include "strngs.h"             // for STRING
 
 struct Pix;
 
diff --git a/include/tesseract/resultiterator.h b/include/tesseract/resultiterator.h
index 8781e0fe19..445305b722 100644
--- a/include/tesseract/resultiterator.h
+++ b/include/tesseract/resultiterator.h
@@ -24,10 +24,10 @@
 
 #include <set>                  // for std::pair
 #include <vector>               // for std::vector
-#include <tesseract/ltrresultiterator.h>  // for LTRResultIterator
-#include <tesseract/platform.h>           // for TESS_API, TESS_LOCAL
-#include <tesseract/publictypes.h>        // for PageIteratorLevel
-#include <tesseract/unichar.h>            // for StrongScriptDirection
+#include "ltrresultiterator.h"  // for LTRResultIterator
+#include "platform.h"           // for TESS_API, TESS_LOCAL
+#include "publictypes.h"        // for PageIteratorLevel
+#include "unichar.h"            // for StrongScriptDirection
 
 template <typename T> class GenericVector;
 template <typename T> class GenericVectorEqEq;
diff --git a/include/tesseract/strngs.h b/include/tesseract/strngs.h
index 5c2b335a5a..f0af9cd684 100644
--- a/include/tesseract/strngs.h
+++ b/include/tesseract/strngs.h
@@ -23,7 +23,7 @@
 #include <cstdint>     // for uint32_t
 #include <cstdio>      // for FILE
 #include <cstring>     // for strncpy
-#include <tesseract/platform.h>  // for TESS_API
+#include "platform.h"  // for TESS_API
 
 namespace tesseract {
 class TFile;
diff --git a/include/tesseract/thresholder.h b/include/tesseract/thresholder.h
index 34991705c7..b63f51a2a4 100644
--- a/include/tesseract/thresholder.h
+++ b/include/tesseract/thresholder.h
@@ -19,8 +19,8 @@
 #ifndef TESSERACT_CCMAIN_THRESHOLDER_H_
 #define TESSERACT_CCMAIN_THRESHOLDER_H_
 
-#include <tesseract/platform.h>
-#include <tesseract/publictypes.h>
+#include "platform.h"
+#include "publictypes.h"
 
 struct Pix;
 
diff --git a/include/tesseract/unichar.h b/include/tesseract/unichar.h
index 67bc803d87..5daca95063 100644
--- a/include/tesseract/unichar.h
+++ b/include/tesseract/unichar.h
@@ -23,7 +23,7 @@
 #include <cstring>
 #include <string>
 #include <vector>
-#include <tesseract/platform.h>
+#include "platform.h"
 
 // Maximum number of characters that can be stored in a UNICHAR. Must be
 // at least 4. Must not exceed 31 without changing the coding of length.