3 files changed, 14 insertions, 20 deletions
diff --git a/src/parse.y b/src/parse.y
index 2b2dd6851..4b1f02106 100644
--- a/src/parse.y
+++ b/src/parse.y
@@ -4634,6 +4634,7 @@ mrb_parser_parse(parser_state *p)
   p->cmd_start = TRUE;
   p->in_def = p->in_single = FALSE;
   p->nerr = p->nwarn = 0;
+  p->sterm = 0;
 
   yyparse(p);
   tree = p->tree;
diff --git a/src/pool.c b/src/pool.c
index 649790b2d..a367a30a5 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -4,9 +4,21 @@
 ** See Copyright Notice in mruby.h
 */
 
-#include "pool.h"
+#include "mruby.h"
+#include <stddef.h>
 #include <string.h>
 
+struct mrb_pool {
+  mrb_state *mrb;
+  struct mrb_pool_page {
+    struct mrb_pool_page *next;
+    size_t offset;
+    size_t len;
+    void *last;
+    char page[1];
+  } *pages;
+};
+
 #undef TEST_POOL
 #ifdef TEST_POOL
 #include <stdio.h>
diff --git a/src/pool.h b/src/pool.h
deleted file mode 100644
index 4d53ccd37..000000000
--- a/src/pool.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-** pool.h - memory pool
-**
-** See Copyright Notice in mruby.h
-*/
-
-#include "mruby.h"
-#include <stddef.h>
-
-typedef struct mrb_pool {
-  mrb_state *mrb;
-  struct mrb_pool_page {
-    struct mrb_pool_page *next;
-    size_t offset;
-    size_t len;
-    void *last;
-    char page[1];
-  } *pages;
-} mrb_pool;