From 1b98247ef882ce60485c19054e0adfcb5cc4ceb6 Mon Sep 17 00:00:00 2001
From: Enzo Novoselic <41305715+StarryWorm@users.noreply.github.com>
Date: Sat, 2 May 2026 14:02:01 -0400
Subject: [PATCH] Fix `RequiredResult<T>` not being parsed properly by
 `include-cleaner`

---
 core/object/object.h                             | 8 ++++----
 modules/objectdb_profiler/snapshot_collector.cpp | 2 +-
 scene/debugger/scene_debugger.cpp                | 2 +-
 scene/debugger/view_3d_controller.cpp            | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/object/object.h b/core/object/object.h
index 444b472c70..aceefe4cd0 100644
--- a/core/object/object.h
+++ b/core/object/object.h
@@ -1024,12 +1024,12 @@ public:
 	}
 
 	template <typename U = T, std::enable_if_t<std::is_base_of_v<RefCounted, U>, int> = 0>
-	_FORCE_INLINE_ element_type *ptr() const {
+	_FORCE_INLINE_ T *ptr() const {
 		return *_value;
 	}
 
 	template <typename U = T, std::enable_if_t<!std::is_base_of_v<RefCounted, U>, int> = 0>
-	_FORCE_INLINE_ element_type *ptr() const {
+	_FORCE_INLINE_ T *ptr() const {
 		return _value;
 	}
 
@@ -1042,11 +1042,11 @@ public:
 		return Ref<T_Other>(_value);
 	}
 
-	_FORCE_INLINE_ element_type *operator*() const {
+	_FORCE_INLINE_ T *operator*() const {
 		return ptr();
 	}
 
-	_FORCE_INLINE_ element_type *operator->() const {
+	_FORCE_INLINE_ T *operator->() const {
 		return ptr();
 	}
 };
diff --git a/modules/objectdb_profiler/snapshot_collector.cpp b/modules/objectdb_profiler/snapshot_collector.cpp
index 13ded9c753..36719edb2d 100644
--- a/modules/objectdb_profiler/snapshot_collector.cpp
+++ b/modules/objectdb_profiler/snapshot_collector.cpp
@@ -37,7 +37,7 @@
 #include "core/version.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
-#include "scene/main/window.h" // IWYU pragma: keep. Used via `get_root()`.
+#include "scene/main/window.h" // IWYU pragma: keep. FIXME: Couldn't figure out how to make RequiredResult<T> equality checks be analyzed properly by include-cleaner.
 
 void SnapshotCollector::initialize() {
 	pending_snapshots.clear();
diff --git a/scene/debugger/scene_debugger.cpp b/scene/debugger/scene_debugger.cpp
index bf3551609b..20513bbbc6 100644
--- a/scene/debugger/scene_debugger.cpp
+++ b/scene/debugger/scene_debugger.cpp
@@ -49,7 +49,7 @@
 #include "scene/debugger/scene_debugger_object.h"
 #include "scene/main/node.h"
 #include "scene/main/scene_tree.h"
-#include "scene/main/window.h" // SceneTree:get_root()
+#include "scene/main/window.h"
 #include "scene/resources/packed_scene.h"
 #include "servers/audio/audio_server.h"
 #include "servers/display/display_server.h"
diff --git a/scene/debugger/view_3d_controller.cpp b/scene/debugger/view_3d_controller.cpp
index 0ef73ee671..f0c2274b36 100644
--- a/scene/debugger/view_3d_controller.cpp
+++ b/scene/debugger/view_3d_controller.cpp
@@ -36,7 +36,7 @@
 #include "core/input/input.h"
 #include "core/input/shortcut.h"
 #include "scene/main/scene_tree.h"
-#include "scene/main/window.h" // IWYU pragma: keep. Needed to get the mouse position from the root window.
+#include "scene/main/window.h"
 
 using namespace View3DControllerConsts;