Correcting build issues.

3 files changed, 5 insertions, 3 deletions

diff --git a/src/ast.cpp b/src/ast.cpp
index 24d3193..4bbe186 100644
--- a/src/ast.cpp
+++ b/src/ast.cpp
@@ -9,7 +9,7 @@
 #include "astleaf.h"
 #include "astbranch.h"
 
-#include "build.tab.h"
+#include "buildparser.h"
 
 Ast::Ast()
 {
diff --git a/src/buildparser.h b/src/buildparser.h
index 47597bb..5337554 100644
--- a/src/buildparser.h
+++ b/src/buildparser.h
@@ -8,6 +8,9 @@
 #ifndef BUILD_PARSER_H
 #define BUILD_PARSER_H
 
+typedef void * yyscan_t;
+class BuildParser;
+
 #include "build.tab.h"
 
 #include "bu/stack.h"
@@ -41,7 +44,6 @@ private:
     Bu::Hash<Bu::String, bool> hConds;
 };
 
-typedef void * yyscan_t;
 #define YY_DECL int build_lex( YYSTYPE *yylval_param, YYLTYPE *yylloc_param, yyscan_t yyscanner, BuildParser &b )
 YY_DECL;
 
diff --git a/src/location.cpp b/src/location.cpp
index 1e2dfcd..507c922 100644
--- a/src/location.cpp
+++ b/src/location.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "location.h"
-#include "build.tab.h"
+#include "buildparser.h"
 
 Location::Location() :
     sFile("none"),