diff --git a/src/common/memory_patcher.cpp b/src/common/memory_patcher.cpp
index 45ab671c2..85a25167a 100644
--- a/src/common/memory_patcher.cpp
+++ b/src/common/memory_patcher.cpp
@@ -3,8 +3,8 @@
 
 #include <algorithm>
 #include <codecvt>
-#include <string>
 #include <sstream>
+#include <string>
 #include <pugixml.hpp>
 #ifdef ENABLE_QT_GUI
 #include <QFile>
@@ -23,7 +23,7 @@
 namespace MemoryPatcher {
 
 uintptr_t g_eboot_address;
-u64 g_eboot_image_size;
+uint64_t g_eboot_image_size;
 std::string g_game_serial;
 std::string patchFile;
 std::vector<patchInfo> pending_patches;
@@ -92,7 +92,7 @@ std::string convertValueToHex(const std::string type, const std::string valueStr
         std::vector<unsigned char> byteArray;
         // convert to little endian
         for (char16_t ch : valueStringU16) {
-            unsigned char low_byte = static_cast<unsigned char>(ch & 0x00FF); 
+            unsigned char low_byte = static_cast<unsigned char>(ch & 0x00FF);
             unsigned char high_byte = static_cast<unsigned char>((ch >> 8) & 0x00FF);
 
             byteArray.push_back(low_byte);
diff --git a/src/common/memory_patcher.h b/src/common/memory_patcher.h
index 7f8d271bd..899ffccb1 100644
--- a/src/common/memory_patcher.h
+++ b/src/common/memory_patcher.h
@@ -9,7 +9,7 @@
 namespace MemoryPatcher {
 
 extern uintptr_t g_eboot_address;
-extern u64 g_eboot_image_size;
+extern uint64_t g_eboot_image_size;
 extern std::string g_game_serial;
 extern std::string patchFile;
 
diff --git a/src/qt_gui/cheats_patches.cpp b/src/qt_gui/cheats_patches.cpp
index bec7659c5..a58106cb3 100644
--- a/src/qt_gui/cheats_patches.cpp
+++ b/src/qt_gui/cheats_patches.cpp
@@ -27,8 +27,8 @@
 #include <QVBoxLayout>
 #include <QXmlStreamReader>
 #include <common/logging/log.h>
-#include "common/memory_patcher.h"
 #include "cheats_patches.h"
+#include "common/memory_patcher.h"
 #include "common/path_util.h"
 #include "core/module.h"