diff --git a/Arrangement_on_surface_2/dont_submit b/Arrangement_on_surface_2/dont_submit
index 0f4735f3625..fe3f975ccd9 100644
--- a/Arrangement_on_surface_2/dont_submit
+++ b/Arrangement_on_surface_2/dont_submit
@@ -5,3 +5,9 @@ include/CGAL/Arr_polycurve_traits_2.h
 include/CGAL/Arr_geometry_traits/Polycurve_2.h
 demo/Arr_algebraic_segment_traits_2
 include/CGAL/Arr_geometry_traits/One_root_number.h
+
+include/CGAL/Arr_extended_rational_arc_traits_d_1.h
+include/CGAL/Arr_hyperbolic_arc_traits_2.h
+include/CGAL/Arr_polycurve_traits_2.h
+include/CGAL/Arr_rational_arc_traits_2.h
+include/CGAL/Arr_triangulation_point_location.h
\ No newline at end of file
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_extended_rational_arc_traits_d_1.h b/Arrangement_on_surface_2/include/CGAL/Arr_extended_rational_arc_traits_d_1.h
index a37c0fa3bf9..4aff08c6fd9 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_extended_rational_arc_traits_d_1.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_extended_rational_arc_traits_d_1.h
@@ -23,6 +23,10 @@
 #ifndef CGAL_ARR_VERTICAL_SEGMENT_TRAITS
 #define CGAL_ARR_VERTICAL_SEGMENT_TRAITS
 
+#include <CGAL/config.h>
+
+#ifdef CGAL_DONT_SUBMIT
+
 #include <CGAL/tags.h>
 #include <CGAL/Arr_tags.h>
 #include <CGAL/assertions.h>
@@ -1788,5 +1792,7 @@ public:
 
 } //namespace CGAL {
 
+#endif // CGAL_DONT_SUBMIT
 
 #endif  //CGAL_ARR_RATIONAL_ARC_TRAITS_D_1_H
+
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_hyperbolic_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_hyperbolic_arc_traits_2.h
index a1f3e1da6ff..72bb6f2b9c0 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_hyperbolic_arc_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_hyperbolic_arc_traits_2.h
@@ -18,9 +18,14 @@
 //
 // Author(s)     : Ron Wein          <wein@post.tau.ac.il>
 
+
+
 #ifndef CGAL_ARR_HYPERBOLIC_ARC_TRAITS_2_H
 #define CGAL_ARR_HYPERBOLIC_ARC_TRAITS_2_H
 
+#include <CGAL/config.h>
+#ifdef CGAL_DONT_SUBMIT
+
 /*! \file
  * The header file for the Arr_hyperbolic_arc_traits_2<Kenrel> class.
  */
@@ -412,4 +417,7 @@ public:
 
 } //namespace CGAL
 
+#endif // CGAL_DONT_SUBMIT
+
 #endif
+
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h
index 8697b2e62db..5ed78db86d0 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_polycurve_traits_2.h
@@ -27,6 +27,10 @@
  * arrangement package.
  */
 
+#include <CGAL/config.h>
+
+#ifdef CGAL_DONT_SUBMIT
+
 #include <CGAL/basic.h>
 #include <CGAL/tags.h>
 #include <CGAL/Arr_tags.h>
@@ -1131,4 +1135,6 @@ private:
 
 } //namespace CGAL
 
+#endif // CGAL_DONT_SUBMIT
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Rational_arc_d_1.h b/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Rational_arc_d_1.h
index 29e94a6e756..b0409c5e60e 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Rational_arc_d_1.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_rat_arc/Rational_arc_d_1.h
@@ -18,7 +18,6 @@
 // Author(s)     : Oren Salzman <orenzalz@post.tau.ac.il >
 //                 Michael Hemmer <Michael.Hemmer@sophia.inria.fr>
 
-#if 0
 
 #ifndef CGAL_RATIONAL_ARC_D_1_H
 #define CGAL_RATIONAL_ARC_D_1_H
@@ -437,15 +436,15 @@ public:
 
     _init(_numer,_denom,cache);
   }
-  void _init(const Polynomial_1& _P, const Polynomial_1& _Q, const Cache& cache) 
+  void _init(const Polynomial_1& P_, const Polynomial_1& Q_, const Cache& cache) 
   {
-    CGAL_precondition(!CGAL::is_zero(_Q));
+    CGAL_precondition(!CGAL::is_zero(Q_));
     //set rational function 
     // Set the numerator & denominator polynomials.
 
     Polynomial_1 P;
     Polynomial_1 Q;
-    _canonicalize(_P, _Q, P, Q);
+    _canonicalize(P_, Q_, P, Q);
                      
     _f = get_rational_function(P, Q, cache);
 
@@ -521,15 +520,15 @@ public:
     _init(_numer,_denom, x_s, dir_right, cache);
   }
 
-  void _init(const Polynomial_1& _P, const Polynomial_1& _Q,
+  void _init(const Polynomial_1& P_, const Polynomial_1& Q_,
              const Algebraic_real_1& x_s, bool dir_right,
              const Cache& cache) 
   {
-    CGAL_precondition(!CGAL::is_zero(_Q));
+    CGAL_precondition(!CGAL::is_zero(Q_));
     //set rational function 
     Polynomial_1 P;
     Polynomial_1 Q;
-    _canonicalize(_P,_Q,P,Q);
+    _canonicalize(P_,Q_,P,Q);
     _f = get_rational_function(P, Q, cache);
 
     // Mark that the target points of the polynomial is unbounded.
@@ -626,15 +625,15 @@ public:
     _init(_numer,_denom,x_s,x_t,cache);
   }
 
-  void _init(const Polynomial_1& _P, const Polynomial_1& _Q,
+  void _init(const Polynomial_1& P_, const Polynomial_1& Q_,
              const Algebraic_real_1& x_s, const Algebraic_real_1& x_t,
              const Cache& cache)
   {
-    CGAL_precondition(!CGAL::is_zero(_Q));
+    CGAL_precondition(!CGAL::is_zero(Q_));
     //set rational function 
     Polynomial_1 P;
     Polynomial_1 Q;
-    _canonicalize(_P, _Q, P, Q);
+    _canonicalize(P_, Q_, P, Q);
     _f = get_rational_function(P, Q, cache);
 
     // Compare the x-coordinates and determine the direction.
@@ -2605,4 +2604,3 @@ public:
 
 #endif //CGAL_RATIONAL_ARC_D_1_H
 
-#endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_rational_arc_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_rational_arc_traits_2.h
index 0e78088c78a..8ea8cbc7549 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_rational_arc_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_rational_arc_traits_2.h
@@ -28,6 +28,9 @@
 /*! \file
  * Definition of the Arr_rational_arc_traits_2 class. 
  */
+#include <CGAL/config.h>
+
+#ifdef CGAL_DONT_SUBMIT
 
 #include <CGAL/tags.h>
 #include <CGAL/Arr_tags.h>
@@ -816,4 +819,6 @@ public:
 
 } //namespace CGAL
 
+#endif // CGAL_DONT_SUBMIT
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_rational_function_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_rational_function_traits_2.h
index 57634363af6..7f8a00d56b7 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_rational_function_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_rational_function_traits_2.h
@@ -1310,4 +1310,5 @@ public:
 
 }   //namespace CGAL {
 
+
 #endif  //CGAL_ARR_RATIONAL_ARC_TRAITS_D_1_H
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_tags.h b/Arrangement_on_surface_2/include/CGAL/Arr_tags.h
index 6cb7ab5536e..5c375bf5fbd 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_tags.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_tags.h
@@ -643,3 +643,4 @@ public:
 } // namespace CGAL
 
 #endif
+
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
index fdca29a510a..ed1c9adb848 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_tracing_traits_2.h
@@ -32,6 +32,7 @@
 
 #include <CGAL/basic.h>
 #include <CGAL/Arr_enums.h>
+#include <CGAL/Arr_tags.h>
 
 namespace CGAL {
 
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h b/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h
index c46e5406345..2b076bf9d7a 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_triangulation_point_location.h
@@ -21,14 +21,17 @@
 #ifndef CGAL_ARR_TRIANGULATION_POINT_LOCATION_H
 #define CGAL_ARR_TRIANGULATION_POINT_LOCATION_H
 
+#include <CGAL/config.h>
+#ifdef CGAL_DONT_SUBMIT
+
 /*! \file
  * Definition of the Arr_triangulation_point_location<Arrangement> template.
  */
+
 #include <CGAL/Arr_observer.h>
 #include <CGAL/Arrangement_2/Arr_traits_adaptor_2.h>
 #include <CGAL/Arr_point_location_result.h>
 
-#include <CGAL/Exact_predicates_inexact_constructions_kernel.h>
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
 #include <CGAL/Constrained_triangulation_2.h>
 #include <CGAL/Triangulation_face_base_2.h>
@@ -138,7 +141,7 @@ public:
    *         query point. This object is either a Face_const_handle or a
    *         Halfedge_const_handle or a Vertex_const_handle.
    */
-  Object locate(const Point_2& p) const;
+  result_type locate(const Point_2& p) const;
 
    //Observer functions that are relevant to overload
    //-------------------------------------------------
@@ -336,4 +339,6 @@ protected:
 // The member-function definitions can be found under:
 #include <CGAL/Arr_point_location/Arr_triangulation_pl_functions.h>
 
+#endif // CGAL_DONT_SUBMIT
+
 #endif
diff --git a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h
index ddf444e8ee9..e2409f787df 100644
--- a/Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h
+++ b/Arrangement_on_surface_2/include/CGAL/Sweep_line_2_algorithms.h
@@ -37,6 +37,7 @@
 #include <CGAL/Arr_rational_function_traits_2.h>
 #include <CGAL/Arr_circle_segment_traits_2.h>
 #include <CGAL/Arr_linear_traits_2.h>
+#include <CGAL/Arr_rat_arc/Rational_arc_d_1.h>
 
 namespace CGAL {