diff --git a/Utilities/cfmt.h b/Utilities/cfmt.h
index 50e32e4a71..16cb08717d 100644
--- a/Utilities/cfmt.h
+++ b/Utilities/cfmt.h
@@ -6,7 +6,7 @@
 #include <vector>
 #include <algorithm>
 
-static const size_t size_dropped = std::numeric_limits<size_t>::max();
+static const std::size_t size_dropped = -1;
 
 /*
 C-style format parser. Appends formatted string to `out`, returns number of characters written.
diff --git a/Utilities/types.h b/Utilities/types.h
index f6aa9469bc..06742faa03 100644
--- a/Utilities/types.h
+++ b/Utilities/types.h
@@ -14,7 +14,6 @@
 #include <type_traits>
 #include <utility>
 #include <chrono>
-#include <limits>
 #include <array>
 
 using std::chrono::steady_clock;
@@ -515,13 +514,13 @@ constexpr inline struct umax_helper
 	template <typename T, typename S = simple_t<T>, typename = std::enable_if_t<std::is_unsigned_v<S>>>
 	explicit constexpr operator T() const
 	{
-		return std::numeric_limits<S>::max();
+		return static_cast<S>(-1);
 	}
 
 	template <typename T, typename S = simple_t<T>, typename = std::enable_if_t<std::is_unsigned_v<S>>>
 	constexpr bool operator==(const T& rhs) const
 	{
-		return rhs == std::numeric_limits<S>::max();
+		return rhs == static_cast<S>(-1);
 	}
 
 #if __cpp_impl_three_way_comparison >= 201711 && !__INTELLISENSE__
@@ -529,7 +528,7 @@ constexpr inline struct umax_helper
 	template <typename T>
 	friend constexpr std::enable_if_t<std::is_unsigned_v<simple_t<T>>, bool> operator==(const T& lhs, const umax_helper& rhs)
 	{
-		return lhs == std::numeric_limits<simple_t<T>>::max();
+		return lhs == static_cast<simple_t<T>>(-1);
 	}
 #endif
 
@@ -538,13 +537,13 @@ constexpr inline struct umax_helper
 	template <typename T, typename S = simple_t<T>, typename = std::enable_if_t<std::is_unsigned_v<S>>>
 	constexpr bool operator!=(const T& rhs) const
 	{
-		return rhs != std::numeric_limits<S>::max();
+		return rhs != static_cast<S>(-1);
 	}
 
 	template <typename T>
 	friend constexpr std::enable_if_t<std::is_unsigned_v<simple_t<T>>, bool> operator!=(const T& lhs, const umax_helper& rhs)
 	{
-		return lhs != std::numeric_limits<simple_t<T>>::max();
+		return lhs != static_cast<simple_t<T>>(-1);
 	}
 #endif
 } umax;
diff --git a/rpcs3/Emu/CPU/CPUDisAsm.h b/rpcs3/Emu/CPU/CPUDisAsm.h
index eaf3971bef..f2d7bde909 100644
--- a/rpcs3/Emu/CPU/CPUDisAsm.h
+++ b/rpcs3/Emu/CPU/CPUDisAsm.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <limits>
 #include "Utilities/StrFmt.h"
 
 enum CPUDisAsmMode
diff --git a/rpcs3/Emu/Cell/lv2/sys_net.cpp b/rpcs3/Emu/Cell/lv2/sys_net.cpp
index 9ecfb908a2..fb6fd255a9 100644
--- a/rpcs3/Emu/Cell/lv2/sys_net.cpp
+++ b/rpcs3/Emu/Cell/lv2/sys_net.cpp
@@ -25,7 +25,6 @@
 
 #include "Emu/NP/np_handler.h"
 
-#include <limits>
 #include <chrono>
 #include <shared_mutex>
 
diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp
index 7f600cef37..8458a7148e 100644
--- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp
+++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp
@@ -685,7 +685,7 @@ namespace
 	template <typename T>
 	constexpr T index_limit()
 	{
-		return std::numeric_limits<T>::max();
+		return -1;
 	}
 
 	template <typename T>
diff --git a/rpcs3/Input/ds4_pad_handler.h b/rpcs3/Input/ds4_pad_handler.h
index d9114fcb7c..7f8aced4d3 100644
--- a/rpcs3/Input/ds4_pad_handler.h
+++ b/rpcs3/Input/ds4_pad_handler.h
@@ -132,10 +132,10 @@ private:
 		const s32 rem = calibData.sensNumer % calibData.sensDenom;
 		const s32 output = (quot * biased) + ((rem * biased) / calibData.sensDenom);
 
-		if (output > std::numeric_limits<s16>::max())
-			return std::numeric_limits<s16>::max();
-		else if (output < std::numeric_limits<s16>::min())
-			return std::numeric_limits<s16>::min();
+		if (output > INT16_MAX)
+			return INT16_MAX;
+		else if (output < INT16_MIN)
+			return INT16_MIN;
 		else return static_cast<s16>(output);
 	}
 
diff --git a/rpcs3/rpcs3qt/qt_utils.cpp b/rpcs3/rpcs3qt/qt_utils.cpp
index 620b3002b6..3afe6a0354 100644
--- a/rpcs3/rpcs3qt/qt_utils.cpp
+++ b/rpcs3/rpcs3qt/qt_utils.cpp
@@ -22,10 +22,10 @@ namespace gui
 			// Get minimum virtual screen x & y for clamping the
 			// window x & y later while taking the width and height
 			// into account, so they don't go offscreen
-			s32 min_screen_x = std::numeric_limits<s32>::max();
-			s32 max_screen_x = std::numeric_limits<s32>::min();
-			s32 min_screen_y = std::numeric_limits<s32>::max();
-			s32 max_screen_y = std::numeric_limits<s32>::min();
+			s32 min_screen_x = INT32_MAX;
+			s32 max_screen_x = INT32_MIN;
+			s32 min_screen_y = INT32_MAX;
+			s32 max_screen_y = INT32_MIN;
 			for (auto screen : QApplication::screens())
 			{
 				auto screen_geometry = screen->availableGeometry();
diff --git a/rpcs3/util/atomic.hpp b/rpcs3/util/atomic.hpp
index a0f8b5212f..07d7bc2aec 100644
--- a/rpcs3/util/atomic.hpp
+++ b/rpcs3/util/atomic.hpp
@@ -1463,7 +1463,7 @@ public:
 	}
 
 	// Conditionally decrement
-	bool try_dec(simple_type greater_than = std::numeric_limits<simple_type>::min())
+	bool try_dec(simple_type greater_than)
 	{
 		type _new, old = atomic_storage<type>::load(m_data);
 
@@ -1486,7 +1486,7 @@ public:
 	}
 
 	// Conditionally increment
-	bool try_inc(simple_type less_than = std::numeric_limits<simple_type>::max())
+	bool try_inc(simple_type less_than)
 	{
 		type _new, old = atomic_storage<type>::load(m_data);