8 files changed, 13 insertions, 16 deletions
diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp
index 082c317655..e330713cfb 100644
--- a/editor/editor_plugin.cpp
+++ b/editor/editor_plugin.cpp
@@ -791,7 +791,7 @@ bool EditorPlugin::build() {
 	return true;
 }
 
-void EditorPlugin::queue_save_layout() const {
+void EditorPlugin::queue_save_layout() {
 	EditorNode::get_singleton()->save_layout();
 }
 
diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h
index 40a91cbfb9..dd3bf08678 100644
--- a/editor/editor_plugin.h
+++ b/editor/editor_plugin.h
@@ -221,7 +221,7 @@ public:
 
 	int update_overlays() const;
 
-	void queue_save_layout() const;
+	void queue_save_layout();
 
 	void make_bottom_panel_item_visible(Control *p_item);
 	void hide_bottom_panel();
diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp
index 3170ea5ff8..9723ae188b 100644
--- a/editor/editor_resource_preview.cpp
+++ b/editor/editor_resource_preview.cpp
@@ -30,8 +30,6 @@
 
 #include "editor_resource_preview.h"
 
-#include "core/method_bind_ext.gen.inc"
-
 #include "core/io/resource_loader.h"
 #include "core/io/resource_saver.h"
 #include "core/message_queue.h"
diff --git a/editor/editor_settings.h b/editor/editor_settings.h
index 04bb49bb51..c1bb7951fa 100644
--- a/editor/editor_settings.h
+++ b/editor/editor_settings.h
@@ -31,8 +31,7 @@
 #ifndef EDITOR_SETTINGS_H
 #define EDITOR_SETTINGS_H
 
-#include "core/object.h"
-
+#include "core/class_db.h"
 #include "core/io/config_file.h"
 #include "core/os/thread_safe.h"
 #include "core/resource.h"
diff --git a/editor/editor_vcs_interface.h b/editor/editor_vcs_interface.h
index ee9e51441d..6ef55f0a46 100644
--- a/editor/editor_vcs_interface.h
+++ b/editor/editor_vcs_interface.h
@@ -31,7 +31,7 @@
 #ifndef EDITOR_VCS_INTERFACE_H
 #define EDITOR_VCS_INTERFACE_H
 
-#include "core/object.h"
+#include "core/class_db.h"
 #include "core/ustring.h"
 #include "scene/gui/panel_container.h"
 
diff --git a/editor/fileserver/editor_file_server.h b/editor/fileserver/editor_file_server.h
index 9645fbf39e..eefaa503c1 100644
--- a/editor/fileserver/editor_file_server.h
+++ b/editor/fileserver/editor_file_server.h
@@ -31,10 +31,10 @@
 #ifndef EDITOR_FILE_SERVER_H
 #define EDITOR_FILE_SERVER_H
 
+#include "core/class_db.h"
 #include "core/io/file_access_network.h"
 #include "core/io/packet_peer.h"
 #include "core/io/tcp_server.h"
-#include "core/object.h"
 #include "core/os/thread.h"
 
 class EditorFileServer : public Object {
diff --git a/editor/inspector_dock.cpp b/editor/inspector_dock.cpp
index 8f1b8838d8..c88cd8ea5f 100644
--- a/editor/inspector_dock.cpp
+++ b/editor/inspector_dock.cpp
@@ -164,7 +164,7 @@ void InspectorDock::_resource_file_selected(String p_file) {
 	editor->push_item(res.operator->());
 }
 
-void InspectorDock::_save_resource(bool save_as) const {
+void InspectorDock::_save_resource(bool save_as) {
 	ObjectID current = EditorNode::get_singleton()->get_editor_history()->get_current();
 	Object *current_obj = current.is_valid() ? ObjectDB::get_instance(current) : nullptr;
 
@@ -179,7 +179,7 @@ void InspectorDock::_save_resource(bool save_as) const {
 	}
 }
 
-void InspectorDock::_unref_resource() const {
+void InspectorDock::_unref_resource() {
 	ObjectID current = EditorNode::get_singleton()->get_editor_history()->get_current();
 	Object *current_obj = current.is_valid() ? ObjectDB::get_instance(current) : nullptr;
 
@@ -190,7 +190,7 @@ void InspectorDock::_unref_resource() const {
 	editor->edit_current();
 }
 
-void InspectorDock::_copy_resource() const {
+void InspectorDock::_copy_resource() {
 	ObjectID current = EditorNode::get_singleton()->get_editor_history()->get_current();
 	Object *current_obj = current.is_valid() ? ObjectDB::get_instance(current) : nullptr;
 
@@ -201,7 +201,7 @@ void InspectorDock::_copy_resource() const {
 	EditorSettings::get_singleton()->set_resource_clipboard(current_res);
 }
 
-void InspectorDock::_paste_resource() const {
+void InspectorDock::_paste_resource() {
 	RES r = EditorSettings::get_singleton()->get_resource_clipboard();
 	if (r.is_valid()) {
 		editor->push_item(EditorSettings::get_singleton()->get_resource_clipboard().ptr(), String());
diff --git a/editor/inspector_dock.h b/editor/inspector_dock.h
index 551d3d1643..b2dabf19c5 100644
--- a/editor/inspector_dock.h
+++ b/editor/inspector_dock.h
@@ -96,10 +96,10 @@ class InspectorDock : public VBoxContainer {
 	void _load_resource(const String &p_type = "");
 	void _open_resource_selector() { _load_resource(); }; // just used to call from arg-less signal
 	void _resource_file_selected(String p_file);
-	void _save_resource(bool save_as) const;
-	void _unref_resource() const;
-	void _copy_resource() const;
-	void _paste_resource() const;
+	void _save_resource(bool save_as);
+	void _unref_resource();
+	void _copy_resource();
+	void _paste_resource();
 
 	void _warning_pressed();
 	void _resource_created();