diff --git a/src/client/game/game.cpp b/src/client/game/game.cpp
index 2412e404..7250a2dd 100644
--- a/src/client/game/game.cpp
+++ b/src/client/game/game.cpp
@@ -19,11 +19,4 @@ namespace game
 		}();
 		return base;
 	}
-
-	CmdArgs* cmd_args_t::operator->() const
-	{
-		return Sys_GetTLS()->cmdArgs;
-	}
-
-	cmd_args_t cmd_args;
 }
diff --git a/src/client/game/game.hpp b/src/client/game/game.hpp
index 7c49978c..4410d479 100644
--- a/src/client/game/game.hpp
+++ b/src/client/game/game.hpp
@@ -50,13 +50,6 @@ namespace game
 	private:
 		size_t address_;
 	};
-
-	struct cmd_args_t
-	{
-		CmdArgs* operator->() const;
-	};
-
-	extern cmd_args_t cmd_args;
 }
 
 inline size_t operator"" _g(const size_t val)
diff --git a/src/client/game/symbols.hpp b/src/client/game/symbols.hpp
index f1b445ce..acd5deb6 100644
--- a/src/client/game/symbols.hpp
+++ b/src/client/game/symbols.hpp
@@ -84,6 +84,14 @@ namespace game
 	// Global game definitions
 	constexpr auto CMD_MAX_NESTING = 8;
 
-	// Reimplementations
+	struct cmd_args_t
+	{
+		CmdArgs* operator->() const
+		{
+			return Sys_GetTLS()->cmdArgs;
+		}
+	};
+
+	// Re-implementations
 	eModes Com_SessionMode_GetMode();
 }