3 files changed, 4 insertions, 9 deletions
diff --git a/src/error.h b/src/error.h
index e4d6acb6c..674d4f477 100644
--- a/src/error.h
+++ b/src/error.h
@@ -8,7 +8,7 @@
 #define MRUBY_ERROR_H
 
 struct RException {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
 };
 
 void mrb_sys_fail(mrb_state *mrb, const char *mesg);
diff --git a/src/gc.c b/src/gc.c
index 0b01164d5..e0a923b89 100644
--- a/src/gc.c
+++ b/src/gc.c
@@ -77,7 +77,7 @@
 #endif
 
 struct free_obj {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct RBasic *next;
 };
 
diff --git a/src/re.h b/src/re.h
index 91bd1abc1..65ca0e6ae 100644
--- a/src/re.h
+++ b/src/re.h
@@ -31,20 +31,15 @@ struct rmatch {
     struct rmatch_offset *char_offset;
 };
 
-//struct RMatch {
-//  MRUBY_OBJECT_HEADER;
-//  mrb_value str;
-//  struct re_registers *regs;
-//};
 struct RMatch {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct RString *str;
   struct rmatch *rmatch;
   struct RRegexp *regexp;
 };
 
 struct RRegexp {
-  MRUBY_OBJECT_HEADER;
+  MRB_OBJECT_HEADER;
   struct re_pattern_buffer *ptr;
   struct RString *src;
   unsigned long usecnt;