diff --git a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp
index 74a2848601..c021d21e3a 100644
--- a/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp
+++ b/src/Gui/3Dconnexion/navlib/NavlibPivot.cpp
@@ -22,6 +22,10 @@
 
 #include <PreCompiled.h>
 
+#ifndef _PreComp_
+#include <limits>
+#endif
+
 #include <QImage>
 #include <QScreen>
 #include <QString>
@@ -48,8 +52,6 @@
 #include <Gui/View3DInventorViewer.h>
 #include <Gui/ViewProvider.h>
 
-constexpr float MAX_FLOAT = std::numeric_limits<float>::max();
-
 long NavlibInterface::GetSelectionTransform(navlib::matrix_t&) const
 {
     return navlib::make_result_code(navlib::navlib_errc::no_data_available);
@@ -128,7 +130,7 @@ long NavlibInterface::GetHitLookAt(navlib::point_t& position) const
     SoRayPickAction rayPickAction(inventorViewer->getSoRenderManager()->getViewportRegion());
     SbMatrix cameraMatrix;
     SbVec3f closestHitPoint;
-    float minLength = MAX_FLOAT;
+    float minLength = std::numeric_limits<float>::max();
 
     // Get the camera rotation
     SoCamera* pCamera = getCamera<SoCamera*>();
@@ -196,7 +198,7 @@ long NavlibInterface::GetHitLookAt(navlib::point_t& position) const
         }
     }
 
-    if (minLength < MAX_FLOAT) {
+    if (minLength < std::numeric_limits<float>::max()) {
         std::copy(closestHitPoint.getValue(), closestHitPoint.getValue() + 3, &position.x);
         return 0;
     }
diff --git a/src/Gui/CallTips.cpp b/src/Gui/CallTips.cpp
index e3712f9c22..44e2599489 100644
--- a/src/Gui/CallTips.cpp
+++ b/src/Gui/CallTips.cpp
@@ -23,6 +23,7 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <limits>
 # include <QApplication>
 # include <QKeyEvent>
 # include <QLabel>
diff --git a/src/Gui/Clipping.cpp b/src/Gui/Clipping.cpp
index d2495c3720..aebf86e8bd 100644
--- a/src/Gui/Clipping.cpp
+++ b/src/Gui/Clipping.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <limits>
 #include <Inventor/actions/SoGetBoundingBoxAction.h>
 #include <Inventor/nodes/SoClipPlane.h>
 #include <Inventor/nodes/SoGroup.h>
diff --git a/src/Gui/DemoMode.cpp b/src/Gui/DemoMode.cpp
index d69224d891..a4eef9d65c 100644
--- a/src/Gui/DemoMode.cpp
+++ b/src/Gui/DemoMode.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <limits>
 #include <QCursor>
 #include <QTimer>
 #include <Inventor/nodes/SoCamera.h>
diff --git a/src/Gui/Dialogs/DlgParameterImp.cpp b/src/Gui/Dialogs/DlgParameterImp.cpp
index 8139e994ba..957d7992ef 100644
--- a/src/Gui/Dialogs/DlgParameterImp.cpp
+++ b/src/Gui/Dialogs/DlgParameterImp.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+#include <limits>
 #include <sstream>
 #include <QByteArray>
 #include <QContextMenuEvent>
diff --git a/src/Gui/EditableDatumLabel.cpp b/src/Gui/EditableDatumLabel.cpp
index 0604bc0a2d..17068a5db7 100644
--- a/src/Gui/EditableDatumLabel.cpp
+++ b/src/Gui/EditableDatumLabel.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <limits>
 # include <Inventor/sensors/SoNodeSensor.h>
 # include <Inventor/nodes/SoAnnotation.h>
 # include <Inventor/nodes/SoOrthographicCamera.h>
diff --git a/src/Gui/InputField.cpp b/src/Gui/InputField.cpp
index ee559b0bc6..6ebeb16844 100644
--- a/src/Gui/InputField.cpp
+++ b/src/Gui/InputField.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <limits>
 # include <QContextMenuEvent>
 # include <QMenu>
 # include <QPixmapCache>
diff --git a/src/Gui/OverlayManager.cpp b/src/Gui/OverlayManager.cpp
index 41cb897bc8..5515060f81 100644
--- a/src/Gui/OverlayManager.cpp
+++ b/src/Gui/OverlayManager.cpp
@@ -23,6 +23,7 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <limits>
 # include <QAction>
 # include <QApplication>
 # include <QComboBox>
diff --git a/src/Gui/PreCompiled.h b/src/Gui/PreCompiled.h
index c665016cf7..718190076b 100644
--- a/src/Gui/PreCompiled.h
+++ b/src/Gui/PreCompiled.h
@@ -65,6 +65,7 @@
 #include <algorithm>
 #include <atomic>
 #include <bitset>
+#include <limits>
 #include <list>
 #include <map>
 #include <numbers>
diff --git a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp
index 9e5bd6b5ba..1afea2d6c1 100644
--- a/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp
+++ b/src/Gui/PreferencePages/DlgSettingsCacheDirectory.cpp
@@ -23,6 +23,9 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+# include <cmath>
+# include <limits>
+# include <vector>
 # include <QCoreApplication>
 # include <QDate>
 # include <QDesktopServices>
@@ -31,8 +34,6 @@
 # include <QMessageBox>
 # include <QSettings>
 # include <QUrl>
-# include <cmath>
-# include <vector>
 #endif
 
 #include <App/Application.h>
diff --git a/src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp b/src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp
index cb352c303f..42b76b5d4b 100644
--- a/src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp
+++ b/src/Gui/PreferencePages/DlgSettingsDocumentImp.cpp
@@ -22,6 +22,10 @@
 
 #include "PreCompiled.h"
 
+#ifndef _PreComp_
+#include <limits>
+#endif
+
 #include <zlib.h>
 #include <App/License.h>
 #include <Gui/AutoSaver.h>
diff --git a/src/Gui/QuantitySpinBox.cpp b/src/Gui/QuantitySpinBox.cpp
index cc18e8be11..18657e6ed5 100644
--- a/src/Gui/QuantitySpinBox.cpp
+++ b/src/Gui/QuantitySpinBox.cpp
@@ -23,6 +23,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <limits>
 # include <QApplication>
 # include <QDebug>
 # include <QFocusEvent>
diff --git a/src/Gui/Selection/SelectionFilter.h b/src/Gui/Selection/SelectionFilter.h
index 563acd90af..13981dabbc 100644
--- a/src/Gui/Selection/SelectionFilter.h
+++ b/src/Gui/Selection/SelectionFilter.h
@@ -24,6 +24,7 @@
 #ifndef GUI_SelectionFilter_H
 #define GUI_SelectionFilter_H
 
+#include <limits>
 #include <memory>
 #include <string>
 #include <CXX/Extensions.hxx>
diff --git a/src/Gui/Selection/SoFCSelectionContext.h b/src/Gui/Selection/SoFCSelectionContext.h
index d9cb345bbf..7eabce062d 100644
--- a/src/Gui/Selection/SoFCSelectionContext.h
+++ b/src/Gui/Selection/SoFCSelectionContext.h
@@ -23,6 +23,7 @@
 #ifndef GUI_SOFCSELECTIONCONTEXT_H
 #define GUI_SOFCSELECTIONCONTEXT_H
 
+#include <limits>
 #include <map>
 #include <memory>
 #include <set>
diff --git a/src/Gui/ShortcutManager.cpp b/src/Gui/ShortcutManager.cpp
index 2f49e8fd7d..0fbf60d3fe 100644
--- a/src/Gui/ShortcutManager.cpp
+++ b/src/Gui/ShortcutManager.cpp
@@ -22,6 +22,7 @@
 
 #include "PreCompiled.h"
 #ifndef _PreComp_
+# include <limits>
 # include <QShortcutEvent>
 # include <QApplication>
 #endif
diff --git a/src/Gui/SoDatumLabel.cpp b/src/Gui/SoDatumLabel.cpp
index 978a7721a1..928284e67f 100644
--- a/src/Gui/SoDatumLabel.cpp
+++ b/src/Gui/SoDatumLabel.cpp
@@ -35,6 +35,7 @@
 
 # include <algorithm>
 # include <cmath>
+# include <limits>
 # include <numbers>
 # include <QFontMetrics>
 # include <QPainter>
diff --git a/src/Gui/SpinBox.cpp b/src/Gui/SpinBox.cpp
index a4fdb99add..d25b0a201c 100644
--- a/src/Gui/SpinBox.cpp
+++ b/src/Gui/SpinBox.cpp
@@ -23,7 +23,7 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
-# include <climits>
+# include <limits>
 # include <QKeyEvent>
 # include <QLineEdit>
 # include <QStyle>
diff --git a/src/Gui/VectorListEditor.cpp b/src/Gui/VectorListEditor.cpp
index 0e432920d1..85e69ec673 100644
--- a/src/Gui/VectorListEditor.cpp
+++ b/src/Gui/VectorListEditor.cpp
@@ -22,6 +22,10 @@
 
 #include "PreCompiled.h"
 
+#ifndef _PreComp_
+#include <limits>
+#endif
+
 #include "VectorListEditor.h"
 #include "ui_VectorListEditor.h"
 #include "QuantitySpinBox.h"
diff --git a/src/Gui/propertyeditor/PropertyItem.cpp b/src/Gui/propertyeditor/PropertyItem.cpp
index 94bbd659f7..48733f4826 100644
--- a/src/Gui/propertyeditor/PropertyItem.cpp
+++ b/src/Gui/propertyeditor/PropertyItem.cpp
@@ -26,6 +26,7 @@
 #ifndef _PreComp_
 #include <algorithm>
 #include <iomanip>
+#include <limits>
 #include <QApplication>
 #include <QComboBox>
 #include <QFontDatabase>
diff --git a/src/Gui/propertyeditor/PropertyModel.cpp b/src/Gui/propertyeditor/PropertyModel.cpp
index aa93d2563a..3babbd74f4 100644
--- a/src/Gui/propertyeditor/PropertyModel.cpp
+++ b/src/Gui/propertyeditor/PropertyModel.cpp
@@ -23,6 +23,7 @@
 #include "PreCompiled.h"
 
 #ifndef _PreComp_
+#include <limits>
 #include <boost/algorithm/string/predicate.hpp>
 #endif