diff --git a/Source/Core/Core/HW/DVD/AMMediaboard.cpp b/Source/Core/Core/HW/DVD/AMMediaboard.cpp
index 5768203e28..1d395efc26 100644
--- a/Source/Core/Core/HW/DVD/AMMediaboard.cpp
+++ b/Source/Core/Core/HW/DVD/AMMediaboard.cpp
@@ -75,14 +75,14 @@ static int WSAGetLastError()
 
 #endif
 
+namespace AMMediaboard
+{
+
 MediaBoardRange::MediaBoardRange(u32 start_, u32 size_, std::span<u8> buffer_)
     : start{start_}, end{start_ + size_}, buffer{buffer_.data()}, buffer_size{buffer_.size()}
 {
 }
 
-namespace AMMediaboard
-{
-
 using Common::SEND_FLAGS;
 
 enum class GuestSocket : s32
diff --git a/Source/Core/Core/HW/DVD/AMMediaboard.h b/Source/Core/Core/HW/DVD/AMMediaboard.h
index 0e0a573a4d..f33dc177ec 100644
--- a/Source/Core/Core/HW/DVD/AMMediaboard.h
+++ b/Source/Core/Core/HW/DVD/AMMediaboard.h
@@ -14,6 +14,15 @@
 
 #include "DiscIO/Volume.h"
 
+namespace Core
+{
+class CPUThreadGuard;
+class System;
+}  // namespace Core
+
+namespace AMMediaboard
+{
+
 enum GameType
 {
   FZeroAX = 1,
@@ -59,12 +68,6 @@ enum InquiryType
   Version2 = 0x29484100,
 };
 
-namespace Core
-{
-class CPUThreadGuard;
-class System;
-}  // namespace Core
-
 struct MediaBoardRange
 {
   u32 start;
@@ -75,9 +78,6 @@ struct MediaBoardRange
   MediaBoardRange(u32 start_, u32 size_, std::span<u8> buffer_);
 };
 
-namespace AMMediaboard
-{
-
 enum class AMMBDICommand : u16
 {
   Inquiry = 0x12,
diff --git a/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp b/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp
index fb449860ad..3381c8fbbc 100644
--- a/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp
+++ b/Source/Core/Core/HW/EXI/EXI_DeviceBaseboard.cpp
@@ -77,8 +77,8 @@ CEXIBaseboard::CEXIBaseboard(Core::System& system) : IEXIDevice(system)
 
   // Virtua Striker 4 and Gekitou Pro Yakyuu need a higher FIRM version
   // Which is read from the backup data?!
-  if (AMMediaboard::GetGameType() == VirtuaStriker4 ||
-      AMMediaboard::GetGameType() == GekitouProYakyuu)
+  if (AMMediaboard::GetGameType() == AMMediaboard::VirtuaStriker4 ||
+      AMMediaboard::GetGameType() == AMMediaboard::GekitouProYakyuu)
   {
     const u64 backup_size = m_backup.GetSize();
     if (backup_size >= 0x20C + 0x1F4)
diff --git a/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp
index 0d23288539..58f182fc9a 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceAMBaseboard.cpp
@@ -42,6 +42,8 @@
 
 namespace SerialInterface
 {
+using namespace AMMediaboard;
+
 void JVSIOMessage::Start(int node)
 {
   m_last_start = m_pointer;