From 246f213905780582d9382625ed91a109f2e7afad Mon Sep 17 00:00:00 2001
From: heinrich5991 <heinrich5991@gmail.com>
Date: Sun, 2 Jan 2022 04:27:29 +0100
Subject: [PATCH] Remove a couple of game/-includes from the engine code

---
 src/engine/client/serverbrowser.cpp      | 1 +
 src/engine/client/serverbrowser_http.cpp | 1 +
 src/engine/serverbrowser.h               | 3 ++-
 src/engine/shared/demo.cpp               | 2 --
 src/engine/shared/serverinfo.cpp         | 3 +++
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp
index 1d43d734e..89a614fe3 100644
--- a/src/engine/client/serverbrowser.cpp
+++ b/src/engine/client/serverbrowser.cpp
@@ -7,6 +7,7 @@
 
 #include <algorithm>
 #include <climits>
+#include <vector>
 
 #include <base/hash_ctxt.h>
 #include <base/math.h>
diff --git a/src/engine/client/serverbrowser_http.cpp b/src/engine/client/serverbrowser_http.cpp
index 66f472904..ae09cf08e 100644
--- a/src/engine/client/serverbrowser_http.cpp
+++ b/src/engine/client/serverbrowser_http.cpp
@@ -11,6 +11,7 @@
 #include <engine/storage.h>
 
 #include <memory>
+#include <vector>
 
 class CChooseMaster
 {
diff --git a/src/engine/serverbrowser.h b/src/engine/serverbrowser.h
index e4ff69fd3..5658da111 100644
--- a/src/engine/serverbrowser.h
+++ b/src/engine/serverbrowser.h
@@ -5,12 +5,13 @@
 
 #include <engine/map.h>
 #include <engine/shared/protocol.h>
-#include <game/client/ui.h>
 
 #include "kernel.h"
 
 #define DDNET_INFO "ddnet-info.json"
 
+class CUIElement;
+
 class CServerInfo
 {
 public:
diff --git a/src/engine/shared/demo.cpp b/src/engine/shared/demo.cpp
index 4cebce60e..6d796cc08 100644
--- a/src/engine/shared/demo.cpp
+++ b/src/engine/shared/demo.cpp
@@ -12,8 +12,6 @@
 #include <engine/shared/video.h>
 #endif
 
-#include <game/generated/protocol.h>
-
 #include "compression.h"
 #include "demo.h"
 #include "memheap.h"
diff --git a/src/engine/shared/serverinfo.cpp b/src/engine/shared/serverinfo.cpp
index 8c9e702f5..2d3fbdc97 100644
--- a/src/engine/shared/serverinfo.cpp
+++ b/src/engine/shared/serverinfo.cpp
@@ -1,9 +1,12 @@
 #include "serverinfo.h"
 
 #include "json.h"
+#include <base/math.h>
 #include <engine/external/json-parser/json.h>
 #include <engine/serverbrowser.h>
 
+#include <cstdio>
+
 static bool IsAllowedHex(char c)
 {
 	static const char ALLOWED[] = "0123456789abcdefABCDEF";