diff --git a/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp b/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp
index f81cd2adb..00d4a40a8 100644
--- a/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp
+++ b/include/boost/geometry/strategies/cartesian/buffer_join_round.hpp
@@ -16,6 +16,10 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
 
+#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_WARN
+#include <boost/geometry/io/wkt/wkt.hpp>
+#endif
+
 
 namespace boost { namespace geometry
 {
diff --git a/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp b/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp
index fd09a0835..ee1267257 100644
--- a/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp
+++ b/include/boost/geometry/strategies/cartesian/buffer_join_round_by_divide.hpp
@@ -16,6 +16,9 @@
 #include <boost/geometry/util/math.hpp>
 #include <boost/geometry/util/select_most_precise.hpp>
 
+#ifdef BOOST_GEOMETRY_DEBUG_BUFFER_WARN
+#include <boost/geometry/io/wkt/wkt.hpp>
+#endif
 
 namespace boost { namespace geometry
 {
diff --git a/test/algorithms/buffer/linestring_buffer.cpp b/test/algorithms/buffer/linestring_buffer.cpp
index 425d7b0d9..4efff65f0 100644
--- a/test/algorithms/buffer/linestring_buffer.cpp
+++ b/test/algorithms/buffer/linestring_buffer.cpp
@@ -7,9 +7,6 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-//#define BOOST_GEOMETRY_DEBUG_ASSEMBLE
-//#define BOOST_GEOMETRY_DEBUG_IDENTIFIER
-
 #include <test_buffer.hpp>
 
 #include <boost/geometry/algorithms/buffer.hpp>
diff --git a/test/algorithms/buffer/polygon_buffer.cpp b/test/algorithms/buffer/polygon_buffer.cpp
index 638288f29..338f8507e 100644
--- a/test/algorithms/buffer/polygon_buffer.cpp
+++ b/test/algorithms/buffer/polygon_buffer.cpp
@@ -7,14 +7,9 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-
-#include <geometry_test_common.hpp>
-
-#define BOOST_GEOMETRY_TEST_BUFFER_POLYGON
 #include <test_buffer.hpp>
 
 
-
 static std::string const simplex
     = "POLYGON ((0 0,1 5,6 1,0 0))";
 static std::string const concave_simplex