3 files changed, 39 insertions, 4 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 461443518..61bb80ea3 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -186,6 +186,8 @@ struct RClass * mrb_module_new(mrb_state *mrb);
 mrb_bool mrb_class_defined(mrb_state *mrb, const char *name);
 struct RClass * mrb_class_get(mrb_state *mrb, const char *name);
 struct RClass * mrb_class_get_under(mrb_state *mrb, struct RClass *outer, const char *name);
+struct RClass * mrb_module_get(mrb_state *mrb, const char *name);
+struct RClass * mrb_module_get_under(mrb_state *mrb, struct RClass *outer, const char *name);
 
 mrb_value mrb_obj_dup(mrb_state *mrb, mrb_value obj);
 mrb_value mrb_check_to_integer(mrb_state *mrb, mrb_value val, const char *method);
@@ -252,6 +254,7 @@ void mrb_free(mrb_state*, void*);
 mrb_value mrb_str_new(mrb_state *mrb, const char *p, size_t len);
 mrb_value mrb_str_new_cstr(mrb_state*, const char*);
 mrb_value mrb_str_new_static(mrb_state *mrb, const char *p, size_t len);
+#define mrb_str_new_lit(mrb, lit) mrb_str_new_static(mrb, (lit), sizeof(lit) - 1)
 
 mrb_state* mrb_open(void);
 mrb_state* mrb_open_allocf(mrb_allocf, void *ud);
diff --git a/include/mruby/gc.h b/include/mruby/gc.h
index 7afa24b48..02714be8e 100644
--- a/include/mruby/gc.h
+++ b/include/mruby/gc.h
@@ -7,11 +7,16 @@
 #ifndef MRUBY_GC_H
 #define MRUBY_GC_H
 
-#include "mruby.h"
-#include "mruby/value.h"
+#if defined(__cplusplus)
+extern "C" {
+#endif
 
-typedef void (each_object_callback)(mrb_state *mrb, struct RBasic* obj, void *data);
-void mrb_objspace_each_objects(mrb_state *mrb, each_object_callback* callback, void *data);
+typedef void (mrb_each_object_callback)(mrb_state *mrb, struct RBasic *obj, void *data);
+void mrb_objspace_each_objects(mrb_state *mrb, mrb_each_object_callback *callback, void *data);
 void mrb_free_context(mrb_state *mrb, struct mrb_context *c);
 
+#if defined(__cplusplus)
+}  /* extern "C" { */
+#endif
+
 #endif  /* MRUBY_GC_H */
diff --git a/include/mruby/version.h b/include/mruby/version.h
new file mode 100644
index 000000000..9105229b9
--- /dev/null
+++ b/include/mruby/version.h
@@ -0,0 +1,27 @@
+#define MRUBY_RUBY_VERSION "1.9"
+#define MRUBY_VERSION "v1.0.0"
+
+#define MRUBY_RELEASE_MAJOR 1
+#define MRUBY_RELEASE_MINOR 0
+#define MRUBY_RELEASE_TEENY 1
+#define MRUBY_RELEASE_NO 10001
+#define MRUBY_RELEASE_DATE "2014-01-10"
+#define MRUBY_RELEASE_YEAR 2014
+#define MRUBY_RELEASE_MONTH 1
+#define MRUBY_RELEASE_DAY 10
+
+#define MRUBY_BIRTH_YEAR 2010
+
+#define MRUBY_AUTHOR "mruby developers"
+
+#define STRINGIZE0(expr) #expr
+#define STRINGIZE(expr) STRINGIZE0(expr)
+
+#define MRUBY_DESCRIPTION             \
+    "mruby "MRUBY_VERSION             \
+    " ("MRUBY_RELEASE_DATE") " 
+#define MRUBY_COPYRIGHT               \
+    "mruby - Copyright (c) "          \
+    STRINGIZE(MRUBY_BIRTH_YEAR)"-"    \
+    STRINGIZE(MRUBY_RELEASE_YEAR)" "  \
+    MRUBY_AUTHOR