diff --git a/editor/plugins/animation_blend_tree_editor_plugin.cpp b/editor/plugins/animation_blend_tree_editor_plugin.cpp
index 2e61a6a88..44f0ff8dd 100644
--- a/editor/plugins/animation_blend_tree_editor_plugin.cpp
+++ b/editor/plugins/animation_blend_tree_editor_plugin.cpp
@@ -41,6 +41,7 @@
 #include "scene/gui/panel.h"
 #include "scene/gui/progress_bar.h"
 #include "scene/main/viewport.h"
+#include "scene/3d/skeleton.h"
 
 void AnimationNodeBlendTreeEditor::add_custom_type(const String &p_name, const Ref<Script> &p_script) {
 	for (int i = 0; i < add_options.size(); i++) {
diff --git a/editor/plugins/root_motion_editor_plugin.cpp b/editor/plugins/root_motion_editor_plugin.cpp
index fb4a38cc3..c58ee8fba 100644
--- a/editor/plugins/root_motion_editor_plugin.cpp
+++ b/editor/plugins/root_motion_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "root_motion_editor_plugin.h"
 #include "editor/editor_node.h"
 #include "scene/main/viewport.h"
+#include "scene/3d/skeleton.h"
 
 void EditorPropertyRootMotion::_confirmed() {
 	TreeItem *ti = filters->get_selected();
diff --git a/editor/plugins/skeleton_ik_editor_plugin.cpp b/editor/plugins/skeleton_ik_editor_plugin.cpp
index bfcc66b6d..ac9a16afa 100644
--- a/editor/plugins/skeleton_ik_editor_plugin.cpp
+++ b/editor/plugins/skeleton_ik_editor_plugin.cpp
@@ -31,6 +31,7 @@
 #include "skeleton_ik_editor_plugin.h"
 
 #include "scene/animation/skeleton_ik.h"
+#include "scene/3d/skeleton.h"
 
 void SkeletonIKEditorPlugin::_play() {
 	if (!skeleton_ik) {
diff --git a/scene/animation/animation_blend_space_1d.cpp b/scene/animation/animation_blend_space_1d.cpp
index b94171292..1f15f7410 100644
--- a/scene/animation/animation_blend_space_1d.cpp
+++ b/scene/animation/animation_blend_space_1d.cpp
@@ -30,6 +30,8 @@
 
 #include "animation_blend_space_1d.h"
 
+#include "scene/3d/skeleton.h"
+
 void AnimationNodeBlendSpace1D::get_parameter_list(List<PropertyInfo> *r_list) const {
 	r_list->push_back(PropertyInfo(Variant::REAL, blend_position));
 }
diff --git a/scene/animation/animation_blend_tree.cpp b/scene/animation/animation_blend_tree.cpp
index a9e3a4415..6457608ba 100644
--- a/scene/animation/animation_blend_tree.cpp
+++ b/scene/animation/animation_blend_tree.cpp
@@ -31,6 +31,7 @@
 #include "animation_blend_tree.h"
 
 #include "scene/scene_string_names.h"
+#include "scene/animation/animation_player.h"
 
 void AnimationNodeAnimation::set_animation(const StringName &p_name) {
 	animation = p_name;
diff --git a/scene/animation/animation_tree.cpp b/scene/animation/animation_tree.cpp
index d2f4cd37f..65ad721db 100644
--- a/scene/animation/animation_tree.cpp
+++ b/scene/animation/animation_tree.cpp
@@ -30,6 +30,9 @@
 
 #include "animation_tree.h"
 
+#include "animation_player.h"
+#include "scene/3d/skeleton.h"
+#include "scene/3d/spatial.h"
 #include "animation_blend_tree.h"
 #include "core/engine.h"
 #include "core/method_bind_ext.gen.inc"
diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h
index f7147306e..b165613d4 100644
--- a/scene/animation/animation_tree.h
+++ b/scene/animation/animation_tree.h
@@ -31,11 +31,12 @@
 #ifndef ANIMATION_GRAPH_PLAYER_H
 #define ANIMATION_GRAPH_PLAYER_H
 
-#include "animation_player.h"
-#include "scene/3d/skeleton.h"
-#include "scene/3d/spatial.h"
+#include "scene/main/node.h"
+#include "core/resource.h"
 #include "scene/resources/animation.h"
 
+class Spatial;
+class Skeleton;
 class AnimationNodeBlendTree;
 class AnimationPlayer;
 class AnimationTree;
diff --git a/scene/animation/skeleton_ik.cpp b/scene/animation/skeleton_ik.cpp
index 402cb2d76..b4701838c 100644
--- a/scene/animation/skeleton_ik.cpp
+++ b/scene/animation/skeleton_ik.cpp
@@ -36,6 +36,8 @@
 
 #ifndef _3D_DISABLED
 
+#include "scene/3d/skeleton.h"
+
 FabrikInverseKinematic::ChainItem *FabrikInverseKinematic::ChainItem::find_child(const BoneId p_bone_id) {
 	for (int i = children.size() - 1; 0 <= i; --i) {
 		if (p_bone_id == children[i].bone) {
diff --git a/scene/animation/skeleton_ik.h b/scene/animation/skeleton_ik.h
index be25631c2..51cf412a5 100644
--- a/scene/animation/skeleton_ik.h
+++ b/scene/animation/skeleton_ik.h
@@ -38,7 +38,11 @@
  */
 
 #include "core/math/transform.h"
-#include "scene/3d/skeleton.h"
+#include "scene/main/node.h"
+
+class Skeleton;
+
+typedef int BoneId;
 
 class FabrikInverseKinematic {
 	struct EndEffector {