diff --git a/.gitattributes b/.gitattributes
index 5c93a3ae3c0..28b1732902a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -15,6 +15,7 @@ Algebraic_foundations/examples/Algebraic_foundations/fraction_traits.cpp -text
 Algebraic_foundations/examples/Algebraic_foundations/implicit_interoperable_dispatch.cpp -text
 Algebraic_foundations/examples/Algebraic_foundations/integralize.cpp -text
 Algebraic_foundations/examples/Algebraic_foundations/interoperable.cpp -text
+Algebraic_foundations/include/CGAL/ipower.h -text
 Algebraic_foundations/package_info/Algebraic_foundations/maintainer -text
 Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt -text
 Algebraic_kernel_d/benchmark/Algebraic_kernel_d/Algebraic_curve_kernel_2.cpp -text
@@ -3206,7 +3207,6 @@ Polynomial/include/CGAL/Polynomial/Coercion_traits.h -text
 Polynomial/include/CGAL/Polynomial/bezout_matrix.h -text
 Polynomial/include/CGAL/Polynomial/determinant.h -text
 Polynomial/include/CGAL/Polynomial/hgdelta_update.h -text
-Polynomial/include/CGAL/Polynomial/ipower.h -text
 Polynomial/include/CGAL/Polynomial/may_have_common_factor.h -text
 Polynomial/include/CGAL/Polynomial/modular_filter.h -text
 Polynomial/include/CGAL/Polynomial/resultant.h -text
diff --git a/Polynomial/include/CGAL/Polynomial/ipower.h b/Algebraic_foundations/include/CGAL/ipower.h
similarity index 100%
rename from Polynomial/include/CGAL/Polynomial/ipower.h
rename to Algebraic_foundations/include/CGAL/ipower.h
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_1.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_1.h
index 77f3b644f06..b73a9c25671 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_1.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_1.h
@@ -23,7 +23,7 @@
 #include <CGAL/Algebraic_kernel_d/Descartes.h>
 #include <CGAL/Algebraic_kernel_d/Real_roots.h>
 #include <CGAL/Algebraic_kernel_d/refine_zero_against.h>
-#include <CGAL/Polynomial/ipower.h>
+#include <CGAL/ipower.h>
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h
index 85bc5498b46..ae63d5d08ee 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h
@@ -15,7 +15,7 @@
 #define CGAL_ALGEBRAIC_KERNEL_D_CONSTRUCT_BINARY_H
 
 #include <CGAL/basic.h>
-#include <CGAL/Polynomial/ipower.h>
+#include <CGAL/ipower.h>
 
 #ifdef CGAL_USE_LEDA
 #include <CGAL/leda_integer.h>
diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h
index 097e88c2583..adb6f6ea824 100644
--- a/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h
+++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/include/CGAL/_test_real_root_isolator.h
@@ -17,7 +17,7 @@
 #include <CGAL/basic.h>
 #include <cassert>
 
-#include <CGAL/Polynomial/ipower.h>
+#include <CGAL/ipower.h>
 /*#include <NiX/basic.h>
 #include <NiX/number_type_utils.h>*/
 
diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/makefile b/Algebraic_kernel_d/test/Algebraic_kernel_d/makefile
index 0abbfc03b7f..c8fe9e200e5 100644
--- a/Algebraic_kernel_d/test/Algebraic_kernel_d/makefile
+++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/makefile
@@ -16,10 +16,6 @@ include $(CGAL_MAKEFILE)
 CXXFLAGS = \
            -Iinclude \
            -I../../include \
-           -I../../../Algebraic_foundations/include \
-           -I../../../Number_types/include \
-           -I../../../Modular_arithmetic/include \
-           -I../../../Polynomial/include \
            $(CGAL_CXXFLAGS) \
            $(LONG_NAME_PROBLEM_CXXFLAGS)
 
diff --git a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h
index dc451b0c5c5..5d3bef3dabd 100644
--- a/Polynomial/include/CGAL/Polynomial/Polynomial_type.h
+++ b/Polynomial/include/CGAL/Polynomial/Polynomial_type.h
@@ -25,7 +25,7 @@
 #ifndef CGAL_POLYNOMIAL_CGALi_TYPE_H
 #define CGAL_POLYNOMIAL_CGALi_TYPE_H
 
-#include <CGAL/Polynomial/ipower.h>
+#include <CGAL/ipower.h>
 #include <sstream>
 
 CGAL_BEGIN_NAMESPACE
diff --git a/Polynomial/include/CGAL/Polynomial/prs_resultant.h b/Polynomial/include/CGAL/Polynomial/prs_resultant.h
index 0defc34da95..c0788bcb205 100644
--- a/Polynomial/include/CGAL/Polynomial/prs_resultant.h
+++ b/Polynomial/include/CGAL/Polynomial/prs_resultant.h
@@ -22,7 +22,7 @@
 #include <CGAL/basic.h>
 #include <CGAL/Polynomial.h>
 
-#include <CGAL/Polynomial/ipower.h>
+#include <CGAL/ipower.h>
 #include <CGAL/Polynomial/hgdelta_update.h>
 
 #ifndef CGAL_POLYNOMIAL_PRS_RESULTANT_H