diff --git a/Modular_arithmetic/include/CGAL/Modular_traits.h b/Modular_arithmetic/include/CGAL/Modular_traits.h
index 290fc60ec3e..84e254bae48 100644
--- a/Modular_arithmetic/include/CGAL/Modular_traits.h
+++ b/Modular_arithmetic/include/CGAL/Modular_traits.h
@@ -22,11 +22,13 @@
 
 #include <CGAL/basic.h>
 #include <CGAL/Residue.h>
+#include <CGAL/Modular_arithmetic/Residue_type.h>
 #include <vector>
 
 
 namespace CGAL { 
 
+
 /*! \ingroup CGAL_Modular_traits_spec 
     \brief A model of concept ModularTraits. 
     
@@ -53,58 +55,6 @@ modular_image(const NT& x){
     return modular_image(x);
 }
 
-
-// The MODULAR_TRAITS specializations for some builtin types
-// =========================================================================
-
-/*! \ingroup CGAL_Modular_traits_spec
-  \brief Specialization of CGAL::Modular_traits for \c int.
-  
-  A model of concept ModularTraits, supports \c int. 
-*/
-template<>
-class Modular_traits<int>{
-public: 
-    typedef int NT;
-    typedef ::CGAL::Tag_true Is_modularizable;
-    typedef Residue Residue_type;
- 
-    struct Modular_image{
-        Residue_type operator()(int i){
-            return Residue_type(i);
-        }
-    };    
-    struct Modular_image_representative{
-        NT operator()(const Residue_type& x){
-            return x.get_value();
-        }
-    };    
-};
-
-/*! \ingroup CGAL_Modular_traits_spec
-  \brief Specialization of CGAL::Modular_traits for \c long.
-  
-  A model of concept ModularTraits, supports \c long. 
-*/
-template<>
-class Modular_traits<long>{
-public: 
-    typedef long NT;
-    typedef ::CGAL::Tag_true Is_modularizable;
-    typedef Residue Residue_type;
- 
-    struct Modular_image{
-        Residue_type operator()(long i){
-            return Residue_type(i);
-        }
-    };   
-    struct Modular_image_representative{
-        NT operator()(const Residue_type& x){
-            return NT(x.get_value());
-        }
-    };    
-};
-
 }///namespace CGAL
 #endif //#ifnedef CGAL_MODULAR_TRAITS_H 1
  
diff --git a/Modular_arithmetic/include/CGAL/Residue.h b/Modular_arithmetic/include/CGAL/Residue.h
index 9e37cc2f93b..b54ca48abf4 100644
--- a/Modular_arithmetic/include/CGAL/Residue.h
+++ b/Modular_arithmetic/include/CGAL/Residue.h
@@ -28,8 +28,8 @@
 #define CGAL_RESIDUE_H 1
 
 #include <CGAL/basic.h>
-#include <CGAL/Coercion_traits.h>
 #include <CGAL/Modular_arithmetic/Residue_type.h>
+#include <CGAL/Coercion_traits.h>
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Modular_arithmetic/test/Modular_arithmetic/Modular_traits.cpp b/Modular_arithmetic/test/Modular_arithmetic/Modular_traits.cpp
index 726892696e8..fced6ab084f 100644
--- a/Modular_arithmetic/test/Modular_arithmetic/Modular_traits.cpp
+++ b/Modular_arithmetic/test/Modular_arithmetic/Modular_traits.cpp
@@ -8,6 +8,7 @@
 
 #include <CGAL/basic.h>
 #include <cassert>
+#include <CGAL/Residue.h>
 #include <CGAL/Modular_traits.h>
 #include <CGAL/Sqrt_extension.h>
 #include <CGAL/Polynomial.h>