5 files changed, 23 insertions, 17 deletions
diff --git a/include/mruby/re.h b/include/mruby/re.h
new file mode 100644
index 000000000..dfb3b0e2d
--- /dev/null
+++ b/include/mruby/re.h
@@ -0,0 +1,20 @@
+/*
+** mruby/re.h - Regexp class
+**
+** See Copyright Notice in mruby.h
+*/
+
+#ifndef MRUBY_RE_H
+#define MRUBY_RE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define REGEXP_CLASS          "Regexp"
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif  /* RE_H */
diff --git a/mrbgems/mruby-string-utf8/src/string.c b/mrbgems/mruby-string-utf8/src/string.c
index da348f4fb..7ce3b9f75 100644
--- a/mrbgems/mruby-string-utf8/src/string.c
+++ b/mrbgems/mruby-string-utf8/src/string.c
@@ -1,12 +1,10 @@
 #include "mruby.h"
 #include "mruby/string.h"
 #include "mruby/range.h"
+#include "mruby/re.h"
 #include <ctype.h>
 #include <string.h>
 
-/* TODO: duplicate definition in src/re.h */
-#define REGEXP_CLASS "Regexp"
-
 static const char utf8len_codepage[256] =
 {
   1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
diff --git a/src/codegen.c b/src/codegen.c
index c869285d9..a36d609c6 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -16,7 +16,7 @@
 #include "mruby/debug.h"
 #include "node.h"
 #include "opcode.h"
-#include "re.h"
+#include "mruby/re.h"
 #include "mrb_throw.h"
 
 typedef mrb_ast_node node;
diff --git a/src/re.h b/src/re.h
deleted file mode 100644
index ee2638b22..000000000
--- a/src/re.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-** re.h - Regexp class
-**
-** See Copyright Notice in mruby.h
-*/
-
-#ifndef RE_H
-#define RE_H
-
-#define REGEXP_CLASS          "Regexp"
-
-#endif  /* RE_H */
diff --git a/src/string.c b/src/string.c
index ebc579ec5..9c206157e 100644
--- a/src/string.c
+++ b/src/string.c
@@ -14,7 +14,7 @@
 #include "mruby/class.h"
 #include "mruby/range.h"
 #include "mruby/string.h"
-#include "re.h"
+#include "mruby/re.h"
 
 #define STR_EMBED_P(s) ((s)->flags & MRB_STR_EMBED)
 #define STR_SET_EMBED_FLAG(s) ((s)->flags |= MRB_STR_EMBED)