diff --git a/Circulator/include/CGAL/circulator.h b/Circulator/include/CGAL/circulator.h
index ee9088d3adf..9efc045bc9c 100644
--- a/Circulator/include/CGAL/circulator.h
+++ b/Circulator/include/CGAL/circulator.h
@@ -30,7 +30,7 @@
 #include <functional>
 #include <iterator>
 #include <CGAL/circulator_bases.h>
-#include <CGAL/Testsuite/use.h>
+#include <CGAL/use.h>
 
 // These are name redefinitions for backwards compatibility
 // with the pre iterator-traits style adaptors.
diff --git a/Installation/include/CGAL/use.h b/Installation/include/CGAL/use.h
new file mode 100644
index 00000000000..fb513be303a
--- /dev/null
+++ b/Installation/include/CGAL/use.h
@@ -0,0 +1,34 @@
+// Copyright (c) 2007   INRIA Sophia-Antipolis (France).
+// All rights reserved.
+//
+// This file is part of CGAL (www.cgal.org); you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public License as
+// published by the Free Software Foundation; either version 3 of the License,
+// or (at your option) any later version.
+//
+// Licensees holding a valid commercial license may use this file in
+// accordance with the commercial license agreement provided with the software.
+//
+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+//
+// $URL$
+// $Id$
+//
+// Author(s)     : Sylvain Pion
+
+#ifndef CGAL_USE_H
+#define CGAL_USE_H
+
+namespace CGAL { namespace internal {
+
+template < typename T > inline
+void use(const T&) {}
+
+} }
+
+// CGAL_USE() is a macro which aims at removing "variable is unused" warnings.
+
+#define CGAL_USE(x) ::CGAL::internal::use(x)
+
+#endif // CGAL_USE_H
diff --git a/Point_set_processing_3/include/CGAL/mst_orient_normals.h b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
index db3fd373efe..48015dcafbb 100644
--- a/Point_set_processing_3/include/CGAL/mst_orient_normals.h
+++ b/Point_set_processing_3/include/CGAL/mst_orient_normals.h
@@ -28,7 +28,7 @@
 #include <CGAL/Index_property_map.h>
 #include <CGAL/Memory_sizer.h>
 #include <CGAL/point_set_processing_assertions.h>
-#include <CGAL/Testsuite/use.h>
+#include <CGAL/use.h>
 
 #include <iterator>
 #include <list>
diff --git a/STL_Extension/include/CGAL/iterator.h b/STL_Extension/include/CGAL/iterator.h
index 8198f63aa2f..40f3d059cc5 100644
--- a/STL_Extension/include/CGAL/iterator.h
+++ b/STL_Extension/include/CGAL/iterator.h
@@ -29,7 +29,7 @@
 
 #include <CGAL/circulator.h>
 #include <CGAL/assertions.h>
-#include <CGAL/Testsuite/use.h>
+#include <CGAL/use.h>
 #include <vector>
 #include <map>
 #include <boost/type_traits.hpp>
diff --git a/Testsuite/include/CGAL/Testsuite/use.h b/Testsuite/include/CGAL/Testsuite/use.h
index 0e7aca616ed..daee40b9051 100644
--- a/Testsuite/include/CGAL/Testsuite/use.h
+++ b/Testsuite/include/CGAL/Testsuite/use.h
@@ -20,15 +20,9 @@
 #ifndef CGAL_TESTSUITE_USE_H
 #define CGAL_TESTSUITE_USE_H
 
-namespace CGAL { namespace internal {
+// This is a wrapper file, for backward compatibility.
+// The macro CGAL_USE is now defined in <CGAL/use.h>
 
-template < typename T > inline
-void use(const T&) {}
-
-} }
-
-// CGAL_USE() is a macro which aims at removing "variable is unused" warnings.
-
-#define CGAL_USE(x) ::CGAL::internal::use(x)
+#include <CGAL/use.h>
 
 #endif // CGAL_TESTSUITE_USE_H