diff --git a/Server/HelloMessage.h b/Server/HelloMessage.h
index 0f6db39..65d9d7c 100644
--- a/Server/HelloMessage.h
+++ b/Server/HelloMessage.h
@@ -6,8 +6,6 @@
 
 #include "Message.h"
 
-constexpr uint64_t CurrentVersion = 0x2;
-
 namespace SocketMessages
 {
 	struct HelloMessage : Message
diff --git a/Server/IdentifyMessage.h b/Server/IdentifyMessage.h
index d3f215d..b496c8a 100644
--- a/Server/IdentifyMessage.h
+++ b/Server/IdentifyMessage.h
@@ -7,9 +7,6 @@
 
 #include "Message.h"
 
-constexpr uint64_t UsernameMinLength = 0x03;
-constexpr uint64_t UsernameMaxLength = 0x20;
-
 namespace SocketMessages
 {
 	struct IdentifyMessage : Message
diff --git a/Server/Message.h b/Server/Message.h
index 1866a7b..0fb4851 100644
--- a/Server/Message.h
+++ b/Server/Message.h
@@ -6,6 +6,12 @@
 
 #include "Snowflake.h"
 
+constexpr uint64_t ChatMessageMinLength = 0x01;
+constexpr uint64_t ChatMessageMaxLength = 2000;
+constexpr uint64_t CurrentVersion = 0x2;
+constexpr uint64_t UsernameMinLength = 0x03;
+constexpr uint64_t UsernameMaxLength = 0x20;
+
 namespace SocketMessages
 {
 	enum class MessageType : uint8_t
diff --git a/Server/ReceiveChatMessage.h b/Server/ReceiveChatMessage.h
index 58a0cb5..6f51901 100644
--- a/Server/ReceiveChatMessage.h
+++ b/Server/ReceiveChatMessage.h
@@ -6,9 +6,6 @@
 
 #include "Message.h"
 
-constexpr uint64_t ChatMessageMinLength = 0x01;
-constexpr uint64_t ChatMessageMaxLength = 2000;
-
 namespace SocketMessages
 {
 	struct ReceiveChatMessage : Message