diff --git a/src/base/utils/random.cpp b/src/base/utils/random.cpp
index ef46fe860..b0b1e2d96 100644
--- a/src/base/utils/random.cpp
+++ b/src/base/utils/random.cpp
@@ -28,7 +28,6 @@
 
 #include "random.h"
 
-#include <limits>
 #include <random>
 
 #include <QtGlobal>
diff --git a/src/base/utils/random.h b/src/base/utils/random.h
index 93448191a..cc1a2888e 100644
--- a/src/base/utils/random.h
+++ b/src/base/utils/random.h
@@ -30,12 +30,13 @@
 #define UTILS_RANDOM_H
 
 #include <cstdint>
+#include <limits>
 
 namespace Utils
 {
     namespace Random
     {
-        uint32_t rand(uint32_t min = 0, uint32_t max = UINT32_MAX);
+        uint32_t rand(uint32_t min = 0, uint32_t max = std::numeric_limits<uint32_t>::max());
     }
 }
 
diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp
index e3cddc567..60b045474 100644
--- a/src/gui/advancedsettings.cpp
+++ b/src/gui/advancedsettings.cpp
@@ -377,19 +377,19 @@ void AdvancedSettings::loadAdvancedSettings()
             , &checkBoxSuggestMode);
     // Send buffer watermark
     spinBoxSendBufferWatermark.setMinimum(1);
-    spinBoxSendBufferWatermark.setMaximum(INT_MAX);
+    spinBoxSendBufferWatermark.setMaximum(std::numeric_limits<int>::max());
     spinBoxSendBufferWatermark.setSuffix(tr(" KiB"));
     spinBoxSendBufferWatermark.setValue(session->sendBufferWatermark());
     addRow(SEND_BUF_WATERMARK, (tr("Send buffer watermark") + ' ' + makeLink("https://www.libtorrent.org/reference-Settings.html#send_buffer_watermark", "(?)"))
             , &spinBoxSendBufferWatermark);
     spinBoxSendBufferLowWatermark.setMinimum(1);
-    spinBoxSendBufferLowWatermark.setMaximum(INT_MAX);
+    spinBoxSendBufferLowWatermark.setMaximum(std::numeric_limits<int>::max());
     spinBoxSendBufferLowWatermark.setSuffix(tr(" KiB"));
     spinBoxSendBufferLowWatermark.setValue(session->sendBufferLowWatermark());
     addRow(SEND_BUF_LOW_WATERMARK, (tr("Send buffer low watermark") + ' ' + makeLink("https://www.libtorrent.org/reference-Settings.html#send_buffer_low_watermark", "(?)"))
             , &spinBoxSendBufferLowWatermark);
     spinBoxSendBufferWatermarkFactor.setMinimum(1);
-    spinBoxSendBufferWatermarkFactor.setMaximum(INT_MAX);
+    spinBoxSendBufferWatermarkFactor.setMaximum(std::numeric_limits<int>::max());
     spinBoxSendBufferWatermarkFactor.setSuffix(" %");
     spinBoxSendBufferWatermarkFactor.setValue(session->sendBufferWatermarkFactor());
     addRow(SEND_BUF_WATERMARK_FACTOR, (tr("Send buffer watermark factor") + ' ' + makeLink("https://www.libtorrent.org/reference-Settings.html#send_buffer_watermark_factor", "(?)"))
diff --git a/src/webui/api/searchcontroller.cpp b/src/webui/api/searchcontroller.cpp
index 37491b4cd..1523cece5 100644
--- a/src/webui/api/searchcontroller.cpp
+++ b/src/webui/api/searchcontroller.cpp
@@ -28,6 +28,8 @@
 
 #include "searchcontroller.h"
 
+#include <limits>
+
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QSharedPointer>
@@ -293,7 +295,7 @@ int SearchController::generateSearchId() const
 
     while (true)
     {
-        const auto id = Utils::Random::rand(1, INT_MAX);
+        const int id = Utils::Random::rand(1, std::numeric_limits<int>::max());
         if (!searchHandlers.contains(id))
             return id;
     }