diff --git a/extensions/test/algorithms/offset.cpp b/extensions/test/algorithms/offset.cpp
index ba7737bd8..3bdd66439 100644
--- a/extensions/test/algorithms/offset.cpp
+++ b/extensions/test/algorithms/offset.cpp
@@ -23,8 +23,6 @@
 
 #include <boost/geometry/strategies/strategies.hpp>
 
-#include <boost/geometry/extensions/strategies/buffer.hpp>
-
 
 #if defined(TEST_WITH_SVG)
 #  include <boost/geometry/multi/algorithms/envelope.hpp>
diff --git a/include/boost/geometry/extensions/algorithms/offset.hpp b/include/boost/geometry/extensions/algorithms/offset.hpp
index 2d122720c..baf8f91ef 100644
--- a/include/boost/geometry/extensions/algorithms/offset.hpp
+++ b/include/boost/geometry/extensions/algorithms/offset.hpp
@@ -14,10 +14,10 @@
 #include <boost/range/functions.hpp>
 
 #include <boost/geometry/core/point_type.hpp>
-#include <boost/geometry/extensions/algorithms/buffer/buffer_inserter.hpp>
-#include <boost/geometry/extensions/strategies/buffer.hpp>
-#include <boost/geometry/extensions/strategies/buffer_distance_asymmetric.hpp>
-#include <boost/geometry/extensions/strategies/buffer_end_skip.hpp>
+#include <boost/geometry/algorithms/detail/buffer/buffer_inserter.hpp>
+#include <boost/geometry/strategies/buffer.hpp>
+#include <boost/geometry/strategies/agnostic/buffer_distance_asymmetric.hpp>
+#include <boost/geometry/strategies/agnostic/buffer_end_skip.hpp>
 #include <boost/geometry/geometries/concepts/check.hpp>
 
 #include <boost/geometry/geometries/segment.hpp>