diff --git a/CHANGES b/CHANGES
index b7b9856e2..33b2b5942 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2898,8 +2898,8 @@ Version 2.0.0 (2 June 2010)
             and in template parameter specializations:
 
               struct S {};
-              template <typename T> struct X { void a() {}; };
-              template <> struct X<S> { void b() {}; };
+              template <typename T> struct X { void a() {} };
+              template <> struct X<S> { void b() {} };
               %template(MyTConcrete) X< ::S >;
 
             plus probably some other corner case usage of ::.
@@ -20234,13 +20234,13 @@ Version 1.3.6  (July 9, 2001)
 	   class TestClass
 	   {
 	   public:
-	     TestClass() {};
-	     TestClass(int a) {};
-	     ~TestClass() {};
-	     unsigned long xyz(short k) {};
-	     unsigned long xyz(int n) {};
-	     static void static_func() {};
-	     static void static_func(int a) {};
+	     TestClass() {}
+	     TestClass(int a) {}
+	     ~TestClass() {}
+	     unsigned long xyz(short k) {}
+	     unsigned long xyz(int n) {}
+	     static void static_func() {}
+	     static void static_func(int a) {}
 	   };
 	   void delete_TestClass(int a);
 
diff --git a/Doc/Manual/Javascript.html b/Doc/Manual/Javascript.html
index 4a0cd46a8..cae199048 100644
--- a/Doc/Manual/Javascript.html
+++ b/Doc/Manual/Javascript.html
@@ -478,7 +478,7 @@ public:
   }
   virtual ~Shape() {
     nshapes--;
-  };
+  }
   double  x, y;
   void    move(double dx, double dy);
   virtual double area(void) = 0;
@@ -490,7 +490,7 @@ class Circle : public Shape {
 private:
   double radius;
 public:
-  Circle(double r) : radius(r) { };
+  Circle(double r) : radius(r) { }
   virtual double area(void);
   virtual double perimeter(void);
 };
@@ -499,7 +499,7 @@ class Square : public Shape {
 private:
   double width;
 public:
-  Square(double w) : width(w) { };
+  Square(double w) : width(w) { }
   virtual double area(void);
   virtual double perimeter(void);
 };</pre>
@@ -776,7 +776,7 @@ class JSEmitter {
    */
   virtual int exitClass(Node *) {
     return SWIG_OK;
-  };
+  }
 
   /**
    * Invoked at the beginning of the variableHandler.
@@ -788,7 +788,7 @@ class JSEmitter {
    */
   virtual int exitVariable(Node *) {
     return SWIG_OK;
-  };
+  }
 
   /**
    * Invoked at the beginning of the functionHandler.
@@ -800,7 +800,7 @@ class JSEmitter {
    */
   virtual int exitFunction(Node *) {
     return SWIG_OK;
-  };
+  }
 
   /**
    * Invoked by functionWrapper callback after call to Language::functionWrapper.
diff --git a/Doc/Manual/SWIGPlus.html b/Doc/Manual/SWIGPlus.html
index 72917f1e0..d0deff03f 100644
--- a/Doc/Manual/SWIGPlus.html
+++ b/Doc/Manual/SWIGPlus.html
@@ -3567,7 +3567,7 @@ It is also possible to separate these declarations from the template class.  For
 template&lt;class T&gt; class List {
     ...
     public:
-    List() { };
+    List() { }
     T get(int index);
     ...
 };
diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c
index de00e2b1f..d9a17b874 100644
--- a/Source/CParse/cscanner.c
+++ b/Source/CParse/cscanner.c
@@ -147,7 +147,7 @@ String *get_raw_text_balanced(int startchar, int endchar) {
  *  friend ostream& operator<<(ostream&, const char *s);
  *
  * or
- *  friend ostream& operator<<(ostream&, const char *s) { };
+ *  friend ostream& operator<<(ostream&, const char *s) { }
  *
  * ------------------------------------------------------------------------- */