diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_2.C
index d70ceecdd65..917117722e6 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_2.C
@@ -20,6 +20,12 @@
 //
 // ============================================================================
 
+#ifndef CGAL_CARTESIAN_AFF_TRANSFORMATION_2_C
+#define CGAL_CARTESIAN_AFF_TRANSFORMATION_2_C
+
+#include <CGAL/determinant.h>
+#include <CGAL/Cartesian/Aff_transformation_rep_2.C>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -28,12 +34,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_AFF_TRANSFORMATION_2_C
-#define CGAL_CARTESIAN_AFF_TRANSFORMATION_2_C
-
-#include <CGAL/determinant.h>
-#include <CGAL/Cartesian/Aff_transformation_rep_2.C>
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_rep_2.h b/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_rep_2.h
index 25eb2463fbc..cc586ce07c8 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_rep_2.h
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Aff_transformation_rep_2.h
@@ -71,7 +71,6 @@ public:
   virtual std::ostream         &print(std::ostream &os) const = 0;
 };
 
-
 template < class R >
 class Aff_transformation_repC2
   : public Aff_transformation_rep_baseC2<R>
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Circle_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Circle_2.C
index f981a73acd4..1718cdd13ae 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Circle_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Circle_2.C
@@ -20,6 +20,14 @@
 //
 // ============================================================================
 
+#ifndef CGAL_CARTESIAN_CIRCLE_2_C
+#define CGAL_CARTESIAN_CIRCLE_2_C
+
+#include <CGAL/Cartesian/constructions_on_points_2.h>
+#include <CGAL/Cartesian/constructions_on_circles_2.h>
+#include <CGAL/Cartesian/distance_computations_2.h>
+#include <CGAL/Cartesian/predicates_on_points_2.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -28,14 +36,6 @@
 #define typename
 #endif
 
-#include <CGAL/Cartesian/constructions_on_points_2.h>
-#include <CGAL/Cartesian/constructions_on_circles_2.h>
-#include <CGAL/Cartesian/distance_computations_2.h>
-#include <CGAL/Cartesian/predicates_on_points_2.h>
-
-#ifndef CGAL_CARTESIAN_CIRCLE_2_C
-#define CGAL_CARTESIAN_CIRCLE_2_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Circle_rep_2.h b/Old_Packages/C2/include/CGAL/Cartesian/Circle_rep_2.h
index fa243f909db..3f286001251 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Circle_rep_2.h
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Circle_rep_2.h
@@ -51,5 +51,4 @@ public:
 
 CGAL_END_NAMESPACE
 
-#endif  // CGAL_CARTESIAN_CIRCLE_REP_2_H
-
+#endif // CGAL_CARTESIAN_CIRCLE_REP_2_H
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C
index f91e651474e..8287d08ad68 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C
@@ -20,6 +20,9 @@
 //
 // ============================================================================
 
+#ifndef CGAL_CARTESIAN_DIRECTION_2_C
+#define CGAL_CARTESIAN_DIRECTION_2_C
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -28,9 +31,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_DIRECTION_2_C
-#define CGAL_CARTESIAN_DIRECTION_2_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Iso_rectangle_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Iso_rectangle_2.C
index 81c301b60cb..99a46842dd0 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Iso_rectangle_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Iso_rectangle_2.C
@@ -20,6 +20,9 @@
 //
 // ============================================================================
 
+#ifndef CGAL_CARTESIAN_ISO_RECTANGLE_2_C
+#define CGAL_CARTESIAN_ISO_RECTANGLE_2_C
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -28,9 +31,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_ISO_RECTANGLE_2_C
-#define CGAL_CARTESIAN_ISO_RECTANGLE_2_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Line_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Line_2.C
index cc63bd9a26c..47bb230bfaa 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Line_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Line_2.C
@@ -20,6 +20,12 @@
 //
 // ============================================================================
 
+#ifndef CGAL_CARTESIAN_LINE_2_C
+#define CGAL_CARTESIAN_LINE_2_C
+
+#include <CGAL/Cartesian/constructions_on_lines_2.h>
+#include <CGAL/Cartesian/predicates_on_lines_2.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -28,12 +34,6 @@
 #define typename
 #endif
 
-#include <CGAL/Cartesian/constructions_on_lines_2.h>
-#include <CGAL/Cartesian/predicates_on_lines_2.h>
-
-#ifndef CGAL_CARTESIAN_LINE_2_C
-#define CGAL_CARTESIAN_LINE_2_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Point_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Point_2.C
index 6b8b9c5326a..184454c4df4 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Point_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Point_2.C
@@ -23,6 +23,10 @@
 #ifndef CGAL_CARTESIAN_POINT_2_C
 #define CGAL_CARTESIAN_POINT_2_C
 
+#include <CGAL/Origin.h>
+#include <CGAL/Bbox_2.h>
+#include <CGAL/number_utils.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -31,10 +35,6 @@
 #define typename
 #endif
 
-#include <CGAL/Origin.h>
-#include <CGAL/Bbox_2.h>
-#include <CGAL/number_utils.h>
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C
index c69dc1dcb13..404eeb568ef 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C
@@ -20,6 +20,9 @@
 //
 // ============================================================================
 
+#ifndef CGAL_CARTESIAN_RAY_2_C
+#define CGAL_CARTESIAN_RAY_2_C
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -28,9 +31,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_RAY_2_C
-#define CGAL_CARTESIAN_RAY_2_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Segment_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Segment_2.C
index f9396a863fc..d14e6f673c1 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Segment_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Segment_2.C
@@ -20,6 +20,9 @@
 //
 // ============================================================================
 
+#ifndef CGAL_CARTESIAN_SEGMENT_2_C
+#define CGAL_CARTESIAN_SEGMENT_2_C
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -28,9 +31,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_SEGMENT_2_C
-#define CGAL_CARTESIAN_SEGMENT_2_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Triangle_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Triangle_2.C
index 050b3938202..fa42bb6b339 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Triangle_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Triangle_2.C
@@ -20,6 +20,11 @@
 //
 // ============================================================================
 
+#ifndef CGAL_CARTESIAN_TRIANGLE_2_C
+#define CGAL_CARTESIAN_TRIANGLE_2_C
+
+#include <CGAL/Cartesian/predicates_on_points_2.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -28,11 +33,6 @@
 #define typename
 #endif
 
-#include <CGAL/Cartesian/predicates_on_points_2.h>
-
-#ifndef CGAL_CARTESIAN_TRIANGLE_2_C
-#define CGAL_CARTESIAN_TRIANGLE_2_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Vector_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Vector_2.C
index 840f7f70211..dbf64faef44 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Vector_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Vector_2.C
@@ -20,6 +20,11 @@
 //
 // ============================================================================
 
+#ifndef CGAL_CARTESIAN_VECTOR_2_C
+#define CGAL_CARTESIAN_VECTOR_2_C
+
+#include <CGAL/Cartesian/Direction_2.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_2_H
 #define CGAL_CTAG
 #endif
@@ -28,11 +33,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_VECTOR_2_C
-#define CGAL_CARTESIAN_VECTOR_2_C
-
-#include <CGAL/Cartesian/Direction_2.h>
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Aff_transformation_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Aff_transformation_3.C
index f48bf7e369f..ef182343956 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Aff_transformation_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Aff_transformation_3.C
@@ -20,6 +20,12 @@
 //
 // ==========================================================================
 
+#ifndef CGAL_CARTESIAN_AFF_TRANSFORMATION_3_C
+#define CGAL_CARTESIAN_AFF_TRANSFORMATION_3_C
+
+#include <CGAL/Cartesian/Aff_transformation_rep_3.C>
+#include <CGAL/determinant.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,12 +34,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_AFF_TRANSFORMATION_3_C
-#define CGAL_CARTESIAN_AFF_TRANSFORMATION_3_C
-
-#include <CGAL/Cartesian/Aff_transformation_rep_3.C>
-#include <CGAL/determinant.h>
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Aff_transformation_rep_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Aff_transformation_rep_3.C
index 75f125f17b9..c781a30963e 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Aff_transformation_rep_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Aff_transformation_rep_3.C
@@ -20,6 +20,9 @@
 //
 // ==========================================================================
 
+#ifndef CGAL_CARTESIAN_AFF_TRANSFORMATION_REP_3_C
+#define CGAL_CARTESIAN_AFF_TRANSFORMATION_REP_3_C
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,9 +31,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_AFF_TRANSFORMATION_REP_3_C
-#define CGAL_CARTESIAN_AFF_TRANSFORMATION_REP_3_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Direction_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Direction_3.C
index af74ea55c01..50fc677340c 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Direction_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Direction_3.C
@@ -20,6 +20,9 @@
 //
 // ======================================================================
 
+#ifndef CGAL_CARTESIAN_DIRECTION_3_C
+#define CGAL_CARTESIAN_DIRECTION_3_C
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,9 +31,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_DIRECTION_3_C
-#define CGAL_CARTESIAN_DIRECTION_3_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
@@ -51,12 +51,14 @@ DirectionC3()
 template < class R >
 DirectionC3<R CGAL_CTAG>::
 DirectionC3(const DirectionC3<R CGAL_CTAG> &d)
-  : Handle(d) {}
+  : Handle(d)
+{}
 
 template < class R >
 DirectionC3<R CGAL_CTAG>::
 DirectionC3(const typename DirectionC3<R CGAL_CTAG>::Vector_3 &v)
-  : Handle(v) {}
+  : Handle(v)
+{}
 
 template < class R >
 DirectionC3<R CGAL_CTAG>::
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Line_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Line_3.C
index 54ce0d3ab30..5eb283f0dd4 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Line_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Line_3.C
@@ -20,14 +20,6 @@
 //
 // ==========================================================================
 
-#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
-#define CGAL_CTAG
-#endif
-
-#ifdef CGAL_CFG_TYPENAME_BUG
-#define typename
-#endif
-
 #ifndef CGAL_CARTESIAN_LINE_3_C
 #define CGAL_CARTESIAN_LINE_3_C
 
@@ -36,6 +28,14 @@
 #include <CGAL/Cartesian/Plane_3.h>
 #include <CGAL/Cartesian/constructions_on_lines_3.h>
 
+#ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
+#define CGAL_CTAG
+#endif
+
+#ifdef CGAL_CFG_TYPENAME_BUG
+#define typename
+#endif
+
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Plane_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Plane_3.C
index 8c819c368a4..4a3c710dd42 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Plane_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Plane_3.C
@@ -20,6 +20,13 @@
 //
 // ======================================================================
 
+#ifndef CGAL_CARTESIAN_PLANE_3_C
+#define CGAL_CARTESIAN_PLANE_3_C
+
+#include <CGAL/Cartesian/constructions_on_planes_3.h>
+#include <CGAL/Cartesian/distance_computations_3.h>
+#include <CGAL/Cartesian/predicates_on_planes_3.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,13 +35,6 @@
 #define typename
 #endif
 
-#include <CGAL/Cartesian/constructions_on_planes_3.h>
-#include <CGAL/Cartesian/distance_computations_3.h>
-#include <CGAL/Cartesian/predicates_on_planes_3.h>
-
-#ifndef CGAL_CARTESIAN_PLANE_3_C
-#define CGAL_CARTESIAN_PLANE_3_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Point_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Point_3.C
index d865a01b400..a692f1eaddd 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Point_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Point_3.C
@@ -20,6 +20,13 @@
 //
 // ======================================================================
 
+#ifndef CGAL_CARTESIAN_POINT_3_C
+#define CGAL_CARTESIAN_POINT_3_C
+
+#include <CGAL/Origin.h>
+#include <CGAL/Bbox_3.h>
+#include <CGAL/number_utils.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,13 +35,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_POINT_3_C
-#define CGAL_CARTESIAN_POINT_3_C
-
-#include <CGAL/Origin.h>
-#include <CGAL/Bbox_3.h>
-#include <CGAL/number_utils.h>
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Ray_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Ray_3.C
index 1aaf9c1fab9..6c43e276252 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Ray_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Ray_3.C
@@ -20,6 +20,11 @@
 //
 // ==========================================================================
 
+#ifndef CGAL_CARTESIAN_RAY_3_C
+#define CGAL_CARTESIAN_RAY_3_C
+
+#include <CGAL/Cartesian/distance_computations_3.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,11 +33,6 @@
 #define typename
 #endif
 
-#include <CGAL/Cartesian/distance_computations_3.h>
-
-#ifndef CGAL_CARTESIAN_RAY_3_C
-#define CGAL_CARTESIAN_RAY_3_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Scaling_rep_3.h b/Old_Packages/C3/include/CGAL/Cartesian/Scaling_rep_3.h
index 3acf1b10023..ad97a84e2fc 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Scaling_rep_3.h
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Scaling_rep_3.h
@@ -20,6 +20,11 @@
 //
 // ==========================================================================
 
+#ifndef CGAL_CARTESIAN_SCALING_REP_3_H
+#define CGAL_CARTESIAN_SCALING_REP_3_H
+
+#include <CGAL/Cartesian/redefine_names_3.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,11 +33,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_SCALING_REP_3_H
-#define CGAL_CARTESIAN_SCALING_REP_3_H
-
-#include <CGAL/Cartesian/redefine_names_3.h>
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
@@ -158,4 +158,8 @@ private:
 
 CGAL_END_NAMESPACE
 
+#ifdef CGAL_CFG_TYPENAME_BUG
+#undef typename
+#endif
+
 #endif // CGAL_CARTESIAN_SCALING_REP_3_H
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Segment_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Segment_3.C
index 47bcbf4d77a..bde9d1f1aca 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Segment_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Segment_3.C
@@ -20,6 +20,11 @@
 //
 // ======================================================================
 
+#ifndef CGAL_CARTESIAN_SEGMENT_3_C
+#define CGAL_CARTESIAN_SEGMENT_3_C
+
+#include <CGAL/Cartesian/distance_computations_3.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,11 +33,6 @@
 #define typename
 #endif
 
-#include <CGAL/Cartesian/distance_computations_3.h>
-
-#ifndef CGAL_CARTESIAN_SEGMENT_3_C
-#define CGAL_CARTESIAN_SEGMENT_3_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Sphere_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Sphere_3.C
index 171cd226af4..c64d7401666 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Sphere_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Sphere_3.C
@@ -20,6 +20,9 @@
 //
 // ==========================================================================
 
+#ifndef CGAL_CARTESIAN_SPHERE_3_C
+#define CGAL_CARTESIAN_SPHERE_3_C
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,9 +31,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_SPHERE_3_C
-#define CGAL_CARTESIAN_SPHERE_3_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Tetrahedron_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Tetrahedron_3.C
index 570b3d09aee..04c5e852303 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Tetrahedron_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Tetrahedron_3.C
@@ -20,6 +20,13 @@
 //
 // ==========================================================================
 
+#ifndef CGAL_CARTESIAN_TETRAHEDRON_3_C
+#define CGAL_CARTESIAN_TETRAHEDRON_3_C
+
+#include <CGAL/Cartesian/solve_3.h>
+#include <vector>
+#include <functional>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,13 +35,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_TETRAHEDRON_3_C
-#define CGAL_CARTESIAN_TETRAHEDRON_3_C
-
-#include <CGAL/Cartesian/solve_3.h>
-#include <vector>
-#include <functional>
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Triangle_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Triangle_3.C
index 0a2d8046a99..c8ba4ba05c0 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Triangle_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Triangle_3.C
@@ -20,6 +20,9 @@
 //
 // ==========================================================================
 
+#ifndef CGAL_CARTESIAN_TRIANGLE_3_C
+#define CGAL_CARTESIAN_TRIANGLE_3_C
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,9 +31,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_TRIANGLE_3_C
-#define CGAL_CARTESIAN_TRIANGLE_3_C
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >
diff --git a/Old_Packages/C3/include/CGAL/Cartesian/Vector_3.C b/Old_Packages/C3/include/CGAL/Cartesian/Vector_3.C
index d606e613f57..7154e4d623e 100644
--- a/Old_Packages/C3/include/CGAL/Cartesian/Vector_3.C
+++ b/Old_Packages/C3/include/CGAL/Cartesian/Vector_3.C
@@ -20,6 +20,11 @@
 //
 // ======================================================================
 
+#ifndef CGAL_CARTESIAN_VECTOR_3_C
+#define CGAL_CARTESIAN_VECTOR_3_C
+
+#include <CGAL/Cartesian/Direction_3.h>
+
 #ifndef CGAL_CARTESIAN_REDEFINE_NAMES_3_H
 #define CGAL_CTAG
 #endif
@@ -28,11 +33,6 @@
 #define typename
 #endif
 
-#ifndef CGAL_CARTESIAN_VECTOR_3_C
-#define CGAL_CARTESIAN_VECTOR_3_C
-
-#include <CGAL/Cartesian/Direction_3.h>
-
 CGAL_BEGIN_NAMESPACE
 
 template < class R >