Run scripts to format and make headers consistent

include/godot_cpp/classes/ref.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_REF_HPP
-#define GODOT_CPP_REF_HPP
+#ifndef GODOT_REF_HPP
+#define GODOT_REF_HPP
 
 #include <godot_cpp/core/defs.hpp>
 
@@ -281,4 +281,4 @@ struct GetTypeInfo<const Ref<T> &, typename EnableIf<TypeInherits<RefCounted, T>
 
 } // namespace godot
 
-#endif // ! GODOT_CPP_REF_HPP
+#endif // GODOT_REF_HPP

include/godot_cpp/classes/wrapped.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_WRAPPED_HPP
-#define GODOT_CPP_WRAPPED_HPP
+#ifndef GODOT_WRAPPED_HPP
+#define GODOT_WRAPPED_HPP
 
 #include <godot_cpp/core/memory.hpp>
 
@@ -384,4 +384,4 @@ public:
 	};                                                                                                             \
 	m_class() : m_class(#m_class) {}
 
-#endif // ! GODOT_CPP_WRAPPED_HPP
+#endif // GODOT_WRAPPED_HPP

include/godot_cpp/core/binder_common.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_BINDER_COMMON_HPP
-#define GODOT_CPP_BINDER_COMMON_HPP
+#ifndef GODOT_BINDER_COMMON_HPP
+#define GODOT_BINDER_COMMON_HPP
 
 #include <godot/gdnative_interface.h>
 
@@ -582,4 +582,4 @@ void call_with_ptr_args_static_method_ret(R (*p_method)(P...), const GDNativeTyp
 #include <godot_cpp/classes/global_constants_binds.hpp>
 #include <godot_cpp/variant/builtin_binds.hpp>
 
-#endif // ! GODOT_CPP_BINDER_COMMON_HPP
+#endif // GODOT_BINDER_COMMON_HPP

include/godot_cpp/core/builtin_ptrcall.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_BUILTIN_PTRCALL_HPP
-#define GODOT_CPP_BUILTIN_PTRCALL_HPP
+#ifndef GODOT_BUILTIN_PTRCALL_HPP
+#define GODOT_BUILTIN_PTRCALL_HPP
 
 #include <godot/gdnative_interface.h>
 
@@ -77,4 +77,4 @@ T _call_builtin_ptr_getter(const GDNativePtrGetter getter, const GDNativeTypePtr
 
 } // namespace godot
 
-#endif // ! GODOT_CPP_BUILTIN_PTRCALL_HPP
+#endif // GODOT_BUILTIN_PTRCALL_HPP

include/godot_cpp/core/class_db.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef CLASS_DB_HPP
-#define CLASS_DB_HPP
+#ifndef GODOT_CLASS_DB_HPP
+#define GODOT_CLASS_DB_HPP
 
 #include <godot/gdnative_interface.h>
 
@@ -254,4 +254,4 @@ MethodBind *ClassDB::bind_vararg_method(uint32_t p_flags, const char *p_name, M
 
 } // namespace godot
 
-#endif // ! CLASS_DB_HPP
+#endif // GODOT_CLASS_DB_HPP

include/godot_cpp/core/defs.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef DEFS_H
-#define DEFS_H
+#ifndef GODOT_DEFS_HPP
+#define GODOT_DEFS_HPP
 
 #include <cstddef>
 #include <cstdint>
@@ -127,4 +127,4 @@ struct BuildIndexSequence : BuildIndexSequence<N - 1, N - 1, Is...> {};
 template <size_t... Is>
 struct BuildIndexSequence<0, Is...> : IndexSequence<Is...> {};
 
-#endif // ! DEFS_H
+#endif // GODOT_DEFS_HPP

include/godot_cpp/core/engine_ptrcall.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_ENGINE_PTRCALL_HPP
-#define GODOT_CPP_ENGINE_PTRCALL_HPP
+#ifndef GODOT_ENGINE_PTRCALL_HPP
+#define GODOT_ENGINE_PTRCALL_HPP
 
 #include <godot/gdnative_interface.h>
 
@@ -94,4 +94,4 @@ void _call_utility_no_ret(const GDNativePtrUtilityFunction func, const Args &...
 
 } // namespace godot
 
-#endif // ! GODOT_CPP_ENGINE_PTRCALL_HPP
+#endif // GODOT_ENGINE_PTRCALL_HPP

include/godot_cpp/core/error_macros.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_ERROR_MACROS_HPP
-#define GODOT_CPP_ERROR_MACROS_HPP
+#ifndef GODOT_ERROR_MACROS_HPP
+#define GODOT_ERROR_MACROS_HPP
 
 #include <godot_cpp/core/defs.hpp>
 #include <godot_cpp/variant/string.hpp>
@@ -614,4 +614,4 @@ void _err_print_index_error(const char *p_function, const char *p_file, int p_li
 #define CHECK_METHOD_BIND(m_mb)
 #endif
 
-#endif // ! GODOT_CPP_ERROR_MACROS_HPP
+#endif // GODOT_ERROR_MACROS_HPP

include/godot_cpp/core/memory.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_MEMORY_HPP
-#define GODOT_CPP_MEMORY_HPP
+#ifndef GODOT_MEMORY_HPP
+#define GODOT_MEMORY_HPP
 
 #include <cstddef>
 #include <cstdint>
@@ -187,4 +187,4 @@ struct _GlobalNilClass {
 
 } // namespace godot
 
-#endif // ! GODOT_CPP_MEMORY_HPP
+#endif // GODOT_MEMORY_HPP

include/godot_cpp/core/method_bind.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_METHOD_BIND_HPP
-#define GODOT_CPP_METHOD_BIND_HPP
+#ifndef GODOT_METHOD_BIND_HPP
+#define GODOT_METHOD_BIND_HPP
 
 #include <godot_cpp/core/binder_common.hpp>
 #include <godot_cpp/core/type_info.hpp>
@@ -734,4 +734,4 @@ MethodBind *create_static_method_bind(R (*p_method)(P...)) {
 
 } // namespace godot
 
-#endif // ! GODOT_CPP_METHOD_BIND_HPP
+#endif // GODOT_METHOD_BIND_HPP

include/godot_cpp/core/method_ptrcall.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_METHOD_PTRCALL_HPP
-#define GODOT_CPP_METHOD_PTRCALL_HPP
+#ifndef GODOT_METHOD_PTRCALL_HPP
+#define GODOT_METHOD_PTRCALL_HPP
 
 #include <godot_cpp/core/defs.hpp>
 
@@ -230,4 +230,4 @@ GDVIRTUAL_NATIVE_PTR(double);
 
 } // namespace godot
 
-#endif // ! GODOT_CPP_METHOD_PTRCALL_HPP
+#endif // GODOT_METHOD_PTRCALL_HPP

include/godot_cpp/core/mutex_lock.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef MUTEX_LOCK_HPP
-#define MUTEX_LOCK_HPP
+#ifndef GODOT_MUTEX_LOCK_HPP
+#define GODOT_MUTEX_LOCK_HPP
 
 #include <godot_cpp/classes/mutex.hpp>
 
@@ -56,4 +56,4 @@ public:
 
 } // namespace godot
 
-#endif // ! MUTEX_LOCK_HPP
+#endif // GODOT_MUTEX_LOCK_HPP

include/godot_cpp/core/object.hpp

@@ -158,4 +158,4 @@ const T *Object::cast_to(const Object *p_object) {
 
 } // namespace godot
 
-#endif // ! GODOT_OBJECT_HPP
+#endif // GODOT_OBJECT_HPP

include/godot_cpp/core/property_info.hpp

@@ -72,4 +72,4 @@ struct PropertyInfo {
 
 } // namespace godot
 
-#endif // ! GODOT_OBJECT_HPP
+#endif // GODOT_PROPERTY_INFO_HPP

include/godot_cpp/core/type_info.hpp

@@ -66,7 +66,7 @@ struct TypeInherits {
 	static char (&test(...))[2];
 
 	static bool const value = sizeof(test(get_d())) == sizeof(char) &&
-							  !TypesAreSame<B volatile const, void volatile const>::value;
+			!TypesAreSame<B volatile const, void volatile const>::value;
 };
 
 static GDNativePropertyInfo make_property_info(GDNativeVariantType p_type, const char *p_name, uint32_t p_hint = PROPERTY_HINT_NONE, const char *p_hint_string = "", uint32_t p_usage = PROPERTY_USAGE_DEFAULT, const char *p_class_name = "") {
@@ -389,4 +389,4 @@ MAKE_TYPED_ARRAY_INFO(Vector<Color>, Variant::PACKED_COLOR_ARRAY)
 
 } // namespace godot
 
-#endif // ! GODOT_TYPE_INFO_HPP
+#endif // GODOT_TYPE_INFO_HPP

include/godot_cpp/godot.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_HPP
-#define GODOT_HPP
+#ifndef GODOT_GODOT_HPP
+#define GODOT_GODOT_HPP
 
 #include <godot/gdnative_interface.h>
 
@@ -84,4 +84,4 @@ public:
 
 } // namespace godot
 
-#endif // ! GODOT_HPP
+#endif // GODOT_GODOT_HPP

include/godot_cpp/templates/cowdata.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef COWDATA_HPP
-#define COWDATA_HPP
+#ifndef GODOT_COWDATA_HPP
+#define GODOT_COWDATA_HPP
 
 #include <godot_cpp/classes/global_constants.hpp>
 #include <godot_cpp/core/class_db.hpp>
@@ -389,4 +389,4 @@ CowData<T>::~CowData() {
 
 } // namespace godot
 
-#endif // ! COWDATA_HPP
+#endif // GODOT_COWDATA_HPP

include/godot_cpp/templates/hash_map.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef HASH_MAP_HPP
-#define HASH_MAP_HPP
+#ifndef GODOT_HASH_MAP_HPP
+#define GODOT_HASH_MAP_HPP
 
 #include <godot_cpp/core/error_macros.hpp>
 #include <godot_cpp/core/memory.hpp>
@@ -588,4 +588,4 @@ public:
 
 } // namespace godot
 
-#endif // HASH_MAP_HPP
+#endif // GODOT_HASH_MAP_HPP

include/godot_cpp/templates/hash_set.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef HASH_SET_HPP
-#define HASH_SET_HPP
+#ifndef GODOT_HASH_SET_HPP
+#define GODOT_HASH_SET_HPP
 
 #include <godot_cpp/core/error_macros.hpp>
 #include <godot_cpp/core/memory.hpp>
@@ -474,4 +474,4 @@ public:
 
 } // namespace godot
 
-#endif // HASH_SET_HPP
+#endif // GODOT_HASH_SET_HPP

include/godot_cpp/templates/hashfuncs.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef HASHFUNCS_HPP
-#define HASHFUNCS_HPP
+#ifndef GODOT_HASHFUNCS_HPP
+#define GODOT_HASHFUNCS_HPP
 
 // Needed for fastmod.
 #if defined(_MSC_VER)
@@ -523,4 +523,4 @@ static _FORCE_INLINE_ uint32_t fastmod(const uint32_t n, const uint64_t c, const
 
 } // namespace godot
 
-#endif // HASHFUNCS_HPP
+#endif // GODOT_HASHFUNCS_HPP

include/godot_cpp/templates/list.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef LIST_HPP
-#define LIST_HPP
+#ifndef GODOT_LIST_HPP
+#define GODOT_LIST_HPP
 
 #include <godot_cpp/core/error_macros.hpp>
 #include <godot_cpp/core/memory.hpp>
@@ -766,4 +766,4 @@ public:
 
 } // namespace godot
 
-#endif // ! LIST_HPP
+#endif // GODOT_LIST_HPP

include/godot_cpp/templates/pair.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef PAIR_HPP
-#define PAIR_HPP
+#ifndef GODOT_PAIR_HPP
+#define GODOT_PAIR_HPP
 
 namespace godot {
 
@@ -104,4 +104,4 @@ struct KeyValueSort {
 
 } // namespace godot
 
-#endif // ! PAIR_HPP
+#endif // GODOT_PAIR_HPP

include/godot_cpp/templates/rb_map.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef RB_MAP_HPP
-#define RB_MAP_HPP
+#ifndef GODOT_RB_MAP_HPP
+#define GODOT_RB_MAP_HPP
 
 #include <godot_cpp/core/error_macros.hpp>
 #include <godot_cpp/core/memory.hpp>
@@ -762,4 +762,4 @@ public:
 
 } // namespace godot
 
-#endif // MAP_HPP
+#endif // GODOT_RB_MAP_HPP

include/godot_cpp/templates/rb_set.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef RB_SET_HPP
-#define RB_SET_HPP
+#ifndef GODOT_RB_SET_HPP
+#define GODOT_RB_SET_HPP
 
 #include <godot_cpp/core/memory.hpp>
 
@@ -711,4 +711,4 @@ public:
 
 } // namespace godot
 
-#endif // SET_HPP
+#endif // GODOT_RB_SET_HPP

include/godot_cpp/templates/rid_owner.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef RID_OWNER_HPP
-#define RID_OWNER_HPP
+#ifndef GODOT_RID_OWNER_HPP
+#define GODOT_RID_OWNER_HPP
 
 #include <godot_cpp/core/memory.hpp>
 #include <godot_cpp/godot.hpp>
@@ -462,4 +462,4 @@ public:
 
 } // namespace godot
 
-#endif // ! RID_OWNER_HPP
+#endif // GODOT_RID_OWNER_HPP

include/godot_cpp/templates/safe_refcount.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef SAFE_REFCOUNT_HPP
-#define SAFE_REFCOUNT_HPP
+#ifndef GODOT_SAFE_REFCOUNT_HPP
+#define GODOT_SAFE_REFCOUNT_HPP
 
 #if !defined(NO_THREADS)
 
@@ -323,4 +323,4 @@ public:
 
 } // namespace godot
 
-#endif // ! SAFE_REFCOUNT_HPP
+#endif // GODOT_SAFE_REFCOUNT_HPP

include/godot_cpp/templates/search_array.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef SEARCH_ARRAY_HPP
-#define SEARCH_ARRAY_HPP
+#ifndef GODOT_SEARCH_ARRAY_HPP
+#define GODOT_SEARCH_ARRAY_HPP
 
 #include <godot_cpp/templates/sort_array.hpp>
 
@@ -68,4 +68,4 @@ public:
 
 } // namespace godot
 
-#endif // ! SEARCH_ARRAY_HPP
+#endif // GODOT_SEARCH_ARRAY_HPP

include/godot_cpp/templates/self_list.hpp

@@ -28,11 +28,11 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef SELF_LIST_HPP
-#define SELF_LIST_HPP
+#ifndef GODOT_SELF_LIST_HPP
+#define GODOT_SELF_LIST_HPP
 
-#include <godot_cpp/core/error_macros.hpp>
 #include <godot_cpp/core/defs.hpp>
+#include <godot_cpp/core/error_macros.hpp>
 
 namespace godot {
 
@@ -140,4 +140,4 @@ public:
 
 } // namespace godot
 
-#endif // SELF_LIST_HPP
+#endif // GODOT_SELF_LIST_HPP

include/godot_cpp/templates/sort_array.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef SORT_ARRAY_HPP
-#define SORT_ARRAY_HPP
+#ifndef GODOT_SORT_ARRAY_HPP
+#define GODOT_SORT_ARRAY_HPP
 
 #include <godot_cpp/core/error_macros.hpp>
 
@@ -320,4 +320,4 @@ public:
 
 } // namespace godot
 
-#endif // ! SORT_ARRAY_HPP
+#endif // GODOT_SORT_ARRAY_HPP

include/godot_cpp/templates/spin_lock.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef SPIN_LOCK_HPP
-#define SPIN_LOCK_HPP
+#ifndef GODOT_SPIN_LOCK_HPP
+#define GODOT_SPIN_LOCK_HPP
 
 #include <atomic>
 
@@ -51,4 +51,4 @@ public:
 
 } // namespace godot
 
-#endif // ! SPIN_LOCK_HPP
+#endif // GODOT_SPIN_LOCK_HPP

include/godot_cpp/templates/thread_work_pool.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef THREAD_WORK_POOL_HPP
-#define THREAD_WORK_POOL_HPP
+#ifndef GODOT_THREAD_WORK_POOL_HPP
+#define GODOT_THREAD_WORK_POOL_HPP
 
 #include <godot_cpp/classes/os.hpp>
 #include <godot_cpp/classes/semaphore.hpp>
@@ -202,4 +202,4 @@ public:
 
 } // namespace godot
 
-#endif // ! THREAD_WORK_POOL_HPP
+#endif // GODOT_THREAD_WORK_POOL_HPP

include/godot_cpp/templates/vector.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef VECTOR_HPP
-#define VECTOR_HPP
+#ifndef GODOT_VECTOR_HPP
+#define GODOT_VECTOR_HPP
 
 /**
  * @class Vector
@@ -318,4 +318,4 @@ void Vector<T>::fill(T p_elem) {
 
 } // namespace godot
 
-#endif // ! VECTOR_HPP
+#endif // GODOT_VECTOR_HPP

include/godot_cpp/templates/vmap.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef VMAP_HPP
-#define VMAP_HPP
+#ifndef GODOT_VMAP_HPP
+#define GODOT_VMAP_HPP
 
 #include <godot_cpp/templates/cowdata.hpp>
 
@@ -201,4 +201,4 @@ public:
 
 } // namespace godot
 
-#endif // ! VMAP_H
+#endif // GODOT_VMAP_HPP

include/godot_cpp/templates/vset.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef VSET_HPP
-#define VSET_HPP
+#ifndef GODOT_VSET_HPP
+#define GODOT_VSET_HPP
 
 #include <godot_cpp/templates/vector.hpp>
 
@@ -142,4 +142,4 @@ public:
 
 } // namespace godot
 
-#endif // VSET_H
+#endif // GODOT_VSET_HPP

include/godot_cpp/variant/char_string.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_CHAR_STRING_HPP
-#define GODOT_CPP_CHAR_STRING_HPP
+#ifndef GODOT_CHAR_STRING_HPP
+#define GODOT_CHAR_STRING_HPP
 
 #include <cstddef>
 #include <cstdint>
@@ -110,4 +110,4 @@ public:
 
 } // namespace godot
 
-#endif // ! GODOT_CPP_CHAR_STRING_HPP
+#endif // GODOT_CHAR_STRING_HPP

include/godot_cpp/variant/char_utils.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef CHAR_UTILS_HPP
-#define CHAR_UTILS_HPP
+#ifndef GODOT_CHAR_UTILS_HPP
+#define GODOT_CHAR_UTILS_HPP
 
 static _FORCE_INLINE_ bool is_ascii_upper_case(char32_t c) {
 	return (c >= 'A' && c <= 'Z');
@@ -87,4 +87,4 @@ static _FORCE_INLINE_ bool is_underscore(char32_t p_char) {
 	return (p_char == '_');
 }
 
-#endif // CHAR_UTILS_HPP
+#endif // GODOT_CHAR_UTILS_HPP

include/godot_cpp/variant/typed_array.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_TYPED_ARRAY_HPP
-#define GODOT_CPP_TYPED_ARRAY_HPP
+#ifndef GODOT_TYPED_ARRAY_HPP
+#define GODOT_TYPED_ARRAY_HPP
 
 #include <godot_cpp/variant/array.hpp>
 #include <godot_cpp/variant/variant.hpp>
@@ -123,4 +123,4 @@ MAKE_TYPED_ARRAY(PackedColorArray, Variant::PACKED_COLOR_ARRAY)
 
 } // namespace godot
 
-#endif // GODOT_CPP_TYPED_ARRAY_HPP
+#endif // GODOT_TYPED_ARRAY_HPP

include/godot_cpp/variant/ucaps.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef UCAPS_HPP
-#define UCAPS_HPP
+#ifndef GODOT_UCAPS_HPP
+#define GODOT_UCAPS_HPP
 
 // satan invented unicode?
 #define CAPS_LEN 666
@@ -1412,4 +1412,4 @@ static int _find_lower(int ch) {
 	return ch;
 }
 
-#endif // UCAPS_HPP
+#endif // GODOT_UCAPS_HPP

include/godot_cpp/variant/variant.hpp

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_CPP_VARIANT_HPP
-#define GODOT_CPP_VARIANT_HPP
+#ifndef GODOT_VARIANT_HPP
+#define GODOT_VARIANT_HPP
 
 #include <godot_cpp/core/defs.hpp>
 
@@ -320,4 +320,4 @@ struct VariantComparator {
 
 } // namespace godot
 
-#endif // ! GODOT_CPP_VARIANT_HPP
+#endif // GODOT_VARIANT_HPP

test/demo/main.gd

@@ -21,7 +21,7 @@ func _ready():
 	prints("Property list")
 	$Example.property_from_list = Vector3(100, 200, 300)
 	prints("  property value ", $Example.property_from_list)
-	
+
 	# Call methods.
 	prints("Instance method calls")
 	$Example.simple_func()