diff --git a/cont.c b/cont.c
index 10b6297068..035cfba71d 100644
--- a/cont.c
+++ b/cont.c
@@ -413,7 +413,7 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
 static const rb_data_type_t cont_data_type = {
     "continuation",
     {cont_mark, cont_free, cont_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static inline void
@@ -1143,7 +1143,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
 static const rb_data_type_t fiber_data_type = {
     "fiber",
     {fiber_mark, fiber_free, fiber_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
diff --git a/dir.c b/dir.c
index 778a637cba..bc26436114 100644
--- a/dir.c
+++ b/dir.c
@@ -379,7 +379,7 @@ dir_memsize(const void *ptr)
 static const rb_data_type_t dir_data_type = {
     "dir",
     {dir_mark, dir_free, dir_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE dir_close(VALUE);
diff --git a/encoding.c b/encoding.c
index eb2ec85cf2..a3514dff5e 100644
--- a/encoding.c
+++ b/encoding.c
@@ -72,7 +72,7 @@ static int load_encoding(const char *name);
 static const rb_data_type_t encoding_data_type = {
     "encoding",
     {0, 0, 0,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type)
diff --git a/enumerator.c b/enumerator.c
index 3beedc425e..4d989c3941 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -167,7 +167,7 @@ static const rb_data_type_t enumerator_data_type = {
 	enumerator_free,
 	enumerator_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static struct enumerator *
@@ -1078,7 +1078,7 @@ static const rb_data_type_t yielder_data_type = {
 	yielder_free,
 	yielder_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static struct yielder *
@@ -1185,7 +1185,7 @@ static const rb_data_type_t generator_data_type = {
 	generator_free,
 	generator_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static struct generator *
diff --git a/error.c b/error.c
index 81684a112d..70bbb233c9 100644
--- a/error.c
+++ b/error.c
@@ -1116,7 +1116,7 @@ static const rb_data_type_t name_err_mesg_data_type = {
 	name_err_mesg_free,
 	name_err_mesg_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 /* :nodoc: */
diff --git a/ext/-test-/marshal/usr/usrmarshal.c b/ext/-test-/marshal/usr/usrmarshal.c
index 056f0326c0..0c9e079af2 100644
--- a/ext/-test-/marshal/usr/usrmarshal.c
+++ b/ext/-test-/marshal/usr/usrmarshal.c
@@ -9,7 +9,7 @@ usr_size(const void *ptr)
 static const rb_data_type_t usrmarshal_type = {
     "UsrMarshal",
     {0, RUBY_DEFAULT_FREE, usr_size,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
 };
 
diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c
index a903edd541..e033886f9d 100644
--- a/ext/-test-/st/numhash/numhash.c
+++ b/ext/-test-/st/numhash/numhash.c
@@ -16,7 +16,7 @@ numhash_memsize(const void *ptr)
 static const rb_data_type_t numhash_type = {
     "numhash",
     {0, numhash_free, numhash_memsize,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
 };
 
diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c
index 08febb5585..79dffa4108 100644
--- a/ext/bigdecimal/bigdecimal.c
+++ b/ext/bigdecimal/bigdecimal.c
@@ -162,7 +162,7 @@ static const rb_data_type_t BigDecimal_data_type = {
     "BigDecimal",
     { 0, BigDecimal_delete, BigDecimal_memsize, },
 #ifdef RUBY_TYPED_FREE_IMMEDIATELY
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 #endif
 };
 
diff --git a/ext/date/date_core.c b/ext/date/date_core.c
index 9ef5160b19..07b65a7ed4 100644
--- a/ext/date/date_core.c
+++ b/ext/date/date_core.c
@@ -2947,7 +2947,7 @@ d_lite_memsize(const void *ptr)
 static const rb_data_type_t d_lite_type = {
     "Date",
     {d_lite_gc_mark, RUBY_TYPED_DEFAULT_FREE, d_lite_memsize,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
 };
 
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c
index 6f64d13690..c90fe71fce 100644
--- a/ext/dbm/dbm.c
+++ b/ext/dbm/dbm.c
@@ -81,7 +81,7 @@ memsize_dbm(const void *ptr)
 static const rb_data_type_t dbm_type = {
     "dbm",
     {0, free_dbm, memsize_dbm,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/digest/digest.c b/ext/digest/digest.c
index b177881cd0..ed96c2f274 100644
--- a/ext/digest/digest.c
+++ b/ext/digest/digest.c
@@ -540,7 +540,7 @@ get_digest_base_metadata(VALUE klass)
 static const rb_data_type_t digest_type = {
     "digest",
     {0, RUBY_TYPED_DEFAULT_FREE, 0,},
-    NULL, NULL,
+    0, 0,
     (RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED),
 };
 
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c
index a8f75b27d1..eb802a7563 100644
--- a/ext/gdbm/gdbm.c
+++ b/ext/gdbm/gdbm.c
@@ -136,7 +136,7 @@ memsize_dbm(const void *ptr)
 static const rb_data_type_t dbm_type = {
     "gdbm",
     {0, free_dbm, memsize_dbm,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 906e902593..f56ac09cd2 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -518,7 +518,7 @@ static size_t State_memsize(const void *ptr)
 static const rb_data_type_t JSON_Generator_State_type = {
     "JSON/Generator/State",
     {NULL, State_free, State_memsize,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c
index ada5596b8e..560aa8977f 100644
--- a/ext/json/parser/parser.c
+++ b/ext/json/parser/parser.c
@@ -2126,7 +2126,7 @@ static size_t JSON_memsize(const void *ptr)
 static const rb_data_type_t JSON_Parser_type = {
     "JSON/Parser",
     {JSON_mark, JSON_free, JSON_memsize,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl
index dab4bb324b..34e30f4868 100644
--- a/ext/json/parser/parser.rl
+++ b/ext/json/parser/parser.rl
@@ -849,7 +849,7 @@ static size_t JSON_memsize(const void *ptr)
 static const rb_data_type_t JSON_Parser_type = {
     "JSON/Parser",
     {JSON_mark, JSON_free, JSON_memsize,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index c423723fa2..bc02e579cd 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -518,7 +518,7 @@ iow_size(const void *ptr)
 static const rb_data_type_t iow_data_type = {
     "ObjectSpace::InternalObjectWrapper",
     {iow_mark, 0, iow_size,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE rb_mInternalObjectWrapper;
diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c
index 0af7d63944..58796fe2a4 100644
--- a/ext/openssl/ossl_bn.c
+++ b/ext/openssl/ossl_bn.c
@@ -45,7 +45,7 @@ ossl_bn_size(const void *ptr)
 static const rb_data_type_t ossl_bn_type = {
     "OpenSSL/BN",
     {0, ossl_bn_free, ossl_bn_size,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c
index 0efadd1925..fb7ec54dcd 100644
--- a/ext/openssl/ossl_cipher.c
+++ b/ext/openssl/ossl_cipher.c
@@ -43,7 +43,7 @@ static size_t ossl_cipher_memsize(const void *ptr);
 static const rb_data_type_t ossl_cipher_type = {
     "OpenSSL/Cipher",
     {0, ossl_cipher_free, ossl_cipher_memsize,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c
index 9b5204fd5f..3fc8170f6a 100644
--- a/ext/psych/psych_emitter.c
+++ b/ext/psych/psych_emitter.c
@@ -41,7 +41,7 @@ static size_t memsize(const void *ptr)
 static const rb_data_type_t psych_emitter_type = {
     "Psych/emitter",
     {0, dealloc, 0,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/psych/psych_parser.c b/ext/psych/psych_parser.c
index 7aad9213c4..6b72195625 100644
--- a/ext/psych/psych_parser.c
+++ b/ext/psych/psych_parser.c
@@ -61,7 +61,7 @@ static size_t memsize(const void *ptr)
 static const rb_data_type_t psych_parser_type = {
     "Psych/parser",
     {0, dealloc, 0,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index 821918cff0..901824c2a7 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -112,7 +112,7 @@ memsize_dbm(const void *ptr)
 static const rb_data_type_t sdbm_type = {
     "sdbm",
     {0, free_sdbm, memsize_dbm,},
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY,
 };
 
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index ae3843041e..cca408fcb5 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -78,7 +78,7 @@ static const rb_data_type_t strio_data_type = {
 	strio_free,
 	strio_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #define check_strio(self) ((struct StringIO*)rb_check_typeddata((self), &strio_data_type))
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index c11eebb947..acb7c61230 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -191,7 +191,7 @@ strscan_memsize(const void *ptr)
 static const rb_data_type_t strscanner_type = {
     "StringScanner",
     {strscan_mark, strscan_free, strscan_memsize},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
diff --git a/ext/win32ole/win32ole_event.c b/ext/win32ole/win32ole_event.c
index fdd2c46e99..4443585239 100644
--- a/ext/win32ole/win32ole_event.c
+++ b/ext/win32ole/win32ole_event.c
@@ -110,7 +110,7 @@ static long  evs_length(void);
 static const rb_data_type_t oleevent_datatype = {
     "win32ole_event",
     {NULL, oleevent_free, oleevent_size,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 STDMETHODIMP EVENTSINK_Invoke(
diff --git a/ext/win32ole/win32ole_method.c b/ext/win32ole/win32ole_method.c
index ebddf54876..ba8cf78015 100644
--- a/ext/win32ole/win32ole_method.c
+++ b/ext/win32ole/win32ole_method.c
@@ -45,7 +45,7 @@ static VALUE folemethod_inspect(VALUE self);
 static const rb_data_type_t olemethod_datatype = {
     "win32ole_method",
     {NULL, olemethod_free, olemethod_size,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static void
diff --git a/ext/win32ole/win32ole_param.c b/ext/win32ole/win32ole_param.c
index d9432ccd20..31cf853b04 100644
--- a/ext/win32ole/win32ole_param.c
+++ b/ext/win32ole/win32ole_param.c
@@ -31,7 +31,7 @@ static VALUE foleparam_inspect(VALUE self);
 static const rb_data_type_t oleparam_datatype = {
     "win32ole_param",
     {NULL, oleparam_free, oleparam_size,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static void
diff --git a/ext/win32ole/win32ole_record.c b/ext/win32ole/win32ole_record.c
index 68b8eaeca6..28d6238492 100644
--- a/ext/win32ole/win32ole_record.c
+++ b/ext/win32ole/win32ole_record.c
@@ -23,7 +23,7 @@ static VALUE folerecord_inspect(VALUE self);
 static const rb_data_type_t olerecord_datatype = {
     "win32ole_record",
     {NULL, olerecord_free, olerecord_size,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static HRESULT
diff --git a/ext/win32ole/win32ole_type.c b/ext/win32ole/win32ole_type.c
index 48df6707e8..efcac883df 100644
--- a/ext/win32ole/win32ole_type.c
+++ b/ext/win32ole/win32ole_type.c
@@ -50,7 +50,7 @@ static VALUE foletype_inspect(VALUE self);
 static const rb_data_type_t oletype_datatype = {
     "win32ole_type",
     {NULL, oletype_free, oletype_size,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 /*
diff --git a/ext/win32ole/win32ole_typelib.c b/ext/win32ole/win32ole_typelib.c
index a2058db62a..5a431d8b12 100644
--- a/ext/win32ole/win32ole_typelib.c
+++ b/ext/win32ole/win32ole_typelib.c
@@ -34,7 +34,7 @@ static VALUE foletypelib_inspect(VALUE self);
 static const rb_data_type_t oletypelib_datatype = {
     "win32ole_typelib",
     {NULL, oletypelib_free, oletypelib_size,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
diff --git a/ext/win32ole/win32ole_variable.c b/ext/win32ole/win32ole_variable.c
index 9b142f9cd2..dd583828f2 100644
--- a/ext/win32ole/win32ole_variable.c
+++ b/ext/win32ole/win32ole_variable.c
@@ -25,7 +25,7 @@ static VALUE folevariable_inspect(VALUE self);
 static const rb_data_type_t olevariable_datatype = {
     "win32ole_variable",
     {NULL, olevariable_free, olevariable_size,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static void
diff --git a/ext/win32ole/win32ole_variant.c b/ext/win32ole/win32ole_variant.c
index c357f9c8e1..1731ab7a61 100644
--- a/ext/win32ole/win32ole_variant.c
+++ b/ext/win32ole/win32ole_variant.c
@@ -26,7 +26,7 @@ static VALUE folevariant_set_value(VALUE self, VALUE val);
 static const rb_data_type_t olevariant_datatype = {
     "win32ole_variant",
     {NULL, olevariant_free, olevariant_size,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static void
diff --git a/file.c b/file.c
index 803ca30e76..b22ff8fbee 100644
--- a/file.c
+++ b/file.c
@@ -367,7 +367,7 @@ stat_memsize(const void *p)
 static const rb_data_type_t stat_data_type = {
     "stat",
     {NULL, RUBY_TYPED_DEFAULT_FREE, stat_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
diff --git a/gc.c b/gc.c
index 92dfb37ac1..6c693fa181 100644
--- a/gc.c
+++ b/gc.c
@@ -7602,7 +7602,7 @@ static const rb_data_type_t weakmap_type = {
 	wmap_free,
 	wmap_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
diff --git a/io.c b/io.c
index 3e743f2356..255431be2d 100644
--- a/io.c
+++ b/io.c
@@ -7758,7 +7758,7 @@ argf_memsize(const void *ptr)
 static const rb_data_type_t argf_type = {
     "ARGF",
     {argf_mark, argf_free, argf_memsize},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static inline void
diff --git a/iseq.c b/iseq.c
index c81193c521..fd0cbd8cd2 100644
--- a/iseq.c
+++ b/iseq.c
@@ -179,7 +179,7 @@ static const rb_data_type_t iseq_data_type = {
 	iseq_free,
 	iseq_memsize,
     },              /* functions */
-    NULL, NULL,
+    0, 0,
     RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
 };
 
diff --git a/marshal.c b/marshal.c
index de6ed607b0..6a61ae53b4 100644
--- a/marshal.c
+++ b/marshal.c
@@ -203,7 +203,7 @@ memsize_dump_arg(const void *ptr)
 static const rb_data_type_t dump_arg_data = {
     "dump_arg",
     {mark_dump_arg, free_dump_arg, memsize_dump_arg,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
@@ -1084,7 +1084,7 @@ memsize_load_arg(const void *ptr)
 static const rb_data_type_t load_arg_data = {
     "load_arg",
     {mark_load_arg, free_load_arg, memsize_load_arg,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #define r_entry(v, arg) r_entry0((v), (arg)->data->num_entries, (arg))
diff --git a/parse.y b/parse.y
index 8af2c9a189..15fe08648f 100644
--- a/parse.y
+++ b/parse.y
@@ -10539,7 +10539,7 @@ static const rb_data_type_t parser_data_type = {
 	parser_free,
 	parser_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #ifndef RIPPER
diff --git a/proc.c b/proc.c
index 5cf972e020..805f7b9603 100644
--- a/proc.c
+++ b/proc.c
@@ -67,7 +67,7 @@ static const rb_data_type_t proc_data_type = {
 	RUBY_TYPED_DEFAULT_FREE,
 	proc_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 VALUE
@@ -265,7 +265,7 @@ const rb_data_type_t ruby_binding_data_type = {
 	binding_free,
 	binding_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 VALUE
@@ -1117,7 +1117,7 @@ static const rb_data_type_t method_data_type = {
 	bm_free,
 	bm_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 VALUE
diff --git a/process.c b/process.c
index cc2f33611c..4a6f87d03b 100644
--- a/process.c
+++ b/process.c
@@ -1376,7 +1376,7 @@ memsize_exec_arg(const void *ptr)
 static const rb_data_type_t exec_arg_data_type = {
     "exec_arg",
     {mark_exec_arg, RUBY_TYPED_DEFAULT_FREE, memsize_exec_arg},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #ifdef _WIN32
diff --git a/random.c b/random.c
index f38af6fce9..c03d613435 100644
--- a/random.c
+++ b/random.c
@@ -334,7 +334,7 @@ static const rb_data_type_t random_data_type = {
 	random_free,
 	random_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static rb_random_t *
diff --git a/thread.c b/thread.c
index 97c4ab903b..8708e6adc2 100644
--- a/thread.c
+++ b/thread.c
@@ -3912,7 +3912,7 @@ thgroup_memsize(const void *ptr)
 static const rb_data_type_t thgroup_data_type = {
     "thgroup",
     {NULL, RUBY_TYPED_DEFAULT_FREE, thgroup_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 /*
@@ -4134,7 +4134,7 @@ mutex_memsize(const void *ptr)
 static const rb_data_type_t mutex_data_type = {
     "mutex",
     {mutex_mark, mutex_free, mutex_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 VALUE
@@ -4584,7 +4584,7 @@ thread_shield_mark(void *ptr)
 static const rb_data_type_t thread_shield_data_type = {
     "thread_shield",
     {thread_shield_mark, 0, 0,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
diff --git a/time.c b/time.c
index d5c5d4fb8a..ddd27ca8dd 100644
--- a/time.c
+++ b/time.c
@@ -1796,7 +1796,7 @@ time_memsize(const void *tobj)
 static const rb_data_type_t time_data_type = {
     "time",
     {time_mark, RUBY_TYPED_DEFAULT_FREE, time_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
diff --git a/transcode.c b/transcode.c
index 76724b470e..17d406e8be 100644
--- a/transcode.c
+++ b/transcode.c
@@ -2920,7 +2920,7 @@ econv_memsize(const void *ptr)
 static const rb_data_type_t econv_data_type = {
     "econv",
     {NULL, econv_free, econv_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE
diff --git a/variable.c b/variable.c
index 20991dbb40..1395f5d625 100644
--- a/variable.c
+++ b/variable.c
@@ -1563,7 +1563,7 @@ autoload_memsize(const void *ptr)
 static const rb_data_type_t autoload_data_type = {
     "autoload",
     {autoload_mark, autoload_free, autoload_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #define check_autoload_table(av) \
@@ -1607,7 +1607,7 @@ autoload_i_memsize(const void *ptr)
 static const rb_data_type_t autoload_data_i_type = {
     "autoload_i",
     {autoload_i_mark, RUBY_TYPED_DEFAULT_FREE, autoload_i_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 #define check_autoload_data(av) \
diff --git a/vm.c b/vm.c
index 4800211366..c710263628 100644
--- a/vm.c
+++ b/vm.c
@@ -383,7 +383,7 @@ env_memsize(const void *ptr)
 static const rb_data_type_t env_data_type = {
     "VM/env",
     {env_mark, RUBY_TYPED_DEFAULT_FREE, env_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE check_env_value(VALUE envval);
@@ -1879,7 +1879,7 @@ vm_memsize(const void *ptr)
 static const rb_data_type_t vm_data_type = {
     "VM",
     {NULL, NULL, vm_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 
@@ -2146,7 +2146,7 @@ const rb_data_type_t ruby_threadptr_data_type = {
 	thread_free,
 	thread_memsize,
     },
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 VALUE
diff --git a/vm_backtrace.c b/vm_backtrace.c
index 7b579d6220..7ea0b3ba5e 100644
--- a/vm_backtrace.c
+++ b/vm_backtrace.c
@@ -106,7 +106,7 @@ location_memsize(const void *ptr)
 static const rb_data_type_t location_data_type = {
     "frame_info",
     {location_mark, RUBY_TYPED_DEFAULT_FREE, location_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static inline rb_backtrace_location_t *
@@ -404,7 +404,7 @@ backtrace_memsize(const void *ptr)
 static const rb_data_type_t backtrace_data_type = {
     "backtrace",
     {backtrace_mark, backtrace_free, backtrace_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 int
diff --git a/vm_trace.c b/vm_trace.c
index 4fce3f37e3..978850a00a 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -667,7 +667,7 @@ tp_memsize(const void *ptr)
 static const rb_data_type_t tp_data_type = {
     "tracepoint",
     {tp_mark, RUBY_TYPED_NEVER_FREE, tp_memsize,},
-    NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0, RUBY_TYPED_FREE_IMMEDIATELY
 };
 
 static VALUE