diff --git a/src/gui/StyleSpec.h b/src/gui/StyleSpec.h
index 3755e105f31de..8f7d518b395d2 100644
--- a/src/gui/StyleSpec.h
+++ b/src/gui/StyleSpec.h
@@ -7,8 +7,8 @@
 #include "client/texturesource.h"
 #include "client/fontengine.h"
 #include "debug.h"
-#include "irrlichttypes_bloated.h"
 #include "util/string.h"
+#include "irr_v2d.h"
 #include <algorithm>
 #include <array>
 #include <vector>
diff --git a/src/gui/guiFormSpecMenu.h b/src/gui/guiFormSpecMenu.h
index 5c3fcd80da87b..174c9ecc332d2 100644
--- a/src/gui/guiFormSpecMenu.h
+++ b/src/gui/guiFormSpecMenu.h
@@ -9,7 +9,6 @@
 #include <stack>
 #include <unordered_set>
 
-#include "irrlichttypes_bloated.h"
 #include "irr_ptr.h"
 #include "inventory.h"
 #include "inventorymanager.h"
diff --git a/src/gui/modalMenu.h b/src/gui/modalMenu.h
index 81888e86625e4..f3485de10d740 100644
--- a/src/gui/modalMenu.h
+++ b/src/gui/modalMenu.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "IGUIElement.h"
-#include "irrlichttypes_bloated.h"
+#include "irr_v2d.h"
 #include "irr_ptr.h"
 
 #include "util/string.h"
diff --git a/src/gui/touchcontrols.h b/src/gui/touchcontrols.h
index ea71e2c86d384..8a47dc8776fff 100644
--- a/src/gui/touchcontrols.h
+++ b/src/gui/touchcontrols.h
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "irrlichttypes.h"
+#include "irr_aabb3d.h"
 #include "IEventReceiver.h"
 
 #include <memory>
diff --git a/src/gui/touchscreenlayout.h b/src/gui/touchscreenlayout.h
index 9c7d72fbfdf47..5cdb92aea2e5c 100644
--- a/src/gui/touchscreenlayout.h
+++ b/src/gui/touchscreenlayout.h
@@ -4,8 +4,9 @@
 
 #pragma once
 
+#include "irrlichttypes.h"
+#include "irr_v2d.h"
 #include "irr_ptr.h"
-#include "irrlichttypes_bloated.h"
 #include "rect.h"
 #include <iostream>
 #include <unordered_map>
diff --git a/src/irrlichttypes_bloated.h b/src/irrlichttypes_bloated.h
deleted file mode 100644
index 6a5826eb1bc15..0000000000000
--- a/src/irrlichttypes_bloated.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// Luanti
-// SPDX-License-Identifier: LGPL-2.1-or-later
-// Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-#pragma once
-
-#include "irrlichttypes.h"
-
-#include "irr_v2d.h"
-#include "irr_v3d.h"
-#include "irr_aabb3d.h"
-
-#include <SColor.h>
diff --git a/src/script/common/c_content.h b/src/script/common/c_content.h
index 011aa355eccfb..3ee7b99412f7c 100644
--- a/src/script/common/c_content.h
+++ b/src/script/common/c_content.h
@@ -20,7 +20,6 @@ extern "C" {
 #include <vector>
 #include <array>
 
-#include "irrlichttypes_bloated.h"
 #include "util/string.h"
 #include "itemgroup.h"
 #include "itemdef.h"
diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h
index 39f6d3f7a6b38..827d8142e41bf 100644
--- a/src/script/common/c_converter.h
+++ b/src/script/common/c_converter.h
@@ -14,7 +14,10 @@
 #include <vector>
 #include <string_view>
 
-#include "irrlichttypes_bloated.h"
+#include <SColor.h>
+#include "irr_v3d.h"
+#include "irr_v2d.h"
+#include "irr_aabb3d.h"
 
 extern "C" {
 #include <lua.h>
diff --git a/src/script/lua_api/l_itemstackmeta.h b/src/script/lua_api/l_itemstackmeta.h
index 85278fd98d57b..cd6abf51a80a6 100644
--- a/src/script/lua_api/l_itemstackmeta.h
+++ b/src/script/lua_api/l_itemstackmeta.h
@@ -9,7 +9,6 @@
 #include "lua_api/l_base.h"
 #include "lua_api/l_metadata.h"
 #include "lua_api/l_item.h"
-#include "irrlichttypes_bloated.h"
 
 class ItemStackMetaRef : public MetaDataRef
 {
diff --git a/src/script/lua_api/l_nodemeta.h b/src/script/lua_api/l_nodemeta.h
index 58ad678eecd14..d21e6adc11a55 100644
--- a/src/script/lua_api/l_nodemeta.h
+++ b/src/script/lua_api/l_nodemeta.h
@@ -6,7 +6,6 @@
 
 #include "lua_api/l_base.h"
 #include "lua_api/l_metadata.h"
-#include "irrlichttypes_bloated.h"
 #include "nodemetadata.h"
 
 class ServerEnvironment;
diff --git a/src/script/lua_api/l_playermeta.h b/src/script/lua_api/l_playermeta.h
index c0f7086436308..de00f3d7f932d 100644
--- a/src/script/lua_api/l_playermeta.h
+++ b/src/script/lua_api/l_playermeta.h
@@ -7,7 +7,6 @@
 
 #include "lua_api/l_base.h"
 #include "lua_api/l_metadata.h"
-#include "irrlichttypes_bloated.h"
 #include "inventory.h"
 
 class ServerEnvironment;
diff --git a/src/staticobject.h b/src/staticobject.h
index f741e528cd81b..b33c2c95dbf59 100644
--- a/src/staticobject.h
+++ b/src/staticobject.h
@@ -4,7 +4,8 @@
 
 #pragma once
 
-#include "irrlichttypes_bloated.h"
+#include "irrlichttypes.h"
+#include "irr_v3d.h"
 #include <string>
 #include <sstream>
 #include <vector>