diff --git a/Old_Packages/C2/Makefile b/Old_Packages/C2/Makefile
index 756400f99ef..c9e41a04fe9 100644
--- a/Old_Packages/C2/Makefile
+++ b/Old_Packages/C2/Makefile
@@ -38,7 +38,7 @@ rtag:
 	cvs rtag v`echo $(VERSION) | sed -e "s/\./_/g"` $(CVS_MODULE_NAME)
 
 submit: package
-	cp $(Package).tar.gz version long_description.txt description.txt \ 
+	cp $(Package).tar.gz version long_description.txt description.txt \
 	changes.txt $(WWW_dir)
 	echo > $(TMP_file)
 	echo "submission::" >> $(TMP_file)
diff --git a/Old_Packages/C2/changes.txt b/Old_Packages/C2/changes.txt
index 7415455647d..a60375a4092 100644
--- a/Old_Packages/C2/changes.txt
+++ b/Old_Packages/C2/changes.txt
@@ -1,7 +1,8 @@
-Version 3.3.9 (November ?? 1999)
-- Mega cleanup [Syl & Herve].
-- Shorter headers in CVS repository, but complete thanks to scripti
-  for submission
+Version 3.3.9 (November 22 1999)
+- Mega cleanup [Syl & Hervé].
+- Shorter headers in CVS repository, but complete in release
+  thanks to script for submission [Hervé]
+- Ray_2.C removed typename in has_on for Borland C++
 
 Version 3.3.8 (October 28 1999)
 - Don't filter compare_lexicographically_xyC2() [Sylvain].
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Circle_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Circle_2.C
index 6ac853ac616..2e13fa35e57 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Circle_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Circle_2.C
@@ -36,15 +36,16 @@ CircleC2<R CGAL_CTAG>::CircleC2()
 
 template < class R >
 CGAL_KERNEL_CTOR_INLINE
-CircleC2<R CGAL_CTAG>::CircleC2(const CircleC2<R CGAL_CTAG> &t)
-  : Handle((Handle&)t)
+CircleC2<R CGAL_CTAG>::CircleC2(const CircleC2<R CGAL_CTAG> &c)
+  : Handle((Handle&)c)
 {}
 
 template < class R >
 CGAL_KERNEL_CTOR_INLINE
-CircleC2<R CGAL_CTAG>::CircleC2(const CircleC2<R CGAL_CTAG>::Point_2 &center,
-                      const typename CircleC2<R CGAL_CTAG>::FT &squared_radius,
-                      const Orientation &orient)
+CircleC2<R CGAL_CTAG>::
+CircleC2(const typename CircleC2<R CGAL_CTAG>::Point_2 &center,
+         const typename CircleC2<R CGAL_CTAG>::FT &squared_radius,
+         const Orientation &orient)
 {
   CGAL_kernel_precondition( ( squared_radius >= FT(0) ) &&
                             ( orient    != COLLINEAR) );
@@ -54,8 +55,9 @@ CircleC2<R CGAL_CTAG>::CircleC2(const CircleC2<R CGAL_CTAG>::Point_2 &center,
 
 template < class R >
 CGAL_KERNEL_CTOR_INLINE
-CircleC2<R CGAL_CTAG>::CircleC2(const CircleC2<R CGAL_CTAG>::Point_2 &center,
-                                const Orientation &orient)
+CircleC2<R CGAL_CTAG>::
+CircleC2(const typename CircleC2<R CGAL_CTAG>::Point_2 &center,
+         const Orientation &orient)
 {
   CGAL_kernel_precondition( ( orient    != COLLINEAR) );
 
@@ -64,15 +66,16 @@ CircleC2<R CGAL_CTAG>::CircleC2(const CircleC2<R CGAL_CTAG>::Point_2 &center,
 
 template < class R >
 CGAL_KERNEL_CTOR_MEDIUM_INLINE
-CircleC2<R CGAL_CTAG>::CircleC2(const CircleC2<R CGAL_CTAG>::Point_2 &p,
-                                const CircleC2<R CGAL_CTAG>::Point_2 &q,
-                                const Orientation &orient)
+CircleC2<R CGAL_CTAG>::
+CircleC2(const typename CircleC2<R CGAL_CTAG>::Point_2 &p,
+         const typename CircleC2<R CGAL_CTAG>::Point_2 &q,
+         const Orientation &orient)
 {
   CGAL_kernel_precondition( orient != COLLINEAR);
 
   if ( p != q) {
-    CircleC2<R CGAL_CTAG>::Point_2 center = midpoint(p,q);
-    CircleC2<R CGAL_CTAG>::FT      squared_radius = squared_distance(p,center);
+    Point_2 center = midpoint(p,q);
+    FT      squared_radius = squared_distance(p,center);
 
     PTR = new Circle_repC2<R>( center, squared_radius, orient);
   } else
@@ -81,9 +84,10 @@ CircleC2<R CGAL_CTAG>::CircleC2(const CircleC2<R CGAL_CTAG>::Point_2 &p,
 
 template < class R >
 CGAL_KERNEL_CTOR_MEDIUM_INLINE
-CircleC2<R CGAL_CTAG>::CircleC2(const CircleC2<R CGAL_CTAG>::Point_2 &p,
-                                const CircleC2<R CGAL_CTAG>::Point_2 &q,
-                                const CircleC2<R CGAL_CTAG>::Point_2 &r)
+CircleC2<R CGAL_CTAG>::
+CircleC2(const typename CircleC2<R CGAL_CTAG>::Point_2 &p,
+         const typename CircleC2<R CGAL_CTAG>::Point_2 &q,
+         const typename CircleC2<R CGAL_CTAG>::Point_2 &r)
 {
   Orientation orient = CGAL::orientation(p,q,r);
   CGAL_kernel_precondition( orient != COLLINEAR);
@@ -102,28 +106,28 @@ CircleC2<R CGAL_CTAG>::~CircleC2()
 template < class R >
 inline
 CircleC2<R CGAL_CTAG> &
-CircleC2<R CGAL_CTAG>::operator=(const CircleC2<R CGAL_CTAG> &t)
+CircleC2<R CGAL_CTAG>::operator=(const CircleC2<R CGAL_CTAG> &c)
 {
-  Handle::operator=(t);
+  Handle::operator=(c);
   return *this;
 }
 
 template < class R >
 CGAL_KERNEL_INLINE
 bool
-CircleC2<R CGAL_CTAG>::operator==(const CircleC2<R CGAL_CTAG> &t) const
+CircleC2<R CGAL_CTAG>::operator==(const CircleC2<R CGAL_CTAG> &c) const
 {
-   return (center() == t.center()) &&
-          (squared_radius() == t.squared_radius() &&
-          orientation() == t.orientation());
+  return (center() == c.center()) &&
+         (squared_radius() == c.squared_radius() &&
+          orientation() == c.orientation());
 }
 
 template < class R >
 inline
 bool
-CircleC2<R CGAL_CTAG>::operator!=(const CircleC2<R CGAL_CTAG> &t) const
+CircleC2<R CGAL_CTAG>::operator!=(const CircleC2<R CGAL_CTAG> &c) const
 {
-  return !(*this == t);
+  return !(*this == c);
 }
 
 template < class R >
@@ -162,7 +166,7 @@ template < class R >
 CGAL_KERNEL_MEDIUM_INLINE
 Oriented_side
 CircleC2<R CGAL_CTAG>::
-oriented_side(const CircleC2<R CGAL_CTAG>::Point_2 &p) const
+oriented_side(const typename CircleC2<R CGAL_CTAG>::Point_2 &p) const
 {
   return Oriented_side(bounded_side(p) * orientation());
 }
@@ -171,7 +175,7 @@ template < class R >
 CGAL_KERNEL_INLINE
 Bounded_side
 CircleC2<R CGAL_CTAG>::
-bounded_side(const CircleC2<R CGAL_CTAG>::Point_2 &p) const
+bounded_side(const typename CircleC2<R CGAL_CTAG>::Point_2 &p) const
 {
   return Bounded_side(CGAL::compare(squared_radius(),
                                     squared_distance(center(),p)));
@@ -181,7 +185,7 @@ template < class R >
 inline
 bool
 CircleC2<R CGAL_CTAG>::
-has_on_boundary(const CircleC2<R CGAL_CTAG>::Point_2 &p) const
+has_on_boundary(const typename CircleC2<R CGAL_CTAG>::Point_2 &p) const
 {
   return squared_distance(center(),p) == squared_radius();
 }
@@ -190,7 +194,7 @@ template < class R >
 CGAL_KERNEL_INLINE
 bool
 CircleC2<R CGAL_CTAG>::
-has_on_negative_side(const CircleC2<R CGAL_CTAG>::Point_2 &p) const
+has_on_negative_side(const typename CircleC2<R CGAL_CTAG>::Point_2 &p) const
 {
   if (orientation() == COUNTERCLOCKWISE)
     return has_on_unbounded_side(p);
@@ -201,7 +205,7 @@ template < class R >
 CGAL_KERNEL_INLINE
 bool
 CircleC2<R CGAL_CTAG>::
-has_on_positive_side(const CircleC2<R CGAL_CTAG>::Point_2 &p) const
+has_on_positive_side(const typename CircleC2<R CGAL_CTAG>::Point_2 &p) const
 {
   if (orientation() == COUNTERCLOCKWISE)
     return has_on_bounded_side(p);
@@ -212,7 +216,7 @@ template < class R >
 inline
 bool
 CircleC2<R CGAL_CTAG>::
-has_on_bounded_side(const CircleC2<R CGAL_CTAG>::Point_2 &p) const
+has_on_bounded_side(const typename CircleC2<R CGAL_CTAG>::Point_2 &p) const
 {
   return squared_distance(center(),p) < squared_radius();
 }
@@ -221,7 +225,7 @@ template < class R >
 inline
 bool
 CircleC2<R CGAL_CTAG>::
-has_on_unbounded_side(const CircleC2<R CGAL_CTAG>::Point_2 &p) const
+has_on_unbounded_side(const typename CircleC2<R CGAL_CTAG>::Point_2 &p) const
 {
   return squared_distance(center(),p) > squared_radius();
 }
@@ -261,16 +265,17 @@ template < class R >
 CGAL_KERNEL_INLINE
 CircleC2<R CGAL_CTAG>
 CircleC2<R CGAL_CTAG>::
-orthogonal_transform(const CircleC2<R CGAL_CTAG>::Aff_transformation_2 &t) const
+orthogonal_transform
+  (const typename CircleC2<R CGAL_CTAG>::Aff_transformation_2 &t) const
 {
   Vector_2 vec(FT(1), FT(0) );   // unit vector
   vec = vec.transform(t);             // transformed
   FT  sq_scale = FT( vec*vec );       // squared scaling factor
 
   return CircleC2<R CGAL_CTAG>(t.transform(center()),
-                      sq_scale * squared_radius(),
-                      t.is_even() ? orientation()
-                                  : CGAL::opposite(orientation()));
+                               sq_scale * squared_radius(),
+                               t.is_even() ? orientation()
+                                           : CGAL::opposite(orientation()));
 }
 
 /*
@@ -327,8 +332,8 @@ CGAL_KERNEL_INLINE
 std::istream&
 operator>>(std::istream &is, CircleC2<R CGAL_CTAG> &c)
 {
-    CircleC2<R CGAL_CTAG>::Point_2 center;
-    CircleC2<R CGAL_CTAG>::FT squared_radius;
+    typename CircleC2<R CGAL_CTAG>::Point_2 center;
+    typename CircleC2<R CGAL_CTAG>::FT squared_radius;
     int o;
     switch(is.iword(IO::mode)) {
     case IO::ASCII :
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C
index 2de676b2e99..3b0ebaf9922 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Direction_2.C
@@ -72,6 +72,7 @@ inline
 bool
 DirectionC2<R CGAL_CTAG>::operator==(const DirectionC2<R CGAL_CTAG> &d) const
 {
+  if ( id() == d.id() ) return true;
   return equal_direction(*this, d);
 }
 
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Line_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Line_2.C
index 0484b50858c..0ba34f1769a 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Line_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Line_2.C
@@ -117,6 +117,7 @@ template < class R >
 CGAL_KERNEL_MEDIUM_INLINE
 bool LineC2<R CGAL_CTAG>::operator==(const LineC2<R CGAL_CTAG> &l) const
 {
+  if ( id() == l.id() ) return true;
   return equal_line(*this,l);
 }
 
diff --git a/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C b/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C
index acfaf074ae8..6f9ba7aec28 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Ray_2.C
@@ -184,8 +184,8 @@ bool
 RayC2<R CGAL_CTAG>::has_on(const typename RayC2<R CGAL_CTAG>::Point_2 &p) const
 {
   return p == source()
-         || ( collinear(source(), p, second_point())
-            && ( typename R::Direction_2(p - source()) == direction() ));
+      || collinear(source(), p, second_point())
+      && Direction_2(p - source()) == direction();
 }
 
 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 6f787ac69af..eb8f46197cf 100644
--- a/Old_Packages/C2/include/CGAL/Cartesian/Triangle_2.C
+++ b/Old_Packages/C2/include/CGAL/Cartesian/Triangle_2.C
@@ -67,6 +67,7 @@ CGAL_KERNEL_MEDIUM_INLINE
 bool
 TriangleC2<R CGAL_CTAG>::operator==(const TriangleC2<R CGAL_CTAG> &t) const
 {
+  if ( id() == t.id() ) return true;
   int i;
   for(i=0; i<3; i++)
     if ( vertex(0) == t.vertex(i) )
diff --git a/Old_Packages/C2/version b/Old_Packages/C2/version
index d5d1c84461d..8eb42778829 100644
--- a/Old_Packages/C2/version
+++ b/Old_Packages/C2/version
@@ -1 +1 @@
-3.3.8 ( 28 Oct 1999 )
+3.3.9 ( 22 Nov 1999 )