diff --git a/src/ccmain/pgedit.cpp b/src/ccmain/pgedit.cpp
index c20c8f3d..9dba021c 100644
--- a/src/ccmain/pgedit.cpp
+++ b/src/ccmain/pgedit.cpp
@@ -114,7 +114,7 @@ CMD_EVENTS mode = CHANGE_DISP_CMD_EVENT;  // selected words op
 bool recog_done = false;                  // recog_all_words was called
 
 // These variables should remain global, since they are only used for the
-// debug mode (in which only a single Tesseract thread/instance will be exist).
+// debug mode (in which only a single Tesseract thread/instance will exist).
 BITS16 word_display_mode;
 static ColorationMode color_mode = CM_RAINBOW;
 BOOL8 display_image = FALSE;
diff --git a/src/ccutil/params.h b/src/ccutil/params.h
index ecee6e26..64e7411c 100644
--- a/src/ccutil/params.h
+++ b/src/ccutil/params.h
@@ -246,8 +246,8 @@ class DoubleParam : public Param {
 //
 // To avoid the problem of undetermined order of static initialization
 // global_params are accessed through the GlobalParams function that
-// initializes the static pointer to global_params only on the first
-// first time GlobalParams() is called.
+// initializes the static pointer to global_params only on the first time
+// GlobalParams() is called.
 //
 // TODO(daria): remove GlobalParams() when all global Tesseract
 // parameters are converted to members.
@@ -285,18 +285,6 @@ tesseract::ParamsVectors *GlobalParams();
 #define double_VAR(name,val,comment)\
   tesseract::DoubleParam     name(val,#name,comment,false,GlobalParams())
 
-#define INT_INIT_VAR(name,val,comment)\
-  tesseract::IntParam      name(val,#name,comment,true,GlobalParams())
-
-#define BOOL_INIT_VAR(name,val,comment)\
-  tesseract::BoolParam     name(val,#name,comment,true,GlobalParams())
-
-#define STRING_INIT_VAR(name,val,comment)\
-  tesseract::StringParam     name(val,#name,comment,true,GlobalParams())
-
-#define double_INIT_VAR(name,val,comment)\
-  tesseract::DoubleParam     name(val,#name,comment,true,GlobalParams())
-
 #define INT_MEMBER(name, val, comment, vec)\
   name(val, #name, comment, false, vec)
 
diff --git a/src/textord/drawedg.cpp b/src/textord/drawedg.cpp
index 0a429b54..f677969d 100644
--- a/src/textord/drawedg.cpp
+++ b/src/textord/drawedg.cpp
@@ -18,7 +18,7 @@
  *
  **********************************************************************/
 
-#include          "drawedg.h"
+#include "drawedg.h"
 
 // Include automatically generated configuration file if running autoconf.
 #ifdef HAVE_CONFIG_H
@@ -33,8 +33,6 @@
 /** default position */
 #define IMAGE_YPOS      0
 
-#define EXTERN
-
 /**
  * @name create_edges_window
  *
diff --git a/src/textord/pithsync.cpp b/src/textord/pithsync.cpp
index 388b4603..a1084f18 100644
--- a/src/textord/pithsync.cpp
+++ b/src/textord/pithsync.cpp
@@ -28,8 +28,6 @@
 
 #define PROJECTION_MARGIN 10     //arbitrary
 
-#define EXTERN
-
 /**********************************************************************
  * FPCUTPT::setup
  *