diff --git a/include/core/Color.hpp b/include/core/Color.hpp
index 938dca9cc..6c219b004 100644
--- a/include/core/Color.hpp
+++ b/include/core/Color.hpp
@@ -7,7 +7,8 @@ namespace godot {
 
 class String;
 
-struct Color {
+class Color {
+public:
 	union {
 		struct {
 			float r;
diff --git a/include/core/Rect2.hpp b/include/core/Rect2.hpp
index 10efdd943..b94a2aad1 100644
--- a/include/core/Rect2.hpp
+++ b/include/core/Rect2.hpp
@@ -14,7 +14,8 @@ namespace godot {
 
 struct Transform2D;
 
-struct Rect2 {
+class Rect2 {
+public:
 	Point2 position;
 	Size2 size;
 
diff --git a/include/core/Rect2i.hpp b/include/core/Rect2i.hpp
index 8938c9dd0..ec2a6caba 100644
--- a/include/core/Rect2i.hpp
+++ b/include/core/Rect2i.hpp
@@ -6,7 +6,8 @@
 
 namespace godot {
 
-struct Rect2i {
+class Rect2i {
+public:
 	Point2i position;
 	Size2i size;
 
diff --git a/include/core/Transform2D.hpp b/include/core/Transform2D.hpp
index ab775e1b7..5773ef8c5 100644
--- a/include/core/Transform2D.hpp
+++ b/include/core/Transform2D.hpp
@@ -8,7 +8,8 @@
 
 namespace godot {
 
-struct Transform2D {
+class Transform2D {
+public:
 	// Warning #1: basis of Transform2D is stored differently from Basis. In terms of elements array, the basis matrix looks like "on paper":
 	// M = (elements[0][0] elements[1][0])
 	//     (elements[0][1] elements[1][1])
diff --git a/include/core/Vector2.hpp b/include/core/Vector2.hpp
index 9c731aa30..b42440c68 100644
--- a/include/core/Vector2.hpp
+++ b/include/core/Vector2.hpp
@@ -7,9 +7,10 @@
 
 namespace godot {
 
-struct Vector2i;
+class Vector2i;
 
-struct Vector2 {
+class Vector2 {
+public:
 	enum Axis {
 		AXIS_X,
 		AXIS_Y,
diff --git a/include/core/Vector2i.hpp b/include/core/Vector2i.hpp
index b6c782707..4ae37c993 100644
--- a/include/core/Vector2i.hpp
+++ b/include/core/Vector2i.hpp
@@ -8,7 +8,8 @@
 
 namespace godot {
 
-struct Vector2i {
+class Vector2i {
+public:
 	enum Axis {
 		AXIS_X,
 		AXIS_Y,
diff --git a/include/core/Vector3.hpp b/include/core/Vector3.hpp
index 6e8348c7f..5c9c11cc5 100644
--- a/include/core/Vector3.hpp
+++ b/include/core/Vector3.hpp
@@ -8,9 +8,10 @@
 namespace godot {
 
 class Basis;
-struct Vector3i;
+class Vector3i;
 
-struct Vector3 {
+class Vector3 {
+public:
 	enum Axis {
 		AXIS_X,
 		AXIS_Y,
diff --git a/include/core/Vector3i.hpp b/include/core/Vector3i.hpp
index 44250eb9e..91370e0bd 100644
--- a/include/core/Vector3i.hpp
+++ b/include/core/Vector3i.hpp
@@ -7,7 +7,8 @@
 
 namespace godot {
 
-struct Vector3i {
+class Vector3i {
+public:
 	enum Axis {
 		AXIS_X,
 		AXIS_Y,
diff --git a/src/core/GodotGlobal.cpp b/src/core/GodotGlobal.cpp
index 9e716952b..a8b6b69b4 100644
--- a/src/core/GodotGlobal.cpp
+++ b/src/core/GodotGlobal.cpp
@@ -102,13 +102,13 @@ void Godot::nativescript_terminate(void *handle) {
 	godot::nativescript_api->godot_nativescript_unregister_instance_binding_data_functions(godot::_RegisterState::language_index);
 }
 
-static void print_warning(const char *description, const char *function, const char *file, int line) {
+void Godot::print_warning(const char *description, const char *function, const char *file, int line) {
 	godot::api->godot_print_warning(description, function, file, line);
 }
-static void print_error(const char *description, const char *function, const char *file, int line) {
+void Godot::print_error(const char *description, const char *function, const char *file, int line) {
 	godot::api->godot_print_error(description, function, file, line);
 }
-static void print_script_error(const char *description, const char *function, const char *file, int line) {
+void Godot::print_script_error(const char *description, const char *function, const char *file, int line) {
 	godot::api->godot_print_script_error(description, function, file, line);
 }
 
diff --git a/src/core/Variant.cpp b/src/core/Variant.cpp
index e51decd8d..2fd0b93f2 100644
--- a/src/core/Variant.cpp
+++ b/src/core/Variant.cpp
@@ -217,6 +217,7 @@ Variant::operator String() const {
 	godot_string s = godot::api->godot_variant_as_string(&_godot_variant);
 	return String(s);
 }
+
 Variant::operator Vector2() const {
 	godot_vector2 s = godot::api->godot_variant_as_vector2(&_godot_variant);
 	return Vector2(s);
@@ -345,7 +346,7 @@ bool Variant::operator==(const Variant &b) const {
 		return false;
 	}
 	valid = godot::api->godot_variant_as_bool(&result);
-	godot_variant_destroy(&result);
+	godot::api->godot_variant_destroy(&result);
 	return valid;
 }
 
@@ -361,7 +362,7 @@ bool Variant::operator<(const Variant &b) const {
 		return false;
 	}
 	valid = godot::api->godot_variant_as_bool(&result);
-	godot_variant_destroy(&result);
+	godot::api->godot_variant_destroy(&result);
 	return valid;
 }
 
@@ -373,7 +374,7 @@ bool Variant::operator<=(const Variant &b) const {
 		return false;
 	}
 	valid = godot::api->godot_variant_as_bool(&result);
-	godot_variant_destroy(&result);
+	godot::api->godot_variant_destroy(&result);
 	return valid;
 }