Cleaning up some header files

7 files changed, 16 insertions, 54 deletions

diff --git a/src/parser/Makefile.am b/src/parser/Makefile.am
index 0533200fa..a621441e1 100644
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -53,7 +53,6 @@ libcvc4parser_la_SOURCES = \
 	parser.cpp \
 	parser_builder.h \
 	parser_builder.cpp \
-	parser_options.h \
 	parser_exception.h
 
 libcvc4parser_noinst_la_SOURCES = \
diff --git a/src/parser/antlr_input.h b/src/parser/antlr_input.h
index d86a18004..c88f368d2 100644
--- a/src/parser/antlr_input.h
+++ b/src/parser/antlr_input.h
@@ -28,12 +28,10 @@
 #include <string>
 #include <vector>
 
-#include "parser/input.h"
-#include "parser/parser_options.h"
-#include "parser/parser_exception.h"
-#include "parser/bounded_token_buffer.h"
-#include "expr/expr.h"
-#include "expr/expr_manager.h"
+#include "bounded_token_buffer.h"
+#include "parser_exception.h"
+#include "input.h"
+
 #include "util/Assert.h"
 #include "util/bitvector.h"
 #include "util/integer.h"
diff --git a/src/parser/input.h b/src/parser/input.h
index 8a35480cd..6ed9bb441 100644
--- a/src/parser/input.h
+++ b/src/parser/input.h
@@ -29,8 +29,8 @@
 #include "expr/expr.h"
 #include "expr/expr_manager.h"
 #include "parser/parser_exception.h"
-#include "parser/parser_options.h"
 #include "util/Assert.h"
+#include "util/language.h"
 
 namespace CVC4 {
 
diff --git a/src/parser/parser.h b/src/parser/parser.h
index ed7db63cf..f7adb2b89 100644
--- a/src/parser/parser.h
+++ b/src/parser/parser.h
@@ -27,24 +27,23 @@
 
 #include "input.h"
 #include "parser_exception.h"
-#include "parser_options.h"
 #include "expr/declaration_scope.h"
-#include "expr/expr.h"
 #include "expr/kind.h"
-#include "util/Assert.h"
 
 namespace CVC4 {
 
 // Forward declarations
 class BooleanType;
+class Expr;
 class ExprManager;
 class Command;
 class FunctionType;
-class KindType;
 class Type;
 
 namespace parser {
 
+class Input;
+
 /** Types of check for the symols */
 enum DeclarationCheck {
   /** Enforce that the symbol has been declared */
diff --git a/src/parser/parser_builder.cpp b/src/parser/parser_builder.cpp
index 2bf0aac31..4ecba67c2 100644
--- a/src/parser/parser_builder.cpp
+++ b/src/parser/parser_builder.cpp
@@ -19,11 +19,13 @@
 #include <string>
 
 #include "parser_builder.h"
+#include "input.h"
+#include "parser.h"
+#include "smt/smt.h"
+#include "smt2/smt2.h"
+
 #include "expr/expr_manager.h"
-#include "parser/input.h"
-#include "parser/parser.h"
-#include "parser/smt/smt.h"
-#include "parser/smt2/smt2.h"
+#include "util/options.h"
 
 namespace CVC4 {
 
diff --git a/src/parser/parser_builder.h b/src/parser/parser_builder.h
index f1fd26ec1..7debc3cf8 100644
--- a/src/parser/parser_builder.h
+++ b/src/parser/parser_builder.h
@@ -24,13 +24,13 @@
 #include <string>
 
 #include "input.h"
-#include "parser_options.h"
 
-#include "util/options.h"
+#include "util/language.h"
 
 namespace CVC4 {
 
 class ExprManager;
+class Options;
 
 namespace parser {
 
diff --git a/src/parser/parser_options.h b/src/parser/parser_options.h
deleted file mode 100644
index b6c61786b..000000000
--- a/src/parser/parser_options.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*********************                                                        */
-/*! \file parser_options.h
- ** \verbatim
- ** Original author: cconway
- ** Major contributors: mdeters
- ** Minor contributors (to current version): none
- ** This file is part of the CVC4 prototype.
- ** Copyright (c) 2009, 2010  The Analysis of Computer Systems Group (ACSys)
- ** Courant Institute of Mathematical Sciences
- ** New York University
- ** See the file COPYING in the top-level source directory for licensing
- ** information.\endverbatim
- **
- ** \brief [[ Add file-specific comments here ]].
- **
- ** [[ Add file-specific comments here ]]
- **/
-
-#include "cvc4_public.h"
-
-#ifndef __CVC4__PARSER__PARSER_OPTIONS_H
-#define __CVC4__PARSER__PARSER_OPTIONS_H
-
-#include <iostream>
-
-#include "util/language.h"
-
-namespace CVC4 {
-namespace parser {
-
-// content moved to util/language.h
-
-}/* CVC4::parser namespace */
-}/* CVC4 namespace */
-
-#endif /* __CVC4__PARSER__PARSER_OPTIONS_H */