diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h
index 2751ff242c5..7d0c158f51f 100644
--- a/core/bind/core_bind.h
+++ b/core/bind/core_bind.h
@@ -694,7 +694,7 @@ VARIANT_ENUM_CAST(_Thread::Priority);
 
 class _ClassDB : public Object {
 
-	GDCLASS(_ClassDB, Object)
+	GDCLASS(_ClassDB, Object);
 
 protected:
 	static void _bind_methods();
@@ -779,7 +779,7 @@ public:
 class _JSON;
 
 class JSONParseResult : public Reference {
-	GDCLASS(JSONParseResult, Reference)
+	GDCLASS(JSONParseResult, Reference);
 
 	friend class _JSON;
 
@@ -807,7 +807,7 @@ public:
 };
 
 class _JSON : public Object {
-	GDCLASS(_JSON, Object)
+	GDCLASS(_JSON, Object);
 
 protected:
 	static void _bind_methods();
diff --git a/core/io/resource_importer.h b/core/io/resource_importer.h
index 317f301b5cf..9cf298a7f51 100644
--- a/core/io/resource_importer.h
+++ b/core/io/resource_importer.h
@@ -94,7 +94,8 @@ public:
 
 class ResourceImporter : public Reference {
 
-	GDCLASS(ResourceImporter, Reference)
+	GDCLASS(ResourceImporter, Reference);
+
 public:
 	virtual String get_importer_name() const = 0;
 	virtual String get_visible_name() const = 0;
diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h
index 9e7020be7c3..70e7bdc2243 100644
--- a/core/io/resource_loader.h
+++ b/core/io/resource_loader.h
@@ -62,7 +62,7 @@ public:
 
 class ResourceFormatLoader : public Reference {
 
-	GDCLASS(ResourceFormatLoader, Reference)
+	GDCLASS(ResourceFormatLoader, Reference);
 
 protected:
 	static void _bind_methods();
diff --git a/core/io/resource_saver.h b/core/io/resource_saver.h
index 7df3bfb1f85..0fba47a5e8c 100644
--- a/core/io/resource_saver.h
+++ b/core/io/resource_saver.h
@@ -38,7 +38,7 @@
 */
 
 class ResourceFormatSaver : public Reference {
-	GDCLASS(ResourceFormatSaver, Reference)
+	GDCLASS(ResourceFormatSaver, Reference);
 
 protected:
 	static void _bind_methods();
diff --git a/core/math/a_star.h b/core/math/a_star.h
index e2a0356c7c1..ec333efc1d3 100644
--- a/core/math/a_star.h
+++ b/core/math/a_star.h
@@ -42,7 +42,7 @@
 
 class AStar : public Reference {
 
-	GDCLASS(AStar, Reference)
+	GDCLASS(AStar, Reference);
 
 	uint64_t pass;
 
diff --git a/core/math/expression.h b/core/math/expression.h
index 79f6f3989dc..1113bb6587d 100644
--- a/core/math/expression.h
+++ b/core/math/expression.h
@@ -34,7 +34,8 @@
 #include "core/reference.h"
 
 class Expression : public Reference {
-	GDCLASS(Expression, Reference)
+	GDCLASS(Expression, Reference);
+
 public:
 	enum BuiltinFunc {
 		MATH_SIN,
diff --git a/core/os/input_event.h b/core/os/input_event.h
index 2eb321f134d..4f5762e7564 100644
--- a/core/os/input_event.h
+++ b/core/os/input_event.h
@@ -173,7 +173,7 @@ enum MidiMessageList {
  */
 
 class InputEvent : public Resource {
-	GDCLASS(InputEvent, Resource)
+	GDCLASS(InputEvent, Resource);
 
 	int device;
 
@@ -210,7 +210,7 @@ public:
 };
 
 class InputEventWithModifiers : public InputEvent {
-	GDCLASS(InputEventWithModifiers, InputEvent)
+	GDCLASS(InputEventWithModifiers, InputEvent);
 
 	bool shift;
 	bool alt;
@@ -256,7 +256,7 @@ public:
 
 class InputEventKey : public InputEventWithModifiers {
 
-	GDCLASS(InputEventKey, InputEventWithModifiers)
+	GDCLASS(InputEventKey, InputEventWithModifiers);
 
 	bool pressed; /// otherwise release
 
@@ -295,7 +295,7 @@ public:
 
 class InputEventMouse : public InputEventWithModifiers {
 
-	GDCLASS(InputEventMouse, InputEventWithModifiers)
+	GDCLASS(InputEventMouse, InputEventWithModifiers);
 
 	int button_mask;
 
@@ -320,7 +320,7 @@ public:
 
 class InputEventMouseButton : public InputEventMouse {
 
-	GDCLASS(InputEventMouseButton, InputEventMouse)
+	GDCLASS(InputEventMouseButton, InputEventMouse);
 
 	float factor;
 	int button_index;
@@ -354,7 +354,7 @@ public:
 
 class InputEventMouseMotion : public InputEventMouse {
 
-	GDCLASS(InputEventMouseMotion, InputEventMouse)
+	GDCLASS(InputEventMouseMotion, InputEventMouse);
 	Vector2 relative;
 	Vector2 speed;
 
@@ -378,7 +378,7 @@ public:
 
 class InputEventJoypadMotion : public InputEvent {
 
-	GDCLASS(InputEventJoypadMotion, InputEvent)
+	GDCLASS(InputEventJoypadMotion, InputEvent);
 	int axis; ///< Joypad axis
 	float axis_value; ///< -1 to 1
 
@@ -403,7 +403,7 @@ public:
 };
 
 class InputEventJoypadButton : public InputEvent {
-	GDCLASS(InputEventJoypadButton, InputEvent)
+	GDCLASS(InputEventJoypadButton, InputEvent);
 
 	int button_index;
 	bool pressed;
@@ -431,7 +431,7 @@ public:
 };
 
 class InputEventScreenTouch : public InputEvent {
-	GDCLASS(InputEventScreenTouch, InputEvent)
+	GDCLASS(InputEventScreenTouch, InputEvent);
 	int index;
 	Vector2 pos;
 	bool pressed;
@@ -457,7 +457,7 @@ public:
 
 class InputEventScreenDrag : public InputEvent {
 
-	GDCLASS(InputEventScreenDrag, InputEvent)
+	GDCLASS(InputEventScreenDrag, InputEvent);
 	int index;
 	Vector2 pos;
 	Vector2 relative;
@@ -487,7 +487,7 @@ public:
 
 class InputEventAction : public InputEvent {
 
-	GDCLASS(InputEventAction, InputEvent)
+	GDCLASS(InputEventAction, InputEvent);
 
 	StringName action;
 	bool pressed;
@@ -519,7 +519,7 @@ public:
 
 class InputEventGesture : public InputEventWithModifiers {
 
-	GDCLASS(InputEventGesture, InputEventWithModifiers)
+	GDCLASS(InputEventGesture, InputEventWithModifiers);
 
 	Vector2 pos;
 
@@ -533,7 +533,7 @@ public:
 
 class InputEventMagnifyGesture : public InputEventGesture {
 
-	GDCLASS(InputEventMagnifyGesture, InputEventGesture)
+	GDCLASS(InputEventMagnifyGesture, InputEventGesture);
 	real_t factor;
 
 protected:
@@ -551,7 +551,7 @@ public:
 
 class InputEventPanGesture : public InputEventGesture {
 
-	GDCLASS(InputEventPanGesture, InputEventGesture)
+	GDCLASS(InputEventPanGesture, InputEventGesture);
 	Vector2 delta;
 
 protected:
@@ -568,7 +568,7 @@ public:
 };
 
 class InputEventMIDI : public InputEvent {
-	GDCLASS(InputEventMIDI, InputEvent)
+	GDCLASS(InputEventMIDI, InputEvent);
 
 	int channel;
 	int message;
diff --git a/editor/animation_bezier_editor.h b/editor/animation_bezier_editor.h
index 66c818f09dc..49aab48719f 100644
--- a/editor/animation_bezier_editor.h
+++ b/editor/animation_bezier_editor.h
@@ -35,7 +35,7 @@
 
 class AnimationBezierTrackEdit : public Control {
 
-	GDCLASS(AnimationBezierTrackEdit, Control)
+	GDCLASS(AnimationBezierTrackEdit, Control);
 
 	enum HandleMode {
 		HANDLE_MODE_FREE,
diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h
index 0f1363b34fe..1452d5519c4 100644
--- a/editor/animation_track_editor.h
+++ b/editor/animation_track_editor.h
@@ -50,7 +50,7 @@
 #include "scene_tree_editor.h"
 
 class AnimationTimelineEdit : public Range {
-	GDCLASS(AnimationTimelineEdit, Range)
+	GDCLASS(AnimationTimelineEdit, Range);
 
 	Ref<Animation> animation;
 	int name_limit;
@@ -123,7 +123,7 @@ class AnimationTrackEditor;
 
 class AnimationTrackEdit : public Control {
 
-	GDCLASS(AnimationTrackEdit, Control)
+	GDCLASS(AnimationTrackEdit, Control);
 
 	enum {
 		MENU_CALL_MODE_CONTINUOUS,
@@ -237,7 +237,8 @@ public:
 };
 
 class AnimationTrackEditPlugin : public Reference {
-	GDCLASS(AnimationTrackEditPlugin, Reference)
+	GDCLASS(AnimationTrackEditPlugin, Reference);
+
 public:
 	virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage);
 	virtual AnimationTrackEdit *create_audio_track_edit();
@@ -248,7 +249,7 @@ class AnimationTrackKeyEdit;
 class AnimationBezierTrackEdit;
 
 class AnimationTrackEditGroup : public Control {
-	GDCLASS(AnimationTrackEditGroup, Control)
+	GDCLASS(AnimationTrackEditGroup, Control);
 	Ref<Texture> icon;
 	String node_name;
 	NodePath node;
@@ -271,7 +272,7 @@ public:
 };
 
 class AnimationTrackEditor : public VBoxContainer {
-	GDCLASS(AnimationTrackEditor, VBoxContainer)
+	GDCLASS(AnimationTrackEditor, VBoxContainer);
 
 	enum {
 		EDIT_COPY_TRACKS,
diff --git a/editor/animation_track_editor_plugins.h b/editor/animation_track_editor_plugins.h
index a1ea7435b1f..5f0ea6196c2 100644
--- a/editor/animation_track_editor_plugins.h
+++ b/editor/animation_track_editor_plugins.h
@@ -34,7 +34,7 @@
 #include "editor/animation_track_editor.h"
 
 class AnimationTrackEditBool : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditBool, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditBool, AnimationTrackEdit);
 	Ref<Texture> icon_checked;
 	Ref<Texture> icon_unchecked;
 
@@ -46,7 +46,7 @@ public:
 };
 
 class AnimationTrackEditColor : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditColor, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditColor, AnimationTrackEdit);
 
 public:
 	virtual int get_key_height() const;
@@ -57,7 +57,7 @@ public:
 };
 
 class AnimationTrackEditAudio : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditAudio, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditAudio, AnimationTrackEdit);
 
 	ObjectID id;
 
@@ -78,7 +78,7 @@ public:
 };
 
 class AnimationTrackEditSpriteFrame : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditSpriteFrame, AnimationTrackEdit);
 
 	ObjectID id;
 
@@ -92,7 +92,7 @@ public:
 };
 
 class AnimationTrackEditSubAnim : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditSubAnim, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditSubAnim, AnimationTrackEdit);
 
 	ObjectID id;
 
@@ -106,7 +106,7 @@ public:
 };
 
 class AnimationTrackEditTypeAudio : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditTypeAudio, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditTypeAudio, AnimationTrackEdit);
 
 	void _preview_changed(ObjectID p_which);
 
@@ -134,7 +134,7 @@ public:
 };
 
 class AnimationTrackEditTypeAnimation : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditTypeAnimation, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditTypeAnimation, AnimationTrackEdit);
 
 	ObjectID id;
 
@@ -149,7 +149,7 @@ public:
 };
 
 class AnimationTrackEditVolumeDB : public AnimationTrackEdit {
-	GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit)
+	GDCLASS(AnimationTrackEditVolumeDB, AnimationTrackEdit);
 
 public:
 	virtual void draw_bg(int p_clip_left, int p_clip_right);
@@ -159,7 +159,8 @@ public:
 };
 
 class AnimationTrackEditDefaultPlugin : public AnimationTrackEditPlugin {
-	GDCLASS(AnimationTrackEditDefaultPlugin, AnimationTrackEditPlugin)
+	GDCLASS(AnimationTrackEditDefaultPlugin, AnimationTrackEditPlugin);
+
 public:
 	virtual AnimationTrackEdit *create_value_track_edit(Object *p_object, Variant::Type p_type, const String &p_property, PropertyHint p_hint, const String &p_hint_string, int p_usage);
 	virtual AnimationTrackEdit *create_audio_track_edit();
diff --git a/editor/audio_stream_preview.h b/editor/audio_stream_preview.h
index 3b8975e3aaa..fca0aabac13 100644
--- a/editor/audio_stream_preview.h
+++ b/editor/audio_stream_preview.h
@@ -36,7 +36,7 @@
 #include "servers/audio/audio_stream.h"
 
 class AudioStreamPreview : public Reference {
-	GDCLASS(AudioStreamPreview, Reference)
+	GDCLASS(AudioStreamPreview, Reference);
 	friend class AudioStream;
 	Vector<uint8_t> preview;
 	float length;
@@ -52,7 +52,7 @@ public:
 };
 
 class AudioStreamPreviewGenerator : public Node {
-	GDCLASS(AudioStreamPreviewGenerator, Node)
+	GDCLASS(AudioStreamPreviewGenerator, Node);
 
 	static AudioStreamPreviewGenerator *singleton;
 
diff --git a/editor/create_dialog.h b/editor/create_dialog.h
index 03c4b25f5c5..0eddbc3cebf 100644
--- a/editor/create_dialog.h
+++ b/editor/create_dialog.h
@@ -44,7 +44,7 @@
 
 class CreateDialog : public ConfirmationDialog {
 
-	GDCLASS(CreateDialog, ConfirmationDialog)
+	GDCLASS(CreateDialog, ConfirmationDialog);
 
 	Vector<String> favorite_list;
 	Tree *favorites;
diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h
index 20890fd3b5d..8781e6ff6cb 100644
--- a/editor/editor_audio_buses.h
+++ b/editor/editor_audio_buses.h
@@ -52,7 +52,7 @@ class EditorAudioBuses;
 
 class EditorAudioBus : public PanelContainer {
 
-	GDCLASS(EditorAudioBus, PanelContainer)
+	GDCLASS(EditorAudioBus, PanelContainer);
 
 	Ref<Texture> disabled_vu;
 	LineEdit *track_name;
@@ -155,7 +155,7 @@ public:
 
 class EditorAudioBuses : public VBoxContainer {
 
-	GDCLASS(EditorAudioBuses, VBoxContainer)
+	GDCLASS(EditorAudioBuses, VBoxContainer);
 
 	HBoxContainer *top_hb;
 
diff --git a/editor/editor_export.h b/editor/editor_export.h
index bd864c528cb..7c01abe0e9e 100644
--- a/editor/editor_export.h
+++ b/editor/editor_export.h
@@ -44,7 +44,8 @@ struct EditorProgress;
 
 class EditorExportPreset : public Reference {
 
-	GDCLASS(EditorExportPreset, Reference)
+	GDCLASS(EditorExportPreset, Reference);
+
 public:
 	enum ExportFilter {
 		EXPORT_ALL_RESOURCES,
@@ -152,7 +153,7 @@ struct SharedObject {
 
 class EditorExportPlatform : public Reference {
 
-	GDCLASS(EditorExportPlatform, Reference)
+	GDCLASS(EditorExportPlatform, Reference);
 
 public:
 	typedef Error (*EditorExportSaveFunction)(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total);
@@ -272,7 +273,7 @@ public:
 };
 
 class EditorExportPlugin : public Reference {
-	GDCLASS(EditorExportPlugin, Reference)
+	GDCLASS(EditorExportPlugin, Reference);
 
 	friend class EditorExportPlatform;
 
@@ -388,7 +389,7 @@ public:
 
 class EditorExportPlatformPC : public EditorExportPlatform {
 
-	GDCLASS(EditorExportPlatformPC, EditorExportPlatform)
+	GDCLASS(EditorExportPlatformPC, EditorExportPlatform);
 
 	Ref<ImageTexture> logo;
 	String name;
@@ -440,7 +441,7 @@ public:
 
 class EditorExportTextSceneToBinaryPlugin : public EditorExportPlugin {
 
-	GDCLASS(EditorExportTextSceneToBinaryPlugin, EditorExportPlugin)
+	GDCLASS(EditorExportTextSceneToBinaryPlugin, EditorExportPlugin);
 
 public:
 	virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features);
diff --git a/editor/editor_inspector.h b/editor/editor_inspector.h
index 494e8b58338..0550509ba20 100644
--- a/editor/editor_inspector.h
+++ b/editor/editor_inspector.h
@@ -48,7 +48,8 @@ public:
 
 class EditorProperty : public Container {
 
-	GDCLASS(EditorProperty, Container)
+	GDCLASS(EditorProperty, Container);
+
 private:
 	String label;
 	int text_size;
@@ -167,7 +168,7 @@ public:
 };
 
 class EditorInspectorPlugin : public Reference {
-	GDCLASS(EditorInspectorPlugin, Reference)
+	GDCLASS(EditorInspectorPlugin, Reference);
 
 	friend class EditorInspector;
 	struct AddedEditor {
diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h
index c28e607c896..0d700cd9b6f 100644
--- a/editor/editor_plugin.h
+++ b/editor/editor_plugin.h
@@ -60,7 +60,8 @@ class EditorToolAddons;
 class ScriptEditor;
 
 class EditorInterface : public Node {
-	GDCLASS(EditorInterface, Node)
+	GDCLASS(EditorInterface, Node);
+
 protected:
 	static void _bind_methods();
 	static EditorInterface *singleton;
diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h
index e62213887d4..46c13d257a0 100644
--- a/editor/editor_profiler.h
+++ b/editor/editor_profiler.h
@@ -42,7 +42,7 @@
 
 class EditorProfiler : public VBoxContainer {
 
-	GDCLASS(EditorProfiler, VBoxContainer)
+	GDCLASS(EditorProfiler, VBoxContainer);
 
 public:
 	struct Metric {
diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp
index 45acd1b6d4d..d5f4d54e5c5 100644
--- a/editor/editor_properties.cpp
+++ b/editor/editor_properties.cpp
@@ -599,7 +599,8 @@ EditorPropertyFlags::EditorPropertyFlags() {
 ///////////////////// LAYERS /////////////////////////
 
 class EditorPropertyLayersGrid : public Control {
-	GDCLASS(EditorPropertyLayersGrid, Control)
+	GDCLASS(EditorPropertyLayersGrid, Control);
+
 public:
 	uint32_t value;
 	Vector<Rect2> flag_rects;
diff --git a/editor/editor_properties.h b/editor/editor_properties.h
index 574767890ca..02d9349f2d7 100644
--- a/editor/editor_properties.h
+++ b/editor/editor_properties.h
@@ -40,7 +40,7 @@
 #include "scene/gui/color_picker.h"
 
 class EditorPropertyNil : public EditorProperty {
-	GDCLASS(EditorPropertyNil, EditorProperty)
+	GDCLASS(EditorPropertyNil, EditorProperty);
 	LineEdit *text;
 
 public:
@@ -49,7 +49,7 @@ public:
 };
 
 class EditorPropertyText : public EditorProperty {
-	GDCLASS(EditorPropertyText, EditorProperty)
+	GDCLASS(EditorPropertyText, EditorProperty);
 	LineEdit *text;
 
 	bool updating;
@@ -66,7 +66,7 @@ public:
 };
 
 class EditorPropertyMultilineText : public EditorProperty {
-	GDCLASS(EditorPropertyMultilineText, EditorProperty)
+	GDCLASS(EditorPropertyMultilineText, EditorProperty);
 	TextEdit *text;
 
 	AcceptDialog *big_text_dialog;
@@ -87,7 +87,7 @@ public:
 };
 
 class EditorPropertyTextEnum : public EditorProperty {
-	GDCLASS(EditorPropertyTextEnum, EditorProperty)
+	GDCLASS(EditorPropertyTextEnum, EditorProperty);
 	OptionButton *options;
 
 	void _option_selected(int p_which);
@@ -102,7 +102,7 @@ public:
 };
 
 class EditorPropertyPath : public EditorProperty {
-	GDCLASS(EditorPropertyPath, EditorProperty)
+	GDCLASS(EditorPropertyPath, EditorProperty);
 	Vector<String> extensions;
 	bool folder;
 	bool global;
@@ -127,7 +127,8 @@ public:
 };
 
 class EditorPropertyClassName : public EditorProperty {
-	GDCLASS(EditorPropertyClassName, EditorProperty)
+	GDCLASS(EditorPropertyClassName, EditorProperty);
+
 private:
 	CreateDialog *dialog;
 	Button *property;
@@ -146,7 +147,8 @@ public:
 };
 
 class EditorPropertyMember : public EditorProperty {
-	GDCLASS(EditorPropertyMember, EditorProperty)
+	GDCLASS(EditorPropertyMember, EditorProperty);
+
 public:
 	enum Type {
 		MEMBER_METHOD_OF_VARIANT_TYPE, ///< a method of a type
@@ -179,7 +181,7 @@ public:
 };
 
 class EditorPropertyCheck : public EditorProperty {
-	GDCLASS(EditorPropertyCheck, EditorProperty)
+	GDCLASS(EditorPropertyCheck, EditorProperty);
 	CheckBox *checkbox;
 
 	void _checkbox_pressed();
@@ -193,7 +195,7 @@ public:
 };
 
 class EditorPropertyEnum : public EditorProperty {
-	GDCLASS(EditorPropertyEnum, EditorProperty)
+	GDCLASS(EditorPropertyEnum, EditorProperty);
 	OptionButton *options;
 
 	void _option_selected(int p_which);
@@ -209,7 +211,7 @@ public:
 };
 
 class EditorPropertyFlags : public EditorProperty {
-	GDCLASS(EditorPropertyFlags, EditorProperty)
+	GDCLASS(EditorPropertyFlags, EditorProperty);
 	VBoxContainer *vbox;
 	Vector<CheckBox *> flags;
 	Vector<int> flag_indices;
@@ -228,7 +230,8 @@ public:
 class EditorPropertyLayersGrid;
 
 class EditorPropertyLayers : public EditorProperty {
-	GDCLASS(EditorPropertyLayers, EditorProperty)
+	GDCLASS(EditorPropertyLayers, EditorProperty);
+
 public:
 	enum LayerType {
 		LAYER_PHYSICS_2D,
@@ -257,7 +260,7 @@ public:
 };
 
 class EditorPropertyInteger : public EditorProperty {
-	GDCLASS(EditorPropertyInteger, EditorProperty)
+	GDCLASS(EditorPropertyInteger, EditorProperty);
 	EditorSpinSlider *spin;
 	bool setting;
 	void _value_changed(double p_val);
@@ -272,7 +275,7 @@ public:
 };
 
 class EditorPropertyObjectID : public EditorProperty {
-	GDCLASS(EditorPropertyObjectID, EditorProperty)
+	GDCLASS(EditorPropertyObjectID, EditorProperty);
 	Button *edit;
 	String base_type;
 	void _edit_pressed();
@@ -287,7 +290,7 @@ public:
 };
 
 class EditorPropertyFloat : public EditorProperty {
-	GDCLASS(EditorPropertyFloat, EditorProperty)
+	GDCLASS(EditorPropertyFloat, EditorProperty);
 	EditorSpinSlider *spin;
 	bool setting;
 	void _value_changed(double p_val);
@@ -302,7 +305,7 @@ public:
 };
 
 class EditorPropertyEasing : public EditorProperty {
-	GDCLASS(EditorPropertyEasing, EditorProperty)
+	GDCLASS(EditorPropertyEasing, EditorProperty);
 	Control *easing_draw;
 	PopupMenu *preset;
 	bool full;
@@ -335,7 +338,7 @@ public:
 };
 
 class EditorPropertyVector2 : public EditorProperty {
-	GDCLASS(EditorPropertyVector2, EditorProperty)
+	GDCLASS(EditorPropertyVector2, EditorProperty);
 	EditorSpinSlider *spin[2];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -351,7 +354,7 @@ public:
 };
 
 class EditorPropertyRect2 : public EditorProperty {
-	GDCLASS(EditorPropertyRect2, EditorProperty)
+	GDCLASS(EditorPropertyRect2, EditorProperty);
 	EditorSpinSlider *spin[4];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -367,7 +370,7 @@ public:
 };
 
 class EditorPropertyVector3 : public EditorProperty {
-	GDCLASS(EditorPropertyVector3, EditorProperty)
+	GDCLASS(EditorPropertyVector3, EditorProperty);
 	EditorSpinSlider *spin[3];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -383,7 +386,7 @@ public:
 };
 
 class EditorPropertyPlane : public EditorProperty {
-	GDCLASS(EditorPropertyPlane, EditorProperty)
+	GDCLASS(EditorPropertyPlane, EditorProperty);
 	EditorSpinSlider *spin[4];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -399,7 +402,7 @@ public:
 };
 
 class EditorPropertyQuat : public EditorProperty {
-	GDCLASS(EditorPropertyQuat, EditorProperty)
+	GDCLASS(EditorPropertyQuat, EditorProperty);
 	EditorSpinSlider *spin[4];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -415,7 +418,7 @@ public:
 };
 
 class EditorPropertyAABB : public EditorProperty {
-	GDCLASS(EditorPropertyAABB, EditorProperty)
+	GDCLASS(EditorPropertyAABB, EditorProperty);
 	EditorSpinSlider *spin[6];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -431,7 +434,7 @@ public:
 };
 
 class EditorPropertyTransform2D : public EditorProperty {
-	GDCLASS(EditorPropertyTransform2D, EditorProperty)
+	GDCLASS(EditorPropertyTransform2D, EditorProperty);
 	EditorSpinSlider *spin[6];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -447,7 +450,7 @@ public:
 };
 
 class EditorPropertyBasis : public EditorProperty {
-	GDCLASS(EditorPropertyBasis, EditorProperty)
+	GDCLASS(EditorPropertyBasis, EditorProperty);
 	EditorSpinSlider *spin[9];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -463,7 +466,7 @@ public:
 };
 
 class EditorPropertyTransform : public EditorProperty {
-	GDCLASS(EditorPropertyTransform, EditorProperty)
+	GDCLASS(EditorPropertyTransform, EditorProperty);
 	EditorSpinSlider *spin[12];
 	bool setting;
 	void _value_changed(double p_val, const String &p_name);
@@ -479,7 +482,7 @@ public:
 };
 
 class EditorPropertyColor : public EditorProperty {
-	GDCLASS(EditorPropertyColor, EditorProperty)
+	GDCLASS(EditorPropertyColor, EditorProperty);
 	ColorPickerButton *picker;
 	void _color_changed(const Color &p_color);
 	void _popup_closed();
@@ -494,7 +497,7 @@ public:
 };
 
 class EditorPropertyNodePath : public EditorProperty {
-	GDCLASS(EditorPropertyNodePath, EditorProperty)
+	GDCLASS(EditorPropertyNodePath, EditorProperty);
 	Button *assign;
 	Button *clear;
 	SceneTreeDialog *scene_tree;
@@ -517,7 +520,7 @@ public:
 };
 
 class EditorPropertyRID : public EditorProperty {
-	GDCLASS(EditorPropertyRID, EditorProperty)
+	GDCLASS(EditorPropertyRID, EditorProperty);
 	Label *label;
 
 public:
@@ -526,7 +529,7 @@ public:
 };
 
 class EditorPropertyResource : public EditorProperty {
-	GDCLASS(EditorPropertyResource, EditorProperty)
+	GDCLASS(EditorPropertyResource, EditorProperty);
 
 	enum MenuOption {
 
@@ -605,7 +608,7 @@ public:
 /// \brief The EditorInspectorDefaultPlugin class
 ///
 class EditorInspectorDefaultPlugin : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorDefaultPlugin, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorDefaultPlugin, EditorInspectorPlugin);
 
 public:
 	virtual bool can_handle(Object *p_object);
diff --git a/editor/editor_properties_array_dict.h b/editor/editor_properties_array_dict.h
index ff759105c3d..18519c754a4 100644
--- a/editor/editor_properties_array_dict.h
+++ b/editor/editor_properties_array_dict.h
@@ -78,7 +78,7 @@ public:
 };
 
 class EditorPropertyArray : public EditorProperty {
-	GDCLASS(EditorPropertyArray, EditorProperty)
+	GDCLASS(EditorPropertyArray, EditorProperty);
 
 	PopupMenu *change_type;
 	bool updating;
@@ -117,7 +117,7 @@ public:
 };
 
 class EditorPropertyDictionary : public EditorProperty {
-	GDCLASS(EditorPropertyDictionary, EditorProperty)
+	GDCLASS(EditorPropertyDictionary, EditorProperty);
 
 	PopupMenu *change_type;
 	bool updating;
diff --git a/editor/editor_spin_slider.h b/editor/editor_spin_slider.h
index ceff878e7f0..1523c20f482 100644
--- a/editor/editor_spin_slider.h
+++ b/editor/editor_spin_slider.h
@@ -36,7 +36,7 @@
 #include "scene/gui/texture_rect.h"
 
 class EditorSpinSlider : public Range {
-	GDCLASS(EditorSpinSlider, Range)
+	GDCLASS(EditorSpinSlider, Range);
 
 	String label;
 	int updown_offset;
diff --git a/editor/export_template_manager.h b/editor/export_template_manager.h
index 608830c990f..ad3ab507b38 100644
--- a/editor/export_template_manager.h
+++ b/editor/export_template_manager.h
@@ -41,7 +41,7 @@
 class ExportTemplateVersion;
 
 class ExportTemplateManager : public ConfirmationDialog {
-	GDCLASS(ExportTemplateManager, ConfirmationDialog)
+	GDCLASS(ExportTemplateManager, ConfirmationDialog);
 
 	AcceptDialog *template_downloader;
 	VBoxContainer *template_list;
diff --git a/editor/find_in_files.h b/editor/find_in_files.h
index 5f728a104bf..178b9a20808 100644
--- a/editor/find_in_files.h
+++ b/editor/find_in_files.h
@@ -36,7 +36,8 @@
 
 // Performs the actual search
 class FindInFiles : public Node {
-	GDCLASS(FindInFiles, Node)
+	GDCLASS(FindInFiles, Node);
+
 public:
 	static const char *SIGNAL_RESULT_FOUND;
 	static const char *SIGNAL_FINISHED;
@@ -93,7 +94,8 @@ class HBoxContainer;
 
 // Prompts search parameters
 class FindInFilesDialog : public AcceptDialog {
-	GDCLASS(FindInFilesDialog, AcceptDialog)
+	GDCLASS(FindInFilesDialog, AcceptDialog);
+
 public:
 	static const char *SIGNAL_FIND_REQUESTED;
 	static const char *SIGNAL_REPLACE_REQUESTED;
@@ -138,7 +140,8 @@ class ProgressBar;
 
 // Display search results
 class FindInFilesPanel : public Control {
-	GDCLASS(FindInFilesPanel, Control)
+	GDCLASS(FindInFilesPanel, Control);
+
 public:
 	static const char *SIGNAL_RESULT_SELECTED;
 	static const char *SIGNAL_FILES_MODIFIED;
diff --git a/editor/import/editor_import_plugin.h b/editor/import/editor_import_plugin.h
index d396dd6d5bf..b3eb7ae83bf 100644
--- a/editor/import/editor_import_plugin.h
+++ b/editor/import/editor_import_plugin.h
@@ -34,7 +34,8 @@
 #include "core/io/resource_importer.h"
 
 class EditorImportPlugin : public ResourceImporter {
-	GDCLASS(EditorImportPlugin, Reference)
+	GDCLASS(EditorImportPlugin, Reference);
+
 protected:
 	static void _bind_methods();
 
diff --git a/editor/import/resource_importer_bitmask.h b/editor/import/resource_importer_bitmask.h
index 166fa998e49..6ae7608ff22 100644
--- a/editor/import/resource_importer_bitmask.h
+++ b/editor/import/resource_importer_bitmask.h
@@ -37,7 +37,7 @@
 class StreamBitMap;
 
 class ResourceImporterBitMap : public ResourceImporter {
-	GDCLASS(ResourceImporterBitMap, ResourceImporter)
+	GDCLASS(ResourceImporterBitMap, ResourceImporter);
 
 public:
 	virtual String get_importer_name() const;
diff --git a/editor/import/resource_importer_csv_translation.h b/editor/import/resource_importer_csv_translation.h
index 6785b68d870..c2753b326fb 100644
--- a/editor/import/resource_importer_csv_translation.h
+++ b/editor/import/resource_importer_csv_translation.h
@@ -34,7 +34,8 @@
 #include "core/io/resource_importer.h"
 
 class ResourceImporterCSVTranslation : public ResourceImporter {
-	GDCLASS(ResourceImporterCSVTranslation, ResourceImporter)
+	GDCLASS(ResourceImporterCSVTranslation, ResourceImporter);
+
 public:
 	virtual String get_importer_name() const;
 	virtual String get_visible_name() const;
diff --git a/editor/import/resource_importer_image.h b/editor/import/resource_importer_image.h
index 3d5b99db2cc..beadf5a8ea7 100644
--- a/editor/import/resource_importer_image.h
+++ b/editor/import/resource_importer_image.h
@@ -35,7 +35,8 @@
 #include "core/io/resource_importer.h"
 
 class ResourceImporterImage : public ResourceImporter {
-	GDCLASS(ResourceImporterImage, ResourceImporter)
+	GDCLASS(ResourceImporterImage, ResourceImporter);
+
 public:
 	virtual String get_importer_name() const;
 	virtual String get_visible_name() const;
diff --git a/editor/import/resource_importer_layered_texture.h b/editor/import/resource_importer_layered_texture.h
index 6b393886b7c..d6acbbabca7 100644
--- a/editor/import/resource_importer_layered_texture.h
+++ b/editor/import/resource_importer_layered_texture.h
@@ -37,7 +37,7 @@
 class StreamTexture;
 
 class ResourceImporterLayeredTexture : public ResourceImporter {
-	GDCLASS(ResourceImporterLayeredTexture, ResourceImporter)
+	GDCLASS(ResourceImporterLayeredTexture, ResourceImporter);
 
 	bool is_3d;
 	static const char *compression_formats[];
diff --git a/editor/import/resource_importer_obj.h b/editor/import/resource_importer_obj.h
index b2a53f582cb..b96bc1b6568 100644
--- a/editor/import/resource_importer_obj.h
+++ b/editor/import/resource_importer_obj.h
@@ -47,7 +47,8 @@ public:
 };
 
 class ResourceImporterOBJ : public ResourceImporter {
-	GDCLASS(ResourceImporterOBJ, ResourceImporter)
+	GDCLASS(ResourceImporterOBJ, ResourceImporter);
+
 public:
 	virtual String get_importer_name() const;
 	virtual String get_visible_name() const;
diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h
index b10c4da2e5c..e89f862c1b5 100644
--- a/editor/import/resource_importer_scene.h
+++ b/editor/import/resource_importer_scene.h
@@ -90,7 +90,7 @@ public:
 };
 
 class ResourceImporterScene : public ResourceImporter {
-	GDCLASS(ResourceImporterScene, ResourceImporter)
+	GDCLASS(ResourceImporterScene, ResourceImporter);
 
 	Set<Ref<EditorSceneImporter> > importers;
 
diff --git a/editor/import/resource_importer_texture.h b/editor/import/resource_importer_texture.h
index ef74e4e41e0..da712bf84dc 100644
--- a/editor/import/resource_importer_texture.h
+++ b/editor/import/resource_importer_texture.h
@@ -37,7 +37,7 @@
 class StreamTexture;
 
 class ResourceImporterTexture : public ResourceImporter {
-	GDCLASS(ResourceImporterTexture, ResourceImporter)
+	GDCLASS(ResourceImporterTexture, ResourceImporter);
 
 protected:
 	enum {
diff --git a/editor/import/resource_importer_texture_atlas.h b/editor/import/resource_importer_texture_atlas.h
index 042deacfe35..3c6fc343c4e 100644
--- a/editor/import/resource_importer_texture_atlas.h
+++ b/editor/import/resource_importer_texture_atlas.h
@@ -34,7 +34,7 @@
 #include "core/image.h"
 #include "core/io/resource_importer.h"
 class ResourceImporterTextureAtlas : public ResourceImporter {
-	GDCLASS(ResourceImporterTextureAtlas, ResourceImporter)
+	GDCLASS(ResourceImporterTextureAtlas, ResourceImporter);
 
 	struct PackData {
 		Rect2 region;
diff --git a/editor/import/resource_importer_wav.h b/editor/import/resource_importer_wav.h
index f993f9e7bc2..24481ea46b6 100644
--- a/editor/import/resource_importer_wav.h
+++ b/editor/import/resource_importer_wav.h
@@ -34,7 +34,8 @@
 #include "core/io/resource_importer.h"
 
 class ResourceImporterWAV : public ResourceImporter {
-	GDCLASS(ResourceImporterWAV, ResourceImporter)
+	GDCLASS(ResourceImporterWAV, ResourceImporter);
+
 public:
 	virtual String get_importer_name() const;
 	virtual String get_visible_name() const;
diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp
index b307ec649a3..6918fe7977e 100644
--- a/editor/import_dock.cpp
+++ b/editor/import_dock.cpp
@@ -32,7 +32,8 @@
 #include "editor_node.h"
 
 class ImportDockParameters : public Object {
-	GDCLASS(ImportDockParameters, Object)
+	GDCLASS(ImportDockParameters, Object);
+
 public:
 	Map<StringName, Variant> values;
 	List<PropertyInfo> properties;
diff --git a/editor/import_dock.h b/editor/import_dock.h
index 77a34e80eb0..c839e19d673 100644
--- a/editor/import_dock.h
+++ b/editor/import_dock.h
@@ -43,7 +43,7 @@
 
 class ImportDockParameters;
 class ImportDock : public VBoxContainer {
-	GDCLASS(ImportDock, VBoxContainer)
+	GDCLASS(ImportDock, VBoxContainer);
 
 	Label *imported;
 	OptionButton *import_as;
diff --git a/editor/pane_drag.h b/editor/pane_drag.h
index c9631bb8709..36c5953d84d 100644
--- a/editor/pane_drag.h
+++ b/editor/pane_drag.h
@@ -35,7 +35,7 @@
 
 class PaneDrag : public Control {
 
-	GDCLASS(PaneDrag, Control)
+	GDCLASS(PaneDrag, Control);
 
 	bool mouse_over;
 
diff --git a/editor/plugins/animation_blend_space_1d_editor.h b/editor/plugins/animation_blend_space_1d_editor.h
index ae4db184e4c..4a924b46c17 100644
--- a/editor/plugins/animation_blend_space_1d_editor.h
+++ b/editor/plugins/animation_blend_space_1d_editor.h
@@ -43,7 +43,7 @@
 
 class AnimationNodeBlendSpace1DEditor : public AnimationTreeNodeEditorPlugin {
 
-	GDCLASS(AnimationNodeBlendSpace1DEditor, AnimationTreeNodeEditorPlugin)
+	GDCLASS(AnimationNodeBlendSpace1DEditor, AnimationTreeNodeEditorPlugin);
 
 	Ref<AnimationNodeBlendSpace1D> blend_space;
 
diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h
index 4a7f933bbf8..4ecbf2e05e2 100644
--- a/editor/plugins/animation_tree_editor_plugin.h
+++ b/editor/plugins/animation_tree_editor_plugin.h
@@ -41,7 +41,8 @@
 #include "scene/gui/tree.h"
 
 class AnimationTreeNodeEditorPlugin : public VBoxContainer {
-	GDCLASS(AnimationTreeNodeEditorPlugin, VBoxContainer)
+	GDCLASS(AnimationTreeNodeEditorPlugin, VBoxContainer);
+
 public:
 	virtual bool can_edit(const Ref<AnimationNode> &p_node) = 0;
 	virtual void edit(const Ref<AnimationNode> &p_node) = 0;
diff --git a/editor/plugins/curve_editor_plugin.h b/editor/plugins/curve_editor_plugin.h
index b034368b6ab..be774a96968 100644
--- a/editor/plugins/curve_editor_plugin.h
+++ b/editor/plugins/curve_editor_plugin.h
@@ -37,7 +37,8 @@
 
 // Edits a y(x) curve
 class CurveEditor : public Control {
-	GDCLASS(CurveEditor, Control)
+	GDCLASS(CurveEditor, Control);
+
 public:
 	CurveEditor();
 
@@ -120,14 +121,16 @@ private:
 };
 
 class EditorInspectorPluginCurve : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginCurve, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginCurve, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
 };
 
 class CurveEditorPlugin : public EditorPlugin {
-	GDCLASS(CurveEditorPlugin, EditorPlugin)
+	GDCLASS(CurveEditorPlugin, EditorPlugin);
+
 public:
 	CurveEditorPlugin(EditorNode *p_node);
 
@@ -135,7 +138,8 @@ public:
 };
 
 class CurvePreviewGenerator : public EditorResourcePreviewGenerator {
-	GDCLASS(CurvePreviewGenerator, EditorResourcePreviewGenerator)
+	GDCLASS(CurvePreviewGenerator, EditorResourcePreviewGenerator);
+
 public:
 	virtual bool handles(const String &p_type) const;
 	virtual Ref<Texture> generate(const Ref<Resource> &p_from, const Size2 p_size) const;
diff --git a/editor/plugins/editor_preview_plugins.h b/editor/plugins/editor_preview_plugins.h
index 16b1f3082b4..12d693b10a9 100644
--- a/editor/plugins/editor_preview_plugins.h
+++ b/editor/plugins/editor_preview_plugins.h
@@ -36,7 +36,8 @@
 void post_process_preview(Ref<Image> p_image);
 
 class EditorTexturePreviewPlugin : public EditorResourcePreviewGenerator {
-	GDCLASS(EditorTexturePreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorTexturePreviewPlugin, EditorResourcePreviewGenerator);
+
 public:
 	virtual bool handles(const String &p_type) const;
 	virtual bool generate_small_preview_automatically() const;
@@ -46,7 +47,8 @@ public:
 };
 
 class EditorImagePreviewPlugin : public EditorResourcePreviewGenerator {
-	GDCLASS(EditorImagePreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorImagePreviewPlugin, EditorResourcePreviewGenerator);
+
 public:
 	virtual bool handles(const String &p_type) const;
 	virtual bool generate_small_preview_automatically() const;
@@ -56,7 +58,8 @@ public:
 };
 
 class EditorBitmapPreviewPlugin : public EditorResourcePreviewGenerator {
-	GDCLASS(EditorBitmapPreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorBitmapPreviewPlugin, EditorResourcePreviewGenerator);
+
 public:
 	virtual bool handles(const String &p_type) const;
 	virtual bool generate_small_preview_automatically() const;
@@ -77,7 +80,7 @@ public:
 
 class EditorMaterialPreviewPlugin : public EditorResourcePreviewGenerator {
 
-	GDCLASS(EditorMaterialPreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorMaterialPreviewPlugin, EditorResourcePreviewGenerator);
 
 	RID scenario;
 	RID sphere;
@@ -123,7 +126,7 @@ public:
 
 class EditorMeshPreviewPlugin : public EditorResourcePreviewGenerator {
 
-	GDCLASS(EditorMeshPreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorMeshPreviewPlugin, EditorResourcePreviewGenerator);
 
 	RID scenario;
 	RID mesh_instance;
@@ -151,7 +154,7 @@ public:
 
 class EditorFontPreviewPlugin : public EditorResourcePreviewGenerator {
 
-	GDCLASS(EditorFontPreviewPlugin, EditorResourcePreviewGenerator)
+	GDCLASS(EditorFontPreviewPlugin, EditorResourcePreviewGenerator);
 
 	RID viewport;
 	RID viewport_texture;
diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h
index 91790abee86..a87a5fe0ba0 100644
--- a/editor/plugins/gradient_editor_plugin.h
+++ b/editor/plugins/gradient_editor_plugin.h
@@ -36,7 +36,7 @@
 #include "scene/gui/gradient_edit.h"
 
 class GradientEditor : public GradientEdit {
-	GDCLASS(GradientEditor, GradientEdit)
+	GDCLASS(GradientEditor, GradientEdit);
 
 	bool editing;
 	Ref<Gradient> gradient;
@@ -54,7 +54,8 @@ public:
 };
 
 class EditorInspectorPluginGradient : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginGradient, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h
index c3f14c27e5f..1405127ab35 100644
--- a/editor/plugins/material_editor_plugin.h
+++ b/editor/plugins/material_editor_plugin.h
@@ -78,7 +78,7 @@ public:
 };
 
 class EditorInspectorPluginMaterial : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginMaterial, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginMaterial, EditorInspectorPlugin);
 	Ref<Environment> env;
 
 public:
@@ -99,7 +99,8 @@ public:
 };
 
 class SpatialMaterialConversionPlugin : public EditorResourceConversionPlugin {
-	GDCLASS(SpatialMaterialConversionPlugin, EditorResourceConversionPlugin)
+	GDCLASS(SpatialMaterialConversionPlugin, EditorResourceConversionPlugin);
+
 public:
 	virtual String converts_to() const;
 	virtual bool handles(const Ref<Resource> &p_resource) const;
@@ -107,7 +108,8 @@ public:
 };
 
 class ParticlesMaterialConversionPlugin : public EditorResourceConversionPlugin {
-	GDCLASS(ParticlesMaterialConversionPlugin, EditorResourceConversionPlugin)
+	GDCLASS(ParticlesMaterialConversionPlugin, EditorResourceConversionPlugin);
+
 public:
 	virtual String converts_to() const;
 	virtual bool handles(const Ref<Resource> &p_resource) const;
@@ -115,7 +117,8 @@ public:
 };
 
 class CanvasItemMaterialConversionPlugin : public EditorResourceConversionPlugin {
-	GDCLASS(CanvasItemMaterialConversionPlugin, EditorResourceConversionPlugin)
+	GDCLASS(CanvasItemMaterialConversionPlugin, EditorResourceConversionPlugin);
+
 public:
 	virtual String converts_to() const;
 	virtual bool handles(const Ref<Resource> &p_resource) const;
diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h
index 8ada2dac907..4c2a81ed701 100644
--- a/editor/plugins/mesh_editor_plugin.h
+++ b/editor/plugins/mesh_editor_plugin.h
@@ -73,7 +73,8 @@ public:
 };
 
 class EditorInspectorPluginMesh : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginMesh, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginMesh, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
diff --git a/editor/plugins/particles_editor_plugin.h b/editor/plugins/particles_editor_plugin.h
index b1b3e3c1c0c..b1c53dcf941 100644
--- a/editor/plugins/particles_editor_plugin.h
+++ b/editor/plugins/particles_editor_plugin.h
@@ -42,7 +42,7 @@
 
 class ParticlesEditorBase : public Control {
 
-	GDCLASS(ParticlesEditorBase, Control)
+	GDCLASS(ParticlesEditorBase, Control);
 
 protected:
 	Spatial *base_node;
diff --git a/editor/plugins/root_motion_editor_plugin.h b/editor/plugins/root_motion_editor_plugin.h
index e7fd597235c..af5d8fc1222 100644
--- a/editor/plugins/root_motion_editor_plugin.h
+++ b/editor/plugins/root_motion_editor_plugin.h
@@ -37,7 +37,7 @@
 #include "scene/animation/animation_tree.h"
 
 class EditorPropertyRootMotion : public EditorProperty {
-	GDCLASS(EditorPropertyRootMotion, EditorProperty)
+	GDCLASS(EditorPropertyRootMotion, EditorProperty);
 	Button *assign;
 	Button *clear;
 	NodePath base_hint;
@@ -60,7 +60,7 @@ public:
 };
 
 class EditorInspectorRootMotionPlugin : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorRootMotionPlugin, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorRootMotionPlugin, EditorInspectorPlugin);
 
 public:
 	virtual bool can_handle(Object *p_object);
diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h
index 0d9168261a6..4ad21567796 100644
--- a/editor/plugins/script_editor_plugin.h
+++ b/editor/plugins/script_editor_plugin.h
@@ -50,7 +50,7 @@
 
 class ScriptEditorQuickOpen : public ConfirmationDialog {
 
-	GDCLASS(ScriptEditorQuickOpen, ConfirmationDialog)
+	GDCLASS(ScriptEditorQuickOpen, ConfirmationDialog);
 
 	LineEdit *search_box;
 	Tree *search_options;
@@ -77,7 +77,7 @@ class ScriptEditorDebugger;
 
 class ScriptEditorBase : public VBoxContainer {
 
-	GDCLASS(ScriptEditorBase, VBoxContainer)
+	GDCLASS(ScriptEditorBase, VBoxContainer);
 
 protected:
 	static void _bind_methods();
diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h
index ebaa930eb0a..701b9e81440 100644
--- a/editor/plugins/spatial_editor_plugin.h
+++ b/editor/plugins/spatial_editor_plugin.h
@@ -431,7 +431,8 @@ public:
 
 class SpatialEditorViewportContainer : public Container {
 
-	GDCLASS(SpatialEditorViewportContainer, Container)
+	GDCLASS(SpatialEditorViewportContainer, Container);
+
 public:
 	enum View {
 		VIEW_USE_1_VIEWPORT,
diff --git a/editor/plugins/style_box_editor_plugin.h b/editor/plugins/style_box_editor_plugin.h
index 95d21b2c440..d31a28b3e4c 100644
--- a/editor/plugins/style_box_editor_plugin.h
+++ b/editor/plugins/style_box_editor_plugin.h
@@ -56,7 +56,8 @@ public:
 };
 
 class EditorInspectorPluginStyleBox : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginStyleBox, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginStyleBox, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
diff --git a/editor/plugins/text_editor.h b/editor/plugins/text_editor.h
index e91909e0ea0..277e93fd396 100644
--- a/editor/plugins/text_editor.h
+++ b/editor/plugins/text_editor.h
@@ -35,7 +35,7 @@
 
 class TextEditor : public ScriptEditorBase {
 
-	GDCLASS(TextEditor, ScriptEditorBase)
+	GDCLASS(TextEditor, ScriptEditorBase);
 
 private:
 	CodeTextEditor *code_editor;
diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h
index bcbda1fbd74..ed257833038 100644
--- a/editor/plugins/texture_editor_plugin.h
+++ b/editor/plugins/texture_editor_plugin.h
@@ -54,7 +54,8 @@ public:
 };
 
 class EditorInspectorPluginTexture : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorPluginTexture, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorPluginTexture, EditorInspectorPlugin);
+
 public:
 	virtual bool can_handle(Object *p_object);
 	virtual void parse_begin(Object *p_object);
diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h
index 1176e1bb928..b417414ae02 100644
--- a/editor/plugins/tile_set_editor_plugin.h
+++ b/editor/plugins/tile_set_editor_plugin.h
@@ -46,7 +46,7 @@ class TileSetEditor : public HSplitContainer {
 	friend class TileSetEditorPlugin;
 	friend class TilesetEditorContext;
 
-	GDCLASS(TileSetEditor, HSplitContainer)
+	GDCLASS(TileSetEditor, HSplitContainer);
 
 	enum TextureToolButtons {
 		TOOL_TILESET_ADD_TEXTURE,
diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp
index a1b903576ed..7d0c67b5ede 100644
--- a/editor/plugins/visual_shader_editor_plugin.cpp
+++ b/editor/plugins/visual_shader_editor_plugin.cpp
@@ -2350,7 +2350,7 @@ VisualShaderEditorPlugin::~VisualShaderEditorPlugin() {
 ////////////////
 
 class VisualShaderNodePluginInputEditor : public OptionButton {
-	GDCLASS(VisualShaderNodePluginInputEditor, OptionButton)
+	GDCLASS(VisualShaderNodePluginInputEditor, OptionButton);
 
 	Ref<VisualShaderNodeInput> input;
 
@@ -2395,7 +2395,8 @@ public:
 };
 
 class VisualShaderNodePluginDefaultEditor : public VBoxContainer {
-	GDCLASS(VisualShaderNodePluginDefaultEditor, VBoxContainer)
+	GDCLASS(VisualShaderNodePluginDefaultEditor, VBoxContainer);
+
 public:
 	void _property_changed(const String &prop, const Variant &p_value, const String &p_field, bool p_changing = false) {
 
diff --git a/editor/plugins/visual_shader_editor_plugin.h b/editor/plugins/visual_shader_editor_plugin.h
index 1b009b61d53..567706b8084 100644
--- a/editor/plugins/visual_shader_editor_plugin.h
+++ b/editor/plugins/visual_shader_editor_plugin.h
@@ -42,7 +42,8 @@
 
 class VisualShaderNodePlugin : public Reference {
 
-	GDCLASS(VisualShaderNodePlugin, Reference)
+	GDCLASS(VisualShaderNodePlugin, Reference);
+
 protected:
 	static void _bind_methods();
 
@@ -245,14 +246,14 @@ public:
 
 class VisualShaderNodePluginDefault : public VisualShaderNodePlugin {
 
-	GDCLASS(VisualShaderNodePluginDefault, VisualShaderNodePlugin)
+	GDCLASS(VisualShaderNodePluginDefault, VisualShaderNodePlugin);
 
 public:
 	virtual Control *create_editor(const Ref<VisualShaderNode> &p_node);
 };
 
 class EditorPropertyShaderMode : public EditorProperty {
-	GDCLASS(EditorPropertyShaderMode, EditorProperty)
+	GDCLASS(EditorPropertyShaderMode, EditorProperty);
 	OptionButton *options;
 
 	void _option_selected(int p_which);
@@ -268,7 +269,7 @@ public:
 };
 
 class EditorInspectorShaderModePlugin : public EditorInspectorPlugin {
-	GDCLASS(EditorInspectorShaderModePlugin, EditorInspectorPlugin)
+	GDCLASS(EditorInspectorShaderModePlugin, EditorInspectorPlugin);
 
 public:
 	virtual bool can_handle(Object *p_object);
@@ -278,7 +279,7 @@ public:
 };
 
 class VisualShaderNodePortPreview : public Control {
-	GDCLASS(VisualShaderNodePortPreview, Control)
+	GDCLASS(VisualShaderNodePortPreview, Control);
 	Ref<VisualShader> shader;
 	VisualShader::Type type;
 	int node;
diff --git a/editor/property_editor.h b/editor/property_editor.h
index 6a709d348bf..a8ef1d6fc1f 100644
--- a/editor/property_editor.h
+++ b/editor/property_editor.h
@@ -56,7 +56,7 @@ class PropertySelector;
 
 class EditorResourceConversionPlugin : public Reference {
 
-	GDCLASS(EditorResourceConversionPlugin, Reference)
+	GDCLASS(EditorResourceConversionPlugin, Reference);
 
 protected:
 	static void _bind_methods();
diff --git a/editor/property_selector.h b/editor/property_selector.h
index cc5b1d48840..a6c1ec64984 100644
--- a/editor/property_selector.h
+++ b/editor/property_selector.h
@@ -36,7 +36,7 @@
 #include "scene/gui/rich_text_label.h"
 
 class PropertySelector : public ConfirmationDialog {
-	GDCLASS(PropertySelector, ConfirmationDialog)
+	GDCLASS(PropertySelector, ConfirmationDialog);
 
 	LineEdit *search_box;
 	Tree *search_options;
diff --git a/editor/quick_open.h b/editor/quick_open.h
index 14d857fa1c0..b6a2e50e88f 100644
--- a/editor/quick_open.h
+++ b/editor/quick_open.h
@@ -37,7 +37,7 @@
 #include "scene/gui/tree.h"
 class EditorQuickOpen : public ConfirmationDialog {
 
-	GDCLASS(EditorQuickOpen, ConfirmationDialog)
+	GDCLASS(EditorQuickOpen, ConfirmationDialog);
 
 	LineEdit *search_box;
 	Tree *search_options;
diff --git a/modules/bullet/bullet_physics_server.h b/modules/bullet/bullet_physics_server.h
index 0b8ad536587..4c598c84f28 100644
--- a/modules/bullet/bullet_physics_server.h
+++ b/modules/bullet/bullet_physics_server.h
@@ -45,7 +45,7 @@
 */
 
 class BulletPhysicsServer : public PhysicsServer {
-	GDCLASS(BulletPhysicsServer, PhysicsServer)
+	GDCLASS(BulletPhysicsServer, PhysicsServer);
 
 	friend class BulletPhysicsDirectSpaceState;
 
diff --git a/modules/bullet/rigid_body_bullet.h b/modules/bullet/rigid_body_bullet.h
index 1e1bea846a2..2c9bdb8b0bb 100644
--- a/modules/bullet/rigid_body_bullet.h
+++ b/modules/bullet/rigid_body_bullet.h
@@ -54,7 +54,7 @@ class BulletPhysicsDirectBodyState;
 /// created by BulletPhysicsServer and is held by the "singleton" variable of this class
 /// Each time something require it, the body must be set again.
 class BulletPhysicsDirectBodyState : public PhysicsDirectBodyState {
-	GDCLASS(BulletPhysicsDirectBodyState, PhysicsDirectBodyState)
+	GDCLASS(BulletPhysicsDirectBodyState, PhysicsDirectBodyState);
 
 	static BulletPhysicsDirectBodyState *singleton;
 
diff --git a/modules/bullet/space_bullet.h b/modules/bullet/space_bullet.h
index 6b3d65edf6f..eb4a065e54c 100644
--- a/modules/bullet/space_bullet.h
+++ b/modules/bullet/space_bullet.h
@@ -68,7 +68,8 @@ class btGjkEpaPenetrationDepthSolver;
 extern ContactAddedCallback gContactAddedCallback;
 
 class BulletPhysicsDirectSpaceState : public PhysicsDirectSpaceState {
-	GDCLASS(BulletPhysicsDirectSpaceState, PhysicsDirectSpaceState)
+	GDCLASS(BulletPhysicsDirectSpaceState, PhysicsDirectSpaceState);
+
 private:
 	SpaceBullet *space;
 
diff --git a/modules/csg/csg_gizmos.h b/modules/csg/csg_gizmos.h
index 0915d051114..d38dafc936b 100644
--- a/modules/csg/csg_gizmos.h
+++ b/modules/csg/csg_gizmos.h
@@ -55,7 +55,8 @@ public:
 };
 
 class EditorPluginCSG : public EditorPlugin {
-	GDCLASS(EditorPluginCSG, EditorPlugin)
+	GDCLASS(EditorPluginCSG, EditorPlugin);
+
 public:
 	EditorPluginCSG(EditorNode *p_editor);
 };
diff --git a/modules/csg/csg_shape.h b/modules/csg/csg_shape.h
index 2171f27f96b..553a7553c6c 100644
--- a/modules/csg/csg_shape.h
+++ b/modules/csg/csg_shape.h
@@ -156,7 +156,8 @@ public:
 VARIANT_ENUM_CAST(CSGShape::Operation)
 
 class CSGCombiner : public CSGShape {
-	GDCLASS(CSGCombiner, CSGShape)
+	GDCLASS(CSGCombiner, CSGShape);
+
 private:
 	virtual CSGBrush *_build_brush();
 
@@ -165,7 +166,7 @@ public:
 };
 
 class CSGPrimitive : public CSGShape {
-	GDCLASS(CSGPrimitive, CSGShape)
+	GDCLASS(CSGPrimitive, CSGShape);
 
 private:
 	bool invert_faces;
@@ -182,7 +183,7 @@ public:
 };
 
 class CSGMesh : public CSGPrimitive {
-	GDCLASS(CSGMesh, CSGPrimitive)
+	GDCLASS(CSGMesh, CSGPrimitive);
 
 	virtual CSGBrush *_build_brush();
 
@@ -204,7 +205,7 @@ public:
 
 class CSGSphere : public CSGPrimitive {
 
-	GDCLASS(CSGSphere, CSGPrimitive)
+	GDCLASS(CSGSphere, CSGPrimitive);
 	virtual CSGBrush *_build_brush();
 
 	Ref<Material> material;
@@ -237,7 +238,7 @@ public:
 
 class CSGBox : public CSGPrimitive {
 
-	GDCLASS(CSGBox, CSGPrimitive)
+	GDCLASS(CSGBox, CSGPrimitive);
 	virtual CSGBrush *_build_brush();
 
 	Ref<Material> material;
@@ -266,7 +267,7 @@ public:
 
 class CSGCylinder : public CSGPrimitive {
 
-	GDCLASS(CSGCylinder, CSGPrimitive)
+	GDCLASS(CSGCylinder, CSGPrimitive);
 	virtual CSGBrush *_build_brush();
 
 	Ref<Material> material;
@@ -303,7 +304,7 @@ public:
 
 class CSGTorus : public CSGPrimitive {
 
-	GDCLASS(CSGTorus, CSGPrimitive)
+	GDCLASS(CSGTorus, CSGPrimitive);
 	virtual CSGBrush *_build_brush();
 
 	Ref<Material> material;
@@ -340,7 +341,7 @@ public:
 
 class CSGPolygon : public CSGPrimitive {
 
-	GDCLASS(CSGPolygon, CSGPrimitive)
+	GDCLASS(CSGPolygon, CSGPrimitive);
 
 public:
 	enum Mode {
diff --git a/modules/enet/networked_multiplayer_enet.h b/modules/enet/networked_multiplayer_enet.h
index 957d0830cb9..8dcb2023141 100644
--- a/modules/enet/networked_multiplayer_enet.h
+++ b/modules/enet/networked_multiplayer_enet.h
@@ -38,7 +38,8 @@
 
 class NetworkedMultiplayerENet : public NetworkedMultiplayerPeer {
 
-	GDCLASS(NetworkedMultiplayerENet, NetworkedMultiplayerPeer)
+	GDCLASS(NetworkedMultiplayerENet, NetworkedMultiplayerPeer);
+
 public:
 	enum CompressionMode {
 		COMPRESS_NONE,
diff --git a/modules/gdnative/arvr/arvr_interface_gdnative.h b/modules/gdnative/arvr/arvr_interface_gdnative.h
index e0e5b678499..651e5c87159 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/gdnative.h b/modules/gdnative/gdnative.h
index 1590994ab4b..005d1d2bffd 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;
 
diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h
index d60e3ae1ae4..79a41df1074 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:
diff --git a/modules/gdnative/net/multiplayer_peer_gdnative.h b/modules/gdnative/net/multiplayer_peer_gdnative.h
index 7d48dc60d15..6fbc62aaa1a 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 742fa4e7d55..8483217210b 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/mono/csharp_script.h b/modules/mono/csharp_script.h
index 7b16b5609e9..64e3b400630 100644
--- a/modules/mono/csharp_script.h
+++ b/modules/mono/csharp_script.h
@@ -63,7 +63,7 @@ TScriptInstance *cast_script_instance(ScriptInstance *p_inst) {
 
 class CSharpScript : public Script {
 
-	GDCLASS(CSharpScript, Script)
+	GDCLASS(CSharpScript, Script);
 
 	friend class CSharpInstance;
 	friend class CSharpLanguage;
diff --git a/modules/mono/editor/godotsharp_editor.h b/modules/mono/editor/godotsharp_editor.h
index d9523c384c5..4a28492bad7 100644
--- a/modules/mono/editor/godotsharp_editor.h
+++ b/modules/mono/editor/godotsharp_editor.h
@@ -35,7 +35,7 @@
 #include "monodevelop_instance.h"
 
 class GodotSharpEditor : public Node {
-	GDCLASS(GodotSharpEditor, Object)
+	GDCLASS(GodotSharpEditor, Object);
 
 	EditorNode *editor;
 
@@ -109,7 +109,7 @@ public:
 };
 
 class MonoReloadNode : public Node {
-	GDCLASS(MonoReloadNode, Node)
+	GDCLASS(MonoReloadNode, Node);
 
 	Timer *reload_timer;
 
diff --git a/modules/mono/editor/mono_bottom_panel.h b/modules/mono/editor/mono_bottom_panel.h
index 406e46f7cec..9b362e51df0 100644
--- a/modules/mono/editor/mono_bottom_panel.h
+++ b/modules/mono/editor/mono_bottom_panel.h
@@ -40,7 +40,7 @@ class MonoBuildTab;
 
 class MonoBottomPanel : public VBoxContainer {
 
-	GDCLASS(MonoBottomPanel, VBoxContainer)
+	GDCLASS(MonoBottomPanel, VBoxContainer);
 
 	EditorNode *editor;
 
@@ -87,7 +87,7 @@ public:
 
 class MonoBuildTab : public VBoxContainer {
 
-	GDCLASS(MonoBuildTab, VBoxContainer)
+	GDCLASS(MonoBuildTab, VBoxContainer);
 
 public:
 	enum BuildResult {
diff --git a/modules/mono/mono_gc_handle.h b/modules/mono/mono_gc_handle.h
index 63b61aff185..60a1eed212d 100644
--- a/modules/mono/mono_gc_handle.h
+++ b/modules/mono/mono_gc_handle.h
@@ -37,7 +37,7 @@
 
 class MonoGCHandle : public Reference {
 
-	GDCLASS(MonoGCHandle, Reference)
+	GDCLASS(MonoGCHandle, Reference);
 
 	bool released;
 	bool weak;
diff --git a/modules/mono/mono_gd/gd_mono.h b/modules/mono/mono_gd/gd_mono.h
index 216c96a6128..95340edcca5 100644
--- a/modules/mono/mono_gd/gd_mono.h
+++ b/modules/mono/mono_gd/gd_mono.h
@@ -267,7 +267,7 @@ public:
 	(void)__gdmono__scope__exit__domain__unload__;
 
 class _GodotSharp : public Object {
-	GDCLASS(_GodotSharp, Object)
+	GDCLASS(_GodotSharp, Object);
 
 	friend class GDMono;
 
diff --git a/modules/mono/signal_awaiter_utils.h b/modules/mono/signal_awaiter_utils.h
index 098008ded71..4fb3cdb56dd 100644
--- a/modules/mono/signal_awaiter_utils.h
+++ b/modules/mono/signal_awaiter_utils.h
@@ -41,7 +41,7 @@ Error connect_signal_awaiter(Object *p_source, const String &p_signal, Object *p
 
 class SignalAwaiterHandle : public MonoGCHandle {
 
-	GDCLASS(SignalAwaiterHandle, MonoGCHandle)
+	GDCLASS(SignalAwaiterHandle, MonoGCHandle);
 
 	bool completed;
 
diff --git a/modules/opensimplex/noise_texture.h b/modules/opensimplex/noise_texture.h
index 0d00ee154d4..445bf974b84 100644
--- a/modules/opensimplex/noise_texture.h
+++ b/modules/opensimplex/noise_texture.h
@@ -40,7 +40,7 @@
 #include "editor/property_editor.h"
 
 class NoiseTexture : public Texture {
-	GDCLASS(NoiseTexture, Texture)
+	GDCLASS(NoiseTexture, Texture);
 
 private:
 	Ref<Image> data;
diff --git a/modules/opensimplex/open_simplex_noise.h b/modules/opensimplex/open_simplex_noise.h
index 96885f5893b..c31cbf68c3c 100644
--- a/modules/opensimplex/open_simplex_noise.h
+++ b/modules/opensimplex/open_simplex_noise.h
@@ -38,7 +38,7 @@
 #include "thirdparty/misc/open-simplex-noise.h"
 
 class OpenSimplexNoise : public Resource {
-	GDCLASS(OpenSimplexNoise, Resource)
+	GDCLASS(OpenSimplexNoise, Resource);
 	OBJ_SAVE_TYPE(OpenSimplexNoise);
 
 	osn_context contexts[6];
diff --git a/modules/opus/audio_stream_opus.h b/modules/opus/audio_stream_opus.h
index fd07e19e2e5..04c2e9d9f04 100644
--- a/modules/opus/audio_stream_opus.h
+++ b/modules/opus/audio_stream_opus.h
@@ -43,7 +43,7 @@
 
 class AudioStreamPlaybackOpus : public AudioStreamPlayback {
 
-	GDCLASS(AudioStreamPlaybackOpus, AudioStreamPlayback)
+	GDCLASS(AudioStreamPlaybackOpus, AudioStreamPlayback);
 
 	enum {
 		MIN_MIX = 1024
@@ -117,7 +117,7 @@ public:
 
 class AudioStreamOpus : public AudioStream {
 
-	GDCLASS(AudioStreamOpus, AudioStream)
+	GDCLASS(AudioStreamOpus, AudioStream);
 
 	String file;
 
diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.h b/modules/stb_vorbis/audio_stream_ogg_vorbis.h
index cbff9d47bb6..c8c179554aa 100644
--- a/modules/stb_vorbis/audio_stream_ogg_vorbis.h
+++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.h
@@ -40,7 +40,7 @@ class AudioStreamOGGVorbis;
 
 class AudioStreamPlaybackOGGVorbis : public AudioStreamPlaybackResampled {
 
-	GDCLASS(AudioStreamPlaybackOGGVorbis, AudioStreamPlaybackResampled)
+	GDCLASS(AudioStreamPlaybackOGGVorbis, AudioStreamPlaybackResampled);
 
 	stb_vorbis *ogg_stream;
 	stb_vorbis_alloc ogg_alloc;
@@ -72,7 +72,7 @@ public:
 
 class AudioStreamOGGVorbis : public AudioStream {
 
-	GDCLASS(AudioStreamOGGVorbis, AudioStream)
+	GDCLASS(AudioStreamOGGVorbis, AudioStream);
 	OBJ_SAVE_TYPE(AudioStream) //children are all saved as AudioStream, so they can be exchanged
 	RES_BASE_EXTENSION("oggstr");
 
diff --git a/modules/stb_vorbis/resource_importer_ogg_vorbis.h b/modules/stb_vorbis/resource_importer_ogg_vorbis.h
index d3d0574d56f..8e4fbde916b 100644
--- a/modules/stb_vorbis/resource_importer_ogg_vorbis.h
+++ b/modules/stb_vorbis/resource_importer_ogg_vorbis.h
@@ -35,7 +35,8 @@
 #include "core/io/resource_importer.h"
 
 class ResourceImporterOGGVorbis : public ResourceImporter {
-	GDCLASS(ResourceImporterOGGVorbis, ResourceImporter)
+	GDCLASS(ResourceImporterOGGVorbis, ResourceImporter);
+
 public:
 	virtual String get_importer_name() const;
 	virtual String get_visible_name() const;
diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h
index 89f32f54f76..098c28370d0 100644
--- a/modules/visual_script/visual_script.h
+++ b/modules/visual_script/visual_script.h
@@ -39,7 +39,7 @@ class VisualScriptNodeInstance;
 class VisualScript;
 
 class VisualScriptNode : public Resource {
-	GDCLASS(VisualScriptNode, Resource)
+	GDCLASS(VisualScriptNode, Resource);
 
 	friend class VisualScript;
 
@@ -165,7 +165,7 @@ public:
 
 class VisualScript : public Script {
 
-	GDCLASS(VisualScript, Script)
+	GDCLASS(VisualScript, Script);
 
 	RES_BASE_EXTENSION("vs");
 
diff --git a/modules/visual_script/visual_script_builtin_funcs.h b/modules/visual_script/visual_script_builtin_funcs.h
index 3e452cd94ff..f009f49b5b7 100644
--- a/modules/visual_script/visual_script_builtin_funcs.h
+++ b/modules/visual_script/visual_script_builtin_funcs.h
@@ -35,7 +35,8 @@
 
 class VisualScriptBuiltinFunc : public VisualScriptNode {
 
-	GDCLASS(VisualScriptBuiltinFunc, VisualScriptNode)
+	GDCLASS(VisualScriptBuiltinFunc, VisualScriptNode);
+
 public:
 	enum BuiltinFunc {
 		MATH_SIN,
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index 7c3bad6785b..3ac170a935b 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -46,7 +46,7 @@
 #ifdef TOOLS_ENABLED
 class VisualScriptEditorSignalEdit : public Object {
 
-	GDCLASS(VisualScriptEditorSignalEdit, Object)
+	GDCLASS(VisualScriptEditorSignalEdit, Object);
 
 	StringName sig;
 
@@ -186,7 +186,7 @@ public:
 
 class VisualScriptEditorVariableEdit : public Object {
 
-	GDCLASS(VisualScriptEditorVariableEdit, Object)
+	GDCLASS(VisualScriptEditorVariableEdit, Object);
 
 	StringName var;
 
diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h
index b66d10021ac..4f302d1d726 100644
--- a/modules/visual_script/visual_script_editor.h
+++ b/modules/visual_script/visual_script_editor.h
@@ -44,7 +44,7 @@ class VisualScriptEditorVariableEdit;
 #ifdef TOOLS_ENABLED
 
 class VisualScriptEditor : public ScriptEditorBase {
-	GDCLASS(VisualScriptEditor, ScriptEditorBase)
+	GDCLASS(VisualScriptEditor, ScriptEditorBase);
 
 	enum {
 		TYPE_SEQUENCE = 1000,
diff --git a/modules/visual_script/visual_script_expression.h b/modules/visual_script/visual_script_expression.h
index 3b2e3b9f787..3a045d2cf78 100644
--- a/modules/visual_script/visual_script_expression.h
+++ b/modules/visual_script/visual_script_expression.h
@@ -36,7 +36,7 @@
 
 class VisualScriptExpression : public VisualScriptNode {
 
-	GDCLASS(VisualScriptExpression, VisualScriptNode)
+	GDCLASS(VisualScriptExpression, VisualScriptNode);
 	friend class VisualScriptNodeInstanceExpression;
 
 	struct Input {
diff --git a/modules/visual_script/visual_script_flow_control.h b/modules/visual_script/visual_script_flow_control.h
index a42605a50ee..d3c7aa68e36 100644
--- a/modules/visual_script/visual_script_flow_control.h
+++ b/modules/visual_script/visual_script_flow_control.h
@@ -35,7 +35,7 @@
 
 class VisualScriptReturn : public VisualScriptNode {
 
-	GDCLASS(VisualScriptReturn, VisualScriptNode)
+	GDCLASS(VisualScriptReturn, VisualScriptNode);
 
 	Variant::Type type;
 	bool with_value;
@@ -72,7 +72,7 @@ public:
 
 class VisualScriptCondition : public VisualScriptNode {
 
-	GDCLASS(VisualScriptCondition, VisualScriptNode)
+	GDCLASS(VisualScriptCondition, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
@@ -100,7 +100,7 @@ public:
 
 class VisualScriptWhile : public VisualScriptNode {
 
-	GDCLASS(VisualScriptWhile, VisualScriptNode)
+	GDCLASS(VisualScriptWhile, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
@@ -128,7 +128,7 @@ public:
 
 class VisualScriptIterator : public VisualScriptNode {
 
-	GDCLASS(VisualScriptIterator, VisualScriptNode)
+	GDCLASS(VisualScriptIterator, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
@@ -156,7 +156,7 @@ public:
 
 class VisualScriptSequence : public VisualScriptNode {
 
-	GDCLASS(VisualScriptSequence, VisualScriptNode)
+	GDCLASS(VisualScriptSequence, VisualScriptNode);
 
 	int steps;
 
@@ -189,7 +189,7 @@ public:
 
 class VisualScriptSwitch : public VisualScriptNode {
 
-	GDCLASS(VisualScriptSwitch, VisualScriptNode)
+	GDCLASS(VisualScriptSwitch, VisualScriptNode);
 
 	struct Case {
 		Variant::Type type;
@@ -231,7 +231,7 @@ public:
 
 class VisualScriptTypeCast : public VisualScriptNode {
 
-	GDCLASS(VisualScriptTypeCast, VisualScriptNode)
+	GDCLASS(VisualScriptTypeCast, VisualScriptNode);
 
 	StringName base_type;
 	String script;
diff --git a/modules/visual_script/visual_script_func_nodes.h b/modules/visual_script/visual_script_func_nodes.h
index 7b1e7871b6b..11eb96293b1 100644
--- a/modules/visual_script/visual_script_func_nodes.h
+++ b/modules/visual_script/visual_script_func_nodes.h
@@ -35,7 +35,8 @@
 
 class VisualScriptFunctionCall : public VisualScriptNode {
 
-	GDCLASS(VisualScriptFunctionCall, VisualScriptNode)
+	GDCLASS(VisualScriptFunctionCall, VisualScriptNode);
+
 public:
 	enum CallMode {
 		CALL_MODE_SELF,
@@ -137,7 +138,8 @@ VARIANT_ENUM_CAST(VisualScriptFunctionCall::RPCCallMode);
 
 class VisualScriptPropertySet : public VisualScriptNode {
 
-	GDCLASS(VisualScriptPropertySet, VisualScriptNode)
+	GDCLASS(VisualScriptPropertySet, VisualScriptNode);
+
 public:
 	enum CallMode {
 		CALL_MODE_SELF,
@@ -242,7 +244,8 @@ VARIANT_ENUM_CAST(VisualScriptPropertySet::AssignOp);
 
 class VisualScriptPropertyGet : public VisualScriptNode {
 
-	GDCLASS(VisualScriptPropertyGet, VisualScriptNode)
+	GDCLASS(VisualScriptPropertyGet, VisualScriptNode);
+
 public:
 	enum CallMode {
 		CALL_MODE_SELF,
@@ -323,7 +326,7 @@ VARIANT_ENUM_CAST(VisualScriptPropertyGet::CallMode);
 
 class VisualScriptEmitSignal : public VisualScriptNode {
 
-	GDCLASS(VisualScriptEmitSignal, VisualScriptNode)
+	GDCLASS(VisualScriptEmitSignal, VisualScriptNode);
 
 private:
 	StringName name;
diff --git a/modules/visual_script/visual_script_nodes.h b/modules/visual_script/visual_script_nodes.h
index b3d199fb38e..762a1bdfb6e 100644
--- a/modules/visual_script/visual_script_nodes.h
+++ b/modules/visual_script/visual_script_nodes.h
@@ -35,7 +35,7 @@
 
 class VisualScriptFunction : public VisualScriptNode {
 
-	GDCLASS(VisualScriptFunction, VisualScriptNode)
+	GDCLASS(VisualScriptFunction, VisualScriptNode);
 
 	struct Argument {
 		String name;
@@ -105,7 +105,7 @@ public:
 
 class VisualScriptOperator : public VisualScriptNode {
 
-	GDCLASS(VisualScriptOperator, VisualScriptNode)
+	GDCLASS(VisualScriptOperator, VisualScriptNode);
 
 	Variant::Type typed;
 	Variant::Operator op;
@@ -141,7 +141,7 @@ public:
 
 class VisualScriptSelect : public VisualScriptNode {
 
-	GDCLASS(VisualScriptSelect, VisualScriptNode)
+	GDCLASS(VisualScriptSelect, VisualScriptNode);
 
 	Variant::Type typed;
 
@@ -174,7 +174,7 @@ public:
 
 class VisualScriptVariableGet : public VisualScriptNode {
 
-	GDCLASS(VisualScriptVariableGet, VisualScriptNode)
+	GDCLASS(VisualScriptVariableGet, VisualScriptNode);
 
 	StringName variable;
 
@@ -207,7 +207,7 @@ public:
 
 class VisualScriptVariableSet : public VisualScriptNode {
 
-	GDCLASS(VisualScriptVariableSet, VisualScriptNode)
+	GDCLASS(VisualScriptVariableSet, VisualScriptNode);
 
 	StringName variable;
 
@@ -240,7 +240,7 @@ public:
 
 class VisualScriptConstant : public VisualScriptNode {
 
-	GDCLASS(VisualScriptConstant, VisualScriptNode)
+	GDCLASS(VisualScriptConstant, VisualScriptNode);
 
 	Variant::Type type;
 	Variant value;
@@ -277,7 +277,7 @@ public:
 
 class VisualScriptPreload : public VisualScriptNode {
 
-	GDCLASS(VisualScriptPreload, VisualScriptNode)
+	GDCLASS(VisualScriptPreload, VisualScriptNode);
 
 	Ref<Resource> preload;
 
@@ -309,7 +309,7 @@ public:
 
 class VisualScriptIndexGet : public VisualScriptNode {
 
-	GDCLASS(VisualScriptIndexGet, VisualScriptNode)
+	GDCLASS(VisualScriptIndexGet, VisualScriptNode);
 
 public:
 	virtual int get_output_sequence_port_count() const;
@@ -333,7 +333,7 @@ public:
 
 class VisualScriptIndexSet : public VisualScriptNode {
 
-	GDCLASS(VisualScriptIndexSet, VisualScriptNode)
+	GDCLASS(VisualScriptIndexSet, VisualScriptNode);
 
 public:
 	virtual int get_output_sequence_port_count() const;
@@ -357,7 +357,7 @@ public:
 
 class VisualScriptGlobalConstant : public VisualScriptNode {
 
-	GDCLASS(VisualScriptGlobalConstant, VisualScriptNode)
+	GDCLASS(VisualScriptGlobalConstant, VisualScriptNode);
 
 	int index;
 
@@ -388,7 +388,7 @@ public:
 
 class VisualScriptClassConstant : public VisualScriptNode {
 
-	GDCLASS(VisualScriptClassConstant, VisualScriptNode)
+	GDCLASS(VisualScriptClassConstant, VisualScriptNode);
 
 	StringName base_type;
 	StringName name;
@@ -425,7 +425,7 @@ public:
 
 class VisualScriptBasicTypeConstant : public VisualScriptNode {
 
-	GDCLASS(VisualScriptBasicTypeConstant, VisualScriptNode)
+	GDCLASS(VisualScriptBasicTypeConstant, VisualScriptNode);
 
 	Variant::Type type;
 	StringName name;
@@ -463,7 +463,8 @@ public:
 
 class VisualScriptMathConstant : public VisualScriptNode {
 
-	GDCLASS(VisualScriptMathConstant, VisualScriptNode)
+	GDCLASS(VisualScriptMathConstant, VisualScriptNode);
+
 public:
 	enum MathConstant {
 		MATH_CONSTANT_ONE,
@@ -512,7 +513,7 @@ VARIANT_ENUM_CAST(VisualScriptMathConstant::MathConstant)
 
 class VisualScriptEngineSingleton : public VisualScriptNode {
 
-	GDCLASS(VisualScriptEngineSingleton, VisualScriptNode)
+	GDCLASS(VisualScriptEngineSingleton, VisualScriptNode);
 
 	String singleton;
 
@@ -545,7 +546,7 @@ public:
 
 class VisualScriptSceneNode : public VisualScriptNode {
 
-	GDCLASS(VisualScriptSceneNode, VisualScriptNode)
+	GDCLASS(VisualScriptSceneNode, VisualScriptNode);
 
 	NodePath path;
 
@@ -580,7 +581,7 @@ public:
 
 class VisualScriptSceneTree : public VisualScriptNode {
 
-	GDCLASS(VisualScriptSceneTree, VisualScriptNode)
+	GDCLASS(VisualScriptSceneTree, VisualScriptNode);
 
 protected:
 	virtual void _validate_property(PropertyInfo &property) const;
@@ -610,7 +611,7 @@ public:
 
 class VisualScriptResourcePath : public VisualScriptNode {
 
-	GDCLASS(VisualScriptResourcePath, VisualScriptNode)
+	GDCLASS(VisualScriptResourcePath, VisualScriptNode);
 
 	String path;
 
@@ -642,7 +643,7 @@ public:
 
 class VisualScriptSelf : public VisualScriptNode {
 
-	GDCLASS(VisualScriptSelf, VisualScriptNode)
+	GDCLASS(VisualScriptSelf, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
@@ -671,7 +672,7 @@ public:
 
 class VisualScriptCustomNode : public VisualScriptNode {
 
-	GDCLASS(VisualScriptCustomNode, VisualScriptNode)
+	GDCLASS(VisualScriptCustomNode, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
@@ -719,7 +720,7 @@ VARIANT_ENUM_CAST(VisualScriptCustomNode::StartMode);
 
 class VisualScriptSubCall : public VisualScriptNode {
 
-	GDCLASS(VisualScriptSubCall, VisualScriptNode)
+	GDCLASS(VisualScriptSubCall, VisualScriptNode);
 
 protected:
 	static void _bind_methods();
@@ -747,7 +748,7 @@ public:
 
 class VisualScriptComment : public VisualScriptNode {
 
-	GDCLASS(VisualScriptComment, VisualScriptNode)
+	GDCLASS(VisualScriptComment, VisualScriptNode);
 
 	String title;
 	String description;
@@ -788,7 +789,7 @@ public:
 
 class VisualScriptConstructor : public VisualScriptNode {
 
-	GDCLASS(VisualScriptConstructor, VisualScriptNode)
+	GDCLASS(VisualScriptConstructor, VisualScriptNode);
 
 	Variant::Type type;
 	MethodInfo constructor;
@@ -824,7 +825,7 @@ public:
 
 class VisualScriptLocalVar : public VisualScriptNode {
 
-	GDCLASS(VisualScriptLocalVar, VisualScriptNode)
+	GDCLASS(VisualScriptLocalVar, VisualScriptNode);
 
 	StringName name;
 	Variant::Type type;
@@ -860,7 +861,7 @@ public:
 
 class VisualScriptLocalVarSet : public VisualScriptNode {
 
-	GDCLASS(VisualScriptLocalVarSet, VisualScriptNode)
+	GDCLASS(VisualScriptLocalVarSet, VisualScriptNode);
 
 	StringName name;
 	Variant::Type type;
@@ -897,7 +898,8 @@ public:
 
 class VisualScriptInputAction : public VisualScriptNode {
 
-	GDCLASS(VisualScriptInputAction, VisualScriptNode)
+	GDCLASS(VisualScriptInputAction, VisualScriptNode);
+
 public:
 	enum Mode {
 		MODE_PRESSED,
@@ -944,7 +946,7 @@ VARIANT_ENUM_CAST(VisualScriptInputAction::Mode)
 
 class VisualScriptDeconstruct : public VisualScriptNode {
 
-	GDCLASS(VisualScriptDeconstruct, VisualScriptNode)
+	GDCLASS(VisualScriptDeconstruct, VisualScriptNode);
 
 	struct Element {
 		StringName name;
diff --git a/modules/visual_script/visual_script_property_selector.h b/modules/visual_script/visual_script_property_selector.h
index 1588243bc1d..6235e4ba1db 100644
--- a/modules/visual_script/visual_script_property_selector.h
+++ b/modules/visual_script/visual_script_property_selector.h
@@ -36,7 +36,7 @@
 #include "scene/gui/rich_text_label.h"
 
 class VisualScriptPropertySelector : public ConfirmationDialog {
-	GDCLASS(VisualScriptPropertySelector, ConfirmationDialog)
+	GDCLASS(VisualScriptPropertySelector, ConfirmationDialog);
 
 	LineEdit *search_box;
 	Tree *search_options;
diff --git a/modules/visual_script/visual_script_yield_nodes.h b/modules/visual_script/visual_script_yield_nodes.h
index 851bf6aa74f..647f2b1e2ec 100644
--- a/modules/visual_script/visual_script_yield_nodes.h
+++ b/modules/visual_script/visual_script_yield_nodes.h
@@ -35,7 +35,8 @@
 
 class VisualScriptYield : public VisualScriptNode {
 
-	GDCLASS(VisualScriptYield, VisualScriptNode)
+	GDCLASS(VisualScriptYield, VisualScriptNode);
+
 public:
 	enum YieldMode {
 		YIELD_RETURN,
@@ -84,7 +85,8 @@ VARIANT_ENUM_CAST(VisualScriptYield::YieldMode)
 
 class VisualScriptYieldSignal : public VisualScriptNode {
 
-	GDCLASS(VisualScriptYieldSignal, VisualScriptNode)
+	GDCLASS(VisualScriptYieldSignal, VisualScriptNode);
+
 public:
 	enum CallMode {
 		CALL_MODE_SELF,
diff --git a/modules/webm/video_stream_webm.h b/modules/webm/video_stream_webm.h
index 4e07c867756..ddcbb1eb082 100644
--- a/modules/webm/video_stream_webm.h
+++ b/modules/webm/video_stream_webm.h
@@ -41,7 +41,7 @@ class OpusVorbisDecoder;
 
 class VideoStreamPlaybackWebm : public VideoStreamPlayback {
 
-	GDCLASS(VideoStreamPlaybackWebm, VideoStreamPlayback)
+	GDCLASS(VideoStreamPlaybackWebm, VideoStreamPlayback);
 
 	String file_name;
 	int audio_track;
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 30267aa9687..30bbceb498c 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -208,7 +208,7 @@ static const LauncherIcon launcher_icons[] = {
 
 class EditorExportPlatformAndroid : public EditorExportPlatform {
 
-	GDCLASS(EditorExportPlatformAndroid, EditorExportPlatform)
+	GDCLASS(EditorExportPlatformAndroid, EditorExportPlatform);
 
 	Ref<ImageTexture> logo;
 	Ref<ImageTexture> run_icon;
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index 487da77b100..c68b420c61e 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -40,7 +40,7 @@
 
 class EditorExportPlatformJavaScript : public EditorExportPlatform {
 
-	GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform)
+	GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform);
 
 	Ref<ImageTexture> logo;
 	Ref<ImageTexture> run_icon;
diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h
index e9cdfa2303b..ffa3d4edb4d 100644
--- a/scene/2d/audio_stream_player_2d.h
+++ b/scene/2d/audio_stream_player_2d.h
@@ -37,7 +37,7 @@
 
 class AudioStreamPlayer2D : public Node2D {
 
-	GDCLASS(AudioStreamPlayer2D, Node2D)
+	GDCLASS(AudioStreamPlayer2D, Node2D);
 
 private:
 	enum {
diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h
index a020ab50292..1f585d84ce3 100644
--- a/scene/2d/canvas_item.h
+++ b/scene/2d/canvas_item.h
@@ -46,7 +46,7 @@ class StyleBox;
 
 class CanvasItemMaterial : public Material {
 
-	GDCLASS(CanvasItemMaterial, Material)
+	GDCLASS(CanvasItemMaterial, Material);
 
 public:
 	enum BlendMode {
diff --git a/scene/2d/collision_object_2d.h b/scene/2d/collision_object_2d.h
index 8aa3330f378..4e7d01c8e6c 100644
--- a/scene/2d/collision_object_2d.h
+++ b/scene/2d/collision_object_2d.h
@@ -36,7 +36,7 @@
 
 class CollisionObject2D : public Node2D {
 
-	GDCLASS(CollisionObject2D, Node2D)
+	GDCLASS(CollisionObject2D, Node2D);
 
 	bool area;
 	RID rid;
diff --git a/scene/2d/collision_shape_2d.h b/scene/2d/collision_shape_2d.h
index e913b4a866d..26c61f47bd4 100644
--- a/scene/2d/collision_shape_2d.h
+++ b/scene/2d/collision_shape_2d.h
@@ -38,7 +38,7 @@ class CollisionObject2D;
 
 class CollisionShape2D : public Node2D {
 
-	GDCLASS(CollisionShape2D, Node2D)
+	GDCLASS(CollisionShape2D, Node2D);
 	Ref<Shape2D> shape;
 	Rect2 rect;
 	uint32_t owner_id;
diff --git a/scene/2d/line_2d.h b/scene/2d/line_2d.h
index 8a6f7b2dc55..11be5055d4a 100644
--- a/scene/2d/line_2d.h
+++ b/scene/2d/line_2d.h
@@ -35,7 +35,7 @@
 
 class Line2D : public Node2D {
 
-	GDCLASS(Line2D, Node2D)
+	GDCLASS(Line2D, Node2D);
 
 public:
 	enum LineJointMode {
diff --git a/scene/2d/mesh_instance_2d.h b/scene/2d/mesh_instance_2d.h
index 4d81c8088ad..af552415ca6 100644
--- a/scene/2d/mesh_instance_2d.h
+++ b/scene/2d/mesh_instance_2d.h
@@ -34,7 +34,7 @@
 #include "scene/2d/node_2d.h"
 
 class MeshInstance2D : public Node2D {
-	GDCLASS(MeshInstance2D, Node2D)
+	GDCLASS(MeshInstance2D, Node2D);
 
 	Ref<Mesh> mesh;
 
diff --git a/scene/2d/particles_2d.h b/scene/2d/particles_2d.h
index a0104b4b16b..0276978f831 100644
--- a/scene/2d/particles_2d.h
+++ b/scene/2d/particles_2d.h
@@ -37,7 +37,7 @@
 
 class Particles2D : public Node2D {
 private:
-	GDCLASS(Particles2D, Node2D)
+	GDCLASS(Particles2D, Node2D);
 
 public:
 	enum DrawOrder {
diff --git a/scene/2d/position_2d.h b/scene/2d/position_2d.h
index ec73c02d2b4..f5ec3ef01aa 100644
--- a/scene/2d/position_2d.h
+++ b/scene/2d/position_2d.h
@@ -35,7 +35,7 @@
 
 class Position2D : public Node2D {
 
-	GDCLASS(Position2D, Node2D)
+	GDCLASS(Position2D, Node2D);
 
 	void _draw_cross();
 
diff --git a/scene/2d/skeleton_2d.h b/scene/2d/skeleton_2d.h
index d24c0a15618..0f48b443875 100644
--- a/scene/2d/skeleton_2d.h
+++ b/scene/2d/skeleton_2d.h
@@ -36,7 +36,7 @@
 class Skeleton2D;
 
 class Bone2D : public Node2D {
-	GDCLASS(Bone2D, Node2D)
+	GDCLASS(Bone2D, Node2D);
 
 	friend class Skeleton2D;
 #ifdef TOOLS_ENABLED
diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h
index 98bc74b2e4b..7a652ed65fd 100644
--- a/scene/3d/audio_stream_player_3d.h
+++ b/scene/3d/audio_stream_player_3d.h
@@ -40,7 +40,8 @@
 class Camera;
 class AudioStreamPlayer3D : public Spatial {
 
-	GDCLASS(AudioStreamPlayer3D, Spatial)
+	GDCLASS(AudioStreamPlayer3D, Spatial);
+
 public:
 	enum AttenuationModel {
 		ATTENUATION_INVERSE_DISTANCE,
diff --git a/scene/3d/spatial_velocity_tracker.h b/scene/3d/spatial_velocity_tracker.h
index 795f56091f5..8260cf3f063 100644
--- a/scene/3d/spatial_velocity_tracker.h
+++ b/scene/3d/spatial_velocity_tracker.h
@@ -34,7 +34,7 @@
 #include "scene/3d/spatial.h"
 
 class SpatialVelocityTracker : public Reference {
-	GDCLASS(SpatialVelocityTracker, Reference)
+	GDCLASS(SpatialVelocityTracker, Reference);
 
 	struct PositionHistory {
 		uint64_t frame;
diff --git a/scene/animation/animation_blend_space_1d.h b/scene/animation/animation_blend_space_1d.h
index dfac88b7124..2e2d8484509 100644
--- a/scene/animation/animation_blend_space_1d.h
+++ b/scene/animation/animation_blend_space_1d.h
@@ -34,7 +34,7 @@
 #include "scene/animation/animation_tree.h"
 
 class AnimationNodeBlendSpace1D : public AnimationRootNode {
-	GDCLASS(AnimationNodeBlendSpace1D, AnimationRootNode)
+	GDCLASS(AnimationNodeBlendSpace1D, AnimationRootNode);
 
 	enum {
 		MAX_BLEND_POINTS = 64
diff --git a/scene/animation/animation_blend_space_2d.h b/scene/animation/animation_blend_space_2d.h
index c21360beb91..66ba9b0db79 100644
--- a/scene/animation/animation_blend_space_2d.h
+++ b/scene/animation/animation_blend_space_2d.h
@@ -34,7 +34,8 @@
 #include "scene/animation/animation_tree.h"
 
 class AnimationNodeBlendSpace2D : public AnimationRootNode {
-	GDCLASS(AnimationNodeBlendSpace2D, AnimationRootNode)
+	GDCLASS(AnimationNodeBlendSpace2D, AnimationRootNode);
+
 public:
 	enum BlendMode {
 		BLEND_MODE_INTERPOLATED,
diff --git a/scene/animation/animation_blend_tree.h b/scene/animation/animation_blend_tree.h
index c16dcb1b8c4..a6ef78d82e1 100644
--- a/scene/animation/animation_blend_tree.h
+++ b/scene/animation/animation_blend_tree.h
@@ -322,7 +322,8 @@ public:
 };
 
 class AnimationNodeOutput : public AnimationNode {
-	GDCLASS(AnimationNodeOutput, AnimationNode)
+	GDCLASS(AnimationNodeOutput, AnimationNode);
+
 public:
 	virtual String get_caption() const;
 	virtual float process(float p_time, bool p_seek);
@@ -332,7 +333,7 @@ public:
 /////
 
 class AnimationNodeBlendTree : public AnimationRootNode {
-	GDCLASS(AnimationNodeBlendTree, AnimationRootNode)
+	GDCLASS(AnimationNodeBlendTree, AnimationRootNode);
 
 	struct Node {
 		Ref<AnimationNode> node;
diff --git a/scene/animation/animation_node_state_machine.h b/scene/animation/animation_node_state_machine.h
index e47b940c35c..26909a326e6 100644
--- a/scene/animation/animation_node_state_machine.h
+++ b/scene/animation/animation_node_state_machine.h
@@ -34,7 +34,8 @@
 #include "scene/animation/animation_tree.h"
 
 class AnimationNodeStateMachineTransition : public Resource {
-	GDCLASS(AnimationNodeStateMachineTransition, Resource)
+	GDCLASS(AnimationNodeStateMachineTransition, Resource);
+
 public:
 	enum SwitchMode {
 		SWITCH_MODE_IMMEDIATE,
diff --git a/scene/animation/animation_tree.h b/scene/animation/animation_tree.h
index 4c65b2a92c1..e22d6e4c2da 100644
--- a/scene/animation/animation_tree.h
+++ b/scene/animation/animation_tree.h
@@ -41,7 +41,8 @@ class AnimationPlayer;
 class AnimationTree;
 
 class AnimationNode : public Resource {
-	GDCLASS(AnimationNode, Resource)
+	GDCLASS(AnimationNode, Resource);
+
 public:
 	enum FilterAction {
 		FILTER_IGNORE,
@@ -155,13 +156,15 @@ VARIANT_ENUM_CAST(AnimationNode::FilterAction)
 
 //root node does not allow inputs
 class AnimationRootNode : public AnimationNode {
-	GDCLASS(AnimationRootNode, AnimationNode)
+	GDCLASS(AnimationRootNode, AnimationNode);
+
 public:
 	AnimationRootNode() {}
 };
 
 class AnimationTree : public Node {
-	GDCLASS(AnimationTree, Node)
+	GDCLASS(AnimationTree, Node);
+
 public:
 	enum AnimationProcessMode {
 		ANIMATION_PROCESS_PHYSICS,
diff --git a/scene/animation/root_motion_view.h b/scene/animation/root_motion_view.h
index bca265b1f01..07f51165a7b 100644
--- a/scene/animation/root_motion_view.h
+++ b/scene/animation/root_motion_view.h
@@ -34,7 +34,8 @@
 #include "scene/3d/visual_instance.h"
 
 class RootMotionView : public VisualInstance {
-	GDCLASS(RootMotionView, VisualInstance)
+	GDCLASS(RootMotionView, VisualInstance);
+
 public:
 	RID immediate;
 	NodePath path;
diff --git a/scene/audio/audio_stream_player.h b/scene/audio/audio_stream_player.h
index 7987bd7e7d9..ab9161c7989 100644
--- a/scene/audio/audio_stream_player.h
+++ b/scene/audio/audio_stream_player.h
@@ -36,7 +36,7 @@
 
 class AudioStreamPlayer : public Node {
 
-	GDCLASS(AudioStreamPlayer, Node)
+	GDCLASS(AudioStreamPlayer, Node);
 
 public:
 	enum MixTarget {
diff --git a/scene/gui/base_button.h b/scene/gui/base_button.h
index abb3f58d6bb..ef278d74066 100644
--- a/scene/gui/base_button.h
+++ b/scene/gui/base_button.h
@@ -138,7 +138,7 @@ VARIANT_ENUM_CAST(BaseButton::ActionMode)
 
 class ButtonGroup : public Resource {
 
-	GDCLASS(ButtonGroup, Resource)
+	GDCLASS(ButtonGroup, Resource);
 	friend class BaseButton;
 	Set<BaseButton *> buttons;
 
diff --git a/scene/gui/color_rect.h b/scene/gui/color_rect.h
index d7f9ef275d9..7a7bbe10297 100644
--- a/scene/gui/color_rect.h
+++ b/scene/gui/color_rect.h
@@ -34,7 +34,7 @@
 #include "scene/gui/control.h"
 
 class ColorRect : public Control {
-	GDCLASS(ColorRect, Control)
+	GDCLASS(ColorRect, Control);
 
 	Color color;
 
diff --git a/scene/gui/split_container.h b/scene/gui/split_container.h
index 3c1ca09a9fd..97838e19a3c 100644
--- a/scene/gui/split_container.h
+++ b/scene/gui/split_container.h
@@ -35,7 +35,7 @@
 
 class SplitContainer : public Container {
 
-	GDCLASS(SplitContainer, Container)
+	GDCLASS(SplitContainer, Container);
 
 public:
 	enum DraggerVisibility {
diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h
index 0c26602d2b8..3e852deda65 100644
--- a/scene/gui/text_edit.h
+++ b/scene/gui/text_edit.h
@@ -40,7 +40,7 @@ class SyntaxHighlighter;
 
 class TextEdit : public Control {
 
-	GDCLASS(TextEdit, Control)
+	GDCLASS(TextEdit, Control);
 
 public:
 	struct HighlighterInfo {
diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp
index c02873cdeba..f8a0db18b19 100644
--- a/scene/main/viewport.cpp
+++ b/scene/main/viewport.cpp
@@ -172,14 +172,16 @@ ViewportTexture::~ViewportTexture() {
 
 class TooltipPanel : public PanelContainer {
 
-	GDCLASS(TooltipPanel, PanelContainer)
+	GDCLASS(TooltipPanel, PanelContainer);
+
 public:
 	TooltipPanel(){};
 };
 
 class TooltipLabel : public Label {
 
-	GDCLASS(TooltipLabel, Label)
+	GDCLASS(TooltipLabel, Label);
+
 public:
 	TooltipLabel(){};
 };
diff --git a/scene/resources/audio_stream_sample.h b/scene/resources/audio_stream_sample.h
index d4c5511f348..bb25b608357 100644
--- a/scene/resources/audio_stream_sample.h
+++ b/scene/resources/audio_stream_sample.h
@@ -37,7 +37,7 @@ class AudioStreamSample;
 
 class AudioStreamPlaybackSample : public AudioStreamPlayback {
 
-	GDCLASS(AudioStreamPlaybackSample, AudioStreamPlayback)
+	GDCLASS(AudioStreamPlaybackSample, AudioStreamPlayback);
 	enum {
 		MIX_FRAC_BITS = 13,
 		MIX_FRAC_LEN = (1 << MIX_FRAC_BITS),
@@ -81,7 +81,7 @@ public:
 };
 
 class AudioStreamSample : public AudioStream {
-	GDCLASS(AudioStreamSample, AudioStream)
+	GDCLASS(AudioStreamSample, AudioStream);
 	RES_BASE_EXTENSION("sample")
 
 public:
diff --git a/scene/resources/curve.h b/scene/resources/curve.h
index 911a440567c..bb12baca488 100644
--- a/scene/resources/curve.h
+++ b/scene/resources/curve.h
@@ -35,7 +35,8 @@
 
 // y(x) curve
 class Curve : public Resource {
-	GDCLASS(Curve, Resource)
+	GDCLASS(Curve, Resource);
+
 public:
 	static const int MIN_X = 0.f;
 	static const int MAX_X = 1.f;
diff --git a/scene/resources/dynamic_font.h b/scene/resources/dynamic_font.h
index 8d60ea17982..d0a709a2d35 100644
--- a/scene/resources/dynamic_font.h
+++ b/scene/resources/dynamic_font.h
@@ -110,7 +110,7 @@ VARIANT_ENUM_CAST(DynamicFontData::Hinting);
 
 class DynamicFontAtSize : public Reference {
 
-	GDCLASS(DynamicFontAtSize, Reference)
+	GDCLASS(DynamicFontAtSize, Reference);
 
 	_THREAD_SAFE_CLASS_
 
diff --git a/scene/resources/material.h b/scene/resources/material.h
index 29b45f769b3..17e52527b3c 100644
--- a/scene/resources/material.h
+++ b/scene/resources/material.h
@@ -43,7 +43,7 @@
 
 class Material : public Resource {
 
-	GDCLASS(Material, Resource)
+	GDCLASS(Material, Resource);
 	RES_BASE_EXTENSION("material")
 	OBJ_SAVE_TYPE(Material)
 
@@ -111,7 +111,7 @@ public:
 
 class SpatialMaterial : public Material {
 
-	GDCLASS(SpatialMaterial, Material)
+	GDCLASS(SpatialMaterial, Material);
 
 public:
 	enum TextureParam {
diff --git a/scene/resources/particles_material.h b/scene/resources/particles_material.h
index 8b3248a9cb2..42bf60ff480 100644
--- a/scene/resources/particles_material.h
+++ b/scene/resources/particles_material.h
@@ -36,7 +36,7 @@
 
 class ParticlesMaterial : public Material {
 
-	GDCLASS(ParticlesMaterial, Material)
+	GDCLASS(ParticlesMaterial, Material);
 
 public:
 	enum Parameter {
diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h
index 0045a487368..312899c0282 100644
--- a/scene/resources/primitive_meshes.h
+++ b/scene/resources/primitive_meshes.h
@@ -269,7 +269,7 @@ public:
 
 class QuadMesh : public PrimitiveMesh {
 
-	GDCLASS(QuadMesh, PrimitiveMesh)
+	GDCLASS(QuadMesh, PrimitiveMesh);
 
 private:
 	Size2 size;
diff --git a/scene/resources/text_file.h b/scene/resources/text_file.h
index 91bb98a3b10..7127eaeb934 100644
--- a/scene/resources/text_file.h
+++ b/scene/resources/text_file.h
@@ -36,7 +36,7 @@
 
 class TextFile : public Resource {
 
-	GDCLASS(TextFile, Resource)
+	GDCLASS(TextFile, Resource);
 
 private:
 	String text;
diff --git a/scene/resources/texture.h b/scene/resources/texture.h
index 59d243484de..eb7a9ff25ca 100644
--- a/scene/resources/texture.h
+++ b/scene/resources/texture.h
@@ -469,7 +469,7 @@ VARIANT_ENUM_CAST(CubeMap::Storage)
 
 class TextureLayered : public Resource {
 
-	GDCLASS(TextureLayered, Resource)
+	GDCLASS(TextureLayered, Resource);
 
 public:
 	enum Flags {
@@ -521,7 +521,8 @@ VARIANT_ENUM_CAST(TextureLayered::Flags)
 
 class Texture3D : public TextureLayered {
 
-	GDCLASS(Texture3D, TextureLayered)
+	GDCLASS(Texture3D, TextureLayered);
+
 public:
 	Texture3D() :
 			TextureLayered(true) {}
@@ -529,7 +530,8 @@ public:
 
 class TextureArray : public TextureLayered {
 
-	GDCLASS(TextureArray, TextureLayered)
+	GDCLASS(TextureArray, TextureLayered);
+
 public:
 	TextureArray() :
 			TextureLayered(false) {}
@@ -551,7 +553,7 @@ public:
 
 class CurveTexture : public Texture {
 
-	GDCLASS(CurveTexture, Texture)
+	GDCLASS(CurveTexture, Texture);
 	RES_BASE_EXTENSION("curvetex")
 
 private:
@@ -599,7 +601,7 @@ public:
 //VARIANT_ENUM_CAST( Texture::CubeMapSide );
 
 class GradientTexture : public Texture {
-	GDCLASS(GradientTexture, Texture)
+	GDCLASS(GradientTexture, Texture);
 
 public:
 	struct Point {
@@ -644,7 +646,7 @@ public:
 };
 
 class ProxyTexture : public Texture {
-	GDCLASS(ProxyTexture, Texture)
+	GDCLASS(ProxyTexture, Texture);
 
 private:
 	RID proxy;
@@ -671,7 +673,7 @@ public:
 };
 
 class AnimatedTexture : public Texture {
-	GDCLASS(AnimatedTexture, Texture)
+	GDCLASS(AnimatedTexture, Texture);
 
 	//use readers writers lock for this, since its far more times read than written to
 	RWLock *rw_lock;
@@ -740,7 +742,7 @@ public:
 };
 
 class CameraTexture : public Texture {
-	GDCLASS(CameraTexture, Texture)
+	GDCLASS(CameraTexture, Texture);
 
 private:
 	int camera_feed_id;
diff --git a/scene/resources/visual_shader.h b/scene/resources/visual_shader.h
index 838c2c618db..1ab3c0c9cc8 100644
--- a/scene/resources/visual_shader.h
+++ b/scene/resources/visual_shader.h
@@ -39,7 +39,8 @@ class VisualShaderNodeUniform;
 class VisualShaderNode;
 
 class VisualShader : public Shader {
-	GDCLASS(VisualShader, Shader)
+	GDCLASS(VisualShader, Shader);
+
 public:
 	enum Type {
 		TYPE_VERTEX,
@@ -163,7 +164,7 @@ VARIANT_ENUM_CAST(VisualShader::Type)
 ///
 
 class VisualShaderNode : public Resource {
-	GDCLASS(VisualShaderNode, Resource)
+	GDCLASS(VisualShaderNode, Resource);
 
 	int port_preview;
 
@@ -215,7 +216,7 @@ public:
 /////
 
 class VisualShaderNodeInput : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeInput, VisualShaderNode)
+	GDCLASS(VisualShaderNodeInput, VisualShaderNode);
 
 	friend class VisualShader;
 	VisualShader::Type shader_type;
@@ -268,7 +269,8 @@ public:
 ///
 
 class VisualShaderNodeOutput : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeOutput, VisualShaderNode)
+	GDCLASS(VisualShaderNodeOutput, VisualShaderNode);
+
 public:
 	friend class VisualShader;
 	VisualShader::Type shader_type;
@@ -304,7 +306,7 @@ public:
 };
 
 class VisualShaderNodeUniform : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeUniform, VisualShaderNode)
+	GDCLASS(VisualShaderNodeUniform, VisualShaderNode);
 
 	String uniform_name;
 
@@ -319,7 +321,8 @@ public:
 };
 
 class VisualShaderNodeGroupBase : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeGroupBase, VisualShaderNode)
+	GDCLASS(VisualShaderNodeGroupBase, VisualShaderNode);
+
 private:
 	void _apply_port_changes();
 
@@ -386,7 +389,7 @@ public:
 };
 
 class VisualShaderNodeExpression : public VisualShaderNodeGroupBase {
-	GDCLASS(VisualShaderNodeExpression, VisualShaderNodeGroupBase)
+	GDCLASS(VisualShaderNodeExpression, VisualShaderNodeGroupBase);
 
 private:
 	String expression;
diff --git a/scene/resources/visual_shader_nodes.h b/scene/resources/visual_shader_nodes.h
index 852248b9b4a..df753276e43 100644
--- a/scene/resources/visual_shader_nodes.h
+++ b/scene/resources/visual_shader_nodes.h
@@ -38,7 +38,7 @@
 ///////////////////////////////////////
 
 class VisualShaderNodeScalarConstant : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeScalarConstant, VisualShaderNode)
+	GDCLASS(VisualShaderNodeScalarConstant, VisualShaderNode);
 	float constant;
 
 protected:
@@ -68,7 +68,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeBooleanConstant : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeBooleanConstant, VisualShaderNode)
+	GDCLASS(VisualShaderNodeBooleanConstant, VisualShaderNode);
 	bool constant;
 
 protected:
@@ -98,7 +98,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeColorConstant : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeColorConstant, VisualShaderNode)
+	GDCLASS(VisualShaderNodeColorConstant, VisualShaderNode);
 	Color constant;
 
 protected:
@@ -128,7 +128,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVec3Constant : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVec3Constant, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVec3Constant, VisualShaderNode);
 	Vector3 constant;
 
 protected:
@@ -158,7 +158,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeTransformConstant : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeTransformConstant, VisualShaderNode)
+	GDCLASS(VisualShaderNodeTransformConstant, VisualShaderNode);
 	Transform constant;
 
 protected:
@@ -190,7 +190,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeTexture : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeTexture, VisualShaderNode)
+	GDCLASS(VisualShaderNodeTexture, VisualShaderNode);
 	Ref<Texture> texture;
 
 public:
@@ -251,7 +251,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeTexture::Source)
 ///////////////////////////////////////
 
 class VisualShaderNodeCubeMap : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeCubeMap, VisualShaderNode)
+	GDCLASS(VisualShaderNodeCubeMap, VisualShaderNode);
 	Ref<CubeMap> cube_map;
 
 public:
@@ -300,7 +300,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeCubeMap::TextureType)
 ///////////////////////////////////////
 
 class VisualShaderNodeScalarOp : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeScalarOp, VisualShaderNode)
+	GDCLASS(VisualShaderNodeScalarOp, VisualShaderNode);
 
 public:
 	enum Operator {
@@ -345,7 +345,7 @@ public:
 VARIANT_ENUM_CAST(VisualShaderNodeScalarOp::Operator)
 
 class VisualShaderNodeVectorOp : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorOp, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorOp, VisualShaderNode);
 
 public:
 	enum Operator {
@@ -394,7 +394,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeVectorOp::Operator)
 ///////////////////////////////////////
 
 class VisualShaderNodeColorOp : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeColorOp, VisualShaderNode)
+	GDCLASS(VisualShaderNodeColorOp, VisualShaderNode);
 
 public:
 	enum Operator {
@@ -442,7 +442,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeColorOp::Operator)
 ///////////////////////////////////////
 
 class VisualShaderNodeTransformMult : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeTransformMult, VisualShaderNode)
+	GDCLASS(VisualShaderNodeTransformMult, VisualShaderNode);
 
 public:
 	enum Operator {
@@ -485,7 +485,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeTransformMult::Operator)
 ///////////////////////////////////////
 
 class VisualShaderNodeTransformVecMult : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeTransformVecMult, VisualShaderNode)
+	GDCLASS(VisualShaderNodeTransformVecMult, VisualShaderNode);
 
 public:
 	enum Operator {
@@ -528,7 +528,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeTransformVecMult::Operator)
 ///////////////////////////////////////
 
 class VisualShaderNodeScalarFunc : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeScalarFunc, VisualShaderNode)
+	GDCLASS(VisualShaderNodeScalarFunc, VisualShaderNode);
 
 public:
 	enum Function {
@@ -599,7 +599,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeScalarFunc::Function)
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorFunc : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorFunc, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorFunc, VisualShaderNode);
 
 public:
 	enum Function {
@@ -673,7 +673,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeVectorFunc::Function)
 ///////////////////////////////////////
 
 class VisualShaderNodeColorFunc : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeColorFunc, VisualShaderNode)
+	GDCLASS(VisualShaderNodeColorFunc, VisualShaderNode);
 
 public:
 	enum Function {
@@ -714,7 +714,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeColorFunc::Function)
 ///////////////////////////////////////
 
 class VisualShaderNodeTransformFunc : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeTransformFunc, VisualShaderNode)
+	GDCLASS(VisualShaderNodeTransformFunc, VisualShaderNode);
 
 public:
 	enum Function {
@@ -755,7 +755,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeTransformFunc::Function)
 ///////////////////////////////////////
 
 class VisualShaderNodeDotProduct : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeDotProduct, VisualShaderNode)
+	GDCLASS(VisualShaderNodeDotProduct, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -778,7 +778,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorLen : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorLen, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorLen, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -801,7 +801,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeDeterminant : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeDeterminant, VisualShaderNode)
+	GDCLASS(VisualShaderNodeDeterminant, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -824,7 +824,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeScalarClamp : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeScalarClamp, VisualShaderNode)
+	GDCLASS(VisualShaderNodeScalarClamp, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -845,7 +845,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorClamp : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorClamp, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorClamp, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -868,7 +868,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeScalarDerivativeFunc : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeScalarDerivativeFunc, VisualShaderNode)
+	GDCLASS(VisualShaderNodeScalarDerivativeFunc, VisualShaderNode);
 
 public:
 	enum Function {
@@ -908,7 +908,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeScalarDerivativeFunc::Function)
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorDerivativeFunc : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorDerivativeFunc, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorDerivativeFunc, VisualShaderNode);
 
 public:
 	enum Function {
@@ -950,7 +950,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeVectorDerivativeFunc::Function)
 ///////////////////////////////////////
 
 class VisualShaderNodeFaceForward : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeFaceForward, VisualShaderNode)
+	GDCLASS(VisualShaderNodeFaceForward, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -973,7 +973,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeOuterProduct : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeOuterProduct, VisualShaderNode)
+	GDCLASS(VisualShaderNodeOuterProduct, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -996,7 +996,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorScalarStep : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorScalarStep, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorScalarStep, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1019,7 +1019,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeScalarSmoothStep : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeScalarSmoothStep, VisualShaderNode)
+	GDCLASS(VisualShaderNodeScalarSmoothStep, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1040,7 +1040,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorSmoothStep : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorSmoothStep, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorSmoothStep, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1061,7 +1061,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorScalarSmoothStep : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorScalarSmoothStep, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorScalarSmoothStep, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1084,7 +1084,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorDistance : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorDistance, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorDistance, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1107,7 +1107,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorRefract : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorRefract, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorRefract, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1130,7 +1130,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeScalarInterp : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeScalarInterp, VisualShaderNode)
+	GDCLASS(VisualShaderNodeScalarInterp, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1151,7 +1151,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorInterp : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorInterp, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorInterp, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1174,7 +1174,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorCompose : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorCompose, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorCompose, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1195,7 +1195,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeTransformCompose : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeTransformCompose, VisualShaderNode)
+	GDCLASS(VisualShaderNodeTransformCompose, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1218,7 +1218,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVectorDecompose : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeVectorDecompose, VisualShaderNode)
+	GDCLASS(VisualShaderNodeVectorDecompose, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1239,7 +1239,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeTransformDecompose : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeTransformDecompose, VisualShaderNode)
+	GDCLASS(VisualShaderNodeTransformDecompose, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1262,7 +1262,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeScalarUniform : public VisualShaderNodeUniform {
-	GDCLASS(VisualShaderNodeScalarUniform, VisualShaderNodeUniform)
+	GDCLASS(VisualShaderNodeScalarUniform, VisualShaderNodeUniform);
 
 public:
 	virtual String get_caption() const;
@@ -1284,7 +1284,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeBooleanUniform : public VisualShaderNodeUniform {
-	GDCLASS(VisualShaderNodeBooleanUniform, VisualShaderNodeUniform)
+	GDCLASS(VisualShaderNodeBooleanUniform, VisualShaderNodeUniform);
 
 public:
 	virtual String get_caption() const;
@@ -1306,7 +1306,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeColorUniform : public VisualShaderNodeUniform {
-	GDCLASS(VisualShaderNodeColorUniform, VisualShaderNodeUniform)
+	GDCLASS(VisualShaderNodeColorUniform, VisualShaderNodeUniform);
 
 public:
 	virtual String get_caption() const;
@@ -1328,7 +1328,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeVec3Uniform : public VisualShaderNodeUniform {
-	GDCLASS(VisualShaderNodeVec3Uniform, VisualShaderNodeUniform)
+	GDCLASS(VisualShaderNodeVec3Uniform, VisualShaderNodeUniform);
 
 public:
 	virtual String get_caption() const;
@@ -1350,7 +1350,7 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeTransformUniform : public VisualShaderNodeUniform {
-	GDCLASS(VisualShaderNodeTransformUniform, VisualShaderNodeUniform)
+	GDCLASS(VisualShaderNodeTransformUniform, VisualShaderNodeUniform);
 
 public:
 	virtual String get_caption() const;
@@ -1372,7 +1372,8 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeTextureUniform : public VisualShaderNodeUniform {
-	GDCLASS(VisualShaderNodeTextureUniform, VisualShaderNodeUniform)
+	GDCLASS(VisualShaderNodeTextureUniform, VisualShaderNodeUniform);
+
 public:
 	enum TextureType {
 		TYPE_DATA,
@@ -1424,7 +1425,7 @@ VARIANT_ENUM_CAST(VisualShaderNodeTextureUniform::ColorDefault)
 ///////////////////////////////////////
 
 class VisualShaderNodeCubeMapUniform : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeCubeMapUniform, VisualShaderNode)
+	GDCLASS(VisualShaderNodeCubeMapUniform, VisualShaderNode);
 
 public:
 	virtual String get_caption() const;
@@ -1447,7 +1448,8 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeIf : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeIf, VisualShaderNode)
+	GDCLASS(VisualShaderNodeIf, VisualShaderNode);
+
 public:
 	virtual String get_caption() const;
 
@@ -1469,7 +1471,8 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeSwitch : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeSwitch, VisualShaderNode)
+	GDCLASS(VisualShaderNodeSwitch, VisualShaderNode);
+
 public:
 	virtual String get_caption() const;
 
@@ -1491,7 +1494,8 @@ public:
 ///////////////////////////////////////
 
 class VisualShaderNodeFresnel : public VisualShaderNode {
-	GDCLASS(VisualShaderNodeFresnel, VisualShaderNode)
+	GDCLASS(VisualShaderNodeFresnel, VisualShaderNode);
+
 public:
 	virtual String get_caption() const;
 
diff --git a/servers/audio/audio_effect.h b/servers/audio/audio_effect.h
index 1274e067403..8ae716db202 100644
--- a/servers/audio/audio_effect.h
+++ b/servers/audio/audio_effect.h
@@ -35,7 +35,7 @@
 #include "core/resource.h"
 
 class AudioEffectInstance : public Reference {
-	GDCLASS(AudioEffectInstance, Reference)
+	GDCLASS(AudioEffectInstance, Reference);
 
 public:
 	virtual void process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) = 0;
@@ -43,7 +43,8 @@ public:
 };
 
 class AudioEffect : public Resource {
-	GDCLASS(AudioEffect, Resource)
+	GDCLASS(AudioEffect, Resource);
+
 public:
 	virtual Ref<AudioEffectInstance> instance() = 0;
 	AudioEffect();
diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h
index ab4ef5f91b3..8f023c0401c 100644
--- a/servers/audio/audio_stream.h
+++ b/servers/audio/audio_stream.h
@@ -38,7 +38,7 @@
 
 class AudioStreamPlayback : public Reference {
 
-	GDCLASS(AudioStreamPlayback, Reference)
+	GDCLASS(AudioStreamPlayback, Reference);
 
 public:
 	virtual void start(float p_from_pos = 0.0) = 0;
@@ -55,7 +55,7 @@ public:
 
 class AudioStreamPlaybackResampled : public AudioStreamPlayback {
 
-	GDCLASS(AudioStreamPlaybackResampled, AudioStreamPlayback)
+	GDCLASS(AudioStreamPlaybackResampled, AudioStreamPlayback);
 
 	enum {
 		FP_BITS = 16, //fixed point used for resampling
@@ -81,7 +81,7 @@ public:
 
 class AudioStream : public Resource {
 
-	GDCLASS(AudioStream, Resource)
+	GDCLASS(AudioStream, Resource);
 	OBJ_SAVE_TYPE(AudioStream) //children are all saved as AudioStream, so they can be exchanged
 
 protected:
@@ -100,7 +100,7 @@ class AudioStreamPlaybackMicrophone;
 
 class AudioStreamMicrophone : public AudioStream {
 
-	GDCLASS(AudioStreamMicrophone, AudioStream)
+	GDCLASS(AudioStreamMicrophone, AudioStream);
 	friend class AudioStreamPlaybackMicrophone;
 
 	Set<AudioStreamPlaybackMicrophone *> playbacks;
@@ -119,7 +119,7 @@ public:
 
 class AudioStreamPlaybackMicrophone : public AudioStreamPlaybackResampled {
 
-	GDCLASS(AudioStreamPlaybackMicrophone, AudioStreamPlayback)
+	GDCLASS(AudioStreamPlaybackMicrophone, AudioStreamPlayback);
 	friend class AudioStreamMicrophone;
 
 	bool active;
@@ -153,7 +153,7 @@ class AudioStreamPlaybackRandomPitch;
 
 class AudioStreamRandomPitch : public AudioStream {
 
-	GDCLASS(AudioStreamRandomPitch, AudioStream)
+	GDCLASS(AudioStreamRandomPitch, AudioStream);
 	friend class AudioStreamPlaybackRandomPitch;
 
 	Set<AudioStreamPlaybackRandomPitch *> playbacks;
@@ -180,7 +180,7 @@ public:
 
 class AudioStreamPlaybackRandomPitch : public AudioStreamPlayback {
 
-	GDCLASS(AudioStreamPlaybackRandomPitch, AudioStreamPlayback)
+	GDCLASS(AudioStreamPlaybackRandomPitch, AudioStreamPlayback);
 	friend class AudioStreamRandomPitch;
 
 	Ref<AudioStreamRandomPitch> random_pitch;
diff --git a/servers/audio/effects/audio_effect_amplify.h b/servers/audio/effects/audio_effect_amplify.h
index b6e2a1d4d89..4a98196d947 100644
--- a/servers/audio/effects/audio_effect_amplify.h
+++ b/servers/audio/effects/audio_effect_amplify.h
@@ -36,7 +36,7 @@
 class AudioEffectAmplify;
 
 class AudioEffectAmplifyInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectAmplifyInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectAmplifyInstance, AudioEffectInstance);
 	friend class AudioEffectAmplify;
 	Ref<AudioEffectAmplify> base;
 
@@ -47,7 +47,7 @@ public:
 };
 
 class AudioEffectAmplify : public AudioEffect {
-	GDCLASS(AudioEffectAmplify, AudioEffect)
+	GDCLASS(AudioEffectAmplify, AudioEffect);
 
 	friend class AudioEffectAmplifyInstance;
 	float volume_db;
diff --git a/servers/audio/effects/audio_effect_chorus.h b/servers/audio/effects/audio_effect_chorus.h
index 9cad2906ff2..417cc0c035e 100644
--- a/servers/audio/effects/audio_effect_chorus.h
+++ b/servers/audio/effects/audio_effect_chorus.h
@@ -36,7 +36,7 @@
 class AudioEffectChorus;
 
 class AudioEffectChorusInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectChorusInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectChorusInstance, AudioEffectInstance);
 	friend class AudioEffectChorus;
 	Ref<AudioEffectChorus> base;
 
@@ -54,7 +54,7 @@ public:
 };
 
 class AudioEffectChorus : public AudioEffect {
-	GDCLASS(AudioEffectChorus, AudioEffect)
+	GDCLASS(AudioEffectChorus, AudioEffect);
 
 	friend class AudioEffectChorusInstance;
 
diff --git a/servers/audio/effects/audio_effect_compressor.h b/servers/audio/effects/audio_effect_compressor.h
index 3ea3a58cb22..0fe956f60ba 100644
--- a/servers/audio/effects/audio_effect_compressor.h
+++ b/servers/audio/effects/audio_effect_compressor.h
@@ -36,7 +36,7 @@
 class AudioEffectCompressor;
 
 class AudioEffectCompressorInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectCompressorInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectCompressorInstance, AudioEffectInstance);
 	friend class AudioEffectCompressor;
 	Ref<AudioEffectCompressor> base;
 
@@ -49,7 +49,7 @@ public:
 };
 
 class AudioEffectCompressor : public AudioEffect {
-	GDCLASS(AudioEffectCompressor, AudioEffect)
+	GDCLASS(AudioEffectCompressor, AudioEffect);
 
 	friend class AudioEffectCompressorInstance;
 	float threshold;
diff --git a/servers/audio/effects/audio_effect_delay.h b/servers/audio/effects/audio_effect_delay.h
index 131b8714a0c..ee778c70dcd 100644
--- a/servers/audio/effects/audio_effect_delay.h
+++ b/servers/audio/effects/audio_effect_delay.h
@@ -36,7 +36,7 @@
 class AudioEffectDelay;
 
 class AudioEffectDelayInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectDelayInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectDelayInstance, AudioEffectInstance);
 	friend class AudioEffectDelay;
 	Ref<AudioEffectDelay> base;
 
@@ -58,7 +58,7 @@ public:
 };
 
 class AudioEffectDelay : public AudioEffect {
-	GDCLASS(AudioEffectDelay, AudioEffect)
+	GDCLASS(AudioEffectDelay, AudioEffect);
 
 	friend class AudioEffectDelayInstance;
 	enum {
diff --git a/servers/audio/effects/audio_effect_distortion.h b/servers/audio/effects/audio_effect_distortion.h
index 2cbffc81a18..0b5ad0ec9ec 100644
--- a/servers/audio/effects/audio_effect_distortion.h
+++ b/servers/audio/effects/audio_effect_distortion.h
@@ -36,7 +36,7 @@
 class AudioEffectDistortion;
 
 class AudioEffectDistortionInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectDistortionInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectDistortionInstance, AudioEffectInstance);
 	friend class AudioEffectDistortion;
 	Ref<AudioEffectDistortion> base;
 	float h[2];
@@ -46,7 +46,8 @@ public:
 };
 
 class AudioEffectDistortion : public AudioEffect {
-	GDCLASS(AudioEffectDistortion, AudioEffect)
+	GDCLASS(AudioEffectDistortion, AudioEffect);
+
 public:
 	enum Mode {
 		MODE_CLIP,
diff --git a/servers/audio/effects/audio_effect_eq.h b/servers/audio/effects/audio_effect_eq.h
index c9735b90739..dc75e566e7b 100644
--- a/servers/audio/effects/audio_effect_eq.h
+++ b/servers/audio/effects/audio_effect_eq.h
@@ -37,7 +37,7 @@
 class AudioEffectEQ;
 
 class AudioEffectEQInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectEQInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectEQInstance, AudioEffectInstance);
 	friend class AudioEffectEQ;
 	Ref<AudioEffectEQ> base;
 
@@ -49,7 +49,7 @@ public:
 };
 
 class AudioEffectEQ : public AudioEffect {
-	GDCLASS(AudioEffectEQ, AudioEffect)
+	GDCLASS(AudioEffectEQ, AudioEffect);
 
 	friend class AudioEffectEQInstance;
 
@@ -75,21 +75,24 @@ public:
 };
 
 class AudioEffectEQ6 : public AudioEffectEQ {
-	GDCLASS(AudioEffectEQ6, AudioEffectEQ)
+	GDCLASS(AudioEffectEQ6, AudioEffectEQ);
+
 public:
 	AudioEffectEQ6() :
 			AudioEffectEQ(EQ::PRESET_6_BANDS) {}
 };
 
 class AudioEffectEQ10 : public AudioEffectEQ {
-	GDCLASS(AudioEffectEQ10, AudioEffectEQ)
+	GDCLASS(AudioEffectEQ10, AudioEffectEQ);
+
 public:
 	AudioEffectEQ10() :
 			AudioEffectEQ(EQ::PRESET_10_BANDS) {}
 };
 
 class AudioEffectEQ21 : public AudioEffectEQ {
-	GDCLASS(AudioEffectEQ21, AudioEffectEQ)
+	GDCLASS(AudioEffectEQ21, AudioEffectEQ);
+
 public:
 	AudioEffectEQ21() :
 			AudioEffectEQ(EQ::PRESET_21_BANDS) {}
diff --git a/servers/audio/effects/audio_effect_filter.h b/servers/audio/effects/audio_effect_filter.h
index fd9a4bcf07c..bb0d451522d 100644
--- a/servers/audio/effects/audio_effect_filter.h
+++ b/servers/audio/effects/audio_effect_filter.h
@@ -37,7 +37,7 @@
 class AudioEffectFilter;
 
 class AudioEffectFilterInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectFilterInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectFilterInstance, AudioEffectInstance);
 	friend class AudioEffectFilter;
 
 	Ref<AudioEffectFilter> base;
@@ -55,7 +55,8 @@ public:
 };
 
 class AudioEffectFilter : public AudioEffect {
-	GDCLASS(AudioEffectFilter, AudioEffect)
+	GDCLASS(AudioEffectFilter, AudioEffect);
+
 public:
 	enum FilterDB {
 		FILTER_6DB,
@@ -95,7 +96,7 @@ public:
 VARIANT_ENUM_CAST(AudioEffectFilter::FilterDB)
 
 class AudioEffectLowPassFilter : public AudioEffectFilter {
-	GDCLASS(AudioEffectLowPassFilter, AudioEffectFilter)
+	GDCLASS(AudioEffectLowPassFilter, AudioEffectFilter);
 
 	void _validate_property(PropertyInfo &property) const {
 		if (property.name == "gain") property.usage = 0;
@@ -107,7 +108,7 @@ public:
 };
 
 class AudioEffectHighPassFilter : public AudioEffectFilter {
-	GDCLASS(AudioEffectHighPassFilter, AudioEffectFilter)
+	GDCLASS(AudioEffectHighPassFilter, AudioEffectFilter);
 	void _validate_property(PropertyInfo &property) const {
 		if (property.name == "gain") property.usage = 0;
 	}
@@ -118,7 +119,7 @@ public:
 };
 
 class AudioEffectBandPassFilter : public AudioEffectFilter {
-	GDCLASS(AudioEffectBandPassFilter, AudioEffectFilter)
+	GDCLASS(AudioEffectBandPassFilter, AudioEffectFilter);
 	void _validate_property(PropertyInfo &property) const {
 		if (property.name == "gain") property.usage = 0;
 	}
@@ -129,28 +130,32 @@ public:
 };
 
 class AudioEffectNotchFilter : public AudioEffectFilter {
-	GDCLASS(AudioEffectNotchFilter, AudioEffectFilter)
+	GDCLASS(AudioEffectNotchFilter, AudioEffectFilter);
+
 public:
 	AudioEffectNotchFilter() :
 			AudioEffectFilter(AudioFilterSW::NOTCH) {}
 };
 
 class AudioEffectBandLimitFilter : public AudioEffectFilter {
-	GDCLASS(AudioEffectBandLimitFilter, AudioEffectFilter)
+	GDCLASS(AudioEffectBandLimitFilter, AudioEffectFilter);
+
 public:
 	AudioEffectBandLimitFilter() :
 			AudioEffectFilter(AudioFilterSW::BANDLIMIT) {}
 };
 
 class AudioEffectLowShelfFilter : public AudioEffectFilter {
-	GDCLASS(AudioEffectLowShelfFilter, AudioEffectFilter)
+	GDCLASS(AudioEffectLowShelfFilter, AudioEffectFilter);
+
 public:
 	AudioEffectLowShelfFilter() :
 			AudioEffectFilter(AudioFilterSW::LOWSHELF) {}
 };
 
 class AudioEffectHighShelfFilter : public AudioEffectFilter {
-	GDCLASS(AudioEffectHighShelfFilter, AudioEffectFilter)
+	GDCLASS(AudioEffectHighShelfFilter, AudioEffectFilter);
+
 public:
 	AudioEffectHighShelfFilter() :
 			AudioEffectFilter(AudioFilterSW::HIGHSHELF) {}
diff --git a/servers/audio/effects/audio_effect_limiter.h b/servers/audio/effects/audio_effect_limiter.h
index d629166f42b..bf7167e3f43 100644
--- a/servers/audio/effects/audio_effect_limiter.h
+++ b/servers/audio/effects/audio_effect_limiter.h
@@ -36,7 +36,7 @@
 class AudioEffectLimiter;
 
 class AudioEffectLimiterInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectLimiterInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectLimiterInstance, AudioEffectInstance);
 	friend class AudioEffectLimiter;
 	Ref<AudioEffectLimiter> base;
 
@@ -47,7 +47,7 @@ public:
 };
 
 class AudioEffectLimiter : public AudioEffect {
-	GDCLASS(AudioEffectLimiter, AudioEffect)
+	GDCLASS(AudioEffectLimiter, AudioEffect);
 
 	friend class AudioEffectLimiterInstance;
 	float threshold;
diff --git a/servers/audio/effects/audio_effect_panner.h b/servers/audio/effects/audio_effect_panner.h
index 4256d05a2f3..7bd5a09fc64 100644
--- a/servers/audio/effects/audio_effect_panner.h
+++ b/servers/audio/effects/audio_effect_panner.h
@@ -36,7 +36,7 @@
 class AudioEffectPanner;
 
 class AudioEffectPannerInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectPannerInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectPannerInstance, AudioEffectInstance);
 	friend class AudioEffectPanner;
 	Ref<AudioEffectPanner> base;
 
@@ -45,7 +45,7 @@ public:
 };
 
 class AudioEffectPanner : public AudioEffect {
-	GDCLASS(AudioEffectPanner, AudioEffect)
+	GDCLASS(AudioEffectPanner, AudioEffect);
 
 	friend class AudioEffectPannerInstance;
 	float pan;
diff --git a/servers/audio/effects/audio_effect_phaser.h b/servers/audio/effects/audio_effect_phaser.h
index 264e792be59..b76d6bb29ce 100644
--- a/servers/audio/effects/audio_effect_phaser.h
+++ b/servers/audio/effects/audio_effect_phaser.h
@@ -36,7 +36,7 @@
 class AudioEffectPhaser;
 
 class AudioEffectPhaserInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectPhaserInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectPhaserInstance, AudioEffectInstance);
 	friend class AudioEffectPhaser;
 	Ref<AudioEffectPhaser> base;
 
@@ -70,7 +70,7 @@ public:
 };
 
 class AudioEffectPhaser : public AudioEffect {
-	GDCLASS(AudioEffectPhaser, AudioEffect)
+	GDCLASS(AudioEffectPhaser, AudioEffect);
 
 	friend class AudioEffectPhaserInstance;
 	float range_min;
diff --git a/servers/audio/effects/audio_effect_pitch_shift.h b/servers/audio/effects/audio_effect_pitch_shift.h
index 0c80cb63441..2028496ebfb 100644
--- a/servers/audio/effects/audio_effect_pitch_shift.h
+++ b/servers/audio/effects/audio_effect_pitch_shift.h
@@ -72,7 +72,7 @@ public:
 class AudioEffectPitchShift;
 
 class AudioEffectPitchShiftInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectPitchShiftInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectPitchShiftInstance, AudioEffectInstance);
 	friend class AudioEffectPitchShift;
 	Ref<AudioEffectPitchShift> base;
 
@@ -85,8 +85,11 @@ public:
 };
 
 class AudioEffectPitchShift : public AudioEffect {
-	GDCLASS(AudioEffectPitchShift, AudioEffect)
+	GDCLASS(AudioEffectPitchShift, AudioEffect);
+
 public:
+	friend class AudioEffectPitchShiftInstance;
+
 	enum FFT_Size {
 		FFT_SIZE_256,
 		FFT_SIZE_512,
@@ -96,9 +99,6 @@ public:
 		FFT_SIZE_MAX
 	};
 
-public:
-	friend class AudioEffectPitchShiftInstance;
-
 	float pitch_scale;
 	int oversampling;
 	FFT_Size fft_size;
diff --git a/servers/audio/effects/audio_effect_record.h b/servers/audio/effects/audio_effect_record.h
index 528c7dbd7c5..d9bf39eb5f8 100644
--- a/servers/audio/effects/audio_effect_record.h
+++ b/servers/audio/effects/audio_effect_record.h
@@ -43,7 +43,7 @@
 class AudioEffectRecord;
 
 class AudioEffectRecordInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectRecordInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectRecordInstance, AudioEffectInstance);
 	friend class AudioEffectRecord;
 	Ref<AudioEffectRecord> base;
 
@@ -77,7 +77,7 @@ public:
 };
 
 class AudioEffectRecord : public AudioEffect {
-	GDCLASS(AudioEffectRecord, AudioEffect)
+	GDCLASS(AudioEffectRecord, AudioEffect);
 
 	friend class AudioEffectRecordInstance;
 
diff --git a/servers/audio/effects/audio_effect_reverb.h b/servers/audio/effects/audio_effect_reverb.h
index ed76050f240..31a796bf98f 100644
--- a/servers/audio/effects/audio_effect_reverb.h
+++ b/servers/audio/effects/audio_effect_reverb.h
@@ -37,7 +37,7 @@
 class AudioEffectReverb;
 
 class AudioEffectReverbInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectReverbInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectReverbInstance, AudioEffectInstance);
 
 	Ref<AudioEffectReverb> base;
 
@@ -54,7 +54,7 @@ public:
 };
 
 class AudioEffectReverb : public AudioEffect {
-	GDCLASS(AudioEffectReverb, AudioEffect)
+	GDCLASS(AudioEffectReverb, AudioEffect);
 
 	friend class AudioEffectReverbInstance;
 
diff --git a/servers/audio/effects/audio_effect_spectrum_analyzer.h b/servers/audio/effects/audio_effect_spectrum_analyzer.h
index 4f4c3c8a583..27eb88d29f9 100644
--- a/servers/audio/effects/audio_effect_spectrum_analyzer.h
+++ b/servers/audio/effects/audio_effect_spectrum_analyzer.h
@@ -36,7 +36,7 @@
 class AudioEffectSpectrumAnalyzer;
 
 class AudioEffectSpectrumAnalyzerInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectSpectrumAnalyzerInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectSpectrumAnalyzerInstance, AudioEffectInstance);
 
 public:
 	enum MagnitudeMode {
@@ -68,7 +68,8 @@ public:
 VARIANT_ENUM_CAST(AudioEffectSpectrumAnalyzerInstance::MagnitudeMode)
 
 class AudioEffectSpectrumAnalyzer : public AudioEffect {
-	GDCLASS(AudioEffectSpectrumAnalyzer, AudioEffect)
+	GDCLASS(AudioEffectSpectrumAnalyzer, AudioEffect);
+
 public:
 	enum FFT_Size {
 		FFT_SIZE_256,
diff --git a/servers/audio/effects/audio_effect_stereo_enhance.h b/servers/audio/effects/audio_effect_stereo_enhance.h
index 787c351a039..44b7d3eb5c4 100644
--- a/servers/audio/effects/audio_effect_stereo_enhance.h
+++ b/servers/audio/effects/audio_effect_stereo_enhance.h
@@ -36,7 +36,7 @@
 class AudioEffectStereoEnhance;
 
 class AudioEffectStereoEnhanceInstance : public AudioEffectInstance {
-	GDCLASS(AudioEffectStereoEnhanceInstance, AudioEffectInstance)
+	GDCLASS(AudioEffectStereoEnhanceInstance, AudioEffectInstance);
 	friend class AudioEffectStereoEnhance;
 	Ref<AudioEffectStereoEnhance> base;
 
@@ -56,7 +56,7 @@ public:
 };
 
 class AudioEffectStereoEnhance : public AudioEffect {
-	GDCLASS(AudioEffectStereoEnhance, AudioEffect)
+	GDCLASS(AudioEffectStereoEnhance, AudioEffect);
 
 	friend class AudioEffectStereoEnhanceInstance;
 	float volume_db;
diff --git a/servers/audio/effects/audio_stream_generator.h b/servers/audio/effects/audio_stream_generator.h
index c3490ddaa58..33839d3db8d 100644
--- a/servers/audio/effects/audio_stream_generator.h
+++ b/servers/audio/effects/audio_stream_generator.h
@@ -35,7 +35,7 @@
 #include "servers/audio/audio_stream.h"
 
 class AudioStreamGenerator : public AudioStream {
-	GDCLASS(AudioStreamGenerator, AudioStream)
+	GDCLASS(AudioStreamGenerator, AudioStream);
 
 	float mix_rate;
 	float buffer_len;
@@ -59,7 +59,7 @@ public:
 
 class AudioStreamGeneratorPlayback : public AudioStreamPlaybackResampled {
 
-	GDCLASS(AudioStreamGeneratorPlayback, AudioStreamPlaybackResampled)
+	GDCLASS(AudioStreamGeneratorPlayback, AudioStreamPlaybackResampled);
 	friend class AudioStreamGenerator;
 	RingBuffer<AudioFrame> buffer;
 	int skips;
diff --git a/servers/audio_server.h b/servers/audio_server.h
index 8c0ffd5a6b9..942fe7bc877 100644
--- a/servers/audio_server.h
+++ b/servers/audio_server.h
@@ -147,7 +147,8 @@ class AudioBusLayout;
 
 class AudioServer : public Object {
 
-	GDCLASS(AudioServer, Object)
+	GDCLASS(AudioServer, Object);
+
 public:
 	//re-expose this here, as AudioDriver is not exposed to script
 	enum SpeakerMode {
@@ -390,7 +391,7 @@ VARIANT_ENUM_CAST(AudioServer::SpeakerMode)
 
 class AudioBusLayout : public Resource {
 
-	GDCLASS(AudioBusLayout, Resource)
+	GDCLASS(AudioBusLayout, Resource);
 
 	friend class AudioServer;