diff --git a/include/utils/KelvinToRgb.h b/include/utils/KelvinToRgb.h
index 7bd4d162d..1f05d4053 100644
--- a/include/utils/KelvinToRgb.h
+++ b/include/utils/KelvinToRgb.h
@@ -66,9 +66,9 @@ static ColorRgb getRgbFromTemperature(int temperature)
 	}
 
 	return {
-		static_cast<uint8_t>(qBound(0, red, UINT8_MAX)),
-		static_cast<uint8_t>(qBound(0, green, UINT8_MAX)),
-		static_cast<uint8_t>(qBound(0, blue, UINT8_MAX)),
+		static_cast<uint8_t>(qBound(0,   red, static_cast<int>(UINT8_MAX))),
+		static_cast<uint8_t>(qBound(0, green, static_cast<int>(UINT8_MAX))),
+		static_cast<uint8_t>(qBound(0,  blue, static_cast<int>(UINT8_MAX))),
 	};
 }
 
diff --git a/include/utils/global_defines.h b/include/utils/global_defines.h
index 08c4a79a5..a79e7ea05 100644
--- a/include/utils/global_defines.h
+++ b/include/utils/global_defines.h
@@ -1,8 +1,31 @@
 #pragma once
 
+#include <cstdint>
+#include <limits>
+
+#include <QList>
+
 #define QSTRING_CSTR(str) str.toUtf8().constData()
 typedef QList< int > QIntList;
 
+// Undefine the max macro if it's defined (Windows-specific)
+#ifdef max
+#undef max
+#endif
+
+// Define your constexpr variable
 constexpr uint32_t UINT8_MAX_SQUARED = static_cast<uint32_t>(std::numeric_limits<unsigned char>::max()) * static_cast<uint32_t>(std::numeric_limits<unsigned char>::max());
 
+// Restore the max macro only if it was previously defined (Windows-specific)
+#ifdef _MSC_VER
+#define NOMINMAX  // Prevent Windows.h from defining min and max macros
+#endif
+
+// Restore the max macro if needed (Windows-specific)
+#ifdef _MSC_VER
+#ifndef max
+#define max(a,b)            (((a) > (b)) ? (a) : (b))
+#endif
+#endif
+