Cleanup various headers to reduce compilation times (#6255)

* Cleanup various headers to reduce compilation times

9 files changed, 12 insertions, 4 deletions

diff --git a/src/script/cpp_api/s_async.h b/src/script/cpp_api/s_async.h
index 94b55db6e..aa1559ed1 100644
--- a/src/script/cpp_api/s_async.h
+++ b/src/script/cpp_api/s_async.h
@@ -24,8 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <deque>
 #include <map>
 
-#include "threading/thread.h"
 #include "threading/semaphore.h"
+#include "threading/thread.h"
 #include "debug.h"
 #include "lua.h"
 #include "cpp_api/s_base.h"
@@ -39,7 +39,7 @@ class AsyncEngine;
 // Data required to queue a job
 struct LuaJobInfo
 {
-	LuaJobInfo() {};
+	LuaJobInfo() = default;
 
 	// Function to be called in async environment
 	std::string serializedFunction = "";
diff --git a/src/script/cpp_api/s_base.h b/src/script/cpp_api/s_base.h
index 28fefdd37..ff92bdf93 100644
--- a/src/script/cpp_api/s_base.h
+++ b/src/script/cpp_api/s_base.h
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <iostream>
 #include <string>
 #include <thread>
+#include <mutex>
 #include "util/basic_macros.h"
 
 extern "C" {
@@ -30,7 +31,6 @@ extern "C" {
 }
 
 #include "irrlichttypes.h"
-#include "threading/mutex_auto_lock.h"
 #include "common/c_types.h"
 #include "common/c_internal.h"
 
diff --git a/src/script/cpp_api/s_internal.h b/src/script/cpp_api/s_internal.h
index 315561e08..b493cb6fa 100644
--- a/src/script/cpp_api/s_internal.h
+++ b/src/script/cpp_api/s_internal.h
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <thread>
 #include "common/c_internal.h"
 #include "cpp_api/s_base.h"
+#include "threading/mutex_auto_lock.h"
 
 #ifdef SCRIPTAPI_LOCK_DEBUG
 #include "debug.h" // assert()
diff --git a/src/script/lua_api/l_base.h b/src/script/lua_api/l_base.h
index af89afd93..e9b28b36a 100644
--- a/src/script/lua_api/l_base.h
+++ b/src/script/lua_api/l_base.h
@@ -30,7 +30,7 @@ extern "C" {
 }
 
 #ifndef SERVER
-#include "client.h"
+class Client;
 #endif
 
 class ScriptApiBase;
diff --git a/src/script/lua_api/l_camera.cpp b/src/script/lua_api/l_camera.cpp
index ef842a222..49622df00 100644
--- a/src/script/lua_api/l_camera.cpp
+++ b/src/script/lua_api/l_camera.cpp
@@ -3,6 +3,7 @@
 #include "l_internal.h"
 #include "content_cao.h"
 #include "camera.h"
+#include "client.h"
 
 LuaCamera::LuaCamera(Camera *m) : m_camera(m)
 {
diff --git a/src/script/lua_api/l_client.cpp b/src/script/lua_api/l_client.cpp
index 6f9240466..81dfdb1e9 100644
--- a/src/script/lua_api/l_client.cpp
+++ b/src/script/lua_api/l_client.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "l_client.h"
 #include "chatmessage.h"
+#include "client.h"
 #include "clientenvironment.h"
 #include "common/c_content.h"
 #include "common/c_converter.h"
diff --git a/src/script/lua_api/l_env.cpp b/src/script/lua_api/l_env.cpp
index 2a57ca59b..9a2ce334b 100644
--- a/src/script/lua_api/l_env.cpp
+++ b/src/script/lua_api/l_env.cpp
@@ -37,6 +37,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "emerge.h"
 #include "pathfinder.h"
 #include "face_position_cache.h"
+#ifndef SERVER
+#include "client.h"
+#endif
 
 struct EnumString ModApiEnvMod::es_ClearObjectsMode[] =
 {
diff --git a/src/script/lua_api/l_localplayer.cpp b/src/script/lua_api/l_localplayer.cpp
index 7f932cbca..da560c3ac 100644
--- a/src/script/lua_api/l_localplayer.cpp
+++ b/src/script/lua_api/l_localplayer.cpp
@@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "l_localplayer.h"
 #include "l_internal.h"
 #include "script/common/c_converter.h"
+#include "localplayer.h"
 
 LuaLocalPlayer::LuaLocalPlayer(LocalPlayer *m) : m_localplayer(m)
 {
diff --git a/src/script/lua_api/l_minimap.cpp b/src/script/lua_api/l_minimap.cpp
index be981c884..b59e79095 100644
--- a/src/script/lua_api/l_minimap.cpp
+++ b/src/script/lua_api/l_minimap.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_minimap.h"
 #include "lua_api/l_internal.h"
 #include "common/c_converter.h"
+#include "client.h"
 #include "minimap.h"
 #include "settings.h"