From 6bae38ca23b3a7c91f4b6f962b9bd214e1536015 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Thu, 17 Mar 2022 09:31:00 +0100
Subject: [PATCH] Moved more includes to cpp files.

---
 scene/3d/sprite_3d.cpp              |  1 +
 scene/3d/sprite_3d.h                |  4 +++-
 scene/3d/visual_instance.cpp        |  1 +
 scene/3d/visual_instance.h          |  4 +++-
 scene/animation/animation_cache.cpp |  3 +++
 scene/animation/animation_cache.h   | 12 +++++++++---
 scene/animation/animation_player.h  | 12 +++++++++++-
 7 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp
index 5633f9c4c..d4959102d 100644
--- a/scene/3d/sprite_3d.cpp
+++ b/scene/3d/sprite_3d.cpp
@@ -31,6 +31,7 @@
 #include "sprite_3d.h"
 #include "core/core_string_names.h"
 #include "scene/scene_string_names.h"
+#include "scene/2d/animated_sprite.h"
 
 Color SpriteBase3D::_get_color_accum() {
 	if (!color_dirty) {
diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h
index 98b5fdb51..94b7ed3e0 100644
--- a/scene/3d/sprite_3d.h
+++ b/scene/3d/sprite_3d.h
@@ -31,8 +31,10 @@
 #ifndef SPRITE_3D_H
 #define SPRITE_3D_H
 
-#include "scene/2d/animated_sprite.h"
 #include "scene/3d/visual_instance.h"
+#include "core/reference.h"
+
+class SpriteFrames;
 
 class SpriteBase3D : public GeometryInstance {
 	GDCLASS(SpriteBase3D, GeometryInstance);
diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp
index a84427b31..473bed50b 100644
--- a/scene/3d/visual_instance.cpp
+++ b/scene/3d/visual_instance.cpp
@@ -33,6 +33,7 @@
 #include "scene/scene_string_names.h"
 #include "servers/visual_server.h"
 #include "skeleton.h"
+#include "scene/resources/material.h"
 
 AABB VisualInstance::get_transformed_aabb() const {
 	return get_global_transform().xform(get_aabb());
diff --git a/scene/3d/visual_instance.h b/scene/3d/visual_instance.h
index 591c20488..c0c8985dd 100644
--- a/scene/3d/visual_instance.h
+++ b/scene/3d/visual_instance.h
@@ -34,7 +34,9 @@
 #include "core/math/face3.h"
 #include "core/rid.h"
 #include "scene/3d/cull_instance.h"
-#include "scene/resources/material.h"
+#include "core/reference.h"
+
+class Material;
 
 class VisualInstance : public CullInstance {
 	GDCLASS(VisualInstance, CullInstance);
diff --git a/scene/animation/animation_cache.cpp b/scene/animation/animation_cache.cpp
index 294e62eaf..9455b1b35 100644
--- a/scene/animation/animation_cache.cpp
+++ b/scene/animation/animation_cache.cpp
@@ -30,6 +30,9 @@
 
 #include "animation_cache.h"
 
+#include "scene/3d/skeleton.h"
+#include "scene/resources/animation.h"
+
 void AnimationCache::_node_exit_tree(Node *p_node) {
 	//it is one shot, so it disconnects upon arrival
 
diff --git a/scene/animation/animation_cache.h b/scene/animation/animation_cache.h
index 15b6c0e09..24d50cae7 100644
--- a/scene/animation/animation_cache.h
+++ b/scene/animation/animation_cache.h
@@ -31,14 +31,20 @@
 #ifndef ANIMATION_CACHE_H
 #define ANIMATION_CACHE_H
 
-#include "scene/3d/skeleton.h"
-#include "scene/resources/animation.h"
+#include "core/object.h"
+#include "core/reference.h"
+
+class Node;
+class Spatial;
+class Resource;
+class Skeleton;
+class Animation;
 
 class AnimationCache : public Object {
 	GDCLASS(AnimationCache, Object);
 
 	struct Path {
-		RES resource;
+		Ref<Resource> resource;
 		Object *object;
 		Skeleton *skeleton; // haxor
 		Node *node;
diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h
index 8f44e6c1c..387664fa5 100644
--- a/scene/animation/animation_player.h
+++ b/scene/animation/animation_player.h
@@ -31,12 +31,22 @@
 #ifndef ANIMATION_PLAYER_H
 #define ANIMATION_PLAYER_H
 
+#include "core/reference.h"
+#include "scene/main/node.h"
+
 #include "scene/2d/node_2d.h"
 #include "scene/3d/skeleton.h"
 #include "scene/3d/spatial.h"
 #include "scene/resources/animation.h"
 
+class Resource;
+class Spatial;
+class Node2D;
+class Skeleton;
+class Animation;
+
 #ifdef TOOLS_ENABLED
+
 class AnimatedValuesBackup : public Reference {
 	GDCLASS(AnimatedValuesBackup, Reference);
 
@@ -92,7 +102,7 @@ private:
 	struct TrackNodeCache {
 		NodePath path;
 		uint32_t id;
-		RES resource;
+		Ref<Resource> resource;
 		Node *node;
 		Spatial *spatial;
 		Node2D *node_2d;