diff --git a/src/common/cityhash.cpp b/src/common/cityhash.cpp
index 343919ff01..cabf02bb81 100644
--- a/src/common/cityhash.cpp
+++ b/src/common/cityhash.cpp
@@ -136,7 +136,7 @@ static u64 HashLen17to32(const char* s, size_t len) {
 
 // Return a 16-byte hash for 48 bytes.  Quick and dirty.
 // Callers do best to use "random-looking" values for a and b.
-static pair<u64, u64> WeakHashLen32WithSeeds(u64 w, u64 x, u64 y, u64 z, u64 a, u64 b) {
+static std::pair<u64, u64> WeakHashLen32WithSeeds(u64 w, u64 x, u64 y, u64 z, u64 a, u64 b) {
     a += w;
     b = Rotate(b + a + z, 21);
     u64 c = a;
@@ -147,7 +147,7 @@ static pair<u64, u64> WeakHashLen32WithSeeds(u64 w, u64 x, u64 y, u64 z, u64 a,
 }
 
 // Return a 16-byte hash for s[0] ... s[31], a, and b.  Quick and dirty.
-static pair<u64, u64> WeakHashLen32WithSeeds(const char* s, u64 a, u64 b) {
+static std::pair<u64, u64> WeakHashLen32WithSeeds(const char* s, u64 a, u64 b) {
     return WeakHashLen32WithSeeds(Fetch64(s), Fetch64(s + 8), Fetch64(s + 16), Fetch64(s + 24), a,
                                   b);
 }
@@ -190,8 +190,8 @@ u64 CityHash64(const char* s, size_t len) {
     u64 x = Fetch64(s + len - 40);
     u64 y = Fetch64(s + len - 16) + Fetch64(s + len - 56);
     u64 z = HashLen16(Fetch64(s + len - 48) + len, Fetch64(s + len - 24));
-    pair<u64, u64> v = WeakHashLen32WithSeeds(s + len - 64, len, z);
-    pair<u64, u64> w = WeakHashLen32WithSeeds(s + len - 32, y + k1, x);
+    std::pair<u64, u64> v = WeakHashLen32WithSeeds(s + len - 64, len, z);
+    std::pair<u64, u64> w = WeakHashLen32WithSeeds(s + len - 32, y + k1, x);
     x = x * k1 + Fetch64(s);
 
     // Decrease len to the nearest multiple of 64, and operate on 64-byte chunks.
@@ -259,7 +259,7 @@ u128 CityHash128WithSeed(const char* s, size_t len, u128 seed) {
 
     // We expect len >= 128 to be the common case.  Keep 56 bytes of state:
     // v, w, x, y, and z.
-    pair<u64, u64> v, w;
+    std::pair<u64, u64> v, w;
     u64 x = seed[0];
     u64 y = seed[1];
     u64 z = len * k1;
diff --git a/src/core/reporter.cpp b/src/core/reporter.cpp
index 1723636811..a1e71b3ba7 100644
--- a/src/core/reporter.cpp
+++ b/src/core/reporter.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: Copyright 2019 yuzu Emulator Project
@@ -174,7 +174,7 @@ Reporter::Reporter(System& system_) : system(system_) {
 Reporter::~Reporter() = default;
 
 void Reporter::SaveCrashReport(u64 title_id, Result result, u64 set_flags, u64 entry_point, u64 sp,
-                               u64 pc, u64 pstate, u64 afsr0, u64 afsr1, u64 esr, u64 far,
+                               u64 pc, u64 pstate, u64 afsr0, u64 afsr1, u64 esr, u64 far_,
                                const std::array<u64, 31>& registers,
                                const std::array<u64, 32>& backtrace, u32 backtrace_size,
                                const std::string& arch, u32 unk10) const {
@@ -193,7 +193,7 @@ void Reporter::SaveCrashReport(u64 title_id, Result result, u64 set_flags, u64 e
     proc_out["afsr0"] = fmt::format("{:016X}", afsr0);
     proc_out["afsr1"] = fmt::format("{:016X}", afsr1);
     proc_out["esr"] = fmt::format("{:016X}", esr);
-    proc_out["far"] = fmt::format("{:016X}", far);
+    proc_out["far"] = fmt::format("{:016X}", far_);
     proc_out["backtrace_size"] = fmt::format("{:08X}", backtrace_size);
     proc_out["unknown_10"] = fmt::format("{:08X}", unk10);
 
diff --git a/src/core/reporter.h b/src/core/reporter.h
index 1eee8da31f..7dce5122ef 100644
--- a/src/core/reporter.h
+++ b/src/core/reporter.h
@@ -33,8 +33,9 @@ public:
     ~Reporter();
 
     // Used by fatal services
+    // NOTE: far is defined by windows.h
     void SaveCrashReport(u64 title_id, Result result, u64 set_flags, u64 entry_point, u64 sp,
-                         u64 pc, u64 pstate, u64 afsr0, u64 afsr1, u64 esr, u64 far,
+                         u64 pc, u64 pstate, u64 afsr0, u64 afsr1, u64 esr, u64 far_,
                          const std::array<u64, 31>& registers, const std::array<u64, 32>& backtrace,
                          u32 backtrace_size, const std::string& arch, u32 unk10) const;