diff --git a/ccmain/equationdetect.cpp b/ccmain/equationdetect.cpp
index 393b0e81e6..3099f2c46e 100644
--- a/ccmain/equationdetect.cpp
+++ b/ccmain/equationdetect.cpp
@@ -1516,4 +1516,4 @@ void EquationDetect::PrintSpecialBlobsDensity(const ColPartition* part) const {
   tprintf("\n");
 }
 
-};  // namespace tesseract
+}  // namespace tesseract
diff --git a/ccstruct/blobs.cpp b/ccstruct/blobs.cpp
index dbbe3a0625..4335b2fd25 100644
--- a/ccstruct/blobs.cpp
+++ b/ccstruct/blobs.cpp
@@ -62,7 +62,7 @@ const TPOINT kDivisibleVerticalItalic(1, 5);
               F u n c t i o n s
 ----------------------------------------------------------------------*/
 
-CLISTIZE(EDGEPT);
+CLISTIZE(EDGEPT)
 
 // Returns true when the two line segments cross each other.
 // (Moved from outlines.cpp).
diff --git a/ccstruct/blobs.h b/ccstruct/blobs.h
index 0119b47df4..70888b1676 100644
--- a/ccstruct/blobs.h
+++ b/ccstruct/blobs.h
@@ -175,7 +175,7 @@ struct EDGEPT {
 };
 
 // For use in chop and findseam to keep a list of which EDGEPTs were inserted.
-CLISTIZEH(EDGEPT);
+CLISTIZEH(EDGEPT)
 
 struct TESSLINE {
   TESSLINE() : is_hole(false), loop(NULL), next(NULL) {}
diff --git a/ccstruct/ratngs.cpp b/ccstruct/ratngs.cpp
index cbd7bf0e2d..03ed873c1b 100644
--- a/ccstruct/ratngs.cpp
+++ b/ccstruct/ratngs.cpp
@@ -33,8 +33,8 @@
 
 using tesseract::ScriptPos;
 
-ELISTIZE(BLOB_CHOICE);
-ELISTIZE(WERD_CHOICE);
+ELISTIZE(BLOB_CHOICE)
+ELISTIZE(WERD_CHOICE)
 
 const float WERD_CHOICE::kBadRating = 100000.0;
 // Min offset in baseline-normalized coords to make a character a subscript.
diff --git a/ccutil/ambigs.cpp b/ccutil/ambigs.cpp
index f65a6df8fb..b940dea090 100644
--- a/ccutil/ambigs.cpp
+++ b/ccutil/ambigs.cpp
@@ -43,7 +43,7 @@ AmbigSpec::AmbigSpec() {
   wrong_ngram_size = 0;
 }
 
-ELISTIZE(AmbigSpec);
+ELISTIZE(AmbigSpec)
 
 // Initializes the ambigs by adding a NULL pointer to each table.
 void UnicharAmbigs::InitUnicharAmbigs(const UNICHARSET& unicharset,
diff --git a/ccutil/ambigs.h b/ccutil/ambigs.h
index 786d46073e..a352b052b5 100644
--- a/ccutil/ambigs.h
+++ b/ccutil/ambigs.h
@@ -134,7 +134,7 @@ class AmbigSpec : public ELIST_LINK {
   AmbigType type;
   int wrong_ngram_size;
 };
-ELISTIZEH(AmbigSpec);
+ELISTIZEH(AmbigSpec)
 
 // AMBIG_TABLE[i] stores a set of ambiguities whose
 // wrong ngram starts with unichar id i.
diff --git a/cutil/structures.cpp b/cutil/structures.cpp
index c1016a26cf..366d331a3a 100644
--- a/cutil/structures.cpp
+++ b/cutil/structures.cpp
@@ -33,4 +33,4 @@
 /*----------------------------------------------------------------------
               F u n c t i o n s
 ----------------------------------------------------------------------*/
-makestructure(new_cell, free_cell, list_rec);
+makestructure(new_cell, free_cell, list_rec)
diff --git a/textord/equationdetectbase.cpp b/textord/equationdetectbase.cpp
index 29a9c84819..8048d2c936 100644
--- a/textord/equationdetectbase.cpp
+++ b/textord/equationdetectbase.cpp
@@ -62,4 +62,4 @@ void EquationDetectBase::RenderSpecialText(Pix* pix,
   boxDestroy(&box);
 }
 
-};  // namespace tesseract
+}  // namespace tesseract
diff --git a/textord/equationdetectbase.h b/textord/equationdetectbase.h
index 06a26cc731..e9bacd2a89 100644
--- a/textord/equationdetectbase.h
+++ b/textord/equationdetectbase.h
@@ -54,6 +54,6 @@ class EquationDetectBase {
   static void RenderSpecialText(Pix* pix, BLOBNBOX* blob);
 };
 
-};  // namespace tesseract
+}  // namespace tesseract
 
 #endif  // TESSERACT_TEXTORD_EQUATIONDETECTBASE_H_
diff --git a/wordrec/lm_state.cpp b/wordrec/lm_state.cpp
index cf80e92e24..ee5560daa4 100644
--- a/wordrec/lm_state.cpp
+++ b/wordrec/lm_state.cpp
@@ -22,7 +22,7 @@
 
 namespace tesseract {
 
-ELISTIZE(ViterbiStateEntry);
+ELISTIZE(ViterbiStateEntry)
 
 void ViterbiStateEntry::Print(const char *msg) const {
   tprintf("%s ViterbiStateEntry", msg);
diff --git a/wordrec/lm_state.h b/wordrec/lm_state.h
index 9c41fb240b..7a3d23ee5d 100644
--- a/wordrec/lm_state.h
+++ b/wordrec/lm_state.h
@@ -187,7 +187,7 @@ struct ViterbiStateEntry : public ELIST_LINK {
   STRING *debug_str;
 };
 
-ELISTIZEH(ViterbiStateEntry);
+ELISTIZEH(ViterbiStateEntry)
 
 /// Struct to store information maintained by various language model components.
 struct LanguageModelState {