diff --git a/binding-mri/binding-util.cpp b/binding-mri/binding-util.cpp
index 7755625..4dc6fc9 100644
--- a/binding-mri/binding-util.cpp
+++ b/binding-mri/binding-util.cpp
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <assert.h>
 
-void initType(rb_data_type_struct &type,
+void initType(rb_data_type_t &type,
               const char *name,
               void (*freeInst)(void *))
 {
diff --git a/binding-mri/binding-util.h b/binding-mri/binding-util.h
index 8fcdab5..93fe006 100644
--- a/binding-mri/binding-util.h
+++ b/binding-mri/binding-util.h
@@ -62,12 +62,12 @@ void
 raiseRbExc(const Exception &exc);
 
 #define DECL_TYPE(Klass) \
-	extern rb_data_type_struct Klass##Type
+	extern rb_data_type_t Klass##Type
 
 #define DEF_TYPE(Klass) \
-	rb_data_type_struct Klass##Type
+	rb_data_type_t Klass##Type
 
-void initType(rb_data_type_struct &type,
+void initType(rb_data_type_t &type,
               const char *name,
               void (*freeInst)(void*));
 
@@ -109,7 +109,7 @@ getPrivateData(VALUE self)
 
 template<class C>
 static inline C *
-getPrivateDataCheck(VALUE self, const rb_data_type_struct &type)
+getPrivateDataCheck(VALUE self, const rb_data_type_t &type)
 {
 	/* We don't check for disposed here because any disposable
 	 * property is always also nullable */
@@ -124,7 +124,7 @@ setPrivateData(VALUE self, void *p)
 }
 
 inline VALUE
-wrapObject(void *p, const rb_data_type_struct &type,
+wrapObject(void *p, const rb_data_type_t &type,
            VALUE underKlass = rb_cObject)
 {
 	VALUE klass = rb_const_get(underKlass, rb_intern(type.wrap_struct_name));
@@ -137,7 +137,7 @@ wrapObject(void *p, const rb_data_type_struct &type,
 
 inline VALUE
 wrapProperty(VALUE self, void *prop, const char *iv,
-             const rb_data_type_struct &type,
+             const rb_data_type_t &type,
              VALUE underKlass = rb_cObject)
 {
 	VALUE propObj = wrapObject(prop, type, underKlass);
diff --git a/binding-mri/tilemap-binding.cpp b/binding-mri/tilemap-binding.cpp
index 1fe0fe8..a62cca2 100644
--- a/binding-mri/tilemap-binding.cpp
+++ b/binding-mri/tilemap-binding.cpp
@@ -28,7 +28,7 @@
 #include "binding-util.h"
 #include "binding-types.h"
 
-rb_data_type_struct TilemapAutotilesType;
+rb_data_type_t TilemapAutotilesType;
 
 RB_METHOD(tilemapAutotilesSet)
 {
diff --git a/binding-mri/tilemapvx-binding.cpp b/binding-mri/tilemapvx-binding.cpp
index c688d72..d87d16b 100644
--- a/binding-mri/tilemapvx-binding.cpp
+++ b/binding-mri/tilemapvx-binding.cpp
@@ -30,7 +30,7 @@
 #include "binding-types.h"
 
 DEF_TYPE(TilemapVX);
-rb_data_type_struct BitmapArrayType;
+rb_data_type_t BitmapArrayType;
 
 RB_METHOD(tilemapVXInitialize)
 {