diff --git a/Utilities/BitField.h b/Utilities/BitField.h
index 55b2513a09..faa5a2a45a 100644
--- a/Utilities/BitField.h
+++ b/Utilities/BitField.h
@@ -13,7 +13,7 @@ struct bf_base
 {
 	using type = T;
 	using vtype = std::common_type_t<type>;
-	using utype = typename std::make_unsigned<vtype>::type;
+	using utype = std::make_unsigned_t<vtype>;
 
 	static constexpr bool can_be_packed = N < (sizeof(int) * 8 + (std::is_unsigned_v<vtype> ? 1 : 0)) && sizeof(vtype) > sizeof(int);
 	using compact_type = std::conditional_t<can_be_packed, std::conditional_t<std::is_unsigned_v<vtype>, uint, int>, vtype>;
diff --git a/rpcs3/Emu/RSX/Common/simple_array.hpp b/rpcs3/Emu/RSX/Common/simple_array.hpp
index b59f748538..a7da780f08 100644
--- a/rpcs3/Emu/RSX/Common/simple_array.hpp
+++ b/rpcs3/Emu/RSX/Common/simple_array.hpp
@@ -410,7 +410,7 @@ namespace rsx
 			std::sort(begin(), end(), predicate);
 		}
 
-		template <typename F, typename U = std::invoke_result<F, const Ty&>::type>
+		template <typename F, typename U = std::invoke_result_t<F, const Ty&>>
 			requires std::is_invocable_v<F, const Ty&>
 		simple_array<U> map(F&& xform) const
 		{
diff --git a/rpcs3/Emu/RSX/Common/surface_utils.h b/rpcs3/Emu/RSX/Common/surface_utils.h
index d7e33623a7..bcecfb8db8 100644
--- a/rpcs3/Emu/RSX/Common/surface_utils.h
+++ b/rpcs3/Emu/RSX/Common/surface_utils.h
@@ -149,7 +149,7 @@ namespace rsx
 
 		rsx::address_range memory_range;
 
-		std::unique_ptr<typename std::remove_pointer<image_storage_type>::type> resolve_surface;
+		std::unique_ptr<typename std::remove_pointer_t<image_storage_type>> resolve_surface;
 		surface_sample_layout sample_layout = surface_sample_layout::null;
 		surface_raster_type raster_type = surface_raster_type::linear;
 
diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h
index 5a8aae2b9d..31b63f2cb7 100644
--- a/rpcs3/Emu/RSX/GL/GLTextureCache.h
+++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Emu/RSX/GL/GLTexture.h"
 #include "GLRenderTargets.h"
 #include "glutils/blitter.h"
 #include "glutils/sync.hpp"
diff --git a/rpcs3/util/atomic.hpp b/rpcs3/util/atomic.hpp
index 85e366943b..7d839b07c3 100644
--- a/rpcs3/util/atomic.hpp
+++ b/rpcs3/util/atomic.hpp
@@ -1167,7 +1167,7 @@ template <typename T, usz Align = sizeof(T)>
 class atomic_t
 {
 protected:
-	using type = typename std::remove_cv<T>::type;
+	using type = std::remove_cv_t<T>;
 
 	using ptr_rt = std::conditional_t<std::is_pointer_v<type>, ullong, type>;
 
diff --git a/rpcs3/util/endian.hpp b/rpcs3/util/endian.hpp
index 009ccbaf6c..c4748b34d5 100644
--- a/rpcs3/util/endian.hpp
+++ b/rpcs3/util/endian.hpp
@@ -148,7 +148,7 @@ namespace stx
 	template <typename T, bool Swap, usz Align = alignof(T)>
 	class alignas(Align) se_t
 	{
-		using type = typename std::remove_cv<T>::type;
+		using type = std::remove_cv_t<T>;
 		using stype = typename se_storage<type, Align>::type;
 		using storage = se_storage<type, Align>;