more cleanupclean_includes

12 files changed, 6 insertions, 14 deletions

diff --git a/src/base/exception.h b/src/base/exception.h
index 1ce2ae757..5e40336ac 100644
--- a/src/base/exception.h
+++ b/src/base/exception.h
@@ -19,12 +19,10 @@
 #ifndef __CVC4__EXCEPTION_H
 #define __CVC4__EXCEPTION_H
 
-#include <cstdarg>
 #include <cstdlib>
 #include <exception>
 #include <iosfwd>
 #include <sstream>
-#include <stdexcept>
 #include <string>
 
 #include "base/tls.h"
diff --git a/src/base/output.cpp b/src/base/output.cpp
index b89e5cff5..84182a864 100644
--- a/src/base/output.cpp
+++ b/src/base/output.cpp
@@ -16,6 +16,7 @@
 
 #include "base/output.h"
 
+#include <cstdarg>
 #include <iostream>
 
 using namespace std;
diff --git a/src/base/output.h b/src/base/output.h
index cdc0ac27f..30ac3f476 100644
--- a/src/base/output.h
+++ b/src/base/output.h
@@ -19,12 +19,10 @@
 #ifndef __CVC4__OUTPUT_H
 #define __CVC4__OUTPUT_H
 
-#include <ios>
 #include <iostream>
 #include <streambuf>
 #include <string>
 #include <cstdio>
-#include <cstdarg>
 #include <set>
 #include <utility>
 
diff --git a/src/options/argument_extender_implementation.cpp b/src/options/argument_extender_implementation.cpp
index 9c38b348b..4895895ee 100644
--- a/src/options/argument_extender_implementation.cpp
+++ b/src/options/argument_extender_implementation.cpp
@@ -19,10 +19,10 @@
 #include <cstdlib>
 #include <cstring>
 #include <list>
+#include <ostream>
 
 #include "base/cvc4_assert.h"
 #include "base/output.h"
-#include "options/argument_extender.h"
 
 namespace CVC4 {
 namespace options {
diff --git a/src/options/didyoumean.cpp b/src/options/didyoumean.cpp
index 40836ddd4..d81e6fee7 100644
--- a/src/options/didyoumean.cpp
+++ b/src/options/didyoumean.cpp
@@ -19,7 +19,6 @@
 
 #include "options/didyoumean.h"
 
-#include <iostream>
 #include <set>
 #include <sstream>
 #include <string>
diff --git a/src/options/open_ostream.cpp b/src/options/open_ostream.cpp
index e93764eed..3675cce2c 100644
--- a/src/options/open_ostream.cpp
+++ b/src/options/open_ostream.cpp
@@ -19,9 +19,7 @@
 
 
 #include <cerrno>
-#include <iostream>
 #include <ostream>
-#include <sstream>
 #include <string>
 #include <utility>
 
diff --git a/src/options/options_handler.cpp b/src/options/options_handler.cpp
index 5658b17b0..8f85a4715 100644
--- a/src/options/options_handler.cpp
+++ b/src/options/options_handler.cpp
@@ -24,7 +24,6 @@
 
 #include "base/configuration.h"
 #include "base/cvc4_assert.h"
-#include "base/exception.h"
 #include "base/modal_exception.h"
 #include "base/output.h"
 #include "lib/strtok_r.h"
@@ -40,6 +39,7 @@
 #include "options/didyoumean.h"
 #include "options/language.h"
 #include "options/option_exception.h"
+#include "options/options.h"
 #include "options/printer_modes.h"
 #include "options/quantifiers_modes.h"
 #include "options/simplification_mode.h"
diff --git a/src/options/options_handler.h b/src/options/options_handler.h
index 16c77b166..4d6932ab1 100644
--- a/src/options/options_handler.h
+++ b/src/options/options_handler.h
@@ -19,7 +19,6 @@
 #ifndef __CVC4__OPTIONS__OPTIONS_HANDLER_H
 #define __CVC4__OPTIONS__OPTIONS_HANDLER_H
 
-#include <ostream>
 #include <string>
 
 #include "base/modal_exception.h"
diff --git a/src/util/cardinality.cpp b/src/util/cardinality.cpp
index 48a1329f9..bb1d351ee 100644
--- a/src/util/cardinality.cpp
+++ b/src/util/cardinality.cpp
@@ -17,6 +17,7 @@
 #include "util/cardinality.h"
 
 #include "base/cvc4_assert.h"
+#include "base/exception.h"
 
 namespace CVC4 {
 
diff --git a/src/util/cardinality.h b/src/util/cardinality.h
index 0bc1fef57..6aa2fb97d 100644
--- a/src/util/cardinality.h
+++ b/src/util/cardinality.h
@@ -21,9 +21,7 @@
 #define __CVC4__CARDINALITY_H
 
 #include <iostream>
-#include <utility>
 
-#include "base/exception.h"
 #include "util/integer.h"
 
 namespace CVC4 {
diff --git a/src/util/regexp.cpp b/src/util/regexp.cpp
index 9915d480d..e2186eb3c 100644
--- a/src/util/regexp.cpp
+++ b/src/util/regexp.cpp
@@ -18,7 +18,8 @@
 #include "util/regexp.h"
 
 #include <iomanip>
-#include <iostream>
+
+#include "base/exception.h"
 
 using namespace std;
 
diff --git a/src/util/regexp.h b/src/util/regexp.h
index beb0ee097..e5d7c967a 100644
--- a/src/util/regexp.h
+++ b/src/util/regexp.h
@@ -26,7 +26,6 @@
 #include <sstream>
 #include <cassert>
 
-#include "base/exception.h"
 #include "util/hash.h"
 
 namespace CVC4 {