diff --git a/Utilities/BEType.h b/Utilities/BEType.h
index 23bc07db7f..226584f95f 100644
--- a/Utilities/BEType.h
+++ b/Utilities/BEType.h
@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/endian.hpp"
 #include <cstring>
 #include <cmath>
diff --git a/Utilities/BitField.h b/Utilities/BitField.h
index ec3390a391..2130289e27 100644
--- a/Utilities/BitField.h
+++ b/Utilities/BitField.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 
 template<typename T, uint N>
 struct bf_base
diff --git a/Utilities/CPUStats.h b/Utilities/CPUStats.h
index b4015e2e8f..dde51bf323 100644
--- a/Utilities/CPUStats.h
+++ b/Utilities/CPUStats.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Utilities/types.h>
+#include "util/types.hpp"
 
 #ifdef _WIN32
 #include "windows.h"
diff --git a/Utilities/Config.cpp b/Utilities/Config.cpp
index cdd949fd7d..d0bd68819f 100644
--- a/Utilities/Config.cpp
+++ b/Utilities/Config.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "Config.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 #include "util/yaml.hpp"
 
diff --git a/Utilities/Config.h b/Utilities/Config.h
index 51dfaba912..7f2a2f335f 100644
--- a/Utilities/Config.h
+++ b/Utilities/Config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/StrFmt.h"
 #include "util/logs.hpp"
 #include "util/atomic.hpp"
diff --git a/Utilities/File.h b/Utilities/File.h
index e5a7d9950d..19479c5fe0 100644
--- a/Utilities/File.h
+++ b/Utilities/File.h
@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "types.h"
+#include "util/types.hpp"
 #include "bit_set.h"
 
 #include <memory>
diff --git a/Utilities/JIT.cpp b/Utilities/JIT.cpp
index 245e64012d..2d8431d873 100644
--- a/Utilities/JIT.cpp
+++ b/Utilities/JIT.cpp
@@ -1,4 +1,4 @@
-#include "types.h"
+#include "util/types.hpp"
 #include "JIT.h"
 #include "StrFmt.h"
 #include "File.h"
diff --git a/Utilities/JIT.h b/Utilities/JIT.h
index eddb7f732f..6570261f1e 100644
--- a/Utilities/JIT.h
+++ b/Utilities/JIT.h
@@ -167,7 +167,7 @@ inline FT build_function_asm(F&& builder)
 #include <string_view>
 #include <unordered_map>
 
-#include "types.h"
+#include "util/types.hpp"
 #include "mutex.h"
 
 #include "restore_new.h"
diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h
index 6a6883b200..fd18d08f11 100644
--- a/Utilities/StrFmt.h
+++ b/Utilities/StrFmt.h
@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "types.h"
+#include "util/types.hpp"
 
 #include <string>
 
diff --git a/Utilities/Thread.h b/Utilities/Thread.h
index c6919ba6d2..48b1b0eec2 100644
--- a/Utilities/Thread.h
+++ b/Utilities/Thread.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 #include "util/shared_ptr.hpp"
 
diff --git a/Utilities/Timer.h b/Utilities/Timer.h
index 3a7d4e6f55..58edcda7cb 100644
--- a/Utilities/Timer.h
+++ b/Utilities/Timer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 
 #include <chrono>
 
diff --git a/Utilities/address_range.h b/Utilities/address_range.h
index 61c0b5b98d..ddc8660951 100644
--- a/Utilities/address_range.h
+++ b/Utilities/address_range.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "StrFmt.h"
 #include <vector>
 
diff --git a/Utilities/bit_set.h b/Utilities/bit_set.h
index d70668114c..784185573e 100644
--- a/Utilities/bit_set.h
+++ b/Utilities/bit_set.h
@@ -21,7 +21,7 @@ Examples:
 Intersection (&) and symmetric difference (^) is also available.
 */
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 template <typename T>
diff --git a/Utilities/cfmt.h b/Utilities/cfmt.h
index 16cb08717d..ce0f3e6ec4 100644
--- a/Utilities/cfmt.h
+++ b/Utilities/cfmt.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include <climits>
 #include <string>
 #include <vector>
diff --git a/Utilities/cond.h b/Utilities/cond.h
index d4dd4db204..642622f0a8 100644
--- a/Utilities/cond.h
+++ b/Utilities/cond.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 // Lightweight condition variable
diff --git a/Utilities/hash.h b/Utilities/hash.h
index 4f8910d2ec..72ab4cf7c5 100644
--- a/Utilities/hash.h
+++ b/Utilities/hash.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 namespace rpcs3
 {
diff --git a/Utilities/lockless.h b/Utilities/lockless.h
index 3936cdda85..85ab4703d6 100644
--- a/Utilities/lockless.h
+++ b/Utilities/lockless.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 //! Simple sizeless array base for concurrent access. Cannot shrink, only growths automatically.
diff --git a/Utilities/mutex.h b/Utilities/mutex.h
index c0846ea9b9..a02d9945da 100644
--- a/Utilities/mutex.h
+++ b/Utilities/mutex.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <mutex>
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 // Shared mutex with small size (u32).
diff --git a/Utilities/sema.h b/Utilities/sema.h
index 947ca0a6ab..a67527ea0b 100644
--- a/Utilities/sema.h
+++ b/Utilities/sema.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <mutex>
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 
 // Lightweight semaphore helper class
diff --git a/Utilities/sync.h b/Utilities/sync.h
index 7309499ad5..6c89f3cfe4 100644
--- a/Utilities/sync.h
+++ b/Utilities/sync.h
@@ -2,7 +2,7 @@
 
 /* For internal use. Don't include. */
 
-#include "types.h"
+#include "util/types.hpp"
 #include "util/atomic.hpp"
 #include "util/dyn_lib.hpp"
 
diff --git a/Utilities/sysinfo.h b/Utilities/sysinfo.h
index c202fb2264..aed1026c08 100755
--- a/Utilities/sysinfo.h
+++ b/Utilities/sysinfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include <string>
 
 namespace utils
diff --git a/Utilities/typemap.h b/Utilities/typemap.h
index 997b737609..ed1bb7bcdc 100644
--- a/Utilities/typemap.h
+++ b/Utilities/typemap.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include "mutex.h"
 #include "util/atomic.hpp"
 #include "util/typeindices.hpp"
diff --git a/Utilities/version.h b/Utilities/version.h
index 24389c1098..00180b5436 100644
--- a/Utilities/version.h
+++ b/Utilities/version.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "types.h"
+#include "util/types.hpp"
 #include <string>
 
 namespace utils
diff --git a/rpcs3/Crypto/key_vault.h b/rpcs3/Crypto/key_vault.h
index 284bc62900..86f4590a41 100644
--- a/rpcs3/Crypto/key_vault.h
+++ b/rpcs3/Crypto/key_vault.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 #include <string>
 #include <vector>
diff --git a/rpcs3/Crypto/unself.h b/rpcs3/Crypto/unself.h
index 9233b18044..382b739e3b 100644
--- a/rpcs3/Crypto/unself.h
+++ b/rpcs3/Crypto/unself.h
@@ -3,7 +3,7 @@
 #include "key_vault.h"
 #include "zlib.h"
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/File.h"
 #include "util/logs.hpp"
 
diff --git a/rpcs3/Crypto/utils.h b/rpcs3/Crypto/utils.h
index c2b190ad16..be7af32b17 100644
--- a/rpcs3/Crypto/utils.h
+++ b/rpcs3/Crypto/utils.h
@@ -4,7 +4,7 @@
 // Licensed under the terms of the GNU GPL, version 3
 // http://www.gnu.org/licenses/gpl-3.0.txt
 
-#include "../../Utilities/types.h"
+#include "util/types.hpp"
 
 #include <stdlib.h>
 #include "aes.h"
diff --git a/rpcs3/Emu/Audio/AudioBackend.h b/rpcs3/Emu/Audio/AudioBackend.h
index ea8089616d..eed1054628 100644
--- a/rpcs3/Emu/Audio/AudioBackend.h
+++ b/rpcs3/Emu/Audio/AudioBackend.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum : u32
 {
@@ -101,7 +101,7 @@ public:
 	u32 get_sample_size() const;
 
 	u32 get_channels() const;
-	
+
 	bool get_convert_to_u16() const;
 
 	bool has_capability(u32 cap) const;
diff --git a/rpcs3/Emu/Audio/AudioDumper.h b/rpcs3/Emu/Audio/AudioDumper.h
index f4dfdcd483..ebdef123c4 100644
--- a/rpcs3/Emu/Audio/AudioDumper.h
+++ b/rpcs3/Emu/Audio/AudioDumper.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/File.h"
 
 struct WAVHeader
diff --git a/rpcs3/Emu/CPU/CPUTranslator.h b/rpcs3/Emu/CPU/CPUTranslator.h
index 3ef7a59568..fbd371ede8 100644
--- a/rpcs3/Emu/CPU/CPUTranslator.h
+++ b/rpcs3/Emu/CPU/CPUTranslator.h
@@ -24,7 +24,7 @@
 #endif
 #include "define_new_memleakdetect.h"
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/StrFmt.h"
 #include "Utilities/BEType.h"
 #include "Utilities/BitField.h"
diff --git a/rpcs3/Emu/Cell/Common.h b/rpcs3/Emu/Cell/Common.h
index 21ddbd5c85..37cbba3844 100644
--- a/rpcs3/Emu/Cell/Common.h
+++ b/rpcs3/Emu/Cell/Common.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 // Floating-point rounding mode (for both PPU and SPU)
 enum FPSCR_RN
diff --git a/rpcs3/Emu/Cell/ErrorCodes.h b/rpcs3/Emu/Cell/ErrorCodes.h
index fe7bfdbf7a..651e9007b5 100644
--- a/rpcs3/Emu/Cell/ErrorCodes.h
+++ b/rpcs3/Emu/Cell/ErrorCodes.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 // Error code type (return type), implements error reporting.
 class error_code
diff --git a/rpcs3/Emu/Cell/MFC.h b/rpcs3/Emu/Cell/MFC.h
index 86a28b8c1d..8905159e43 100644
--- a/rpcs3/Emu/Cell/MFC.h
+++ b/rpcs3/Emu/Cell/MFC.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum MFC : u8
 {
diff --git a/rpcs3/Emu/Cell/Modules/StaticHLE.h b/rpcs3/Emu/Cell/Modules/StaticHLE.h
index 28588e21e5..3860b46eec 100644
--- a/rpcs3/Emu/Cell/Modules/StaticHLE.h
+++ b/rpcs3/Emu/Cell/Modules/StaticHLE.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Utilities/types.h"
+#include "util/types.hpp"
 #include "Emu/Memory/vm_ptr.h"
 #include <vector>
 
diff --git a/rpcs3/Emu/Cell/SPUAnalyser.h b/rpcs3/Emu/Cell/SPUAnalyser.h
index 0f30e5b690..fa322c242b 100644
--- a/rpcs3/Emu/Cell/SPUAnalyser.h
+++ b/rpcs3/Emu/Cell/SPUAnalyser.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 // SPU Instruction Type
 struct spu_itype
diff --git a/rpcs3/Emu/Cell/lv2/sys_trace.h b/rpcs3/Emu/Cell/lv2/sys_trace.h
index 83c9105142..87b2071d2f 100644
--- a/rpcs3/Emu/Cell/lv2/sys_trace.h
+++ b/rpcs3/Emu/Cell/lv2/sys_trace.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 // SysCalls
 s32 sys_trace_create();
diff --git a/rpcs3/Emu/GameInfo.h b/rpcs3/Emu/GameInfo.h
index 3c7f0fcd55..efd2819799 100644
--- a/rpcs3/Emu/GameInfo.h
+++ b/rpcs3/Emu/GameInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include <string>
 
 struct GameInfo
diff --git a/rpcs3/Emu/IdManager.h b/rpcs3/Emu/IdManager.h
index 5712d777f5..f33e5ac0da 100644
--- a/rpcs3/Emu/IdManager.h
+++ b/rpcs3/Emu/IdManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/mutex.h"
 
 #include <memory>
@@ -48,7 +48,7 @@ namespace id_manager
 		static constexpr std::pair<u32, u32> invl_range = invl_range_extract_impl<T>::invl_range;
 
 		static_assert(count && step && u64{step} * (count - 1) + base < u64{UINT32_MAX} + (base != 0 ? 1 : 0), "ID traits: invalid object range");
-	
+
 		// TODO: Add more conditions
 		static_assert(!invl_range.second || (u64{invl_range.second} + invl_range.first <= 32 /*....*/ ));
 	};
@@ -580,7 +580,7 @@ public:
 		{
 			std::lock_guard lock(id_manager::g_mutex);
 
-			if (const auto found = find_id<T, Get>(id); found && 
+			if (const auto found = find_id<T, Get>(id); found &&
 				(!found->second.owner_before(sptr) && !sptr.owner_before(found->second)))
 			{
 				ptr = std::move(found->second);
diff --git a/rpcs3/Emu/Io/Keyboard.h b/rpcs3/Emu/Io/Keyboard.h
index 20cf4c21f7..ac54e7fdd2 100644
--- a/rpcs3/Emu/Io/Keyboard.h
+++ b/rpcs3/Emu/Io/Keyboard.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum
 {
@@ -92,7 +92,7 @@ enum Keys
 	CELL_KEYC_KANA        = 0x88,
 	CELL_KEYC_HENKAN      = 0x8a,
 	CELL_KEYC_MUHENKAN    = 0x8b,
-	
+
 	// Raw keycodes for ASCII keys
 	CELL_KEYC_A                     = 0x04,
 	CELL_KEYC_B                     = 0x05,
diff --git a/rpcs3/Emu/Io/PadHandler.h b/rpcs3/Emu/Io/PadHandler.h
index 68d5397e8c..14d01a5217 100644
--- a/rpcs3/Emu/Io/PadHandler.h
+++ b/rpcs3/Emu/Io/PadHandler.h
@@ -4,7 +4,7 @@
 #include "pad_types.h"
 #include "pad_config.h"
 #include "pad_config_types.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 struct PadDevice
 {
diff --git a/rpcs3/Emu/Io/pad_config_types.h b/rpcs3/Emu/Io/pad_config_types.h
index 0f07a7b585..9d62f5820a 100644
--- a/rpcs3/Emu/Io/pad_config_types.h
+++ b/rpcs3/Emu/Io/pad_config_types.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum class pad_handler
 {
diff --git a/rpcs3/Emu/Memory/vm.h b/rpcs3/Emu/Memory/vm.h
index 3e4620083d..c257fb0941 100644
--- a/rpcs3/Emu/Memory/vm.h
+++ b/rpcs3/Emu/Memory/vm.h
@@ -2,7 +2,7 @@
 
 #include <map>
 #include <memory>
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/StrFmt.h"
 #include "Utilities/BEType.h"
 
diff --git a/rpcs3/Emu/Memory/vm_ptr.h b/rpcs3/Emu/Memory/vm_ptr.h
index 5285198eb7..c9c49998de 100644
--- a/rpcs3/Emu/Memory/vm_ptr.h
+++ b/rpcs3/Emu/Memory/vm_ptr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/BEType.h"
 #include "vm.h"
 
diff --git a/rpcs3/Emu/RSX/Capture/rsx_trace.h b/rpcs3/Emu/RSX/Capture/rsx_trace.h
index 3bfd0c05a9..ad90496ad9 100644
--- a/rpcs3/Emu/RSX/Capture/rsx_trace.h
+++ b/rpcs3/Emu/RSX/Capture/rsx_trace.h
@@ -1,8 +1,9 @@
 #pragma once
+
 #include <string>
 #include <array>
 #include <vector>
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Emu/RSX/rsx_methods.h"
 
 namespace rsx
diff --git a/rpcs3/Emu/RSX/Common/ShaderParam.h b/rpcs3/Emu/RSX/Common/ShaderParam.h
index e358ef099b..0ea0e6a27e 100644
--- a/rpcs3/Emu/RSX/Common/ShaderParam.h
+++ b/rpcs3/Emu/RSX/Common/ShaderParam.h
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Utilities/StrUtil.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum class FUNCTION
 {
diff --git a/rpcs3/Emu/RSX/Common/TextGlyphs.h b/rpcs3/Emu/RSX/Common/TextGlyphs.h
index f0ce18316d..a8796efacf 100644
--- a/rpcs3/Emu/RSX/Common/TextGlyphs.h
+++ b/rpcs3/Emu/RSX/Common/TextGlyphs.h
@@ -6,7 +6,7 @@
 #include <unordered_map>
 #include <vector>
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 /**
 * FONT GLYPHS GO HERE
diff --git a/rpcs3/Emu/RSX/Common/surface_utils.h b/rpcs3/Emu/RSX/Common/surface_utils.h
index 79e2dbc2b8..19e3663587 100644
--- a/rpcs3/Emu/RSX/Common/surface_utils.h
+++ b/rpcs3/Emu/RSX/Common/surface_utils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 #include "Utilities/address_range.h"
 #include "TextureUtils.h"
diff --git a/rpcs3/Emu/RSX/GL/GLExecutionState.h b/rpcs3/Emu/RSX/GL/GLExecutionState.h
index 8163632360..37a41f0953 100644
--- a/rpcs3/Emu/RSX/GL/GLExecutionState.h
+++ b/rpcs3/Emu/RSX/GL/GLExecutionState.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 #include "OpenGL.h"
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_animation.h b/rpcs3/Emu/RSX/Overlays/overlay_animation.h
index 878f97ec71..2612459650 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_animation.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_animation.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 #include "overlay_utils.h"
 
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_controls.h b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
index ff9ad3a888..13ad8de1ab 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_controls.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_controls.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 #include "Utilities/File.h"
 #include "overlay_utils.h"
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_fonts.h b/rpcs3/Emu/RSX/Overlays/overlay_fonts.h
index d36dd110fd..fcaea4c37e 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_fonts.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_fonts.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "overlay_utils.h"
 
 #include <vector>
diff --git a/rpcs3/Emu/RSX/Overlays/overlay_utils.h b/rpcs3/Emu/RSX/Overlays/overlay_utils.h
index 73f28d89c9..e88129e1c9 100644
--- a/rpcs3/Emu/RSX/Overlays/overlay_utils.h
+++ b/rpcs3/Emu/RSX/Overlays/overlay_utils.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/geometry.h"
 
 #include <string>
diff --git a/rpcs3/Emu/RSX/RSXFIFO.h b/rpcs3/Emu/RSX/RSXFIFO.h
index 6836480bce..522896270e 100644
--- a/rpcs3/Emu/RSX/RSXFIFO.h
+++ b/rpcs3/Emu/RSX/RSXFIFO.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Emu/RSX/gcm_enums.h"
 
 struct RsxDmaControl;
diff --git a/rpcs3/Emu/RSX/RSXFragmentProgram.h b/rpcs3/Emu/RSX/RSXFragmentProgram.h
index 9292c0cc84..21efe8a6ce 100644
--- a/rpcs3/Emu/RSX/RSXFragmentProgram.h
+++ b/rpcs3/Emu/RSX/RSXFragmentProgram.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gcm_enums.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 enum register_type
 {
diff --git a/rpcs3/Emu/RSX/RSXOffload.h b/rpcs3/Emu/RSX/RSXOffload.h
index 02b3aaf787..de233cecf4 100644
--- a/rpcs3/Emu/RSX/RSXOffload.h
+++ b/rpcs3/Emu/RSX/RSXOffload.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/address_range.h"
 
 #include <vector>
diff --git a/rpcs3/Emu/RSX/RSXVertexProgram.h b/rpcs3/Emu/RSX/RSXVertexProgram.h
index 9dc5f25d9d..7c568e47a0 100644
--- a/rpcs3/Emu/RSX/RSXVertexProgram.h
+++ b/rpcs3/Emu/RSX/RSXVertexProgram.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "gcm_enums.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 #include <vector>
 #include <bitset>
diff --git a/rpcs3/Emu/RSX/VK/VulkanAPI.h b/rpcs3/Emu/RSX/VK/VulkanAPI.h
index c56436c71b..8c5d7c5849 100644
--- a/rpcs3/Emu/RSX/VK/VulkanAPI.h
+++ b/rpcs3/Emu/RSX/VK/VulkanAPI.h
@@ -12,4 +12,4 @@
 #include <vulkan/vulkan.h>
 #include <vulkan/vk_sdk_platform.h>
 #include "define_new_memleakdetect.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
diff --git a/rpcs3/Emu/RSX/gcm_enums.h b/rpcs3/Emu/RSX/gcm_enums.h
index b70fa44bdc..489b1e29d8 100644
--- a/rpcs3/Emu/RSX/gcm_enums.h
+++ b/rpcs3/Emu/RSX/gcm_enums.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 
 namespace rsx
 {
diff --git a/rpcs3/Emu/RSX/gcm_printing.h b/rpcs3/Emu/RSX/gcm_printing.h
index 79e3dcb7e9..f5e67aec6f 100644
--- a/rpcs3/Emu/RSX/gcm_printing.h
+++ b/rpcs3/Emu/RSX/gcm_printing.h
@@ -1,5 +1,6 @@
 #pragma once
-#include <Utilities/types.h>
+
+#include "util/types.hpp"
 #include <string>
 #include <functional>
 
diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/Emu/RSX/rsx_decode.h
index 969bc6db9c..bd5b555682 100644
--- a/rpcs3/Emu/RSX/rsx_decode.h
+++ b/rpcs3/Emu/RSX/rsx_decode.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "Utilities/types.h"
+
+#include "util/types.hpp"
 #include "Utilities/BitField.h"
 #include "Utilities/StrFmt.h"
 #include <tuple>
diff --git a/rpcs3/Emu/RSX/rsx_vertex_data.h b/rpcs3/Emu/RSX/rsx_vertex_data.h
index 307fe0b1ab..fc10eabe13 100644
--- a/rpcs3/Emu/RSX/rsx_vertex_data.h
+++ b/rpcs3/Emu/RSX/rsx_vertex_data.h
@@ -2,7 +2,7 @@
 
 #include "gcm_enums.h"
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "rsx_utils.h"
 
 namespace rsx
diff --git a/rpcs3/Emu/perf_meter.hpp b/rpcs3/Emu/perf_meter.hpp
index 741e07fef1..d75a80c10b 100644
--- a/rpcs3/Emu/perf_meter.hpp
+++ b/rpcs3/Emu/perf_meter.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "util/logs.hpp"
 #include "Utilities/sysinfo.h"
 #include "system_config.h"
diff --git a/rpcs3/Loader/ELF.h b/rpcs3/Loader/ELF.h
index bc07ac40bd..3de72ddad7 100644
--- a/rpcs3/Loader/ELF.h
+++ b/rpcs3/Loader/ELF.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Utilities/types.h"
+#include "util/types.hpp"
 #include "../../Utilities/File.h"
 #include "../../Utilities/bit_set.h"
 
diff --git a/rpcs3/Loader/PUP.h b/rpcs3/Loader/PUP.h
index 4f28580030..6e27267f94 100644
--- a/rpcs3/Loader/PUP.h
+++ b/rpcs3/Loader/PUP.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../Utilities/types.h"
+#include "util/types.hpp"
 #include "../../Utilities/File.h"
 
 #include <vector>
@@ -34,7 +34,7 @@ class pup_object
 {
 	const fs::file& m_file;
 	bool isValid = true;
-	
+
 	std::vector<PUPFileEntry> m_file_tbl;
 	std::vector<PUPHashEntry> m_hash_tbl;
 
diff --git a/rpcs3/display_sleep_control.cpp b/rpcs3/display_sleep_control.cpp
index c9ee78d100..3a6f17faf3 100644
--- a/rpcs3/display_sleep_control.cpp
+++ b/rpcs3/display_sleep_control.cpp
@@ -14,7 +14,7 @@ static IOPMAssertionID s_pm_assertion = kIOPMNullAssertionID;
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusMessage>
 #include <QDBusReply>
-#include "Utilities/types.h"
+#include "util/types.hpp"
 static u32 s_dbus_cookie = 0;
 #endif
 
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index a77465c152..a02f1c4d93 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -548,7 +548,7 @@
     <ClInclude Include="..\Utilities\sysinfo.h" />
     <ClInclude Include="..\Utilities\Thread.h" />
     <ClInclude Include="..\Utilities\Timer.h" />
-    <ClInclude Include="..\Utilities\types.h" />
+    <ClInclude Include="util\types.hpp" />
     <ClInclude Include="..\Utilities\version.h" />
     <ClInclude Include="util\vm.hpp" />
     <ClInclude Include="util\asm.hpp" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 1614fbce78..a5f9a2e3ea 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -1183,7 +1183,7 @@
     <ClInclude Include="Emu\RSX\Common\BufferUtils.h">
       <Filter>Emu\GPU\RSX\Common</Filter>
     </ClInclude>
-    <ClInclude Include="..\Utilities\types.h">
+    <ClInclude Include="util\types.hpp">
       <Filter>Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\Utilities\BitField.h">
diff --git a/rpcs3/rpcs3qt/game_list_frame.cpp b/rpcs3/rpcs3qt/game_list_frame.cpp
index d3bee8941c..ef3b64af7c 100644
--- a/rpcs3/rpcs3qt/game_list_frame.cpp
+++ b/rpcs3/rpcs3qt/game_list_frame.cpp
@@ -17,7 +17,7 @@
 #include "Emu/Memory/vm.h"
 #include "Emu/System.h"
 #include "Loader/PSF.h"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/lockless.h"
 #include "util/yaml.hpp"
 #include "Input/pad_thread.h"
diff --git a/rpcs3/rpcs3qt/kernel_explorer.h b/rpcs3/rpcs3qt/kernel_explorer.h
index 5e1ef9e58e..f42e2fea3d 100644
--- a/rpcs3/rpcs3qt/kernel_explorer.h
+++ b/rpcs3/rpcs3qt/kernel_explorer.h
@@ -3,7 +3,7 @@
 #include <QDialog>
 #include <QTreeWidget>
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 class kernel_explorer : public QDialog
 {
diff --git a/rpcs3/stdafx.h b/rpcs3/stdafx.h
index e7aec14ef3..5f4b26c632 100644
--- a/rpcs3/stdafx.h
+++ b/rpcs3/stdafx.h
@@ -13,7 +13,7 @@
 	#include "define_new_memleakdetect.h"
 #endif
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/BEType.h"
 #include "util/atomic.hpp"
 #include "Utilities/StrFmt.h"
diff --git a/rpcs3/util/asm.hpp b/rpcs3/util/asm.hpp
index 7244741d18..818d379e22 100644
--- a/rpcs3/util/asm.hpp
+++ b/rpcs3/util/asm.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 extern bool g_use_rtm;
 extern u64 g_rtm_tx_limit1;
diff --git a/rpcs3/util/atomic.hpp b/rpcs3/util/atomic.hpp
index 07d7bc2aec..2c10195a92 100644
--- a/rpcs3/util/atomic.hpp
+++ b/rpcs3/util/atomic.hpp
@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include <functional>
 #include <mutex>
 
diff --git a/rpcs3/util/endian.hpp b/rpcs3/util/endian.hpp
index 5015aa6256..e250a20fd8 100644
--- a/rpcs3/util/endian.hpp
+++ b/rpcs3/util/endian.hpp
@@ -1,6 +1,6 @@
 #pragma once // No BOM and only basic ASCII in this header, or a neko will die
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 namespace stx
 {
diff --git a/Utilities/types.h b/rpcs3/util/types.hpp
similarity index 100%
rename from Utilities/types.h
rename to rpcs3/util/types.hpp
diff --git a/rpcs3/util/vm.hpp b/rpcs3/util/vm.hpp
index 3941a0600d..8d79c9c568 100644
--- a/rpcs3/util/vm.hpp
+++ b/rpcs3/util/vm.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Utilities/types.h"
+#include "util/types.hpp"
 
 namespace utils
 {
diff --git a/rpcs3/util/yaml.cpp b/rpcs3/util/yaml.cpp
index 792ad12bee..d3886c16ef 100644
--- a/rpcs3/util/yaml.cpp
+++ b/rpcs3/util/yaml.cpp
@@ -1,5 +1,5 @@
 #include "util/yaml.hpp"
-#include "Utilities/types.h"
+#include "util/types.hpp"
 #include "Utilities/cheat_info.h"
 #include "Utilities/Config.h"