diff --git a/.gitattributes b/.gitattributes
index 6dc9d498ca0..cc2a141944e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -264,7 +264,6 @@ Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Algebraic_real_traits.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Approximate_arithmetic_controller.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Bitstream_coefficient_kernel_at_alpha.h -text
-Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Non_generic_position_exception.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/alg_real_utils.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/enums.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Curve_analysis_2.h -text
@@ -296,6 +295,7 @@ Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Descartes.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Float_traits.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Integer_iterator.h -text
+Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Non_generic_position_exception.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_embeddable_extension.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Real_roots.h -text
 Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/construct_binary.h -text
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h
index 930e9886101..e9bb35341ff 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_analysis_2.h
@@ -28,9 +28,7 @@
 #include <CGAL/Algebraic_kernel_d/Bitstream_descartes.h>
 #include <CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree_traits.h>
 #include <CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Bitstream_coefficient_kernel_at_alpha.h>
-
-
-#include <CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Non_generic_position_exception.h>
+#include <CGAL/Algebraic_kernel_d/Non_generic_position_exception.h>
 
 #include <CGAL/Polynomial_traits_d.h>
 
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_pair_analysis_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_pair_analysis_2.h
index ebff02a46ec..76d9d1caa4e 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_pair_analysis_2.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Curve_pair_analysis_2.h
@@ -30,7 +30,7 @@
 #include <CGAL/Algebraic_curve_kernel_2/analyses/Shear_controller.h>
 #include <CGAL/Algebraic_curve_kernel_2/analyses/Shear_transformation.h>
 #include <CGAL/Algebraic_curve_kernel_2/analyses/Degeneracy_strategy.h>
-#include <CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Non_generic_position_exception.h>
+#include <CGAL/Algebraic_kernel_d/Non_generic_position_exception.h>
 
 #include <CGAL/Algebraic_curve_kernel_2/Status_line_CPA_1.h>
 
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Event_line_builder.h b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Event_line_builder.h
index 98ad6ec6bca..616b9a4b916 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Event_line_builder.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/analyses/Event_line_builder.h
@@ -20,7 +20,7 @@
 
 #include <CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/alg_real_utils.h>
 #include <CGAL/Algebraic_kernel_d/Bitstream_descartes.h>
-#include <CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Non_generic_position_exception.h>
+#include <CGAL/Algebraic_kernel_d/Non_generic_position_exception.h>
 
 #include <CGAL/Polynomial/sturm_habicht_sequence.h>
 #include <CGAL/Algebraic_curve_kernel_2/analyses/Zero_resultant_exception.h>
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h
index 26abb335d18..c1cc2fe44f2 100644
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Bitstream_descartes.h
@@ -25,7 +25,7 @@
 #include <CGAL/Algebraic_kernel_d/Bitstream_descartes_rndl_tree.h>
 #endif
 
-#include <CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Non_generic_position_exception.h>
+#include <CGAL/Algebraic_curve_kernel_d/Non_generic_position_exception.h>
 
 CGAL_BEGIN_NAMESPACE
 
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Non_generic_position_exception.h b/Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Non_generic_position_exception.h
similarity index 100%
rename from Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Bitstream_descartes_at_x/Non_generic_position_exception.h
rename to Algebraic_kernel_d/include/CGAL/Algebraic_kernel_d/Non_generic_position_exception.h