From f80456ea113634f58313d2e3b8705fb12999a58b Mon Sep 17 00:00:00 2001
From: Ranieri Althoff <1993083+ranisalt@users.noreply.github.com>
Date: Fri, 18 Mar 2022 22:21:43 +0100
Subject: [PATCH] Move all system & boost headers to PCH (#4022)

---
 src/combat.h             |  3 ---
 src/condition.h          |  2 --
 src/database.h           |  2 --
 src/databasetasks.h      |  2 --
 src/definitions.h        |  2 --
 src/fileloader.h         |  3 ---
 src/item.h               |  3 ---
 src/lockfree.h           |  2 --
 src/luascript.h          |  8 --------
 src/luavariant.h         |  2 --
 src/mounts.cpp           |  1 -
 src/otpch.h              | 25 +++++++++++++++++++++++++
 src/player.h             |  2 --
 src/podium.h             |  2 --
 src/protocolgame.h       |  1 -
 src/pugicast.h           |  2 --
 src/rsa.h                |  2 --
 src/spawn.h              |  2 --
 src/tasks.h              |  2 --
 src/thread_holder_base.h |  2 --
 src/tools.cpp            |  1 -
 src/tools.h              |  3 ---
 src/xtea.h               |  2 --
 23 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/src/combat.h b/src/combat.h
index a6a3fa78e8..e231fbe658 100644
--- a/src/combat.h
+++ b/src/combat.h
@@ -8,9 +8,6 @@
 #include "condition.h"
 #include "item.h"
 
-#include <utility>
-#include <valarray>
-
 class Creature;
 class Player;
 struct Position;
diff --git a/src/condition.h b/src/condition.h
index 1af8a5b62d..9637230f9e 100644
--- a/src/condition.h
+++ b/src/condition.h
@@ -6,8 +6,6 @@
 
 #include "enums.h"
 
-#include <limits>
-
 class Creature;
 class Player;
 class PropStream;
diff --git a/src/database.h b/src/database.h
index 0603406aa3..e5af21b06b 100644
--- a/src/database.h
+++ b/src/database.h
@@ -6,8 +6,6 @@
 
 #include "pugicast.h"
 
-#include <mysql/mysql.h>
-
 class DBResult;
 using DBResult_ptr = std::shared_ptr<DBResult>;
 
diff --git a/src/databasetasks.h b/src/databasetasks.h
index bc79ca4e96..ad4a8b1c85 100644
--- a/src/databasetasks.h
+++ b/src/databasetasks.h
@@ -7,8 +7,6 @@
 #include "database.h"
 #include "thread_holder_base.h"
 
-#include <condition_variable>
-
 struct DatabaseTask {
 	DatabaseTask(std::string&& query, std::function<void(DBResult_ptr, bool)>&& callback, bool store) :
 		query(std::move(query)), callback(std::move(callback)), store(store) {}
diff --git a/src/definitions.h b/src/definitions.h
index e85302723c..941841029d 100644
--- a/src/definitions.h
+++ b/src/definitions.h
@@ -27,8 +27,6 @@ static constexpr auto AUTHENTICATOR_PERIOD = 30U;
 #define _USE_MATH_DEFINES
 #endif
 
-#include <cmath>
-
 #ifdef _WIN32
 #ifndef NOMINMAX
 #define NOMINMAX
diff --git a/src/fileloader.h b/src/fileloader.h
index 2b931a8d6b..3c4eec9ec1 100644
--- a/src/fileloader.h
+++ b/src/fileloader.h
@@ -4,9 +4,6 @@
 #ifndef FS_FILELOADER_H
 #define FS_FILELOADER_H
 
-#include <boost/iostreams/device/mapped_file.hpp>
-#include <limits>
-
 class PropStream;
 
 namespace OTB {
diff --git a/src/item.h b/src/item.h
index a5055b6d2a..93531cdcbf 100644
--- a/src/item.h
+++ b/src/item.h
@@ -10,9 +10,6 @@
 #include "thing.h"
 #include "tools.h"
 
-#include <boost/variant.hpp>
-#include <deque>
-
 class BedItem;
 class Container;
 class Door;
diff --git a/src/lockfree.h b/src/lockfree.h
index d20167c32e..6c76998da0 100644
--- a/src/lockfree.h
+++ b/src/lockfree.h
@@ -8,8 +8,6 @@
 #define _ENABLE_ATOMIC_ALIGNMENT_FIX
 #endif
 
-#include <boost/lockfree/stack.hpp>
-
 /*
  * we use this to avoid instantiating multiple free lists for objects of the
  * same size and it can be replaced by a variable template in C++14
diff --git a/src/luascript.h b/src/luascript.h
index 906d7bde29..f593d0707f 100644
--- a/src/luascript.h
+++ b/src/luascript.h
@@ -8,14 +8,6 @@
 #include "enums.h"
 #include "position.h"
 
-#include <cassert>
-
-#if __has_include("luajit/lua.hpp")
-#include <luajit/lua.hpp>
-#else
-#include <lua.hpp>
-#endif
-
 #if LUA_VERSION_NUM >= 502
 #ifndef LUA_COMPAT_ALL
 #ifndef LUA_COMPAT_MODULE
diff --git a/src/luavariant.h b/src/luavariant.h
index 82627f3ed8..fe3dd723b9 100644
--- a/src/luavariant.h
+++ b/src/luavariant.h
@@ -1,8 +1,6 @@
 #ifndef FS_LUAVARIANT_H
 #define FS_LUAVARIANT_H
 
-#include <variant>
-
 enum LuaVariantType_t {
 	VARIANT_NUMBER = 0,
 	VARIANT_POSITION = 1,
diff --git a/src/mounts.cpp b/src/mounts.cpp
index fa8c1f2571..b672c7326e 100644
--- a/src/mounts.cpp
+++ b/src/mounts.cpp
@@ -5,7 +5,6 @@
 
 #include "mounts.h"
 
-#include "definitions.h"
 #include "pugicast.h"
 #include "tools.h"
 
diff --git a/src/otpch.h b/src/otpch.h
index 6d6b5d1232..603f7549a8 100644
--- a/src/otpch.h
+++ b/src/otpch.h
@@ -7,24 +7,49 @@
 // Definitions should be global.
 #include "definitions.h"
 
+// System headers required in headers should be included here.
 #include <algorithm>
+#include <array>
+#include <atomic>
+#include <bitset>
 #include <boost/asio.hpp>
+#include <boost/iostreams/device/mapped_file.hpp>
+#include <boost/lockfree/stack.hpp>
+#include <boost/variant.hpp>
+#include <cassert>
+#include <condition_variable>
+#include <cryptopp/rsa.h>
 #include <cstdint>
+#include <cstdlib>
+#include <deque>
 #include <fmt/color.h>
 #include <forward_list>
 #include <functional>
 #include <iostream>
+#include <limits>
 #include <list>
 #include <map>
 #include <memory>
 #include <mutex>
+#include <mysql/mysql.h>
 #include <pugixml.hpp>
+#include <random>
 #include <set>
 #include <sstream>
+#include <string_view>
 #include <string>
 #include <thread>
 #include <unordered_map>
 #include <unordered_set>
+#include <utility>
+#include <valarray>
+#include <variant>
 #include <vector>
 
+#if __has_include("luajit/lua.hpp")
+#include <luajit/lua.hpp>
+#else
+#include <lua.hpp>
+#endif
+
 #endif // FS_OTPCH_H
diff --git a/src/player.h b/src/player.h
index 4d40700da6..371f95bdb2 100644
--- a/src/player.h
+++ b/src/player.h
@@ -14,8 +14,6 @@
 #include "town.h"
 #include "vocation.h"
 
-#include <bitset>
-
 class DepotChest;
 class House;
 class NetworkMessage;
diff --git a/src/podium.h b/src/podium.h
index 50a26b1dca..acbdf4ec44 100644
--- a/src/podium.h
+++ b/src/podium.h
@@ -6,8 +6,6 @@
 
 #include "item.h"
 
-#include <bitset>
-
 class Podium final : public Item
 {
 	public:
diff --git a/src/protocolgame.h b/src/protocolgame.h
index 65f1680254..95dd628626 100644
--- a/src/protocolgame.h
+++ b/src/protocolgame.h
@@ -6,7 +6,6 @@
 
 #include "chat.h"
 #include "creature.h"
-#include "definitions.h"
 #include "protocol.h"
 #include "tasks.h"
 
diff --git a/src/pugicast.h b/src/pugicast.h
index 53c0f59d9e..829b9deac2 100644
--- a/src/pugicast.h
+++ b/src/pugicast.h
@@ -4,8 +4,6 @@
 #ifndef FS_PUGICAST_H
 #define FS_PUGICAST_H
 
-#include <cstdlib>
-
 namespace pugi {
 
 template<class T> T cast(const char* str);
diff --git a/src/rsa.h b/src/rsa.h
index 4d8d83eb9d..f589fbe346 100644
--- a/src/rsa.h
+++ b/src/rsa.h
@@ -4,8 +4,6 @@
 #ifndef FS_RSA_H
 #define FS_RSA_H
 
-#include <cryptopp/rsa.h>
-
 class RSA
 {
 	public:
diff --git a/src/spawn.h b/src/spawn.h
index 09d88f3a87..baa7f7eb84 100644
--- a/src/spawn.h
+++ b/src/spawn.h
@@ -6,8 +6,6 @@
 
 #include "position.h"
 
-#include <utility>
-
 class Monster;
 class MonsterType;
 class Npc;
diff --git a/src/tasks.h b/src/tasks.h
index c25a9c2350..73f12abdec 100644
--- a/src/tasks.h
+++ b/src/tasks.h
@@ -6,8 +6,6 @@
 
 #include "thread_holder_base.h"
 
-#include <condition_variable>
-
 using TaskFunc = std::function<void(void)>;
 const int DISPATCHER_TASK_EXPIRATION = 2000;
 const auto SYSTEM_TIME_ZERO = std::chrono::system_clock::time_point(std::chrono::milliseconds(0));
diff --git a/src/thread_holder_base.h b/src/thread_holder_base.h
index 7d74f010a9..a4f0b90175 100644
--- a/src/thread_holder_base.h
+++ b/src/thread_holder_base.h
@@ -6,8 +6,6 @@
 
 #include "enums.h"
 
-#include <atomic>
-
 template <typename Derived>
 class ThreadHolder
 {
diff --git a/src/tools.cpp b/src/tools.cpp
index 33987040f1..51d2c20670 100644
--- a/src/tools.cpp
+++ b/src/tools.cpp
@@ -6,7 +6,6 @@
 #include "tools.h"
 
 #include "configmanager.h"
-#include "definitions.h"
 
 #include <chrono>
 
diff --git a/src/tools.h b/src/tools.h
index 40e6aa320a..4f4d862cac 100644
--- a/src/tools.h
+++ b/src/tools.h
@@ -8,9 +8,6 @@
 #include "enums.h"
 #include "position.h"
 
-#include <random>
-#include <string_view>
-
 void printXMLError(const std::string& where, const std::string& fileName, const pugi::xml_parse_result& result);
 
 std::string transformToSHA1(const std::string& input);
diff --git a/src/xtea.h b/src/xtea.h
index b3a0802d6d..91b0c3fec1 100644
--- a/src/xtea.h
+++ b/src/xtea.h
@@ -4,8 +4,6 @@
 #ifndef FS_XTEA_H
 #define FS_XTEA_H
 
-#include <array>
-
 namespace xtea {
 
 using key = std::array<uint32_t, 4>;