diff --git a/Partition_2/include/CGAL/Partition_2/Rotation_tree_2.h b/Partition_2/include/CGAL/Partition_2/Rotation_tree_2.h
index 960554cff6a..07aefb785cc 100644
--- a/Partition_2/include/CGAL/Partition_2/Rotation_tree_2.h
+++ b/Partition_2/include/CGAL/Partition_2/Rotation_tree_2.h
@@ -36,7 +36,7 @@
 
 //  MSVC6 doesn't work with the CGALi::vector but it does with the std::vector
 //  (from stlport?)
-#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
+#if defined(__BORLANDC__)
 #include <vector>
 #else
 #include <CGAL/vector.h>
@@ -47,7 +47,7 @@
 namespace CGAL {
 
 template <class Traits_>
-#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
+#if defined(__BORLANDC__)
 class Rotation_tree_2 : public std::vector< Rotation_tree_node_2<Traits_> >
 #else
 class Rotation_tree_2 : public CGALi::vector< Rotation_tree_node_2<Traits_> >
@@ -56,7 +56,7 @@ class Rotation_tree_2 : public CGALi::vector< Rotation_tree_node_2<Traits_> >
 public:
    typedef Traits_                                 Traits;
    typedef Rotation_tree_node_2<Traits>            Node;
-#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
+#if defined(__BORLANDC__)
    typedef typename std::vector<Node>::iterator    Self_iterator;
 #else
    typedef typename CGALi::vector<Node>::iterator  Self_iterator;
diff --git a/Partition_2/include/CGAL/Partition_2/Rotation_tree_node_2.h b/Partition_2/include/CGAL/Partition_2/Rotation_tree_node_2.h
index 612f06f94ea..a38fddf3fb3 100644
--- a/Partition_2/include/CGAL/Partition_2/Rotation_tree_node_2.h
+++ b/Partition_2/include/CGAL/Partition_2/Rotation_tree_node_2.h
@@ -35,7 +35,7 @@
 #include <utility>
 //  MSVC6 doesn't work with the CGALi::vector but it does with the std::vector
 //  (from stlport?)
-#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
+#if defined(__BORLANDC__)
 #include <vector>
 #else
 #include <CGAL/vector.h>
@@ -52,7 +52,7 @@ public:
 
    typedef typename Traits::Point_2          Base_point;
    typedef Rotation_tree_node_2<Traits>      Self;
-#if (defined( _MSC_VER) && (_MSC_VER <= 1200)) || defined(__BORLANDC__)
+#if defined(__BORLANDC__)
    typedef std::vector< Self >               Tree;
 #else
    typedef CGALi::vector< Self >             Tree;
diff --git a/STL_Extension/include/CGAL/vector.h b/STL_Extension/include/CGAL/vector.h
index 481b46c005f..af8df9dbee0 100644
--- a/STL_Extension/include/CGAL/vector.h
+++ b/STL_Extension/include/CGAL/vector.h
@@ -25,10 +25,6 @@
 #ifndef CGAL_VECTOR_H
 #define CGAL_VECTOR_H 1
 
-#if defined( _MSC_VER) && (_MSC_VER <= 1200)
-#error CGAL::vector not available on MSC VC6
-#else
-
 #include <CGAL/basic.h>
 #include <CGAL/memory.h>
 #include <iterator>
@@ -36,12 +32,10 @@
 #include <memory>
 #include <cstddef>
 
-
 CGAL_BEGIN_NAMESPACE
 
 namespace CGALi {
 
-
 // We give the vector container class a class based iterator implementation.
 // It ensures that iterator_traits work on compilers not supporting
 // partial specializations and it guarantees that default initialization
@@ -601,7 +595,4 @@ void vector<T, Alloc>::insert( iterator position, size_type n, const T& x) {
 
 CGAL_END_NAMESPACE
 
-#endif // defined( _MSC_VER) && (_MSC_VER <= 1200)
-
 #endif // CGAL_VECTOR_H //
-// EOF //
diff --git a/STL_Extension/test/STL_Extension/test_multiset.cpp b/STL_Extension/test/STL_Extension/test_multiset.cpp
index c11960b1b03..2c9906e2774 100644
--- a/STL_Extension/test/STL_Extension/test_multiset.cpp
+++ b/STL_Extension/test/STL_Extension/test_multiset.cpp
@@ -25,13 +25,6 @@
 // A test for the CGAL::Multiset container.
 // ============================================================================
 
-#if defined( _MSC_VER) && (_MSC_VER <= 1200)
-// CGAL::vector not available on MSC VC6
-int main() {
-  return (0);
-}
-#else
-
 #include <CGAL/basic.h>
 #include <CGAL/Multiset.h>
 #include <string>
@@ -644,5 +637,3 @@ void test_swap_and_replace ()
 
   return;
 }
-
-#endif // defined( _MSC_VER) && (_MSC_VER <= 1200) //
diff --git a/STL_Extension/test/STL_Extension/test_vector.cpp b/STL_Extension/test/STL_Extension/test_vector.cpp
index 4cad4616d7c..f938d3d67a4 100644
--- a/STL_Extension/test/STL_Extension/test_vector.cpp
+++ b/STL_Extension/test/STL_Extension/test_vector.cpp
@@ -28,13 +28,6 @@
 // with templates.
 // ============================================================================
 
-#if defined( _MSC_VER) && (_MSC_VER <= 1200)
-// CGAL::vector not available on MSC VC6
-int main() {
-    return 0;
-}
-#else
-
 #include <CGAL/vector.h>
 #include <CGAL/Testsuite/assert.h>
 #include <iostream>
@@ -204,5 +197,3 @@ int main() {
   
     return 0;
 }
-
-#endif // defined( _MSC_VER) && (_MSC_VER <= 1200) //