diff --git a/src/lib/bezier/BezierQuad.cpp b/src/lib/bezier/BezierQuad.cpp
index c69ba265e1..1b8d73599f 100644
--- a/src/lib/bezier/BezierQuad.cpp
+++ b/src/lib/bezier/BezierQuad.cpp
@@ -41,9 +41,8 @@
 
 namespace bezier
 {
-
-#define GOLDEN_RATIO 1.61803398 //(sqrt(5)+1)/2
-#define RESOLUTION 0.0001  //represents resolution; end criterion for golden section search
+static constexpr double GOLDEN_RATIO = 1.6180339887; //(sqrt(5)+1)/2
+static constexpr double RESOLUTION = 0.0001; //End criterion for golden section search
 
 template<typename Tp>
 void BezierQuad<Tp>::setBezier(const Vector3_t &pt0, const Vector3_t &ctrl, const Vector3_t &pt1,
diff --git a/src/lib/mathlib/math/SearchMin.hpp b/src/lib/mathlib/math/SearchMin.hpp
index 4a02d5f9d1..f265c8ed68 100644
--- a/src/lib/mathlib/math/SearchMin.hpp
+++ b/src/lib/mathlib/math/SearchMin.hpp
@@ -38,14 +38,13 @@
  * - Golden Section Search
  */
 
-#define GOLDEN_RATIO 1.6180339887 //(sqrt(5)+1)/2
-
 #pragma once
 
 #include <platforms/px4_defines.h>
 
 namespace math
 {
+static constexpr double GOLDEN_RATIO = 1.6180339887; //(sqrt(5)+1)/2
 
 // Type-safe abs
 template<typename _Tp>
@@ -60,8 +59,8 @@ inline const _Tp goldensection(const _Tp &arg1, const _Tp &arg2, _Tp(*fun)(_Tp),
 {
 	_Tp a = arg1;
 	_Tp b = arg2;
-	_Tp c = b - (b - a) / ((_Tp)GOLDEN_RATIO);
-	_Tp d = a + (b - a) / ((_Tp)GOLDEN_RATIO);
+	_Tp c = b - (b - a) / GOLDEN_RATIO;
+	_Tp d = a + (b - a) / GOLDEN_RATIO;
 
 	while (abs_t(c - d) > tol) {
 
@@ -72,8 +71,8 @@ inline const _Tp goldensection(const _Tp &arg1, const _Tp &arg2, _Tp(*fun)(_Tp),
 			a = c;
 		}
 
-		c = b - (b - a) / ((_Tp)GOLDEN_RATIO);
-		d = a + (b - a) / ((_Tp)GOLDEN_RATIO);
+		c = b - (b - a) / GOLDEN_RATIO;
+		d = a + (b - a) / GOLDEN_RATIO;
 
 	}