diff --git a/Android.bp b/Android.bp
index 7c66cedab..7b91cd28a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -53,7 +53,6 @@ cc_defaults {
     name: "vsomeip_lib_defaults",
 
     cflags: [
-        "-DVSOMEIP_BOOST_VERSION=107500",
         "-DVSOMEIP_INTERNAL_SUPPRESS_DEPRECATED",
         // std::result_of was removed in C++20; force Boost.Asio 1.75 to use
         // std::invoke_result instead (supported since Boost 1.74).
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa4ad1ccd..d10a3df45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -219,8 +219,6 @@ endif()
 
 message( STATUS "Using boost version: ${VSOMEIP_BOOST_VERSION}" )
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DVSOMEIP_BOOST_VERSION=${VSOMEIP_BOOST_VERSION}")
-
 find_package(PkgConfig)
 
 # DLT
diff --git a/implementation/service_discovery/include/service_discovery_impl.hpp b/implementation/service_discovery/include/service_discovery_impl.hpp
index ed17cd23f..8618c3c5c 100644
--- a/implementation/service_discovery/include/service_discovery_impl.hpp
+++ b/implementation/service_discovery/include/service_discovery_impl.hpp
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <boost/version.hpp>
 #include <boost/asio/ip/address.hpp>
 #include <map>
 #include <memory>
@@ -30,7 +31,7 @@
 #include "deserializer.hpp"
 #include "message_impl.hpp"
 
-#if VSOMEIP_BOOST_VERSION < 107600
+#if BOOST_VERSION < 107600
 #include <boost/container_hash/hash.hpp>
 
 // Custom hash function for boost::asio::ip::address.
@@ -42,7 +43,7 @@ struct address_hash {
                             : boost::hash<boost::asio::ip::address_v6::bytes_type>()(addr.to_v6().to_bytes());
     }
 };
-#endif // VSOMEIP_BOOST_VERSION < 107600
+#endif // BOOST_VERSION < 107600
 
 namespace vsomeip_v3 {
 
@@ -453,7 +454,7 @@ class service_discovery_impl : public service_discovery, public std::enable_shar
     std::atomic<uint32_t> offers_received_;
 
 // List of hosts from which we have received unicast and multicast messages.
-#if VSOMEIP_BOOST_VERSION < 107600
+#if BOOST_VERSION < 107600
     std::unordered_map<boost::asio::ip::address, std::tuple<bool, bool>, address_hash> observed_hosts;
 #else
     std::unordered_map<boost::asio::ip::address, std::tuple<bool, bool>> observed_hosts;
diff --git a/test/common/src/utility.cpp b/test/common/src/utility.cpp
index f58f837b2..a69a5460f 100644
--- a/test/common/src/utility.cpp
+++ b/test/common/src/utility.cpp
@@ -3,6 +3,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+#include <boost/version.hpp>
 #include <common/utility.hpp>
 
 void utility::load_policy_data(std::string _input, std::vector<vsomeip_v3::configuration_element>& _elements,
@@ -57,7 +58,7 @@ std::set<std::string> utility::get_all_files_in_dir(const std::string& _dir_path
                 if (boost::filesystem::is_directory(iter->path())
                     && (std::find(_dir_skip_list.begin(), _dir_skip_list.end(), iter->path().filename()) != _dir_skip_list.end())) {
                     // Boost Filesystem  API to skip current directory iteration
-#if VSOMEIP_BOOST_VERSION < 108100
+#if BOOST_VERSION < 108100
                     iter.no_push();
 #else
                     iter.disable_recursion_pending();