diff --git a/src/console/Command.hpp b/src/console/Command.hpp
index 74a75db..b9e3e12 100644
--- a/src/console/Command.hpp
+++ b/src/console/Command.hpp
@@ -14,22 +14,6 @@
 #define CONSOLE_HISTORY_DEPTH 32
 #define CONSOLE_NOHELP nullptr
 
-typedef int32_t (*COMMANDHANDLER)(const char*, const char*);
-
-class CONSOLECOMMAND : public TSHashObject<CONSOLECOMMAND, HASHKEY_STRI> {
-    public:
-        COMMANDHANDLER m_handler;
-        const char*    m_helpText;
-        CATEGORY       m_category;
-};
-
-class ConsoleCommandList {
-    public:
-        const char*    m_command;
-        COMMANDHANDLER m_handler;
-        const char*    m_helpText;
-};
-
 extern TSHashTable<CONSOLECOMMAND, HASHKEY_STRI> g_consoleCommandHash;
 extern char g_commandHistory[CONSOLE_HISTORY_DEPTH][CONSOLE_CMD_BUFFER_SIZE];
 extern uint32_t g_commandHistoryIndex;
diff --git a/src/console/Types.hpp b/src/console/Types.hpp
index b75aceb..c497a60 100644
--- a/src/console/Types.hpp
+++ b/src/console/Types.hpp
@@ -34,4 +34,34 @@ enum CONSOLERESIZESTATE {
     NUM_CONSOLERESIZESTATES,
 };
 
+typedef int32_t (*COMMANDHANDLER)(const char*, const char*);
+
+class CONSOLECOMMAND : public TSHashObject<CONSOLECOMMAND, HASHKEY_STRI> {
+    public:
+        COMMANDHANDLER m_handler;
+        const char*    m_helpText;
+        CATEGORY       m_category;
+};
+
+class CONSOLELINE : public TSLinkedNode<CONSOLELINE> {
+    public:
+        char* buffer;
+        uint32_t chars;
+        uint32_t charsalloc;
+        uint32_t inputpos;
+        uint32_t inputstart;
+        COLOR_T colorType;
+        CGxString* fontPointer;
+
+        ~CONSOLELINE();
+};
+
+class ConsoleCommandList {
+    public:
+        const char*    m_command;
+        COMMANDHANDLER m_handler;
+        const char*    m_helpText;
+};
+
+
 #endif