Merge pull request #117402 from akien-mga/clangd-unused-includes-modules

Remove unused includes in `modules` with clangd-tidy

editor/template_builders.py

@@ -62,8 +62,8 @@ def make_templates(target, source, env):
 
     with methods.generated_wrapper(str(target[0])) as file:
         file.write(f"""\
-#include "core/object/object.h"
 #include "core/object/script_language.h"
+#include "core/string/ustring.h"
 
 inline constexpr int TEMPLATES_ARRAY_SIZE = {len(parsed_templates)};
 static const struct ScriptLanguage::ScriptTemplate TEMPLATES[TEMPLATES_ARRAY_SIZE] = {{

modules/camera/camera_feed_linux.cpp

@@ -350,8 +350,7 @@ bool CameraFeedLinux::set_format(int p_index, const Dictionary &p_parameters) {
 	return true;
 }
 
-CameraFeedLinux::CameraFeedLinux(const String &p_device_name) :
-		CameraFeed() {
+CameraFeedLinux::CameraFeedLinux(const String &p_device_name) {
 	device_name = p_device_name;
 	_query_device(device_name);
 }

modules/camera/camera_linux.h

@@ -32,6 +32,7 @@
 
 #include "core/os/mutex.h"
 #include "core/os/thread.h"
+#include "core/templates/safe_refcount.h"
 #include "servers/camera/camera_server.h"
 
 class CameraLinux : public CameraServer {

modules/camera/camera_win.cpp

@@ -30,6 +30,8 @@
 
 #include "camera_win.h"
 
+#include "servers/camera/camera_feed.h"
+
 ///@TODO sorry guys, I got about 80% through implementing this using DirectShow only
 // to find out Microsoft deprecated half the API and its replacement is as confusing
 // as they could make it. Joey suggested looking into libuvc which offers a more direct

modules/camera/camera_win.h

@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "servers/camera/camera_feed.h"
 #include "servers/camera/camera_server.h"
 
 class CameraWindows : public CameraServer {

modules/csg/editor/csg_gizmos.cpp

@@ -32,7 +32,6 @@
 
 #include "core/math/geometry_3d.h"
 #include "core/object/callable_mp.h"
-#include "core/object/class_db.h"
 #include "editor/editor_node.h"
 #include "editor/editor_undo_redo_manager.h"
 #include "editor/scene/3d/gizmos/gizmo_3d_helper.h"

modules/csg/tests/test_csg.h

@@ -30,9 +30,10 @@
 
 #pragma once
 
-#include "../csg.h"
 #include "../csg_shape.h"
+
 #include "scene/main/scene_tree.h"
+#include "scene/main/window.h"
 
 #include "tests/test_macros.h"
 

modules/enet/enet_multiplayer_peer.h

@@ -32,7 +32,6 @@
 
 #include "enet_connection.h"
 
-#include "core/crypto/crypto.h"
 #include "scene/main/multiplayer_peer.h"
 
 #include <enet/enet.h>

modules/fbx/fbx_state.h

@@ -32,9 +32,7 @@
 
 #include "modules/gltf/gltf_defines.h"
 #include "modules/gltf/gltf_state.h"
-#include "modules/gltf/structures/gltf_skeleton.h"
 #include "modules/gltf/structures/gltf_skin.h"
-#include "modules/gltf/structures/gltf_texture.h"
 
 #include <ufbx.h>
 

modules/gdscript/editor/gdscript_docgen.cpp

@@ -33,6 +33,7 @@
 #include "../gdscript.h"
 
 #include "core/config/project_settings.h"
+#include "core/doc_data.h"
 
 HashMap<String, String> GDScriptDocGen::singletons;
 

modules/gdscript/editor/gdscript_docgen.h

@@ -32,8 +32,6 @@
 
 #include "../gdscript_parser.h"
 
-#include "core/doc_data.h"
-
 class GDScriptDocGen {
 	using GDP = GDScriptParser;
 	using GDType = GDP::DataType;

modules/gdscript/editor/gdscript_highlighter.cpp

@@ -37,7 +37,6 @@
 #include "core/core_constants.h"
 #include "core/object/class_db.h"
 #include "editor/settings/editor_settings.h"
-#include "editor/themes/editor_theme_manager.h"
 #include "scene/gui/text_edit.h"
 
 Dictionary GDScriptSyntaxHighlighter::_get_line_syntax_highlighting_impl(int p_line) {

modules/gdscript/gdscript_byte_codegen.cpp

@@ -30,7 +30,6 @@
 
 #include "gdscript_byte_codegen.h"
 
-#include "core/debugger/engine_debugger.h"
 #include "core/object/class_db.h"
 
 uint32_t GDScriptByteCodeGenerator::add_parameter(const StringName &p_name, bool p_is_optional, const GDScriptDataType &p_type) {

modules/gdscript/gdscript_codegen.h

@@ -31,7 +31,6 @@
 #pragma once
 
 #include "gdscript_function.h"
-#include "gdscript_utility_functions.h"
 
 #include "core/string/string_name.h"
 #include "core/variant/variant.h"

modules/gdscript/gdscript_compiler.cpp

@@ -40,8 +40,6 @@
 #include "core/config/project_settings.h"
 #include "core/object/class_db.h"
 
-#include "scene/scene_string_names.h"
-
 bool GDScriptCompiler::_is_class_member_property(CodeGen &codegen, const StringName &p_name) {
 	if (codegen.function_node && codegen.function_node->is_static) {
 		return false;

modules/gdscript/gdscript_disassembler.cpp

@@ -33,7 +33,7 @@
 #include "gdscript.h"
 #include "gdscript_function.h"
 
-#include "core/object/class_db.h"
+#include "core/object/method_bind.h"
 #include "core/string/string_builder.h"
 
 static String _get_variant_string(const Variant &p_variant) {

modules/gdscript/language_server/gdscript_language_server.cpp

@@ -30,6 +30,8 @@
 
 #include "gdscript_language_server.h"
 
+#include "gdscript_language_protocol.h"
+
 #include "core/os/os.h"
 #include "editor/editor_log.h"
 #include "editor/editor_node.h"

modules/gdscript/language_server/gdscript_language_server.h

@@ -30,8 +30,6 @@
 
 #pragma once
 
-#include "gdscript_language_protocol.h"
-
 #include "editor/plugins/editor_plugin.h"
 
 class GDScriptLanguageServer : public EditorPlugin {

modules/gdscript/language_server/gdscript_text_document.cpp

@@ -36,7 +36,7 @@
 
 #include "core/object/callable_mp.h"
 #include "core/object/class_db.h"
-#include "editor/script/script_text_editor.h"
+#include "editor/script/script_editor_plugin.h"
 #include "editor/settings/editor_settings.h"
 #include "servers/display/display_server.h"
 

modules/gdscript/register_types.cpp

@@ -42,6 +42,7 @@
 #include "editor/script/script_editor_plugin.h"
 
 #ifndef GDSCRIPT_NO_LSP
+#include "language_server/gdscript_language_protocol.h"
 #include "language_server/gdscript_language_server.h"
 #endif
 #endif // TOOLS_ENABLED

modules/gdscript/tests/gdscript_test_runner.cpp

@@ -39,7 +39,7 @@
 #include "core/config/project_settings.h"
 #include "core/core_globals.h"
 #include "core/io/dir_access.h"
-#include "core/io/file_access_pack.h"
+#include "core/io/file_access.h"
 #include "core/object/class_db.h"
 #include "core/os/os.h"
 #include "core/string/string_builder.h"

modules/gdscript/tests/gdscript_test_runner.h

@@ -30,10 +30,9 @@
 
 #pragma once
 
-#include "../gdscript.h"
-
 #include "core/error/error_macros.h"
 #include "core/string/print_string.h"
+#include "core/string/string_name.h"
 #include "core/string/ustring.h"
 #include "core/templates/vector.h"
 

modules/gdscript/tests/test_completion.h

@@ -48,7 +48,7 @@
 #include "scene/resources/packed_scene.h"
 #include "scene/theme/theme_db.h"
 
-#include "modules/modules_enabled.gen.h" // For mono.
+#include "modules/modules_enabled.gen.h" // IWYU pragma: keep. For mono.
 
 namespace GDScriptTests {
 

modules/gdscript/tests/test_gdscript.cpp

@@ -35,6 +35,7 @@
 #include "../gdscript_parser.h"
 #include "../gdscript_tokenizer.h"
 #include "../gdscript_tokenizer_buffer.h"
+#include "gdscript_test_runner.h"
 
 #include "core/config/project_settings.h"
 #include "core/io/file_access.h"

modules/gdscript/tests/test_gdscript.h

@@ -30,10 +30,6 @@
 
 #pragma once
 
-#include "gdscript_test_runner.h"
-
-#include "tests/test_macros.h"
-
 namespace GDScriptTests {
 
 enum TestType {

modules/gdscript/tests/test_lsp.h

@@ -40,6 +40,7 @@
 #include "../language_server/gdscript_language_protocol.h"
 #include "../language_server/gdscript_workspace.h"
 #include "../language_server/godot_lsp.h"
+#include "gdscript_test_runner.h"
 
 #include "core/io/dir_access.h"
 #include "editor/file_system/editor_file_system.h"

modules/glslang/register_types.cpp

@@ -30,10 +30,14 @@
 
 #include "register_types.h"
 
-#include "core/config/engine.h"
-#include "core/os/os.h"
 #include "shader_compile.h"
 
+#include "core/config/engine.h"
+
+#ifdef D3D12_ENABLED
+#include "core/os/os.h"
+#endif
+
 GODOT_GCC_WARNING_PUSH_AND_IGNORE("-Wshadow")
 
 #include <glslang/Public/ResourceLimits.h>

modules/gltf/extensions/gltf_document_extension.cpp

@@ -30,7 +30,7 @@
 
 #include "gltf_document_extension.h"
 
-#include "core/object/class_db.h"
+#include "core/object/class_db.h" // IWYU pragma: keep. `GDVIRTUAL_BIND` macro.
 
 void GLTFDocumentExtension::_bind_methods() {
 	// Import process.

modules/gltf/extensions/physics/gltf_document_extension_physics.cpp

@@ -30,6 +30,9 @@
 
 #include "gltf_document_extension_physics.h"
 
+#include "gltf_physics_body.h"
+#include "gltf_physics_shape.h"
+
 #include "scene/3d/physics/area_3d.h"
 #include "scene/3d/physics/rigid_body_3d.h"
 #include "scene/3d/physics/static_body_3d.h"

modules/gltf/extensions/physics/gltf_document_extension_physics.h

@@ -31,8 +31,6 @@
 #pragma once
 
 #include "../gltf_document_extension.h"
-#include "gltf_physics_body.h"
-#include "gltf_physics_shape.h"
 
 class GLTFDocumentExtensionPhysics : public GLTFDocumentExtension {
 	GDCLASS(GLTFDocumentExtensionPhysics, GLTFDocumentExtension);

modules/gltf/extensions/physics/gltf_physics_body.h

@@ -30,7 +30,8 @@
 
 #pragma once
 
-#include "scene/3d/physics/physics_body_3d.h"
+#include "core/io/resource.h"
+#include "scene/3d/physics/collision_object_3d.h"
 
 // GLTFPhysicsBody is an intermediary between Godot's physics body nodes
 // and the OMI_physics_body extension.

modules/gltf/extensions/physics/gltf_physics_shape.cpp

@@ -30,8 +30,6 @@
 
 #include "gltf_physics_shape.h"
 
-#include "../../gltf_state.h"
-
 #include "core/math/convex_hull.h"
 #include "core/object/class_db.h"
 #include "scene/3d/physics/area_3d.h"

modules/gltf/gltf_document.cpp

@@ -48,7 +48,6 @@
 #include "core/object/class_db.h"
 #include "core/object/object_id.h"
 #include "core/version.h"
-#include "scene/2d/node_2d.h"
 #include "scene/3d/bone_attachment_3d.h"
 #include "scene/3d/camera_3d.h"
 #include "scene/3d/importer_mesh_instance_3d.h"

modules/gltf/register_types.cpp

@@ -43,6 +43,8 @@
 
 #ifndef PHYSICS_3D_DISABLED
 #include "extensions/physics/gltf_document_extension_physics.h"
+#include "extensions/physics/gltf_physics_body.h"
+#include "extensions/physics/gltf_physics_shape.h"
 #endif // PHYSICS_3D_DISABLED
 
 #ifdef TOOLS_ENABLED

modules/gltf/skin_tool.cpp

@@ -30,6 +30,8 @@
 
 #include "skin_tool.h"
 
+#include "core/math/disjoint_set.h"
+
 SkinNodeIndex SkinTool::_find_highest_node(Vector<Ref<GLTFNode>> &r_nodes, const Vector<GLTFNodeIndex> &p_subset) {
 	int highest = -1;
 	SkinNodeIndex best_node = -1;

modules/gltf/skin_tool.h

@@ -36,7 +36,6 @@
 #include "structures/gltf_skeleton.h"
 #include "structures/gltf_skin.h"
 
-#include "core/math/disjoint_set.h"
 #include "core/templates/rb_set.h"
 
 using SkinNodeIndex = int;

modules/gltf/tests/test_gltf.h

@@ -37,16 +37,9 @@
 #include "core/config/project_settings.h"
 #include "core/io/dir_access.h"
 #include "core/object/class_db.h"
-#include "drivers/png/image_loader_png.h"
 #include "editor/import/3d/resource_importer_scene.h"
 #include "editor/import/resource_importer_texture.h"
-#include "editor/inspector/editor_resource_preview.h"
-#include "scene/3d/mesh_instance_3d.h"
-#include "scene/3d/skeleton_3d.h"
-#include "scene/main/window.h"
-#include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/compressed_texture.h"
-#include "scene/resources/material.h"
 #include "scene/resources/packed_scene.h"
 #include "tests/test_utils.h"
 

modules/gltf/tests/test_gltf_extras.h

@@ -31,10 +31,11 @@
 #pragma once
 
 #include "test_gltf.h"
-#include "tests/test_macros.h"
 
 #ifdef TOOLS_ENABLED
 
+#include "../editor/editor_scene_importer_gltf.h"
+
 #include "editor/import/3d/resource_importer_scene.h"
 #include "scene/3d/mesh_instance_3d.h"
 #include "scene/3d/skeleton_3d.h"
@@ -42,11 +43,7 @@
 #include "scene/main/window.h"
 #include "scene/resources/3d/primitive_meshes.h"
 #include "scene/resources/material.h"
-#include "scene/resources/packed_scene.h"
-
-#include "modules/gltf/editor/editor_scene_importer_gltf.h"
-#include "modules/gltf/gltf_document.h"
-#include "modules/gltf/gltf_state.h"
+#include "tests/test_macros.h"
 
 namespace TestGltf {
 

modules/gltf/tests/test_gltf_images.h

@@ -30,13 +30,15 @@
 
 #pragma once
 
-#include "test_gltf.h"
-
 #ifdef TOOLS_ENABLED
 
+#include "test_gltf.h"
+
 #include "editor/file_system/editor_file_system.h"
-#include "editor/file_system/editor_paths.h"
+#include "editor/inspector/editor_resource_preview.h"
 #include "scene/main/scene_tree.h"
+#include "scene/main/window.h"
+#include "scene/resources/3d/primitive_meshes.cpp"
 #include "scene/resources/image_texture.h"
 
 namespace TestGltf {

modules/godot_physics_2d/godot_broad_phase_2d.h

@@ -30,7 +30,6 @@
 
 #pragma once
 
-#include "core/math/math_funcs.h"
 #include "core/math/rect2.h"
 
 class GodotCollisionObject2D;

modules/godot_physics_2d/godot_collision_object_2d.cpp

@@ -29,6 +29,7 @@
 /**************************************************************************/
 
 #include "godot_collision_object_2d.h"
+
 #include "godot_physics_server_2d.h"
 #include "godot_space_2d.h"
 

modules/godot_physics_2d/godot_collision_object_2d.h

@@ -34,7 +34,6 @@
 #include "godot_shape_2d.h"
 
 #include "core/templates/self_list.h"
-#include "servers/physics_2d/physics_server_2d.h"
 
 class GodotSpace2D;
 

modules/godot_physics_2d/godot_physics_server_2d.cpp

@@ -34,7 +34,6 @@
 #include "godot_broad_phase_2d_bvh.h"
 #include "godot_collision_solver_2d.h"
 
-#include "core/config/project_settings.h"
 #include "core/debugger/engine_debugger.h"
 #include "core/os/os.h"
 

modules/godot_physics_3d/godot_broad_phase_3d.h

@@ -31,7 +31,6 @@
 #pragma once
 
 #include "core/math/aabb.h"
-#include "core/math/math_funcs.h"
 
 class GodotCollisionObject3D;
 

modules/godot_physics_3d/godot_collision_object_3d.h

@@ -34,7 +34,6 @@
 #include "godot_shape_3d.h"
 
 #include "core/templates/self_list.h"
-#include "servers/physics_3d/physics_server_3d.h"
 
 #ifdef DEBUG_ENABLED
 #define MAX_OBJECT_DISTANCE 3.1622776601683791e+18

modules/godot_physics_3d/godot_step_3d.cpp

@@ -30,7 +30,7 @@
 
 #include "godot_step_3d.h"
 
-#include "godot_joint_3d.h"
+#include "godot_constraint_3d.h"
 
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"

modules/godot_physics_3d/joints/godot_jacobian_entry_3d.h

@@ -49,7 +49,8 @@ subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 */
 
-#include "core/math/transform_3d.h"
+#include "core/math/basis.h"
+#include "core/math/vector3.h"
 
 class GodotJacobianEntry3D {
 public:

modules/gridmap/grid_map.cpp

@@ -43,7 +43,6 @@
 
 #ifndef PHYSICS_3D_DISABLED
 #include "core/math/convex_hull.h"
-#include "scene/resources/3d/box_shape_3d.h"
 #include "scene/resources/3d/capsule_shape_3d.h"
 #include "scene/resources/3d/concave_polygon_shape_3d.h"
 #include "scene/resources/3d/convex_polygon_shape_3d.h"

modules/gridmap/grid_map.h

@@ -32,7 +32,6 @@
 
 #include "scene/3d/node_3d.h"
 #include "scene/resources/3d/mesh_library.h"
-#include "scene/resources/multimesh.h"
 
 class NavigationMesh;
 class NavigationMeshSourceGeometryData3D;

modules/jolt_physics/joints/jolt_cone_twist_joint_3d.cpp

@@ -34,7 +34,7 @@
 #include "../objects/jolt_body_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include "Jolt/Physics/Constraints/SwingTwistConstraint.h"
+#include <Jolt/Physics/Constraints/SwingTwistConstraint.h>
 
 namespace {
 

modules/jolt_physics/joints/jolt_cone_twist_joint_3d.h

@@ -33,9 +33,9 @@
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Body/Body.h"
+#include <Jolt/Physics/Body/Body.h>
 
 class JoltConeTwistJoint3D final : public JoltJoint3D {
 	typedef PhysicsServer3D::ConeTwistJointParam Parameter;

modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.cpp

@@ -34,7 +34,7 @@
 #include "../objects/jolt_body_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include "Jolt/Physics/Constraints/SixDOFConstraint.h"
+#include <Jolt/Physics/Constraints/SixDOFConstraint.h>
 
 namespace {
 

modules/jolt_physics/joints/jolt_generic_6dof_joint_3d.h

@@ -33,9 +33,9 @@
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Constraints/SixDOFConstraint.h"
+#include <Jolt/Physics/Constraints/SixDOFConstraint.h>
 
 class JoltGeneric6DOFJoint3D final : public JoltJoint3D {
 	typedef Vector3::Axis Axis;

modules/jolt_physics/joints/jolt_hinge_joint_3d.cpp

@@ -36,8 +36,8 @@
 
 #include "core/config/engine.h"
 
-#include "Jolt/Physics/Constraints/FixedConstraint.h"
-#include "Jolt/Physics/Constraints/HingeConstraint.h"
+#include <Jolt/Physics/Constraints/FixedConstraint.h>
+#include <Jolt/Physics/Constraints/HingeConstraint.h>
 
 namespace {
 

modules/jolt_physics/joints/jolt_hinge_joint_3d.h

@@ -33,9 +33,9 @@
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Constraints/SliderConstraint.h"
+#include <Jolt/Physics/Constraints/SliderConstraint.h>
 
 class JoltHingeJoint3D final : public JoltJoint3D {
 	typedef PhysicsServer3D::HingeJointParam Parameter;

modules/jolt_physics/joints/jolt_joint_3d.h

@@ -32,9 +32,9 @@
 
 #include "servers/physics_3d/physics_server_3d.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Constraints/Constraint.h"
+#include <Jolt/Physics/Constraints/Constraint.h>
 
 class JoltBody3D;
 class JoltSpace3D;

modules/jolt_physics/joints/jolt_pin_joint_3d.cpp

@@ -34,7 +34,7 @@
 #include "../objects/jolt_body_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include "Jolt/Physics/Constraints/PointConstraint.h"
+#include <Jolt/Physics/Constraints/PointConstraint.h>
 
 namespace {
 

modules/jolt_physics/joints/jolt_pin_joint_3d.h

@@ -32,9 +32,9 @@
 
 #include "jolt_joint_3d.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Constraints/SliderConstraint.h"
+#include <Jolt/Physics/Constraints/SliderConstraint.h>
 
 class JoltPinJoint3D final : public JoltJoint3D {
 	static JPH::Constraint *_build_pin(JPH::Body *p_jolt_body_a, JPH::Body *p_jolt_body_b, const Transform3D &p_shifted_ref_a, const Transform3D &p_shifted_ref_b);

modules/jolt_physics/joints/jolt_slider_joint_3d.cpp

@@ -34,8 +34,8 @@
 #include "../objects/jolt_body_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include "Jolt/Physics/Constraints/FixedConstraint.h"
-#include "Jolt/Physics/Constraints/SliderConstraint.h"
+#include <Jolt/Physics/Constraints/FixedConstraint.h>
+#include <Jolt/Physics/Constraints/SliderConstraint.h>
 
 namespace {
 

modules/jolt_physics/joints/jolt_slider_joint_3d.h

@@ -33,9 +33,9 @@
 #include "../jolt_physics_server_3d.h"
 #include "jolt_joint_3d.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Constraints/SliderConstraint.h"
+#include <Jolt/Physics/Constraints/SliderConstraint.h>
 
 class JoltSliderJoint3D final : public JoltJoint3D {
 	typedef PhysicsServer3D::SliderJointParam Parameter;

modules/jolt_physics/jolt_globals.cpp

@@ -38,9 +38,9 @@
 #include "core/string/print_string.h"
 #include "core/variant/variant.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/RegisterTypes.h"
+#include <Jolt/RegisterTypes.h>
 
 #include <cstdarg>
 

modules/jolt_physics/jolt_physics_server_3d.cpp

@@ -39,7 +39,6 @@
 #include "objects/jolt_area_3d.h"
 #include "objects/jolt_body_3d.h"
 #include "objects/jolt_soft_body_3d.h"
-#include "servers/physics_3d/physics_server_3d_wrap_mt.h"
 #include "shapes/jolt_box_shape_3d.h"
 #include "shapes/jolt_capsule_shape_3d.h"
 #include "shapes/jolt_concave_polygon_shape_3d.h"

modules/jolt_physics/misc/jolt_stream_wrappers.h

@@ -34,10 +34,10 @@
 
 #include "core/io/file_access.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Core/StreamIn.h"
-#include "Jolt/Core/StreamOut.h"
+#include <Jolt/Core/StreamIn.h>
+#include <Jolt/Core/StreamOut.h>
 
 class JoltStreamOutputWrapper final : public JPH::StreamOut {
 	Ref<FileAccess> file_access;

modules/jolt_physics/misc/jolt_type_conversions.h

@@ -37,14 +37,14 @@
 #include "core/math/transform_3d.h"
 #include "core/string/ustring.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Core/Color.h"
-#include "Jolt/Geometry/AABox.h"
-#include "Jolt/Geometry/Plane.h"
-#include "Jolt/Math/Mat44.h"
-#include "Jolt/Math/Quat.h"
-#include "Jolt/Math/Vec3.h"
+#include <Jolt/Core/Color.h>
+#include <Jolt/Geometry/AABox.h>
+#include <Jolt/Geometry/Plane.h>
+#include <Jolt/Math/Mat44.h>
+#include <Jolt/Math/Quat.h>
+#include <Jolt/Math/Vec3.h>
 
 _FORCE_INLINE_ Vector3 to_godot(const JPH::Vec3 &p_vec) {
 	return Vector3((real_t)p_vec.GetX(), (real_t)p_vec.GetY(), (real_t)p_vec.GetZ());

modules/jolt_physics/objects/jolt_area_3d.cpp

@@ -30,7 +30,6 @@
 
 #include "jolt_area_3d.h"
 
-#include "../jolt_project_settings.h"
 #include "../misc/jolt_math_funcs.h"
 #include "../misc/jolt_type_conversions.h"
 #include "../shapes/jolt_shape_3d.h"

modules/jolt_physics/objects/jolt_group_filter.cpp

@@ -30,8 +30,6 @@
 
 #include "jolt_group_filter.h"
 
-#include "jolt_area_3d.h"
-#include "jolt_body_3d.h"
 #include "jolt_object_3d.h"
 
 bool JoltGroupFilter::CanCollide(const JPH::CollisionGroup &p_group1, const JPH::CollisionGroup &p_group2) const {

modules/jolt_physics/objects/jolt_group_filter.h

@@ -30,10 +30,10 @@
 
 #pragma once
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Collision/CollisionGroup.h"
-#include "Jolt/Physics/Collision/GroupFilter.h"
+#include <Jolt/Physics/Collision/CollisionGroup.h>
+#include <Jolt/Physics/Collision/GroupFilter.h>
 
 class JoltObject3D;
 

modules/jolt_physics/objects/jolt_object_3d.cpp

@@ -31,8 +31,6 @@
 #include "jolt_object_3d.h"
 
 #include "../jolt_physics_server_3d.h"
-#include "../jolt_project_settings.h"
-#include "../spaces/jolt_layers.h"
 #include "../spaces/jolt_space_3d.h"
 #include "jolt_group_filter.h"
 

modules/jolt_physics/objects/jolt_object_3d.h

@@ -35,14 +35,13 @@
 #include "core/math/vector3.h"
 #include "core/object/object.h"
 #include "core/string/ustring.h"
-#include "core/templates/local_vector.h"
 #include "core/templates/rid.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Body/Body.h"
-#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
-#include "Jolt/Physics/Collision/ObjectLayer.h"
+#include <Jolt/Physics/Body/Body.h>
+#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
+#include <Jolt/Physics/Collision/ObjectLayer.h>
 
 class JoltArea3D;
 class JoltBody3D;

modules/jolt_physics/objects/jolt_shaped_object_3d.cpp

@@ -32,13 +32,12 @@
 
 #include "../misc/jolt_math_funcs.h"
 #include "../misc/jolt_type_conversions.h"
-#include "../shapes/jolt_custom_double_sided_shape.h"
 #include "../shapes/jolt_shape_3d.h"
 #include "../spaces/jolt_space_3d.h"
 
-#include "Jolt/Physics/Collision/Shape/EmptyShape.h"
-#include "Jolt/Physics/Collision/Shape/MutableCompoundShape.h"
-#include "Jolt/Physics/Collision/Shape/StaticCompoundShape.h"
+#include <Jolt/Physics/Collision/Shape/EmptyShape.h>
+#include <Jolt/Physics/Collision/Shape/MutableCompoundShape.h>
+#include <Jolt/Physics/Collision/Shape/StaticCompoundShape.h>
 
 bool JoltShapedObject3D::_is_big() const {
 	// This number is completely arbitrary, and mostly just needs to capture `WorldBoundaryShape3D`, which needs to be kept out of the normal broadphase layers.

modules/jolt_physics/objects/jolt_shaped_object_3d.h

@@ -34,10 +34,10 @@
 
 #include "core/templates/self_list.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Body/Body.h"
-#include "Jolt/Physics/Body/BodyCreationSettings.h"
+#include <Jolt/Physics/Body/Body.h>
+#include <Jolt/Physics/Body/BodyCreationSettings.h>
 
 class JoltShapedObject3D : public JoltObject3D {
 	friend class JoltShape3D;

modules/jolt_physics/objects/jolt_soft_body_3d.cpp

@@ -41,7 +41,7 @@
 #include "core/config/engine.h"
 #include "servers/rendering/rendering_server.h"
 
-#include "Jolt/Physics/SoftBody/SoftBodyMotionProperties.h"
+#include <Jolt/Physics/SoftBody/SoftBodyMotionProperties.h>
 
 namespace {
 

modules/jolt_physics/objects/jolt_soft_body_3d.h

@@ -34,10 +34,10 @@
 
 #include "servers/physics_3d/physics_server_3d.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/SoftBody/SoftBodyCreationSettings.h"
-#include "Jolt/Physics/SoftBody/SoftBodySharedSettings.h"
+#include <Jolt/Physics/SoftBody/SoftBodyCreationSettings.h>
+#include <Jolt/Physics/SoftBody/SoftBodySharedSettings.h>
 
 class JoltArea3D;
 class JoltSpace3D;

modules/jolt_physics/shapes/jolt_box_shape_3d.cpp

@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include "Jolt/Physics/Collision/Shape/BoxShape.h"
+#include <Jolt/Physics/Collision/Shape/BoxShape.h>
 
 JPH::ShapeRefC JoltBoxShape3D::_build() const {
 	const float min_half_extent = (float)half_extents[half_extents.min_axis_index()];

modules/jolt_physics/shapes/jolt_capsule_shape_3d.cpp

@@ -32,7 +32,7 @@
 
 #include "../misc/jolt_type_conversions.h"
 
-#include "Jolt/Physics/Collision/Shape/CapsuleShape.h"
+#include <Jolt/Physics/Collision/Shape/CapsuleShape.h>
 
 JPH::ShapeRefC JoltCapsuleShape3D::_build() const {
 	ERR_FAIL_COND_V_MSG(radius <= 0.0f, nullptr, vformat("Failed to build Jolt Physics capsule shape with %s. Its radius must be greater than 0. This shape belongs to %s.", to_string(), _owners_to_string()));

modules/jolt_physics/shapes/jolt_concave_polygon_shape_3d.cpp

@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include "Jolt/Physics/Collision/Shape/MeshShape.h"
+#include <Jolt/Physics/Collision/Shape/MeshShape.h>
 
 JPH::ShapeRefC JoltConcavePolygonShape3D::_build() const {
 	const int vertex_count = (int)faces.size();

modules/jolt_physics/shapes/jolt_convex_polygon_shape_3d.cpp

@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include "Jolt/Physics/Collision/Shape/ConvexHullShape.h"
+#include <Jolt/Physics/Collision/Shape/ConvexHullShape.h>
 
 JPH::ShapeRefC JoltConvexPolygonShape3D::_build() const {
 	const int vertex_count = (int)vertices.size();

modules/jolt_physics/shapes/jolt_custom_decorated_shape.h

@@ -30,12 +30,10 @@
 
 #pragma once
 
-#include "jolt_custom_shape_type.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Jolt.h"
-
-#include "Jolt/Physics/Collision/Shape/DecoratedShape.h"
-#include "Jolt/Physics/Collision/TransformedShape.h"
+#include <Jolt/Physics/Collision/Shape/DecoratedShape.h>
+#include <Jolt/Physics/Collision/TransformedShape.h>
 
 class JoltCustomDecoratedShapeSettings : public JPH::DecoratedShapeSettings {
 public:

modules/jolt_physics/shapes/jolt_custom_double_sided_shape.cpp

@@ -30,12 +30,10 @@
 
 #include "jolt_custom_double_sided_shape.h"
 
-#include "../jolt_project_settings.h"
-
 #include "core/error/error_macros.h"
 
-#include "Jolt/Physics/Collision/CollisionDispatch.h"
-#include "Jolt/Physics/Collision/RayCast.h"
+#include <Jolt/Physics/Collision/CollisionDispatch.h>
+#include <Jolt/Physics/Collision/RayCast.h>
 
 namespace {
 

modules/jolt_physics/shapes/jolt_custom_motion_shape.h

@@ -34,10 +34,10 @@
 
 #include "core/error/error_macros.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Collision/Shape/ConvexShape.h"
-#include "Jolt/Physics/Collision/TransformedShape.h"
+#include <Jolt/Physics/Collision/Shape/ConvexShape.h>
+#include <Jolt/Physics/Collision/TransformedShape.h>
 
 class JoltCustomMotionShape final : public JPH::ConvexShape {
 	mutable JPH::ConvexShape::SupportBuffer inner_support_buffer;

modules/jolt_physics/shapes/jolt_custom_ray_shape.cpp

@@ -32,12 +32,14 @@
 
 #include "../spaces/jolt_query_collectors.h"
 
-#include "Jolt/Physics/Collision/CastResult.h"
-#include "Jolt/Physics/Collision/RayCast.h"
-#include "Jolt/Physics/Collision/TransformedShape.h"
+#include "core/error/error_macros.h"
+
+#include <Jolt/Physics/Collision/CastResult.h>
+#include <Jolt/Physics/Collision/RayCast.h>
+#include <Jolt/Physics/Collision/TransformedShape.h>
 
 #ifdef JPH_DEBUG_RENDERER
-#include "Jolt/Renderer/DebugRenderer.h"
+#include <Jolt/Renderer/DebugRenderer.h>
 #endif
 
 namespace {

modules/jolt_physics/shapes/jolt_custom_ray_shape.h

@@ -32,9 +32,9 @@
 
 #include "jolt_custom_shape_type.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Collision/Shape/ConvexShape.h"
+#include <Jolt/Physics/Collision/Shape/ConvexShape.h>
 
 class JoltCustomRayShapeSettings final : public JPH::ConvexShapeSettings {
 public:

modules/jolt_physics/shapes/jolt_custom_shape_type.h

@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Collision/Shape/Shape.h"
+#include <Jolt/Physics/Collision/Shape/Shape.h>
 
 namespace JoltCustomShapeSubType {
 

modules/jolt_physics/shapes/jolt_custom_user_data_shape.cpp

@@ -32,8 +32,8 @@
 
 #include "core/error/error_macros.h"
 
-#include "Jolt/Physics/Collision/CollisionDispatch.h"
-#include "Jolt/Physics/Collision/ShapeCast.h"
+#include <Jolt/Physics/Collision/CollisionDispatch.h>
+#include <Jolt/Physics/Collision/ShapeCast.h>
 
 namespace {
 

modules/jolt_physics/shapes/jolt_cylinder_shape_3d.cpp

@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include "Jolt/Physics/Collision/Shape/CylinderShape.h"
+#include <Jolt/Physics/Collision/Shape/CylinderShape.h>
 
 JPH::ShapeRefC JoltCylinderShape3D::_build() const {
 	const float half_height = height / 2.0f;

modules/jolt_physics/shapes/jolt_height_map_shape_3d.cpp

@@ -33,8 +33,8 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include "Jolt/Physics/Collision/Shape/HeightFieldShape.h"
-#include "Jolt/Physics/Collision/Shape/MeshShape.h"
+#include <Jolt/Physics/Collision/Shape/HeightFieldShape.h>
+#include <Jolt/Physics/Collision/Shape/MeshShape.h>
 
 namespace {
 

modules/jolt_physics/shapes/jolt_shape_3d.cpp

@@ -35,12 +35,12 @@
 #include "jolt_custom_double_sided_shape.h"
 #include "jolt_custom_user_data_shape.h"
 
-#include "Jolt/Physics/Collision/Shape/MutableCompoundShape.h"
-#include "Jolt/Physics/Collision/Shape/OffsetCenterOfMassShape.h"
-#include "Jolt/Physics/Collision/Shape/RotatedTranslatedShape.h"
-#include "Jolt/Physics/Collision/Shape/ScaledShape.h"
-#include "Jolt/Physics/Collision/Shape/SphereShape.h"
-#include "Jolt/Physics/Collision/Shape/StaticCompoundShape.h"
+#include <Jolt/Physics/Collision/Shape/MutableCompoundShape.h>
+#include <Jolt/Physics/Collision/Shape/OffsetCenterOfMassShape.h>
+#include <Jolt/Physics/Collision/Shape/RotatedTranslatedShape.h>
+#include <Jolt/Physics/Collision/Shape/ScaledShape.h>
+#include <Jolt/Physics/Collision/Shape/SphereShape.h>
+#include <Jolt/Physics/Collision/Shape/StaticCompoundShape.h>
 
 namespace {
 

modules/jolt_physics/shapes/jolt_shape_3d.h

@@ -32,9 +32,9 @@
 
 #include "servers/physics_3d/physics_server_3d.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Collision/Shape/Shape.h"
+#include <Jolt/Physics/Collision/Shape/Shape.h>
 
 class JoltShapedObject3D;
 

modules/jolt_physics/shapes/jolt_shape_instance_3d.cpp

@@ -32,7 +32,7 @@
 
 #include "jolt_shape_3d.h"
 
-#include "Jolt/Physics/Collision/Shape/DecoratedShape.h"
+#include <Jolt/Physics/Collision/Shape/DecoratedShape.h>
 
 JoltShapeInstance3D::ShapeReference::ShapeReference(JoltShapedObject3D *p_parent, JoltShape3D *p_shape) :
 		parent(p_parent),

modules/jolt_physics/shapes/jolt_shape_instance_3d.h

@@ -32,9 +32,9 @@
 
 #include "core/math/transform_3d.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Collision/Shape/Shape.h"
+#include <Jolt/Physics/Collision/Shape/Shape.h>
 
 class JoltShapedObject3D;
 class JoltShape3D;

modules/jolt_physics/shapes/jolt_sphere_shape_3d.cpp

@@ -32,7 +32,7 @@
 
 #include "../misc/jolt_type_conversions.h"
 
-#include "Jolt/Physics/Collision/Shape/SphereShape.h"
+#include <Jolt/Physics/Collision/Shape/SphereShape.h>
 
 JPH::ShapeRefC JoltSphereShape3D::_build() const {
 	ERR_FAIL_COND_V_MSG(radius <= 0.0f, nullptr, vformat("Failed to build Jolt Physics sphere shape with %s. Its radius must be greater than 0. This shape belongs to %s.", to_string(), _owners_to_string()));

modules/jolt_physics/shapes/jolt_world_boundary_shape_3d.cpp

@@ -33,7 +33,7 @@
 #include "../jolt_project_settings.h"
 #include "../misc/jolt_type_conversions.h"
 
-#include "Jolt/Physics/Collision/Shape/PlaneShape.h"
+#include <Jolt/Physics/Collision/Shape/PlaneShape.h>
 
 JPH::ShapeRefC JoltWorldBoundaryShape3D::_build() const {
 	const Plane normalized_plane = plane.normalized();

modules/jolt_physics/spaces/jolt_body_activation_listener_3d.h

@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Body/BodyActivationListener.h"
+#include <Jolt/Physics/Body/BodyActivationListener.h>
 
 class JoltBodyActivationListener3D final
 		: public JPH::BodyActivationListener {

modules/jolt_physics/spaces/jolt_broad_phase_layer.h

@@ -30,9 +30,9 @@
 
 #pragma once
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
+#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
 
 #include <cstdint>
 

modules/jolt_physics/spaces/jolt_contact_listener_3d.cpp

@@ -37,8 +37,8 @@
 #include "../objects/jolt_soft_body_3d.h"
 #include "jolt_space_3d.h"
 
-#include "Jolt/Physics/Collision/EstimateCollisionResponse.h"
-#include "Jolt/Physics/SoftBody/SoftBodyManifold.h"
+#include <Jolt/Physics/Collision/EstimateCollisionResponse.h>
+#include <Jolt/Physics/SoftBody/SoftBodyManifold.h>
 
 void JoltContactListener3D::OnContactAdded(const JPH::Body &p_body1, const JPH::Body &p_body2, const JPH::ContactManifold &p_manifold, JPH::ContactSettings &p_settings) {
 	_try_override_collision_response(p_body1, p_body2, p_settings);

modules/jolt_physics/spaces/jolt_contact_listener_3d.h

@@ -35,16 +35,13 @@
 #include "core/templates/hash_set.h"
 #include "core/templates/hashfuncs.h"
 #include "core/templates/local_vector.h"
-#include "core/templates/safe_refcount.h"
 #include "core/variant/variant.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Body/Body.h"
-#include "Jolt/Physics/Collision/ContactListener.h"
-#include "Jolt/Physics/SoftBody/SoftBodyContactListener.h"
-
-#include <new>
+#include <Jolt/Physics/Body/Body.h>
+#include <Jolt/Physics/Collision/ContactListener.h>
+#include <Jolt/Physics/SoftBody/SoftBodyContactListener.h>
 
 class JoltArea3D;
 class JoltBody3D;

modules/jolt_physics/spaces/jolt_job_system.cpp

@@ -30,14 +30,12 @@
 
 #include "jolt_job_system.h"
 
-#include "../jolt_project_settings.h"
-
 #include "core/debugger/engine_debugger.h"
 #include "core/object/worker_thread_pool.h"
 #include "core/os/os.h"
 #include "core/os/time.h"
 
-#include "Jolt/Physics/PhysicsSettings.h"
+#include <Jolt/Physics/PhysicsSettings.h>
 
 void JoltJobSystem::Job::_execute(void *p_user_data) {
 	Job *job = static_cast<Job *>(p_user_data);

modules/jolt_physics/spaces/jolt_job_system.h

@@ -33,10 +33,10 @@
 #include "core/os/spin_lock.h"
 #include "core/templates/hash_map.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Core/FixedSizeFreeList.h"
-#include "Jolt/Core/JobSystemWithBarrier.h"
+#include <Jolt/Core/FixedSizeFreeList.h>
+#include <Jolt/Core/JobSystemWithBarrier.h>
 
 #include <atomic>
 

modules/jolt_physics/spaces/jolt_layers.cpp

@@ -30,7 +30,6 @@
 
 #include "jolt_layers.h"
 
-#include "../jolt_project_settings.h"
 #include "jolt_broad_phase_layer.h"
 
 #include "core/error/error_macros.h"

modules/jolt_physics/spaces/jolt_layers.h

@@ -33,10 +33,10 @@
 #include "core/templates/hash_map.h"
 #include "core/templates/local_vector.h"
 
-#include "Jolt/Jolt.h"
+#include <Jolt/Jolt.h>
 
-#include "Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h"
-#include "Jolt/Physics/Collision/ObjectLayer.h"
+#include <Jolt/Physics/Collision/BroadPhase/BroadPhaseLayer.h>
+#include <Jolt/Physics/Collision/ObjectLayer.h>
 
 class JoltLayers final
 		: public JPH::BroadPhaseLayerInterface,