diff --git a/modules/base/pymod/export_logger.cc b/modules/base/pymod/export_logger.cc
index 41433a40a9a9b0553bb3834ee94c79abf766a64e..1434b4f6721113600427e205a18c85f2e4e754e6 100644
--- a/modules/base/pymod/export_logger.cc
+++ b/modules/base/pymod/export_logger.cc
@@ -18,6 +18,7 @@
 //------------------------------------------------------------------------------
 #include <boost/python.hpp>
 #include <boost/python/raw_function.hpp>
+#include <boost/version.hpp>
 #if BOOST_VERSION<103400
 #include <boost/python/detail/api_placeholder.hpp>
 #endif
diff --git a/modules/base/src/boost_filesystem_helper.hh b/modules/base/src/boost_filesystem_helper.hh
index 450ffa94deaef5b230c11cd0129e3a5422549fda..03a9786e75d838d97fbee3694a59fb79dd177132 100644
--- a/modules/base/src/boost_filesystem_helper.hh
+++ b/modules/base/src/boost_filesystem_helper.hh
@@ -24,6 +24,7 @@
 #define OST_BOOST_FILESYSTEM_HELPER_HH
 
 #include <boost/filesystem/path.hpp>
+#include <boost/version.hpp>
 
 namespace {
 
diff --git a/modules/base/tests/test_string_ref.cc b/modules/base/tests/test_string_ref.cc
index 539440d171586ea4f138f2e2417fe421299d8609..7ef5b67768347822693f6d75918e7954a109e716 100644
--- a/modules/base/tests/test_string_ref.cc
+++ b/modules/base/tests/test_string_ref.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 #include <ost/string_ref.hh>
 using namespace ost;
 
diff --git a/modules/geom/src/vec_mat_predicates.hh b/modules/geom/src/vec_mat_predicates.hh
index 7f897a5099941015200444cc5148a19098fa39ca..bbe639f3b70f7e68cafaf96e30668027d3c95b33 100644
--- a/modules/geom/src/vec_mat_predicates.hh
+++ b/modules/geom/src/vec_mat_predicates.hh
@@ -18,9 +18,13 @@
 //------------------------------------------------------------------------------
 #ifndef OST_GEOM_VEC_MAT_PREDICATES_HH
 #define OST_GEOM_VEC_MAT_PREDICATES_HH
-#include <boost/version.hpp>
 #include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION<105900
 #include <boost/test/floating_point_comparison.hpp>
+#else
+#include <boost/test/tools/floating_point_comparison.hpp>
+#endif
 #include <ost/geom/geom.hh>
 
 
diff --git a/modules/geom/tests/test_composite3.cc b/modules/geom/tests/test_composite3.cc
index 31479351cf63b5f946a7ac67d49007b1311168d5..48309acd0476adbced427021e1ffb23af061079a 100644
--- a/modules/geom/tests/test_composite3.cc
+++ b/modules/geom/tests/test_composite3.cc
@@ -23,7 +23,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/geom/tests/test_quat.cc b/modules/geom/tests/test_quat.cc
index b4228dc38476c3d6b200f8276abcee3c38022da3..158f44d1ee415c6ab32a475ef89ad543e819350e 100644
--- a/modules/geom/tests/test_quat.cc
+++ b/modules/geom/tests/test_quat.cc
@@ -21,7 +21,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 
 #include "helper.hh"
 using namespace geom;
diff --git a/modules/gfx/tests/test_color.cc b/modules/gfx/tests/test_color.cc
index 26784b4cc6bbac872aa3b4703564b1b3be8aeb95..21f82f2c3e54f06eaae81c0affad095f106d7d33 100644
--- a/modules/gfx/tests/test_color.cc
+++ b/modules/gfx/tests/test_color.cc
@@ -25,7 +25,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 
 using boost::unit_test_framework::test_suite;
 
diff --git a/modules/img/alg/tests/test_normalizer.cc b/modules/img/alg/tests/test_normalizer.cc
index 205a5a5b31125332ea527bd4e0e666f75f0b5354..2b13c649f5441cc99fc7c6fa7d49ab0da05f8a7d 100644
--- a/modules/img/alg/tests/test_normalizer.cc
+++ b/modules/img/alg/tests/test_normalizer.cc
@@ -25,6 +25,12 @@
 #include <iostream>
 
 #include "tests.hh"
+#include <boost/version.hpp>
+#if BOOST_VERSION<105900
+#include <boost/test/floating_point_comparison.hpp>
+#else
+#include <boost/test/tools/floating_point_comparison.hpp>
+#endif
 
 #include <ost/img/image.hh>
 #include  <ost/img/alg/normalizer_factory.hh>
diff --git a/modules/io/tests/test_io_img.cc b/modules/io/tests/test_io_img.cc
index 2e7b4961c43e0679b82303e00d6b152dceacf560..11821e11f06ec1560abe8036c90ef1da2c981850 100644
--- a/modules/io/tests/test_io_img.cc
+++ b/modules/io/tests/test_io_img.cc
@@ -18,6 +18,12 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
+#include <boost/version.hpp>
+#if BOOST_VERSION<105900
+#include <boost/test/floating_point_comparison.hpp>
+#else
+#include <boost/test/tools/floating_point_comparison.hpp>
+#endif
 
 #include <map>
 #include <ost/io/img/load_map.hh>
diff --git a/modules/io/tests/test_io_pdb.cc b/modules/io/tests/test_io_pdb.cc
index 4eb4cb19b2d7a56091cc5caf5e1714ab5913781f..4cfc224927c64c7bc04799fc131a30536489c178 100644
--- a/modules/io/tests/test_io_pdb.cc
+++ b/modules/io/tests/test_io_pdb.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 using boost::unit_test_framework::test_suite;
 
 #include <ost/test_utils/compare_files.hh>
diff --git a/modules/io/tests/test_io_sdf.cc b/modules/io/tests/test_io_sdf.cc
index b15b4f6e7c4e34a8033a6577dbf714dc3b605b09..1aa5faf282ca170dc948a0ae2950331e2ce1623f 100644
--- a/modules/io/tests/test_io_sdf.cc
+++ b/modules/io/tests/test_io_sdf.cc
@@ -18,7 +18,6 @@
 //------------------------------------------------------------------------------
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 using boost::unit_test_framework::test_suite;
diff --git a/modules/io/tests/test_mmcif_info.cc b/modules/io/tests/test_mmcif_info.cc
index 28c165c80a22a9bed3f5db610e872b51387c1ad9..19c091f350254bd2fb47d88bd65551c007de8197 100644
--- a/modules/io/tests/test_mmcif_info.cc
+++ b/modules/io/tests/test_mmcif_info.cc
@@ -19,7 +19,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 
 #include <ost/io/io_exception.hh>
 #include <ost/io/mol/mmcif_info.hh>
diff --git a/modules/io/tests/test_mmcif_reader.cc b/modules/io/tests/test_mmcif_reader.cc
index 87e844f72e8a247796d9ffec69535c722ee8a481..2711bddcf7306dd712045ff533bca6771f8a9ae5 100644
--- a/modules/io/tests/test_mmcif_reader.cc
+++ b/modules/io/tests/test_mmcif_reader.cc
@@ -19,7 +19,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 
 #include <fstream>
 #include <ost/platform.hh>
diff --git a/modules/io/tests/test_star_parser.cc b/modules/io/tests/test_star_parser.cc
index 8024025a5154b94ddb731400f8a6b2ad0ed68bea..86edfe272ad6ed327d5c222baaff51743f1ffe71 100644
--- a/modules/io/tests/test_star_parser.cc
+++ b/modules/io/tests/test_star_parser.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 
 #include <fstream>
 #include <math.h>
diff --git a/modules/mol/base/pymod/export_entity_view.cc b/modules/mol/base/pymod/export_entity_view.cc
index 19781a94f2ae3e6019d7e57b0eb55e6119b3d1e2..fb969ce46c695932f3c73e3632aff535add1dcce 100644
--- a/modules/mol/base/pymod/export_entity_view.cc
+++ b/modules/mol/base/pymod/export_entity_view.cc
@@ -18,6 +18,7 @@
 //------------------------------------------------------------------------------
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
+#include <boost/version.hpp>
 #if BOOST_VERSION<103400
 #include <boost/python/detail/api_placeholder.hpp>
 #endif
diff --git a/modules/mol/base/tests/test_ics.cc b/modules/mol/base/tests/test_ics.cc
index a68d49734e5fee7c75189727bcece0fa4590650d..73358b98dca23c8256522458475c186efe8d2557 100644
--- a/modules/mol/base/tests/test_ics.cc
+++ b/modules/mol/base/tests/test_ics.cc
@@ -21,7 +21,6 @@
  */
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 #include <ost/mol/mol.hh>
 #include <ost/log.hh>
 #include <ost/message.hh>
diff --git a/modules/seq/alg/tests/test_sequence_identity.cc b/modules/seq/alg/tests/test_sequence_identity.cc
index d95d5a671b3a8d2f905230d8988f0acf1db08987..87bd3f33e2d4bb8b210a62a7a99c06bc8562ab48 100644
--- a/modules/seq/alg/tests/test_sequence_identity.cc
+++ b/modules/seq/alg/tests/test_sequence_identity.cc
@@ -22,7 +22,6 @@
 
 #define BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
 #include <ost/seq/alg/sequence_identity.hh>