diff --git a/main/input_default.h b/main/input_default.h
index b71bea0d5..259fb7210 100644
--- a/main/input_default.h
+++ b/main/input_default.h
@@ -203,7 +203,7 @@ private:
 
 	Vector<JoyDeviceMapping> map_db;
 
-	Set<uint32_t> ignored_device_ids;
+	RBSet<uint32_t> ignored_device_ids;
 
 	JoyEvent _get_mapped_button_event(const JoyDeviceMapping &mapping, int p_button);
 	JoyEvent _get_mapped_axis_event(const JoyDeviceMapping &mapping, int p_axis, float p_value);
diff --git a/modules/dds/image_loader_dds.cpp b/modules/dds/image_loader_dds.cpp
index 474aae4c2..1aff6c671 100644
--- a/modules/dds/image_loader_dds.cpp
+++ b/modules/dds/image_loader_dds.cpp
@@ -31,7 +31,7 @@
 #include "image_loader_dds.h"
 
 #include "core/os/os.h"
-#include "core/print_string.h"
+#include "core/string/print_string.h"
 
 #include "core/io/file_access_memory.h"
 #include "core/os/file_access.h"
diff --git a/servers/rendering/rendering_server_canvas_helper.cpp b/servers/rendering/rendering_server_canvas_helper.cpp
index 747a2418e..35da7e716 100644
--- a/servers/rendering/rendering_server_canvas_helper.cpp
+++ b/servers/rendering/rendering_server_canvas_helper.cpp
@@ -99,7 +99,7 @@ void MultiRect::add_rect(RID p_canvas_item, const Rect2 &p_rect, RID p_texture,
 	sources.push_back(source);
 
 	// Legacy path
-	if (!VisualServerCanvasHelper::_multirect_enabled) {
+	if (!RenderingServerCanvasHelper::_multirect_enabled) {
 		flush();
 	}
 }