remove dependency to node.h and pool.h

5 files changed, 14 insertions, 11 deletions

diff --git a/include/mruby.h b/include/mruby.h
index 299ad1721..9e7d20351 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -588,6 +588,14 @@ int mrb_sourceline(void);
 void ruby_default_signal(int sig);
 mrb_value mrb_attr_get(mrb_state *mrb, mrb_value obj, mrb_sym id);
 
+/* memory pool implementation */
+typedef struct mrb_pool mrb_pool;
+struct mrb_pool* mrb_pool_open(mrb_state*);
+void mrb_pool_close(struct mrb_pool*);
+void* mrb_pool_alloc(struct mrb_pool*, size_t);
+void* mrb_pool_realloc(struct mrb_pool*, void*, size_t oldlen, size_t newlen);
+int mrb_pool_can_realloc(struct mrb_pool*, void*, size_t);
+
 #if defined(__cplusplus)
 }  /* extern "C" { */
 #endif
diff --git a/include/mruby/compile.h b/include/mruby/compile.h
index 2a47b569a..b41eed57e 100644
--- a/include/mruby/compile.h
+++ b/include/mruby/compile.h
@@ -19,8 +19,6 @@ typedef struct mrb_ast_node {
   struct mrb_ast_node *car, *cdr;
 } mrb_ast_node;
 
-#include "node.h"
-#include "pool.h"
 #include <stdio.h>
 
 enum mrb_lex_state_enum {
diff --git a/src/codegen.c b/src/codegen.c
index e039e72dc..769f9e538 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -8,11 +8,12 @@
 #define CODEGEN_DUMP
 
 #include "mruby.h"
+#include "mruby/string.h"
 #include "mruby/irep.h"
-#include "mruby/compile.h"
 #include "mruby/proc.h"
+#include "mruby/compile.h"
 #include "opcode.h"
-#include "mruby/string.h"
+#include "node.h"
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/src/parse.y b/src/parse.y
index 811107902..8acdf983a 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -13,8 +13,10 @@
 #define YYSTACK_USE_ALLOCA 0
 
 #include "mruby.h"
-#include "st.h"
 #include "mruby/compile.h"
+#include "node.h"
+#include "st.h"
+
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
diff --git a/src/pool.h b/src/pool.h
index 6b1897a14..4d53ccd37 100644
--- a/src/pool.h
+++ b/src/pool.h
@@ -17,9 +17,3 @@ typedef struct mrb_pool {
     char page[1];
   } *pages;
 } mrb_pool;
-
-mrb_pool* mrb_pool_open(mrb_state*);
-void mrb_pool_close(mrb_pool*);
-void* mrb_pool_alloc(mrb_pool*, size_t);
-void* mrb_pool_realloc(mrb_pool*, void*, size_t oldlen, size_t newlen);
-int mrb_pool_can_realloc(mrb_pool*, void*, size_t);