diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45040f396b6..b50b854ea5e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,6 @@ find_package(Boost ${BOOST_MINIMUM_VERSION} REQUIRED)
 if (NOT Boost_VERSION_MACRO)
     set(Boost_VERSION_MACRO ${Boost_VERSION})
 endif()
-add_definitions(-DBoost_VERSION_MACRO=${Boost_VERSION_MACRO})
 set(BOOST_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
 
 include(CheckCCompilerFlag)
diff --git a/NEWS.md b/NEWS.md
index 299c71e5024..feb7c7789b3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -70,6 +70,42 @@ milestone for 3.7.0
 ## pgRouting 3.6
 
 
+### pgRouting 3.6.3 Release Notes
+
+To see all issues & pull requests closed by this release see the [Git closed
+milestone for 3.6.3
+](https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.3%22)
+
+**Build**
+
+* Explicit minimum requirements:
+
+  * postgres 11.0.0
+  * postgis 3.0.0
+
+**Code fixes**
+
+* Fix warnings from cpplint.
+* Fix warnings from clang 18.
+
+**CI tests**
+
+* Add a clang tidy test on changed files.
+* Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1,
+  3.1.2
+
+**Documentation**
+
+* Results of documentation queries adujsted to boost 1.83.0 version:
+
+  * pgr_edgeDisjointPaths
+  * pgr_stoerWagner
+
+**pgtap tests**
+
+* bug fixes
+
+
 ### pgRouting 3.6.2 Release Notes
 
 To see all issues & pull requests closed by this release see the [Git closed
diff --git a/doc/src/release_notes.rst b/doc/src/release_notes.rst
index 7d61e54d11f..ff53e86be6f 100644
--- a/doc/src/release_notes.rst
+++ b/doc/src/release_notes.rst
@@ -102,6 +102,43 @@ pgRouting 3.6
    :local:
    :depth: 1
 
+pgRouting 3.6.3 Release Notes
+-------------------------------------------------------------------------------
+
+To see all issues & pull requests closed by this release see the `Git closed
+milestone for 3.6.3
+<https://github.com/pgRouting/pgrouting/issues?utf8=%E2%9C%93&q=milestone%3A%22Release%203.6.3%22>`__
+
+.. rubric:: Build
+
+* Explicit minimum requirements:
+
+  * postgres 11.0.0
+  * postgis 3.0.0
+
+.. rubric:: Code fixes
+
+* Fix warnings from cpplint.
+* Fix warnings from clang 18.
+
+.. rubric:: CI tests
+
+* Add a clang tidy test on changed files.
+* Update test not done on versions: 3.0.1, 3.0.2, 3.0.3, 3.0.4, 3.1.0, 3.1.1,
+  3.1.2
+
+.. rubric:: Documentation
+
+* Results of documentation queries adujsted to boost 1.83.0 version:
+
+  * pgr_edgeDisjointPaths
+  * pgr_stoerWagner
+
+.. rubric:: pgtap tests
+
+* bug fixes
+
+
 pgRouting 3.6.2 Release Notes
 -------------------------------------------------------------------------------
 
diff --git a/include/coloring/pgr_edgeColoring.hpp b/include/coloring/pgr_edgeColoring.hpp
index eeb6a53f15a..f697ea967ab 100644
--- a/include/coloring/pgr_edgeColoring.hpp
+++ b/include/coloring/pgr_edgeColoring.hpp
@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>
+#include <boost/version.hpp>
 
 #include "cpp_common/edge_t.hpp"
 #include "c_types/ii_t_rt.h"
@@ -59,7 +60,7 @@ class Pgr_edgeColoring : public Pgr_messages {
     explicit Pgr_edgeColoring(const std::vector<Edge_t>&);
     Pgr_edgeColoring() = delete;
 
-#if Boost_VERSION_MACRO >= 106800
+#if BOOST_VERSION >= 106800
     friend std::ostream& operator<<(std::ostream &, const Pgr_edgeColoring&);
 #endif
 
diff --git a/include/tsp/tsp.hpp b/include/tsp/tsp.hpp
index ef9e549c332..8933af6b775 100644
--- a/include/tsp/tsp.hpp
+++ b/include/tsp/tsp.hpp
@@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 #include <boost/config.hpp>
 #include <boost/graph/adjacency_list.hpp>
+#include <boost/version.hpp>
 
 #include "c_types/iid_t_rt.h"
 #include "cpp_common/coordinate_t.hpp"
@@ -77,7 +78,7 @@ class TSP : public Pgr_messages {
     explicit TSP(const std::vector<Coordinate_t>&);
     TSP() = delete;
 
-#if Boost_VERSION_MACRO >= 106800
+#if BOOST_VERSION >= 106800
     friend std::ostream& operator<<(std::ostream &, const TSP&);
 #endif
     bool has_vertex(int64_t id) const;
diff --git a/src/alpha_shape/pgr_alphaShape.cpp b/src/alpha_shape/pgr_alphaShape.cpp
index b6bad91ee20..adbe522ea0a 100644
--- a/src/alpha_shape/pgr_alphaShape.cpp
+++ b/src/alpha_shape/pgr_alphaShape.cpp
@@ -41,7 +41,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/geometry/algorithms/num_points.hpp>
 #include <boost/geometry/algorithms/append.hpp>
 #include <boost/geometry/algorithms/area.hpp>
-#if Boost_VERSION_MACRO >= 107500
+#include <boost/version.hpp>
+#if BOOST_VERSION >= 107500
 #    include <boost/geometry/strategies/strategies.hpp>
 #else
 #    include <boost/geometry/strategies/agnostic/point_in_point.hpp>
diff --git a/src/tsp/tsp.cpp b/src/tsp/tsp.cpp
index 67f7258a858..e9698971352 100644
--- a/src/tsp/tsp.cpp
+++ b/src/tsp/tsp.cpp
@@ -37,6 +37,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 #include <boost/graph/connected_components.hpp>
 #include <boost/graph/dijkstra_shortest_paths.hpp>
 #include <boost/graph/graph_utility.hpp>
+#include <boost/version.hpp>
 
 #include "cpp_common/identifiers.hpp"
 #include "cpp_common/pgr_messages.hpp"
@@ -503,7 +504,7 @@ TSP::get_edge_id(E e) const {
 
 
 
-#if Boost_VERSION_MACRO >= 106800
+#if BOOST_VERSION >= 106800
 std::ostream& operator<<(std::ostream &log, const TSP& data) {
     log << "Number of Vertices is:" << num_vertices(data.graph) << "\n";
     log << "Number of Edges is:" << num_edges(data.graph) << "\n";