diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 6635d6b5b..8dcd40cfd 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -7,6 +7,7 @@
 #include <new>
 #include <tuple>
 
+#include <base/hash.h>
 #include <base/hash_ctxt.h>
 #include <base/logger.h>
 #include <base/math.h>
@@ -68,8 +69,6 @@
 #undef main
 #endif
 
-#include "base/hash.h"
-
 #include <chrono>
 #include <thread>
 
diff --git a/src/engine/server/databases/mysql.cpp b/src/engine/server/databases/mysql.cpp
index 49fe6ddfd..ef7fbfa1a 100644
--- a/src/engine/server/databases/mysql.cpp
+++ b/src/engine/server/databases/mysql.cpp
@@ -1,5 +1,6 @@
 #include "connection.h"
-#include "engine/server/databases/connection_pool.h"
+
+#include <engine/server/databases/connection_pool.h>
 
 #if defined(CONF_MYSQL)
 #include <mysql.h>
diff --git a/src/engine/shared/websockets.cpp b/src/engine/shared/websockets.cpp
index 74dcadcbb..9728f1f83 100644
--- a/src/engine/shared/websockets.cpp
+++ b/src/engine/shared/websockets.cpp
@@ -4,9 +4,9 @@
 #include <map>
 #include <string>
 
-#include "base/system.h"
 #include "protocol.h"
 #include "ringbuffer.h"
+#include <base/system.h>
 #if defined(CONF_FAMILY_UNIX)
 #include <arpa/inet.h>
 #elif defined(CONF_FAMILY_WINDOWS)
diff --git a/src/game/client/components/killmessages.cpp b/src/game/client/components/killmessages.cpp
index 9eb319cf4..317725c77 100644
--- a/src/game/client/components/killmessages.cpp
+++ b/src/game/client/components/killmessages.cpp
@@ -2,11 +2,11 @@
 /* If you are missing that file, acquire a complete release at teeworlds.com.                */
 #include <engine/graphics.h>
 #include <engine/shared/config.h>
+#include <engine/shared/protocol.h>
 #include <engine/textrender.h>
 #include <game/generated/client_data.h>
 #include <game/generated/protocol.h>
 
-#include "engine/shared/protocol.h"
 #include "killmessages.h"
 #include <game/client/animstate.h>
 #include <game/client/gameclient.h>
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index b104c8790..f68063952 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -1,13 +1,14 @@
 /* (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 "gamecontext.h"
+
 #include <vector>
 
-#include "base/system.h"
-#include "gamecontext.h"
 #include "teeinfo.h"
 #include <antibot/antibot_data.h>
 #include <base/logger.h>
 #include <base/math.h>
+#include <base/system.h>
 #include <engine/console.h>
 #include <engine/engine.h>
 #include <engine/map.h>
diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h
index 03652dcae..1a22ae253 100644
--- a/src/game/server/gamecontext.h
+++ b/src/game/server/gamecontext.h
@@ -7,12 +7,12 @@
 #include <engine/server.h>
 
 #include <game/collision.h>
+#include <game/generated/protocol.h>
 #include <game/layers.h>
 #include <game/mapbugs.h>
 #include <game/voting.h>
 
 #include "eventhandler.h"
-#include "game/generated/protocol.h"
 #include "gameworld.h"
 #include "teehistorian.h"
 
diff --git a/src/game/server/save.cpp b/src/game/server/save.cpp
index 6e6f955d6..68e75ba38 100644
--- a/src/game/server/save.cpp
+++ b/src/game/server/save.cpp
@@ -1,13 +1,13 @@
 #include "save.h"
 
-#include <cstdio>
+#include <cstdio> // sscanf
 
-#include "engine/shared/protocol.h"
 #include "entities/character.h"
 #include "gamemodes/DDRace.h"
 #include "player.h"
 #include "teams.h"
 #include <engine/shared/config.h>
+#include <engine/shared/protocol.h>
 
 CSaveTee::CSaveTee() = default;
 
diff --git a/src/test/score.cpp b/src/test/score.cpp
index 98df4a714..723ffa7f4 100644
--- a/src/test/score.cpp
+++ b/src/test/score.cpp
@@ -1,9 +1,9 @@
-#include "engine/server/databases/connection_pool.h"
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
 #include <base/detect.h>
 #include <engine/server/databases/connection.h>
+#include <engine/server/databases/connection_pool.h>
 #include <engine/shared/config.h>
 #include <game/server/scoreworker.h>