diff --git a/platform/ios/display_server_ios.h b/platform/ios/display_server_ios.h
index f0cd2fceda..aa4b00d0bd 100644
--- a/platform/ios/display_server_ios.h
+++ b/platform/ios/display_server_ios.h
@@ -56,7 +56,7 @@
 #import <QuartzCore/CAMetalLayer.h>
 
 class DisplayServerIOS : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerIOS, DisplayServer);
 
 	_THREAD_SAFE_CLASS_
 
diff --git a/platform/linuxbsd/wayland/display_server_wayland.h b/platform/linuxbsd/wayland/display_server_wayland.h
index 102fb6739a..66f62c3e7b 100644
--- a/platform/linuxbsd/wayland/display_server_wayland.h
+++ b/platform/linuxbsd/wayland/display_server_wayland.h
@@ -67,7 +67,8 @@
 #undef CursorShape
 
 class DisplayServerWayland : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerWayland, DisplayServer);
+
 	struct WindowData {
 		WindowID id = INVALID_WINDOW_ID;
 
diff --git a/platform/linuxbsd/x11/display_server_x11.h b/platform/linuxbsd/x11/display_server_x11.h
index 6a275e7d43..a2ccc47c39 100644
--- a/platform/linuxbsd/x11/display_server_x11.h
+++ b/platform/linuxbsd/x11/display_server_x11.h
@@ -123,7 +123,7 @@ typedef struct _xrr_monitor_info {
 #undef CursorShape
 
 class DisplayServerX11 : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerX11, DisplayServer);
 
 	_THREAD_SAFE_CLASS_
 
diff --git a/platform/macos/display_server_macos.h b/platform/macos/display_server_macos.h
index 133658cd4a..e21da1499e 100644
--- a/platform/macos/display_server_macos.h
+++ b/platform/macos/display_server_macos.h
@@ -64,7 +64,7 @@
 #undef CursorShape
 
 class DisplayServerMacOS : public DisplayServer {
-	GDCLASS(DisplayServerMacOS, DisplayServer); // Note: required for Object::cast_to.
+	GDSOFTCLASS(DisplayServerMacOS, DisplayServer);
 
 	_THREAD_SAFE_CLASS_
 
diff --git a/platform/web/display_server_web.h b/platform/web/display_server_web.h
index 858e35bfc3..c62d4eb491 100644
--- a/platform/web/display_server_web.h
+++ b/platform/web/display_server_web.h
@@ -38,7 +38,7 @@
 #include <emscripten/html5.h>
 
 class DisplayServerWeb : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerWeb, DisplayServer);
 
 private:
 	struct JSTouchEvent {
diff --git a/platform/windows/display_server_windows.h b/platform/windows/display_server_windows.h
index 137b91f85f..b53da1dbbe 100644
--- a/platform/windows/display_server_windows.h
+++ b/platform/windows/display_server_windows.h
@@ -366,7 +366,7 @@ class DropTargetWindows;
 #endif
 
 class DisplayServerWindows : public DisplayServer {
-	// No need to register with GDCLASS, it's platform-specific and nothing is added.
+	GDSOFTCLASS(DisplayServerWindows, DisplayServer);
 
 	friend class DropTargetWindows;
 
diff --git a/servers/display_server_headless.h b/servers/display_server_headless.h
index e2ca4a9bb8..a4216ec861 100644
--- a/servers/display_server_headless.h
+++ b/servers/display_server_headless.h
@@ -35,6 +35,8 @@
 #include "servers/rendering/dummy/rasterizer_dummy.h"
 
 class DisplayServerHeadless : public DisplayServer {
+	GDSOFTCLASS(DisplayServerHeadless, DisplayServer);
+
 private:
 	friend class DisplayServer;
 
diff --git a/tests/display_server_mock.h b/tests/display_server_mock.h
index a36f9a10e2..0cc643bd03 100644
--- a/tests/display_server_mock.h
+++ b/tests/display_server_mock.h
@@ -37,6 +37,8 @@
 // Specialized DisplayServer for unittests based on DisplayServerHeadless, that
 // additionally supports things like mouse enter/exit events and clipboard.
 class DisplayServerMock : public DisplayServerHeadless {
+	GDSOFTCLASS(DisplayServerMock, DisplayServerHeadless);
+
 private:
 	friend class DisplayServer;