diff --git a/src/game/client/prediction/entities/laser.cpp b/src/game/client/prediction/entities/laser.cpp
index cb8af2837..3c9e005fa 100644
--- a/src/game/client/prediction/entities/laser.cpp
+++ b/src/game/client/prediction/entities/laser.cpp
@@ -3,6 +3,7 @@
 #include "laser.h"
 #include "character.h"
 #include <game/generated/protocol.h>
+#include <game/mapitems.h>
 
 #include <engine/shared/config.h>
 
diff --git a/src/game/client/prediction/entities/pickup.cpp b/src/game/client/prediction/entities/pickup.cpp
index bcf032369..7593dfa78 100644
--- a/src/game/client/prediction/entities/pickup.cpp
+++ b/src/game/client/prediction/entities/pickup.cpp
@@ -3,6 +3,7 @@
 #include "pickup.h"
 #include "character.h"
 #include <game/generated/protocol.h>
+#include <game/mapitems.h>
 
 void CPickup::Tick()
 {
diff --git a/src/game/client/prediction/entities/projectile.cpp b/src/game/client/prediction/entities/projectile.cpp
index 442e43c1a..a26db73f5 100644
--- a/src/game/client/prediction/entities/projectile.cpp
+++ b/src/game/client/prediction/entities/projectile.cpp
@@ -3,6 +3,7 @@
 #include "projectile.h"
 #include <game/client/projectile_data.h>
 #include <game/generated/protocol.h>
+#include <game/mapitems.h>
 
 #include <engine/shared/config.h>
 
diff --git a/src/game/collision.cpp b/src/game/collision.cpp
index 3733a9f17..257d1bc5e 100644
--- a/src/game/collision.cpp
+++ b/src/game/collision.cpp
@@ -7,7 +7,6 @@
 #include <antibot/antibot_data.h>
 
 #include <cmath>
-#include <engine/kernel.h>
 #include <engine/map.h>
 
 #include <game/collision.h>
diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp
index 0e103c5ef..0fc9d4112 100644
--- a/src/game/gamecore.cpp
+++ b/src/game/gamecore.cpp
@@ -1,6 +1,7 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include "gamecore.h"
+#include "mapitems.h"
 
 #include <engine/shared/config.h>
 
diff --git a/src/game/gamecore.h b/src/game/gamecore.h
index 614408f84..b790d18dd 100644
--- a/src/game/gamecore.h
+++ b/src/game/gamecore.h
@@ -3,7 +3,6 @@
 #ifndef GAME_GAMECORE_H
 #define GAME_GAMECORE_H
 
-#include <base/math.h>
 #include <base/system.h>
 
 #include <map>
@@ -13,9 +12,7 @@
 #include "collision.h"
 #include <engine/shared/protocol.h>
 #include <game/generated/protocol.h>
-#include <math.h>
 
-#include "mapitems.h"
 #include "prng.h"
 #include "teamscore.h"
 
diff --git a/src/game/layers.cpp b/src/game/layers.cpp
index db8db09d8..c20a881c5 100644
--- a/src/game/layers.cpp
+++ b/src/game/layers.cpp
@@ -1,6 +1,7 @@
 /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include "layers.h"
+#include <engine/map.h>
 
 CLayers::CLayers()
 {
diff --git a/src/game/layers.h b/src/game/layers.h
index 10dc2df27..fdfa991e5 100644
--- a/src/game/layers.h
+++ b/src/game/layers.h
@@ -3,7 +3,6 @@
 #ifndef GAME_LAYERS_H
 #define GAME_LAYERS_H
 
-#include <engine/map.h>
 #include <game/mapitems.h>
 
 class CLayers
diff --git a/src/game/mapitems.h b/src/game/mapitems.h
index 06c2cbf0d..7f762e7e3 100644
--- a/src/game/mapitems.h
+++ b/src/game/mapitems.h
@@ -3,8 +3,6 @@
 #ifndef GAME_MAPITEMS_H
 #define GAME_MAPITEMS_H
 
-#include <engine/shared/protocol.h>
-
 // layer types
 enum
 {
diff --git a/src/game/prng.cpp b/src/game/prng.cpp
index cb3cc1819..02a19ff40 100644
--- a/src/game/prng.cpp
+++ b/src/game/prng.cpp
@@ -1,5 +1,7 @@
 #include "prng.h"
 
+#include <base/system.h>
+
 // From https://en.wikipedia.org/w/index.php?title=Permuted_congruential_generator&oldid=901497400#Example_code.
 //
 // > The generator recommended for most users is PCG-XSH-RR with 64-bit state
diff --git a/src/game/prng.h b/src/game/prng.h
index da727a0ef..90a2546d4 100644
--- a/src/game/prng.h
+++ b/src/game/prng.h
@@ -1,7 +1,7 @@
 #ifndef GAME_PRNG_H
 #define GAME_PRNG_H
 
-#include <base/system.h>
+#include <stdint.h>
 
 class CPrng
 {
diff --git a/src/game/teamscore.cpp b/src/game/teamscore.cpp
index 65d7389c2..0a8d3c0d1 100644
--- a/src/game/teamscore.cpp
+++ b/src/game/teamscore.cpp
@@ -1,6 +1,5 @@
 /* (c) Shereef Marzouk. See "licence DDRace.txt" and the readme.txt in the root of the distribution for more information. */
 #include "teamscore.h"
-#include <base/math.h>
 #include <engine/shared/config.h>
 
 CTeamsCore::CTeamsCore()