diff --git a/src/api/baseapi.cpp b/src/api/baseapi.cpp
index 850de33b6bfbfe456efdfdf08830d64d4640de29..a529e62b5f9ef79c0c6fbbdde8a27db393dc7f44 100644
--- a/src/api/baseapi.cpp
+++ b/src/api/baseapi.cpp
@@ -36,7 +36,7 @@
 #else
 #include <dirent.h>
 #include <libgen.h>
-#include <string.h>
+#include <cstring>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/src/api/renderer.cpp b/src/api/renderer.cpp
index bd59a5d3a39ae28d6e83c61a1a5456664b9fb012..b040bb7514140882c4110d1802120bea2cd4af99 100644
--- a/src/api/renderer.cpp
+++ b/src/api/renderer.cpp
@@ -19,7 +19,7 @@
 #include "config_auto.h"
 #endif
 
-#include <string.h>
+#include <cstring>
 #include <memory>  // std::unique_ptr
 #include "baseapi.h"
 #include "genericvector.h"
diff --git a/src/ccmain/adaptions.cpp b/src/ccmain/adaptions.cpp
index 6fe65bde3324e28940790cb7306d572107666f52..437573bed632eb059cf18bc2798ffd8e5fede1b5 100644
--- a/src/ccmain/adaptions.cpp
+++ b/src/ccmain/adaptions.cpp
@@ -19,7 +19,7 @@
  **********************************************************************/
 
 #include <ctype.h>
-#include <string.h>
+#include <cstring>
 #include "tessbox.h"
 #include "tessvars.h"
 #include "memry.h"
diff --git a/src/ccmain/applybox.cpp b/src/ccmain/applybox.cpp
index 97cbdb6e9e341a1b1d848e88ec99ff62a660ca35..dc4ab403fb00999ed32bb938bfa9b65774180ac1 100644
--- a/src/ccmain/applybox.cpp
+++ b/src/ccmain/applybox.cpp
@@ -19,7 +19,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <string.h>
+#include <cstring>
 #include "allheaders.h"
 #include "boxread.h"
 #include "chopper.h"
diff --git a/src/ccmain/control.cpp b/src/ccmain/control.cpp
index 6105c754f2531faac741831ed4a96934605ec6a3..4317be3dc8c63aea2e64045bbad305d5c86537ba 100644
--- a/src/ccmain/control.cpp
+++ b/src/ccmain/control.cpp
@@ -24,7 +24,7 @@
 #endif
 
 #include <algorithm>
-#include <string.h>
+#include <cstring>
 #include <cmath>
 #ifdef __UNIX__
 #include <unistd.h>
diff --git a/src/ccmain/fixxht.cpp b/src/ccmain/fixxht.cpp
index 03e3ada98152780d221c8bfae17e051f87d42492..fd39958b3f270437ea2afb66e31e724b36b067a9 100644
--- a/src/ccmain/fixxht.cpp
+++ b/src/ccmain/fixxht.cpp
@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include <algorithm>
-#include <string.h>
+#include <cstring>
 #include <ctype.h>
 #include "params.h"
 #include "float2int.h"
diff --git a/src/ccmain/output.cpp b/src/ccmain/output.cpp
index 50540c4cc70bf795f4e4d02613f8f20a19e1300b..440ff2b8899a3ee5dee10bf1ca3929be66080789 100644
--- a/src/ccmain/output.cpp
+++ b/src/ccmain/output.cpp
@@ -19,7 +19,7 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <string.h>
+#include <cstring>
 #ifdef __UNIX__
 #include <unistd.h>
 #endif
diff --git a/src/ccmain/reject.cpp b/src/ccmain/reject.cpp
index 6310c3f86cbdbfee6b65e71aa8631cb1e05ad7da..45cd0262293902a10a03f1c1e5ae298877fd339e 100644
--- a/src/ccmain/reject.cpp
+++ b/src/ccmain/reject.cpp
@@ -21,7 +21,7 @@
 #include "scanutils.h"
 #include <ctype.h>
 #include <errno.h>
-#include <string.h>
+#include <cstring>
 #include "genericvector.h"
 #include "reject.h"
 #include "control.h"
diff --git a/src/ccmain/thresholder.cpp b/src/ccmain/thresholder.cpp
index 5a193c32a913f747ec8a015bac97f57f68b487cc..1bed17418ad9139e0f62edb55c628b74b600708e 100644
--- a/src/ccmain/thresholder.cpp
+++ b/src/ccmain/thresholder.cpp
@@ -21,7 +21,7 @@
 
 #include "thresholder.h"
 
-#include <string.h>
+#include <cstring>
 
 #include "otsuthr.h"
 
diff --git a/src/ccstruct/boxread.cpp b/src/ccstruct/boxread.cpp
index 277b8ddba7c0b917214d661b2925f2b01dea82f7..972fa2bbf1a11c99a18be1d04d76e37170cbb501 100644
--- a/src/ccstruct/boxread.cpp
+++ b/src/ccstruct/boxread.cpp
@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include "boxread.h"
-#include <string.h>
+#include <cstring>
 
 #include "fileerr.h"
 #include "rect.h"
diff --git a/src/ccstruct/coutln.cpp b/src/ccstruct/coutln.cpp
index 8a5a9554cd37220cbf3f8e3438cf88a45b330494..b829e0a505f5b10fcdb4707690921823578752ee 100644
--- a/src/ccstruct/coutln.cpp
+++ b/src/ccstruct/coutln.cpp
@@ -18,7 +18,7 @@
  **********************************************************************/
 
 #include <algorithm>
-#include <string.h>
+#include <cstring>
 
 #include "coutln.h"
 
diff --git a/src/ccstruct/otsuthr.cpp b/src/ccstruct/otsuthr.cpp
index 76b2e125e3ce635b39dd570d655f5404a0cacfa0..14f5839150d40369024030772cf4653a9daa7121 100644
--- a/src/ccstruct/otsuthr.cpp
+++ b/src/ccstruct/otsuthr.cpp
@@ -19,7 +19,7 @@
 
 #include "otsuthr.h"
 
-#include <string.h>
+#include <cstring>
 #include "allheaders.h"
 #include "helpers.h"
 #include "openclwrapper.h"
diff --git a/src/ccstruct/params_training_featdef.cpp b/src/ccstruct/params_training_featdef.cpp
index 8944202ee26065de48a97bd85760dc639dd31691..d8617657ac5438086c6c56e3fb4cb0513fa86ab0 100644
--- a/src/ccstruct/params_training_featdef.cpp
+++ b/src/ccstruct/params_training_featdef.cpp
@@ -17,7 +17,7 @@
 //
 ///////////////////////////////////////////////////////////////////////
 
-#include <string.h>
+#include <cstring>
 
 #include "params_training_featdef.h"
 
diff --git a/src/ccstruct/statistc.cpp b/src/ccstruct/statistc.cpp
index 66392acfa0cb1baca1f8bb5925627ccef4245f27..e5da372b1c1d44b9e0e30ed5ae4201810407ec81 100644
--- a/src/ccstruct/statistc.cpp
+++ b/src/ccstruct/statistc.cpp
@@ -23,7 +23,7 @@
 #endif
 
 #include "statistc.h"
-#include <string.h>
+#include <cstring>
 #include <math.h>
 #include <stdlib.h>
 #include "errcode.h"
diff --git a/src/ccutil/bitvector.cpp b/src/ccutil/bitvector.cpp
index 4248c9e1600e59f15bd991ee9b5c4659a914fa17..16f0d9c976282e1fc4ec6bf2c0fa1a68cddcadcd 100644
--- a/src/ccutil/bitvector.cpp
+++ b/src/ccutil/bitvector.cpp
@@ -20,7 +20,7 @@
 ///////////////////////////////////////////////////////////////////////
 
 #include "bitvector.h"
-#include <string.h>
+#include <cstring>
 #include "helpers.h"
 
 #include <algorithm>
diff --git a/src/ccutil/errcode.cpp b/src/ccutil/errcode.cpp
index 09e6a0604d8e796b183c3b5f6c2a71dbcb11b697..725e56ed19e0a8e7bd67147379018087a347de2a 100644
--- a/src/ccutil/errcode.cpp
+++ b/src/ccutil/errcode.cpp
@@ -17,15 +17,15 @@
  *
  **********************************************************************/
 
-#include          <stdio.h>
-#include          <stdlib.h>
-#include          <stdarg.h>
-#include          <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <cstring>
 #ifdef __UNIX__
-#include          <signal.h>
+#include <signal.h>
 #endif
-#include          "tprintf.h"
-#include          "errcode.h"
+#include "tprintf.h"
+#include "errcode.h"
 
 const ERRCODE BADERRACTION = "Illegal error action";
 #define MAX_MSG       1024
diff --git a/src/ccutil/params.cpp b/src/ccutil/params.cpp
index 1692577ee85a3bca60d66f51728fb81fc975e06f..3a8c8187a08e17d94d0a7af5b8b5cbc5a7786268 100644
--- a/src/ccutil/params.cpp
+++ b/src/ccutil/params.cpp
@@ -17,14 +17,14 @@
  *
  **********************************************************************/
 
-#include          <stdio.h>
-#include          <string.h>
-#include          <stdlib.h>
-
-#include          "genericvector.h"
-#include          "scanutils.h"
-#include          "tprintf.h"
-#include          "params.h"
+#include <stdio.h>
+#include <cstring>
+#include <stdlib.h>
+
+#include "genericvector.h"
+#include "scanutils.h"
+#include "tprintf.h"
+#include "params.h"
 
 #define PLUS          '+'        //flag states
 #define MINUS         '-'
diff --git a/src/ccutil/platform.h b/src/ccutil/platform.h
index c78f2e33315fdfd17b7f9169af969f93316ab77a..c639b81db231219a9b91b13b6f94711c79fc47df 100644
--- a/src/ccutil/platform.h
+++ b/src/ccutil/platform.h
@@ -20,8 +20,6 @@
 #ifndef TESSERACT_CCUTIL_PLATFORM_H_
 #define TESSERACT_CCUTIL_PLATFORM_H_
 
-#include <string.h>
-
 #define DLLSYM
 #ifdef _WIN32
 #ifndef NOMINMAX
diff --git a/src/ccutil/unichar.h b/src/ccutil/unichar.h
index fe115055c0278c16e1168679f52227310a1e3f8b..80e5b7f7a36caba7ba8a1dc83c497ebfbb076dc3 100644
--- a/src/ccutil/unichar.h
+++ b/src/ccutil/unichar.h
@@ -21,7 +21,7 @@
 #define TESSERACT_CCUTIL_UNICHAR_H_
 
 #include <memory.h>
-#include <string.h>
+#include <cstring>
 #include <string>
 #include <vector>
 #include "platform.h"
diff --git a/src/classify/classify.cpp b/src/classify/classify.cpp
index b78e4bd96350ee51ffc73408969a82f48cdbff11..f90931fc492b4c6f30e22cb6da079c8f8e1d073a 100644
--- a/src/classify/classify.cpp
+++ b/src/classify/classify.cpp
@@ -29,7 +29,7 @@
 #include "shapeclassifier.h"
 #include "shapetable.h"
 #include "unicity_table.h"
-#include <string.h>
+#include <cstring>
 
 namespace tesseract {
 Classify::Classify()
diff --git a/src/training/cntraining.cpp b/src/training/cntraining.cpp
index 236440f4f41f24ab58757e04d1099dff52f2082f..baf6cd5447c2d0fc207f1dc86c54a57df1e92d20 100644
--- a/src/training/cntraining.cpp
+++ b/src/training/cntraining.cpp
@@ -31,7 +31,7 @@
 #include "ocrfeatures.h"
 #include "clusttool.h"
 #include "cluster.h"
-#include <string.h>
+#include <cstring>
 #include <cstdio>
 #include <cmath>
 #include "unichar.h"
diff --git a/src/training/tessopt.cpp b/src/training/tessopt.cpp
index 2be2c5f359bc1375f084d0c7ca1dc22fa7fa1f68..9fa4fe03c65ee0629031b18efb4a0dee4863c31d 100644
--- a/src/training/tessopt.cpp
+++ b/src/training/tessopt.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
  * File:        tessopt.cpp
  * Description: Re-implementation of the unix code.
- * Author:					Ray Smith
- * Created:					Tue Nov 28 05:52:50 MST 1995
+ * Author:      Ray Smith
+ * Created:     Tue Nov 28 05:52:50 MST 1995
  *
  * (C) Copyright 1995, Hewlett-Packard Co.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,9 +17,9 @@
  *
  **********************************************************************/
 
-#include          <string.h>
-#include          <stdio.h>
-#include          "tessopt.h"
+#include <cstring>
+#include <stdio.h>
+#include "tessopt.h"
 
 int tessoptind;
 char *tessoptarg;
diff --git a/src/viewer/scrollview.cpp b/src/viewer/scrollview.cpp
index de702672c3d33463e7b39d20e9ed3efaed1fbff1..64f0aa8653a6320a15edf8ae39f28009d2757e05 100644
--- a/src/viewer/scrollview.cpp
+++ b/src/viewer/scrollview.cpp
@@ -22,7 +22,7 @@
 
 #include <stdarg.h>
 #include <limits.h>
-#include <string.h>
+#include <cstring>
 #include <map>
 #include <utility>
 #include <algorithm>
diff --git a/src/viewer/svmnode.cpp b/src/viewer/svmnode.cpp
index f128ffb40a6c797835a61448e59f1bda8b457899..b3203c8951e70636f0db57f4310703731685cd91 100644
--- a/src/viewer/svmnode.cpp
+++ b/src/viewer/svmnode.cpp
@@ -25,7 +25,7 @@
 // A SVMenuNode can both be used in the context_ of popup menus as well as
 // menu bars.
 
-#include <string.h>
+#include <cstring>
 #include <iostream>
 #include <cstring>