diff --git a/Algebraic_foundations/include/CGAL/Coercion_traits.h b/Algebraic_foundations/include/CGAL/Coercion_traits.h
index 563a54fdc73..a887ee60031 100644
--- a/Algebraic_foundations/include/CGAL/Coercion_traits.h
+++ b/Algebraic_foundations/include/CGAL/Coercion_traits.h
@@ -157,32 +157,32 @@ template<class A , class B, int > struct Coercion_traits_for_level;
     
 
 
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,int);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long long);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,float);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,double);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long double);
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,int)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long long)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,float)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,double)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short,long double)
         
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long long);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,float);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,double);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long double);
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long long)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,float)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,double)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int,long double)
 
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,long long);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,float);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,double);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,long double);
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,long long)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,float)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,double)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long,long double)
 
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,float);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,double);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,long double);
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,float)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,double)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long,long double)
 
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float,double);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float,long double);
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float,double)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float,long double)
       
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(double,long double);
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(double,long double)
 
 //! Specialization for equal types.
 template <class A>    
@@ -198,13 +198,13 @@ struct Coercion_traits<A,A>{
     };
 };
     
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(short);
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(int);   
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long);
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long long);
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(float);
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(double);
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long double);
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(short)
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(int)  
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long)
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long long)
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(float)
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(double)
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(long double)
 
 enum COERCION_TRAITS_LEVEL {
     CTL_TOP          = 4,
diff --git a/Number_types/include/CGAL/Lazy_exact_nt.h b/Number_types/include/CGAL/Lazy_exact_nt.h
index bd244322e45..a280bcd41a6 100644
--- a/Number_types/include/CGAL/Lazy_exact_nt.h
+++ b/Number_types/include/CGAL/Lazy_exact_nt.h
@@ -1143,7 +1143,7 @@ public:
 };
 
 
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF_TEM(Lazy_exact_nt<ET>, class ET);
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF_TEM(Lazy_exact_nt<ET>, class ET)
 
 template<class ET1, class ET2 >
 struct Coercion_traits< Lazy_exact_nt<ET1>, Lazy_exact_nt<ET2> >
diff --git a/Number_types/include/CGAL/MP_Float.h b/Number_types/include/CGAL/MP_Float.h
index 470e6b2ac5e..cae0f58ac20 100644
--- a/Number_types/include/CGAL/MP_Float.h
+++ b/Number_types/include/CGAL/MP_Float.h
@@ -807,8 +807,8 @@ public:
 // };
 
 // Coercion_traits
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(MP_Float);
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int, MP_Float);
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF(MP_Float)
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int, MP_Float)
 
 
 CGAL_END_NAMESPACE
diff --git a/Number_types/include/CGAL/Quotient.h b/Number_types/include/CGAL/Quotient.h
index e381004d347..ffc2be3fcb2 100644
--- a/Number_types/include/CGAL/Quotient.h
+++ b/Number_types/include/CGAL/Quotient.h
@@ -710,7 +710,7 @@ Quotient<NT> >{};
 
 
 // self coercion
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF_TEM( Quotient<NT>, class NT);
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF_TEM( Quotient<NT>, class NT)
 
 // from int to Quotient
 template <class NT>
@@ -755,7 +755,7 @@ Quotient<NT> >
 {};
 
 // from NT to Quotient
-CGAL_DEFINE_COERCION_TRAITS_FROM_TO_TEM ( NT, Quotient<NT>, class NT);
+CGAL_DEFINE_COERCION_TRAITS_FROM_TO_TEM ( NT, Quotient<NT>, class NT)
 
 /*! \ingroup NiX_Fraction_traits_spec
  *  \brief Specialization of Fraction_traits for Quotient<NT>
diff --git a/Number_types/include/CGAL/Root_of_2.h b/Number_types/include/CGAL/Root_of_2.h
index 260edcb6d0a..cd40f98633f 100644
--- a/Number_types/include/CGAL/Root_of_2.h
+++ b/Number_types/include/CGAL/Root_of_2.h
@@ -310,7 +310,7 @@ public:
 
 // COERCION_TRAITS BEGIN
 
-CGAL_DEFINE_COERCION_TRAITS_FOR_SELF_TEM(Root_of_2<RT>,class RT);
+CGAL_DEFINE_COERCION_TRAITS_FOR_SELF_TEM(Root_of_2<RT>,class RT)
 
 template <class RT>
 struct Coercion_traits< RT , Root_of_2<RT> >{
diff --git a/Number_types/include/CGAL/leda_coercion_traits.h b/Number_types/include/CGAL/leda_coercion_traits.h
index 8da6beb038f..4dd722d677b 100644
--- a/Number_types/include/CGAL/leda_coercion_traits.h
+++ b/Number_types/include/CGAL/leda_coercion_traits.h
@@ -49,43 +49,43 @@ CGAL_BEGIN_NAMESPACE
 
 //LEDA internal coercions:
 
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::integer,::leda::bigfloat);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::integer,::leda::rational);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::integer,::leda::real);
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::integer,::leda::bigfloat)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::integer,::leda::rational)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::integer,::leda::real)
 
 // CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::bigfloat,::leda::rational); see below
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::bigfloat,::leda::real);
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::bigfloat,::leda::real)
 
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::rational,::leda::real);
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(::leda::rational,::leda::real)
 
 // The following definitions reflect the interaction of the LEDA number types
 // with the built in types,
 // leda integer:
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short    ,::leda::integer);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int      ,::leda::integer);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long     ,::leda::integer);
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short    ,::leda::integer)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int      ,::leda::integer)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long     ,::leda::integer)
 
 // leda rational:
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short      ,::leda::rational);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int        ,::leda::rational);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long       ,::leda::rational);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long  ,::leda::rational);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float      ,::leda::rational);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(double     ,::leda::rational);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long double,::leda::rational);
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short      ,::leda::rational)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int        ,::leda::rational)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long       ,::leda::rational)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long long  ,::leda::rational)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float      ,::leda::rational)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(double     ,::leda::rational)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long double,::leda::rational)
 
 // leda bigfloat:      :
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short      ,::leda::bigfloat);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int        ,::leda::bigfloat);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long       ,::leda::bigfloat);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float      ,::leda::bigfloat);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(double     ,::leda::bigfloat);
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short      ,::leda::bigfloat)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int        ,::leda::bigfloat)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(long       ,::leda::bigfloat)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float      ,::leda::bigfloat)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(double     ,::leda::bigfloat)
 
 // leda real:
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short      ,::leda::real);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int        ,::leda::real);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float      ,::leda::real);
-    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(double     ,::leda::real);
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(short      ,::leda::real)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(int        ,::leda::real)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(float      ,::leda::real)
+    CGAL_DEFINE_COERCION_TRAITS_FROM_TO(double     ,::leda::real)
 
 //not provided by LEDA
 //Note that this is not symmetric to CORE