diff --git a/spec/compiler/build_tables/build_tables_spec.cpp b/spec/compiler/build_tables/build_tables_spec.cpp
index eba1b5ed..4c116c24 100644
--- a/spec/compiler/build_tables/build_tables_spec.cpp
+++ b/spec/compiler/build_tables/build_tables_spec.cpp
@@ -1,6 +1,6 @@
 #include "compiler_spec_helper.h"
-#include "prepared_grammar.h"
-#include "build_tables/build_tables.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/build_tables/build_tables.h"
 #include <functional>
 
 using namespace rules;
diff --git a/spec/compiler/build_tables/first_set_spec.cpp b/spec/compiler/build_tables/first_set_spec.cpp
index 2d29dac3..3eb512ef 100644
--- a/spec/compiler/build_tables/first_set_spec.cpp
+++ b/spec/compiler/build_tables/first_set_spec.cpp
@@ -1,6 +1,6 @@
 #include "compiler_spec_helper.h"
-#include "prepared_grammar.h"
-#include "build_tables/first_set.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/build_tables/first_set.h"
 
 using std::set;
 using namespace build_tables;
diff --git a/spec/compiler/build_tables/follow_sets_spec.cpp b/spec/compiler/build_tables/follow_sets_spec.cpp
index 6adea9a1..21d24a7d 100644
--- a/spec/compiler/build_tables/follow_sets_spec.cpp
+++ b/spec/compiler/build_tables/follow_sets_spec.cpp
@@ -1,6 +1,6 @@
 #include "compiler_spec_helper.h"
-#include "prepared_grammar.h"
-#include "build_tables/follow_sets.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/build_tables/follow_sets.h"
 
 using std::set;
 using namespace build_tables;
diff --git a/spec/compiler/build_tables/item_set_closure_spec.cpp b/spec/compiler/build_tables/item_set_closure_spec.cpp
index 9bee8609..b9bc49e3 100644
--- a/spec/compiler/build_tables/item_set_closure_spec.cpp
+++ b/spec/compiler/build_tables/item_set_closure_spec.cpp
@@ -1,7 +1,7 @@
 #include "compiler_spec_helper.h"
-#include "prepared_grammar.h"
-#include "build_tables/item_set_closure.h"
-#include "build_tables/item_set_transitions.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/build_tables/item_set_closure.h"
+#include "compiler/build_tables/item_set_transitions.h"
 
 using namespace build_tables;
 using namespace rules;
diff --git a/spec/compiler/build_tables/rule_can_be_blank_spec.cpp b/spec/compiler/build_tables/rule_can_be_blank_spec.cpp
index 684a6719..461ae193 100644
--- a/spec/compiler/build_tables/rule_can_be_blank_spec.cpp
+++ b/spec/compiler/build_tables/rule_can_be_blank_spec.cpp
@@ -1,5 +1,5 @@
 #include "compiler_spec_helper.h"
-#include "build_tables/rule_can_be_blank.h"
+#include "compiler/build_tables/rule_can_be_blank.h"
 
 using namespace rules;
 using build_tables::rule_can_be_blank;
diff --git a/spec/compiler/build_tables/rule_transitions_spec.cpp b/spec/compiler/build_tables/rule_transitions_spec.cpp
index 78d72d16..9f706980 100644
--- a/spec/compiler/build_tables/rule_transitions_spec.cpp
+++ b/spec/compiler/build_tables/rule_transitions_spec.cpp
@@ -1,5 +1,5 @@
 #include "compiler_spec_helper.h"
-#include "build_tables/rule_transitions.h"
+#include "compiler/build_tables/rule_transitions.h"
 
 using namespace rules;
 using namespace build_tables;
diff --git a/spec/compiler/compile_examples.cpp b/spec/compiler/compile_examples.cpp
index be21c8be..57399843 100644
--- a/spec/compiler/compile_examples.cpp
+++ b/spec/compiler/compile_examples.cpp
@@ -1,6 +1,6 @@
 #include "compiler_spec_helper.h"
-#include "../../examples/grammars/json.hpp"
-#include "../../examples/grammars/arithmetic.hpp"
+#include "grammars/json.hpp"
+#include "grammars/arithmetic.hpp"
 #include <fstream>
 
 static string src_dir() {
diff --git a/spec/compiler/compiler_spec_helper.h b/spec/compiler/compiler_spec_helper.h
index 206e34f0..7a4e45be 100644
--- a/spec/compiler/compiler_spec_helper.h
+++ b/spec/compiler/compiler_spec_helper.h
@@ -6,7 +6,6 @@
 #include "helpers/equals_pointer.h"
 #include "helpers/character_set_helpers.h"
 #include "tree_sitter/compiler.h"
-#include "compiler/rules/character_set.h"
 
 using namespace tree_sitter;
 using namespace std;
diff --git a/spec/compiler/prepare_grammar_spec.cpp b/spec/compiler/prepare_grammar_spec.cpp
index 204c5682..c824a520 100644
--- a/spec/compiler/prepare_grammar_spec.cpp
+++ b/spec/compiler/prepare_grammar_spec.cpp
@@ -1,6 +1,6 @@
 #include "compiler_spec_helper.h"
-#include "prepared_grammar.h"
-#include "prepare_grammar/prepare_grammar.h"
+#include "compiler/prepared_grammar.h"
+#include "compiler/prepare_grammar/prepare_grammar.h"
 #include "compiler/rules/symbol.h"
 
 START_TEST
diff --git a/tree_sitter.gyp b/tree_sitter.gyp
index 48fff911..776b3b13 100644
--- a/tree_sitter.gyp
+++ b/tree_sitter.gyp
@@ -7,7 +7,6 @@
       'include_dirs': [
         'include',
         'src',
-        'src',
       ],
       'sources': [
         '<!@(find include src -name "*.h" -or -name "*.cpp" -or -name "*.c")',
@@ -44,8 +43,9 @@
       'type': 'executable',
       'dependencies': ['tree_sitter'],
       'include_dirs': [
+        'src',
         'externals/bandit',
-        'src/compiler',
+        'examples',
         'spec/compiler',
       ],
       'sources': [
@@ -59,8 +59,9 @@
       'type': 'executable',
       'dependencies': ['tree_sitter'],
       'include_dirs': [
+        'src',
         'externals/bandit',
-        'src/runtime',
+        'examples',
         'spec/runtime',
       ],
       'sources': [