diff --git a/src/content_nodemeta.cpp b/src/content_nodemeta.cpp
index 39743c11f..f3ffc4bef 100644
--- a/src/content_nodemeta.cpp
+++ b/src/content_nodemeta.cpp
@@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodetimer.h"
 #include "inventory.h"
 #include "log.h"
+#include "debug.h"
 #include "serialization.h"
 #include "util/serialize.h"
 #include "util/string.h"
diff --git a/src/nodemetadata.cpp b/src/nodemetadata.cpp
index 43770fee1..a11503ebe 100644
--- a/src/nodemetadata.cpp
+++ b/src/nodemetadata.cpp
@@ -23,6 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include "irrlicht_changes/printing.h"
 #include "log.h"
+#include "debug.h"
 #include "util/serialize.h"
 #include "constants.h" // MAP_BLOCKSIZE
 #include <sstream>
diff --git a/src/object_properties.cpp b/src/object_properties.cpp
index df3d245f9..5fb6a7d41 100644
--- a/src/object_properties.cpp
+++ b/src/object_properties.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlicht_changes/printing.h"
 #include "irrlichttypes_bloated.h"
 #include "exceptions.h"
+#include "log.h"
 #include "util/serialize.h"
 #include <sstream>
 
diff --git a/src/script/common/c_converter.cpp b/src/script/common/c_converter.cpp
index a7b18365a..446f88f3d 100644
--- a/src/script/common/c_converter.cpp
+++ b/src/script/common/c_converter.cpp
@@ -25,6 +25,7 @@ extern "C" {
 #include "util/numeric.h"
 #include "util/serialize.h"
 #include "util/string.h"
+#include "log.h"
 #include "common/c_converter.h"
 #include "common/c_internal.h"
 #include "constants.h"
diff --git a/src/serialization.cpp b/src/serialization.cpp
index 689e4d986..4134126ca 100644
--- a/src/serialization.cpp
+++ b/src/serialization.cpp
@@ -18,7 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "serialization.h"
-
+#include "log.h"
 #include "util/serialize.h"
 
 #include <zlib.h>
diff --git a/src/util/serialize.h b/src/util/serialize.h
index 00250ece5..d7526a765 100644
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -21,7 +21,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "irrlichttypes_bloated.h"
 #include "exceptions.h" // for SerializationError
-#include "debug.h" // for assert
 #include "ieee_float.h"
 
 #include "config.h"
@@ -39,6 +38,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 	#endif
 #endif
 #include <cstring> // for memcpy
+#include <cassert>
 #include <iostream>
 #include <string>
 #include <string_view>