diff --git a/CGALimageIO/include/CGAL/ImageIO.h b/CGALimageIO/include/CGAL/ImageIO.h
index 7c9dc4f2f94..a6a1538650b 100644
--- a/CGALimageIO/include/CGAL/ImageIO.h
+++ b/CGALimageIO/include/CGAL/ImageIO.h
@@ -206,7 +206,7 @@ typedef struct imformat {
   char realName[IMAGE_FORMAT_NAME_LENGTH];
   /* pointer towards the next image format*/
   struct imformat *next;
-} IMAGE_FORMAT, *PTRIMAGE_FORMAT;;
+} IMAGE_FORMAT, *PTRIMAGE_FORMAT;
 
 /** Image descriptor */
 typedef struct point_image {
diff --git a/Core/include/CGAL/CORE/Impl.h b/Core/include/CGAL/CORE/Impl.h
index 7d3af554487..d3adef80a20 100644
--- a/Core/include/CGAL/CORE/Impl.h
+++ b/Core/include/CGAL/CORE/Impl.h
@@ -13,7 +13,7 @@
 
 // macros for defining namespace
 #define CORE_BEGIN_NAMESPACE    namespace CORE {
-#define CORE_END_NAMESPACE      };
+#define CORE_END_NAMESPACE      }
 
 // condition preprocessor for inline function
 #ifndef CORE_DISABLE_INLINE
diff --git a/Core/include/CGAL/CORE/MemoryPool.h b/Core/include/CGAL/CORE/MemoryPool.h
index b16346bf8f3..5992e00a86e 100644
--- a/Core/include/CGAL/CORE/MemoryPool.h
+++ b/Core/include/CGAL/CORE/MemoryPool.h
@@ -104,4 +104,5 @@ void MemoryPool< T, nObjects >::free(void* t) {
 }
 
 CORE_END_NAMESPACE
+
 #endif // _CORE_MEMORYPOOL_H_
diff --git a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h
index 9d4e937b1c2..782f6a504ca 100644
--- a/GraphicsView/include/CGAL/Qt/DemosMainWindow.h
+++ b/GraphicsView/include/CGAL/Qt/DemosMainWindow.h
@@ -47,7 +47,7 @@ public:
 		Position = 0x2,
 		State    = 0x4};
 
-  Q_DECLARE_FLAGS(Options, Option);
+  Q_DECLARE_FLAGS(Options, Option)
 
 public:
   unsigned int maxNumberOfRecentFiles() const ;
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h
index 310315e6b11..4e77bd52c36 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/GUI_base.h
@@ -112,7 +112,7 @@ public:
     }
   }
 
-  CGAL_KINETIC_LISTENER1(CURRENT_TIME);
+  CGAL_KINETIC_LISTENER1(CURRENT_TIME)
 public:
   //! get the simulator
   typename Simulator::Handle& simulator() {
@@ -168,7 +168,7 @@ protected:
 
   
 
-  CGAL_KINETIC_LISTEN1(Timer, TICKS, timer_rang());
+  CGAL_KINETIC_LISTEN1(Timer, TICKS, timer_rang())
   /*class Timer_listener: public Timer::Listener
   {
   public:
@@ -328,5 +328,5 @@ protected:
   //Listener *drawable_;
   bool processing_;
 };
-CGAL_KINETIC_END_NAMESPACE;
+CGAL_KINETIC_END_NAMESPACE
 #endif
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h
index 6b8f0d791d3..43acf9241cc 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_core.h
@@ -42,7 +42,7 @@ namespace CGAL
 
 	Qt_core();
 
-	CGAL_KINETIC_LISTENERNT1(LAST_BUTTON_PRESSED);
+	CGAL_KINETIC_LISTENERNT1(LAST_BUTTON_PRESSED)
       public:
       
 	/*class Listener
@@ -143,7 +143,7 @@ namespace CGAL
 	typename Base::Handle t_;
       };
 
-    };
-  };
-};
+    }
+  }
+}
 #endif
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h
index 7aa0c27b5cb..513d0e59f3a 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_timer.h
@@ -33,7 +33,7 @@ namespace CGAL
       class Qt_timer: public QObject, public Non_ref_counted<Qt_timer>
       {
 	Q_OBJECT
-    	CGAL_KINETIC_LISTENERNT1(TICKS);
+    	CGAL_KINETIC_LISTENERNT1(TICKS)
      
       public:
 	Qt_timer();
@@ -46,7 +46,7 @@ namespace CGAL
 	  //CGAL_precondition(id_!=-1);
 	  if (id_!= -1) timer_.killTimer(id_);
 	  id_=-1;
-	};
+	}
 	void run(double time_in_seconds);
       protected:
 	QTimer timer_;
@@ -57,7 +57,7 @@ namespace CGAL
 	 private slots:
 	 void timerDone();
       };
-    };
-  };
-};
+    }
+  }
+}
 #endif
diff --git a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h
index eee5da8ea09..f8e79b096d1 100644
--- a/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h
+++ b/Kinetic_data_structures/include/CGAL/Kinetic/IO/internal/Qt_window_2.h
@@ -83,7 +83,7 @@ namespace CGAL
 	Qt_widget_2_core *widget_;
 	Qt_core core_;
       };
-    };
-  };
-};
+    }
+  }
+}
 #endif
diff --git a/Kinetic_data_structures/include/CGAL/Tools/Label.h b/Kinetic_data_structures/include/CGAL/Tools/Label.h
index 9b5bcc1a39b..872d29bcd32 100644
--- a/Kinetic_data_structures/include/CGAL/Tools/Label.h
+++ b/Kinetic_data_structures/include/CGAL/Tools/Label.h
@@ -20,6 +20,7 @@
 
 #ifndef CGAL_LABEL_H_
 #define CGAL_LABEL_H_
+
 #include <CGAL/basic.h>
 #include <iostream>
 #include <sstream>
@@ -75,8 +76,8 @@ public:
   }
 };
 
-CGAL_OUTPUT1(Label);
-
+CGAL_OUTPUT1(Label)
 
 CGAL_END_NAMESPACE
+
 #endif
diff --git a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h
index e83f1b58299..79ec126852c 100644
--- a/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h
+++ b/Kinetic_data_structures/include/CGAL/Tools/utility_macros.h
@@ -370,7 +370,7 @@ template <class A, class B>			\
       typedef name<Tr> T;						\
       CGAL_HAS_INFINITY_BODY;						\
     };									\
-  };
+  }
 
 
 
@@ -396,7 +396,7 @@ template <class A, class B>			\
       typedef name<Tr, Ur> T;						\
       CGAL_HAS_INFINITY_BODY;						\
     };									\
-  };
+  }
 
 #endif
 
diff --git a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_core.cpp b/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_core.cpp
index 089d77668ff..a35cc2a935e 100644
--- a/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_core.cpp
+++ b/Kinetic_data_structures/src/CGALQt/Kinetic_Qt_core.cpp
@@ -35,7 +35,7 @@ void Qt_core::play_button() {
   CGAL_LOG(Log::SOME, "Play button pushed.\n");
   mode_=RUN;
   CGAL_KINETIC_NOTIFY(LAST_BUTTON_PRESSED);
-};
+}
 
 void Qt_core::pause_button() {
   CGAL_LOG(Log::SOME, "Pause button pushed.\n");
diff --git a/Mesh_2/include/CGAL/Meshes/Simple_map_container.h b/Mesh_2/include/CGAL/Meshes/Simple_map_container.h
index fe65aa1f3dc..707069e0822 100644
--- a/Mesh_2/include/CGAL/Meshes/Simple_map_container.h
+++ b/Mesh_2/include/CGAL/Meshes/Simple_map_container.h
@@ -77,7 +77,7 @@ namespace CGAL {
       }
     }; // end Simple_map_container
     
-  }; // end namespace Mesh_3
-}; // end namespace CGAL
+  } // end namespace Mesh_3
+} // end namespace CGAL
 
 #endif // CGAL_MESHES_SIMPLE_MAP_CONTAINER_H
diff --git a/Mesh_2/include/CGAL/Meshes/Triangulation_mesher_level_traits_3.h b/Mesh_2/include/CGAL/Meshes/Triangulation_mesher_level_traits_3.h
index 79855e6d5f5..89b66412d8a 100644
--- a/Mesh_2/include/CGAL/Meshes/Triangulation_mesher_level_traits_3.h
+++ b/Mesh_2/include/CGAL/Meshes/Triangulation_mesher_level_traits_3.h
@@ -137,6 +137,6 @@ struct Triangulation_mesher_level_traits_3 :
 
 }; // end Triangulation_mesher_level_traits_3
 
-}; // end namespace CGAL
+} // end namespace CGAL
 
 #endif // CGAL_MESH_2_TRIANGULATION_MESHER_LEVEL_TRAITS_3_H
diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h
index 1de188a9f77..261fe484e77 100644
--- a/Number_types/include/CGAL/Lazy_exact_nt.h
+++ b/Number_types/include/CGAL/Lazy_exact_nt.h
@@ -1134,10 +1134,10 @@ struct Coercion_traits< Lazy_exact_nt<ET1>, Lazy_exact_nt<ET2> >
         :public Coercion_traits<NTX, Lazy_exact_nt<ET> >{};             \
 
 
-CGAL_COERCION_TRAITS_LAZY_EXACT(int);
-CGAL_COERCION_TRAITS_LAZY_EXACT(short);
-CGAL_COERCION_TRAITS_LAZY_EXACT(double);
-CGAL_COERCION_TRAITS_LAZY_EXACT(float);
+CGAL_COERCION_TRAITS_LAZY_EXACT(int)
+CGAL_COERCION_TRAITS_LAZY_EXACT(short)
+CGAL_COERCION_TRAITS_LAZY_EXACT(double)
+CGAL_COERCION_TRAITS_LAZY_EXACT(float)
 #undef CGAL_COERCION_TRAITS_LAZY_EXACT
 
 namespace INTERN_LAZY_EXACT_NT {
diff --git a/PDB/include/CGAL/PDB/Atom.h b/PDB/include/CGAL/PDB/Atom.h
index e8ce3494775..3605592255d 100644
--- a/PDB/include/CGAL/PDB/Atom.h
+++ b/PDB/include/CGAL/PDB/Atom.h
@@ -107,7 +107,7 @@ private:
 };
 
 
-CGAL_SWAP(Atom);
+CGAL_SWAP(Atom)
 
 /*inline bool Atom::operator<(const Atom &o) const {
   if (index_ < o.index_) return true;
diff --git a/PDB/include/CGAL/PDB/Chain.h b/PDB/include/CGAL/PDB/Chain.h
index bf2bcf57515..0bf2b27fb80 100644
--- a/PDB/include/CGAL/PDB/Chain.h
+++ b/PDB/include/CGAL/PDB/Chain.h
@@ -357,8 +357,8 @@ private:
 };
 
 
-CGAL_SWAP(Chain);
-CGAL_OUTPUT(Chain);
+CGAL_SWAP(Chain)
+CGAL_OUTPUT(Chain)
 
 
 
diff --git a/PDB/include/CGAL/PDB/Heterogen.h b/PDB/include/CGAL/PDB/Heterogen.h
index a7e5e63d841..f36eaed896a 100644
--- a/PDB/include/CGAL/PDB/Heterogen.h
+++ b/PDB/include/CGAL/PDB/Heterogen.h
@@ -161,8 +161,8 @@ inline int index_atoms(const Heterogen &m, int start=0) {
 }
 
 
-CGAL_SWAP(Heterogen);
-CGAL_OUTPUT(Heterogen);
+CGAL_SWAP(Heterogen)
+CGAL_OUTPUT(Heterogen)
 
 }}
 #endif
diff --git a/PDB/include/CGAL/PDB/Model.h b/PDB/include/CGAL/PDB/Model.h
index 85de3dc81f9..a100a89793e 100644
--- a/PDB/include/CGAL/PDB/Model.h
+++ b/PDB/include/CGAL/PDB/Model.h
@@ -308,9 +308,9 @@ private:
   HeterogensMap heterogens_;
 };
 
-CGAL_SWAP(Model);
+CGAL_SWAP(Model)
 
-CGAL_OUTPUT(Model);
+CGAL_OUTPUT(Model)
 
 //! Assign unique indices to all atoms in the Model, starting at optional start value
 /*!
diff --git a/PDB/include/CGAL/PDB/Monomer.h b/PDB/include/CGAL/PDB/Monomer.h
index 34b0b93ae1c..744eb0f48c2 100644
--- a/PDB/include/CGAL/PDB/Monomer.h
+++ b/PDB/include/CGAL/PDB/Monomer.h
@@ -296,8 +296,8 @@ inline int index_atoms(const Monomer &m, int start=0) {
 }
 
 
-CGAL_SWAP(Monomer);
-CGAL_OUTPUT(Monomer);
+CGAL_SWAP(Monomer)
+CGAL_OUTPUT(Monomer)
 
 }}
 #endif
diff --git a/PDB/include/CGAL/PDB/PDB.h b/PDB/include/CGAL/PDB/PDB.h
index 3621ca503d1..09c8ab5e7ea 100644
--- a/PDB/include/CGAL/PDB/PDB.h
+++ b/PDB/include/CGAL/PDB/PDB.h
@@ -185,9 +185,9 @@ inline int index_atoms(const PDB &c, int start=0) {
   return start;
 }
 
-CGAL_OUTPUT(PDB);
+CGAL_OUTPUT(PDB)
 
-CGAL_SWAP(PDB);
+CGAL_SWAP(PDB)
 
 }}
 #endif
diff --git a/PDB/include/CGAL/PDB/internal/dummies.h b/PDB/include/CGAL/PDB/internal/dummies.h
index 411860f2976..82971bd70f3 100644
--- a/PDB/include/CGAL/PDB/internal/dummies.h
+++ b/PDB/include/CGAL/PDB/internal/dummies.h
@@ -9,7 +9,7 @@ namespace internal {
   extern Monomer dummy_residue;
   extern Atom dummy_atom;
 
-};
+}
 }}
 
 #endif
diff --git a/PDB/include/CGAL/PDB/small_map.h b/PDB/include/CGAL/PDB/small_map.h
index b8e7699e3f4..75f666defdd 100644
--- a/PDB/include/CGAL/PDB/small_map.h
+++ b/PDB/include/CGAL/PDB/small_map.h
@@ -277,5 +277,6 @@ namespace std{
     return k > vk.key();
     }*/
 
-};
+}
+
 #endif
diff --git a/Qt_widget/include/CGAL/IO/Qt_widget.h b/Qt_widget/include/CGAL/IO/Qt_widget.h
index a158e853310..e559094758a 100644
--- a/Qt_widget/include/CGAL/IO/Qt_widget.h
+++ b/Qt_widget/include/CGAL/IO/Qt_widget.h
@@ -282,7 +282,7 @@ inline
 Qt_widget& operator<<(Qt_widget& w, Qt_widget& (*m)(Qt_widget&))
 {
   return m(w);
-};
+}
 
 // w << noFill << ... stop the filling of geometrical object
 inline
@@ -348,7 +348,7 @@ inline
 QColor Qt_widget::color() const
 {
   return painter->pen().color();
-};
+}
 
 
 inline
diff --git a/Qt_widget/include/CGAL/IO/Qt_widget_standard_toolbar.h b/Qt_widget/include/CGAL/IO/Qt_widget_standard_toolbar.h
index 948cf53eaa1..5aa6d12c710 100644
--- a/Qt_widget/include/CGAL/IO/Qt_widget_standard_toolbar.h
+++ b/Qt_widget/include/CGAL/IO/Qt_widget_standard_toolbar.h
@@ -74,6 +74,6 @@ private:
   QToolButton* nolayerBt;
 };//end class
 
-};//end namespace
+} //end namespace
 
 #endif //CGAL_QT_WIDGET_STANDARD_TOOLBAR_H
diff --git a/Qt_widget/src/CGALQt/Qt_widget.cpp b/Qt_widget/src/CGALQt/Qt_widget.cpp
index 24f3360c73b..be9750bddde 100644
--- a/Qt_widget/src/CGALQt/Qt_widget.cpp
+++ b/Qt_widget/src/CGALQt/Qt_widget.cpp
@@ -558,7 +558,7 @@ void Qt_widget::clear() {
         emit(redraw_on_front());
       unlock();
     }
-  };
+  }
   
   void Qt_widget::detach(Qt_widget_layer* s)
   {
diff --git a/Qt_widget/src/CGALQt/Qt_widget_history.cpp b/Qt_widget/src/CGALQt/Qt_widget_history.cpp
index 550c4383a45..e2dc1f771e2 100644
--- a/Qt_widget/src/CGALQt/Qt_widget_history.cpp
+++ b/Qt_widget/src/CGALQt/Qt_widget_history.cpp
@@ -42,7 +42,7 @@ Qt_widget_history::Qt_widget_history(Qt_widget* parent, const char* name):
 	  this, SLOT(save()));
   connect(parent, SIGNAL(internal_clear_history()),
 	  this, SLOT(clear()));
-};
+}
 
 void Qt_widget_history::backward()
 {
@@ -90,6 +90,6 @@ void Qt_widget_history::save()
   emit forwardAvaillable(false);
 }
 
-}; // end namespace
+} // end namespace
 #include "Qt_widget_history.moc"
 
diff --git a/Qt_widget/src/CGALQt/Qt_widget_standard_toolbar.cpp b/Qt_widget/src/CGALQt/Qt_widget_standard_toolbar.cpp
index 1848f0c1239..b2b29e13eec 100644
--- a/Qt_widget/src/CGALQt/Qt_widget_standard_toolbar.cpp
+++ b/Qt_widget/src/CGALQt/Qt_widget_standard_toolbar.cpp
@@ -57,7 +57,7 @@ namespace CGAL {
   {
     setLabel("Qt_widget standard toolbar");
     fill_toolbar(parent);
-  };
+  }
   
   Qt_widget_standard_toolbar::
   Qt_widget_standard_toolbar(Qt_widget *w, QMainWindow *mw,
@@ -68,7 +68,7 @@ namespace CGAL {
     widget(w)
   {
     fill_toolbar(mw);
-  };
+  }
   
   void Qt_widget_standard_toolbar::fill_toolbar(QMainWindow *mw)
   {
@@ -206,7 +206,7 @@ namespace CGAL {
     connect(history, SIGNAL(forwardAvaillable(bool)),
             forwardBt, SLOT(setEnabled(bool)));
     history->clear();
-  };
+  }
 
   void Qt_widget_standard_toolbar::group_clicked(int i)
   {
diff --git a/STL_Extension/include/CGAL/type_traits.h b/STL_Extension/include/CGAL/type_traits.h
index 1d13658109a..fe3ba2afea7 100644
--- a/STL_Extension/include/CGAL/type_traits.h
+++ b/STL_Extension/include/CGAL/type_traits.h
@@ -34,6 +34,6 @@ struct is_same_or_derived :
   >::type
 {};
 
-};
+}
 
 #endif