diff --git a/src/console/CVar.hpp b/src/console/CVar.hpp
index f37b1e7..6ea1e81 100644
--- a/src/console/CVar.hpp
+++ b/src/console/CVar.hpp
@@ -1,7 +1,7 @@
 #ifndef CONSOLE_C_VAR_HPP
 #define CONSOLE_C_VAR_HPP
 
-#include <cstdint>
+#include "console/Types.hpp"
 #include <common/String.hpp>
 #include <storm/Hash.hpp>
 
diff --git a/src/console/Client.hpp b/src/console/Client.hpp
index 3ace87d..59abdbd 100644
--- a/src/console/Client.hpp
+++ b/src/console/Client.hpp
@@ -1,6 +1,8 @@
 #ifndef CONSOLE_CLIENT_HPP
 #define CONSOLE_CLIENT_HPP
 
+#include "console/Types.hpp"
+
 void ConsoleInitializeClientCommand();
 
 void ConsoleInitializeClientCVar(const char* a1);
diff --git a/src/console/Command.hpp b/src/console/Command.hpp
index 11f67a8..639bb96 100644
--- a/src/console/Command.hpp
+++ b/src/console/Command.hpp
@@ -1,8 +1,8 @@
 #ifndef CONSOLE_COMMAND_HPP
 #define CONSOLE_COMMAND_HPP
 
+#include "console/Types.hpp"
 #include <storm/Hash.hpp>
-#include <cstdint>
 
 #define EXEC_BUFFER_SIZE 8192
 #define CMD_BUFFER_SIZE 1024
@@ -10,20 +10,6 @@
 #define HISTORY_DEPTH 32
 #define NOHELP nullptr
 
-enum CATEGORY {
-    DEBUG,
-    GRAPHICS,
-    CONSOLE,
-    COMBAT,
-    GAME,
-    DEFAULT,
-    NET,
-    SOUND,
-    GM,
-    NONE,
-    LAST
-};
-
 struct CONSOLECOMMAND : TSHashObject<CONSOLECOMMAND, HASHKEY_STRI> {
     const char* command;
     int32_t (*handler)(const char*, const char*);
diff --git a/src/console/Device.cpp b/src/console/Device.cpp
index 7d59bc3..cec9d7e 100644
--- a/src/console/Device.cpp
+++ b/src/console/Device.cpp
@@ -3,7 +3,6 @@
 #include "console/CVar.hpp"
 #include "event/Input.hpp"
 #include "gx/Device.hpp"
-#include <cstring>
 
 CVar* s_cvGxMaximize;
 CVar* s_cvGxResolution;
diff --git a/src/console/Device.hpp b/src/console/Device.hpp
index a958f38..887e328 100644
--- a/src/console/Device.hpp
+++ b/src/console/Device.hpp
@@ -1,6 +1,7 @@
 #ifndef CONSOLE_DEVICE_HPP
 #define CONSOLE_DEVICE_HPP
 
+#include "console/Types.hpp"
 #include "gx/CGxFormat.hpp"
 
 struct DefaultSettings {
diff --git a/src/console/Types.hpp b/src/console/Types.hpp
new file mode 100644
index 0000000..7bc9383
--- /dev/null
+++ b/src/console/Types.hpp
@@ -0,0 +1,46 @@
+#ifndef CONSOLE_TYPES_HPP
+#define CONSOLE_TYPES_HPP
+
+#include <cstdint>
+
+enum CATEGORY {
+    DEBUG,
+    GRAPHICS,
+    CONSOLE,
+    COMBAT,
+    GAME,
+    DEFAULT,
+    NET,
+    SOUND,
+    GM,
+    NONE,
+    LAST
+};
+
+enum COLOR_T {
+    DEFAULT_COLOR,
+    INPUT_COLOR,
+    ECHO_COLOR,
+    ERROR_COLOR,
+    WARNING_COLOR,
+    GLOBAL_COLOR,
+    ADMIN_COLOR,
+    HIGHLIGHT_COLOR,
+    BACKGROUND_COLOR,
+    NUM_COLORTYPES
+};
+
+enum CONSOLERESIZESTATE {
+    CS_NONE,
+    CS_STRETCH,
+    NUM_CONSOLERESIZESTATES
+};
+
+enum HIGHLIGHTSTATE {
+    HS_NONE,
+    HS_HIGHLIGHTING,
+    HS_ENDHIGHLIGHT,
+    NUM_HIGHLIGHTSTATES
+};
+
+#endif