diff --git a/src/ccmain/adaptions.cpp b/src/ccmain/adaptions.cpp
index 59e8e5e8fb..6fe65bde33 100644
--- a/src/ccmain/adaptions.cpp
+++ b/src/ccmain/adaptions.cpp
@@ -1,9 +1,9 @@
 /**********************************************************************
  * File:        adaptions.cpp  (Formerly adaptions.c)
  * Description: Functions used to adapt to blobs already confidently
- *					identified
- * Author:		Chris Newton
- * Created:		Thu Oct  7 10:17:28 BST 1993
+ *              identified
+ * Author:      Chris Newton
+ * Created:     Thu Oct  7 10:17:28 BST 1993
  *
  * (C) Copyright 1992, Hewlett-Packard Ltd.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,18 +18,15 @@
  *
  **********************************************************************/
 
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          <ctype.h>
-#include          <string.h>
-#include          "tessbox.h"
-#include          "tessvars.h"
-#include          "memry.h"
-#include          "reject.h"
-#include          "control.h"
-#include          "stopper.h"
-#include          "tesseractclass.h"
+#include <ctype.h>
+#include <string.h>
+#include "tessbox.h"
+#include "tessvars.h"
+#include "memry.h"
+#include "reject.h"
+#include "control.h"
+#include "stopper.h"
+#include "tesseractclass.h"
 
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
diff --git a/src/ccmain/applybox.cpp b/src/ccmain/applybox.cpp
index 3b40889f91..97cbdb6e9e 100644
--- a/src/ccmain/applybox.cpp
+++ b/src/ccmain/applybox.cpp
@@ -18,11 +18,8 @@
  **********************************************************************/
 
 #include <ctype.h>
-#include <string.h>
-#ifdef __UNIX__
-#include <assert.h>
 #include <errno.h>
-#endif
+#include <string.h>
 #include "allheaders.h"
 #include "boxread.h"
 #include "chopper.h"
diff --git a/src/ccmain/control.cpp b/src/ccmain/control.cpp
index 5ce8c0b4f3..6105c754f2 100644
--- a/src/ccmain/control.cpp
+++ b/src/ccmain/control.cpp
@@ -27,11 +27,10 @@
 #include <string.h>
 #include <cmath>
 #ifdef __UNIX__
-#include <assert.h>
 #include <unistd.h>
-#include <errno.h>
 #endif
 #include <ctype.h>
+#include <errno.h>
 #include "callcpp.h"
 #include "control.h"
 #include "docqual.h"
diff --git a/src/ccmain/output.cpp b/src/ccmain/output.cpp
index 64dfca1d4a..50540c4cc7 100644
--- a/src/ccmain/output.cpp
+++ b/src/ccmain/output.cpp
@@ -17,12 +17,11 @@
  *
  **********************************************************************/
 
-#include <string.h>
 #include <ctype.h>
+#include <errno.h>
+#include <string.h>
 #ifdef __UNIX__
-#include          <assert.h>
-#include          <unistd.h>
-#include          <errno.h>
+#include <unistd.h>
 #endif
 #include "helpers.h"
 #include "tessvars.h"
diff --git a/src/ccmain/reject.cpp b/src/ccmain/reject.cpp
index 88202b3f4e..6310c3f86c 100644
--- a/src/ccmain/reject.cpp
+++ b/src/ccmain/reject.cpp
@@ -17,21 +17,18 @@
  *
  **********************************************************************/
 
-#include          "tessvars.h"
-#ifdef __UNIX__
-#include          <assert.h>
-#include          <errno.h>
-#endif
-#include          "scanutils.h"
-#include          <ctype.h>
-#include          <string.h>
-#include          "genericvector.h"
-#include          "reject.h"
-#include          "control.h"
-#include          "docqual.h"
-#include          "globaloc.h"  // For err_exit.
-#include          "globals.h"
-#include          "helpers.h"
+#include "tessvars.h"
+#include "scanutils.h"
+#include <ctype.h>
+#include <errno.h>
+#include <string.h>
+#include "genericvector.h"
+#include "reject.h"
+#include "control.h"
+#include "docqual.h"
+#include "globaloc.h"  // For err_exit.
+#include "globals.h"
+#include "helpers.h"
 
 #include "tesseractclass.h"
 
diff --git a/src/ccstruct/blread.cpp b/src/ccstruct/blread.cpp
index 1c2d68b09b..9d3291caef 100644
--- a/src/ccstruct/blread.cpp
+++ b/src/ccstruct/blread.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
  * File:        blread.cpp  (Formerly pdread.c)
  * Description: Friend function of BLOCK to read the uscan pd file.
- * Author:		Ray Smith
- * Created:		Mon Mar 18 14:39:00 GMT 1991
+ * Author:      Ray Smith
+ * Created:     Mon Mar 18 14:39:00 GMT 1991
  *
  * (C) Copyright 1991, Hewlett-Packard Ltd.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,13 +17,10 @@
  *
  **********************************************************************/
 
-#include          <stdlib.h>
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          "scanutils.h"
-#include          "fileerr.h"
-#include          "blread.h"
+#include <stdlib.h>
+#include "scanutils.h"
+#include "fileerr.h"
+#include "blread.h"
 
 #define UNLV_EXT  ".uzn"  // unlv zone file
 
diff --git a/src/ccstruct/coutln.cpp b/src/ccstruct/coutln.cpp
index 6680b3be3d..8a5a9554cd 100644
--- a/src/ccstruct/coutln.cpp
+++ b/src/ccstruct/coutln.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
  * File:        coutln.cpp  (Formerly coutline.c)
  * Description: Code for the C_OUTLINE class.
- * Author:                  Ray Smith
- * Created:                 Mon Oct 07 16:01:57 BST 1991
+ * Author:      Ray Smith
+ * Created:     Mon Oct 07 16:01:57 BST 1991
  *
  * (C) Copyright 1991, Hewlett-Packard Ltd.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,9 +19,6 @@
 
 #include <algorithm>
 #include <string.h>
-#ifdef __UNIX__
-#include <assert.h>
-#endif
 
 #include "coutln.h"
 
diff --git a/src/ccstruct/pageres.cpp b/src/ccstruct/pageres.cpp
index 3db3b01c69..2cbaf5806c 100644
--- a/src/ccstruct/pageres.cpp
+++ b/src/ccstruct/pageres.cpp
@@ -21,13 +21,12 @@
  ** limitations under the License.
  *
  **********************************************************************/
-#include          <stdlib.h>
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          "blamer.h"
-#include          "pageres.h"
-#include          "blobs.h"
+
+#include <stdlib.h>
+#include <cassert>
+#include "blamer.h"
+#include "pageres.h"
+#include "blobs.h"
 
 ELISTIZE (BLOCK_RES)
 CLISTIZE (BLOCK_RES) ELISTIZE (ROW_RES) ELISTIZE (WERD_RES)
diff --git a/src/ccstruct/polyaprx.cpp b/src/ccstruct/polyaprx.cpp
index 371a32cdba..d8df934181 100644
--- a/src/ccstruct/polyaprx.cpp
+++ b/src/ccstruct/polyaprx.cpp
@@ -17,14 +17,11 @@
  *
  **********************************************************************/
 
-#include          <stdio.h>
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
+#include <stdio.h>
 #define FASTEDGELENGTH    256
-#include          "polyaprx.h"
-#include          "params.h"
-#include          "tprintf.h"
+#include "polyaprx.h"
+#include "params.h"
+#include "tprintf.h"
 
 #define EXTERN
 
diff --git a/src/ccstruct/ratngs.h b/src/ccstruct/ratngs.h
index fce3245594..3d4e6e1a03 100644
--- a/src/ccstruct/ratngs.h
+++ b/src/ccstruct/ratngs.h
@@ -20,7 +20,7 @@
 #ifndef           RATNGS_H
 #define           RATNGS_H
 
-#include <assert.h>
+#include <cassert>
 
 #include "clst.h"
 #include "elst.h"
diff --git a/src/ccstruct/rejctmap.h b/src/ccstruct/rejctmap.h
index ed82865564..338843d314 100644
--- a/src/ccstruct/rejctmap.h
+++ b/src/ccstruct/rejctmap.h
@@ -41,9 +41,6 @@ OF THIS IMPLIED TEMPORAL ORDERING OF THE FLAGS!!!!
 #ifndef           REJCTMAP_H
 #define           REJCTMAP_H
 
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
 #include <memory>
 #include "bits16.h"
 #include "errcode.h"
diff --git a/src/ccstruct/split.cpp b/src/ccstruct/split.cpp
index 4d72a7ea53..eeb728b54c 100644
--- a/src/ccstruct/split.cpp
+++ b/src/ccstruct/split.cpp
@@ -36,10 +36,6 @@
 
 #include <algorithm>
 
-#ifdef __UNIX__
-#include <assert.h>
-#endif
-
 /*----------------------------------------------------------------------
               V a r i a b l e s
 ----------------------------------------------------------------------*/
diff --git a/src/ccutil/strngs.cpp b/src/ccutil/strngs.cpp
index 6cdfc2d557..471628db69 100644
--- a/src/ccutil/strngs.cpp
+++ b/src/ccutil/strngs.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
  * File:        strngs.cpp  (Formerly strings.c)
  * Description: STRING class functions.
- * Author:          Ray Smith
- * Created:         Fri Feb 15 09:13:30 GMT 1991
+ * Author:      Ray Smith
+ * Created:     Fri Feb 15 09:13:30 GMT 1991
  *
  * (C) Copyright 1991, Hewlett-Packard Ltd.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@
 
 #include "strngs.h"
 
-#include <assert.h>
+#include <cassert>
 
 #include "errcode.h"
 #include "genericvector.h"
diff --git a/src/classify/adaptmatch.cpp b/src/classify/adaptmatch.cpp
index 7b0b8a0323..777937c01f 100644
--- a/src/classify/adaptmatch.cpp
+++ b/src/classify/adaptmatch.cpp
@@ -55,13 +55,11 @@
 #include "werd.h"
 
 #include <algorithm>
+#include <cassert>
 #include <cstdio>
 #include <cstring>
 #include <cstdlib>
 #include <cmath>
-#ifdef __UNIX__
-#include <assert.h>
-#endif
 
 #define ADAPT_TEMPLATE_SUFFIX ".a"
 
diff --git a/src/cutil/callcpp.cpp b/src/cutil/callcpp.cpp
index 6f486afee5..5fb68647fe 100644
--- a/src/cutil/callcpp.cpp
+++ b/src/cutil/callcpp.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
  * File:        callcpp.cpp
  * Description: extern C interface calling C++ from C.
- * Author:		Ray Smith
- * Created:		Sun Feb 04 20:39:23 MST 1996
+ * Author:      Ray Smith
+ * Created:     Sun Feb 04 20:39:23 MST 1996
  *
  * (C) Copyright 1996, Hewlett-Packard Co.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,18 +22,15 @@
 #include "config_auto.h"
 #endif
 
-#include          "errcode.h"
-#ifdef __UNIX__
-#include          <assert.h>
+#include "errcode.h"
 #include <stdarg.h>
-#endif
-#include          <time.h>
-#include          "memry.h"
-#include          "scrollview.h"
-#include          "params.h"
-#include          "callcpp.h"
-#include          "tprintf.h"
-#include          "host.h"
+#include <time.h>
+#include "memry.h"
+#include "scrollview.h"
+#include "params.h"
+#include "callcpp.h"
+#include "tprintf.h"
+#include "host.h"
 #include "unichar.h"
 
 #include <memory>
diff --git a/src/cutil/callcpp.h b/src/cutil/callcpp.h
index dfa07006b9..eacbea601c 100644
--- a/src/cutil/callcpp.h
+++ b/src/cutil/callcpp.h
@@ -1,8 +1,8 @@
 /**********************************************************************
  * File:        callcpp.h
  * Description: extern C interface calling C++ from C.
- * Author:		Ray Smith
- * Created:		Sun Feb 04 20:39:23 MST 1996
+ * Author:      Ray Smith
+ * Created:     Sun Feb 04 20:39:23 MST 1996
  *
  * (C) Copyright 1996, Hewlett-Packard Co.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,9 +20,6 @@
 #ifndef CALLCPP_H
 #define CALLCPP_H
 
-#ifndef __UNIX__
-#include <assert.h>
-#endif
 #include "host.h"
 #include "params.h"
 #include "unichar.h"
diff --git a/src/cutil/danerror.cpp b/src/cutil/danerror.cpp
index 29920e9843..5294798f10 100644
--- a/src/cutil/danerror.cpp
+++ b/src/cutil/danerror.cpp
@@ -22,9 +22,6 @@
 #include "danerror.h"
 #include "tprintf.h"
 #include "globaloc.h"
-#ifdef __UNIX__
-#include "assert.h"
-#endif
 
 #include <cstdio>
 
diff --git a/src/textord/fpchop.cpp b/src/textord/fpchop.cpp
index 943d5d1682..9591d465cd 100644
--- a/src/textord/fpchop.cpp
+++ b/src/textord/fpchop.cpp
@@ -17,16 +17,13 @@
  *
  **********************************************************************/
 
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          "stderr.h"
-#include          "blobbox.h"
-#include          "statistc.h"
-#include          "drawtord.h"
-#include          "tovars.h"
-#include          "topitch.h"
-#include          "fpchop.h"
+#include "stderr.h"
+#include "blobbox.h"
+#include "statistc.h"
+#include "drawtord.h"
+#include "tovars.h"
+#include "topitch.h"
+#include "fpchop.h"
 
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
diff --git a/src/textord/makerow.cpp b/src/textord/makerow.cpp
index cc753b8dc7..a790fb4de8 100644
--- a/src/textord/makerow.cpp
+++ b/src/textord/makerow.cpp
@@ -17,24 +17,21 @@
  *
  **********************************************************************/
 
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          "stderr.h"
-#include          "blobbox.h"
-#include          "ccstruct.h"
-#include          "detlinefit.h"
-#include          "statistc.h"
-#include          "drawtord.h"
-#include          "blkocc.h"
-#include          "sortflts.h"
-#include          "oldbasel.h"
-#include          "textord.h"
-#include          "tordmain.h"
-#include          "underlin.h"
-#include          "makerow.h"
-#include          "tprintf.h"
-#include          "tovars.h"
+#include "stderr.h"
+#include "blobbox.h"
+#include "ccstruct.h"
+#include "detlinefit.h"
+#include "statistc.h"
+#include "drawtord.h"
+#include "blkocc.h"
+#include "sortflts.h"
+#include "oldbasel.h"
+#include "textord.h"
+#include "tordmain.h"
+#include "underlin.h"
+#include "makerow.h"
+#include "tprintf.h"
+#include "tovars.h"
 
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
diff --git a/src/textord/pithsync.cpp b/src/textord/pithsync.cpp
index 99b8996858..43986c77cd 100644
--- a/src/textord/pithsync.cpp
+++ b/src/textord/pithsync.cpp
@@ -17,16 +17,13 @@
  *
  **********************************************************************/
 
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          <math.h>
-#include          "memry.h"
-#include          "makerow.h"
-#include          "pitsync1.h"
-#include          "topitch.h"
-#include          "pithsync.h"
-#include          "tprintf.h"
+#include <math.h>
+#include "memry.h"
+#include "makerow.h"
+#include "pitsync1.h"
+#include "topitch.h"
+#include "pithsync.h"
+#include "tprintf.h"
 
 #define PROJECTION_MARGIN 10     //arbitrary
 
diff --git a/src/textord/pitsync1.cpp b/src/textord/pitsync1.cpp
index c95c670aa0..438d6aee01 100644
--- a/src/textord/pitsync1.cpp
+++ b/src/textord/pitsync1.cpp
@@ -1,8 +1,8 @@
 /**********************************************************************
  * File:        pitsync1.cpp  (Formerly pitsync.c)
  * Description: Code to find the optimum fixed pitch segmentation of some blobs.
- * Author:		Ray Smith
- * Created:		Thu Nov 19 11:48:05 GMT 1992
+ * Author:      Ray Smith
+ * Created:     Thu Nov 19 11:48:05 GMT 1992
  *
  * (C) Copyright 1992, Hewlett-Packard Ltd.
  ** Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,12 +17,9 @@
  *
  **********************************************************************/
 
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          <math.h>
-#include          "memry.h"
-#include          "pitsync1.h"
+#include <math.h>
+#include "memry.h"
+#include "pitsync1.h"
 
 ELISTIZE (FPSEGPT) CLISTIZE (FPSEGPT_LIST)
 #define EXTERN
diff --git a/src/textord/topitch.cpp b/src/textord/topitch.cpp
index 9dc8ba8f9d..64ca46edf9 100644
--- a/src/textord/topitch.cpp
+++ b/src/textord/topitch.cpp
@@ -17,20 +17,17 @@
  *
  **********************************************************************/
 
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          "stderr.h"
-#include          "blobbox.h"
-#include          "statistc.h"
-#include          "drawtord.h"
-#include          "makerow.h"
-#include          "pitsync1.h"
-#include          "pithsync.h"
-#include          "tovars.h"
-#include          "wordseg.h"
-#include          "topitch.h"
-#include          "helpers.h"
+#include "stderr.h"
+#include "blobbox.h"
+#include "statistc.h"
+#include "drawtord.h"
+#include "makerow.h"
+#include "pitsync1.h"
+#include "pithsync.h"
+#include "tovars.h"
+#include "wordseg.h"
+#include "topitch.h"
+#include "helpers.h"
 
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
diff --git a/src/textord/tordmain.cpp b/src/textord/tordmain.cpp
index cbd30db9ec..2881958885 100644
--- a/src/textord/tordmain.cpp
+++ b/src/textord/tordmain.cpp
@@ -21,9 +21,6 @@
 #include "config_auto.h"
 #endif
 
-#ifdef __UNIX__
-#include <assert.h>
-#endif
 #include "stderr.h"
 #include "globaloc.h"
 #include "blread.h"
diff --git a/src/textord/underlin.cpp b/src/textord/underlin.cpp
index a442f3e029..980c50b4c8 100644
--- a/src/textord/underlin.cpp
+++ b/src/textord/underlin.cpp
@@ -17,10 +17,7 @@
  *
  **********************************************************************/
 
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          "underlin.h"
+#include "underlin.h"
 
 #define PROJECTION_MARGIN 10     //arbitrary
 #define EXTERN
diff --git a/src/textord/wordseg.cpp b/src/textord/wordseg.cpp
index 0daaa81b5b..d86c910eed 100644
--- a/src/textord/wordseg.cpp
+++ b/src/textord/wordseg.cpp
@@ -17,21 +17,18 @@
  *
  **********************************************************************/
 
-#ifdef __UNIX__
-#include          <assert.h>
-#endif
-#include          "stderr.h"
-#include          "blobbox.h"
-#include          "statistc.h"
-#include          "drawtord.h"
-#include          "makerow.h"
-#include          "pitsync1.h"
-#include          "tovars.h"
-#include          "topitch.h"
-#include          "cjkpitch.h"
-#include          "textord.h"
-#include          "fpchop.h"
-#include          "wordseg.h"
+#include "stderr.h"
+#include "blobbox.h"
+#include "statistc.h"
+#include "drawtord.h"
+#include "makerow.h"
+#include "pitsync1.h"
+#include "tovars.h"
+#include "topitch.h"
+#include "cjkpitch.h"
+#include "textord.h"
+#include "fpchop.h"
+#include "wordseg.h"
 
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
diff --git a/src/training/commontraining.cpp b/src/training/commontraining.cpp
index cf8031e5ad..a1e1217c2c 100644
--- a/src/training/commontraining.cpp
+++ b/src/training/commontraining.cpp
@@ -14,7 +14,6 @@
 #include "commontraining.h"
 
 #include <algorithm>
-#include <assert.h>
 #include <cmath>
 
 #include "allheaders.h"
diff --git a/src/training/normstrngs.cpp b/src/training/normstrngs.cpp
index 331fcab1f1..efa6a7befa 100644
--- a/src/training/normstrngs.cpp
+++ b/src/training/normstrngs.cpp
@@ -20,7 +20,6 @@
 
 #include "normstrngs.h"
 
-#include <assert.h>
 #include <string>
 #include <unordered_map>
 #include <vector>
diff --git a/src/wordrec/associate.cpp b/src/wordrec/associate.cpp
index 255488bfa4..fc58bf1dfd 100644
--- a/src/wordrec/associate.cpp
+++ b/src/wordrec/associate.cpp
@@ -19,11 +19,8 @@
 ///////////////////////////////////////////////////////////////////////
 
 
-#include <cstdio>
-#ifdef __UNIX__
-#include <assert.h>
-#endif
 #include <cmath>
+#include <cstdio>
 
 #include "associate.h"
 #include "normalis.h"
diff --git a/src/wordrec/chopper.cpp b/src/wordrec/chopper.cpp
index 3d090f1788..db1b980c1d 100644
--- a/src/wordrec/chopper.cpp
+++ b/src/wordrec/chopper.cpp
@@ -31,7 +31,6 @@
 
 #include "chopper.h"
 
-#include "assert.h"
 #include "associate.h"
 #include "blobs.h"
 #include "callcpp.h"
diff --git a/src/wordrec/outlines.cpp b/src/wordrec/outlines.cpp
index 6fdfdbd976..d52f2c4537 100644
--- a/src/wordrec/outlines.cpp
+++ b/src/wordrec/outlines.cpp
@@ -31,10 +31,6 @@
 #include "outlines.h"
 #include "wordrec.h"
 
-#ifdef __UNIX__
-#include <assert.h>
-#endif
-
 namespace tesseract {
 /*----------------------------------------------------------------------
               F u n c t i o n s
diff --git a/src/wordrec/plotedges.cpp b/src/wordrec/plotedges.cpp
index 43ac0d65f3..a839b6b4fd 100644
--- a/src/wordrec/plotedges.cpp
+++ b/src/wordrec/plotedges.cpp
@@ -22,9 +22,6 @@
  ** limitations under the License.
  *
  *********************************************************************************/
-#ifdef __UNIX__
-#include <assert.h>
-#endif
 
 #include "plotedges.h"
 #include "render.h"
diff --git a/src/wordrec/render.cpp b/src/wordrec/render.cpp
index 20529fe599..b05139eb27 100644
--- a/src/wordrec/render.cpp
+++ b/src/wordrec/render.cpp
@@ -25,9 +25,6 @@
 #include "render.h"
 #include "blobs.h"
 
-#ifdef __UNIX__
-#include <assert.h>
-#endif
 #include <cmath>
 
 #include "vecfuncs.h"