diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h
index 22d27284d5..29df028e36 100644
--- a/Source/Core/Common/Arm64Emitter.h
+++ b/Source/Core/Common/Arm64Emitter.h
@@ -1126,7 +1126,7 @@ private:
   void UXTL(u8 src_size, ARM64Reg Rd, ARM64Reg Rn, bool upper);
 };
 
-class ARM64CodeBlock : public CodeBlock<ARM64XEmitter>
+class ARM64CodeBlock : public Common::CodeBlock<ARM64XEmitter>
 {
 private:
   void PoisonMemory() override
diff --git a/Source/Core/Common/CodeBlock.h b/Source/Core/Common/CodeBlock.h
index 97a2c06ad0..19fc6be433 100644
--- a/Source/Core/Common/CodeBlock.h
+++ b/Source/Core/Common/CodeBlock.h
@@ -11,6 +11,8 @@
 #include "Common/CommonTypes.h"
 #include "Common/MemoryUtil.h"
 
+namespace Common
+{
 // Everything that needs to generate code should inherit from this.
 // You get memory management for free, plus, you can use all emitter functions without
 // having to prefix them with gen-> or something similar.
@@ -116,3 +118,4 @@ public:
     m_children.emplace_back(child);
   }
 };
+}  // namespace Common
diff --git a/Source/Core/Common/x64Emitter.h b/Source/Core/Common/x64Emitter.h
index bd5614c812..6916883d89 100644
--- a/Source/Core/Common/x64Emitter.h
+++ b/Source/Core/Common/x64Emitter.h
@@ -1155,7 +1155,7 @@ public:
   }
 };  // class XEmitter
 
-class X64CodeBlock : public CodeBlock<XEmitter>
+class X64CodeBlock : public Common::CodeBlock<XEmitter>
 {
 private:
   void PoisonMemory() override