Clean up includes to reduce compile times (#6031)

This PR cleans up a ton of includes, based on the suggestions of iwyu.
Mostly, it removes includes from header files in favor of forward declarations and adds includes to source files.

14 files changed, 20 insertions, 20 deletions

diff --git a/src/util/bitvector.cpp b/src/util/bitvector.cpp
index 9233bde53..5d017cb0f 100644
--- a/src/util/bitvector.cpp
+++ b/src/util/bitvector.cpp
@@ -18,6 +18,8 @@
 
 #include "util/bitvector.h"
 
+#include "base/exception.h"
+
 namespace CVC4 {
 
 unsigned BitVector::getSize() const { return d_size; }
diff --git a/src/util/bitvector.h b/src/util/bitvector.h
index 997293639..b1a27929a 100644
--- a/src/util/bitvector.h
+++ b/src/util/bitvector.h
@@ -21,7 +21,6 @@
 
 #include <iosfwd>
 
-#include "base/exception.h"
 #include "util/integer.h"
 
 namespace CVC4 {
diff --git a/src/util/cardinality.cpp b/src/util/cardinality.cpp
index 585512138..f78b076de 100644
--- a/src/util/cardinality.cpp
+++ b/src/util/cardinality.cpp
@@ -16,7 +16,10 @@
 
 #include "util/cardinality.h"
 
+#include <ostream>
+
 #include "base/check.h"
+#include "base/exception.h"
 
 namespace CVC4 {
 
diff --git a/src/util/cardinality.h b/src/util/cardinality.h
index 8ad3edbe2..9218095a8 100644
--- a/src/util/cardinality.h
+++ b/src/util/cardinality.h
@@ -20,10 +20,8 @@
 #ifndef CVC4__CARDINALITY_H
 #define CVC4__CARDINALITY_H
 
-#include <iostream>
-#include <utility>
+#include <iosfwd>
 
-#include "base/exception.h"
 #include "util/integer.h"
 
 namespace CVC4 {
diff --git a/src/util/divisible.h b/src/util/divisible.h
index 36bb37db0..b2682b055 100644
--- a/src/util/divisible.h
+++ b/src/util/divisible.h
@@ -21,8 +21,9 @@
 #define CVC4__DIVISIBLE_H
 
 #include <iosfwd>
+#include <ostream>
+#include <stddef.h>
 
-#include "base/exception.h"
 #include "util/integer.h"
 
 namespace CVC4 {
diff --git a/src/util/ostream_util.cpp b/src/util/ostream_util.cpp
index c97238892..ce8b50bc8 100644
--- a/src/util/ostream_util.cpp
+++ b/src/util/ostream_util.cpp
@@ -15,6 +15,8 @@
  **/
 #include "util/ostream_util.h"
 
+#include <ostream>
+
 namespace CVC4 {
 
 StreamFormatScope::StreamFormatScope(std::ostream& out)
diff --git a/src/util/ostream_util.h b/src/util/ostream_util.h
index b27c22819..6e2a291a3 100644
--- a/src/util/ostream_util.h
+++ b/src/util/ostream_util.h
@@ -20,7 +20,7 @@
 #define CVC4__UTIL__OSTREAM_UTIL_H
 
 #include <ios>
-#include <ostream>
+#include <iosfwd>
 
 namespace CVC4 {
 
diff --git a/src/util/resource_manager.cpp b/src/util/resource_manager.cpp
index 17dac50b3..0534be1b7 100644
--- a/src/util/resource_manager.cpp
+++ b/src/util/resource_manager.cpp
@@ -16,8 +16,13 @@
 **/
 #include "util/resource_manager.h"
 
+#include <algorithm>
+#include <ostream>
+
 #include "base/check.h"
+#include "base/listener.h"
 #include "base/output.h"
+#include "options/options.h"
 #include "options/smt_options.h"
 #include "util/statistics_registry.h"
 
diff --git a/src/util/resource_manager.h b/src/util/resource_manager.h
index 3be99021b..a4a9b7f4e 100644
--- a/src/util/resource_manager.h
+++ b/src/util/resource_manager.h
@@ -21,18 +21,15 @@
 #ifndef CVC4__RESOURCE_MANAGER_H
 #define CVC4__RESOURCE_MANAGER_H
 
-#include <sys/time.h>
-
+#include <stdint.h>
 #include <chrono>
 #include <memory>
-
-#include "base/exception.h"
-#include "base/listener.h"
-#include "options/options.h"
-#include "util/unsafe_interrupt_exception.h"
+#include <vector>
 
 namespace CVC4 {
 
+class Listener;
+class Options;
 class StatisticsRegistry;
 
 /**
diff --git a/src/util/statistics.cpp b/src/util/statistics.cpp
index 73e6afb96..781c73aec 100644
--- a/src/util/statistics.cpp
+++ b/src/util/statistics.cpp
@@ -17,8 +17,6 @@
 
 #include "util/statistics.h"
 
-#include <typeinfo>
-
 #include "util/safe_print.h"
 #include "util/statistics_registry.h" // for details about class Stat
 
diff --git a/src/util/statistics_registry.h b/src/util/statistics_registry.h
index d2f7244f9..efa1de1c0 100644
--- a/src/util/statistics_registry.h
+++ b/src/util/statistics_registry.h
@@ -43,7 +43,6 @@
 #include <vector>
 
 #include "base/exception.h"
-#include "lib/clock_gettime.h"
 #include "util/safe_print.h"
 #include "util/statistics.h"
 
diff --git a/src/util/tuple.h b/src/util/tuple.h
index 240e41792..109d4640b 100644
--- a/src/util/tuple.h
+++ b/src/util/tuple.h
@@ -20,7 +20,6 @@
 #define CVC4__TUPLE_H
 
 #include <iostream>
-#include <string>
 #include <vector>
 #include <utility>
 
diff --git a/src/util/utility.cpp b/src/util/utility.cpp
index 7a50eb7fd..2b848d924 100644
--- a/src/util/utility.cpp
+++ b/src/util/utility.cpp
@@ -19,7 +19,6 @@
 #include <unistd.h>
 
 #include <cstdlib>
-#include <iostream>
 
 #include "base/check.h"
 
diff --git a/src/util/utility.h b/src/util/utility.h
index 549b98d66..06155788f 100644
--- a/src/util/utility.h
+++ b/src/util/utility.h
@@ -21,10 +21,8 @@
 
 #include <algorithm>
 #include <fstream>
-#include <functional>
 #include <memory>
 #include <string>
-#include <utility>
 
 namespace CVC4 {