diff --git a/Old_Packages/Cartesian_basic/changes.txt b/Old_Packages/Cartesian_basic/changes.txt
index 43751930ee7..43b3c5b113b 100644
--- a/Old_Packages/Cartesian_basic/changes.txt
+++ b/Old_Packages/Cartesian_basic/changes.txt
@@ -1,3 +1,9 @@
+Version 3.3.2 (September 16 1999)
+- Added missing typename in Cartesian_dynamic_d
+- Added missing typedefs for RT and FT in Cartesian_dynamic_d
+- Added predicate and construction objects in Cartesian_3 (synchronized
+  with Homogeneous)
+
 Version 3.3.1 (September 9 1999)
 - Removed <CGAL/Kernel/function_objects.h> which bazooked H2 and H3
 
diff --git a/Old_Packages/Cartesian_basic/include/CGAL/Cartesian.h b/Old_Packages/Cartesian_basic/include/CGAL/Cartesian.h
index f997878a11f..d1146a54c26 100644
--- a/Old_Packages/Cartesian_basic/include/CGAL/Cartesian.h
+++ b/Old_Packages/Cartesian_basic/include/CGAL/Cartesian.h
@@ -227,167 +227,611 @@ typedef CGALi::Construct<Triangle_2>           Construct_triangle_2;
 typedef CGALi::Construct<Aff_transformation_2> Construct_aff_transformation_2;
 
 Construct_point_2 
-construct_point_2_object() const { return Construct_point_2(); }
+construct_point_2_object() const 
+{ return Construct_point_2(); }
+
 Construct_vector_2
-construct_vector_2_object() const { return Construct_vector_2(); }
+construct_vector_2_object() const 
+{ return Construct_vector_2(); }
+
 Construct_direction_2
-construct_direction_2_object() const { return Construct_direction_2(); }
+construct_direction_2_object() const 
+{ return Construct_direction_2(); }
+
 Construct_segment_2
-construct_segment_2_object() const { return Construct_segment_2(); }
+construct_segment_2_object() const 
+{ return Construct_segment_2(); }
+
 Construct_line_2
-construct_line_2_object() const { return Construct_line_2(); }
+construct_line_2_object() const 
+{ return Construct_line_2(); }
+
 Construct_ray_2
-construct_ray_2_object() const { return Construct_ray_2(); }
+construct_ray_2_object() const 
+{ return Construct_ray_2(); }
+
 Construct_circle_2
-construct_circle_2() const { return Construct_circle_2(); }
+construct_circle_2_object() const 
+{ return Construct_circle_2(); }
+
 Construct_triangle_2
-construct_triangle_2_object() const { return Construct_triangle_2(); }
+construct_triangle_2_object() const 
+{ return Construct_triangle_2(); }
+
 Construct_aff_transformation_2
-construct_aff_transformation_2_object() const { return Construct_aff_transformation_2(); }
+construct_aff_transformation_2_object() const 
+{ return Construct_aff_transformation_2(); }
 
 typedef CGALi::Call_point_to_get<Point_2>              Construct_point_on_2;
 Construct_point_on_2
-construct_point_on_2_object() const { return Construct_point_on_2(); }
+construct_point_on_2_object() const 
+{ return Construct_point_on_2(); }
 
-typedef CGALi::Call_second_point_to_get<Point_2>       Construct_second_point_on_2;
+typedef CGALi::Call_second_point_to_get<Point_2>  Construct_second_point_on_2;
 Construct_second_point_on_2
-construct_second_point_on_2_object() const { return Construct_second_point_on_2(); }
+construct_second_point_on_2_object() const 
+{ return Construct_second_point_on_2(); }
 
-typedef CGALi::Call_perpendicular_to_get<Vector_2>     Construct_perpendicular_vector_2;
+typedef CGALi::Call_source_to_get<Point_2>        Construct_source_point_2;
+Construct_source_point_2
+construct_source_point_2_object() const 
+{ return Construct_source_point_2(); }
+
+typedef CGALi::Call_target_to_get<Point_2>        Construct_target_point_2;
+Construct_target_point_2
+construct_target_point_2_object() const 
+{ return Construct_target_point_2(); }
+
+typedef CGALi::Call_min_to_get<Point_2>           Construct_min_point_2;
+Construct_min_point_2
+construct_min_point_2_object() const 
+{ return Construct_min_point_2(); }
+
+typedef CGALi::Call_max_to_get<Point_2>           Construct_max_point_2;
+Construct_max_point_2
+construct_max_point_2_object() const 
+{ return Construct_max_point_2(); }
+
+typedef CGALi::Call_direction_to_get<Direction_2> Construct_direction_of_line_2;
+Construct_direction_of_line_2
+construct_direction_of_line_2_object() const 
+{ return Construct_direction_of_line_2(); }
+
+typedef CGALi::Call_direction_to_get<Direction_2> Construct_direction_of_ray_2;
+Construct_direction_of_ray_2
+construct_direction_of_ray_2_object() const 
+{ return Construct_direction_of_ray_2(); }
+
+typedef CGALi::Call_supporting_line_to_get<Line_2> Construct_supporting_line_2;
+Construct_supporting_line_2
+construct_supporting_line_2_object() const 
+{ return Construct_supporting_line_2(); }
+
+typedef CGALi::Call_perpendicular_to_get<Vector_2> Construct_perpendicular_vector_2;
 Construct_perpendicular_vector_2
-construct_perpendicular_vector_2_object() const { return Construct_perpendicular_vector_2(); }
+construct_perpendicular_vector_2_object() const 
+{ return Construct_perpendicular_vector_2(); }
 
 typedef CGALi::Call_perpendicular_to_get<Direction_2>  Construct_perpendicular_direction_2;
 Construct_perpendicular_direction_2
-construct_perpendicular_direction_2_object() const { return Construct_perpendicular_direction_2(); }
+construct_perpendicular_direction_2_object() const 
+{ return Construct_perpendicular_direction_2(); }
 
-typedef CGALi::Call_perpendicular_to_get<Line_2>       Construct_perpendicular_line_2;
+typedef CGALi::Call_perpendicular_to_get<Line_2>   Construct_perpendicular_line_2;
 Construct_perpendicular_line_2
-construct_perpendicular_line_2_object() const { return Construct_perpendicular_line_2(); }
+construct_perpendicular_line_2_object() const 
+{ return Construct_perpendicular_line_2(); }
 
-typedef CGALi::p_Midpoint<Point_2>                     Construct_midpoint_2;
-Construct_midpoint_2
-construct_midpoint_2_object() const { return Construct_midpoint_2(); }
+typedef CGALi::p_Midpoint<Point_2>                 Construct_midpoint;
+Construct_midpoint
+construct_midpoint_object() const 
+{ return Construct_midpoint(); }
 
-typedef CGALi::p_Circumcenter<Point_2>                 Construct_circumcenter_2;
+typedef CGALi::p_Circumcenter<Point_2>             Construct_circumcenter_2;
 Construct_circumcenter_2
-construct_circumcenter_2_object() const { return Construct_circumcenter_2(); }
+construct_circumcenter_2_object() const 
+{ return Construct_circumcenter_2(); }
 
-typedef CGALi::pl_Bisector<Point_2, Line_2>            Construct_bisector_2;
+typedef CGALi::pl_Bisector<Point_2, Line_2>        Construct_bisector_2;
 Construct_bisector_2
-construct_bisector_2_object() const { return Construct_bisector_2(); }
+construct_bisector_2_object() const 
+{ return Construct_bisector_2(); }
 
-typedef CGALi::Intersect                               Intersect_2;
+typedef CGALi::Call_opposite_to_get<Segment_2>     Construct_opposite_segment_2;
+Construct_opposite_segment_2
+construct_opposite_segment_2_object() const 
+{ return Construct_opposite_segment_2(); }
+
+typedef CGALi::Call_opposite_to_get<Ray_2>         Construct_opposite_ray_2;
+Construct_opposite_ray_2
+construct_opposite_ray_2_object() const 
+{ return Construct_opposite_ray_2(); }
+
+typedef CGALi::Call_opposite_to_get<Line_2>        Construct_opposite_line_2;
+Construct_opposite_line_2
+construct_opposite_line_2_object() const 
+{ return Construct_opposite_line_2(); }
+
+typedef CGALi::Call_opposite_to_get<Triangle_2>    Construct_opposite_triangle_2;
+Construct_opposite_triangle_2
+construct_opposite_triangle_2_object() const 
+{ return Construct_opposite_triangle_2(); }
+
+typedef CGALi::Call_opposite_to_get<Circle_2>      Construct_opposite_circle_2;
+Construct_opposite_circle_2
+construct_opposite_circle_2_object() const 
+{ return Construct_opposite_circle_2(); }
+
+typedef CGALi::Call_transform                      Transform_2;
+Transform_2
+transform_2_object() const 
+{ return Transform_2(); }
+
+typedef CGALi::Intersect                           Intersect_2;
 Intersect_2
-intersect_2_object() const { return Intersect_2(); }
+intersect_2_object() const 
+{ return Intersect_2(); }
 
-typedef CGALi::Call_y_at_x_to_get<FT>                  Compute_y_at_x;
+typedef CGALi::Call_y_at_x_to_get<FT>              Compute_y_at_x;
 Compute_y_at_x
-compute_y_at_x_object() const { return Compute_y_at_x(); }
+compute_y_at_x_object() const 
+{ return Compute_y_at_x(); }
 
-typedef CGALi::Call_squared_length_to_get<FT>          Compute_squared_length;
-Compute_squared_length
-Compute_squared_length_object() const { return Compute_squared_length(); }
+typedef CGALi::Call_squared_length_to_get<FT>      Compute_squared_length_2;
+Compute_squared_length_2
+Compute_squared_length_2_object() const 
+{ return Compute_squared_length_2(); }
 
-/*
-typedef CGALi::std::equal_to                                  Equal_2;
+typedef CGALi::Equal                               Equal_2;
 Equal_2
-equal_2_object() const { return Equal_2(); }
+equal_2_object() const 
+{ return Equal_2(); }
 
-typedef CGALi::p_Equal_xy                              Equal_xy_2;
+typedef CGALi::Equal_x                             Equal_x_2;
+Equal_x_2
+equal_x_2_object() const 
+{ return Equal_x_2(); }
+
+typedef CGALi::Equal_y                             Equal_y_2;
+Equal_y_2
+equal_y_2_object() const 
+{ return Equal_y_2(); }
+
+typedef CGALi::Equal_xy                            Equal_xy_2;
 Equal_xy_2
-equal_xy_2_object() const { return Equal_xy_2(); }
-*/
+equal_xy_2_object() const 
+{ return Equal_xy_2(); }
 
-typedef p_Less_xy<Point_2>                       Less_xy_2;
+typedef CGALi::Less_x                              Less_x_2;
+Less_x_2
+less_x_2_object() const 
+{ return Less_x_2(); }
+
+typedef CGALi::Less_y                              Less_y_2;
+Less_y_2
+less_y_2_object() const 
+{ return Less_y_2(); }
+
+typedef CGAL::p_Less_xy<Point_2>                   Less_xy_2;
 Less_xy_2
-less_xy_2_object() const { return Less_xy_2(); }
+less_xy_2_object() const 
+{ return Less_xy_2(); }
 
-/*
-typedef CGALi::p_Less_dist_to_point<Point_2>           Less_distance_to_point_2;
-Less_distance_to_point_2
-less_distance_to_point_2_object() const { return Less_distance_to_point_2(); }
-*/
-
-typedef p_Less_dist_to_line_2p<Point_2>         Less_signed_distance_to_line_2;
-Less_signed_distance_to_line_2
-less_signed_distance_to_line_2_object() const { return Less_signed_distance_to_line_2(); }
-
-typedef p_Leftturn<Point_2>                     Leftturn_2;
-Leftturn_2
-leftturn_2_object() const { return Leftturn_2(); }
-
-typedef p_Left_of_line_2p<Point_2>              Left_of_line_2;
-Left_of_line_2
-left_of_line_2_object() const { return Left_of_line_2(); }
-
-typedef CGALi::Collinear                               Collinear_2;
-Collinear_2
-collinear_2_object() const { return Collinear_2(); }
-
-typedef p_Orientation<Point_2>                  Orientation_2;
-Orientation_2
-orientation_2_object() const { return Orientation_2(); }
-
-typedef CGALi::Side_of_oriented_circle                 Side_of_oriented_circle_2;
-Side_of_oriented_circle_2
-side_of_oriented_circle_2_object() const { return Side_of_oriented_circle_2(); }
-
-typedef CGALi::Call_is_horizontal                      Is_horizontal_2;
-Is_horizontal_2
-is_horizontal_2_object() const { return Is_horizontal_2(); }
-
-typedef CGALi::Call_is_vertical                        Is_vertical_2;
-Is_vertical_2
-is_vertical_2_object() const { return Is_vertical_2(); }
-
-typedef CGALi::Call_is_degenerate                      Is_degenerate_2;
-Is_degenerate_2
-is_degenerate_2_object() const { return Is_degenerate_2(); }
-
-typedef CGALi::Call_has_on_bounded_side                Has_on_bounded_side_2;
-Has_on_bounded_side_2
-has_on_bounded_side_2_object() const { return Has_on_bounded_side_2(); }
-
-typedef CGALi::Call_has_on_unbounded_side              Has_on_unbounded_side_2;
-Has_on_unbounded_side_2
-has_on_unbounded_side_2_object() const { return Has_on_unbounded_side_2(); }
-
-typedef CGALi::Call_has_on_boundary                    Has_on_boundary_2;
-Has_on_boundary_2
-has_on_boundary_2_object() const { return Has_on_boundary_2(); }
-
-typedef CGALi::Call_has_on_positive_side               Has_on_positive_side_2;
-Has_on_positive_side_2
-has_on_positive_side_2_object() const { return Has_on_positive_side_2(); }
-
-typedef CGALi::Call_has_on_negative_side               Has_on_negative_side_2;
-Has_on_negative_side_2
-has_on_negative_side_2_object() const { return Has_on_negative_side_2(); }
-
-typedef CGALi::Call_oriented_side                      Oriented_side_2;
-Oriented_side_2
-oriented_side_2_object() const { return Oriented_side_2(); }
-
-typedef CGALi::Compare_x                               Compare_x_2;
+typedef CGALi::Compare_x                           Compare_x_2;
 Compare_x_2
-compare_x_2_object() const { return Compare_x_2(); }
+compare_x_2_object() const 
+{ return Compare_x_2(); }
 
-typedef CGALi::Compare_y                               Compare_y_2;
+typedef CGALi::Compare_y                           Compare_y_2;
 Compare_y_2
-compare_y_2_object() const { return Compare_y_2(); }
+compare_y_2_object() const 
+{ return Compare_y_2(); }
 
-typedef CGALi::Compare_y_at_x                          Compare_y_at_x_2;
+typedef CGALi::Compare_xy                          Compare_xy_2;
+Compare_xy_2
+compare_xy_2_object() const 
+{ return Compare_xy_2(); }
+
+typedef CGALi::Compare_y_at_x                      Compare_y_at_x_2;
 Compare_y_at_x_2
-compare_y_at_x_2_object() const { return Compare_y_at_x_2(); }
+compare_y_at_x_2_object() const 
+{ return Compare_y_at_x_2(); }
 
-typedef CGALi::Are_ordered_along_line                  Are_ordered_along_line_2 ;
+typedef CGAL ::p_Less_dist_to_point<Point_2>       Less_distance_to_point_2;
+Less_distance_to_point_2
+less_distance_to_point_2_object(const Point_2& p) const 
+{ return Less_distance_to_point_2(p); }
+
+typedef CGAL ::p_Less_dist_to_line_2p<Point_2>     Less_signed_distance_to_line_2;
+Less_signed_distance_to_line_2
+less_signed_distance_to_line_2_object(const Point_2& p, const Point_2& q) const 
+{ return Less_signed_distance_to_line_2(p,q); }
+
+typedef CGAL ::p_Less_rotate_ccw<Point_2>          Less_rotate_ccw_2;
+Less_rotate_ccw_2
+less_rotate_ccw_2(const Point_2& p) const 
+{ return Less_rotate_ccw_2(p); }
+
+typedef CGAL ::p_Leftturn<Point_2>                 Leftturn_2;
+Leftturn_2
+leftturn_2_object() const 
+{ return Leftturn_2(); }
+
+typedef CGAL ::p_Left_of_line_2p<Point_2>          Left_of_line_2;
+Left_of_line_2
+left_of_line_2_object(const Point_2& p, const Point_2& q) const 
+{ return Left_of_line_2(p,q); }
+
+typedef CGALi::Collinear                           Collinear_2;
+Collinear_2
+collinear_2_object() const 
+{ return Collinear_2(); }
+
+typedef CGAL ::p_Orientation<Point_2>              Orientation_2;
+Orientation_2
+orientation_2_object() const 
+{ return Orientation_2(); }
+
+typedef CGALi::Side_of_oriented_circle             Side_of_oriented_circle_2;
+Side_of_oriented_circle_2
+side_of_oriented_circle_2_object() const 
+{ return Side_of_oriented_circle_2(); }
+
+typedef CGALi::Side_of_bounded_circle              Side_of_bounded_circle_2;
+Side_of_bounded_circle_2
+side_of_bounded_circle_2_object() const
+{ return Side_of_bounded_circle_2(); }
+
+typedef CGALi::Call_is_horizontal                  Is_horizontal_2;
+Is_horizontal_2
+is_horizontal_2_object() const 
+{ return Is_horizontal_2(); }
+
+typedef CGALi::Call_is_vertical                    Is_vertical_2;
+Is_vertical_2
+is_vertical_2_object() const 
+{ return Is_vertical_2(); }
+
+typedef CGALi::Call_is_degenerate                  Is_degenerate_2;
+Is_degenerate_2
+is_degenerate_2_object() const 
+{ return Is_degenerate_2(); }
+
+typedef CGALi::Call_has_on                         Has_on_2;
+Has_on_2
+has_on_2_object() const 
+{ return Has_on_2(); }
+
+typedef CGALi::Call_collinear_has_on               Collinear_has_on_2;
+Collinear_has_on_2
+collinear_has_on_2_object() const 
+{ return Collinear_has_on_2(); }
+
+typedef CGALi::Call_has_on_bounded_side            Has_on_bounded_side_2;
+Has_on_bounded_side_2
+has_on_bounded_side_2_object() const 
+{ return Has_on_bounded_side_2(); }
+
+typedef CGALi::Call_has_on_unbounded_side          Has_on_unbounded_side_2;
+Has_on_unbounded_side_2
+has_on_unbounded_side_2_object() const 
+{ return Has_on_unbounded_side_2(); }
+
+typedef CGALi::Call_has_on_boundary                Has_on_boundary_2;
+Has_on_boundary_2
+has_on_boundary_2_object() const 
+{ return Has_on_boundary_2(); }
+
+typedef CGALi::Call_has_on_positive_side           Has_on_positive_side_2;
+Has_on_positive_side_2
+has_on_positive_side_2_object() const 
+{ return Has_on_positive_side_2(); }
+
+typedef CGALi::Call_has_on_negative_side           Has_on_negative_side_2;
+Has_on_negative_side_2
+has_on_negative_side_2_object() const 
+{ return Has_on_negative_side_2(); }
+
+typedef CGALi::Call_oriented_side                  Oriented_side_2;
+Oriented_side_2
+oriented_side_2_object() const 
+{ return Oriented_side_2(); }
+
+typedef CGALi::Are_ordered_along_line              Are_ordered_along_line_2 ;
 Are_ordered_along_line_2
-are_ordered_along_line_2_object() const { return Are_ordered_along_line_2(); }
+are_ordered_along_line_2_object() const 
+{ return Are_ordered_along_line_2(); }
 
-typedef CGALi::Are_strictly_ordered_along_line         Are_strictly_ordered_along_line_2;
+typedef CGALi::Are_strictly_ordered_along_line     Are_strictly_ordered_along_line_2;
 Are_strictly_ordered_along_line_2
-are_strictly_ordered_along_line_2_object() const { return Are_strictly_ordered_along_line_2(); }
+are_strictly_ordered_along_line_2_object() const 
+{ return Are_strictly_ordered_along_line_2(); }
+
+typedef CGALi::Collinear_are_ordered_along_line    Collinear_are_ordered_along_line_2;
+Collinear_are_ordered_along_line_2
+collinear_are_ordered_along_line_2_object() const 
+{ return Collinear_are_ordered_along_line_2(); }
+
+typedef CGALi::Collinear_are_strictly_ordered_along_line Collinear_are_strictly_ordered_along_line_2;
+Collinear_are_strictly_ordered_along_line_2
+collinear_are_strictly_ordered_along_line_2_object() const 
+{ return Collinear_are_strictly_ordered_along_line_2(); }
+
+typedef CGALi::Construct<Point_3>                  Construct_point_3;
+typedef CGALi::Construct<Vector_3>                 Construct_vector_3;
+typedef CGALi::Construct<Direction_3>              Construct_direction_3;
+typedef CGALi::Construct<Segment_3>                Construct_segment_3;
+typedef CGALi::Construct<Plane_3>                  Construct_plane_3;
+typedef CGALi::Construct<Line_3>                   Construct_line_3;
+typedef CGALi::Construct<Ray_3>                    Construct_ray_3;
+typedef CGALi::Construct<Triangle_3>               Construct_triangle_3;
+typedef CGALi::Construct<Tetrahedron_3>            Construct_tetrahedron_3;
+typedef CGALi::Construct<Aff_transformation_3>     Construct_aff_transformation_3;
+
+Construct_point_3 
+construct_point_3_object() const 
+{ return Construct_point_3(); }
+
+Construct_vector_3
+construct_vector_3_object() const 
+{ return Construct_vector_3(); }
+
+Construct_direction_3
+construct_direction_3_object() const 
+{ return Construct_direction_3(); }
+
+Construct_segment_3
+construct_segment_3_object() const 
+{ return Construct_segment_3(); }
+
+Construct_plane_3
+construct_plane_3_object() const 
+{ return Construct_plane_3(); }
+
+Construct_line_3
+construct_line_3_object() const 
+{ return Construct_line_3(); }
+
+Construct_ray_3
+construct_ray_3_object() const 
+{ return Construct_ray_3(); }
+
+Construct_triangle_3
+construct_triangle_3_object() const 
+{ return Construct_triangle_3(); }
+
+Construct_tetrahedron_3
+construct_tetrahedron_object() const 
+{ return Construct_tetrahedron_3(); }
+
+Construct_aff_transformation_3
+construct_aff_transformation_3_object() const 
+{ return Construct_aff_transformation_3(); }
+
+typedef CGALi::Call_point_to_get<Point_3>              Construct_point_on_3;
+Construct_point_on_3
+construct_point_on_3_object() const 
+{ return Construct_point_on_3(); }
+
+typedef CGALi::Call_second_point_to_get<Point_3>       Construct_second_point_on_3;
+Construct_second_point_on_3
+construct_second_point_on_3_object() const 
+{ return Construct_second_point_on_3(); }
+
+typedef CGALi::Call_perpendicular_plane_to_get<Plane_3> Construct_perpendicular_plane_3;
+Construct_perpendicular_plane_3
+construct_perpendicular_plane_3() const 
+{ return Construct_perpendicular_plane_3(); }
+
+typedef CGALi::p_Midpoint<Point_3>                     Construct_midpoint_3;
+Construct_midpoint_3
+construct_midpoint_3_object() const 
+{ return Construct_midpoint_3(); }
+
+typedef CGALi::Call_opposite_to_get<Segment_3>         Construct_opposite_segment_3;
+Construct_opposite_segment_3
+construct_opposite_segment_3_object() const 
+{ return Construct_opposite_segment_3(); }
+
+typedef CGALi::Call_opposite_to_get<Ray_3>             Construct_opposite_ray_3;
+Construct_opposite_ray_3
+construct_opposite_ray_3_object() const 
+{ return Construct_opposite_ray_3(); }
+
+typedef CGALi::Call_opposite_to_get<Line_3>            Construct_opposite_line_3;
+Construct_opposite_line_3
+construct_opposite_line_3_object() const 
+{ return Construct_opposite_line_3(); }
+
+typedef CGALi::Call_supporting_plane_to_get<Plane_3>   Construct_supporting_plane_3;
+Construct_supporting_plane_3
+construct_supporting_plane_3_object() const 
+{ return Construct_supporting_plane_3(); }
+
+typedef CGALi::Call_transform                          Transform_3;
+Transform_3
+transform_3_object() const 
+{ return Transform_2(); }
+
+typedef CGALi::Intersect                               Intersect_3;
+Intersect_3
+intersect_3_object() const 
+{ return Intersect_3(); }
+
+typedef CGALi::Call_squared_length_to_get<FT>          Compute_squared_length_3;
+Compute_squared_length_3
+compute_squared_length_3_object() const 
+{ return Compute_squared_length_3(); }
+
+typedef CGALi::Equal                                   Equal_3;
+Equal_3
+equal_3_object() const 
+{ return Equal_3(); }
+
+typedef CGALi::Equal_x                                 Equal_x_3;
+Equal_x_3
+equal_x_3_object() const 
+{ return Equal_x_3(); }
+
+typedef CGALi::Equal_y                                 Equal_y_3;
+Equal_y_3
+equal_y_3_object() const 
+{ return Equal_y_3(); }
+
+typedef CGALi::Equal_z                                 Equal_z_3;
+Equal_z_3
+equal_z_3_object() const 
+{ return Equal_z_3(); }
+
+typedef CGALi::Equal_xy                                Equal_xy_3;
+Equal_xy_3
+equal_xy_3_object() const 
+{ return Equal_xy_3(); }
+
+typedef CGALi::Equal_xyz                               Equal_xyz_3;
+Equal_xyz_3
+equal_xyz_3_object() const 
+{ return Equal_xyz_3(); }
+
+typedef CGALi::Less_x                                  Less_x_3;
+Less_x_3
+less_x_3_object() const 
+{ return Less_x_3(); }
+
+typedef CGALi::Less_y                                  Less_y_3;
+Less_y_3
+less_y_3_object() const 
+{ return Less_y_3(); }
+
+typedef CGALi::Less_z                                  Less_z_3;
+Less_z_3
+less_z_3_object() const 
+{ return Less_z_3(); }
+
+typedef CGAL::p_Less_xy<Point_3>                       Less_xy_3;
+Less_xy_3
+less_xy_3_object() const 
+{ return Less_xy_3(); }
+
+typedef CGALi::Less_xyz                                Less_xyz_3;
+Less_xyz_3
+less_xyz_3_object() const 
+{ return Less_xyz_3(); }
+
+typedef CGALi::Compare_x                               Compare_x_3;
+Compare_x_3
+compare_x_3_object() const 
+{ return Compare_x_3(); }
+
+typedef CGALi::Compare_y                               Compare_y_3;
+Compare_y_3
+compare_y_3_object() const 
+{ return Compare_y_3(); }
+
+typedef CGALi::Compare_z                               Compare_z_3;
+Compare_z_3
+compare_z_3_object() const 
+{ return Compare_z_3(); }
+
+typedef CGALi::Compare_xy                              Compare_xy_3;
+Compare_xy_3
+compare_xy_3_object() const 
+{ return Compare_xyz_3(); }
+
+typedef CGALi::Compare_xyz                             Compare_xyz_3;
+Compare_xyz_3
+compare_xyz_3_object() const 
+{ return Compare_xyz_3(); }
+
+typedef CGAL ::p_Less_dist_to_point<Point_3>           Less_distance_to_point_3;
+Less_distance_to_point_3
+less_distance_to_point_3_object() const 
+{ return Less_distance_to_point_3(); }
+
+typedef CGALi::Collinear                               Collinear_3;
+Collinear_3
+collinear_3_object() const 
+{ return Collinear_3(); }
+
+typedef CGALi::Coplanar                                Coplanar_3 ;
+Coplanar_3
+coplanar_3_object() const 
+{ return Coplanar_3(); }
+
+typedef CGAL ::p_Orientation<Point_3>                  Orientation_3;
+Orientation_3
+orientation_3_object() const 
+{ return Orientation_3(); }
+
+typedef CGALi::Call_is_degenerate                      Is_degenerate_3;
+Is_degenerate_3
+is_degenerate_3_object() const 
+{ return Is_degenerate_3(); }
+
+typedef CGALi::Call_has_on                             Has_on_3;
+Has_on_3
+has_on_3_object() const 
+{ return Has_on_3(); }
+
+typedef CGALi::Call_has_on_bounded_side                Has_on_bounded_side_3;
+Has_on_bounded_side_3
+has_on_bounded_side_3_object() const 
+{ return Has_on_bounded_side_3(); }
+
+typedef CGALi::Call_has_on_unbounded_side              Has_on_unbounded_side_3;
+Has_on_unbounded_side_3
+has_on_unbounded_side_3_object() const 
+{ return Has_on_unbounded_side_3(); }
+
+typedef CGALi::Call_has_on_boundary                    Has_on_boundary_3;
+Has_on_boundary_3
+has_on_boundary_3_object() const 
+{ return Has_on_boundary_3(); }
+
+typedef CGALi::Call_has_on_positive_side               Has_on_positive_side_3;
+Has_on_positive_side_3
+has_on_positive_side_3_object() const 
+{ return Has_on_positive_side_3(); }
+
+typedef CGALi::Call_has_on_negative_side               Has_on_negative_side_3;
+Has_on_negative_side_3
+has_on_negative_side_3_object() const 
+{ return Has_on_negative_side_3(); }
+
+typedef CGALi::Call_oriented_side                      Oriented_side_3;
+Oriented_side_3
+oriented_side_3_object() const 
+{ return Oriented_side_3(); }
+
+typedef CGALi::Are_ordered_along_line                  Are_ordered_along_line_3 ;
+Are_ordered_along_line_3
+are_ordered_along_line_3_object() const 
+{ return Are_ordered_along_line_3(); }
+
+typedef CGALi::Are_strictly_ordered_along_line         Are_strictly_ordered_along_line_3;
+Are_strictly_ordered_along_line_3
+are_strictly_ordered_along_line_3_object() const 
+{ return Are_strictly_ordered_along_line_3(); }
+
+typedef CGALi::Collinear_are_ordered_along_line        Collinear_are_ordered_along_line_3;
+Collinear_are_ordered_along_line_3
+collinear_are_ordered_along_line_3_object() const 
+{ return Collinear_are_ordered_along_line_3(); }
+
+typedef CGALi::Collinear_are_strictly_ordered_along_line Collinear_are_strictly_ordered_along_line_3;
+Collinear_are_strictly_ordered_along_line_3
+collinear_are_strictly_ordered_along_line_3_object() const 
+{ return Collinear_are_strictly_ordered_along_line_3(); }
+
+typedef CGALi::Side_of_oriented_sphere                 Side_of_oriented_sphere_3;
+Side_of_oriented_sphere_3
+side_of_oriented_sphere_3_object() const 
+{ return Side_of_oriented_sphere_3(); }
+
+typedef CGALi::Side_of_bounded_sphere                  Side_of_bounded_sphere_3;
+Side_of_bounded_sphere_3
+side_of_bounded_sphere_3_object() const 
+{ return Side_of_bounded_sphere_3(); }
 
 };
 
diff --git a/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_2.h b/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_2.h
index 26f6dac9297..6dcbccc01ab 100644
--- a/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_2.h
+++ b/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_2.h
@@ -217,167 +217,335 @@ typedef CGALi::Construct<Triangle_2>           Construct_triangle_2;
 typedef CGALi::Construct<Aff_transformation_2> Construct_aff_transformation_2;
 
 Construct_point_2 
-construct_point_2_object() const { return Construct_point_2(); }
+construct_point_2_object() const 
+{ return Construct_point_2(); }
+
 Construct_vector_2
-construct_vector_2_object() const { return Construct_vector_2(); }
+construct_vector_2_object() const 
+{ return Construct_vector_2(); }
+
 Construct_direction_2
-construct_direction_2_object() const { return Construct_direction_2(); }
+construct_direction_2_object() const 
+{ return Construct_direction_2(); }
+
 Construct_segment_2
-construct_segment_2_object() const { return Construct_segment_2(); }
+construct_segment_2_object() const 
+{ return Construct_segment_2(); }
+
 Construct_line_2
-construct_line_2_object() const { return Construct_line_2(); }
+construct_line_2_object() const 
+{ return Construct_line_2(); }
+
 Construct_ray_2
-construct_ray_2_object() const { return Construct_ray_2(); }
+construct_ray_2_object() const 
+{ return Construct_ray_2(); }
+
 Construct_circle_2
-construct_circle_2() const { return Construct_circle_2(); }
+construct_circle_2_object() const 
+{ return Construct_circle_2(); }
+
 Construct_triangle_2
-construct_triangle_2_object() const { return Construct_triangle_2(); }
+construct_triangle_2_object() const 
+{ return Construct_triangle_2(); }
+
 Construct_aff_transformation_2
-construct_aff_transformation_2_object() const { return Construct_aff_transformation_2(); }
+construct_aff_transformation_2_object() const 
+{ return Construct_aff_transformation_2(); }
 
 typedef CGALi::Call_point_to_get<Point_2>              Construct_point_on_2;
 Construct_point_on_2
-construct_point_on_2_object() const { return Construct_point_on_2(); }
+construct_point_on_2_object() const 
+{ return Construct_point_on_2(); }
 
-typedef CGALi::Call_second_point_to_get<Point_2>       Construct_second_point_on_2;
+typedef CGALi::Call_second_point_to_get<Point_2>  Construct_second_point_on_2;
 Construct_second_point_on_2
-construct_second_point_on_2_object() const { return Construct_second_point_on_2(); }
+construct_second_point_on_2_object() const 
+{ return Construct_second_point_on_2(); }
 
-typedef CGALi::Call_perpendicular_to_get<Vector_2>     Construct_perpendicular_vector_2;
+typedef CGALi::Call_source_to_get<Point_2>        Construct_source_point_2;
+Construct_source_point_2
+construct_source_point_2_object() const 
+{ return Construct_source_point_2(); }
+
+typedef CGALi::Call_target_to_get<Point_2>        Construct_target_point_2;
+Construct_target_point_2
+construct_target_point_2_object() const 
+{ return Construct_target_point_2(); }
+
+typedef CGALi::Call_min_to_get<Point_2>           Construct_min_point_2;
+Construct_min_point_2
+construct_min_point_2_object() const 
+{ return Construct_min_point_2(); }
+
+typedef CGALi::Call_max_to_get<Point_2>           Construct_max_point_2;
+Construct_max_point_2
+construct_max_point_2_object() const 
+{ return Construct_max_point_2(); }
+
+typedef CGALi::Call_direction_to_get<Direction_2> Construct_direction_of_line_2;
+Construct_direction_of_line_2
+construct_direction_of_line_2_object() const 
+{ return Construct_direction_of_line_2(); }
+
+typedef CGALi::Call_direction_to_get<Direction_2> Construct_direction_of_ray_2;
+Construct_direction_of_ray_2
+construct_direction_of_ray_2_object() const 
+{ return Construct_direction_of_ray_2(); }
+
+typedef CGALi::Call_supporting_line_to_get<Line_2> Construct_supporting_line_2;
+Construct_supporting_line_2
+construct_supporting_line_2_object() const 
+{ return Construct_supporting_line_2(); }
+
+typedef CGALi::Call_perpendicular_to_get<Vector_2> Construct_perpendicular_vector_2;
 Construct_perpendicular_vector_2
-construct_perpendicular_vector_2_object() const { return Construct_perpendicular_vector_2(); }
+construct_perpendicular_vector_2_object() const 
+{ return Construct_perpendicular_vector_2(); }
 
 typedef CGALi::Call_perpendicular_to_get<Direction_2>  Construct_perpendicular_direction_2;
 Construct_perpendicular_direction_2
-construct_perpendicular_direction_2_object() const { return Construct_perpendicular_direction_2(); }
+construct_perpendicular_direction_2_object() const 
+{ return Construct_perpendicular_direction_2(); }
 
-typedef CGALi::Call_perpendicular_to_get<Line_2>       Construct_perpendicular_line_2;
+typedef CGALi::Call_perpendicular_to_get<Line_2>   Construct_perpendicular_line_2;
 Construct_perpendicular_line_2
-construct_perpendicular_line_2_object() const { return Construct_perpendicular_line_2(); }
+construct_perpendicular_line_2_object() const 
+{ return Construct_perpendicular_line_2(); }
 
-typedef CGALi::p_Midpoint<Point_2>                     Construct_midpoint_2;
-Construct_midpoint_2
-construct_midpoint_2_object() const { return Construct_midpoint_2(); }
+typedef CGALi::p_Midpoint<Point_2>                 Construct_midpoint;
+Construct_midpoint
+construct_midpoint_object() const 
+{ return Construct_midpoint(); }
 
-typedef CGALi::p_Circumcenter<Point_2>                 Construct_circumcenter_2;
+typedef CGALi::p_Circumcenter<Point_2>             Construct_circumcenter_2;
 Construct_circumcenter_2
-construct_circumcenter_2_object() const { return Construct_circumcenter_2(); }
+construct_circumcenter_2_object() const 
+{ return Construct_circumcenter_2(); }
 
-typedef CGALi::pl_Bisector<Point_2, Line_2>            Construct_bisector_2;
+typedef CGALi::pl_Bisector<Point_2, Line_2>        Construct_bisector_2;
 Construct_bisector_2
-construct_bisector_2_object() const { return Construct_bisector_2(); }
+construct_bisector_2_object() const 
+{ return Construct_bisector_2(); }
 
-typedef CGALi::Intersect                               Intersect_2;
+typedef CGALi::Call_opposite_to_get<Segment_2>     Construct_opposite_segment_2;
+Construct_opposite_segment_2
+construct_opposite_segment_2_object() const 
+{ return Construct_opposite_segment_2(); }
+
+typedef CGALi::Call_opposite_to_get<Ray_2>         Construct_opposite_ray_2;
+Construct_opposite_ray_2
+construct_opposite_ray_2_object() const 
+{ return Construct_opposite_ray_2(); }
+
+typedef CGALi::Call_opposite_to_get<Line_2>        Construct_opposite_line_2;
+Construct_opposite_line_2
+construct_opposite_line_2_object() const 
+{ return Construct_opposite_line_2(); }
+
+typedef CGALi::Call_opposite_to_get<Triangle_2>    Construct_opposite_triangle_2;
+Construct_opposite_triangle_2
+construct_opposite_triangle_2_object() const 
+{ return Construct_opposite_triangle_2(); }
+
+typedef CGALi::Call_opposite_to_get<Circle_2>      Construct_opposite_circle_2;
+Construct_opposite_circle_2
+construct_opposite_circle_2_object() const 
+{ return Construct_opposite_circle_2(); }
+
+typedef CGALi::Call_transform                      Transform_2;
+Transform_2
+transform_2_object() const 
+{ return Transform_2(); }
+
+typedef CGALi::Intersect                           Intersect_2;
 Intersect_2
-intersect_2_object() const { return Intersect_2(); }
+intersect_2_object() const 
+{ return Intersect_2(); }
 
-typedef CGALi::Call_y_at_x_to_get<FT>                  Compute_y_at_x;
+typedef CGALi::Call_y_at_x_to_get<FT>              Compute_y_at_x;
 Compute_y_at_x
-compute_y_at_x_object() const { return Compute_y_at_x(); }
+compute_y_at_x_object() const 
+{ return Compute_y_at_x(); }
 
-typedef CGALi::Call_squared_length_to_get<FT>          Compute_squared_length;
-Compute_squared_length
-Compute_squared_length_object() const { return Compute_squared_length(); }
+typedef CGALi::Call_squared_length_to_get<FT>      Compute_squared_length_2;
+Compute_squared_length_2
+Compute_squared_length_2_object() const 
+{ return Compute_squared_length_2(); }
 
-/*
-typedef CGALi::std::equal_to                                  Equal_2;
+typedef CGALi::Equal                               Equal_2;
 Equal_2
-equal_2_object() const { return Equal_2(); }
+equal_2_object() const 
+{ return Equal_2(); }
 
-typedef CGALi::p_Equal_xy                              Equal_xy_2;
+typedef CGALi::Equal_x                             Equal_x_2;
+Equal_x_2
+equal_x_2_object() const 
+{ return Equal_x_2(); }
+
+typedef CGALi::Equal_y                             Equal_y_2;
+Equal_y_2
+equal_y_2_object() const 
+{ return Equal_y_2(); }
+
+typedef CGALi::Equal_xy                            Equal_xy_2;
 Equal_xy_2
-equal_xy_2_object() const { return Equal_xy_2(); }
-*/
+equal_xy_2_object() const 
+{ return Equal_xy_2(); }
 
-typedef p_Less_xy<Point_2>                       Less_xy_2;
+typedef CGALi::Less_x                              Less_x_2;
+Less_x_2
+less_x_2_object() const 
+{ return Less_x_2(); }
+
+typedef CGALi::Less_y                              Less_y_2;
+Less_y_2
+less_y_2_object() const 
+{ return Less_y_2(); }
+
+typedef CGAL::p_Less_xy<Point_2>                   Less_xy_2;
 Less_xy_2
-less_xy_2_object() const { return Less_xy_2(); }
+less_xy_2_object() const 
+{ return Less_xy_2(); }
 
-/*
-typedef CGALi::p_Less_dist_to_point<Point_2>           Less_distance_to_point_2;
-Less_distance_to_point_2
-less_distance_to_point_2_object() const { return Less_distance_to_point_2(); }
-*/
-
-typedef p_Less_dist_to_line_2p<Point_2>         Less_signed_distance_to_line_2;
-Less_signed_distance_to_line_2
-less_signed_distance_to_line_2_object() const { return Less_signed_distance_to_line_2(); }
-
-typedef p_Leftturn<Point_2>                     Leftturn_2;
-Leftturn_2
-leftturn_2_object() const { return Leftturn_2(); }
-
-typedef p_Left_of_line_2p<Point_2>              Left_of_line_2;
-Left_of_line_2
-left_of_line_2_object() const { return Left_of_line_2(); }
-
-typedef CGALi::Collinear                               Collinear_2;
-Collinear_2
-collinear_2_object() const { return Collinear_2(); }
-
-typedef p_Orientation<Point_2>                  Orientation_2;
-Orientation_2
-orientation_2_object() const { return Orientation_2(); }
-
-typedef CGALi::Side_of_oriented_circle                 Side_of_oriented_circle_2;
-Side_of_oriented_circle_2
-side_of_oriented_circle_2_object() const { return Side_of_oriented_circle_2(); }
-
-typedef CGALi::Call_is_horizontal                      Is_horizontal_2;
-Is_horizontal_2
-is_horizontal_2_object() const { return Is_horizontal_2(); }
-
-typedef CGALi::Call_is_vertical                        Is_vertical_2;
-Is_vertical_2
-is_vertical_2_object() const { return Is_vertical_2(); }
-
-typedef CGALi::Call_is_degenerate                      Is_degenerate_2;
-Is_degenerate_2
-is_degenerate_2_object() const { return Is_degenerate_2(); }
-
-typedef CGALi::Call_has_on_bounded_side                Has_on_bounded_side_2;
-Has_on_bounded_side_2
-has_on_bounded_side_2_object() const { return Has_on_bounded_side_2(); }
-
-typedef CGALi::Call_has_on_unbounded_side              Has_on_unbounded_side_2;
-Has_on_unbounded_side_2
-has_on_unbounded_side_2_object() const { return Has_on_unbounded_side_2(); }
-
-typedef CGALi::Call_has_on_boundary                    Has_on_boundary_2;
-Has_on_boundary_2
-has_on_boundary_2_object() const { return Has_on_boundary_2(); }
-
-typedef CGALi::Call_has_on_positive_side               Has_on_positive_side_2;
-Has_on_positive_side_2
-has_on_positive_side_2_object() const { return Has_on_positive_side_2(); }
-
-typedef CGALi::Call_has_on_negative_side               Has_on_negative_side_2;
-Has_on_negative_side_2
-has_on_negative_side_2_object() const { return Has_on_negative_side_2(); }
-
-typedef CGALi::Call_oriented_side                      Oriented_side_2;
-Oriented_side_2
-oriented_side_2_object() const { return Oriented_side_2(); }
-
-typedef CGALi::Compare_x                               Compare_x_2;
+typedef CGALi::Compare_x                           Compare_x_2;
 Compare_x_2
-compare_x_2_object() const { return Compare_x_2(); }
+compare_x_2_object() const 
+{ return Compare_x_2(); }
 
-typedef CGALi::Compare_y                               Compare_y_2;
+typedef CGALi::Compare_y                           Compare_y_2;
 Compare_y_2
-compare_y_2_object() const { return Compare_y_2(); }
+compare_y_2_object() const 
+{ return Compare_y_2(); }
 
-typedef CGALi::Compare_y_at_x                          Compare_y_at_x_2;
+typedef CGALi::Compare_xy                          Compare_xy_2;
+Compare_xy_2
+compare_xy_2_object() const 
+{ return Compare_xy_2(); }
+
+typedef CGALi::Compare_y_at_x                      Compare_y_at_x_2;
 Compare_y_at_x_2
-compare_y_at_x_2_object() const { return Compare_y_at_x_2(); }
+compare_y_at_x_2_object() const 
+{ return Compare_y_at_x_2(); }
 
-typedef CGALi::Are_ordered_along_line                  Are_ordered_along_line_2 ;
+typedef CGAL ::p_Less_dist_to_point<Point_2>       Less_distance_to_point_2;
+Less_distance_to_point_2
+less_distance_to_point_2_object(const Point_2& p) const 
+{ return Less_distance_to_point_2(p); }
+
+typedef CGAL ::p_Less_dist_to_line_2p<Point_2>     Less_signed_distance_to_line_2;
+Less_signed_distance_to_line_2
+less_signed_distance_to_line_2_object(const Point_2& p, const Point_2& q) const 
+{ return Less_signed_distance_to_line_2(p,q); }
+
+typedef CGAL ::p_Less_rotate_ccw<Point_2>          Less_rotate_ccw_2;
+Less_rotate_ccw_2
+less_rotate_ccw_2(const Point_2& p) const 
+{ return Less_rotate_ccw_2(p); }
+
+typedef CGAL ::p_Leftturn<Point_2>                 Leftturn_2;
+Leftturn_2
+leftturn_2_object() const 
+{ return Leftturn_2(); }
+
+typedef CGAL ::p_Left_of_line_2p<Point_2>          Left_of_line_2;
+Left_of_line_2
+left_of_line_2_object(const Point_2& p, const Point_2& q) const 
+{ return Left_of_line_2(p,q); }
+
+typedef CGALi::Collinear                           Collinear_2;
+Collinear_2
+collinear_2_object() const 
+{ return Collinear_2(); }
+
+typedef CGAL ::p_Orientation<Point_2>              Orientation_2;
+Orientation_2
+orientation_2_object() const 
+{ return Orientation_2(); }
+
+typedef CGALi::Side_of_oriented_circle             Side_of_oriented_circle_2;
+Side_of_oriented_circle_2
+side_of_oriented_circle_2_object() const 
+{ return Side_of_oriented_circle_2(); }
+
+typedef CGALi::Side_of_bounded_circle              Side_of_bounded_circle_2;
+Side_of_bounded_circle_2
+side_of_bounded_circle_2_object() const
+{ return Side_of_bounded_circle_2(); }
+
+typedef CGALi::Call_is_horizontal                  Is_horizontal_2;
+Is_horizontal_2
+is_horizontal_2_object() const 
+{ return Is_horizontal_2(); }
+
+typedef CGALi::Call_is_vertical                    Is_vertical_2;
+Is_vertical_2
+is_vertical_2_object() const 
+{ return Is_vertical_2(); }
+
+typedef CGALi::Call_is_degenerate                  Is_degenerate_2;
+Is_degenerate_2
+is_degenerate_2_object() const 
+{ return Is_degenerate_2(); }
+
+typedef CGALi::Call_has_on                         Has_on_2;
+Has_on_2
+has_on_2_object() const 
+{ return Has_on_2(); }
+
+typedef CGALi::Call_collinear_has_on               Collinear_has_on_2;
+Collinear_has_on_2
+collinear_has_on_2_object() const 
+{ return Collinear_has_on_2(); }
+
+typedef CGALi::Call_has_on_bounded_side            Has_on_bounded_side_2;
+Has_on_bounded_side_2
+has_on_bounded_side_2_object() const 
+{ return Has_on_bounded_side_2(); }
+
+typedef CGALi::Call_has_on_unbounded_side          Has_on_unbounded_side_2;
+Has_on_unbounded_side_2
+has_on_unbounded_side_2_object() const 
+{ return Has_on_unbounded_side_2(); }
+
+typedef CGALi::Call_has_on_boundary                Has_on_boundary_2;
+Has_on_boundary_2
+has_on_boundary_2_object() const 
+{ return Has_on_boundary_2(); }
+
+typedef CGALi::Call_has_on_positive_side           Has_on_positive_side_2;
+Has_on_positive_side_2
+has_on_positive_side_2_object() const 
+{ return Has_on_positive_side_2(); }
+
+typedef CGALi::Call_has_on_negative_side           Has_on_negative_side_2;
+Has_on_negative_side_2
+has_on_negative_side_2_object() const 
+{ return Has_on_negative_side_2(); }
+
+typedef CGALi::Call_oriented_side                  Oriented_side_2;
+Oriented_side_2
+oriented_side_2_object() const 
+{ return Oriented_side_2(); }
+
+typedef CGALi::Are_ordered_along_line              Are_ordered_along_line_2 ;
 Are_ordered_along_line_2
-are_ordered_along_line_2_object() const { return Are_ordered_along_line_2(); }
+are_ordered_along_line_2_object() const 
+{ return Are_ordered_along_line_2(); }
 
-typedef CGALi::Are_strictly_ordered_along_line         Are_strictly_ordered_along_line_2;
+typedef CGALi::Are_strictly_ordered_along_line     Are_strictly_ordered_along_line_2;
 Are_strictly_ordered_along_line_2
-are_strictly_ordered_along_line_2_object() const { return Are_strictly_ordered_along_line_2(); }
+are_strictly_ordered_along_line_2_object() const 
+{ return Are_strictly_ordered_along_line_2(); }
+
+typedef CGALi::Collinear_are_ordered_along_line    Collinear_are_ordered_along_line_2;
+Collinear_are_ordered_along_line_2
+collinear_are_ordered_along_line_2_object() const 
+{ return Collinear_are_ordered_along_line_2(); }
+
+typedef CGALi::Collinear_are_strictly_ordered_along_line Collinear_are_strictly_ordered_along_line_2;
+Collinear_are_strictly_ordered_along_line_2
+collinear_are_strictly_ordered_along_line_2_object() const 
+{ return Collinear_are_strictly_ordered_along_line_2(); }
 
 };
 
diff --git a/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_3.h b/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_3.h
index 6d9817377fc..1ffed7731c5 100644
--- a/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_3.h
+++ b/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_3.h
@@ -141,8 +141,10 @@ CGAL_END_NAMESPACE
 #include <CGAL/Cartesian/Tetrahedron_3.C>
 #include <CGAL/Cartesian/Aff_transformation_3.C>
  
-#include <CGAL/Kernel/Construction_objects_3.h>
-#include <CGAL/Kernel/Predicate_objects_3.h>
+// #include <CGAL/Kernel/Construction_objects_3.h>
+// #include <CGAL/Kernel/Predicate_objects_3.h>
+#include <CGAL/predicate_objects_on_points_2.h>
+#include <CGAL/Kernel/function_objects.h>
 
 CGAL_BEGIN_NAMESPACE
 
@@ -256,6 +258,282 @@ struct Cartesian_3 :
     static   RT FT_numerator(const FT &r)                { return r;}
     static   RT FT_denominator(const FT &)               { return RT(1);}
 
+typedef CGALi::Construct<Point_3>                  Construct_point_3;
+typedef CGALi::Construct<Vector_3>                 Construct_vector_3;
+typedef CGALi::Construct<Direction_3>              Construct_direction_3;
+typedef CGALi::Construct<Segment_3>                Construct_segment_3;
+typedef CGALi::Construct<Plane_3>                  Construct_plane_3;
+typedef CGALi::Construct<Line_3>                   Construct_line_3;
+typedef CGALi::Construct<Ray_3>                    Construct_ray_3;
+typedef CGALi::Construct<Triangle_3>               Construct_triangle_3;
+typedef CGALi::Construct<Tetrahedron_3>            Construct_tetrahedron_3;
+typedef CGALi::Construct<Aff_transformation_3>     Construct_aff_transformation_3;
+
+Construct_point_3 
+construct_point_3_object() const 
+{ return Construct_point_3(); }
+
+Construct_vector_3
+construct_vector_3_object() const 
+{ return Construct_vector_3(); }
+
+Construct_direction_3
+construct_direction_3_object() const 
+{ return Construct_direction_3(); }
+
+Construct_segment_3
+construct_segment_3_object() const 
+{ return Construct_segment_3(); }
+
+Construct_plane_3
+construct_plane_3_object() const 
+{ return Construct_plane_3(); }
+
+Construct_line_3
+construct_line_3_object() const 
+{ return Construct_line_3(); }
+
+Construct_ray_3
+construct_ray_3_object() const 
+{ return Construct_ray_3(); }
+
+Construct_triangle_3
+construct_triangle_3_object() const 
+{ return Construct_triangle_3(); }
+
+Construct_tetrahedron_3
+construct_tetrahedron_object() const 
+{ return Construct_tetrahedron_3(); }
+
+Construct_aff_transformation_3
+construct_aff_transformation_3_object() const 
+{ return Construct_aff_transformation_3(); }
+
+typedef CGALi::Call_point_to_get<Point_3>              Construct_point_on_3;
+Construct_point_on_3
+construct_point_on_3_object() const 
+{ return Construct_point_on_3(); }
+
+typedef CGALi::Call_second_point_to_get<Point_3>       Construct_second_point_on_3;
+Construct_second_point_on_3
+construct_second_point_on_3_object() const 
+{ return Construct_second_point_on_3(); }
+
+typedef CGALi::Call_perpendicular_plane_to_get<Plane_3> Construct_perpendicular_plane_3;
+Construct_perpendicular_plane_3
+construct_perpendicular_plane_3() const 
+{ return Construct_perpendicular_plane_3(); }
+
+typedef CGALi::p_Midpoint<Point_3>                     Construct_midpoint_3;
+Construct_midpoint_3
+construct_midpoint_3_object() const 
+{ return Construct_midpoint_3(); }
+
+typedef CGALi::Call_opposite_to_get<Segment_3>         Construct_opposite_segment_3;
+Construct_opposite_segment_3
+construct_opposite_segment_3_object() const 
+{ return Construct_opposite_segment_3(); }
+
+typedef CGALi::Call_opposite_to_get<Ray_3>             Construct_opposite_ray_3;
+Construct_opposite_ray_3
+construct_opposite_ray_3_object() const 
+{ return Construct_opposite_ray_3(); }
+
+typedef CGALi::Call_opposite_to_get<Line_3>            Construct_opposite_line_3;
+Construct_opposite_line_3
+construct_opposite_line_3_object() const 
+{ return Construct_opposite_line_3(); }
+
+typedef CGALi::Call_supporting_plane_to_get<Plane_3>   Construct_supporting_plane_3;
+Construct_supporting_plane_3
+construct_supporting_plane_3_object() const 
+{ return Construct_supporting_plane_3(); }
+
+typedef CGALi::Call_transform                          Transform_3;
+Transform_3
+transform_3_object() const 
+{ return Transform_2(); }
+
+typedef CGALi::Intersect                               Intersect_3;
+Intersect_3
+intersect_3_object() const 
+{ return Intersect_3(); }
+
+typedef CGALi::Call_squared_length_to_get<FT>          Compute_squared_length_3;
+Compute_squared_length_3
+compute_squared_length_3_object() const 
+{ return Compute_squared_length_3(); }
+
+typedef CGALi::Equal                                   Equal_3;
+Equal_3
+equal_3_object() const 
+{ return Equal_3(); }
+
+typedef CGALi::Equal_x                                 Equal_x_3;
+Equal_x_3
+equal_x_3_object() const 
+{ return Equal_x_3(); }
+
+typedef CGALi::Equal_y                                 Equal_y_3;
+Equal_y_3
+equal_y_3_object() const 
+{ return Equal_y_3(); }
+
+typedef CGALi::Equal_z                                 Equal_z_3;
+Equal_z_3
+equal_z_3_object() const 
+{ return Equal_z_3(); }
+
+typedef CGALi::Equal_xy                                Equal_xy_3;
+Equal_xy_3
+equal_xy_3_object() const 
+{ return Equal_xy_3(); }
+
+typedef CGALi::Equal_xyz                               Equal_xyz_3;
+Equal_xyz_3
+equal_xyz_3_object() const 
+{ return Equal_xyz_3(); }
+
+typedef CGALi::Less_x                                  Less_x_3;
+Less_x_3
+less_x_3_object() const 
+{ return Less_x_3(); }
+
+typedef CGALi::Less_y                                  Less_y_3;
+Less_y_3
+less_y_3_object() const 
+{ return Less_y_3(); }
+
+typedef CGALi::Less_z                                  Less_z_3;
+Less_z_3
+less_z_3_object() const 
+{ return Less_z_3(); }
+
+typedef CGAL::p_Less_xy<Point_3>                       Less_xy_3;
+Less_xy_3
+less_xy_3_object() const 
+{ return Less_xy_3(); }
+
+typedef CGALi::Less_xyz                                Less_xyz_3;
+Less_xyz_3
+less_xyz_3_object() const 
+{ return Less_xyz_3(); }
+
+typedef CGALi::Compare_x                               Compare_x_3;
+Compare_x_3
+compare_x_3_object() const 
+{ return Compare_x_3(); }
+
+typedef CGALi::Compare_y                               Compare_y_3;
+Compare_y_3
+compare_y_3_object() const 
+{ return Compare_y_3(); }
+
+typedef CGALi::Compare_z                               Compare_z_3;
+Compare_z_3
+compare_z_3_object() const 
+{ return Compare_z_3(); }
+
+typedef CGALi::Compare_xy                              Compare_xy_3;
+Compare_xy_3
+compare_xy_3_object() const 
+{ return Compare_xyz_3(); }
+
+typedef CGALi::Compare_xyz                             Compare_xyz_3;
+Compare_xyz_3
+compare_xyz_3_object() const 
+{ return Compare_xyz_3(); }
+
+typedef CGAL ::p_Less_dist_to_point<Point_3>           Less_distance_to_point_3;
+Less_distance_to_point_3
+less_distance_to_point_3_object() const 
+{ return Less_distance_to_point_3(); }
+
+typedef CGALi::Collinear                               Collinear_3;
+Collinear_3
+collinear_3_object() const 
+{ return Collinear_3(); }
+
+typedef CGALi::Coplanar                                Coplanar_3 ;
+Coplanar_3
+coplanar_3_object() const 
+{ return Coplanar_3(); }
+
+typedef CGAL ::p_Orientation<Point_3>                  Orientation_3;
+Orientation_3
+orientation_3_object() const 
+{ return Orientation_3(); }
+
+typedef CGALi::Call_is_degenerate                      Is_degenerate_3;
+Is_degenerate_3
+is_degenerate_3_object() const 
+{ return Is_degenerate_3(); }
+
+typedef CGALi::Call_has_on                             Has_on_3;
+Has_on_3
+has_on_3_object() const 
+{ return Has_on_3(); }
+
+typedef CGALi::Call_has_on_bounded_side                Has_on_bounded_side_3;
+Has_on_bounded_side_3
+has_on_bounded_side_3_object() const 
+{ return Has_on_bounded_side_3(); }
+
+typedef CGALi::Call_has_on_unbounded_side              Has_on_unbounded_side_3;
+Has_on_unbounded_side_3
+has_on_unbounded_side_3_object() const 
+{ return Has_on_unbounded_side_3(); }
+
+typedef CGALi::Call_has_on_boundary                    Has_on_boundary_3;
+Has_on_boundary_3
+has_on_boundary_3_object() const 
+{ return Has_on_boundary_3(); }
+
+typedef CGALi::Call_has_on_positive_side               Has_on_positive_side_3;
+Has_on_positive_side_3
+has_on_positive_side_3_object() const 
+{ return Has_on_positive_side_3(); }
+
+typedef CGALi::Call_has_on_negative_side               Has_on_negative_side_3;
+Has_on_negative_side_3
+has_on_negative_side_3_object() const 
+{ return Has_on_negative_side_3(); }
+
+typedef CGALi::Call_oriented_side                      Oriented_side_3;
+Oriented_side_3
+oriented_side_3_object() const 
+{ return Oriented_side_3(); }
+
+typedef CGALi::Are_ordered_along_line                  Are_ordered_along_line_3 ;
+Are_ordered_along_line_3
+are_ordered_along_line_3_object() const 
+{ return Are_ordered_along_line_3(); }
+
+typedef CGALi::Are_strictly_ordered_along_line         Are_strictly_ordered_along_line_3;
+Are_strictly_ordered_along_line_3
+are_strictly_ordered_along_line_3_object() const 
+{ return Are_strictly_ordered_along_line_3(); }
+
+typedef CGALi::Collinear_are_ordered_along_line        Collinear_are_ordered_along_line_3;
+Collinear_are_ordered_along_line_3
+collinear_are_ordered_along_line_3_object() const 
+{ return Collinear_are_ordered_along_line_3(); }
+
+typedef CGALi::Collinear_are_strictly_ordered_along_line Collinear_are_strictly_ordered_along_line_3;
+Collinear_are_strictly_ordered_along_line_3
+collinear_are_strictly_ordered_along_line_3_object() const 
+{ return Collinear_are_strictly_ordered_along_line_3(); }
+
+typedef CGALi::Side_of_oriented_sphere                 Side_of_oriented_sphere_3;
+Side_of_oriented_sphere_3
+side_of_oriented_sphere_3_object() const 
+{ return Side_of_oriented_sphere_3(); }
+
+typedef CGALi::Side_of_bounded_sphere                  Side_of_bounded_sphere_3;
+Side_of_bounded_sphere_3
+side_of_bounded_sphere_3_object() const 
+{ return Side_of_bounded_sphere_3(); }
+
 };
 
 CGAL_END_NAMESPACE
diff --git a/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_dynamic_d.h b/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_dynamic_d.h
index 616866ba7a6..77d49911d43 100644
--- a/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_dynamic_d.h
+++ b/Old_Packages/Cartesian_basic/include/CGAL/Cartesian_dynamic_d.h
@@ -79,6 +79,11 @@ template< class _FT >
 struct Cartesian_dynamic_d
   : public Cartesian_base_dynamic_d< Cartesian_dynamic_d<_FT>, _FT >
 {
+    // Number types and representation tag
+    typedef _FT                                 RT;
+    typedef _FT                                 FT;
+    typedef Cartesian_tag                       Rep_tag;
+
     typedef Cartesian_dynamic_d<_FT>            Self;
     typedef Cartesian_base_dynamic_d<Self,_FT>  Kernel_base;
 
@@ -87,7 +92,7 @@ struct Cartesian_dynamic_d
     // Cartesian_d<FT>::Point_d is exactly CGAL::Point_d< Cartesian_d<FT> >
     // We still need to inherit explicitly, see Cartesian.h for explanation
 
-    typedef Kernel_base::Point_d                Point_d;
+    typedef typename Kernel_base::Point_d       Point_d;
 
 #else
     // Now CGAL::Point_d<R> is only a wrapper around CGAL::PointCd<R>
@@ -97,7 +102,7 @@ struct Cartesian_dynamic_d
     // Cartesian_d<FT>::Base is needed so that CGAL::Point_d< Cartesian_d<FT> >
     // can inherit from Cartesian_d<FT>::Kernel_base::Point_d
 
-    typedef Kernel_base::Point_d                Point_d_base;
+    typedef typename Kernel_base::Point_d       Point_d_base;
 
     // Note: necessary to qualify Point_d by ::CGAL:: to disambiguate between
     // Point_d in the current namespace (nested within CGAL) and
diff --git a/Old_Packages/Cartesian_basic/version b/Old_Packages/Cartesian_basic/version
index ca3528f2bc2..41dbbb8c5a1 100644
--- a/Old_Packages/Cartesian_basic/version
+++ b/Old_Packages/Cartesian_basic/version
@@ -1 +1 @@
-3.3.1 ( 9 Sep 1999 )
+3.3.2 ( 17 Sep 1999 )