9 files changed, 9 insertions, 18 deletions
diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.h b/modules/gdnative/arvr/arvr_interface_gdnative.h
index e0e5b67849..651e5c8715 100644
--- a/modules/gdnative/arvr/arvr_interface_gdnative.h
+++ b/modules/gdnative/arvr/arvr_interface_gdnative.h
@@ -41,7 +41,7 @@
 */
 
 class ARVRInterfaceGDNative : public ARVRInterface {
-	GDCLASS(ARVRInterfaceGDNative, ARVRInterface)
+	GDCLASS(ARVRInterfaceGDNative, ARVRInterface);
 
 	void cleanup();
 
diff --git a/modules/gdnative/config.py b/modules/gdnative/config.py
index 7898de5523..b9e5afcdf3 100644
--- a/modules/gdnative/config.py
+++ b/modules/gdnative/config.py
@@ -6,6 +6,7 @@ def configure(env):
 
 def get_doc_classes():
     return [
+        "@NativeScript",
         "ARVRInterfaceGDNative",
         "GDNative",
         "GDNativeLibrary",
@@ -13,7 +14,6 @@ def get_doc_classes():
         "NativeScript",
         "PacketPeerGDNative",
         "PluginScript",
-        "ResourceFormatLoaderVideoStreamGDNative",
         "StreamPeerGDNative",
         "VideoStreamGDNative",
         "WebRTCPeerConnectionGDNative",
diff --git a/modules/gdnative/doc_classes/ResourceFormatLoaderVideoStreamGDNative.xml b/modules/gdnative/doc_classes/@NativeScript.xml
index cd8b336778..cb5de198ac 100644
--- a/modules/gdnative/doc_classes/ResourceFormatLoaderVideoStreamGDNative.xml
+++ b/modules/gdnative/doc_classes/@NativeScript.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="ResourceFormatLoaderVideoStreamGDNative" inherits="ResourceFormatLoader" category="Core" version="3.2">
+<class name="@NativeScript" category="Core" version="3.2">
 	<brief_description>
 	</brief_description>
 	<description>
diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h
index ef57387059..005d1d2bff 100644
--- a/modules/gdnative/gdnative.h
+++ b/modules/gdnative/gdnative.h
@@ -45,7 +45,7 @@ class GDNativeLibraryResourceLoader;
 class GDNative;
 
 class GDNativeLibrary : public Resource {
-	GDCLASS(GDNativeLibrary, Resource)
+	GDCLASS(GDNativeLibrary, Resource);
 
 	static Map<String, Vector<Ref<GDNative> > > *loaded_libraries;
 
@@ -137,7 +137,7 @@ struct GDNativeCallRegistry {
 };
 
 class GDNative : public Reference {
-	GDCLASS(GDNative, Reference)
+	GDCLASS(GDNative, Reference);
 
 	Ref<GDNativeLibrary> library;
 
@@ -165,7 +165,6 @@ public:
 };
 
 class GDNativeLibraryResourceLoader : public ResourceFormatLoader {
-	GDCLASS(GDNativeLibraryResourceLoader, ResourceFormatLoader)
 public:
 	virtual RES load(const String &p_path, const String &p_original_path, Error *r_error);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
@@ -174,7 +173,6 @@ public:
 };
 
 class GDNativeLibraryResourceSaver : public ResourceFormatSaver {
-	GDCLASS(GDNativeLibraryResourceSaver, ResourceFormatSaver)
 public:
 	virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags);
 	virtual bool recognize(const RES &p_resource) const;
diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h
index be1c499714..79a41df107 100644
--- a/modules/gdnative/nativescript/nativescript.h
+++ b/modules/gdnative/nativescript/nativescript.h
@@ -99,7 +99,7 @@ struct NativeScriptDesc {
 };
 
 class NativeScript : public Script {
-	GDCLASS(NativeScript, Script)
+	GDCLASS(NativeScript, Script);
 
 #ifdef TOOLS_ENABLED
 	Set<PlaceHolderScriptInstance *> placeholders;
@@ -370,7 +370,7 @@ inline NativeScriptDesc *NativeScript::get_script_desc() const {
 }
 
 class NativeReloadNode : public Node {
-	GDCLASS(NativeReloadNode, Node)
+	GDCLASS(NativeReloadNode, Node);
 	bool unloaded;
 
 public:
@@ -382,7 +382,6 @@ public:
 };
 
 class ResourceFormatLoaderNativeScript : public ResourceFormatLoader {
-	GDCLASS(ResourceFormatLoaderNativeScript, ResourceFormatLoader)
 public:
 	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;
@@ -391,7 +390,6 @@ public:
 };
 
 class ResourceFormatSaverNativeScript : public ResourceFormatSaver {
-	GDCLASS(ResourceFormatSaverNativeScript, ResourceFormatSaver)
 	virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags = 0);
 	virtual bool recognize(const RES &p_resource) const;
 	virtual void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const;
diff --git a/modules/gdnative/net/multiplayer_peer_gdnative.h b/modules/gdnative/net/multiplayer_peer_gdnative.h
index 7d48dc60d1..6fbc62aaa1 100644
--- a/modules/gdnative/net/multiplayer_peer_gdnative.h
+++ b/modules/gdnative/net/multiplayer_peer_gdnative.h
@@ -36,7 +36,7 @@
 #include "modules/gdnative/include/net/godot_net.h"
 
 class MultiplayerPeerGDNative : public NetworkedMultiplayerPeer {
-	GDCLASS(MultiplayerPeerGDNative, NetworkedMultiplayerPeer)
+	GDCLASS(MultiplayerPeerGDNative, NetworkedMultiplayerPeer);
 
 protected:
 	static void _bind_methods();
diff --git a/modules/gdnative/net/packet_peer_gdnative.h b/modules/gdnative/net/packet_peer_gdnative.h
index 742fa4e7d5..8483217210 100644
--- a/modules/gdnative/net/packet_peer_gdnative.h
+++ b/modules/gdnative/net/packet_peer_gdnative.h
@@ -36,7 +36,7 @@
 #include "modules/gdnative/include/net/godot_net.h"
 
 class PacketPeerGDNative : public PacketPeer {
-	GDCLASS(PacketPeerGDNative, PacketPeer)
+	GDCLASS(PacketPeerGDNative, PacketPeer);
 
 protected:
 	static void _bind_methods();
diff --git a/modules/gdnative/pluginscript/pluginscript_loader.h b/modules/gdnative/pluginscript/pluginscript_loader.h
index 69a2ac6bfe..6218037a15 100644
--- a/modules/gdnative/pluginscript/pluginscript_loader.h
+++ b/modules/gdnative/pluginscript/pluginscript_loader.h
@@ -40,8 +40,6 @@ class PluginScriptLanguage;
 
 class ResourceFormatLoaderPluginScript : public ResourceFormatLoader {
 
-	GDCLASS(ResourceFormatLoaderPluginScript, ResourceFormatLoader)
-
 	PluginScriptLanguage *_language;
 
 public:
@@ -54,8 +52,6 @@ public:
 
 class ResourceFormatSaverPluginScript : public ResourceFormatSaver {
 
-	GDCLASS(ResourceFormatSaverPluginScript, ResourceFormatSaver)
-
 	PluginScriptLanguage *_language;
 
 public:
diff --git a/modules/gdnative/videodecoder/video_stream_gdnative.h b/modules/gdnative/videodecoder/video_stream_gdnative.h
index aafd02f33d..b9f1c8e4da 100644
--- a/modules/gdnative/videodecoder/video_stream_gdnative.h
+++ b/modules/gdnative/videodecoder/video_stream_gdnative.h
@@ -197,7 +197,6 @@ public:
 };
 
 class ResourceFormatLoaderVideoStreamGDNative : public ResourceFormatLoader {
-	GDCLASS(ResourceFormatLoaderVideoStreamGDNative, ResourceFormatLoader)
 public:
 	virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL);
 	virtual void get_recognized_extensions(List<String> *p_extensions) const;