diff --git a/src/Mod/Measure/App/MeasureAngle.cpp b/src/Mod/Measure/App/MeasureAngle.cpp
index 73021f0b4e..5e72fbe5b4 100644
--- a/src/Mod/Measure/App/MeasureAngle.cpp
+++ b/src/Mod/Measure/App/MeasureAngle.cpp
@@ -108,7 +108,7 @@ bool MeasureAngle::isPrioritizedSelection(const App::MeasureSelection& selection
     getVec(*ob2, sub2, vec2);
 
 
-    double angle = std::fmod(vec1.GetAngle(vec2), D_PI);
+    double angle = std::fmod(vec1.GetAngle(vec2), std::numbers::pi);
     return angle > Base::Precision::Angular();
 }
 
diff --git a/src/Mod/Measure/App/PreCompiled.h b/src/Mod/Measure/App/PreCompiled.h
index c3f684ddc1..ee6e3a5092 100644
--- a/src/Mod/Measure/App/PreCompiled.h
+++ b/src/Mod/Measure/App/PreCompiled.h
@@ -30,7 +30,6 @@
 #ifdef _PreComp_
 
 // standard
-#include <cfloat>
 #include <cmath>
 
 // STL
diff --git a/src/Mod/Measure/Gui/PreCompiled.h b/src/Mod/Measure/Gui/PreCompiled.h
index a2a4065edf..c897421afa 100644
--- a/src/Mod/Measure/Gui/PreCompiled.h
+++ b/src/Mod/Measure/Gui/PreCompiled.h
@@ -44,7 +44,6 @@
 #ifdef _PreComp_
 
 // standard
-#include <cfloat>
 #include <cmath>
 
 // STL
diff --git a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp
index 5c1efba5f3..33cfbd62b2 100644
--- a/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp
+++ b/src/Mod/Measure/Gui/ViewProviderMeasureAngle.cpp
@@ -325,7 +325,7 @@ void ViewProviderMeasureAngle::redrawAnnotation()
 {
     auto obj = dynamic_cast<Measure::MeasureAngle*>(getMeasureObject());
     double angleDeg = obj->Angle.getValue();
-    constexpr double radiansPerDegree = M_PI / 180.0;
+    constexpr double radiansPerDegree = std::numbers::pi / 180.0;
     this->fieldAngle = angleDeg * radiansPerDegree;
 
     // Set matrix