diff --git a/Examples/test-suite/array_typedef_memberin.i b/Examples/test-suite/array_typedef_memberin.i
index b1d13d2ea..3a0cf2522 100644
--- a/Examples/test-suite/array_typedef_memberin.i
+++ b/Examples/test-suite/array_typedef_memberin.i
@@ -8,5 +8,5 @@ namespace ArrayExample
     public: 
         arr_short8 node_list; 
      }; 
-}; 
+} 
 %} 
diff --git a/Examples/test-suite/constant_pointers.i b/Examples/test-suite/constant_pointers.i
index 141099f4f..5a713f081 100644
--- a/Examples/test-suite/constant_pointers.i
+++ b/Examples/test-suite/constant_pointers.i
@@ -69,7 +69,7 @@ public:
     ReturnValuesTest() : int3(NULL) {}
 };
 
-const int* globalRet1() {return &GlobalInt;};
-int* const globalRet2() {return &GlobalInt;};
+const int* globalRet1() {return &GlobalInt;}
+int* const globalRet2() {return &GlobalInt;}
 
 %}
diff --git a/Examples/test-suite/cpp_namespace.i b/Examples/test-suite/cpp_namespace.i
index 94c08d536..d7bf95e9f 100644
--- a/Examples/test-suite/cpp_namespace.i
+++ b/Examples/test-suite/cpp_namespace.i
@@ -17,14 +17,14 @@
 
     class Test {
     public:
-      Test() { };
-      ~Test() { };
+      Test() { }
+      ~Test() { }
       char *method() {
 	return (char *) "Test::method";
       }
     };
     typedef Test *TestPtr;
-    void weird(Bad x, ::Bad y) { };
+    void weird(Bad x, ::Bad y) { }
   }
 
   char *do_method(example::TestPtr t) {
diff --git a/Examples/test-suite/import_nomodule.i b/Examples/test-suite/import_nomodule.i
index c2c709305..67828a2f3 100644
--- a/Examples/test-suite/import_nomodule.i
+++ b/Examples/test-suite/import_nomodule.i
@@ -22,7 +22,7 @@ Foo *create_Foo() {
    return new Foo();
 }
 
-void test1(Foo *f, Integer x) { };
+void test1(Foo *f, Integer x) { }
 
 class Bar : public Foo { };
 
diff --git a/Examples/test-suite/namespace_nested.i b/Examples/test-suite/namespace_nested.i
index 36b4680a5..6b2a06ccb 100644
--- a/Examples/test-suite/namespace_nested.i
+++ b/Examples/test-suite/namespace_nested.i
@@ -40,7 +40,7 @@ namespace hello
     // This doesn't work
     //
     typedef Hi<hi::hi0> Hi0;
-  };
+  }
   
   
   namespace oss
diff --git a/Examples/test-suite/private_assign.i b/Examples/test-suite/private_assign.i
index 6f95df0fb..d2da98a8b 100644
--- a/Examples/test-suite/private_assign.i
+++ b/Examples/test-suite/private_assign.i
@@ -16,6 +16,6 @@
 
    Foo blah() {
       return Foo();
-   };
+   }
 %}
 
diff --git a/Examples/test-suite/redefined.i b/Examples/test-suite/redefined.i
index 50205a8af..67e38da45 100644
--- a/Examples/test-suite/redefined.i
+++ b/Examples/test-suite/redefined.i
@@ -53,7 +53,7 @@
     friend int foo(A*, B*);
   };
 
-  inline int foo(A*, B*) { return 0; };
+  inline int foo(A*, B*) { return 0; }
   
 %}
 
@@ -65,7 +65,7 @@
 // since they are not C/C++/CPP standard.
 //
 %extend Hello {
-  int hi(int) { return 0; };
+  int hi(int) { return 0; }
 }
 
 %rename(chao) hi(int);
@@ -100,7 +100,7 @@
     typedef int Int;
     typedef double Int;
     friend short hello(int);
-    int hi(int) { return 0; };
+    int hi(int) { return 0; }
   };
   
 %}
diff --git a/Examples/test-suite/throw_exception.i b/Examples/test-suite/throw_exception.i
index c43477e2b..28d943658 100644
--- a/Examples/test-suite/throw_exception.i
+++ b/Examples/test-suite/throw_exception.i
@@ -16,7 +16,7 @@ namespace Namespace {
   typedef const Error* ErrorPtr;
   typedef int IntArray[10];
   enum EnumTest { enum1, enum2 };
-};
+}
 class Foo {
 public:
     void test_int() throw(int) {
diff --git a/Examples/test-suite/voidtest.i b/Examples/test-suite/voidtest.i
index 37d6d9fc5..01e7e8485 100644
--- a/Examples/test-suite/voidtest.i
+++ b/Examples/test-suite/voidtest.i
@@ -3,14 +3,14 @@
 %inline %{
 
 void globalfunc(void) {
-};
+}
 
 class Foo {
 public:
-   Foo() { };
-   void memberfunc(void) { };
-   static void staticmemberfunc(void) { };
+   Foo() { }
+   void memberfunc(void) { }
+   static void staticmemberfunc(void) { }
 };
 
 %}
-   
\ No newline at end of file
+