Rename all C-style headers (e.g. <stdio.h>) to C++ style (<cstdio>).

src/api/baseapi.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_API_BASEAPI_H_
 #define TESSERACT_API_BASEAPI_H_
 
-#include <stdio.h>
+#include <cstdio>
 // 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.

src/arch/dotproductavx.cpp

@@ -20,8 +20,8 @@
 // Implementation for non-avx archs.
 
 #include "dotproductavx.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 namespace tesseract {
 double DotProductAVX(const double* u, const double* v, int n) {
@@ -33,7 +33,7 @@ double DotProductAVX(const double* u, const double* v, int n) {
 #else  // !defined(__AVX__)
 // Implementation for avx capable archs.
 #include <immintrin.h>
-#include <stdint.h>
+#include <cstdint>
 #include "dotproductavx.h"
 #include "host.h"
 

src/arch/dotproductsse.cpp

@@ -20,8 +20,8 @@
 // This code can't compile with "-msse4.1", so use dummy stubs.
 
 #include "dotproductsse.h"
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 namespace tesseract {
 double DotProductSSE(const double* u, const double* v, int n) {
@@ -39,7 +39,7 @@ int32_t IntDotProductSSE(const int8_t* u, const int8_t* v, int n) {
 
 #include <emmintrin.h>
 #include <smmintrin.h>
-#include <stdint.h>
+#include <cstdint>
 #include "dotproductsse.h"
 #include "host.h"
 

src/arch/intsimdmatrix.h

@@ -19,7 +19,7 @@
 #ifndef TESSERACT_ARCH_INTSIMDMATRIX_H_
 #define TESSERACT_ARCH_INTSIMDMATRIX_H_
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include "genericvector.h"
 #include "matrix.h"

src/arch/intsimdmatrixavx2.cpp

@@ -20,7 +20,7 @@
 
 #ifdef __AVX2__
 #include <immintrin.h>
-#include <stdint.h>
+#include <cstdint>
 #include <algorithm>
 #include <vector>
 

src/arch/intsimdmatrixsse.cpp

@@ -18,7 +18,7 @@
 
 #include "intsimdmatrixsse.h"
 
-#include <stdint.h>
+#include <cstdint>
 #include <vector>
 #include "dotproductsse.h"
 

src/ccmain/control.cpp

@@ -24,7 +24,7 @@
 #endif
 
 #include <string.h>
-#include <math.h>
+#include <cmath>
 #ifdef __UNIX__
 #include <assert.h>
 #include <unistd.h>

src/ccmain/paramsd.cpp

@@ -21,8 +21,8 @@
 // tesseract from the ui.
 #ifdef _WIN32
 #else
-#include <stdlib.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstdio>
 #endif
 
 #include <map>

src/ccmain/tessvars.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <stdio.h>
+#include <cstdio>
 
 #include  "tessvars.h"
 

src/ccmain/tessvars.h

@@ -20,7 +20,7 @@
 #ifndef           TESSVARS_H
 #define           TESSVARS_H
 
-#include <stdio.h>
+#include <cstdio>
 
 
 extern FILE *debug_fp;    // write debug stuff here

src/ccmain/tfacepp.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <math.h>
+#include <cmath>
 
 #include "blamer.h"
 #include "errcode.h"

src/ccstruct/blamer.h

@@ -21,7 +21,7 @@
 #ifndef TESSERACT_CCSTRUCT_BLAMER_H_
 #define TESSERACT_CCSTRUCT_BLAMER_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include "boxword.h"
 #include "genericvector.h"
 #include "matrix.h"

src/ccstruct/boxread.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCUTIL_BOXREAD_H_
 #define TESSERACT_CCUTIL_BOXREAD_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include "genericvector.h"
 #include "strngs.h"
 

src/ccstruct/matrix.h

@@ -29,7 +29,7 @@
 #ifndef TESSERACT_CCSTRUCT_MATRIX_H_
 #define TESSERACT_CCSTRUCT_MATRIX_H_
 
-#include <math.h>
+#include <cmath>
 #include "kdpair.h"
 #include "points.h"
 #include "serialis.h"

src/ccstruct/normalis.cpp

@@ -19,7 +19,7 @@
 
 #include "normalis.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #include "allheaders.h"
 #include "blobs.h"

src/ccstruct/normalis.h

@@ -20,7 +20,7 @@
 #ifndef           NORMALIS_H
 #define           NORMALIS_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "genericvector.h"
 #include "host.h"
 

src/ccstruct/ocrblock.cpp

@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include "ocrblock.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>  // std::unique_ptr
 #include "blckerr.h"
 #include "stepblob.h"

src/ccstruct/ocrpara.cpp

@@ -17,7 +17,7 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "ocrpara.h"
 #include "host.h"  // For NearlyEqual()

src/ccstruct/ocrrow.h

@@ -20,7 +20,7 @@
 #ifndef           OCRROW_H
 #define           OCRROW_H
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "quspline.h"
 #include "werd.h"

src/ccstruct/pdblock.cpp

@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include "pdblock.h"
-#include <stdlib.h>
+#include <cstdlib>
 #include <memory>  // std::unique_ptr
 #include "allheaders.h"
 #include "blckerr.h"

src/ccstruct/polyblk.cpp

@@ -19,8 +19,8 @@
 
 #include "polyblk.h"
 #include <ctype.h>
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 #include <memory>  // std::unique_ptr
 #include "elst.h"
 

src/ccstruct/quadlsq.cpp

@@ -17,8 +17,8 @@
  *
  **********************************************************************/
 
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 #include "quadlsq.h"
 #include "tprintf.h"
 

src/ccstruct/rect.h

@@ -20,7 +20,7 @@
 #ifndef           RECT_H
 #define           RECT_H
 
-#include <math.h>
+#include <cmath>
 #include "points.h"
 #include "ndminx.h"
 #include "scrollview.h"

src/ccstruct/statistc.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCSTRUCT_STATISTC_H_
 #define TESSERACT_CCSTRUCT_STATISTC_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include "host.h"
 #include "kdpair.h"
 #include "scrollview.h"

src/ccstruct/vecfuncs.h

@@ -25,7 +25,7 @@
 #ifndef VECFUNCS_H
 #define VECFUNCS_H
 
-#include <math.h>
+#include <cmath>
 
 struct EDGEPT;
 

src/ccutil/ambigs.cpp

@@ -20,7 +20,7 @@
 
 #include "ambigs.h"
 
-#include <stdio.h>
+#include <cstdio>
 #include "helpers.h"
 #include "universalambigs.h"
 

src/ccutil/bitvector.h

@@ -22,8 +22,8 @@
 #ifndef TESSERACT_CCUTIL_BITVECTOR_H_
 #define TESSERACT_CCUTIL_BITVECTOR_H_
 
-#include <assert.h>
-#include <stdio.h>
+#include <cassert>
+#include <cstdio>
 #include "host.h"
 
 namespace tesseract {

src/ccutil/clst.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "clst.h"
 
 /***********************************************************************

src/ccutil/clst.h

@@ -20,7 +20,7 @@
 #ifndef CLST_H
 #define CLST_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "host.h"
 #include "serialis.h"
 #include "lsterr.h"

src/ccutil/elst.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "elst.h"
 
 /***********************************************************************

src/ccutil/elst.h

@@ -20,7 +20,7 @@
 #ifndef ELST_H
 #define ELST_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "host.h"
 #include "serialis.h"
 #include "lsterr.h"

src/ccutil/elst2.cpp

@@ -17,7 +17,7 @@
  *
  **********************************************************************/
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "host.h"
 #include "elst2.h"
 

src/ccutil/elst2.h

@@ -20,7 +20,7 @@
 #ifndef ELST2_H
 #define ELST2_H
 
-#include <stdio.h>
+#include <cstdio>
 #include "host.h"
 #include "serialis.h"
 #include "lsterr.h"

src/ccutil/genericvector.h

@@ -20,9 +20,9 @@
 #ifndef TESSERACT_CCUTIL_GENERICVECTOR_H_
 #define TESSERACT_CCUTIL_GENERICVECTOR_H_
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <cassert>
+#include <cstdio>
+#include <cstdlib>
 
 #include "tesscallback.h"
 #include "errcode.h"

src/ccutil/helpers.h

@@ -26,8 +26,8 @@
 #define TESSERACT_CCUTIL_HELPERS_H_
 
 #include <cassert>
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 #include <functional>
 #include <string>
 

src/ccutil/indexmapbidi.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCUTIL_INDEXMAPBIDI_H_
 #define TESSERACT_CCUTIL_INDEXMAPBIDI_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include "genericvector.h"
 
 namespace tesseract {

src/ccutil/qrsequence.h

@@ -27,7 +27,7 @@
 #ifndef TESSERACT_CCUTIL_QRSEQUENCE_H_
 #define TESSERACT_CCUTIL_QRSEQUENCE_H_
 
-#include <math.h>
+#include <cmath>
 
 class QRSequenceGenerator {
  public:

src/ccutil/scanutils.cpp

@@ -23,13 +23,13 @@
 #include "config_auto.h"
 #endif
 
-#include <ctype.h>
-#include <math.h>
-#include <stdarg.h>
-#include <stddef.h>
-#include <string.h>
-#include <limits.h>
-#include <stdio.h>
+#include <cctype>
+#include <cmath>
+#include <cstdarg>
+#include <cstddef>
+#include <cstring>
+#include <climits>
+#include <cstdio>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

src/ccutil/scanutils.h

@@ -19,9 +19,9 @@
 #ifndef TESSERACT_CCUTIL_SCANUTILS_H_
 #define TESSERACT_CCUTIL_SCANUTILS_H_
 
-#include <stdint.h>
-#include <stddef.h>
-#include <stdio.h>
+#include <cstdint>
+#include <cstddef>
+#include <cstdio>
 #include <sys/stat.h>
 
 /**

src/ccutil/serialis.cpp

@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include "serialis.h"
-#include <stdio.h>
+#include <cstdio>
 #include "genericvector.h"
 
 namespace tesseract {

src/ccutil/serialis.h

@@ -20,9 +20,9 @@
 #ifndef SERIALIS_H
 #define SERIALIS_H
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
+#include <cstdlib>
+#include <cstring>
+#include <cstdio>
 #include "host.h"
 
 template <typename T> class GenericVector;

src/ccutil/sorthelper.h

@@ -20,7 +20,7 @@
 #ifndef TESSERACT_CCUTIL_SORTHELPER_H_
 #define TESSERACT_CCUTIL_SORTHELPER_H_
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "genericvector.h"
 
 // Generic class to provide functions based on a <value,count> pair.

src/ccutil/strngs.h

@@ -20,9 +20,9 @@
 #ifndef           STRNGS_H
 #define           STRNGS_H
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+#include <cassert>
+#include <cstdio>
+#include <cstring>
 #include "memry.h"
 #include "platform.h"
 

src/ccutil/tessdatamanager.cpp

@@ -23,7 +23,7 @@
 
 #include "tessdatamanager.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "helpers.h"
 #include "serialis.h"

src/ccutil/unicharset.cpp

@@ -19,9 +19,9 @@
 
 #include "unicharset.h"
 
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+#include <cassert>
+#include <cstdio>
+#include <cstring>
 
 #include "params.h"
 #include "serialis.h"

src/classify/adaptive.h

@@ -23,7 +23,7 @@
 ----------------------------------------------------------------------------*/
 #include "oldlist.h"
 #include "intproto.h"
-#include <stdio.h>
+#include <cstdio>
 
 typedef struct
 {

src/classify/adaptmatch.cpp

@@ -55,10 +55,10 @@
 #include "unicharset.h"
 #include "werd.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
 #ifdef __UNIX__
 #include <assert.h>
 #endif

src/classify/cluster.cpp

@@ -24,7 +24,7 @@
 #include "matrix.h"
 #include "tprintf.h"
 #include "danerror.h"
-#include <math.h>
+#include <cmath>
 
 #define HOTELLING 1  // If true use Hotelling's test to decide where to split.
 #define FTABLE_X 10  // Size of FTable.

src/classify/clusttool.cpp

@@ -22,8 +22,8 @@
 #include "danerror.h"
 #include "emalloc.h"
 #include "scanutils.h"
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 
 using tesseract::TFile;
 

src/classify/clusttool.h

@@ -20,7 +20,7 @@
 #define TESSERACT_CLASSIFY_CLUSTTOOL_H_
 
 //--------------------------Include Files---------------------------------------
-#include <stdio.h>
+#include <cstdio>
 #include "cluster.h"
 #include "host.h"
 #include "serialis.h"

src/classify/cutoffs.cpp

@@ -20,7 +20,7 @@
 ----------------------------------------------------------------------------*/
 #include "cutoffs.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "classify.h"
 #include "efio.h"

src/classify/featdefs.cpp

@@ -23,8 +23,8 @@
 #include "danerror.h"
 #include "scanutils.h"
 
-#include <string.h>
-#include <stdio.h>
+#include <cstring>
+#include <cstdio>
 
 /** define errors triggered by this module */
 #define ILLEGAL_NUM_SETS  3001

src/classify/fpoint.h

@@ -22,8 +22,8 @@
           Include Files and Type Defines
 ----------------------------------------------------------------------------**/
 #include "host.h"
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 
 /* define data structure to hold 2D points or vectors using floating point */
 typedef struct

src/classify/intfx.h

@@ -24,7 +24,7 @@
 #include "blobs.h"
 #include "intproto.h"
 #include "normalis.h"
-#include <math.h>
+#include <cmath>
 
 class DENORM;
 

src/classify/intmatcher.cpp

@@ -36,7 +36,7 @@
 #include "helpers.h"
 #include "classify.h"
 #include "shapetable.h"
-#include <math.h>
+#include <cmath>
 
 using tesseract::ScoredFont;
 using tesseract::UnicharRating;

src/classify/intproto.cpp

@@ -19,9 +19,9 @@
           Include Files and Type Defines
 -----------------------------------------------------------------------------*/
 
-#include <math.h>
-#include <stdio.h>
-#include <assert.h>
+#include <cmath>
+#include <cstdio>
+#include <cassert>
 #ifdef __UNIX__
 #include <unistd.h>
 #endif

src/classify/kdtree.cpp

@@ -24,8 +24,8 @@
 #include "kdtree.h"
 #include "const.h"
 #include "emalloc.h"
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 
 #define Magnitude(X)    ((X) < 0 ? -(X) : (X))
 #define NodeFound(N,K,D)  (( (N)->Key == (K) ) && ( (N)->Data == (D) ))

src/classify/mastertrainer.cpp

@@ -25,8 +25,8 @@
 #endif
 
 #include "mastertrainer.h"
-#include <math.h>
-#include <time.h>
+#include <cmath>
+#include <ctime>
 #include "allheaders.h"
 #include "boxread.h"
 #include "classify.h"

src/classify/mf.cpp

@@ -24,7 +24,7 @@
 #include "mfdefs.h"
 #include "mfx.h"
 
-#include <math.h>
+#include <cmath>
 
 /*----------------------------------------------------------------------------
         Global Data Definitions and Declarations

src/classify/mfdefs.cpp

@@ -20,7 +20,7 @@
 ----------------------------------------------------------------------------**/
 #include "mfdefs.h"
 #include "emalloc.h"
-#include <math.h>
+#include <cmath>
 
 /*----------------------------------------------------------------------------
               Public Code

src/classify/mfoutline.cpp

@@ -27,8 +27,8 @@
 #include "params.h"
 #include "classify.h"
 
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 
 /*----------------------------------------------------------------------------
               Public Code

src/classify/mfx.cpp

@@ -26,7 +26,7 @@
 #include "normalis.h"
 #include "params.h"
 
-#include <math.h>
+#include <cmath>
 
 /*----------------------------------------------------------------------------
           Variables

src/classify/normmatch.cpp

@@ -20,8 +20,8 @@
 ----------------------------------------------------------------------------*/
 #include "normmatch.h"
 
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 
 #include "classify.h"
 #include "clusttool.h"

src/classify/ocrfeatures.cpp

@@ -24,8 +24,8 @@
 #include "danerror.h"
 #include "scanutils.h"
 
-#include <assert.h>
-#include <math.h>
+#include <cassert>
+#include <cmath>
 
 /*----------------------------------------------------------------------------
               Public Code

src/classify/ocrfeatures.h

@@ -23,7 +23,7 @@
 ----------------------------------------------------------------------------**/
 #include "blobs.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 class DENORM;
 struct INT_FX_RESULT_STRUCT;

src/classify/outfeat.cpp

@@ -26,7 +26,7 @@
 #include "mfoutline.h"
 #include "ocrfeatures.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 /*----------------------------------------------------------------------------
               Public Code

src/classify/picofeat.cpp

@@ -29,8 +29,8 @@
 #include "params.h"
 #include "trainingsample.h"
 
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 
 /*---------------------------------------------------------------------------
           Variables

src/classify/protos.cpp

@@ -35,8 +35,8 @@
 #include "classify.h"
 #include "params.h"
 
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 
 #define PROTO_INCREMENT   32
 #define CONFIG_INCREMENT  16

src/cutil/bitvec.cpp

@@ -21,7 +21,7 @@
 -----------------------------------------------------------------------------*/
 #include "bitvec.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "emalloc.h"
 #include "tprintf.h"

src/cutil/cutil.cpp

@@ -42,7 +42,7 @@ Import original HP distribution
 #include "tprintf.h"
 #include "callcpp.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 #define RESET_COUNT 2000
 

src/cutil/cutil.h

@@ -36,9 +36,9 @@ Import original HP distribution
 /*----------------------------------------------------------------------
                      I n c l u d e s
 ----------------------------------------------------------------------*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
 
 #include "host.h"
 #include "tprintf.h"

src/cutil/danerror.cpp

@@ -26,7 +26,7 @@
 #include "assert.h"
 #endif
 
-#include <stdio.h>
+#include <cstdio>
 
 /**
  * This routine prints the specified error message to stderr.

src/cutil/efio.cpp

@@ -20,8 +20,8 @@
 ----------------------------------------------------------------------------*/
 #include "efio.h"
 #include "danerror.h"
-#include <stdio.h>
-#include <string.h>
+#include <cstdio>
+#include <cstring>
 
 #define MAXERRORMESSAGE   256
 

src/cutil/efio.h

@@ -21,7 +21,7 @@
 /**----------------------------------------------------------------------------
           Include Files and Type Defines
 ----------------------------------------------------------------------------**/
-#include <stdio.h>
+#include <cstdio>
 
 #define FOPENERROR      3000
 

src/cutil/emalloc.cpp

@@ -26,7 +26,7 @@
 ----------------------------------------------------------------------------*/
 #include "emalloc.h"
 #include "danerror.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 /*----------------------------------------------------------------------------
               Public Code

src/cutil/globals.h

@@ -29,7 +29,7 @@
 #include "unicharset.h"
 #include "strngs.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 
 #endif

src/cutil/oldlist.cpp

@@ -83,7 +83,7 @@
 
 ******************************************************************************/
 #include "oldlist.h"
-#include <stdio.h>
+#include <cstdio>
 #include "structures.h"
 
 /*----------------------------------------------------------------------

src/cutil/structures.cpp

@@ -27,7 +27,7 @@
 ----------------------------------------------------------------------*/
 #include "structures.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 
 /*----------------------------------------------------------------------

src/dict/dict.cpp

@@ -16,7 +16,7 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "dict.h"
 #include "unicodes.h"

src/dict/matchdefs.h

@@ -22,7 +22,7 @@
           Include Files and Type Defines
 ----------------------------------------------------------------------------**/
 #include "host.h"
-#include <stdio.h>
+#include <cstdio>
 #include "unichar.h"
 
 /* define the maximum number of classes defined for any matcher

src/dict/stopper.cpp

@@ -16,10 +16,10 @@
  ** limitations under the License.
  ******************************************************************************/
 
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <math.h>
+#include <cstdio>
+#include <cstring>
+#include <cctype>
+#include <cmath>
 
 #include "stopper.h"
 #include "ambigs.h"

src/lstm/fullyconnected.cpp

@@ -21,8 +21,8 @@
 #ifdef _OPENMP
 #include <omp.h>
 #endif
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #include "functions.h"
 #include "networkscratch.h"

src/lstm/lstm.cpp

@@ -21,8 +21,8 @@
 #ifdef _OPENMP
 #include <omp.h>
 #endif
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 
 #if !defined(__GNUC__) && defined(_MSC_VER)
 #include <intrin.h>     // _BitScanReverse

src/lstm/network.cpp

@@ -23,7 +23,7 @@
 
 #include "network.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 
 // This base class needs to know about all its sub-classes because of the
 // factory deserializing method: CreateFromFile.

src/lstm/network.h

@@ -19,7 +19,7 @@
 #ifndef TESSERACT_LSTM_NETWORK_H_
 #define TESSERACT_LSTM_NETWORK_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include <cmath>
 
 #include "genericvector.h"

src/lstm/networkio.h

@@ -19,8 +19,8 @@
 #ifndef TESSERACT_LSTM_NETWORKIO_H_
 #define TESSERACT_LSTM_NETWORKIO_H_
 
-#include <math.h>
-#include <stdio.h>
+#include <cmath>
+#include <cstdio>
 #include <vector>
 
 #include "genericvector.h"

src/lstm/reversed.cpp

@@ -18,7 +18,7 @@
 
 #include "reversed.h"
 
-#include <stdio.h>
+#include <cstdio>
 
 #include "networkscratch.h"
 

src/opencl/opencl_device_selection.h

@@ -17,9 +17,9 @@
 #define _CRT_SECURE_NO_WARNINGS
 #endif
 
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #ifdef __APPLE__
 #include <OpenCL/cl.h>

src/opencl/openclwrapper.cpp

@@ -24,7 +24,7 @@
 
 #if ON_APPLE
 #include <mach/mach_time.h>
-#include <stdio.h>
+#include <cstdio>
 #endif
 
 #define CALLOC LEPT_CALLOC

src/opencl/openclwrapper.h

@@ -11,7 +11,7 @@
 #ifndef TESSERACT_OPENCL_OPENCLWRAPPER_H_
 #define TESSERACT_OPENCL_OPENCLWRAPPER_H_
 
-#include <stdio.h>
+#include <cstdio>
 #include "allheaders.h"
 #include "pix.h"
 #include "tprintf.h"

src/textord/baselinedetect.cpp

@@ -27,7 +27,7 @@
 
 #include "baselinedetect.h"
 
-#include <math.h>
+#include <cmath>
 #include "allheaders.h"
 #include "blobbox.h"
 #include "detlinefit.h"

src/textord/blkocc.cpp

@@ -29,7 +29,7 @@
 */
 
 #include <ctype.h>
-#include <math.h>
+#include <cmath>
 #include "errcode.h"
 #include "drawtord.h"
 #include "blkocc.h"

src/textord/strokewidth.cpp

@@ -23,7 +23,7 @@
 
 #include "strokewidth.h"
 
-#include <math.h>
+#include <cmath>
 
 #include "blobbox.h"
 #include "colpartition.h"

src/textord/tablefind.cpp

@@ -22,7 +22,7 @@
 #endif
 
 #include "tablefind.h"
-#include <math.h>
+#include <cmath>
 
 #include "allheaders.h"
 

src/training/boxchar.cpp

@@ -22,7 +22,7 @@
 
 #include "boxchar.h"
 
-#include <stddef.h>
+#include <cstddef>
 #include <algorithm>
 #include <vector>
 

src/training/classifier_tester.cpp

@@ -16,7 +16,7 @@
 //            but doesn't have to be the same as the training data.
 //  Author:   Ray Smith
 
-#include <stdio.h>
+#include <cstdio>
 #ifdef GOOGLE_TESSERACT
 #include "base/commandlineflags.h"
 #endif  // GOOGLE_TESSERACT

src/training/cntraining.cpp

@@ -32,8 +32,8 @@
 #include "clusttool.h"
 #include "cluster.h"
 #include <string.h>
-#include <stdio.h>
-#include <math.h>
+#include <cstdio>
+#include <cmath>
 #include "unichar.h"
 #include "commontraining.h"
 

src/training/commandlineflags.h

@@ -21,7 +21,7 @@
 
 #ifndef GOOGLE_TESSERACT
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "tprintf.h"
 #include "params.h"
 

src/training/commontraining.cpp

@@ -14,7 +14,7 @@
 #include "commontraining.h"
 
 #include <assert.h>
-#include <math.h>
+#include <cmath>
 
 #include "allheaders.h"
 #include "ccutil.h"

src/training/degradeimage.cpp

@@ -20,7 +20,7 @@
 
 #include "degradeimage.h"
 
-#include <stdlib.h>
+#include <cstdlib>
 #include "allheaders.h"   // from leptonica
 #include "genericvector.h"
 #include "helpers.h"  // For TRand.