diff --git a/spine-c/codegen/src/types.ts b/spine-c/codegen/src/types.ts
index 63bf534f6..186606b22 100644
--- a/spine-c/codegen/src/types.ts
+++ b/spine-c/codegen/src/types.ts
@@ -316,16 +316,16 @@ export function toCTypeName(cppType: string, knownTypeNames: Set<string>): strin
 export function isNullable(cppType: string): boolean {
     const normalizedType = cppType.replace(/\s+/g, ' ').trim();
     
-    // Pointer types are nullable
-    if (normalizedType.includes('*')) {
-        return true;
-    }
-    
-    // Reference types are NOT nullable
+    // Reference types are NOT nullable (even if they contain pointers inside templates)
     if (normalizedType.includes('&')) {
         return false;
     }
     
+    // Pointer types are nullable (only if not a reference)
+    if (normalizedType.includes('*')) {
+        return true;
+    }
+    
     // Value types and primitives are NOT nullable
     return false;
 }
diff --git a/spine-c/src/generated/animation.cpp b/spine-c/src/generated/animation.cpp
index cbb6b433f..4b50920cf 100644
--- a/spine-c/src/generated/animation.cpp
+++ b/spine-c/src/generated/animation.cpp
@@ -3,7 +3,7 @@
 
 using namespace spine;
 
-spine_animation spine_animation_create(const char *name, /*@null*/ spine_array_timeline timelines, float duration) {
+spine_animation spine_animation_create(const char *name, spine_array_timeline timelines, float duration) {
 	return (spine_animation) new (__FILE__, __LINE__) Animation(String(name), *((Array<Timeline *> *) timelines), duration);
 }
 
@@ -11,12 +11,12 @@ void spine_animation_dispose(spine_animation self) {
 	delete (Animation *) self;
 }
 
-/*@null*/ spine_array_timeline spine_animation_get_timelines(spine_animation self) {
+spine_array_timeline spine_animation_get_timelines(spine_animation self) {
 	Animation *_self = (Animation *) self;
 	return (spine_array_timeline) &_self->getTimelines();
 }
 
-void spine_animation_set_timelines(spine_animation self, /*@null*/ spine_array_timeline timelines) {
+void spine_animation_set_timelines(spine_animation self, spine_array_timeline timelines) {
 	Animation *_self = (Animation *) self;
 	_self->setTimelines(*((Array<Timeline *> *) timelines));
 }
diff --git a/spine-c/src/generated/animation.h b/spine-c/src/generated/animation.h
index 8e78c5b8d..f6d31836c 100644
--- a/spine-c/src/generated/animation.h
+++ b/spine-c/src/generated/animation.h
@@ -9,12 +9,12 @@
 extern "C" {
 #endif
 
-SPINE_C_API spine_animation spine_animation_create(const char *name, /*@null*/ spine_array_timeline timelines, float duration);
+SPINE_C_API spine_animation spine_animation_create(const char *name, spine_array_timeline timelines, float duration);
 
 SPINE_C_API void spine_animation_dispose(spine_animation self);
 
-SPINE_C_API /*@null*/ spine_array_timeline spine_animation_get_timelines(spine_animation self);
-SPINE_C_API void spine_animation_set_timelines(spine_animation self, /*@null*/ spine_array_timeline timelines);
+SPINE_C_API spine_array_timeline spine_animation_get_timelines(spine_animation self);
+SPINE_C_API void spine_animation_set_timelines(spine_animation self, spine_array_timeline timelines);
 SPINE_C_API bool spine_animation_has_timeline(spine_animation self, spine_array_property_id ids);
 SPINE_C_API float spine_animation_get_duration(spine_animation self);
 SPINE_C_API void spine_animation_set_duration(spine_animation self, float inValue);
diff --git a/spine-c/src/generated/animation_state.cpp b/spine-c/src/generated/animation_state.cpp
index ad2d6b5ef..2df5ddd5d 100644
--- a/spine-c/src/generated/animation_state.cpp
+++ b/spine-c/src/generated/animation_state.cpp
@@ -78,7 +78,7 @@ spine_animation_state_data spine_animation_state_get_data(spine_animation_state
 	return (spine_animation_state_data) &_self->getData();
 }
 
-/*@null*/ spine_array_track_entry spine_animation_state_get_tracks(spine_animation_state self) {
+spine_array_track_entry spine_animation_state_get_tracks(spine_animation_state self) {
 	AnimationState *_self = (AnimationState *) self;
 	return (spine_array_track_entry) &_self->getTracks();
 }
diff --git a/spine-c/src/generated/animation_state.h b/spine-c/src/generated/animation_state.h
index 3da19d1cc..5ecd94359 100644
--- a/spine-c/src/generated/animation_state.h
+++ b/spine-c/src/generated/animation_state.h
@@ -31,7 +31,7 @@ SPINE_C_API spine_track_entry spine_animation_state_add_empty_animation(spine_an
 SPINE_C_API void spine_animation_state_set_empty_animations(spine_animation_state self, float mixDuration);
 SPINE_C_API /*@null*/ spine_track_entry spine_animation_state_get_current(spine_animation_state self, size_t trackIndex);
 SPINE_C_API spine_animation_state_data spine_animation_state_get_data(spine_animation_state self);
-SPINE_C_API /*@null*/ spine_array_track_entry spine_animation_state_get_tracks(spine_animation_state self);
+SPINE_C_API spine_array_track_entry spine_animation_state_get_tracks(spine_animation_state self);
 SPINE_C_API float spine_animation_state_get_time_scale(spine_animation_state self);
 SPINE_C_API void spine_animation_state_set_time_scale(spine_animation_state self, float inValue);
 SPINE_C_API void spine_animation_state_disable_queue(spine_animation_state self);
diff --git a/spine-c/src/generated/arrays.cpp b/spine-c/src/generated/arrays.cpp
index ba1da1838..86ff1c0be 100644
--- a/spine-c/src/generated/arrays.cpp
+++ b/spine-c/src/generated/arrays.cpp
@@ -337,7 +337,7 @@ size_t spine_array_animation_size(spine_array_animation array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_animation spine_array_animation_set_size(spine_array_animation array, size_t newSize, /*@null*/ spine_animation defaultValue) {
+spine_array_animation spine_array_animation_set_size(spine_array_animation array, size_t newSize, spine_animation defaultValue) {
 	Array<Animation *> *_array = (Array<Animation *> *) array;
 	return (spine_array_animation) &_array->setSize(newSize, (Animation *) defaultValue);
 }
@@ -347,17 +347,17 @@ void spine_array_animation_ensure_capacity(spine_array_animation array, size_t n
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_animation_add(spine_array_animation array, /*@null*/ spine_animation inValue) {
+void spine_array_animation_add(spine_array_animation array, spine_animation inValue) {
 	Array<Animation *> *_array = (Array<Animation *> *) array;
 	_array->add((Animation *) inValue);
 }
 
-void spine_array_animation_add_all(spine_array_animation array, /*@null*/ spine_array_animation inValue) {
+void spine_array_animation_add_all(spine_array_animation array, spine_array_animation inValue) {
 	Array<Animation *> *_array = (Array<Animation *> *) array;
 	_array->addAll(*((const Array<Animation *> *) inValue));
 }
 
-void spine_array_animation_clear_and_add_all(spine_array_animation array, /*@null*/ spine_array_animation inValue) {
+void spine_array_animation_clear_and_add_all(spine_array_animation array, spine_array_animation inValue) {
 	Array<Animation *> *_array = (Array<Animation *> *) array;
 	_array->clearAndAddAll(*((const Array<Animation *> *) inValue));
 }
@@ -367,12 +367,12 @@ void spine_array_animation_remove_at(spine_array_animation array, size_t inIndex
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_animation_contains(spine_array_animation array, /*@null*/ spine_animation inValue) {
+bool spine_array_animation_contains(spine_array_animation array, spine_animation inValue) {
 	Array<Animation *> *_array = (Array<Animation *> *) array;
 	return _array->contains((Animation *) inValue);
 }
 
-int spine_array_animation_index_of(spine_array_animation array, /*@null*/ spine_animation inValue) {
+int spine_array_animation_index_of(spine_array_animation array, spine_animation inValue) {
 	Array<Animation *> *_array = (Array<Animation *> *) array;
 	return _array->indexOf((Animation *) inValue);
 }
@@ -407,8 +407,7 @@ size_t spine_array_atlas_page_size(spine_array_atlas_page array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_atlas_page spine_array_atlas_page_set_size(spine_array_atlas_page array, size_t newSize,
-																 /*@null*/ spine_atlas_page defaultValue) {
+spine_array_atlas_page spine_array_atlas_page_set_size(spine_array_atlas_page array, size_t newSize, spine_atlas_page defaultValue) {
 	Array<AtlasPage *> *_array = (Array<AtlasPage *> *) array;
 	return (spine_array_atlas_page) &_array->setSize(newSize, (AtlasPage *) defaultValue);
 }
@@ -418,17 +417,17 @@ void spine_array_atlas_page_ensure_capacity(spine_array_atlas_page array, size_t
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_atlas_page_add(spine_array_atlas_page array, /*@null*/ spine_atlas_page inValue) {
+void spine_array_atlas_page_add(spine_array_atlas_page array, spine_atlas_page inValue) {
 	Array<AtlasPage *> *_array = (Array<AtlasPage *> *) array;
 	_array->add((AtlasPage *) inValue);
 }
 
-void spine_array_atlas_page_add_all(spine_array_atlas_page array, /*@null*/ spine_array_atlas_page inValue) {
+void spine_array_atlas_page_add_all(spine_array_atlas_page array, spine_array_atlas_page inValue) {
 	Array<AtlasPage *> *_array = (Array<AtlasPage *> *) array;
 	_array->addAll(*((const Array<AtlasPage *> *) inValue));
 }
 
-void spine_array_atlas_page_clear_and_add_all(spine_array_atlas_page array, /*@null*/ spine_array_atlas_page inValue) {
+void spine_array_atlas_page_clear_and_add_all(spine_array_atlas_page array, spine_array_atlas_page inValue) {
 	Array<AtlasPage *> *_array = (Array<AtlasPage *> *) array;
 	_array->clearAndAddAll(*((const Array<AtlasPage *> *) inValue));
 }
@@ -438,12 +437,12 @@ void spine_array_atlas_page_remove_at(spine_array_atlas_page array, size_t inInd
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_atlas_page_contains(spine_array_atlas_page array, /*@null*/ spine_atlas_page inValue) {
+bool spine_array_atlas_page_contains(spine_array_atlas_page array, spine_atlas_page inValue) {
 	Array<AtlasPage *> *_array = (Array<AtlasPage *> *) array;
 	return _array->contains((AtlasPage *) inValue);
 }
 
-int spine_array_atlas_page_index_of(spine_array_atlas_page array, /*@null*/ spine_atlas_page inValue) {
+int spine_array_atlas_page_index_of(spine_array_atlas_page array, spine_atlas_page inValue) {
 	Array<AtlasPage *> *_array = (Array<AtlasPage *> *) array;
 	return _array->indexOf((AtlasPage *) inValue);
 }
@@ -478,8 +477,7 @@ size_t spine_array_atlas_region_size(spine_array_atlas_region array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_atlas_region spine_array_atlas_region_set_size(spine_array_atlas_region array, size_t newSize,
-																	 /*@null*/ spine_atlas_region defaultValue) {
+spine_array_atlas_region spine_array_atlas_region_set_size(spine_array_atlas_region array, size_t newSize, spine_atlas_region defaultValue) {
 	Array<AtlasRegion *> *_array = (Array<AtlasRegion *> *) array;
 	return (spine_array_atlas_region) &_array->setSize(newSize, (AtlasRegion *) defaultValue);
 }
@@ -489,17 +487,17 @@ void spine_array_atlas_region_ensure_capacity(spine_array_atlas_region array, si
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_atlas_region_add(spine_array_atlas_region array, /*@null*/ spine_atlas_region inValue) {
+void spine_array_atlas_region_add(spine_array_atlas_region array, spine_atlas_region inValue) {
 	Array<AtlasRegion *> *_array = (Array<AtlasRegion *> *) array;
 	_array->add((AtlasRegion *) inValue);
 }
 
-void spine_array_atlas_region_add_all(spine_array_atlas_region array, /*@null*/ spine_array_atlas_region inValue) {
+void spine_array_atlas_region_add_all(spine_array_atlas_region array, spine_array_atlas_region inValue) {
 	Array<AtlasRegion *> *_array = (Array<AtlasRegion *> *) array;
 	_array->addAll(*((const Array<AtlasRegion *> *) inValue));
 }
 
-void spine_array_atlas_region_clear_and_add_all(spine_array_atlas_region array, /*@null*/ spine_array_atlas_region inValue) {
+void spine_array_atlas_region_clear_and_add_all(spine_array_atlas_region array, spine_array_atlas_region inValue) {
 	Array<AtlasRegion *> *_array = (Array<AtlasRegion *> *) array;
 	_array->clearAndAddAll(*((const Array<AtlasRegion *> *) inValue));
 }
@@ -509,12 +507,12 @@ void spine_array_atlas_region_remove_at(spine_array_atlas_region array, size_t i
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_atlas_region_contains(spine_array_atlas_region array, /*@null*/ spine_atlas_region inValue) {
+bool spine_array_atlas_region_contains(spine_array_atlas_region array, spine_atlas_region inValue) {
 	Array<AtlasRegion *> *_array = (Array<AtlasRegion *> *) array;
 	return _array->contains((AtlasRegion *) inValue);
 }
 
-int spine_array_atlas_region_index_of(spine_array_atlas_region array, /*@null*/ spine_atlas_region inValue) {
+int spine_array_atlas_region_index_of(spine_array_atlas_region array, spine_atlas_region inValue) {
 	Array<AtlasRegion *> *_array = (Array<AtlasRegion *> *) array;
 	return _array->indexOf((AtlasRegion *) inValue);
 }
@@ -549,8 +547,7 @@ size_t spine_array_attachment_size(spine_array_attachment array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_attachment spine_array_attachment_set_size(spine_array_attachment array, size_t newSize,
-																 /*@null*/ spine_attachment defaultValue) {
+spine_array_attachment spine_array_attachment_set_size(spine_array_attachment array, size_t newSize, spine_attachment defaultValue) {
 	Array<Attachment *> *_array = (Array<Attachment *> *) array;
 	return (spine_array_attachment) &_array->setSize(newSize, (Attachment *) defaultValue);
 }
@@ -560,17 +557,17 @@ void spine_array_attachment_ensure_capacity(spine_array_attachment array, size_t
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_attachment_add(spine_array_attachment array, /*@null*/ spine_attachment inValue) {
+void spine_array_attachment_add(spine_array_attachment array, spine_attachment inValue) {
 	Array<Attachment *> *_array = (Array<Attachment *> *) array;
 	_array->add((Attachment *) inValue);
 }
 
-void spine_array_attachment_add_all(spine_array_attachment array, /*@null*/ spine_array_attachment inValue) {
+void spine_array_attachment_add_all(spine_array_attachment array, spine_array_attachment inValue) {
 	Array<Attachment *> *_array = (Array<Attachment *> *) array;
 	_array->addAll(*((const Array<Attachment *> *) inValue));
 }
 
-void spine_array_attachment_clear_and_add_all(spine_array_attachment array, /*@null*/ spine_array_attachment inValue) {
+void spine_array_attachment_clear_and_add_all(spine_array_attachment array, spine_array_attachment inValue) {
 	Array<Attachment *> *_array = (Array<Attachment *> *) array;
 	_array->clearAndAddAll(*((const Array<Attachment *> *) inValue));
 }
@@ -580,12 +577,12 @@ void spine_array_attachment_remove_at(spine_array_attachment array, size_t inInd
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_attachment_contains(spine_array_attachment array, /*@null*/ spine_attachment inValue) {
+bool spine_array_attachment_contains(spine_array_attachment array, spine_attachment inValue) {
 	Array<Attachment *> *_array = (Array<Attachment *> *) array;
 	return _array->contains((Attachment *) inValue);
 }
 
-int spine_array_attachment_index_of(spine_array_attachment array, /*@null*/ spine_attachment inValue) {
+int spine_array_attachment_index_of(spine_array_attachment array, spine_attachment inValue) {
 	Array<Attachment *> *_array = (Array<Attachment *> *) array;
 	return _array->indexOf((Attachment *) inValue);
 }
@@ -620,7 +617,7 @@ size_t spine_array_bone_size(spine_array_bone array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_bone spine_array_bone_set_size(spine_array_bone array, size_t newSize, /*@null*/ spine_bone defaultValue) {
+spine_array_bone spine_array_bone_set_size(spine_array_bone array, size_t newSize, spine_bone defaultValue) {
 	Array<Bone *> *_array = (Array<Bone *> *) array;
 	return (spine_array_bone) &_array->setSize(newSize, (Bone *) defaultValue);
 }
@@ -630,17 +627,17 @@ void spine_array_bone_ensure_capacity(spine_array_bone array, size_t newCapacity
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_bone_add(spine_array_bone array, /*@null*/ spine_bone inValue) {
+void spine_array_bone_add(spine_array_bone array, spine_bone inValue) {
 	Array<Bone *> *_array = (Array<Bone *> *) array;
 	_array->add((Bone *) inValue);
 }
 
-void spine_array_bone_add_all(spine_array_bone array, /*@null*/ spine_array_bone inValue) {
+void spine_array_bone_add_all(spine_array_bone array, spine_array_bone inValue) {
 	Array<Bone *> *_array = (Array<Bone *> *) array;
 	_array->addAll(*((const Array<Bone *> *) inValue));
 }
 
-void spine_array_bone_clear_and_add_all(spine_array_bone array, /*@null*/ spine_array_bone inValue) {
+void spine_array_bone_clear_and_add_all(spine_array_bone array, spine_array_bone inValue) {
 	Array<Bone *> *_array = (Array<Bone *> *) array;
 	_array->clearAndAddAll(*((const Array<Bone *> *) inValue));
 }
@@ -650,12 +647,12 @@ void spine_array_bone_remove_at(spine_array_bone array, size_t inIndex) {
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_bone_contains(spine_array_bone array, /*@null*/ spine_bone inValue) {
+bool spine_array_bone_contains(spine_array_bone array, spine_bone inValue) {
 	Array<Bone *> *_array = (Array<Bone *> *) array;
 	return _array->contains((Bone *) inValue);
 }
 
-int spine_array_bone_index_of(spine_array_bone array, /*@null*/ spine_bone inValue) {
+int spine_array_bone_index_of(spine_array_bone array, spine_bone inValue) {
 	Array<Bone *> *_array = (Array<Bone *> *) array;
 	return _array->indexOf((Bone *) inValue);
 }
@@ -690,7 +687,7 @@ size_t spine_array_bone_data_size(spine_array_bone_data array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_bone_data spine_array_bone_data_set_size(spine_array_bone_data array, size_t newSize, /*@null*/ spine_bone_data defaultValue) {
+spine_array_bone_data spine_array_bone_data_set_size(spine_array_bone_data array, size_t newSize, spine_bone_data defaultValue) {
 	Array<BoneData *> *_array = (Array<BoneData *> *) array;
 	return (spine_array_bone_data) &_array->setSize(newSize, (BoneData *) defaultValue);
 }
@@ -700,17 +697,17 @@ void spine_array_bone_data_ensure_capacity(spine_array_bone_data array, size_t n
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_bone_data_add(spine_array_bone_data array, /*@null*/ spine_bone_data inValue) {
+void spine_array_bone_data_add(spine_array_bone_data array, spine_bone_data inValue) {
 	Array<BoneData *> *_array = (Array<BoneData *> *) array;
 	_array->add((BoneData *) inValue);
 }
 
-void spine_array_bone_data_add_all(spine_array_bone_data array, /*@null*/ spine_array_bone_data inValue) {
+void spine_array_bone_data_add_all(spine_array_bone_data array, spine_array_bone_data inValue) {
 	Array<BoneData *> *_array = (Array<BoneData *> *) array;
 	_array->addAll(*((const Array<BoneData *> *) inValue));
 }
 
-void spine_array_bone_data_clear_and_add_all(spine_array_bone_data array, /*@null*/ spine_array_bone_data inValue) {
+void spine_array_bone_data_clear_and_add_all(spine_array_bone_data array, spine_array_bone_data inValue) {
 	Array<BoneData *> *_array = (Array<BoneData *> *) array;
 	_array->clearAndAddAll(*((const Array<BoneData *> *) inValue));
 }
@@ -720,12 +717,12 @@ void spine_array_bone_data_remove_at(spine_array_bone_data array, size_t inIndex
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_bone_data_contains(spine_array_bone_data array, /*@null*/ spine_bone_data inValue) {
+bool spine_array_bone_data_contains(spine_array_bone_data array, spine_bone_data inValue) {
 	Array<BoneData *> *_array = (Array<BoneData *> *) array;
 	return _array->contains((BoneData *) inValue);
 }
 
-int spine_array_bone_data_index_of(spine_array_bone_data array, /*@null*/ spine_bone_data inValue) {
+int spine_array_bone_data_index_of(spine_array_bone_data array, spine_bone_data inValue) {
 	Array<BoneData *> *_array = (Array<BoneData *> *) array;
 	return _array->indexOf((BoneData *) inValue);
 }
@@ -760,7 +757,7 @@ size_t spine_array_bone_pose_size(spine_array_bone_pose array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_bone_pose spine_array_bone_pose_set_size(spine_array_bone_pose array, size_t newSize, /*@null*/ spine_bone_pose defaultValue) {
+spine_array_bone_pose spine_array_bone_pose_set_size(spine_array_bone_pose array, size_t newSize, spine_bone_pose defaultValue) {
 	Array<BonePose *> *_array = (Array<BonePose *> *) array;
 	return (spine_array_bone_pose) &_array->setSize(newSize, (BonePose *) defaultValue);
 }
@@ -770,17 +767,17 @@ void spine_array_bone_pose_ensure_capacity(spine_array_bone_pose array, size_t n
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_bone_pose_add(spine_array_bone_pose array, /*@null*/ spine_bone_pose inValue) {
+void spine_array_bone_pose_add(spine_array_bone_pose array, spine_bone_pose inValue) {
 	Array<BonePose *> *_array = (Array<BonePose *> *) array;
 	_array->add((BonePose *) inValue);
 }
 
-void spine_array_bone_pose_add_all(spine_array_bone_pose array, /*@null*/ spine_array_bone_pose inValue) {
+void spine_array_bone_pose_add_all(spine_array_bone_pose array, spine_array_bone_pose inValue) {
 	Array<BonePose *> *_array = (Array<BonePose *> *) array;
 	_array->addAll(*((const Array<BonePose *> *) inValue));
 }
 
-void spine_array_bone_pose_clear_and_add_all(spine_array_bone_pose array, /*@null*/ spine_array_bone_pose inValue) {
+void spine_array_bone_pose_clear_and_add_all(spine_array_bone_pose array, spine_array_bone_pose inValue) {
 	Array<BonePose *> *_array = (Array<BonePose *> *) array;
 	_array->clearAndAddAll(*((const Array<BonePose *> *) inValue));
 }
@@ -790,12 +787,12 @@ void spine_array_bone_pose_remove_at(spine_array_bone_pose array, size_t inIndex
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_bone_pose_contains(spine_array_bone_pose array, /*@null*/ spine_bone_pose inValue) {
+bool spine_array_bone_pose_contains(spine_array_bone_pose array, spine_bone_pose inValue) {
 	Array<BonePose *> *_array = (Array<BonePose *> *) array;
 	return _array->contains((BonePose *) inValue);
 }
 
-int spine_array_bone_pose_index_of(spine_array_bone_pose array, /*@null*/ spine_bone_pose inValue) {
+int spine_array_bone_pose_index_of(spine_array_bone_pose array, spine_bone_pose inValue) {
 	Array<BonePose *> *_array = (Array<BonePose *> *) array;
 	return _array->indexOf((BonePose *) inValue);
 }
@@ -830,8 +827,8 @@ size_t spine_array_bounding_box_attachment_size(spine_array_bounding_box_attachm
 	return _array->size();
 }
 
-/*@null*/ spine_array_bounding_box_attachment spine_array_bounding_box_attachment_set_size(spine_array_bounding_box_attachment array, size_t newSize,
-																						   /*@null*/ spine_bounding_box_attachment defaultValue) {
+spine_array_bounding_box_attachment spine_array_bounding_box_attachment_set_size(spine_array_bounding_box_attachment array, size_t newSize,
+																				 spine_bounding_box_attachment defaultValue) {
 	Array<BoundingBoxAttachment *> *_array = (Array<BoundingBoxAttachment *> *) array;
 	return (spine_array_bounding_box_attachment) &_array->setSize(newSize, (BoundingBoxAttachment *) defaultValue);
 }
@@ -841,18 +838,17 @@ void spine_array_bounding_box_attachment_ensure_capacity(spine_array_bounding_bo
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_bounding_box_attachment_add(spine_array_bounding_box_attachment array, /*@null*/ spine_bounding_box_attachment inValue) {
+void spine_array_bounding_box_attachment_add(spine_array_bounding_box_attachment array, spine_bounding_box_attachment inValue) {
 	Array<BoundingBoxAttachment *> *_array = (Array<BoundingBoxAttachment *> *) array;
 	_array->add((BoundingBoxAttachment *) inValue);
 }
 
-void spine_array_bounding_box_attachment_add_all(spine_array_bounding_box_attachment array, /*@null*/ spine_array_bounding_box_attachment inValue) {
+void spine_array_bounding_box_attachment_add_all(spine_array_bounding_box_attachment array, spine_array_bounding_box_attachment inValue) {
 	Array<BoundingBoxAttachment *> *_array = (Array<BoundingBoxAttachment *> *) array;
 	_array->addAll(*((const Array<BoundingBoxAttachment *> *) inValue));
 }
 
-void spine_array_bounding_box_attachment_clear_and_add_all(spine_array_bounding_box_attachment array,
-														   /*@null*/ spine_array_bounding_box_attachment inValue) {
+void spine_array_bounding_box_attachment_clear_and_add_all(spine_array_bounding_box_attachment array, spine_array_bounding_box_attachment inValue) {
 	Array<BoundingBoxAttachment *> *_array = (Array<BoundingBoxAttachment *> *) array;
 	_array->clearAndAddAll(*((const Array<BoundingBoxAttachment *> *) inValue));
 }
@@ -862,12 +858,12 @@ void spine_array_bounding_box_attachment_remove_at(spine_array_bounding_box_atta
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_bounding_box_attachment_contains(spine_array_bounding_box_attachment array, /*@null*/ spine_bounding_box_attachment inValue) {
+bool spine_array_bounding_box_attachment_contains(spine_array_bounding_box_attachment array, spine_bounding_box_attachment inValue) {
 	Array<BoundingBoxAttachment *> *_array = (Array<BoundingBoxAttachment *> *) array;
 	return _array->contains((BoundingBoxAttachment *) inValue);
 }
 
-int spine_array_bounding_box_attachment_index_of(spine_array_bounding_box_attachment array, /*@null*/ spine_bounding_box_attachment inValue) {
+int spine_array_bounding_box_attachment_index_of(spine_array_bounding_box_attachment array, spine_bounding_box_attachment inValue) {
 	Array<BoundingBoxAttachment *> *_array = (Array<BoundingBoxAttachment *> *) array;
 	return _array->indexOf((BoundingBoxAttachment *) inValue);
 }
@@ -902,8 +898,7 @@ size_t spine_array_constraint_size(spine_array_constraint array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_constraint spine_array_constraint_set_size(spine_array_constraint array, size_t newSize,
-																 /*@null*/ spine_constraint defaultValue) {
+spine_array_constraint spine_array_constraint_set_size(spine_array_constraint array, size_t newSize, spine_constraint defaultValue) {
 	Array<Constraint *> *_array = (Array<Constraint *> *) array;
 	return (spine_array_constraint) &_array->setSize(newSize, (Constraint *) defaultValue);
 }
@@ -913,17 +908,17 @@ void spine_array_constraint_ensure_capacity(spine_array_constraint array, size_t
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_constraint_add(spine_array_constraint array, /*@null*/ spine_constraint inValue) {
+void spine_array_constraint_add(spine_array_constraint array, spine_constraint inValue) {
 	Array<Constraint *> *_array = (Array<Constraint *> *) array;
 	_array->add((Constraint *) inValue);
 }
 
-void spine_array_constraint_add_all(spine_array_constraint array, /*@null*/ spine_array_constraint inValue) {
+void spine_array_constraint_add_all(spine_array_constraint array, spine_array_constraint inValue) {
 	Array<Constraint *> *_array = (Array<Constraint *> *) array;
 	_array->addAll(*((const Array<Constraint *> *) inValue));
 }
 
-void spine_array_constraint_clear_and_add_all(spine_array_constraint array, /*@null*/ spine_array_constraint inValue) {
+void spine_array_constraint_clear_and_add_all(spine_array_constraint array, spine_array_constraint inValue) {
 	Array<Constraint *> *_array = (Array<Constraint *> *) array;
 	_array->clearAndAddAll(*((const Array<Constraint *> *) inValue));
 }
@@ -933,12 +928,12 @@ void spine_array_constraint_remove_at(spine_array_constraint array, size_t inInd
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_constraint_contains(spine_array_constraint array, /*@null*/ spine_constraint inValue) {
+bool spine_array_constraint_contains(spine_array_constraint array, spine_constraint inValue) {
 	Array<Constraint *> *_array = (Array<Constraint *> *) array;
 	return _array->contains((Constraint *) inValue);
 }
 
-int spine_array_constraint_index_of(spine_array_constraint array, /*@null*/ spine_constraint inValue) {
+int spine_array_constraint_index_of(spine_array_constraint array, spine_constraint inValue) {
 	Array<Constraint *> *_array = (Array<Constraint *> *) array;
 	return _array->indexOf((Constraint *) inValue);
 }
@@ -973,8 +968,8 @@ size_t spine_array_constraint_data_size(spine_array_constraint_data array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_constraint_data spine_array_constraint_data_set_size(spine_array_constraint_data array, size_t newSize,
-																		   /*@null*/ spine_constraint_data defaultValue) {
+spine_array_constraint_data spine_array_constraint_data_set_size(spine_array_constraint_data array, size_t newSize,
+																 spine_constraint_data defaultValue) {
 	Array<ConstraintData *> *_array = (Array<ConstraintData *> *) array;
 	return (spine_array_constraint_data) &_array->setSize(newSize, (ConstraintData *) defaultValue);
 }
@@ -984,17 +979,17 @@ void spine_array_constraint_data_ensure_capacity(spine_array_constraint_data arr
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_constraint_data_add(spine_array_constraint_data array, /*@null*/ spine_constraint_data inValue) {
+void spine_array_constraint_data_add(spine_array_constraint_data array, spine_constraint_data inValue) {
 	Array<ConstraintData *> *_array = (Array<ConstraintData *> *) array;
 	_array->add((ConstraintData *) inValue);
 }
 
-void spine_array_constraint_data_add_all(spine_array_constraint_data array, /*@null*/ spine_array_constraint_data inValue) {
+void spine_array_constraint_data_add_all(spine_array_constraint_data array, spine_array_constraint_data inValue) {
 	Array<ConstraintData *> *_array = (Array<ConstraintData *> *) array;
 	_array->addAll(*((const Array<ConstraintData *> *) inValue));
 }
 
-void spine_array_constraint_data_clear_and_add_all(spine_array_constraint_data array, /*@null*/ spine_array_constraint_data inValue) {
+void spine_array_constraint_data_clear_and_add_all(spine_array_constraint_data array, spine_array_constraint_data inValue) {
 	Array<ConstraintData *> *_array = (Array<ConstraintData *> *) array;
 	_array->clearAndAddAll(*((const Array<ConstraintData *> *) inValue));
 }
@@ -1004,12 +999,12 @@ void spine_array_constraint_data_remove_at(spine_array_constraint_data array, si
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_constraint_data_contains(spine_array_constraint_data array, /*@null*/ spine_constraint_data inValue) {
+bool spine_array_constraint_data_contains(spine_array_constraint_data array, spine_constraint_data inValue) {
 	Array<ConstraintData *> *_array = (Array<ConstraintData *> *) array;
 	return _array->contains((ConstraintData *) inValue);
 }
 
-int spine_array_constraint_data_index_of(spine_array_constraint_data array, /*@null*/ spine_constraint_data inValue) {
+int spine_array_constraint_data_index_of(spine_array_constraint_data array, spine_constraint_data inValue) {
 	Array<ConstraintData *> *_array = (Array<ConstraintData *> *) array;
 	return _array->indexOf((ConstraintData *) inValue);
 }
@@ -1044,7 +1039,7 @@ size_t spine_array_event_size(spine_array_event array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_event spine_array_event_set_size(spine_array_event array, size_t newSize, /*@null*/ spine_event defaultValue) {
+spine_array_event spine_array_event_set_size(spine_array_event array, size_t newSize, spine_event defaultValue) {
 	Array<Event *> *_array = (Array<Event *> *) array;
 	return (spine_array_event) &_array->setSize(newSize, (Event *) defaultValue);
 }
@@ -1054,17 +1049,17 @@ void spine_array_event_ensure_capacity(spine_array_event array, size_t newCapaci
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_event_add(spine_array_event array, /*@null*/ spine_event inValue) {
+void spine_array_event_add(spine_array_event array, spine_event inValue) {
 	Array<Event *> *_array = (Array<Event *> *) array;
 	_array->add((Event *) inValue);
 }
 
-void spine_array_event_add_all(spine_array_event array, /*@null*/ spine_array_event inValue) {
+void spine_array_event_add_all(spine_array_event array, spine_array_event inValue) {
 	Array<Event *> *_array = (Array<Event *> *) array;
 	_array->addAll(*((const Array<Event *> *) inValue));
 }
 
-void spine_array_event_clear_and_add_all(spine_array_event array, /*@null*/ spine_array_event inValue) {
+void spine_array_event_clear_and_add_all(spine_array_event array, spine_array_event inValue) {
 	Array<Event *> *_array = (Array<Event *> *) array;
 	_array->clearAndAddAll(*((const Array<Event *> *) inValue));
 }
@@ -1074,12 +1069,12 @@ void spine_array_event_remove_at(spine_array_event array, size_t inIndex) {
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_event_contains(spine_array_event array, /*@null*/ spine_event inValue) {
+bool spine_array_event_contains(spine_array_event array, spine_event inValue) {
 	Array<Event *> *_array = (Array<Event *> *) array;
 	return _array->contains((Event *) inValue);
 }
 
-int spine_array_event_index_of(spine_array_event array, /*@null*/ spine_event inValue) {
+int spine_array_event_index_of(spine_array_event array, spine_event inValue) {
 	Array<Event *> *_array = (Array<Event *> *) array;
 	return _array->indexOf((Event *) inValue);
 }
@@ -1114,8 +1109,7 @@ size_t spine_array_event_data_size(spine_array_event_data array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_event_data spine_array_event_data_set_size(spine_array_event_data array, size_t newSize,
-																 /*@null*/ spine_event_data defaultValue) {
+spine_array_event_data spine_array_event_data_set_size(spine_array_event_data array, size_t newSize, spine_event_data defaultValue) {
 	Array<EventData *> *_array = (Array<EventData *> *) array;
 	return (spine_array_event_data) &_array->setSize(newSize, (EventData *) defaultValue);
 }
@@ -1125,17 +1119,17 @@ void spine_array_event_data_ensure_capacity(spine_array_event_data array, size_t
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_event_data_add(spine_array_event_data array, /*@null*/ spine_event_data inValue) {
+void spine_array_event_data_add(spine_array_event_data array, spine_event_data inValue) {
 	Array<EventData *> *_array = (Array<EventData *> *) array;
 	_array->add((EventData *) inValue);
 }
 
-void spine_array_event_data_add_all(spine_array_event_data array, /*@null*/ spine_array_event_data inValue) {
+void spine_array_event_data_add_all(spine_array_event_data array, spine_array_event_data inValue) {
 	Array<EventData *> *_array = (Array<EventData *> *) array;
 	_array->addAll(*((const Array<EventData *> *) inValue));
 }
 
-void spine_array_event_data_clear_and_add_all(spine_array_event_data array, /*@null*/ spine_array_event_data inValue) {
+void spine_array_event_data_clear_and_add_all(spine_array_event_data array, spine_array_event_data inValue) {
 	Array<EventData *> *_array = (Array<EventData *> *) array;
 	_array->clearAndAddAll(*((const Array<EventData *> *) inValue));
 }
@@ -1145,12 +1139,12 @@ void spine_array_event_data_remove_at(spine_array_event_data array, size_t inInd
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_event_data_contains(spine_array_event_data array, /*@null*/ spine_event_data inValue) {
+bool spine_array_event_data_contains(spine_array_event_data array, spine_event_data inValue) {
 	Array<EventData *> *_array = (Array<EventData *> *) array;
 	return _array->contains((EventData *) inValue);
 }
 
-int spine_array_event_data_index_of(spine_array_event_data array, /*@null*/ spine_event_data inValue) {
+int spine_array_event_data_index_of(spine_array_event_data array, spine_event_data inValue) {
 	Array<EventData *> *_array = (Array<EventData *> *) array;
 	return _array->indexOf((EventData *) inValue);
 }
@@ -1185,8 +1179,7 @@ size_t spine_array_from_property_size(spine_array_from_property array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_from_property spine_array_from_property_set_size(spine_array_from_property array, size_t newSize,
-																	   /*@null*/ spine_from_property defaultValue) {
+spine_array_from_property spine_array_from_property_set_size(spine_array_from_property array, size_t newSize, spine_from_property defaultValue) {
 	Array<FromProperty *> *_array = (Array<FromProperty *> *) array;
 	return (spine_array_from_property) &_array->setSize(newSize, (FromProperty *) defaultValue);
 }
@@ -1196,17 +1189,17 @@ void spine_array_from_property_ensure_capacity(spine_array_from_property array,
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_from_property_add(spine_array_from_property array, /*@null*/ spine_from_property inValue) {
+void spine_array_from_property_add(spine_array_from_property array, spine_from_property inValue) {
 	Array<FromProperty *> *_array = (Array<FromProperty *> *) array;
 	_array->add((FromProperty *) inValue);
 }
 
-void spine_array_from_property_add_all(spine_array_from_property array, /*@null*/ spine_array_from_property inValue) {
+void spine_array_from_property_add_all(spine_array_from_property array, spine_array_from_property inValue) {
 	Array<FromProperty *> *_array = (Array<FromProperty *> *) array;
 	_array->addAll(*((const Array<FromProperty *> *) inValue));
 }
 
-void spine_array_from_property_clear_and_add_all(spine_array_from_property array, /*@null*/ spine_array_from_property inValue) {
+void spine_array_from_property_clear_and_add_all(spine_array_from_property array, spine_array_from_property inValue) {
 	Array<FromProperty *> *_array = (Array<FromProperty *> *) array;
 	_array->clearAndAddAll(*((const Array<FromProperty *> *) inValue));
 }
@@ -1216,12 +1209,12 @@ void spine_array_from_property_remove_at(spine_array_from_property array, size_t
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_from_property_contains(spine_array_from_property array, /*@null*/ spine_from_property inValue) {
+bool spine_array_from_property_contains(spine_array_from_property array, spine_from_property inValue) {
 	Array<FromProperty *> *_array = (Array<FromProperty *> *) array;
 	return _array->contains((FromProperty *) inValue);
 }
 
-int spine_array_from_property_index_of(spine_array_from_property array, /*@null*/ spine_from_property inValue) {
+int spine_array_from_property_index_of(spine_array_from_property array, spine_from_property inValue) {
 	Array<FromProperty *> *_array = (Array<FromProperty *> *) array;
 	return _array->indexOf((FromProperty *) inValue);
 }
@@ -1256,8 +1249,8 @@ size_t spine_array_physics_constraint_size(spine_array_physics_constraint array)
 	return _array->size();
 }
 
-/*@null*/ spine_array_physics_constraint spine_array_physics_constraint_set_size(spine_array_physics_constraint array, size_t newSize,
-																				 /*@null*/ spine_physics_constraint defaultValue) {
+spine_array_physics_constraint spine_array_physics_constraint_set_size(spine_array_physics_constraint array, size_t newSize,
+																	   spine_physics_constraint defaultValue) {
 	Array<PhysicsConstraint *> *_array = (Array<PhysicsConstraint *> *) array;
 	return (spine_array_physics_constraint) &_array->setSize(newSize, (PhysicsConstraint *) defaultValue);
 }
@@ -1267,17 +1260,17 @@ void spine_array_physics_constraint_ensure_capacity(spine_array_physics_constrai
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_physics_constraint_add(spine_array_physics_constraint array, /*@null*/ spine_physics_constraint inValue) {
+void spine_array_physics_constraint_add(spine_array_physics_constraint array, spine_physics_constraint inValue) {
 	Array<PhysicsConstraint *> *_array = (Array<PhysicsConstraint *> *) array;
 	_array->add((PhysicsConstraint *) inValue);
 }
 
-void spine_array_physics_constraint_add_all(spine_array_physics_constraint array, /*@null*/ spine_array_physics_constraint inValue) {
+void spine_array_physics_constraint_add_all(spine_array_physics_constraint array, spine_array_physics_constraint inValue) {
 	Array<PhysicsConstraint *> *_array = (Array<PhysicsConstraint *> *) array;
 	_array->addAll(*((const Array<PhysicsConstraint *> *) inValue));
 }
 
-void spine_array_physics_constraint_clear_and_add_all(spine_array_physics_constraint array, /*@null*/ spine_array_physics_constraint inValue) {
+void spine_array_physics_constraint_clear_and_add_all(spine_array_physics_constraint array, spine_array_physics_constraint inValue) {
 	Array<PhysicsConstraint *> *_array = (Array<PhysicsConstraint *> *) array;
 	_array->clearAndAddAll(*((const Array<PhysicsConstraint *> *) inValue));
 }
@@ -1287,12 +1280,12 @@ void spine_array_physics_constraint_remove_at(spine_array_physics_constraint arr
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_physics_constraint_contains(spine_array_physics_constraint array, /*@null*/ spine_physics_constraint inValue) {
+bool spine_array_physics_constraint_contains(spine_array_physics_constraint array, spine_physics_constraint inValue) {
 	Array<PhysicsConstraint *> *_array = (Array<PhysicsConstraint *> *) array;
 	return _array->contains((PhysicsConstraint *) inValue);
 }
 
-int spine_array_physics_constraint_index_of(spine_array_physics_constraint array, /*@null*/ spine_physics_constraint inValue) {
+int spine_array_physics_constraint_index_of(spine_array_physics_constraint array, spine_physics_constraint inValue) {
 	Array<PhysicsConstraint *> *_array = (Array<PhysicsConstraint *> *) array;
 	return _array->indexOf((PhysicsConstraint *) inValue);
 }
@@ -1327,7 +1320,7 @@ size_t spine_array_polygon_size(spine_array_polygon array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_polygon spine_array_polygon_set_size(spine_array_polygon array, size_t newSize, /*@null*/ spine_polygon defaultValue) {
+spine_array_polygon spine_array_polygon_set_size(spine_array_polygon array, size_t newSize, spine_polygon defaultValue) {
 	Array<Polygon *> *_array = (Array<Polygon *> *) array;
 	return (spine_array_polygon) &_array->setSize(newSize, (Polygon *) defaultValue);
 }
@@ -1337,17 +1330,17 @@ void spine_array_polygon_ensure_capacity(spine_array_polygon array, size_t newCa
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_polygon_add(spine_array_polygon array, /*@null*/ spine_polygon inValue) {
+void spine_array_polygon_add(spine_array_polygon array, spine_polygon inValue) {
 	Array<Polygon *> *_array = (Array<Polygon *> *) array;
 	_array->add((Polygon *) inValue);
 }
 
-void spine_array_polygon_add_all(spine_array_polygon array, /*@null*/ spine_array_polygon inValue) {
+void spine_array_polygon_add_all(spine_array_polygon array, spine_array_polygon inValue) {
 	Array<Polygon *> *_array = (Array<Polygon *> *) array;
 	_array->addAll(*((const Array<Polygon *> *) inValue));
 }
 
-void spine_array_polygon_clear_and_add_all(spine_array_polygon array, /*@null*/ spine_array_polygon inValue) {
+void spine_array_polygon_clear_and_add_all(spine_array_polygon array, spine_array_polygon inValue) {
 	Array<Polygon *> *_array = (Array<Polygon *> *) array;
 	_array->clearAndAddAll(*((const Array<Polygon *> *) inValue));
 }
@@ -1357,12 +1350,12 @@ void spine_array_polygon_remove_at(spine_array_polygon array, size_t inIndex) {
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_polygon_contains(spine_array_polygon array, /*@null*/ spine_polygon inValue) {
+bool spine_array_polygon_contains(spine_array_polygon array, spine_polygon inValue) {
 	Array<Polygon *> *_array = (Array<Polygon *> *) array;
 	return _array->contains((Polygon *) inValue);
 }
 
-int spine_array_polygon_index_of(spine_array_polygon array, /*@null*/ spine_polygon inValue) {
+int spine_array_polygon_index_of(spine_array_polygon array, spine_polygon inValue) {
 	Array<Polygon *> *_array = (Array<Polygon *> *) array;
 	return _array->indexOf((Polygon *) inValue);
 }
@@ -1397,7 +1390,7 @@ size_t spine_array_skin_size(spine_array_skin array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_skin spine_array_skin_set_size(spine_array_skin array, size_t newSize, /*@null*/ spine_skin defaultValue) {
+spine_array_skin spine_array_skin_set_size(spine_array_skin array, size_t newSize, spine_skin defaultValue) {
 	Array<Skin *> *_array = (Array<Skin *> *) array;
 	return (spine_array_skin) &_array->setSize(newSize, (Skin *) defaultValue);
 }
@@ -1407,17 +1400,17 @@ void spine_array_skin_ensure_capacity(spine_array_skin array, size_t newCapacity
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_skin_add(spine_array_skin array, /*@null*/ spine_skin inValue) {
+void spine_array_skin_add(spine_array_skin array, spine_skin inValue) {
 	Array<Skin *> *_array = (Array<Skin *> *) array;
 	_array->add((Skin *) inValue);
 }
 
-void spine_array_skin_add_all(spine_array_skin array, /*@null*/ spine_array_skin inValue) {
+void spine_array_skin_add_all(spine_array_skin array, spine_array_skin inValue) {
 	Array<Skin *> *_array = (Array<Skin *> *) array;
 	_array->addAll(*((const Array<Skin *> *) inValue));
 }
 
-void spine_array_skin_clear_and_add_all(spine_array_skin array, /*@null*/ spine_array_skin inValue) {
+void spine_array_skin_clear_and_add_all(spine_array_skin array, spine_array_skin inValue) {
 	Array<Skin *> *_array = (Array<Skin *> *) array;
 	_array->clearAndAddAll(*((const Array<Skin *> *) inValue));
 }
@@ -1427,12 +1420,12 @@ void spine_array_skin_remove_at(spine_array_skin array, size_t inIndex) {
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_skin_contains(spine_array_skin array, /*@null*/ spine_skin inValue) {
+bool spine_array_skin_contains(spine_array_skin array, spine_skin inValue) {
 	Array<Skin *> *_array = (Array<Skin *> *) array;
 	return _array->contains((Skin *) inValue);
 }
 
-int spine_array_skin_index_of(spine_array_skin array, /*@null*/ spine_skin inValue) {
+int spine_array_skin_index_of(spine_array_skin array, spine_skin inValue) {
 	Array<Skin *> *_array = (Array<Skin *> *) array;
 	return _array->indexOf((Skin *) inValue);
 }
@@ -1467,7 +1460,7 @@ size_t spine_array_slot_size(spine_array_slot array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_slot spine_array_slot_set_size(spine_array_slot array, size_t newSize, /*@null*/ spine_slot defaultValue) {
+spine_array_slot spine_array_slot_set_size(spine_array_slot array, size_t newSize, spine_slot defaultValue) {
 	Array<Slot *> *_array = (Array<Slot *> *) array;
 	return (spine_array_slot) &_array->setSize(newSize, (Slot *) defaultValue);
 }
@@ -1477,17 +1470,17 @@ void spine_array_slot_ensure_capacity(spine_array_slot array, size_t newCapacity
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_slot_add(spine_array_slot array, /*@null*/ spine_slot inValue) {
+void spine_array_slot_add(spine_array_slot array, spine_slot inValue) {
 	Array<Slot *> *_array = (Array<Slot *> *) array;
 	_array->add((Slot *) inValue);
 }
 
-void spine_array_slot_add_all(spine_array_slot array, /*@null*/ spine_array_slot inValue) {
+void spine_array_slot_add_all(spine_array_slot array, spine_array_slot inValue) {
 	Array<Slot *> *_array = (Array<Slot *> *) array;
 	_array->addAll(*((const Array<Slot *> *) inValue));
 }
 
-void spine_array_slot_clear_and_add_all(spine_array_slot array, /*@null*/ spine_array_slot inValue) {
+void spine_array_slot_clear_and_add_all(spine_array_slot array, spine_array_slot inValue) {
 	Array<Slot *> *_array = (Array<Slot *> *) array;
 	_array->clearAndAddAll(*((const Array<Slot *> *) inValue));
 }
@@ -1497,12 +1490,12 @@ void spine_array_slot_remove_at(spine_array_slot array, size_t inIndex) {
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_slot_contains(spine_array_slot array, /*@null*/ spine_slot inValue) {
+bool spine_array_slot_contains(spine_array_slot array, spine_slot inValue) {
 	Array<Slot *> *_array = (Array<Slot *> *) array;
 	return _array->contains((Slot *) inValue);
 }
 
-int spine_array_slot_index_of(spine_array_slot array, /*@null*/ spine_slot inValue) {
+int spine_array_slot_index_of(spine_array_slot array, spine_slot inValue) {
 	Array<Slot *> *_array = (Array<Slot *> *) array;
 	return _array->indexOf((Slot *) inValue);
 }
@@ -1537,7 +1530,7 @@ size_t spine_array_slot_data_size(spine_array_slot_data array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_slot_data spine_array_slot_data_set_size(spine_array_slot_data array, size_t newSize, /*@null*/ spine_slot_data defaultValue) {
+spine_array_slot_data spine_array_slot_data_set_size(spine_array_slot_data array, size_t newSize, spine_slot_data defaultValue) {
 	Array<SlotData *> *_array = (Array<SlotData *> *) array;
 	return (spine_array_slot_data) &_array->setSize(newSize, (SlotData *) defaultValue);
 }
@@ -1547,17 +1540,17 @@ void spine_array_slot_data_ensure_capacity(spine_array_slot_data array, size_t n
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_slot_data_add(spine_array_slot_data array, /*@null*/ spine_slot_data inValue) {
+void spine_array_slot_data_add(spine_array_slot_data array, spine_slot_data inValue) {
 	Array<SlotData *> *_array = (Array<SlotData *> *) array;
 	_array->add((SlotData *) inValue);
 }
 
-void spine_array_slot_data_add_all(spine_array_slot_data array, /*@null*/ spine_array_slot_data inValue) {
+void spine_array_slot_data_add_all(spine_array_slot_data array, spine_array_slot_data inValue) {
 	Array<SlotData *> *_array = (Array<SlotData *> *) array;
 	_array->addAll(*((const Array<SlotData *> *) inValue));
 }
 
-void spine_array_slot_data_clear_and_add_all(spine_array_slot_data array, /*@null*/ spine_array_slot_data inValue) {
+void spine_array_slot_data_clear_and_add_all(spine_array_slot_data array, spine_array_slot_data inValue) {
 	Array<SlotData *> *_array = (Array<SlotData *> *) array;
 	_array->clearAndAddAll(*((const Array<SlotData *> *) inValue));
 }
@@ -1567,12 +1560,12 @@ void spine_array_slot_data_remove_at(spine_array_slot_data array, size_t inIndex
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_slot_data_contains(spine_array_slot_data array, /*@null*/ spine_slot_data inValue) {
+bool spine_array_slot_data_contains(spine_array_slot_data array, spine_slot_data inValue) {
 	Array<SlotData *> *_array = (Array<SlotData *> *) array;
 	return _array->contains((SlotData *) inValue);
 }
 
-int spine_array_slot_data_index_of(spine_array_slot_data array, /*@null*/ spine_slot_data inValue) {
+int spine_array_slot_data_index_of(spine_array_slot_data array, spine_slot_data inValue) {
 	Array<SlotData *> *_array = (Array<SlotData *> *) array;
 	return _array->indexOf((SlotData *) inValue);
 }
@@ -1607,8 +1600,7 @@ size_t spine_array_texture_region_size(spine_array_texture_region array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_texture_region spine_array_texture_region_set_size(spine_array_texture_region array, size_t newSize,
-																		 /*@null*/ spine_texture_region defaultValue) {
+spine_array_texture_region spine_array_texture_region_set_size(spine_array_texture_region array, size_t newSize, spine_texture_region defaultValue) {
 	Array<TextureRegion *> *_array = (Array<TextureRegion *> *) array;
 	return (spine_array_texture_region) &_array->setSize(newSize, (TextureRegion *) defaultValue);
 }
@@ -1618,17 +1610,17 @@ void spine_array_texture_region_ensure_capacity(spine_array_texture_region array
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_texture_region_add(spine_array_texture_region array, /*@null*/ spine_texture_region inValue) {
+void spine_array_texture_region_add(spine_array_texture_region array, spine_texture_region inValue) {
 	Array<TextureRegion *> *_array = (Array<TextureRegion *> *) array;
 	_array->add((TextureRegion *) inValue);
 }
 
-void spine_array_texture_region_add_all(spine_array_texture_region array, /*@null*/ spine_array_texture_region inValue) {
+void spine_array_texture_region_add_all(spine_array_texture_region array, spine_array_texture_region inValue) {
 	Array<TextureRegion *> *_array = (Array<TextureRegion *> *) array;
 	_array->addAll(*((const Array<TextureRegion *> *) inValue));
 }
 
-void spine_array_texture_region_clear_and_add_all(spine_array_texture_region array, /*@null*/ spine_array_texture_region inValue) {
+void spine_array_texture_region_clear_and_add_all(spine_array_texture_region array, spine_array_texture_region inValue) {
 	Array<TextureRegion *> *_array = (Array<TextureRegion *> *) array;
 	_array->clearAndAddAll(*((const Array<TextureRegion *> *) inValue));
 }
@@ -1638,12 +1630,12 @@ void spine_array_texture_region_remove_at(spine_array_texture_region array, size
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_texture_region_contains(spine_array_texture_region array, /*@null*/ spine_texture_region inValue) {
+bool spine_array_texture_region_contains(spine_array_texture_region array, spine_texture_region inValue) {
 	Array<TextureRegion *> *_array = (Array<TextureRegion *> *) array;
 	return _array->contains((TextureRegion *) inValue);
 }
 
-int spine_array_texture_region_index_of(spine_array_texture_region array, /*@null*/ spine_texture_region inValue) {
+int spine_array_texture_region_index_of(spine_array_texture_region array, spine_texture_region inValue) {
 	Array<TextureRegion *> *_array = (Array<TextureRegion *> *) array;
 	return _array->indexOf((TextureRegion *) inValue);
 }
@@ -1678,7 +1670,7 @@ size_t spine_array_timeline_size(spine_array_timeline array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_timeline spine_array_timeline_set_size(spine_array_timeline array, size_t newSize, /*@null*/ spine_timeline defaultValue) {
+spine_array_timeline spine_array_timeline_set_size(spine_array_timeline array, size_t newSize, spine_timeline defaultValue) {
 	Array<Timeline *> *_array = (Array<Timeline *> *) array;
 	return (spine_array_timeline) &_array->setSize(newSize, (Timeline *) defaultValue);
 }
@@ -1688,17 +1680,17 @@ void spine_array_timeline_ensure_capacity(spine_array_timeline array, size_t new
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_timeline_add(spine_array_timeline array, /*@null*/ spine_timeline inValue) {
+void spine_array_timeline_add(spine_array_timeline array, spine_timeline inValue) {
 	Array<Timeline *> *_array = (Array<Timeline *> *) array;
 	_array->add((Timeline *) inValue);
 }
 
-void spine_array_timeline_add_all(spine_array_timeline array, /*@null*/ spine_array_timeline inValue) {
+void spine_array_timeline_add_all(spine_array_timeline array, spine_array_timeline inValue) {
 	Array<Timeline *> *_array = (Array<Timeline *> *) array;
 	_array->addAll(*((const Array<Timeline *> *) inValue));
 }
 
-void spine_array_timeline_clear_and_add_all(spine_array_timeline array, /*@null*/ spine_array_timeline inValue) {
+void spine_array_timeline_clear_and_add_all(spine_array_timeline array, spine_array_timeline inValue) {
 	Array<Timeline *> *_array = (Array<Timeline *> *) array;
 	_array->clearAndAddAll(*((const Array<Timeline *> *) inValue));
 }
@@ -1708,12 +1700,12 @@ void spine_array_timeline_remove_at(spine_array_timeline array, size_t inIndex)
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_timeline_contains(spine_array_timeline array, /*@null*/ spine_timeline inValue) {
+bool spine_array_timeline_contains(spine_array_timeline array, spine_timeline inValue) {
 	Array<Timeline *> *_array = (Array<Timeline *> *) array;
 	return _array->contains((Timeline *) inValue);
 }
 
-int spine_array_timeline_index_of(spine_array_timeline array, /*@null*/ spine_timeline inValue) {
+int spine_array_timeline_index_of(spine_array_timeline array, spine_timeline inValue) {
 	Array<Timeline *> *_array = (Array<Timeline *> *) array;
 	return _array->indexOf((Timeline *) inValue);
 }
@@ -1748,8 +1740,7 @@ size_t spine_array_to_property_size(spine_array_to_property array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_to_property spine_array_to_property_set_size(spine_array_to_property array, size_t newSize,
-																   /*@null*/ spine_to_property defaultValue) {
+spine_array_to_property spine_array_to_property_set_size(spine_array_to_property array, size_t newSize, spine_to_property defaultValue) {
 	Array<ToProperty *> *_array = (Array<ToProperty *> *) array;
 	return (spine_array_to_property) &_array->setSize(newSize, (ToProperty *) defaultValue);
 }
@@ -1759,17 +1750,17 @@ void spine_array_to_property_ensure_capacity(spine_array_to_property array, size
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_to_property_add(spine_array_to_property array, /*@null*/ spine_to_property inValue) {
+void spine_array_to_property_add(spine_array_to_property array, spine_to_property inValue) {
 	Array<ToProperty *> *_array = (Array<ToProperty *> *) array;
 	_array->add((ToProperty *) inValue);
 }
 
-void spine_array_to_property_add_all(spine_array_to_property array, /*@null*/ spine_array_to_property inValue) {
+void spine_array_to_property_add_all(spine_array_to_property array, spine_array_to_property inValue) {
 	Array<ToProperty *> *_array = (Array<ToProperty *> *) array;
 	_array->addAll(*((const Array<ToProperty *> *) inValue));
 }
 
-void spine_array_to_property_clear_and_add_all(spine_array_to_property array, /*@null*/ spine_array_to_property inValue) {
+void spine_array_to_property_clear_and_add_all(spine_array_to_property array, spine_array_to_property inValue) {
 	Array<ToProperty *> *_array = (Array<ToProperty *> *) array;
 	_array->clearAndAddAll(*((const Array<ToProperty *> *) inValue));
 }
@@ -1779,12 +1770,12 @@ void spine_array_to_property_remove_at(spine_array_to_property array, size_t inI
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_to_property_contains(spine_array_to_property array, /*@null*/ spine_to_property inValue) {
+bool spine_array_to_property_contains(spine_array_to_property array, spine_to_property inValue) {
 	Array<ToProperty *> *_array = (Array<ToProperty *> *) array;
 	return _array->contains((ToProperty *) inValue);
 }
 
-int spine_array_to_property_index_of(spine_array_to_property array, /*@null*/ spine_to_property inValue) {
+int spine_array_to_property_index_of(spine_array_to_property array, spine_to_property inValue) {
 	Array<ToProperty *> *_array = (Array<ToProperty *> *) array;
 	return _array->indexOf((ToProperty *) inValue);
 }
@@ -1819,8 +1810,7 @@ size_t spine_array_track_entry_size(spine_array_track_entry array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_track_entry spine_array_track_entry_set_size(spine_array_track_entry array, size_t newSize,
-																   /*@null*/ spine_track_entry defaultValue) {
+spine_array_track_entry spine_array_track_entry_set_size(spine_array_track_entry array, size_t newSize, spine_track_entry defaultValue) {
 	Array<TrackEntry *> *_array = (Array<TrackEntry *> *) array;
 	return (spine_array_track_entry) &_array->setSize(newSize, (TrackEntry *) defaultValue);
 }
@@ -1830,17 +1820,17 @@ void spine_array_track_entry_ensure_capacity(spine_array_track_entry array, size
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_track_entry_add(spine_array_track_entry array, /*@null*/ spine_track_entry inValue) {
+void spine_array_track_entry_add(spine_array_track_entry array, spine_track_entry inValue) {
 	Array<TrackEntry *> *_array = (Array<TrackEntry *> *) array;
 	_array->add((TrackEntry *) inValue);
 }
 
-void spine_array_track_entry_add_all(spine_array_track_entry array, /*@null*/ spine_array_track_entry inValue) {
+void spine_array_track_entry_add_all(spine_array_track_entry array, spine_array_track_entry inValue) {
 	Array<TrackEntry *> *_array = (Array<TrackEntry *> *) array;
 	_array->addAll(*((const Array<TrackEntry *> *) inValue));
 }
 
-void spine_array_track_entry_clear_and_add_all(spine_array_track_entry array, /*@null*/ spine_array_track_entry inValue) {
+void spine_array_track_entry_clear_and_add_all(spine_array_track_entry array, spine_array_track_entry inValue) {
 	Array<TrackEntry *> *_array = (Array<TrackEntry *> *) array;
 	_array->clearAndAddAll(*((const Array<TrackEntry *> *) inValue));
 }
@@ -1850,12 +1840,12 @@ void spine_array_track_entry_remove_at(spine_array_track_entry array, size_t inI
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_track_entry_contains(spine_array_track_entry array, /*@null*/ spine_track_entry inValue) {
+bool spine_array_track_entry_contains(spine_array_track_entry array, spine_track_entry inValue) {
 	Array<TrackEntry *> *_array = (Array<TrackEntry *> *) array;
 	return _array->contains((TrackEntry *) inValue);
 }
 
-int spine_array_track_entry_index_of(spine_array_track_entry array, /*@null*/ spine_track_entry inValue) {
+int spine_array_track_entry_index_of(spine_array_track_entry array, spine_track_entry inValue) {
 	Array<TrackEntry *> *_array = (Array<TrackEntry *> *) array;
 	return _array->indexOf((TrackEntry *) inValue);
 }
@@ -1890,7 +1880,7 @@ size_t spine_array_update_size(spine_array_update array) {
 	return _array->size();
 }
 
-/*@null*/ spine_array_update spine_array_update_set_size(spine_array_update array, size_t newSize, /*@null*/ spine_update defaultValue) {
+spine_array_update spine_array_update_set_size(spine_array_update array, size_t newSize, spine_update defaultValue) {
 	Array<Update *> *_array = (Array<Update *> *) array;
 	return (spine_array_update) &_array->setSize(newSize, (Update *) defaultValue);
 }
@@ -1900,17 +1890,17 @@ void spine_array_update_ensure_capacity(spine_array_update array, size_t newCapa
 	_array->ensureCapacity(newCapacity);
 }
 
-void spine_array_update_add(spine_array_update array, /*@null*/ spine_update inValue) {
+void spine_array_update_add(spine_array_update array, spine_update inValue) {
 	Array<Update *> *_array = (Array<Update *> *) array;
 	_array->add((Update *) inValue);
 }
 
-void spine_array_update_add_all(spine_array_update array, /*@null*/ spine_array_update inValue) {
+void spine_array_update_add_all(spine_array_update array, spine_array_update inValue) {
 	Array<Update *> *_array = (Array<Update *> *) array;
 	_array->addAll(*((const Array<Update *> *) inValue));
 }
 
-void spine_array_update_clear_and_add_all(spine_array_update array, /*@null*/ spine_array_update inValue) {
+void spine_array_update_clear_and_add_all(spine_array_update array, spine_array_update inValue) {
 	Array<Update *> *_array = (Array<Update *> *) array;
 	_array->clearAndAddAll(*((const Array<Update *> *) inValue));
 }
@@ -1920,12 +1910,12 @@ void spine_array_update_remove_at(spine_array_update array, size_t inIndex) {
 	_array->removeAt(inIndex);
 }
 
-bool spine_array_update_contains(spine_array_update array, /*@null*/ spine_update inValue) {
+bool spine_array_update_contains(spine_array_update array, spine_update inValue) {
 	Array<Update *> *_array = (Array<Update *> *) array;
 	return _array->contains((Update *) inValue);
 }
 
-int spine_array_update_index_of(spine_array_update array, /*@null*/ spine_update inValue) {
+int spine_array_update_index_of(spine_array_update array, spine_update inValue) {
 	Array<Update *> *_array = (Array<Update *> *) array;
 	return _array->indexOf((Update *) inValue);
 }
diff --git a/spine-c/src/generated/arrays.h b/spine-c/src/generated/arrays.h
index ecdc31a0f..6f41af17a 100644
--- a/spine-c/src/generated/arrays.h
+++ b/spine-c/src/generated/arrays.h
@@ -188,22 +188,21 @@ SPINE_C_API size_t spine_array_animation_get_capacity(spine_array_animation arra
 
 SPINE_C_API size_t spine_array_animation_size(spine_array_animation array);
 
-SPINE_C_API /*@null*/ spine_array_animation spine_array_animation_set_size(spine_array_animation array, size_t newSize,
-																		   /*@null*/ spine_animation defaultValue);
+SPINE_C_API spine_array_animation spine_array_animation_set_size(spine_array_animation array, size_t newSize, spine_animation defaultValue);
 
 SPINE_C_API void spine_array_animation_ensure_capacity(spine_array_animation array, size_t newCapacity);
 
-SPINE_C_API void spine_array_animation_add(spine_array_animation array, /*@null*/ spine_animation inValue);
+SPINE_C_API void spine_array_animation_add(spine_array_animation array, spine_animation inValue);
 
-SPINE_C_API void spine_array_animation_add_all(spine_array_animation array, /*@null*/ spine_array_animation inValue);
+SPINE_C_API void spine_array_animation_add_all(spine_array_animation array, spine_array_animation inValue);
 
-SPINE_C_API void spine_array_animation_clear_and_add_all(spine_array_animation array, /*@null*/ spine_array_animation inValue);
+SPINE_C_API void spine_array_animation_clear_and_add_all(spine_array_animation array, spine_array_animation inValue);
 
 SPINE_C_API void spine_array_animation_remove_at(spine_array_animation array, size_t inIndex);
 
-SPINE_C_API bool spine_array_animation_contains(spine_array_animation array, /*@null*/ spine_animation inValue);
+SPINE_C_API bool spine_array_animation_contains(spine_array_animation array, spine_animation inValue);
 
-SPINE_C_API int spine_array_animation_index_of(spine_array_animation array, /*@null*/ spine_animation inValue);
+SPINE_C_API int spine_array_animation_index_of(spine_array_animation array, spine_animation inValue);
 
 SPINE_C_API /*@null*/ spine_animation *spine_array_animation_buffer(spine_array_animation array);
 
@@ -217,22 +216,21 @@ SPINE_C_API size_t spine_array_atlas_page_get_capacity(spine_array_atlas_page ar
 
 SPINE_C_API size_t spine_array_atlas_page_size(spine_array_atlas_page array);
 
-SPINE_C_API /*@null*/ spine_array_atlas_page spine_array_atlas_page_set_size(spine_array_atlas_page array, size_t newSize,
-																			 /*@null*/ spine_atlas_page defaultValue);
+SPINE_C_API spine_array_atlas_page spine_array_atlas_page_set_size(spine_array_atlas_page array, size_t newSize, spine_atlas_page defaultValue);
 
 SPINE_C_API void spine_array_atlas_page_ensure_capacity(spine_array_atlas_page array, size_t newCapacity);
 
-SPINE_C_API void spine_array_atlas_page_add(spine_array_atlas_page array, /*@null*/ spine_atlas_page inValue);
+SPINE_C_API void spine_array_atlas_page_add(spine_array_atlas_page array, spine_atlas_page inValue);
 
-SPINE_C_API void spine_array_atlas_page_add_all(spine_array_atlas_page array, /*@null*/ spine_array_atlas_page inValue);
+SPINE_C_API void spine_array_atlas_page_add_all(spine_array_atlas_page array, spine_array_atlas_page inValue);
 
-SPINE_C_API void spine_array_atlas_page_clear_and_add_all(spine_array_atlas_page array, /*@null*/ spine_array_atlas_page inValue);
+SPINE_C_API void spine_array_atlas_page_clear_and_add_all(spine_array_atlas_page array, spine_array_atlas_page inValue);
 
 SPINE_C_API void spine_array_atlas_page_remove_at(spine_array_atlas_page array, size_t inIndex);
 
-SPINE_C_API bool spine_array_atlas_page_contains(spine_array_atlas_page array, /*@null*/ spine_atlas_page inValue);
+SPINE_C_API bool spine_array_atlas_page_contains(spine_array_atlas_page array, spine_atlas_page inValue);
 
-SPINE_C_API int spine_array_atlas_page_index_of(spine_array_atlas_page array, /*@null*/ spine_atlas_page inValue);
+SPINE_C_API int spine_array_atlas_page_index_of(spine_array_atlas_page array, spine_atlas_page inValue);
 
 SPINE_C_API /*@null*/ spine_atlas_page *spine_array_atlas_page_buffer(spine_array_atlas_page array);
 
@@ -246,22 +244,22 @@ SPINE_C_API size_t spine_array_atlas_region_get_capacity(spine_array_atlas_regio
 
 SPINE_C_API size_t spine_array_atlas_region_size(spine_array_atlas_region array);
 
-SPINE_C_API /*@null*/ spine_array_atlas_region spine_array_atlas_region_set_size(spine_array_atlas_region array, size_t newSize,
-																				 /*@null*/ spine_atlas_region defaultValue);
+SPINE_C_API spine_array_atlas_region spine_array_atlas_region_set_size(spine_array_atlas_region array, size_t newSize,
+																	   spine_atlas_region defaultValue);
 
 SPINE_C_API void spine_array_atlas_region_ensure_capacity(spine_array_atlas_region array, size_t newCapacity);
 
-SPINE_C_API void spine_array_atlas_region_add(spine_array_atlas_region array, /*@null*/ spine_atlas_region inValue);
+SPINE_C_API void spine_array_atlas_region_add(spine_array_atlas_region array, spine_atlas_region inValue);
 
-SPINE_C_API void spine_array_atlas_region_add_all(spine_array_atlas_region array, /*@null*/ spine_array_atlas_region inValue);
+SPINE_C_API void spine_array_atlas_region_add_all(spine_array_atlas_region array, spine_array_atlas_region inValue);
 
-SPINE_C_API void spine_array_atlas_region_clear_and_add_all(spine_array_atlas_region array, /*@null*/ spine_array_atlas_region inValue);
+SPINE_C_API void spine_array_atlas_region_clear_and_add_all(spine_array_atlas_region array, spine_array_atlas_region inValue);
 
 SPINE_C_API void spine_array_atlas_region_remove_at(spine_array_atlas_region array, size_t inIndex);
 
-SPINE_C_API bool spine_array_atlas_region_contains(spine_array_atlas_region array, /*@null*/ spine_atlas_region inValue);
+SPINE_C_API bool spine_array_atlas_region_contains(spine_array_atlas_region array, spine_atlas_region inValue);
 
-SPINE_C_API int spine_array_atlas_region_index_of(spine_array_atlas_region array, /*@null*/ spine_atlas_region inValue);
+SPINE_C_API int spine_array_atlas_region_index_of(spine_array_atlas_region array, spine_atlas_region inValue);
 
 SPINE_C_API /*@null*/ spine_atlas_region *spine_array_atlas_region_buffer(spine_array_atlas_region array);
 
@@ -275,22 +273,21 @@ SPINE_C_API size_t spine_array_attachment_get_capacity(spine_array_attachment ar
 
 SPINE_C_API size_t spine_array_attachment_size(spine_array_attachment array);
 
-SPINE_C_API /*@null*/ spine_array_attachment spine_array_attachment_set_size(spine_array_attachment array, size_t newSize,
-																			 /*@null*/ spine_attachment defaultValue);
+SPINE_C_API spine_array_attachment spine_array_attachment_set_size(spine_array_attachment array, size_t newSize, spine_attachment defaultValue);
 
 SPINE_C_API void spine_array_attachment_ensure_capacity(spine_array_attachment array, size_t newCapacity);
 
-SPINE_C_API void spine_array_attachment_add(spine_array_attachment array, /*@null*/ spine_attachment inValue);
+SPINE_C_API void spine_array_attachment_add(spine_array_attachment array, spine_attachment inValue);
 
-SPINE_C_API void spine_array_attachment_add_all(spine_array_attachment array, /*@null*/ spine_array_attachment inValue);
+SPINE_C_API void spine_array_attachment_add_all(spine_array_attachment array, spine_array_attachment inValue);
 
-SPINE_C_API void spine_array_attachment_clear_and_add_all(spine_array_attachment array, /*@null*/ spine_array_attachment inValue);
+SPINE_C_API void spine_array_attachment_clear_and_add_all(spine_array_attachment array, spine_array_attachment inValue);
 
 SPINE_C_API void spine_array_attachment_remove_at(spine_array_attachment array, size_t inIndex);
 
-SPINE_C_API bool spine_array_attachment_contains(spine_array_attachment array, /*@null*/ spine_attachment inValue);
+SPINE_C_API bool spine_array_attachment_contains(spine_array_attachment array, spine_attachment inValue);
 
-SPINE_C_API int spine_array_attachment_index_of(spine_array_attachment array, /*@null*/ spine_attachment inValue);
+SPINE_C_API int spine_array_attachment_index_of(spine_array_attachment array, spine_attachment inValue);
 
 SPINE_C_API /*@null*/ spine_attachment *spine_array_attachment_buffer(spine_array_attachment array);
 
@@ -304,21 +301,21 @@ SPINE_C_API size_t spine_array_bone_get_capacity(spine_array_bone array);
 
 SPINE_C_API size_t spine_array_bone_size(spine_array_bone array);
 
-SPINE_C_API /*@null*/ spine_array_bone spine_array_bone_set_size(spine_array_bone array, size_t newSize, /*@null*/ spine_bone defaultValue);
+SPINE_C_API spine_array_bone spine_array_bone_set_size(spine_array_bone array, size_t newSize, spine_bone defaultValue);
 
 SPINE_C_API void spine_array_bone_ensure_capacity(spine_array_bone array, size_t newCapacity);
 
-SPINE_C_API void spine_array_bone_add(spine_array_bone array, /*@null*/ spine_bone inValue);
+SPINE_C_API void spine_array_bone_add(spine_array_bone array, spine_bone inValue);
 
-SPINE_C_API void spine_array_bone_add_all(spine_array_bone array, /*@null*/ spine_array_bone inValue);
+SPINE_C_API void spine_array_bone_add_all(spine_array_bone array, spine_array_bone inValue);
 
-SPINE_C_API void spine_array_bone_clear_and_add_all(spine_array_bone array, /*@null*/ spine_array_bone inValue);
+SPINE_C_API void spine_array_bone_clear_and_add_all(spine_array_bone array, spine_array_bone inValue);
 
 SPINE_C_API void spine_array_bone_remove_at(spine_array_bone array, size_t inIndex);
 
-SPINE_C_API bool spine_array_bone_contains(spine_array_bone array, /*@null*/ spine_bone inValue);
+SPINE_C_API bool spine_array_bone_contains(spine_array_bone array, spine_bone inValue);
 
-SPINE_C_API int spine_array_bone_index_of(spine_array_bone array, /*@null*/ spine_bone inValue);
+SPINE_C_API int spine_array_bone_index_of(spine_array_bone array, spine_bone inValue);
 
 SPINE_C_API /*@null*/ spine_bone *spine_array_bone_buffer(spine_array_bone array);
 
@@ -332,22 +329,21 @@ SPINE_C_API size_t spine_array_bone_data_get_capacity(spine_array_bone_data arra
 
 SPINE_C_API size_t spine_array_bone_data_size(spine_array_bone_data array);
 
-SPINE_C_API /*@null*/ spine_array_bone_data spine_array_bone_data_set_size(spine_array_bone_data array, size_t newSize,
-																		   /*@null*/ spine_bone_data defaultValue);
+SPINE_C_API spine_array_bone_data spine_array_bone_data_set_size(spine_array_bone_data array, size_t newSize, spine_bone_data defaultValue);
 
 SPINE_C_API void spine_array_bone_data_ensure_capacity(spine_array_bone_data array, size_t newCapacity);
 
-SPINE_C_API void spine_array_bone_data_add(spine_array_bone_data array, /*@null*/ spine_bone_data inValue);
+SPINE_C_API void spine_array_bone_data_add(spine_array_bone_data array, spine_bone_data inValue);
 
-SPINE_C_API void spine_array_bone_data_add_all(spine_array_bone_data array, /*@null*/ spine_array_bone_data inValue);
+SPINE_C_API void spine_array_bone_data_add_all(spine_array_bone_data array, spine_array_bone_data inValue);
 
-SPINE_C_API void spine_array_bone_data_clear_and_add_all(spine_array_bone_data array, /*@null*/ spine_array_bone_data inValue);
+SPINE_C_API void spine_array_bone_data_clear_and_add_all(spine_array_bone_data array, spine_array_bone_data inValue);
 
 SPINE_C_API void spine_array_bone_data_remove_at(spine_array_bone_data array, size_t inIndex);
 
-SPINE_C_API bool spine_array_bone_data_contains(spine_array_bone_data array, /*@null*/ spine_bone_data inValue);
+SPINE_C_API bool spine_array_bone_data_contains(spine_array_bone_data array, spine_bone_data inValue);
 
-SPINE_C_API int spine_array_bone_data_index_of(spine_array_bone_data array, /*@null*/ spine_bone_data inValue);
+SPINE_C_API int spine_array_bone_data_index_of(spine_array_bone_data array, spine_bone_data inValue);
 
 SPINE_C_API /*@null*/ spine_bone_data *spine_array_bone_data_buffer(spine_array_bone_data array);
 
@@ -361,22 +357,21 @@ SPINE_C_API size_t spine_array_bone_pose_get_capacity(spine_array_bone_pose arra
 
 SPINE_C_API size_t spine_array_bone_pose_size(spine_array_bone_pose array);
 
-SPINE_C_API /*@null*/ spine_array_bone_pose spine_array_bone_pose_set_size(spine_array_bone_pose array, size_t newSize,
-																		   /*@null*/ spine_bone_pose defaultValue);
+SPINE_C_API spine_array_bone_pose spine_array_bone_pose_set_size(spine_array_bone_pose array, size_t newSize, spine_bone_pose defaultValue);
 
 SPINE_C_API void spine_array_bone_pose_ensure_capacity(spine_array_bone_pose array, size_t newCapacity);
 
-SPINE_C_API void spine_array_bone_pose_add(spine_array_bone_pose array, /*@null*/ spine_bone_pose inValue);
+SPINE_C_API void spine_array_bone_pose_add(spine_array_bone_pose array, spine_bone_pose inValue);
 
-SPINE_C_API void spine_array_bone_pose_add_all(spine_array_bone_pose array, /*@null*/ spine_array_bone_pose inValue);
+SPINE_C_API void spine_array_bone_pose_add_all(spine_array_bone_pose array, spine_array_bone_pose inValue);
 
-SPINE_C_API void spine_array_bone_pose_clear_and_add_all(spine_array_bone_pose array, /*@null*/ spine_array_bone_pose inValue);
+SPINE_C_API void spine_array_bone_pose_clear_and_add_all(spine_array_bone_pose array, spine_array_bone_pose inValue);
 
 SPINE_C_API void spine_array_bone_pose_remove_at(spine_array_bone_pose array, size_t inIndex);
 
-SPINE_C_API bool spine_array_bone_pose_contains(spine_array_bone_pose array, /*@null*/ spine_bone_pose inValue);
+SPINE_C_API bool spine_array_bone_pose_contains(spine_array_bone_pose array, spine_bone_pose inValue);
 
-SPINE_C_API int spine_array_bone_pose_index_of(spine_array_bone_pose array, /*@null*/ spine_bone_pose inValue);
+SPINE_C_API int spine_array_bone_pose_index_of(spine_array_bone_pose array, spine_bone_pose inValue);
 
 SPINE_C_API /*@null*/ spine_bone_pose *spine_array_bone_pose_buffer(spine_array_bone_pose array);
 
@@ -390,26 +385,24 @@ SPINE_C_API size_t spine_array_bounding_box_attachment_get_capacity(spine_array_
 
 SPINE_C_API size_t spine_array_bounding_box_attachment_size(spine_array_bounding_box_attachment array);
 
-SPINE_C_API /*@null*/ spine_array_bounding_box_attachment spine_array_bounding_box_attachment_set_size(
-	spine_array_bounding_box_attachment array, size_t newSize, /*@null*/ spine_bounding_box_attachment defaultValue);
+SPINE_C_API spine_array_bounding_box_attachment spine_array_bounding_box_attachment_set_size(spine_array_bounding_box_attachment array,
+																							 size_t newSize,
+																							 spine_bounding_box_attachment defaultValue);
 
 SPINE_C_API void spine_array_bounding_box_attachment_ensure_capacity(spine_array_bounding_box_attachment array, size_t newCapacity);
 
-SPINE_C_API void spine_array_bounding_box_attachment_add(spine_array_bounding_box_attachment array, /*@null*/ spine_bounding_box_attachment inValue);
+SPINE_C_API void spine_array_bounding_box_attachment_add(spine_array_bounding_box_attachment array, spine_bounding_box_attachment inValue);
 
-SPINE_C_API void spine_array_bounding_box_attachment_add_all(spine_array_bounding_box_attachment array,
-															 /*@null*/ spine_array_bounding_box_attachment inValue);
+SPINE_C_API void spine_array_bounding_box_attachment_add_all(spine_array_bounding_box_attachment array, spine_array_bounding_box_attachment inValue);
 
 SPINE_C_API void spine_array_bounding_box_attachment_clear_and_add_all(spine_array_bounding_box_attachment array,
-																	   /*@null*/ spine_array_bounding_box_attachment inValue);
+																	   spine_array_bounding_box_attachment inValue);
 
 SPINE_C_API void spine_array_bounding_box_attachment_remove_at(spine_array_bounding_box_attachment array, size_t inIndex);
 
-SPINE_C_API bool spine_array_bounding_box_attachment_contains(spine_array_bounding_box_attachment array,
-															  /*@null*/ spine_bounding_box_attachment inValue);
+SPINE_C_API bool spine_array_bounding_box_attachment_contains(spine_array_bounding_box_attachment array, spine_bounding_box_attachment inValue);
 
-SPINE_C_API int spine_array_bounding_box_attachment_index_of(spine_array_bounding_box_attachment array,
-															 /*@null*/ spine_bounding_box_attachment inValue);
+SPINE_C_API int spine_array_bounding_box_attachment_index_of(spine_array_bounding_box_attachment array, spine_bounding_box_attachment inValue);
 
 SPINE_C_API /*@null*/ spine_bounding_box_attachment *spine_array_bounding_box_attachment_buffer(spine_array_bounding_box_attachment array);
 
@@ -423,22 +416,21 @@ SPINE_C_API size_t spine_array_constraint_get_capacity(spine_array_constraint ar
 
 SPINE_C_API size_t spine_array_constraint_size(spine_array_constraint array);
 
-SPINE_C_API /*@null*/ spine_array_constraint spine_array_constraint_set_size(spine_array_constraint array, size_t newSize,
-																			 /*@null*/ spine_constraint defaultValue);
+SPINE_C_API spine_array_constraint spine_array_constraint_set_size(spine_array_constraint array, size_t newSize, spine_constraint defaultValue);
 
 SPINE_C_API void spine_array_constraint_ensure_capacity(spine_array_constraint array, size_t newCapacity);
 
-SPINE_C_API void spine_array_constraint_add(spine_array_constraint array, /*@null*/ spine_constraint inValue);
+SPINE_C_API void spine_array_constraint_add(spine_array_constraint array, spine_constraint inValue);
 
-SPINE_C_API void spine_array_constraint_add_all(spine_array_constraint array, /*@null*/ spine_array_constraint inValue);
+SPINE_C_API void spine_array_constraint_add_all(spine_array_constraint array, spine_array_constraint inValue);
 
-SPINE_C_API void spine_array_constraint_clear_and_add_all(spine_array_constraint array, /*@null*/ spine_array_constraint inValue);
+SPINE_C_API void spine_array_constraint_clear_and_add_all(spine_array_constraint array, spine_array_constraint inValue);
 
 SPINE_C_API void spine_array_constraint_remove_at(spine_array_constraint array, size_t inIndex);
 
-SPINE_C_API bool spine_array_constraint_contains(spine_array_constraint array, /*@null*/ spine_constraint inValue);
+SPINE_C_API bool spine_array_constraint_contains(spine_array_constraint array, spine_constraint inValue);
 
-SPINE_C_API int spine_array_constraint_index_of(spine_array_constraint array, /*@null*/ spine_constraint inValue);
+SPINE_C_API int spine_array_constraint_index_of(spine_array_constraint array, spine_constraint inValue);
 
 SPINE_C_API /*@null*/ spine_constraint *spine_array_constraint_buffer(spine_array_constraint array);
 
@@ -452,22 +444,22 @@ SPINE_C_API size_t spine_array_constraint_data_get_capacity(spine_array_constrai
 
 SPINE_C_API size_t spine_array_constraint_data_size(spine_array_constraint_data array);
 
-SPINE_C_API /*@null*/ spine_array_constraint_data spine_array_constraint_data_set_size(spine_array_constraint_data array, size_t newSize,
-																					   /*@null*/ spine_constraint_data defaultValue);
+SPINE_C_API spine_array_constraint_data spine_array_constraint_data_set_size(spine_array_constraint_data array, size_t newSize,
+																			 spine_constraint_data defaultValue);
 
 SPINE_C_API void spine_array_constraint_data_ensure_capacity(spine_array_constraint_data array, size_t newCapacity);
 
-SPINE_C_API void spine_array_constraint_data_add(spine_array_constraint_data array, /*@null*/ spine_constraint_data inValue);
+SPINE_C_API void spine_array_constraint_data_add(spine_array_constraint_data array, spine_constraint_data inValue);
 
-SPINE_C_API void spine_array_constraint_data_add_all(spine_array_constraint_data array, /*@null*/ spine_array_constraint_data inValue);
+SPINE_C_API void spine_array_constraint_data_add_all(spine_array_constraint_data array, spine_array_constraint_data inValue);
 
-SPINE_C_API void spine_array_constraint_data_clear_and_add_all(spine_array_constraint_data array, /*@null*/ spine_array_constraint_data inValue);
+SPINE_C_API void spine_array_constraint_data_clear_and_add_all(spine_array_constraint_data array, spine_array_constraint_data inValue);
 
 SPINE_C_API void spine_array_constraint_data_remove_at(spine_array_constraint_data array, size_t inIndex);
 
-SPINE_C_API bool spine_array_constraint_data_contains(spine_array_constraint_data array, /*@null*/ spine_constraint_data inValue);
+SPINE_C_API bool spine_array_constraint_data_contains(spine_array_constraint_data array, spine_constraint_data inValue);
 
-SPINE_C_API int spine_array_constraint_data_index_of(spine_array_constraint_data array, /*@null*/ spine_constraint_data inValue);
+SPINE_C_API int spine_array_constraint_data_index_of(spine_array_constraint_data array, spine_constraint_data inValue);
 
 SPINE_C_API /*@null*/ spine_constraint_data *spine_array_constraint_data_buffer(spine_array_constraint_data array);
 
@@ -481,21 +473,21 @@ SPINE_C_API size_t spine_array_event_get_capacity(spine_array_event array);
 
 SPINE_C_API size_t spine_array_event_size(spine_array_event array);
 
-SPINE_C_API /*@null*/ spine_array_event spine_array_event_set_size(spine_array_event array, size_t newSize, /*@null*/ spine_event defaultValue);
+SPINE_C_API spine_array_event spine_array_event_set_size(spine_array_event array, size_t newSize, spine_event defaultValue);
 
 SPINE_C_API void spine_array_event_ensure_capacity(spine_array_event array, size_t newCapacity);
 
-SPINE_C_API void spine_array_event_add(spine_array_event array, /*@null*/ spine_event inValue);
+SPINE_C_API void spine_array_event_add(spine_array_event array, spine_event inValue);
 
-SPINE_C_API void spine_array_event_add_all(spine_array_event array, /*@null*/ spine_array_event inValue);
+SPINE_C_API void spine_array_event_add_all(spine_array_event array, spine_array_event inValue);
 
-SPINE_C_API void spine_array_event_clear_and_add_all(spine_array_event array, /*@null*/ spine_array_event inValue);
+SPINE_C_API void spine_array_event_clear_and_add_all(spine_array_event array, spine_array_event inValue);
 
 SPINE_C_API void spine_array_event_remove_at(spine_array_event array, size_t inIndex);
 
-SPINE_C_API bool spine_array_event_contains(spine_array_event array, /*@null*/ spine_event inValue);
+SPINE_C_API bool spine_array_event_contains(spine_array_event array, spine_event inValue);
 
-SPINE_C_API int spine_array_event_index_of(spine_array_event array, /*@null*/ spine_event inValue);
+SPINE_C_API int spine_array_event_index_of(spine_array_event array, spine_event inValue);
 
 SPINE_C_API /*@null*/ spine_event *spine_array_event_buffer(spine_array_event array);
 
@@ -509,22 +501,21 @@ SPINE_C_API size_t spine_array_event_data_get_capacity(spine_array_event_data ar
 
 SPINE_C_API size_t spine_array_event_data_size(spine_array_event_data array);
 
-SPINE_C_API /*@null*/ spine_array_event_data spine_array_event_data_set_size(spine_array_event_data array, size_t newSize,
-																			 /*@null*/ spine_event_data defaultValue);
+SPINE_C_API spine_array_event_data spine_array_event_data_set_size(spine_array_event_data array, size_t newSize, spine_event_data defaultValue);
 
 SPINE_C_API void spine_array_event_data_ensure_capacity(spine_array_event_data array, size_t newCapacity);
 
-SPINE_C_API void spine_array_event_data_add(spine_array_event_data array, /*@null*/ spine_event_data inValue);
+SPINE_C_API void spine_array_event_data_add(spine_array_event_data array, spine_event_data inValue);
 
-SPINE_C_API void spine_array_event_data_add_all(spine_array_event_data array, /*@null*/ spine_array_event_data inValue);
+SPINE_C_API void spine_array_event_data_add_all(spine_array_event_data array, spine_array_event_data inValue);
 
-SPINE_C_API void spine_array_event_data_clear_and_add_all(spine_array_event_data array, /*@null*/ spine_array_event_data inValue);
+SPINE_C_API void spine_array_event_data_clear_and_add_all(spine_array_event_data array, spine_array_event_data inValue);
 
 SPINE_C_API void spine_array_event_data_remove_at(spine_array_event_data array, size_t inIndex);
 
-SPINE_C_API bool spine_array_event_data_contains(spine_array_event_data array, /*@null*/ spine_event_data inValue);
+SPINE_C_API bool spine_array_event_data_contains(spine_array_event_data array, spine_event_data inValue);
 
-SPINE_C_API int spine_array_event_data_index_of(spine_array_event_data array, /*@null*/ spine_event_data inValue);
+SPINE_C_API int spine_array_event_data_index_of(spine_array_event_data array, spine_event_data inValue);
 
 SPINE_C_API /*@null*/ spine_event_data *spine_array_event_data_buffer(spine_array_event_data array);
 
@@ -538,22 +529,22 @@ SPINE_C_API size_t spine_array_from_property_get_capacity(spine_array_from_prope
 
 SPINE_C_API size_t spine_array_from_property_size(spine_array_from_property array);
 
-SPINE_C_API /*@null*/ spine_array_from_property spine_array_from_property_set_size(spine_array_from_property array, size_t newSize,
-																				   /*@null*/ spine_from_property defaultValue);
+SPINE_C_API spine_array_from_property spine_array_from_property_set_size(spine_array_from_property array, size_t newSize,
+																		 spine_from_property defaultValue);
 
 SPINE_C_API void spine_array_from_property_ensure_capacity(spine_array_from_property array, size_t newCapacity);
 
-SPINE_C_API void spine_array_from_property_add(spine_array_from_property array, /*@null*/ spine_from_property inValue);
+SPINE_C_API void spine_array_from_property_add(spine_array_from_property array, spine_from_property inValue);
 
-SPINE_C_API void spine_array_from_property_add_all(spine_array_from_property array, /*@null*/ spine_array_from_property inValue);
+SPINE_C_API void spine_array_from_property_add_all(spine_array_from_property array, spine_array_from_property inValue);
 
-SPINE_C_API void spine_array_from_property_clear_and_add_all(spine_array_from_property array, /*@null*/ spine_array_from_property inValue);
+SPINE_C_API void spine_array_from_property_clear_and_add_all(spine_array_from_property array, spine_array_from_property inValue);
 
 SPINE_C_API void spine_array_from_property_remove_at(spine_array_from_property array, size_t inIndex);
 
-SPINE_C_API bool spine_array_from_property_contains(spine_array_from_property array, /*@null*/ spine_from_property inValue);
+SPINE_C_API bool spine_array_from_property_contains(spine_array_from_property array, spine_from_property inValue);
 
-SPINE_C_API int spine_array_from_property_index_of(spine_array_from_property array, /*@null*/ spine_from_property inValue);
+SPINE_C_API int spine_array_from_property_index_of(spine_array_from_property array, spine_from_property inValue);
 
 SPINE_C_API /*@null*/ spine_from_property *spine_array_from_property_buffer(spine_array_from_property array);
 
@@ -567,23 +558,22 @@ SPINE_C_API size_t spine_array_physics_constraint_get_capacity(spine_array_physi
 
 SPINE_C_API size_t spine_array_physics_constraint_size(spine_array_physics_constraint array);
 
-SPINE_C_API /*@null*/ spine_array_physics_constraint spine_array_physics_constraint_set_size(spine_array_physics_constraint array, size_t newSize,
-																							 /*@null*/ spine_physics_constraint defaultValue);
+SPINE_C_API spine_array_physics_constraint spine_array_physics_constraint_set_size(spine_array_physics_constraint array, size_t newSize,
+																				   spine_physics_constraint defaultValue);
 
 SPINE_C_API void spine_array_physics_constraint_ensure_capacity(spine_array_physics_constraint array, size_t newCapacity);
 
-SPINE_C_API void spine_array_physics_constraint_add(spine_array_physics_constraint array, /*@null*/ spine_physics_constraint inValue);
+SPINE_C_API void spine_array_physics_constraint_add(spine_array_physics_constraint array, spine_physics_constraint inValue);
 
-SPINE_C_API void spine_array_physics_constraint_add_all(spine_array_physics_constraint array, /*@null*/ spine_array_physics_constraint inValue);
+SPINE_C_API void spine_array_physics_constraint_add_all(spine_array_physics_constraint array, spine_array_physics_constraint inValue);
 
-SPINE_C_API void spine_array_physics_constraint_clear_and_add_all(spine_array_physics_constraint array,
-																  /*@null*/ spine_array_physics_constraint inValue);
+SPINE_C_API void spine_array_physics_constraint_clear_and_add_all(spine_array_physics_constraint array, spine_array_physics_constraint inValue);
 
 SPINE_C_API void spine_array_physics_constraint_remove_at(spine_array_physics_constraint array, size_t inIndex);
 
-SPINE_C_API bool spine_array_physics_constraint_contains(spine_array_physics_constraint array, /*@null*/ spine_physics_constraint inValue);
+SPINE_C_API bool spine_array_physics_constraint_contains(spine_array_physics_constraint array, spine_physics_constraint inValue);
 
-SPINE_C_API int spine_array_physics_constraint_index_of(spine_array_physics_constraint array, /*@null*/ spine_physics_constraint inValue);
+SPINE_C_API int spine_array_physics_constraint_index_of(spine_array_physics_constraint array, spine_physics_constraint inValue);
 
 SPINE_C_API /*@null*/ spine_physics_constraint *spine_array_physics_constraint_buffer(spine_array_physics_constraint array);
 
@@ -597,22 +587,21 @@ SPINE_C_API size_t spine_array_polygon_get_capacity(spine_array_polygon array);
 
 SPINE_C_API size_t spine_array_polygon_size(spine_array_polygon array);
 
-SPINE_C_API /*@null*/ spine_array_polygon spine_array_polygon_set_size(spine_array_polygon array, size_t newSize,
-																	   /*@null*/ spine_polygon defaultValue);
+SPINE_C_API spine_array_polygon spine_array_polygon_set_size(spine_array_polygon array, size_t newSize, spine_polygon defaultValue);
 
 SPINE_C_API void spine_array_polygon_ensure_capacity(spine_array_polygon array, size_t newCapacity);
 
-SPINE_C_API void spine_array_polygon_add(spine_array_polygon array, /*@null*/ spine_polygon inValue);
+SPINE_C_API void spine_array_polygon_add(spine_array_polygon array, spine_polygon inValue);
 
-SPINE_C_API void spine_array_polygon_add_all(spine_array_polygon array, /*@null*/ spine_array_polygon inValue);
+SPINE_C_API void spine_array_polygon_add_all(spine_array_polygon array, spine_array_polygon inValue);
 
-SPINE_C_API void spine_array_polygon_clear_and_add_all(spine_array_polygon array, /*@null*/ spine_array_polygon inValue);
+SPINE_C_API void spine_array_polygon_clear_and_add_all(spine_array_polygon array, spine_array_polygon inValue);
 
 SPINE_C_API void spine_array_polygon_remove_at(spine_array_polygon array, size_t inIndex);
 
-SPINE_C_API bool spine_array_polygon_contains(spine_array_polygon array, /*@null*/ spine_polygon inValue);
+SPINE_C_API bool spine_array_polygon_contains(spine_array_polygon array, spine_polygon inValue);
 
-SPINE_C_API int spine_array_polygon_index_of(spine_array_polygon array, /*@null*/ spine_polygon inValue);
+SPINE_C_API int spine_array_polygon_index_of(spine_array_polygon array, spine_polygon inValue);
 
 SPINE_C_API /*@null*/ spine_polygon *spine_array_polygon_buffer(spine_array_polygon array);
 
@@ -626,21 +615,21 @@ SPINE_C_API size_t spine_array_skin_get_capacity(spine_array_skin array);
 
 SPINE_C_API size_t spine_array_skin_size(spine_array_skin array);
 
-SPINE_C_API /*@null*/ spine_array_skin spine_array_skin_set_size(spine_array_skin array, size_t newSize, /*@null*/ spine_skin defaultValue);
+SPINE_C_API spine_array_skin spine_array_skin_set_size(spine_array_skin array, size_t newSize, spine_skin defaultValue);
 
 SPINE_C_API void spine_array_skin_ensure_capacity(spine_array_skin array, size_t newCapacity);
 
-SPINE_C_API void spine_array_skin_add(spine_array_skin array, /*@null*/ spine_skin inValue);
+SPINE_C_API void spine_array_skin_add(spine_array_skin array, spine_skin inValue);
 
-SPINE_C_API void spine_array_skin_add_all(spine_array_skin array, /*@null*/ spine_array_skin inValue);
+SPINE_C_API void spine_array_skin_add_all(spine_array_skin array, spine_array_skin inValue);
 
-SPINE_C_API void spine_array_skin_clear_and_add_all(spine_array_skin array, /*@null*/ spine_array_skin inValue);
+SPINE_C_API void spine_array_skin_clear_and_add_all(spine_array_skin array, spine_array_skin inValue);
 
 SPINE_C_API void spine_array_skin_remove_at(spine_array_skin array, size_t inIndex);
 
-SPINE_C_API bool spine_array_skin_contains(spine_array_skin array, /*@null*/ spine_skin inValue);
+SPINE_C_API bool spine_array_skin_contains(spine_array_skin array, spine_skin inValue);
 
-SPINE_C_API int spine_array_skin_index_of(spine_array_skin array, /*@null*/ spine_skin inValue);
+SPINE_C_API int spine_array_skin_index_of(spine_array_skin array, spine_skin inValue);
 
 SPINE_C_API /*@null*/ spine_skin *spine_array_skin_buffer(spine_array_skin array);
 
@@ -654,21 +643,21 @@ SPINE_C_API size_t spine_array_slot_get_capacity(spine_array_slot array);
 
 SPINE_C_API size_t spine_array_slot_size(spine_array_slot array);
 
-SPINE_C_API /*@null*/ spine_array_slot spine_array_slot_set_size(spine_array_slot array, size_t newSize, /*@null*/ spine_slot defaultValue);
+SPINE_C_API spine_array_slot spine_array_slot_set_size(spine_array_slot array, size_t newSize, spine_slot defaultValue);
 
 SPINE_C_API void spine_array_slot_ensure_capacity(spine_array_slot array, size_t newCapacity);
 
-SPINE_C_API void spine_array_slot_add(spine_array_slot array, /*@null*/ spine_slot inValue);
+SPINE_C_API void spine_array_slot_add(spine_array_slot array, spine_slot inValue);
 
-SPINE_C_API void spine_array_slot_add_all(spine_array_slot array, /*@null*/ spine_array_slot inValue);
+SPINE_C_API void spine_array_slot_add_all(spine_array_slot array, spine_array_slot inValue);
 
-SPINE_C_API void spine_array_slot_clear_and_add_all(spine_array_slot array, /*@null*/ spine_array_slot inValue);
+SPINE_C_API void spine_array_slot_clear_and_add_all(spine_array_slot array, spine_array_slot inValue);
 
 SPINE_C_API void spine_array_slot_remove_at(spine_array_slot array, size_t inIndex);
 
-SPINE_C_API bool spine_array_slot_contains(spine_array_slot array, /*@null*/ spine_slot inValue);
+SPINE_C_API bool spine_array_slot_contains(spine_array_slot array, spine_slot inValue);
 
-SPINE_C_API int spine_array_slot_index_of(spine_array_slot array, /*@null*/ spine_slot inValue);
+SPINE_C_API int spine_array_slot_index_of(spine_array_slot array, spine_slot inValue);
 
 SPINE_C_API /*@null*/ spine_slot *spine_array_slot_buffer(spine_array_slot array);
 
@@ -682,22 +671,21 @@ SPINE_C_API size_t spine_array_slot_data_get_capacity(spine_array_slot_data arra
 
 SPINE_C_API size_t spine_array_slot_data_size(spine_array_slot_data array);
 
-SPINE_C_API /*@null*/ spine_array_slot_data spine_array_slot_data_set_size(spine_array_slot_data array, size_t newSize,
-																		   /*@null*/ spine_slot_data defaultValue);
+SPINE_C_API spine_array_slot_data spine_array_slot_data_set_size(spine_array_slot_data array, size_t newSize, spine_slot_data defaultValue);
 
 SPINE_C_API void spine_array_slot_data_ensure_capacity(spine_array_slot_data array, size_t newCapacity);
 
-SPINE_C_API void spine_array_slot_data_add(spine_array_slot_data array, /*@null*/ spine_slot_data inValue);
+SPINE_C_API void spine_array_slot_data_add(spine_array_slot_data array, spine_slot_data inValue);
 
-SPINE_C_API void spine_array_slot_data_add_all(spine_array_slot_data array, /*@null*/ spine_array_slot_data inValue);
+SPINE_C_API void spine_array_slot_data_add_all(spine_array_slot_data array, spine_array_slot_data inValue);
 
-SPINE_C_API void spine_array_slot_data_clear_and_add_all(spine_array_slot_data array, /*@null*/ spine_array_slot_data inValue);
+SPINE_C_API void spine_array_slot_data_clear_and_add_all(spine_array_slot_data array, spine_array_slot_data inValue);
 
 SPINE_C_API void spine_array_slot_data_remove_at(spine_array_slot_data array, size_t inIndex);
 
-SPINE_C_API bool spine_array_slot_data_contains(spine_array_slot_data array, /*@null*/ spine_slot_data inValue);
+SPINE_C_API bool spine_array_slot_data_contains(spine_array_slot_data array, spine_slot_data inValue);
 
-SPINE_C_API int spine_array_slot_data_index_of(spine_array_slot_data array, /*@null*/ spine_slot_data inValue);
+SPINE_C_API int spine_array_slot_data_index_of(spine_array_slot_data array, spine_slot_data inValue);
 
 SPINE_C_API /*@null*/ spine_slot_data *spine_array_slot_data_buffer(spine_array_slot_data array);
 
@@ -711,22 +699,22 @@ SPINE_C_API size_t spine_array_texture_region_get_capacity(spine_array_texture_r
 
 SPINE_C_API size_t spine_array_texture_region_size(spine_array_texture_region array);
 
-SPINE_C_API /*@null*/ spine_array_texture_region spine_array_texture_region_set_size(spine_array_texture_region array, size_t newSize,
-																					 /*@null*/ spine_texture_region defaultValue);
+SPINE_C_API spine_array_texture_region spine_array_texture_region_set_size(spine_array_texture_region array, size_t newSize,
+																		   spine_texture_region defaultValue);
 
 SPINE_C_API void spine_array_texture_region_ensure_capacity(spine_array_texture_region array, size_t newCapacity);
 
-SPINE_C_API void spine_array_texture_region_add(spine_array_texture_region array, /*@null*/ spine_texture_region inValue);
+SPINE_C_API void spine_array_texture_region_add(spine_array_texture_region array, spine_texture_region inValue);
 
-SPINE_C_API void spine_array_texture_region_add_all(spine_array_texture_region array, /*@null*/ spine_array_texture_region inValue);
+SPINE_C_API void spine_array_texture_region_add_all(spine_array_texture_region array, spine_array_texture_region inValue);
 
-SPINE_C_API void spine_array_texture_region_clear_and_add_all(spine_array_texture_region array, /*@null*/ spine_array_texture_region inValue);
+SPINE_C_API void spine_array_texture_region_clear_and_add_all(spine_array_texture_region array, spine_array_texture_region inValue);
 
 SPINE_C_API void spine_array_texture_region_remove_at(spine_array_texture_region array, size_t inIndex);
 
-SPINE_C_API bool spine_array_texture_region_contains(spine_array_texture_region array, /*@null*/ spine_texture_region inValue);
+SPINE_C_API bool spine_array_texture_region_contains(spine_array_texture_region array, spine_texture_region inValue);
 
-SPINE_C_API int spine_array_texture_region_index_of(spine_array_texture_region array, /*@null*/ spine_texture_region inValue);
+SPINE_C_API int spine_array_texture_region_index_of(spine_array_texture_region array, spine_texture_region inValue);
 
 SPINE_C_API /*@null*/ spine_texture_region *spine_array_texture_region_buffer(spine_array_texture_region array);
 
@@ -740,22 +728,21 @@ SPINE_C_API size_t spine_array_timeline_get_capacity(spine_array_timeline array)
 
 SPINE_C_API size_t spine_array_timeline_size(spine_array_timeline array);
 
-SPINE_C_API /*@null*/ spine_array_timeline spine_array_timeline_set_size(spine_array_timeline array, size_t newSize,
-																		 /*@null*/ spine_timeline defaultValue);
+SPINE_C_API spine_array_timeline spine_array_timeline_set_size(spine_array_timeline array, size_t newSize, spine_timeline defaultValue);
 
 SPINE_C_API void spine_array_timeline_ensure_capacity(spine_array_timeline array, size_t newCapacity);
 
-SPINE_C_API void spine_array_timeline_add(spine_array_timeline array, /*@null*/ spine_timeline inValue);
+SPINE_C_API void spine_array_timeline_add(spine_array_timeline array, spine_timeline inValue);
 
-SPINE_C_API void spine_array_timeline_add_all(spine_array_timeline array, /*@null*/ spine_array_timeline inValue);
+SPINE_C_API void spine_array_timeline_add_all(spine_array_timeline array, spine_array_timeline inValue);
 
-SPINE_C_API void spine_array_timeline_clear_and_add_all(spine_array_timeline array, /*@null*/ spine_array_timeline inValue);
+SPINE_C_API void spine_array_timeline_clear_and_add_all(spine_array_timeline array, spine_array_timeline inValue);
 
 SPINE_C_API void spine_array_timeline_remove_at(spine_array_timeline array, size_t inIndex);
 
-SPINE_C_API bool spine_array_timeline_contains(spine_array_timeline array, /*@null*/ spine_timeline inValue);
+SPINE_C_API bool spine_array_timeline_contains(spine_array_timeline array, spine_timeline inValue);
 
-SPINE_C_API int spine_array_timeline_index_of(spine_array_timeline array, /*@null*/ spine_timeline inValue);
+SPINE_C_API int spine_array_timeline_index_of(spine_array_timeline array, spine_timeline inValue);
 
 SPINE_C_API /*@null*/ spine_timeline *spine_array_timeline_buffer(spine_array_timeline array);
 
@@ -769,22 +756,21 @@ SPINE_C_API size_t spine_array_to_property_get_capacity(spine_array_to_property
 
 SPINE_C_API size_t spine_array_to_property_size(spine_array_to_property array);
 
-SPINE_C_API /*@null*/ spine_array_to_property spine_array_to_property_set_size(spine_array_to_property array, size_t newSize,
-																			   /*@null*/ spine_to_property defaultValue);
+SPINE_C_API spine_array_to_property spine_array_to_property_set_size(spine_array_to_property array, size_t newSize, spine_to_property defaultValue);
 
 SPINE_C_API void spine_array_to_property_ensure_capacity(spine_array_to_property array, size_t newCapacity);
 
-SPINE_C_API void spine_array_to_property_add(spine_array_to_property array, /*@null*/ spine_to_property inValue);
+SPINE_C_API void spine_array_to_property_add(spine_array_to_property array, spine_to_property inValue);
 
-SPINE_C_API void spine_array_to_property_add_all(spine_array_to_property array, /*@null*/ spine_array_to_property inValue);
+SPINE_C_API void spine_array_to_property_add_all(spine_array_to_property array, spine_array_to_property inValue);
 
-SPINE_C_API void spine_array_to_property_clear_and_add_all(spine_array_to_property array, /*@null*/ spine_array_to_property inValue);
+SPINE_C_API void spine_array_to_property_clear_and_add_all(spine_array_to_property array, spine_array_to_property inValue);
 
 SPINE_C_API void spine_array_to_property_remove_at(spine_array_to_property array, size_t inIndex);
 
-SPINE_C_API bool spine_array_to_property_contains(spine_array_to_property array, /*@null*/ spine_to_property inValue);
+SPINE_C_API bool spine_array_to_property_contains(spine_array_to_property array, spine_to_property inValue);
 
-SPINE_C_API int spine_array_to_property_index_of(spine_array_to_property array, /*@null*/ spine_to_property inValue);
+SPINE_C_API int spine_array_to_property_index_of(spine_array_to_property array, spine_to_property inValue);
 
 SPINE_C_API /*@null*/ spine_to_property *spine_array_to_property_buffer(spine_array_to_property array);
 
@@ -798,22 +784,21 @@ SPINE_C_API size_t spine_array_track_entry_get_capacity(spine_array_track_entry
 
 SPINE_C_API size_t spine_array_track_entry_size(spine_array_track_entry array);
 
-SPINE_C_API /*@null*/ spine_array_track_entry spine_array_track_entry_set_size(spine_array_track_entry array, size_t newSize,
-																			   /*@null*/ spine_track_entry defaultValue);
+SPINE_C_API spine_array_track_entry spine_array_track_entry_set_size(spine_array_track_entry array, size_t newSize, spine_track_entry defaultValue);
 
 SPINE_C_API void spine_array_track_entry_ensure_capacity(spine_array_track_entry array, size_t newCapacity);
 
-SPINE_C_API void spine_array_track_entry_add(spine_array_track_entry array, /*@null*/ spine_track_entry inValue);
+SPINE_C_API void spine_array_track_entry_add(spine_array_track_entry array, spine_track_entry inValue);
 
-SPINE_C_API void spine_array_track_entry_add_all(spine_array_track_entry array, /*@null*/ spine_array_track_entry inValue);
+SPINE_C_API void spine_array_track_entry_add_all(spine_array_track_entry array, spine_array_track_entry inValue);
 
-SPINE_C_API void spine_array_track_entry_clear_and_add_all(spine_array_track_entry array, /*@null*/ spine_array_track_entry inValue);
+SPINE_C_API void spine_array_track_entry_clear_and_add_all(spine_array_track_entry array, spine_array_track_entry inValue);
 
 SPINE_C_API void spine_array_track_entry_remove_at(spine_array_track_entry array, size_t inIndex);
 
-SPINE_C_API bool spine_array_track_entry_contains(spine_array_track_entry array, /*@null*/ spine_track_entry inValue);
+SPINE_C_API bool spine_array_track_entry_contains(spine_array_track_entry array, spine_track_entry inValue);
 
-SPINE_C_API int spine_array_track_entry_index_of(spine_array_track_entry array, /*@null*/ spine_track_entry inValue);
+SPINE_C_API int spine_array_track_entry_index_of(spine_array_track_entry array, spine_track_entry inValue);
 
 SPINE_C_API /*@null*/ spine_track_entry *spine_array_track_entry_buffer(spine_array_track_entry array);
 
@@ -827,21 +812,21 @@ SPINE_C_API size_t spine_array_update_get_capacity(spine_array_update array);
 
 SPINE_C_API size_t spine_array_update_size(spine_array_update array);
 
-SPINE_C_API /*@null*/ spine_array_update spine_array_update_set_size(spine_array_update array, size_t newSize, /*@null*/ spine_update defaultValue);
+SPINE_C_API spine_array_update spine_array_update_set_size(spine_array_update array, size_t newSize, spine_update defaultValue);
 
 SPINE_C_API void spine_array_update_ensure_capacity(spine_array_update array, size_t newCapacity);
 
-SPINE_C_API void spine_array_update_add(spine_array_update array, /*@null*/ spine_update inValue);
+SPINE_C_API void spine_array_update_add(spine_array_update array, spine_update inValue);
 
-SPINE_C_API void spine_array_update_add_all(spine_array_update array, /*@null*/ spine_array_update inValue);
+SPINE_C_API void spine_array_update_add_all(spine_array_update array, spine_array_update inValue);
 
-SPINE_C_API void spine_array_update_clear_and_add_all(spine_array_update array, /*@null*/ spine_array_update inValue);
+SPINE_C_API void spine_array_update_clear_and_add_all(spine_array_update array, spine_array_update inValue);
 
 SPINE_C_API void spine_array_update_remove_at(spine_array_update array, size_t inIndex);
 
-SPINE_C_API bool spine_array_update_contains(spine_array_update array, /*@null*/ spine_update inValue);
+SPINE_C_API bool spine_array_update_contains(spine_array_update array, spine_update inValue);
 
-SPINE_C_API int spine_array_update_index_of(spine_array_update array, /*@null*/ spine_update inValue);
+SPINE_C_API int spine_array_update_index_of(spine_array_update array, spine_update inValue);
 
 SPINE_C_API /*@null*/ spine_update *spine_array_update_buffer(spine_array_update array);
 
diff --git a/spine-c/src/generated/atlas.cpp b/spine-c/src/generated/atlas.cpp
index d36f2c827..422daf43e 100644
--- a/spine-c/src/generated/atlas.cpp
+++ b/spine-c/src/generated/atlas.cpp
@@ -17,12 +17,12 @@ void spine_atlas_flip_v(spine_atlas self) {
 	return (spine_atlas_region) _self->findRegion(String(name));
 }
 
-/*@null*/ spine_array_atlas_page spine_atlas_get_pages(spine_atlas self) {
+spine_array_atlas_page spine_atlas_get_pages(spine_atlas self) {
 	Atlas *_self = (Atlas *) self;
 	return (spine_array_atlas_page) &_self->getPages();
 }
 
-/*@null*/ spine_array_atlas_region spine_atlas_get_regions(spine_atlas self) {
+spine_array_atlas_region spine_atlas_get_regions(spine_atlas self) {
 	Atlas *_self = (Atlas *) self;
 	return (spine_array_atlas_region) &_self->getRegions();
 }
diff --git a/spine-c/src/generated/atlas.h b/spine-c/src/generated/atlas.h
index a2e4f747f..7f6aa6308 100644
--- a/spine-c/src/generated/atlas.h
+++ b/spine-c/src/generated/atlas.h
@@ -13,8 +13,8 @@ SPINE_C_API void spine_atlas_dispose(spine_atlas self);
 
 SPINE_C_API void spine_atlas_flip_v(spine_atlas self);
 SPINE_C_API /*@null*/ spine_atlas_region spine_atlas_find_region(spine_atlas self, const char *name);
-SPINE_C_API /*@null*/ spine_array_atlas_page spine_atlas_get_pages(spine_atlas self);
-SPINE_C_API /*@null*/ spine_array_atlas_region spine_atlas_get_regions(spine_atlas self);
+SPINE_C_API spine_array_atlas_page spine_atlas_get_pages(spine_atlas self);
+SPINE_C_API spine_array_atlas_region spine_atlas_get_regions(spine_atlas self);
 
 #ifdef __cplusplus
 }
diff --git a/spine-c/src/generated/bone.cpp b/spine-c/src/generated/bone.cpp
index a017b3769..85977d4fe 100644
--- a/spine-c/src/generated/bone.cpp
+++ b/spine-c/src/generated/bone.cpp
@@ -25,7 +25,7 @@ spine_rtti spine_bone_get_rtti(spine_bone self) {
 	return (spine_bone) _self->getParent();
 }
 
-/*@null*/ spine_array_bone spine_bone_get_children(spine_bone self) {
+spine_array_bone spine_bone_get_children(spine_bone self) {
 	Bone *_self = (Bone *) self;
 	return (spine_array_bone) &_self->getChildren();
 }
diff --git a/spine-c/src/generated/bone.h b/spine-c/src/generated/bone.h
index 8c2f8103c..d76df14ae 100644
--- a/spine-c/src/generated/bone.h
+++ b/spine-c/src/generated/bone.h
@@ -16,7 +16,7 @@ SPINE_C_API void spine_bone_dispose(spine_bone self);
 
 SPINE_C_API spine_rtti spine_bone_get_rtti(spine_bone self);
 SPINE_C_API /*@null*/ spine_bone spine_bone_get_parent(spine_bone self);
-SPINE_C_API /*@null*/ spine_array_bone spine_bone_get_children(spine_bone self);
+SPINE_C_API spine_array_bone spine_bone_get_children(spine_bone self);
 SPINE_C_API bool spine_bone_is_y_down(void);
 SPINE_C_API void spine_bone_set_y_down(bool value);
 SPINE_C_API void spine_bone_update(spine_bone self, spine_skeleton skeleton, spine_physics physics);
diff --git a/spine-c/src/generated/event_timeline.cpp b/spine-c/src/generated/event_timeline.cpp
index 3f475cd4f..5f39c81bc 100644
--- a/spine-c/src/generated/event_timeline.cpp
+++ b/spine-c/src/generated/event_timeline.cpp
@@ -28,7 +28,7 @@ size_t spine_event_timeline_get_frame_count(spine_event_timeline self) {
 	return _self->getFrameCount();
 }
 
-/*@null*/ spine_array_event spine_event_timeline_get_events(spine_event_timeline self) {
+spine_array_event spine_event_timeline_get_events(spine_event_timeline self) {
 	EventTimeline *_self = (EventTimeline *) self;
 	return (spine_array_event) &_self->getEvents();
 }
diff --git a/spine-c/src/generated/event_timeline.h b/spine-c/src/generated/event_timeline.h
index 0227ebf0c..c3c307390 100644
--- a/spine-c/src/generated/event_timeline.h
+++ b/spine-c/src/generated/event_timeline.h
@@ -18,7 +18,7 @@ SPINE_C_API void spine_event_timeline_apply(spine_event_timeline self, spine_ske
 											/*@null*/ spine_array_event pEvents, float alpha, spine_mix_blend blend, spine_mix_direction direction,
 											bool appliedPose);
 SPINE_C_API size_t spine_event_timeline_get_frame_count(spine_event_timeline self);
-SPINE_C_API /*@null*/ spine_array_event spine_event_timeline_get_events(spine_event_timeline self);
+SPINE_C_API spine_array_event spine_event_timeline_get_events(spine_event_timeline self);
 SPINE_C_API void spine_event_timeline_set_frame(spine_event_timeline self, size_t frame, spine_event event);
 SPINE_C_API size_t spine_event_timeline_get_frame_entries(spine_event_timeline self);
 SPINE_C_API spine_array_float spine_event_timeline_get_frames(spine_event_timeline self);
diff --git a/spine-c/src/generated/ik_constraint.cpp b/spine-c/src/generated/ik_constraint.cpp
index 5e0a9ef02..62b9589dc 100644
--- a/spine-c/src/generated/ik_constraint.cpp
+++ b/spine-c/src/generated/ik_constraint.cpp
@@ -41,7 +41,7 @@ spine_ik_constraint_data spine_ik_constraint_get_data(spine_ik_constraint self)
 	return (spine_ik_constraint_data) &_self->getData();
 }
 
-/*@null*/ spine_array_bone_pose spine_ik_constraint_get_bones(spine_ik_constraint self) {
+spine_array_bone_pose spine_ik_constraint_get_bones(spine_ik_constraint self) {
 	IkConstraint *_self = (IkConstraint *) self;
 	return (spine_array_bone_pose) &_self->getBones();
 }
diff --git a/spine-c/src/generated/ik_constraint.h b/spine-c/src/generated/ik_constraint.h
index 0f7c87320..9752fe33b 100644
--- a/spine-c/src/generated/ik_constraint.h
+++ b/spine-c/src/generated/ik_constraint.h
@@ -19,7 +19,7 @@ SPINE_C_API void spine_ik_constraint_update(spine_ik_constraint self, spine_skel
 SPINE_C_API void spine_ik_constraint_sort(spine_ik_constraint self, spine_skeleton skeleton);
 SPINE_C_API bool spine_ik_constraint_is_source_active(spine_ik_constraint self);
 SPINE_C_API spine_ik_constraint_data spine_ik_constraint_get_data(spine_ik_constraint self);
-SPINE_C_API /*@null*/ spine_array_bone_pose spine_ik_constraint_get_bones(spine_ik_constraint self);
+SPINE_C_API spine_array_bone_pose spine_ik_constraint_get_bones(spine_ik_constraint self);
 SPINE_C_API spine_bone spine_ik_constraint_get_target(spine_ik_constraint self);
 SPINE_C_API void spine_ik_constraint_set_target(spine_ik_constraint self, spine_bone inValue);
 SPINE_C_API void spine_ik_constraint_apply_1(spine_skeleton skeleton, spine_bone_pose bone, float targetX, float targetY, bool compress, bool stretch,
diff --git a/spine-c/src/generated/ik_constraint_data.cpp b/spine-c/src/generated/ik_constraint_data.cpp
index 2409c740b..8bd68ffc2 100644
--- a/spine-c/src/generated/ik_constraint_data.cpp
+++ b/spine-c/src/generated/ik_constraint_data.cpp
@@ -21,7 +21,7 @@ spine_constraint spine_ik_constraint_data_create_method(spine_ik_constraint_data
 	return (spine_constraint) &_self->create(*((Skeleton *) skeleton));
 }
 
-/*@null*/ spine_array_bone_data spine_ik_constraint_data_get_bones(spine_ik_constraint_data self) {
+spine_array_bone_data spine_ik_constraint_data_get_bones(spine_ik_constraint_data self) {
 	IkConstraintData *_self = (IkConstraintData *) self;
 	return (spine_array_bone_data) &_self->getBones();
 }
diff --git a/spine-c/src/generated/ik_constraint_data.h b/spine-c/src/generated/ik_constraint_data.h
index 8b24b632a..c5ac259ff 100644
--- a/spine-c/src/generated/ik_constraint_data.h
+++ b/spine-c/src/generated/ik_constraint_data.h
@@ -15,7 +15,7 @@ SPINE_C_API void spine_ik_constraint_data_dispose(spine_ik_constraint_data self)
 
 SPINE_C_API spine_rtti spine_ik_constraint_data_get_rtti(spine_ik_constraint_data self);
 SPINE_C_API spine_constraint spine_ik_constraint_data_create_method(spine_ik_constraint_data self, spine_skeleton skeleton);
-SPINE_C_API /*@null*/ spine_array_bone_data spine_ik_constraint_data_get_bones(spine_ik_constraint_data self);
+SPINE_C_API spine_array_bone_data spine_ik_constraint_data_get_bones(spine_ik_constraint_data self);
 SPINE_C_API spine_bone_data spine_ik_constraint_data_get_target(spine_ik_constraint_data self);
 SPINE_C_API void spine_ik_constraint_data_set_target(spine_ik_constraint_data self, spine_bone_data inValue);
 SPINE_C_API bool spine_ik_constraint_data_get_uniform(spine_ik_constraint_data self);
diff --git a/spine-c/src/generated/path_constraint.cpp b/spine-c/src/generated/path_constraint.cpp
index 51f51baac..65a61c164 100644
--- a/spine-c/src/generated/path_constraint.cpp
+++ b/spine-c/src/generated/path_constraint.cpp
@@ -36,7 +36,7 @@ bool spine_path_constraint_is_source_active(spine_path_constraint self) {
 	return _self->isSourceActive();
 }
 
-/*@null*/ spine_array_bone_pose spine_path_constraint_get_bones(spine_path_constraint self) {
+spine_array_bone_pose spine_path_constraint_get_bones(spine_path_constraint self) {
 	PathConstraint *_self = (PathConstraint *) self;
 	return (spine_array_bone_pose) &_self->getBones();
 }
diff --git a/spine-c/src/generated/path_constraint.h b/spine-c/src/generated/path_constraint.h
index 9f0e4093f..911ab5f64 100644
--- a/spine-c/src/generated/path_constraint.h
+++ b/spine-c/src/generated/path_constraint.h
@@ -18,7 +18,7 @@ SPINE_C_API spine_path_constraint spine_path_constraint_copy(spine_path_constrai
 SPINE_C_API void spine_path_constraint_update(spine_path_constraint self, spine_skeleton skeleton, spine_physics physics);
 SPINE_C_API void spine_path_constraint_sort(spine_path_constraint self, spine_skeleton skeleton);
 SPINE_C_API bool spine_path_constraint_is_source_active(spine_path_constraint self);
-SPINE_C_API /*@null*/ spine_array_bone_pose spine_path_constraint_get_bones(spine_path_constraint self);
+SPINE_C_API spine_array_bone_pose spine_path_constraint_get_bones(spine_path_constraint self);
 SPINE_C_API spine_slot spine_path_constraint_get_slot(spine_path_constraint self);
 SPINE_C_API void spine_path_constraint_set_slot(spine_path_constraint self, spine_slot slot);
 SPINE_C_API spine_path_constraint_data spine_path_constraint_get_data(spine_path_constraint self);
diff --git a/spine-c/src/generated/path_constraint_data.cpp b/spine-c/src/generated/path_constraint_data.cpp
index 42440b054..18419a407 100644
--- a/spine-c/src/generated/path_constraint_data.cpp
+++ b/spine-c/src/generated/path_constraint_data.cpp
@@ -21,7 +21,7 @@ spine_constraint spine_path_constraint_data_create_method(spine_path_constraint_
 	return (spine_constraint) &_self->create(*((Skeleton *) skeleton));
 }
 
-/*@null*/ spine_array_bone_data spine_path_constraint_data_get_bones(spine_path_constraint_data self) {
+spine_array_bone_data spine_path_constraint_data_get_bones(spine_path_constraint_data self) {
 	PathConstraintData *_self = (PathConstraintData *) self;
 	return (spine_array_bone_data) &_self->getBones();
 }
diff --git a/spine-c/src/generated/path_constraint_data.h b/spine-c/src/generated/path_constraint_data.h
index f900d8285..3cad0377f 100644
--- a/spine-c/src/generated/path_constraint_data.h
+++ b/spine-c/src/generated/path_constraint_data.h
@@ -15,7 +15,7 @@ SPINE_C_API void spine_path_constraint_data_dispose(spine_path_constraint_data s
 
 SPINE_C_API spine_rtti spine_path_constraint_data_get_rtti(spine_path_constraint_data self);
 SPINE_C_API spine_constraint spine_path_constraint_data_create_method(spine_path_constraint_data self, spine_skeleton skeleton);
-SPINE_C_API /*@null*/ spine_array_bone_data spine_path_constraint_data_get_bones(spine_path_constraint_data self);
+SPINE_C_API spine_array_bone_data spine_path_constraint_data_get_bones(spine_path_constraint_data self);
 SPINE_C_API spine_slot_data spine_path_constraint_data_get_slot(spine_path_constraint_data self);
 SPINE_C_API void spine_path_constraint_data_set_slot(spine_path_constraint_data self, spine_slot_data slot);
 SPINE_C_API spine_position_mode spine_path_constraint_data_get_position_mode(spine_path_constraint_data self);
diff --git a/spine-c/src/generated/sequence.cpp b/spine-c/src/generated/sequence.cpp
index a2b6f899a..4baf9e6d2 100644
--- a/spine-c/src/generated/sequence.cpp
+++ b/spine-c/src/generated/sequence.cpp
@@ -66,7 +66,7 @@ void spine_sequence_set_setup_index(spine_sequence self, int setupIndex) {
 	_self->setSetupIndex(setupIndex);
 }
 
-/*@null*/ spine_array_texture_region spine_sequence_get_regions(spine_sequence self) {
+spine_array_texture_region spine_sequence_get_regions(spine_sequence self) {
 	Sequence *_self = (Sequence *) self;
 	return (spine_array_texture_region) &_self->getRegions();
 }
diff --git a/spine-c/src/generated/sequence.h b/spine-c/src/generated/sequence.h
index fe3abe2c1..803494373 100644
--- a/spine-c/src/generated/sequence.h
+++ b/spine-c/src/generated/sequence.h
@@ -24,7 +24,7 @@ SPINE_C_API int spine_sequence_get_digits(spine_sequence self);
 SPINE_C_API void spine_sequence_set_digits(spine_sequence self, int digits);
 SPINE_C_API int spine_sequence_get_setup_index(spine_sequence self);
 SPINE_C_API void spine_sequence_set_setup_index(spine_sequence self, int setupIndex);
-SPINE_C_API /*@null*/ spine_array_texture_region spine_sequence_get_regions(spine_sequence self);
+SPINE_C_API spine_array_texture_region spine_sequence_get_regions(spine_sequence self);
 
 #ifdef __cplusplus
 }
diff --git a/spine-c/src/generated/skeleton.cpp b/spine-c/src/generated/skeleton.cpp
index 9db49aad7..a48eefffe 100644
--- a/spine-c/src/generated/skeleton.cpp
+++ b/spine-c/src/generated/skeleton.cpp
@@ -31,7 +31,7 @@ void spine_skeleton_sort_bone(spine_skeleton self, /*@null*/ spine_bone bone) {
 	_self->sortBone((Bone *) bone);
 }
 
-void spine_skeleton_sort_reset(/*@null*/ spine_array_bone bones) {
+void spine_skeleton_sort_reset(spine_array_bone bones) {
 	Skeleton::sortReset(*((Array<Bone *> *) bones));
 }
 
@@ -60,12 +60,12 @@ spine_skeleton_data spine_skeleton_get_data(spine_skeleton self) {
 	return (spine_skeleton_data) &_self->getData();
 }
 
-/*@null*/ spine_array_bone spine_skeleton_get_bones(spine_skeleton self) {
+spine_array_bone spine_skeleton_get_bones(spine_skeleton self) {
 	Skeleton *_self = (Skeleton *) self;
 	return (spine_array_bone) &_self->getBones();
 }
 
-/*@null*/ spine_array_update spine_skeleton_get_update_cache(spine_skeleton self) {
+spine_array_update spine_skeleton_get_update_cache(spine_skeleton self) {
 	Skeleton *_self = (Skeleton *) self;
 	return (spine_array_update) &_self->getUpdateCache();
 }
@@ -80,7 +80,7 @@ spine_skeleton_data spine_skeleton_get_data(spine_skeleton self) {
 	return (spine_bone) _self->findBone(String(boneName));
 }
 
-/*@null*/ spine_array_slot spine_skeleton_get_slots(spine_skeleton self) {
+spine_array_slot spine_skeleton_get_slots(spine_skeleton self) {
 	Skeleton *_self = (Skeleton *) self;
 	return (spine_array_slot) &_self->getSlots();
 }
@@ -90,7 +90,7 @@ spine_skeleton_data spine_skeleton_get_data(spine_skeleton self) {
 	return (spine_slot) _self->findSlot(String(slotName));
 }
 
-/*@null*/ spine_array_slot spine_skeleton_get_draw_order(spine_skeleton self) {
+spine_array_slot spine_skeleton_get_draw_order(spine_skeleton self) {
 	Skeleton *_self = (Skeleton *) self;
 	return (spine_array_slot) &_self->getDrawOrder();
 }
@@ -125,12 +125,12 @@ void spine_skeleton_set_attachment(spine_skeleton self, const char *slotName, co
 	_self->setAttachment(String(slotName), String(attachmentName));
 }
 
-/*@null*/ spine_array_constraint spine_skeleton_get_constraints(spine_skeleton self) {
+spine_array_constraint spine_skeleton_get_constraints(spine_skeleton self) {
 	Skeleton *_self = (Skeleton *) self;
 	return (spine_array_constraint) &_self->getConstraints();
 }
 
-/*@null*/ spine_array_physics_constraint spine_skeleton_get_physics_constraints(spine_skeleton self) {
+spine_array_physics_constraint spine_skeleton_get_physics_constraints(spine_skeleton self) {
 	Skeleton *_self = (Skeleton *) self;
 	return (spine_array_physics_constraint) &_self->getPhysicsConstraints();
 }
diff --git a/spine-c/src/generated/skeleton.h b/spine-c/src/generated/skeleton.h
index d65d16eb5..ba6d52c98 100644
--- a/spine-c/src/generated/skeleton.h
+++ b/spine-c/src/generated/skeleton.h
@@ -17,27 +17,27 @@ SPINE_C_API void spine_skeleton_update_cache(spine_skeleton self);
 SPINE_C_API void spine_skeleton_print_update_cache(spine_skeleton self);
 SPINE_C_API void spine_skeleton_constrained(spine_skeleton self, spine_posed object);
 SPINE_C_API void spine_skeleton_sort_bone(spine_skeleton self, /*@null*/ spine_bone bone);
-SPINE_C_API void spine_skeleton_sort_reset(/*@null*/ spine_array_bone bones);
+SPINE_C_API void spine_skeleton_sort_reset(spine_array_bone bones);
 SPINE_C_API void spine_skeleton_update_world_transform(spine_skeleton self, spine_physics physics);
 SPINE_C_API void spine_skeleton_setup_pose(spine_skeleton self);
 SPINE_C_API void spine_skeleton_setup_pose_bones(spine_skeleton self);
 SPINE_C_API void spine_skeleton_setup_pose_slots(spine_skeleton self);
 SPINE_C_API spine_skeleton_data spine_skeleton_get_data(spine_skeleton self);
-SPINE_C_API /*@null*/ spine_array_bone spine_skeleton_get_bones(spine_skeleton self);
-SPINE_C_API /*@null*/ spine_array_update spine_skeleton_get_update_cache(spine_skeleton self);
+SPINE_C_API spine_array_bone spine_skeleton_get_bones(spine_skeleton self);
+SPINE_C_API spine_array_update spine_skeleton_get_update_cache(spine_skeleton self);
 SPINE_C_API /*@null*/ spine_bone spine_skeleton_get_root_bone(spine_skeleton self);
 SPINE_C_API /*@null*/ spine_bone spine_skeleton_find_bone(spine_skeleton self, const char *boneName);
-SPINE_C_API /*@null*/ spine_array_slot spine_skeleton_get_slots(spine_skeleton self);
+SPINE_C_API spine_array_slot spine_skeleton_get_slots(spine_skeleton self);
 SPINE_C_API /*@null*/ spine_slot spine_skeleton_find_slot(spine_skeleton self, const char *slotName);
-SPINE_C_API /*@null*/ spine_array_slot spine_skeleton_get_draw_order(spine_skeleton self);
+SPINE_C_API spine_array_slot spine_skeleton_get_draw_order(spine_skeleton self);
 SPINE_C_API /*@null*/ spine_skin spine_skeleton_get_skin(spine_skeleton self);
 SPINE_C_API void spine_skeleton_set_skin_1(spine_skeleton self, const char *skinName);
 SPINE_C_API void spine_skeleton_set_skin_2(spine_skeleton self, /*@null*/ spine_skin newSkin);
 SPINE_C_API /*@null*/ spine_attachment spine_skeleton_get_attachment_1(spine_skeleton self, const char *slotName, const char *attachmentName);
 SPINE_C_API /*@null*/ spine_attachment spine_skeleton_get_attachment_2(spine_skeleton self, int slotIndex, const char *attachmentName);
 SPINE_C_API void spine_skeleton_set_attachment(spine_skeleton self, const char *slotName, const char *attachmentName);
-SPINE_C_API /*@null*/ spine_array_constraint spine_skeleton_get_constraints(spine_skeleton self);
-SPINE_C_API /*@null*/ spine_array_physics_constraint spine_skeleton_get_physics_constraints(spine_skeleton self);
+SPINE_C_API spine_array_constraint spine_skeleton_get_constraints(spine_skeleton self);
+SPINE_C_API spine_array_physics_constraint spine_skeleton_get_physics_constraints(spine_skeleton self);
 SPINE_C_API void spine_skeleton_get_bounds_1(spine_skeleton self, float *outX, float *outY, float *outWidth, float *outHeight,
 											 spine_array_float outVertexBuffer);
 SPINE_C_API void spine_skeleton_get_bounds_2(spine_skeleton self, float *outX, float *outY, float *outWidth, float *outHeight,
diff --git a/spine-c/src/generated/skeleton_bounds.cpp b/spine-c/src/generated/skeleton_bounds.cpp
index 8f7bf0be4..951faa0d0 100644
--- a/spine-c/src/generated/skeleton_bounds.cpp
+++ b/spine-c/src/generated/skeleton_bounds.cpp
@@ -62,12 +62,12 @@ bool spine_skeleton_bounds_intersects_segment_2(spine_skeleton_bounds self, spin
 	return (spine_bounding_box_attachment) _self->getBoundingBox((Polygon *) polygon);
 }
 
-/*@null*/ spine_array_polygon spine_skeleton_bounds_get_polygons(spine_skeleton_bounds self) {
+spine_array_polygon spine_skeleton_bounds_get_polygons(spine_skeleton_bounds self) {
 	SkeletonBounds *_self = (SkeletonBounds *) self;
 	return (spine_array_polygon) &_self->getPolygons();
 }
 
-/*@null*/ spine_array_bounding_box_attachment spine_skeleton_bounds_get_bounding_boxes(spine_skeleton_bounds self) {
+spine_array_bounding_box_attachment spine_skeleton_bounds_get_bounding_boxes(spine_skeleton_bounds self) {
 	SkeletonBounds *_self = (SkeletonBounds *) self;
 	return (spine_array_bounding_box_attachment) &_self->getBoundingBoxes();
 }
diff --git a/spine-c/src/generated/skeleton_bounds.h b/spine-c/src/generated/skeleton_bounds.h
index 865fa6f6c..aeed789da 100644
--- a/spine-c/src/generated/skeleton_bounds.h
+++ b/spine-c/src/generated/skeleton_bounds.h
@@ -26,8 +26,8 @@ SPINE_C_API bool spine_skeleton_bounds_intersects_segment_2(spine_skeleton_bound
 SPINE_C_API /*@null*/ spine_polygon spine_skeleton_bounds_get_polygon(spine_skeleton_bounds self, /*@null*/ spine_bounding_box_attachment attachment);
 SPINE_C_API /*@null*/ spine_bounding_box_attachment spine_skeleton_bounds_get_bounding_box(spine_skeleton_bounds self,
 																						   /*@null*/ spine_polygon polygon);
-SPINE_C_API /*@null*/ spine_array_polygon spine_skeleton_bounds_get_polygons(spine_skeleton_bounds self);
-SPINE_C_API /*@null*/ spine_array_bounding_box_attachment spine_skeleton_bounds_get_bounding_boxes(spine_skeleton_bounds self);
+SPINE_C_API spine_array_polygon spine_skeleton_bounds_get_polygons(spine_skeleton_bounds self);
+SPINE_C_API spine_array_bounding_box_attachment spine_skeleton_bounds_get_bounding_boxes(spine_skeleton_bounds self);
 SPINE_C_API float spine_skeleton_bounds_get_min_x(spine_skeleton_bounds self);
 SPINE_C_API float spine_skeleton_bounds_get_min_y(spine_skeleton_bounds self);
 SPINE_C_API float spine_skeleton_bounds_get_max_x(spine_skeleton_bounds self);
diff --git a/spine-c/src/generated/skeleton_data.cpp b/spine-c/src/generated/skeleton_data.cpp
index 77511623a..266845cd1 100644
--- a/spine-c/src/generated/skeleton_data.cpp
+++ b/spine-c/src/generated/skeleton_data.cpp
@@ -46,17 +46,17 @@ void spine_skeleton_data_set_name(spine_skeleton_data self, const char *inValue)
 	_self->setName(String(inValue));
 }
 
-/*@null*/ spine_array_bone_data spine_skeleton_data_get_bones(spine_skeleton_data self) {
+spine_array_bone_data spine_skeleton_data_get_bones(spine_skeleton_data self) {
 	SkeletonData *_self = (SkeletonData *) self;
 	return (spine_array_bone_data) &_self->getBones();
 }
 
-/*@null*/ spine_array_slot_data spine_skeleton_data_get_slots(spine_skeleton_data self) {
+spine_array_slot_data spine_skeleton_data_get_slots(spine_skeleton_data self) {
 	SkeletonData *_self = (SkeletonData *) self;
 	return (spine_array_slot_data) &_self->getSlots();
 }
 
-/*@null*/ spine_array_skin spine_skeleton_data_get_skins(spine_skeleton_data self) {
+spine_array_skin spine_skeleton_data_get_skins(spine_skeleton_data self) {
 	SkeletonData *_self = (SkeletonData *) self;
 	return (spine_array_skin) &_self->getSkins();
 }
@@ -71,17 +71,17 @@ void spine_skeleton_data_set_default_skin(spine_skeleton_data self, /*@null*/ sp
 	_self->setDefaultSkin((Skin *) inValue);
 }
 
-/*@null*/ spine_array_event_data spine_skeleton_data_get_events(spine_skeleton_data self) {
+spine_array_event_data spine_skeleton_data_get_events(spine_skeleton_data self) {
 	SkeletonData *_self = (SkeletonData *) self;
 	return (spine_array_event_data) &_self->getEvents();
 }
 
-/*@null*/ spine_array_animation spine_skeleton_data_get_animations(spine_skeleton_data self) {
+spine_array_animation spine_skeleton_data_get_animations(spine_skeleton_data self) {
 	SkeletonData *_self = (SkeletonData *) self;
 	return (spine_array_animation) &_self->getAnimations();
 }
 
-/*@null*/ spine_array_constraint_data spine_skeleton_data_get_constraints(spine_skeleton_data self) {
+spine_array_constraint_data spine_skeleton_data_get_constraints(spine_skeleton_data self) {
 	SkeletonData *_self = (SkeletonData *) self;
 	return (spine_array_constraint_data) &_self->getConstraints();
 }
diff --git a/spine-c/src/generated/skeleton_data.h b/spine-c/src/generated/skeleton_data.h
index 0e122ed3b..054773cf7 100644
--- a/spine-c/src/generated/skeleton_data.h
+++ b/spine-c/src/generated/skeleton_data.h
@@ -20,14 +20,14 @@ SPINE_C_API /*@null*/ spine_event_data spine_skeleton_data_find_event(spine_skel
 SPINE_C_API /*@null*/ spine_animation spine_skeleton_data_find_animation(spine_skeleton_data self, const char *animationName);
 SPINE_C_API const char *spine_skeleton_data_get_name(spine_skeleton_data self);
 SPINE_C_API void spine_skeleton_data_set_name(spine_skeleton_data self, const char *inValue);
-SPINE_C_API /*@null*/ spine_array_bone_data spine_skeleton_data_get_bones(spine_skeleton_data self);
-SPINE_C_API /*@null*/ spine_array_slot_data spine_skeleton_data_get_slots(spine_skeleton_data self);
-SPINE_C_API /*@null*/ spine_array_skin spine_skeleton_data_get_skins(spine_skeleton_data self);
+SPINE_C_API spine_array_bone_data spine_skeleton_data_get_bones(spine_skeleton_data self);
+SPINE_C_API spine_array_slot_data spine_skeleton_data_get_slots(spine_skeleton_data self);
+SPINE_C_API spine_array_skin spine_skeleton_data_get_skins(spine_skeleton_data self);
 SPINE_C_API /*@null*/ spine_skin spine_skeleton_data_get_default_skin(spine_skeleton_data self);
 SPINE_C_API void spine_skeleton_data_set_default_skin(spine_skeleton_data self, /*@null*/ spine_skin inValue);
-SPINE_C_API /*@null*/ spine_array_event_data spine_skeleton_data_get_events(spine_skeleton_data self);
-SPINE_C_API /*@null*/ spine_array_animation spine_skeleton_data_get_animations(spine_skeleton_data self);
-SPINE_C_API /*@null*/ spine_array_constraint_data spine_skeleton_data_get_constraints(spine_skeleton_data self);
+SPINE_C_API spine_array_event_data spine_skeleton_data_get_events(spine_skeleton_data self);
+SPINE_C_API spine_array_animation spine_skeleton_data_get_animations(spine_skeleton_data self);
+SPINE_C_API spine_array_constraint_data spine_skeleton_data_get_constraints(spine_skeleton_data self);
 SPINE_C_API float spine_skeleton_data_get_x(spine_skeleton_data self);
 SPINE_C_API void spine_skeleton_data_set_x(spine_skeleton_data self, float inValue);
 SPINE_C_API float spine_skeleton_data_get_y(spine_skeleton_data self);
diff --git a/spine-c/src/generated/skin.cpp b/spine-c/src/generated/skin.cpp
index f2f0f02bf..1bc4c432c 100644
--- a/spine-c/src/generated/skin.cpp
+++ b/spine-c/src/generated/skin.cpp
@@ -26,7 +26,7 @@ void spine_skin_remove_attachment(spine_skin self, size_t slotIndex, const char
 	_self->removeAttachment(slotIndex, String(name));
 }
 
-void spine_skin_find_attachments_for_slot(spine_skin self, size_t slotIndex, /*@null*/ spine_array_attachment attachments) {
+void spine_skin_find_attachments_for_slot(spine_skin self, size_t slotIndex, spine_array_attachment attachments) {
 	Skin *_self = (Skin *) self;
 	_self->findAttachmentsForSlot(slotIndex, *((Array<Attachment *> *) attachments));
 }
@@ -46,12 +46,12 @@ void spine_skin_copy_skin(spine_skin self, spine_skin other) {
 	_self->copySkin(*((Skin *) other));
 }
 
-/*@null*/ spine_array_bone_data spine_skin_get_bones(spine_skin self) {
+spine_array_bone_data spine_skin_get_bones(spine_skin self) {
 	Skin *_self = (Skin *) self;
 	return (spine_array_bone_data) &_self->getBones();
 }
 
-/*@null*/ spine_array_constraint_data spine_skin_get_constraints(spine_skin self) {
+spine_array_constraint_data spine_skin_get_constraints(spine_skin self) {
 	Skin *_self = (Skin *) self;
 	return (spine_array_constraint_data) &_self->getConstraints();
 }
diff --git a/spine-c/src/generated/skin.h b/spine-c/src/generated/skin.h
index 0fcbc2e38..8b0f17c8d 100644
--- a/spine-c/src/generated/skin.h
+++ b/spine-c/src/generated/skin.h
@@ -16,12 +16,12 @@ SPINE_C_API void spine_skin_dispose(spine_skin self);
 SPINE_C_API void spine_skin_set_attachment(spine_skin self, size_t slotIndex, const char *name, spine_attachment attachment);
 SPINE_C_API /*@null*/ spine_attachment spine_skin_get_attachment(spine_skin self, size_t slotIndex, const char *name);
 SPINE_C_API void spine_skin_remove_attachment(spine_skin self, size_t slotIndex, const char *name);
-SPINE_C_API void spine_skin_find_attachments_for_slot(spine_skin self, size_t slotIndex, /*@null*/ spine_array_attachment attachments);
+SPINE_C_API void spine_skin_find_attachments_for_slot(spine_skin self, size_t slotIndex, spine_array_attachment attachments);
 SPINE_C_API const char *spine_skin_get_name(spine_skin self);
 SPINE_C_API void spine_skin_add_skin(spine_skin self, spine_skin other);
 SPINE_C_API void spine_skin_copy_skin(spine_skin self, spine_skin other);
-SPINE_C_API /*@null*/ spine_array_bone_data spine_skin_get_bones(spine_skin self);
-SPINE_C_API /*@null*/ spine_array_constraint_data spine_skin_get_constraints(spine_skin self);
+SPINE_C_API spine_array_bone_data spine_skin_get_bones(spine_skin self);
+SPINE_C_API spine_array_constraint_data spine_skin_get_constraints(spine_skin self);
 SPINE_C_API spine_color spine_skin_get_color(spine_skin self);
 
 #ifdef __cplusplus
diff --git a/spine-c/src/generated/transform_constraint.cpp b/spine-c/src/generated/transform_constraint.cpp
index 51168438c..7921b718f 100644
--- a/spine-c/src/generated/transform_constraint.cpp
+++ b/spine-c/src/generated/transform_constraint.cpp
@@ -36,7 +36,7 @@ bool spine_transform_constraint_is_source_active(spine_transform_constraint self
 	return _self->isSourceActive();
 }
 
-/*@null*/ spine_array_bone_pose spine_transform_constraint_get_bones(spine_transform_constraint self) {
+spine_array_bone_pose spine_transform_constraint_get_bones(spine_transform_constraint self) {
 	TransformConstraint *_self = (TransformConstraint *) self;
 	return (spine_array_bone_pose) &_self->getBones();
 }
diff --git a/spine-c/src/generated/transform_constraint.h b/spine-c/src/generated/transform_constraint.h
index 7e28c0990..ed6a98ba8 100644
--- a/spine-c/src/generated/transform_constraint.h
+++ b/spine-c/src/generated/transform_constraint.h
@@ -18,7 +18,7 @@ SPINE_C_API spine_transform_constraint spine_transform_constraint_copy(spine_tra
 SPINE_C_API void spine_transform_constraint_update(spine_transform_constraint self, spine_skeleton skeleton, spine_physics physics);
 SPINE_C_API void spine_transform_constraint_sort(spine_transform_constraint self, spine_skeleton skeleton);
 SPINE_C_API bool spine_transform_constraint_is_source_active(spine_transform_constraint self);
-SPINE_C_API /*@null*/ spine_array_bone_pose spine_transform_constraint_get_bones(spine_transform_constraint self);
+SPINE_C_API spine_array_bone_pose spine_transform_constraint_get_bones(spine_transform_constraint self);
 SPINE_C_API spine_bone spine_transform_constraint_get_source(spine_transform_constraint self);
 SPINE_C_API void spine_transform_constraint_set_source(spine_transform_constraint self, spine_bone source);
 SPINE_C_API spine_transform_constraint_data spine_transform_constraint_get_data(spine_transform_constraint self);
diff --git a/spine-c/src/generated/transform_constraint_data.cpp b/spine-c/src/generated/transform_constraint_data.cpp
index 1ebad6a6b..24e15985b 100644
--- a/spine-c/src/generated/transform_constraint_data.cpp
+++ b/spine-c/src/generated/transform_constraint_data.cpp
@@ -21,7 +21,7 @@ spine_constraint spine_transform_constraint_data_create_method(spine_transform_c
 	return (spine_constraint) &_self->create(*((Skeleton *) skeleton));
 }
 
-/*@null*/ spine_array_bone_data spine_transform_constraint_data_get_bones(spine_transform_constraint_data self) {
+spine_array_bone_data spine_transform_constraint_data_get_bones(spine_transform_constraint_data self) {
 	TransformConstraintData *_self = (TransformConstraintData *) self;
 	return (spine_array_bone_data) &_self->getBones();
 }
@@ -136,7 +136,7 @@ void spine_transform_constraint_data_set_clamp(spine_transform_constraint_data s
 	_self->setClamp(clamp);
 }
 
-/*@null*/ spine_array_from_property spine_transform_constraint_data_get_properties(spine_transform_constraint_data self) {
+spine_array_from_property spine_transform_constraint_data_get_properties(spine_transform_constraint_data self) {
 	TransformConstraintData *_self = (TransformConstraintData *) self;
 	return (spine_array_from_property) &_self->getProperties();
 }
diff --git a/spine-c/src/generated/transform_constraint_data.h b/spine-c/src/generated/transform_constraint_data.h
index dcec34df4..7d5ddc38e 100644
--- a/spine-c/src/generated/transform_constraint_data.h
+++ b/spine-c/src/generated/transform_constraint_data.h
@@ -15,7 +15,7 @@ SPINE_C_API void spine_transform_constraint_data_dispose(spine_transform_constra
 
 SPINE_C_API spine_rtti spine_transform_constraint_data_get_rtti(spine_transform_constraint_data self);
 SPINE_C_API spine_constraint spine_transform_constraint_data_create_method(spine_transform_constraint_data self, spine_skeleton skeleton);
-SPINE_C_API /*@null*/ spine_array_bone_data spine_transform_constraint_data_get_bones(spine_transform_constraint_data self);
+SPINE_C_API spine_array_bone_data spine_transform_constraint_data_get_bones(spine_transform_constraint_data self);
 SPINE_C_API spine_bone_data spine_transform_constraint_data_get_source(spine_transform_constraint_data self);
 SPINE_C_API void spine_transform_constraint_data_set_source(spine_transform_constraint_data self, spine_bone_data source);
 SPINE_C_API float spine_transform_constraint_data_get_offset_rotation(spine_transform_constraint_data self);
@@ -38,7 +38,7 @@ SPINE_C_API bool spine_transform_constraint_data_get_additive(spine_transform_co
 SPINE_C_API void spine_transform_constraint_data_set_additive(spine_transform_constraint_data self, bool additive);
 SPINE_C_API bool spine_transform_constraint_data_get_clamp(spine_transform_constraint_data self);
 SPINE_C_API void spine_transform_constraint_data_set_clamp(spine_transform_constraint_data self, bool clamp);
-SPINE_C_API /*@null*/ spine_array_from_property spine_transform_constraint_data_get_properties(spine_transform_constraint_data self);
+SPINE_C_API spine_array_from_property spine_transform_constraint_data_get_properties(spine_transform_constraint_data self);
 SPINE_C_API const char *spine_transform_constraint_data_get_name(spine_transform_constraint_data self);
 SPINE_C_API bool spine_transform_constraint_data_get_skin_required(spine_transform_constraint_data self);
 SPINE_C_API spine_transform_constraint_pose spine_transform_constraint_data_get_setup_pose(spine_transform_constraint_data self);