diff --git a/core/config/engine.h b/core/config/engine.h
index b38412308ae..238ae2253ab 100644
--- a/core/config/engine.h
+++ b/core/config/engine.h
@@ -34,7 +34,6 @@
 #include "core/os/main_loop.h"
 #include "core/string/ustring.h"
 #include "core/templates/list.h"
-#include "core/templates/vector.h"
 
 template <typename T>
 class TypedArray;
diff --git a/core/config/project_settings.cpp b/core/config/project_settings.cpp
index 30cdd789a44..fa6e5639b73 100644
--- a/core/config/project_settings.cpp
+++ b/core/config/project_settings.cpp
@@ -39,7 +39,6 @@
 #include "core/io/marshalls.h"
 #include "core/io/resource_uid.h"
 #include "core/object/script_language.h"
-#include "core/os/keyboard.h"
 #include "core/templates/rb_set.h"
 #include "core/variant/typed_array.h"
 #include "core/variant/variant_parser.h"
diff --git a/core/core_bind.cpp b/core/core_bind.cpp
index 237d479989d..59f290d13c8 100644
--- a/core/core_bind.cpp
+++ b/core/core_bind.cpp
@@ -35,8 +35,6 @@
 #include "core/crypto/crypto_core.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/debugger/script_debugger.h"
-#include "core/io/file_access_compressed.h"
-#include "core/io/file_access_encrypted.h"
 #include "core/io/marshalls.h"
 #include "core/math/geometry_2d.h"
 #include "core/math/geometry_3d.h"
diff --git a/core/core_bind.h b/core/core_bind.h
index 102c973ebf8..b64f9069b18 100644
--- a/core/core_bind.h
+++ b/core/core_bind.h
@@ -34,8 +34,6 @@
 #include "core/debugger/engine_profiler.h"
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
-#include "core/object/script_language.h"
-#include "core/os/os.h"
 #include "core/os/semaphore.h"
 #include "core/os/thread.h"
 #include "core/templates/safe_refcount.h"
diff --git a/core/core_constants.cpp b/core/core_constants.cpp
index cdb4f2c800d..236caa0bc4b 100644
--- a/core/core_constants.cpp
+++ b/core/core_constants.cpp
@@ -33,7 +33,6 @@
 #include "core/input/input_event.h"
 #include "core/object/class_db.h"
 #include "core/os/keyboard.h"
-#include "core/templates/hash_set.h"
 #include "core/variant/variant.h"
 
 struct _CoreConstant {
diff --git a/core/core_constants.h b/core/core_constants.h
index 82d626c7495..8ab4a78a3b4 100644
--- a/core/core_constants.h
+++ b/core/core_constants.h
@@ -32,7 +32,7 @@
 #define CORE_CONSTANTS_H
 
 #include "core/string/string_name.h"
-#include "core/templates/hash_set.h"
+#include "core/templates/hash_map.h"
 
 class CoreConstants {
 public:
diff --git a/core/crypto/crypto.cpp b/core/crypto/crypto.cpp
index 30003e4ea86..692bd133521 100644
--- a/core/crypto/crypto.cpp
+++ b/core/crypto/crypto.cpp
@@ -30,10 +30,6 @@
 
 #include "crypto.h"
 
-#include "core/config/engine.h"
-#include "core/io/certs_compressed.gen.h"
-#include "core/io/compression.h"
-
 /// Resources
 
 CryptoKey *(*CryptoKey::_create)(bool p_notify_postinitialize) = nullptr;
diff --git a/core/debugger/engine_debugger.h b/core/debugger/engine_debugger.h
index 3c4ac87408b..1822915f440 100644
--- a/core/debugger/engine_debugger.h
+++ b/core/debugger/engine_debugger.h
@@ -36,7 +36,6 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/vector.h"
 #include "core/variant/array.h"
-#include "core/variant/variant.h"
 
 class RemoteDebuggerPeer;
 class ScriptDebugger;
diff --git a/core/debugger/script_debugger.h b/core/debugger/script_debugger.h
index ee037b91fa9..fb786f1b94a 100644
--- a/core/debugger/script_debugger.h
+++ b/core/debugger/script_debugger.h
@@ -34,7 +34,6 @@
 #include "core/object/script_language.h"
 #include "core/string/string_name.h"
 #include "core/templates/hash_set.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/vector.h"
 
 class ScriptDebugger {
diff --git a/core/input/shortcut.cpp b/core/input/shortcut.cpp
index cdc6e2e8f77..2301e00179e 100644
--- a/core/input/shortcut.cpp
+++ b/core/input/shortcut.cpp
@@ -29,7 +29,6 @@
 /**************************************************************************/
 
 #include "shortcut.h"
-#include "core/os/keyboard.h"
 
 void Shortcut::set_events(const Array &p_events) {
 	for (int i = 0; i < p_events.size(); i++) {
diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp
index 0a4d5a3be6b..64c9769b45b 100644
--- a/core/io/config_file.cpp
+++ b/core/io/config_file.cpp
@@ -31,7 +31,6 @@
 #include "config_file.h"
 
 #include "core/io/file_access_encrypted.h"
-#include "core/os/keyboard.h"
 #include "core/string/string_builder.h"
 #include "core/variant/variant_parser.h"
 
diff --git a/core/io/dtls_server.cpp b/core/io/dtls_server.cpp
index 7638328dc33..a84fff81fee 100644
--- a/core/io/dtls_server.cpp
+++ b/core/io/dtls_server.cpp
@@ -30,9 +30,6 @@
 
 #include "dtls_server.h"
 
-#include "core/config/project_settings.h"
-#include "core/io/file_access.h"
-
 DTLSServer *(*DTLSServer::_create)(bool p_notify_postinitialize) = nullptr;
 bool DTLSServer::available = false;
 
diff --git a/core/io/file_access_compressed.cpp b/core/io/file_access_compressed.cpp
index 53ef93d09b9..6b349a05160 100644
--- a/core/io/file_access_compressed.cpp
+++ b/core/io/file_access_compressed.cpp
@@ -30,8 +30,6 @@
 
 #include "file_access_compressed.h"
 
-#include "core/string/print_string.h"
-
 void FileAccessCompressed::configure(const String &p_magic, Compression::Mode p_mode, uint32_t p_block_size) {
 	magic = p_magic.ascii().get_data();
 	magic = (magic + "    ").substr(0, 4);
diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp
index c899c860c6d..bb832b9bac3 100644
--- a/core/io/file_access_encrypted.cpp
+++ b/core/io/file_access_encrypted.cpp
@@ -31,11 +31,8 @@
 #include "file_access_encrypted.h"
 
 #include "core/crypto/crypto_core.h"
-#include "core/string/print_string.h"
 #include "core/variant/variant.h"
 
-#include <stdio.h>
-
 Error FileAccessEncrypted::open_and_parse(Ref<FileAccess> p_base, const Vector<uint8_t> &p_key, Mode p_mode, bool p_with_magic, const Vector<uint8_t> &p_iv) {
 	ERR_FAIL_COND_V_MSG(file.is_valid(), ERR_ALREADY_IN_USE, vformat("Can't open file while another file from path '%s' is open.", file->get_path_absolute()));
 	ERR_FAIL_COND_V(p_key.size() != 32, ERR_INVALID_PARAMETER);
diff --git a/core/io/file_access_memory.cpp b/core/io/file_access_memory.cpp
index b5ab18407b3..e052f8a4961 100644
--- a/core/io/file_access_memory.cpp
+++ b/core/io/file_access_memory.cpp
@@ -31,8 +31,6 @@
 #include "file_access_memory.h"
 
 #include "core/config/project_settings.h"
-#include "core/io/dir_access.h"
-#include "core/templates/rb_map.h"
 
 static HashMap<String, Vector<uint8_t>> *files = nullptr;
 
diff --git a/core/io/file_access_pack.cpp b/core/io/file_access_pack.cpp
index 5ccd8a8fb75..1a0e0b06cc9 100644
--- a/core/io/file_access_pack.cpp
+++ b/core/io/file_access_pack.cpp
@@ -35,8 +35,6 @@
 #include "core/os/os.h"
 #include "core/version.h"
 
-#include <stdio.h>
-
 Error PackedData::add_pack(const String &p_path, bool p_replace_files, uint64_t p_offset) {
 	for (int i = 0; i < sources.size(); i++) {
 		if (sources[i]->try_open_pack(p_path, p_replace_files, p_offset)) {
diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h
index 70119711649..80d69d7b541 100644
--- a/core/io/file_access_pack.h
+++ b/core/io/file_access_pack.h
@@ -36,7 +36,6 @@
 #include "core/string/print_string.h"
 #include "core/templates/hash_set.h"
 #include "core/templates/list.h"
-#include "core/templates/rb_map.h"
 
 // Godot's packed file magic header ("GDPC" in ASCII).
 #define PACK_HEADER_MAGIC 0x43504447
diff --git a/core/io/file_access_zip.h b/core/io/file_access_zip.h
index 57f1d203588..a1544feefa3 100644
--- a/core/io/file_access_zip.h
+++ b/core/io/file_access_zip.h
@@ -34,12 +34,9 @@
 #ifdef MINIZIP_ENABLED
 
 #include "core/io/file_access_pack.h"
-#include "core/templates/rb_map.h"
 
 #include "thirdparty/minizip/unzip.h"
 
-#include <stdlib.h>
-
 class ZipArchive : public PackSource {
 public:
 	struct File {
diff --git a/core/io/image.cpp b/core/io/image.cpp
index b35c98b1eba..4d19d3a4336 100644
--- a/core/io/image.cpp
+++ b/core/io/image.cpp
@@ -36,11 +36,9 @@
 #include "core/io/image_loader.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"
-#include "core/string/print_string.h"
 #include "core/templates/hash_map.h"
 #include "core/variant/dictionary.h"
 
-#include <stdio.h>
 #include <cmath>
 
 const char *Image::format_names[Image::FORMAT_MAX] = {
diff --git a/core/io/image.h b/core/io/image.h
index f6504c7be88..5d46aff9500 100644
--- a/core/io/image.h
+++ b/core/io/image.h
@@ -33,7 +33,6 @@
 
 #include "core/io/resource.h"
 #include "core/math/color.h"
-#include "core/math/rect2.h"
 
 /**
  * Image storage class. This is used to store an image in user memory, as well as
diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp
index 58e63a4cc99..51c4c49bc58 100644
--- a/core/io/image_loader.cpp
+++ b/core/io/image_loader.cpp
@@ -30,8 +30,6 @@
 
 #include "image_loader.h"
 
-#include "core/string/print_string.h"
-
 void ImageFormatLoader::_bind_methods() {
 	BIND_BITFIELD_FLAG(FLAG_NONE);
 	BIND_BITFIELD_FLAG(FLAG_FORCE_LINEAR);
diff --git a/core/io/ip_address.cpp b/core/io/ip_address.cpp
index 9342792493f..f12c896dc14 100644
--- a/core/io/ip_address.cpp
+++ b/core/io/ip_address.cpp
@@ -34,7 +34,6 @@ IPAddress::operator Variant() const {
 	return operator String();
 }*/
 
-#include <stdio.h>
 #include <string.h>
 
 IPAddress::operator String() const {
diff --git a/core/io/logger.cpp b/core/io/logger.cpp
index 26b60f6738e..a0cf3e73ce1 100644
--- a/core/io/logger.cpp
+++ b/core/io/logger.cpp
@@ -30,12 +30,9 @@
 
 #include "logger.h"
 
-#include "core/config/project_settings.h"
 #include "core/core_globals.h"
 #include "core/io/dir_access.h"
-#include "core/os/os.h"
 #include "core/os/time.h"
-#include "core/string/print_string.h"
 
 #include "modules/modules_enabled.gen.h" // For regex.
 
diff --git a/core/io/packet_peer_dtls.cpp b/core/io/packet_peer_dtls.cpp
index 231c48d8876..5ac0dff7946 100644
--- a/core/io/packet_peer_dtls.cpp
+++ b/core/io/packet_peer_dtls.cpp
@@ -29,8 +29,6 @@
 /**************************************************************************/
 
 #include "packet_peer_dtls.h"
-#include "core/config/project_settings.h"
-#include "core/io/file_access.h"
 
 PacketPeerDTLS *(*PacketPeerDTLS::_create)(bool p_notify_postinitialize) = nullptr;
 bool PacketPeerDTLS::available = false;
diff --git a/core/io/plist.cpp b/core/io/plist.cpp
index 26b8c39495a..b1ce6d23b8e 100644
--- a/core/io/plist.cpp
+++ b/core/io/plist.cpp
@@ -30,6 +30,9 @@
 
 #include "plist.h"
 
+#include "core/crypto/crypto_core.h"
+#include "core/os/time.h"
+
 PList::PLNodeType PListNode::get_type() const {
 	return data_type;
 }
diff --git a/core/io/plist.h b/core/io/plist.h
index 7d8b8ef0b42..7b3199060f4 100644
--- a/core/io/plist.h
+++ b/core/io/plist.h
@@ -33,9 +33,7 @@
 
 // Property list file format (application/x-plist) parser, property list ASN-1 serialization.
 
-#include "core/crypto/crypto_core.h"
 #include "core/io/file_access.h"
-#include "core/os/time.h"
 
 class PListNode;
 
diff --git a/core/io/remote_filesystem_client.h b/core/io/remote_filesystem_client.h
index fcb5c1cfc3c..f96c263c585 100644
--- a/core/io/remote_filesystem_client.h
+++ b/core/io/remote_filesystem_client.h
@@ -31,7 +31,6 @@
 #ifndef REMOTE_FILESYSTEM_CLIENT_H
 #define REMOTE_FILESYSTEM_CLIENT_H
 
-#include "core/io/ip_address.h"
 #include "core/string/ustring.h"
 #include "core/templates/hash_set.h"
 #include "core/templates/local_vector.h"
diff --git a/core/io/resource.cpp b/core/io/resource.cpp
index c65484b6c61..2ef24367d7a 100644
--- a/core/io/resource.cpp
+++ b/core/io/resource.cpp
@@ -30,15 +30,11 @@
 
 #include "resource.h"
 
-#include "core/io/file_access.h"
 #include "core/io/resource_loader.h"
 #include "core/math/math_funcs.h"
-#include "core/object/script_language.h"
 #include "core/os/os.h"
 #include "scene/main/node.h" //only so casting works
 
-#include <stdio.h>
-
 void Resource::emit_changed() {
 	if (ResourceLoader::is_within_load() && !Thread::is_main_thread()) {
 		ResourceLoader::resource_changed_emit(this);
diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp
index 542b6335501..9151e395d2c 100644
--- a/core/io/resource_format_binary.cpp
+++ b/core/io/resource_format_binary.cpp
@@ -33,8 +33,6 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access_compressed.h"
-#include "core/io/image.h"
-#include "core/io/marshalls.h"
 #include "core/io/missing_resource.h"
 #include "core/object/script_language.h"
 #include "core/version.h"
diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h
index ebd6024033b..f933e88b23b 100644
--- a/core/io/resource_loader.h
+++ b/core/io/resource_loader.h
@@ -34,7 +34,6 @@
 #include "core/io/resource.h"
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/worker_thread_pool.h"
-#include "core/os/semaphore.h"
 #include "core/os/thread.h"
 
 class ConditionVariable;
diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp
index 6923ca1269f..ed1f6f4e2e2 100644
--- a/core/io/xml_parser.cpp
+++ b/core/io/xml_parser.cpp
@@ -30,7 +30,7 @@
 
 #include "xml_parser.h"
 
-#include "core/string/print_string.h"
+#include "core/io/file_access.h"
 
 //#define DEBUG_XML
 
diff --git a/core/io/xml_parser.h b/core/io/xml_parser.h
index 77df99a881b..a14bdee5710 100644
--- a/core/io/xml_parser.h
+++ b/core/io/xml_parser.h
@@ -31,7 +31,6 @@
 #ifndef XML_PARSER_H
 #define XML_PARSER_H
 
-#include "core/io/file_access.h"
 #include "core/object/ref_counted.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp
index a70aea5663f..060b1bb1e53 100644
--- a/core/math/a_star.cpp
+++ b/core/math/a_star.cpp
@@ -32,7 +32,6 @@
 #include "a_star.compat.inc"
 
 #include "core/math/geometry_3d.h"
-#include "core/object/script_language.h"
 
 int64_t AStar3D::get_available_point_id() const {
 	if (points.has(last_free_id)) {
diff --git a/core/math/a_star_grid_2d.h b/core/math/a_star_grid_2d.h
index 0536b8109b7..ae6f3a1fc99 100644
--- a/core/math/a_star_grid_2d.h
+++ b/core/math/a_star_grid_2d.h
@@ -33,7 +33,6 @@
 
 #include "core/object/gdvirtual.gen.inc"
 #include "core/object/ref_counted.h"
-#include "core/templates/list.h"
 #include "core/templates/local_vector.h"
 
 class AStarGrid2D : public RefCounted {
diff --git a/core/math/convex_hull.cpp b/core/math/convex_hull.cpp
index 22aabc8ecf2..4052234fa31 100644
--- a/core/math/convex_hull.cpp
+++ b/core/math/convex_hull.cpp
@@ -61,12 +61,9 @@ subject to the following restrictions:
 #include "core/error/error_macros.h"
 #include "core/math/aabb.h"
 #include "core/math/math_defs.h"
-#include "core/os/memory.h"
 #include "core/templates/oa_hash_map.h"
 #include "core/templates/paged_allocator.h"
 
-#include <string.h>
-
 //#define DEBUG_CONVEX_HULL
 //#define SHOW_ITERATIONS
 
diff --git a/core/math/geometry_3d.cpp b/core/math/geometry_3d.cpp
index 4d554551666..361a0607b5d 100644
--- a/core/math/geometry_3d.cpp
+++ b/core/math/geometry_3d.cpp
@@ -30,8 +30,6 @@
 
 #include "geometry_3d.h"
 
-#include "thirdparty/misc/polypartition.h"
-
 void Geometry3D::get_closest_points_between_segments(const Vector3 &p_p0, const Vector3 &p_p1, const Vector3 &p_q0, const Vector3 &p_q1, Vector3 &r_ps, Vector3 &r_qt) {
 	// Based on David Eberly's Computation of Distance Between Line Segments algorithm.
 
diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp
index 6a60a5925d4..34a0c021c7a 100644
--- a/core/math/quick_hull.cpp
+++ b/core/math/quick_hull.cpp
@@ -30,8 +30,6 @@
 
 #include "quick_hull.h"
 
-#include "core/templates/rb_map.h"
-
 uint32_t QuickHull::debug_stop_after = 0xFFFFFFFF;
 
 Error QuickHull::build(const Vector<Vector3> &p_points, Geometry3D::MeshData &r_mesh) {
diff --git a/core/math/quick_hull.h b/core/math/quick_hull.h
index d7ff880f1af..f4891a7c61e 100644
--- a/core/math/quick_hull.h
+++ b/core/math/quick_hull.h
@@ -31,9 +31,7 @@
 #ifndef QUICK_HULL_H
 #define QUICK_HULL_H
 
-#include "core/math/aabb.h"
 #include "core/math/geometry_3d.h"
-#include "core/templates/hash_set.h"
 #include "core/templates/list.h"
 
 class QuickHull {
diff --git a/core/math/transform_3d.cpp b/core/math/transform_3d.cpp
index 2c91a7604b0..d4673851a3d 100644
--- a/core/math/transform_3d.cpp
+++ b/core/math/transform_3d.cpp
@@ -30,7 +30,6 @@
 
 #include "transform_3d.h"
 
-#include "core/math/math_funcs.h"
 #include "core/string/ustring.h"
 
 void Transform3D::affine_invert() {
diff --git a/core/object/callable_method_pointer.h b/core/object/callable_method_pointer.h
index 86c66593bd3..a12db51cbb0 100644
--- a/core/object/callable_method_pointer.h
+++ b/core/object/callable_method_pointer.h
@@ -32,8 +32,6 @@
 #define CALLABLE_METHOD_POINTER_H
 
 #include "core/object/object.h"
-#include "core/templates/hashfuncs.h"
-#include "core/templates/simple_type.h"
 #include "core/variant/binder_common.h"
 #include "core/variant/callable.h"
 
diff --git a/core/object/class_db.cpp b/core/object/class_db.cpp
index 865b6acc423..048a19b3c62 100644
--- a/core/object/class_db.cpp
+++ b/core/object/class_db.cpp
@@ -33,7 +33,6 @@
 #include "core/config/engine.h"
 #include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
-#include "core/os/mutex.h"
 #include "core/version.h"
 
 #define OBJTYPE_RLOCK RWLockRead _rw_lockr_(lock);
diff --git a/core/object/object.cpp b/core/object/object.cpp
index ef1ca8132cb..66727e9b4c5 100644
--- a/core/object/object.cpp
+++ b/core/object/object.cpp
@@ -38,7 +38,6 @@
 #include "core/os/os.h"
 #include "core/string/print_string.h"
 #include "core/string/translation_server.h"
-#include "core/templates/local_vector.h"
 #include "core/variant/typed_array.h"
 
 #ifdef DEBUG_ENABLED
diff --git a/core/object/script_language.cpp b/core/object/script_language.cpp
index 5afe45ca359..4ef53dba1df 100644
--- a/core/object/script_language.cpp
+++ b/core/object/script_language.cpp
@@ -35,8 +35,6 @@
 #include "core/debugger/script_debugger.h"
 #include "core/io/resource_loader.h"
 
-#include <stdint.h>
-
 ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES];
 int ScriptServer::_language_count = 0;
 bool ScriptServer::languages_ready = false;
diff --git a/core/object/script_language.h b/core/object/script_language.h
index 9c0632ed532..6ceeb428751 100644
--- a/core/object/script_language.h
+++ b/core/object/script_language.h
@@ -35,7 +35,6 @@
 #include "core/io/resource.h"
 #include "core/object/script_instance.h"
 #include "core/templates/pair.h"
-#include "core/templates/rb_map.h"
 #include "core/templates/safe_refcount.h"
 #include "core/variant/typed_array.h"
 
diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp
index 5e214901643..9e3c82f4aa3 100644
--- a/core/os/main_loop.cpp
+++ b/core/os/main_loop.cpp
@@ -30,8 +30,6 @@
 
 #include "main_loop.h"
 
-#include "core/object/script_language.h"
-
 void MainLoop::_bind_methods() {
 	BIND_CONSTANT(NOTIFICATION_OS_MEMORY_WARNING);
 	BIND_CONSTANT(NOTIFICATION_TRANSLATION_CHANGED);
diff --git a/core/os/memory.cpp b/core/os/memory.cpp
index dae0a31fe02..29711730b8d 100644
--- a/core/os/memory.cpp
+++ b/core/os/memory.cpp
@@ -30,10 +30,8 @@
 
 #include "memory.h"
 
-#include "core/error/error_macros.h"
 #include "core/templates/safe_refcount.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/core/os/mutex.h b/core/os/mutex.h
index a968fd7029f..c650d842ec8 100644
--- a/core/os/mutex.h
+++ b/core/os/mutex.h
@@ -31,7 +31,6 @@
 #ifndef MUTEX_H
 #define MUTEX_H
 
-#include "core/error/error_macros.h"
 #include "core/typedefs.h"
 
 #ifdef MINGW_ENABLED
diff --git a/core/os/os.cpp b/core/os/os.cpp
index ff713ab3027..f7bfd46a34e 100644
--- a/core/os/os.cpp
+++ b/core/os/os.cpp
@@ -31,7 +31,6 @@
 #include "os.h"
 
 #include "core/config/project_settings.h"
-#include "core/input/input.h"
 #include "core/io/dir_access.h"
 #include "core/io/file_access.h"
 #include "core/io/json.h"
diff --git a/core/os/os.h b/core/os/os.h
index bff489adeac..bfd1e886a94 100644
--- a/core/os/os.h
+++ b/core/os/os.h
@@ -39,7 +39,6 @@
 #include "core/templates/list.h"
 #include "core/templates/vector.h"
 
-#include <stdarg.h>
 #include <stdlib.h>
 
 class OS {
diff --git a/core/os/thread.h b/core/os/thread.h
index 1c442b41f62..066c4befa77 100644
--- a/core/os/thread.h
+++ b/core/os/thread.h
@@ -42,8 +42,6 @@
 #include "core/templates/safe_refcount.h"
 #include "core/typedefs.h"
 
-#include <new>
-
 #ifdef MINGW_ENABLED
 #define MINGW_STDTHREAD_REDUNDANCY_WARNING
 #include "thirdparty/mingw-std-threads/mingw.thread.h"
diff --git a/core/os/thread_safe.h b/core/os/thread_safe.h
index 042a0b7d987..316b0c96876 100644
--- a/core/os/thread_safe.h
+++ b/core/os/thread_safe.h
@@ -31,8 +31,6 @@
 #ifndef THREAD_SAFE_H
 #define THREAD_SAFE_H
 
-#include "core/os/mutex.h"
-
 #define _THREAD_SAFE_CLASS_ mutable Mutex _thread_safe_;
 #define _THREAD_SAFE_METHOD_ MutexLock _thread_safe_method_(_thread_safe_);
 #define _THREAD_SAFE_LOCK_ _thread_safe_.lock();
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index 685ba9d3d98..3e172c2b82a 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -67,8 +67,6 @@
 #include "core/math/a_star.h"
 #include "core/math/a_star_grid_2d.h"
 #include "core/math/expression.h"
-#include "core/math/geometry_2d.h"
-#include "core/math/geometry_3d.h"
 #include "core/math/random_number_generator.h"
 #include "core/math/triangle_mesh.h"
 #include "core/object/class_db.h"
diff --git a/core/string/node_path.cpp b/core/string/node_path.cpp
index 40c81edf4ce..b32bed5ee45 100644
--- a/core/string/node_path.cpp
+++ b/core/string/node_path.cpp
@@ -30,7 +30,7 @@
 
 #include "node_path.h"
 
-#include "core/string/print_string.h"
+#include "core/variant/variant.h"
 
 void NodePath::_update_hash_cache() const {
 	uint32_t h = data->absolute ? 1 : 0;
diff --git a/core/string/print_string.cpp b/core/string/print_string.cpp
index adceb6365e6..08628814223 100644
--- a/core/string/print_string.cpp
+++ b/core/string/print_string.cpp
@@ -33,8 +33,6 @@
 #include "core/core_globals.h"
 #include "core/os/os.h"
 
-#include <stdio.h>
-
 static PrintHandlerList *print_handler_list = nullptr;
 
 void add_print_handler(PrintHandlerList *p_handler) {
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp
index e1588d3752f..c23e72c61f1 100644
--- a/core/string/ustring.cpp
+++ b/core/string/ustring.cpp
@@ -34,7 +34,6 @@
 #include "core/math/color.h"
 #include "core/math/math_funcs.h"
 #include "core/object/object.h"
-#include "core/os/memory.h"
 #include "core/string/print_string.h"
 #include "core/string/string_name.h"
 #include "core/string/translation_server.h"
diff --git a/core/string/ustring.h b/core/string/ustring.h
index 594e1d362b1..317e6a90b07 100644
--- a/core/string/ustring.h
+++ b/core/string/ustring.h
@@ -39,8 +39,6 @@
 #include "core/typedefs.h"
 #include "core/variant/array.h"
 
-#include <utility>
-
 /*************************************************************************/
 /*  Utility Functions                                                    */
 /*************************************************************************/
diff --git a/core/templates/command_queue_mt.cpp b/core/templates/command_queue_mt.cpp
index 5fa767263f9..08b903d92eb 100644
--- a/core/templates/command_queue_mt.cpp
+++ b/core/templates/command_queue_mt.cpp
@@ -30,9 +30,6 @@
 
 #include "command_queue_mt.h"
 
-#include "core/config/project_settings.h"
-#include "core/os/os.h"
-
 CommandQueueMT::CommandQueueMT() {
 	command_mem.reserve(DEFAULT_COMMAND_MEM_SIZE_KB * 1024);
 }
diff --git a/core/templates/command_queue_mt.h b/core/templates/command_queue_mt.h
index 8ef5dd30642..089dc5a620c 100644
--- a/core/templates/command_queue_mt.h
+++ b/core/templates/command_queue_mt.h
@@ -35,7 +35,6 @@
 #include "core/os/condition_variable.h"
 #include "core/os/memory.h"
 #include "core/os/mutex.h"
-#include "core/string/print_string.h"
 #include "core/templates/local_vector.h"
 #include "core/templates/simple_type.h"
 #include "core/typedefs.h"
diff --git a/core/templates/hash_map.h b/core/templates/hash_map.h
index 329952e8d4f..b365cd1fa74 100644
--- a/core/templates/hash_map.h
+++ b/core/templates/hash_map.h
@@ -31,10 +31,8 @@
 #ifndef HASH_MAP_H
 #define HASH_MAP_H
 
-#include "core/math/math_funcs.h"
 #include "core/os/memory.h"
 #include "core/templates/hashfuncs.h"
-#include "core/templates/paged_allocator.h"
 #include "core/templates/pair.h"
 
 /**
diff --git a/core/templates/rid_owner.h b/core/templates/rid_owner.h
index 42001590546..982ed54893c 100644
--- a/core/templates/rid_owner.h
+++ b/core/templates/rid_owner.h
@@ -34,9 +34,7 @@
 #include "core/os/memory.h"
 #include "core/os/mutex.h"
 #include "core/string/print_string.h"
-#include "core/templates/hash_set.h"
 #include "core/templates/list.h"
-#include "core/templates/oa_hash_map.h"
 #include "core/templates/rid.h"
 #include "core/templates/safe_refcount.h"
 
diff --git a/core/variant/array.cpp b/core/variant/array.cpp
index abde597f202..d91612b420c 100644
--- a/core/variant/array.cpp
+++ b/core/variant/array.cpp
@@ -32,7 +32,6 @@
 
 #include "container_type_validate.h"
 #include "core/math/math_funcs.h"
-#include "core/object/class_db.h"
 #include "core/object/script_language.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/search_array.h"
diff --git a/core/variant/array.h b/core/variant/array.h
index 78b5d71c888..b386ae7aa11 100644
--- a/core/variant/array.h
+++ b/core/variant/array.h
@@ -36,7 +36,6 @@
 #include <climits>
 
 class Callable;
-class Object;
 class StringName;
 class Variant;
 
diff --git a/core/variant/callable.h b/core/variant/callable.h
index e76b888ac28..a66a6efebc8 100644
--- a/core/variant/callable.h
+++ b/core/variant/callable.h
@@ -33,7 +33,6 @@
 
 #include "core/object/object_id.h"
 #include "core/string/string_name.h"
-#include "core/templates/list.h"
 
 class Object;
 class Variant;
diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp
index c879efecb0d..9abcde30226 100644
--- a/core/variant/variant.cpp
+++ b/core/variant/variant.cpp
@@ -32,10 +32,8 @@
 
 #include "core/debugger/engine_debugger.h"
 #include "core/io/json.h"
-#include "core/io/marshalls.h"
 #include "core/io/resource.h"
 #include "core/math/math_funcs.h"
-#include "core/string/print_string.h"
 #include "core/variant/variant_parser.h"
 
 PagedAllocator<Variant::Pools::BucketSmall, true> Variant::Pools::_bucket_small;
diff --git a/core/variant/variant_destruct.cpp b/core/variant/variant_destruct.cpp
index 409f4bd07bb..a9b517c5cf0 100644
--- a/core/variant/variant_destruct.cpp
+++ b/core/variant/variant_destruct.cpp
@@ -30,8 +30,6 @@
 
 #include "variant_destruct.h"
 
-#include "core/templates/local_vector.h"
-
 static Variant::PTRDestructor destruct_pointers[Variant::VARIANT_MAX] = { nullptr };
 
 template <typename T>
diff --git a/core/variant/variant_parser.cpp b/core/variant/variant_parser.cpp
index bd0b0692b06..0755a71e419 100644
--- a/core/variant/variant_parser.cpp
+++ b/core/variant/variant_parser.cpp
@@ -31,10 +31,8 @@
 #include "variant_parser.h"
 
 #include "core/crypto/crypto_core.h"
-#include "core/input/input_event.h"
 #include "core/io/resource_loader.h"
 #include "core/object/script_language.h"
-#include "core/os/keyboard.h"
 #include "core/string/string_buffer.h"
 
 char32_t VariantParser::Stream::get_char() {
diff --git a/core/variant/variant_setget.h b/core/variant/variant_setget.h
index cdacbad3739..9b8c99fdaa5 100644
--- a/core/variant/variant_setget.h
+++ b/core/variant/variant_setget.h
@@ -35,7 +35,6 @@
 
 #include "core/debugger/engine_debugger.h"
 #include "core/object/class_db.h"
-#include "core/templates/local_vector.h"
 #include "core/variant/variant_internal.h"
 
 /**** NAMED SETTERS AND GETTERS ****/
diff --git a/main/main.cpp b/main/main.cpp
index b8dec2154b2..67df09de153 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -47,6 +47,7 @@
 #include "core/io/ip.h"
 #include "core/io/resource_loader.h"
 #include "core/object/message_queue.h"
+#include "core/object/script_language.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
 #include "core/register_core_types.h"