diff --git a/Nef_2/include/CGAL/Nef_2/Polynomial_impl.h b/Nef_2/include/CGAL/Nef_2/Polynomial_impl.h
index d65136f1974..c0296a774b4 100644
--- a/Nef_2/include/CGAL/Nef_2/Polynomial_impl.h
+++ b/Nef_2/include/CGAL/Nef_2/Polynomial_impl.h
@@ -19,20 +19,12 @@
 // Author(s)     : Michael Seel
 //                 Andreas Fabri
 
-#ifdef CGAL_HEADER_ONLY
-#define CGAL_INLINE_FUNCTION inline
-
-#include <CGAL/license/Nef_2.h>
-
-#else
-#define CGAL_INLINE_FUNCTION
-#endif
 
 namespace CGAL{
 
   namespace Nef {
 
-CGAL_INLINE_FUNCTION
+inline
 void Polynomial<int>::euclidean_div(
   const Polynomial<int>& f, const Polynomial<int>& g,
   Polynomial<int>& q, Polynomial<int>& r)
@@ -53,7 +45,7 @@ void Polynomial<int>::euclidean_div(
 
 
 
-CGAL_INLINE_FUNCTION
+inline
 void Polynomial<int>::pseudo_div(
   const Polynomial<int>& f, const Polynomial<int>& g, 
   Polynomial<int>& q, Polynomial<int>& r, int& D)
@@ -87,7 +79,7 @@ void Polynomial<int>::pseudo_div(
 
 
 
-CGAL_INLINE_FUNCTION
+inline
 Polynomial<int> Polynomial<int>::gcd(
   const Polynomial<int>& p1, const Polynomial<int>& p2)
 { CGAL_NEF_TRACEN("gcd("<<p1<<" , "<<p2<<")");
@@ -120,7 +112,7 @@ Polynomial<int> Polynomial<int>::gcd(
 
 
 
-CGAL_INLINE_FUNCTION
+inline
 void Polynomial<double>::euclidean_div(
   const Polynomial<double>& f, const Polynomial<double>& g,
   Polynomial<double>& q, Polynomial<double>& r)
@@ -141,7 +133,7 @@ void Polynomial<double>::euclidean_div(
 
 
 
-CGAL_INLINE_FUNCTION
+inline
 void Polynomial<double>::pseudo_div(
   const Polynomial<double>& f, const Polynomial<double>& g, 
   Polynomial<double>& q, Polynomial<double>& r, double& D)
@@ -173,7 +165,7 @@ void Polynomial<double>::pseudo_div(
   CGAL_NEF_TRACEN("  returning "<<q<<", "<<r<<", "<< D);
 }
 
-CGAL_INLINE_FUNCTION
+inline
 Polynomial<double> Polynomial<double>::gcd(
   const Polynomial<double>& p1, const Polynomial<double>& p2)
 { CGAL_NEF_TRACEN("gcd("<<p1<<" , "<<p2<<")");
diff --git a/Nef_2/src/CGAL/NefPolynomial.cpp b/Nef_2/src/CGAL/NefPolynomial.cpp
deleted file mode 100644
index aa717ca140c..00000000000
--- a/Nef_2/src/CGAL/NefPolynomial.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2000  Max-Planck-Institute Saarbruecken (Germany).
-// 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)     : Michael Seel
-//                 Andreas Fabri
-
-#ifndef CGAL_HEADER_ONLY
-
-#include <CGAL/Nef_2/Polynomial.h>
-#include <CGAL/Nef_2/Polynomial_impl.h>
-
-#endif // CGAL_HEADER_ONLY