diff --git a/compiler-scopes.h b/compiler-scopes.h
index 64a1cd4..e6895d0 100644
--- a/compiler-scopes.h
+++ b/compiler-scopes.h
@@ -1,6 +1,6 @@
 #ifndef COMPILER_SCOPES_H
 #define COMPILER_SCOPES_H
-#include "parser.h"
+#include "parser-tree.h"
 
 /* compiler-scopes
  * Tools for dealing with scopes.
diff --git a/compiler.h b/compiler.h
index 6acef81..23dcf0f 100644
--- a/compiler.h
+++ b/compiler.h
@@ -1,9 +1,8 @@
 #ifndef COMPILER_H
 #define COMPILER_H
-#include "util.h"
-#include "parser.h"
-#include "vm-lines.h"
 #include "compiler-scopes.h"
+#include "parser-tree.h"
+#include "vm-lines.h"
 
 typedef struct {
 	SCOPE* globalscope;
diff --git a/main.c b/main.c
index 09c2c7d..78dd57c 100644
--- a/main.c
+++ b/main.c
@@ -2,6 +2,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include "parser.h"
 #include "compiler.h"
 
 void printcompiler(COMPILER* c) {
diff --git a/parser-tree.h b/parser-tree.h
index 41da1c8..cbc6ccc 100644
--- a/parser-tree.h
+++ b/parser-tree.h
@@ -1,5 +1,6 @@
 #ifndef PARSER_TREE_H
 #define PARSER_TREE_H
+#include <stdbool.h>
 #include "tokenizer.h"
 #include "util.h"