diff --git a/src/base/tl/bitmask.h b/src/base/tl/bitmask.h
index dd60ab60a..38e703925 100644
--- a/src/base/tl/bitmask.h
+++ b/src/base/tl/bitmask.h
@@ -4,8 +4,5 @@
 #define BASE_TL_BITMASK_H
 
 #include <bitset>
-#include <engine/shared/protocol.h>
-
-typedef std::bitset<MAX_CLIENTS> CClientMask;
 
 #endif
diff --git a/src/engine/shared/protocol.h b/src/engine/shared/protocol.h
index ecd583325..46c085d14 100644
--- a/src/engine/shared/protocol.h
+++ b/src/engine/shared/protocol.h
@@ -3,6 +3,8 @@
 #ifndef ENGINE_SHARED_PROTOCOL_H
 #define ENGINE_SHARED_PROTOCOL_H
 
+#include <base/tl/bitmask.h>
+
 /*
 	Connection diagram - How the initialization works.
 
@@ -123,4 +125,6 @@ enum
 	VERSION_DDNET_MULTI_LASER = 16040,
 };
 
+typedef std::bitset<MAX_CLIENTS> CClientMask;
+
 #endif
diff --git a/src/game/client/prediction/gameworld.h b/src/game/client/prediction/gameworld.h
index be9340e96..2f0930329 100644
--- a/src/game/client/prediction/gameworld.h
+++ b/src/game/client/prediction/gameworld.h
@@ -3,7 +3,6 @@
 #ifndef GAME_CLIENT_PREDICTION_GAMEWORLD_H
 #define GAME_CLIENT_PREDICTION_GAMEWORLD_H
 
-#include <base/tl/bitmask.h>
 #include <game/gamecore.h>
 #include <game/teamscore.h>
 
diff --git a/src/game/server/entities/character.h b/src/game/server/entities/character.h
index 61ec1b359..4309e54d1 100644
--- a/src/game/server/entities/character.h
+++ b/src/game/server/entities/character.h
@@ -3,7 +3,6 @@
 #ifndef GAME_SERVER_ENTITIES_CHARACTER_H
 #define GAME_SERVER_ENTITIES_CHARACTER_H
 
-#include <base/tl/bitmask.h>
 #include <game/server/entity.h>
 #include <game/server/save.h>
 
diff --git a/src/game/server/entities/laser.h b/src/game/server/entities/laser.h
index c1b68a1b4..00654c0ad 100644
--- a/src/game/server/entities/laser.h
+++ b/src/game/server/entities/laser.h
@@ -3,7 +3,6 @@
 #ifndef GAME_SERVER_ENTITIES_LASER_H
 #define GAME_SERVER_ENTITIES_LASER_H
 
-#include <base/tl/bitmask.h>
 #include <game/server/entity.h>
 
 class CLaser : public CEntity
diff --git a/src/game/server/eventhandler.h b/src/game/server/eventhandler.h
index 6f6b549c1..f6c0b42f9 100644
--- a/src/game/server/eventhandler.h
+++ b/src/game/server/eventhandler.h
@@ -5,7 +5,7 @@
 
 #include <stdint.h>
 
-#include <base/tl/bitmask.h>
+#include <engine/shared/protocol.h>
 
 class CEventHandler
 {
diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h
index 8e4b35cec..3ad67eb82 100644
--- a/src/game/server/gamecontext.h
+++ b/src/game/server/gamecontext.h
@@ -3,7 +3,6 @@
 #ifndef GAME_SERVER_GAMECONTEXT_H
 #define GAME_SERVER_GAMECONTEXT_H
 
-#include <base/tl/bitmask.h>
 #include <engine/console.h>
 #include <engine/server.h>
 
diff --git a/src/game/server/gamecontroller.h b/src/game/server/gamecontroller.h
index 4ea42d19b..50bace0d0 100644
--- a/src/game/server/gamecontroller.h
+++ b/src/game/server/gamecontroller.h
@@ -3,9 +3,9 @@
 #ifndef GAME_SERVER_GAMECONTROLLER_H
 #define GAME_SERVER_GAMECONTROLLER_H
 
-#include <base/tl/bitmask.h>
 #include <base/vmath.h>
 #include <engine/map.h>
+#include <engine/shared/protocol.h>
 
 #include <vector>