More cleanup of includes to reduce compilation times (#6037)

Similar to #6031, this PR implements suggestions from iwyu to reduce the number of includes in header files by introducing forward declarations and moving includes to source files.

13 files changed, 18 insertions, 16 deletions

diff --git a/src/util/bitvector.h b/src/util/bitvector.h
index b1a27929a..a5ef3a607 100644
--- a/src/util/bitvector.h
+++ b/src/util/bitvector.h
@@ -20,7 +20,9 @@
 #define CVC4__BITVECTOR_H
 
 #include <iosfwd>
+#include <iostream>
 
+#include "base/exception.h"
 #include "util/integer.h"
 
 namespace CVC4 {
diff --git a/src/util/cardinality.cpp b/src/util/cardinality.cpp
index f78b076de..bf3a8ef2b 100644
--- a/src/util/cardinality.cpp
+++ b/src/util/cardinality.cpp
@@ -17,6 +17,7 @@
 #include "util/cardinality.h"
 
 #include <ostream>
+#include <sstream>
 
 #include "base/check.h"
 #include "base/exception.h"
diff --git a/src/util/integer_gmp_imp.h b/src/util/integer_gmp_imp.h
index fe05dc982..cca141094 100644
--- a/src/util/integer_gmp_imp.h
+++ b/src/util/integer_gmp_imp.h
@@ -20,13 +20,11 @@
 #ifndef CVC4__INTEGER_H
 #define CVC4__INTEGER_H
 
+#include <gmpxx.h>
+
 #include <iosfwd>
-#include <limits>
 #include <string>
 
-#include "base/exception.h"
-#include "util/gmp_util.h"
-
 namespace CVC4 {
 
 class Rational;
diff --git a/src/util/poly_util.cpp b/src/util/poly_util.cpp
index ad769b779..2e2f200a3 100644
--- a/src/util/poly_util.cpp
+++ b/src/util/poly_util.cpp
@@ -27,6 +27,7 @@
 #include <poly/polyxx.h>
 
 #include <map>
+#include <sstream>
 
 #include "base/check.h"
 #include "maybe.h"
diff --git a/src/util/rational_gmp_imp.h b/src/util/rational_gmp_imp.h
index f166d9cdc..f6c9a1e44 100644
--- a/src/util/rational_gmp_imp.h
+++ b/src/util/rational_gmp_imp.h
@@ -24,7 +24,7 @@
 
 #include <string>
 
-#include "base/exception.h"
+#include "util/gmp_util.h"
 #include "util/integer.h"
 #include "util/maybe.h"
 
diff --git a/src/util/result.cpp b/src/util/result.cpp
index f4e4d13c7..09445fa3b 100644
--- a/src/util/result.cpp
+++ b/src/util/result.cpp
@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <cctype>
 #include <iostream>
+#include <sstream>
 #include <string>
 
 #include "base/check.h"
diff --git a/src/util/result.h b/src/util/result.h
index 96fe919d0..d0b0896bc 100644
--- a/src/util/result.h
+++ b/src/util/result.h
@@ -19,10 +19,9 @@
 #ifndef CVC4__RESULT_H
 #define CVC4__RESULT_H
 
-#include <iostream>
+#include <iosfwd>
 #include <string>
 
-#include "base/exception.h"
 #include "options/language.h"
 
 namespace CVC4 {
diff --git a/src/util/safe_print.cpp b/src/util/safe_print.cpp
index f45849736..aa2918cde 100644
--- a/src/util/safe_print.cpp
+++ b/src/util/safe_print.cpp
@@ -20,8 +20,11 @@
 
 #include "safe_print.h"
 
+#include <time.h>
 #include <unistd.h>
 
+#include <cstdlib>
+
 /* Size of buffers used */
 #define BUFFER_SIZE 20
 
diff --git a/src/util/safe_print.h b/src/util/safe_print.h
index 6f72569bb..b98b4f3e9 100644
--- a/src/util/safe_print.h
+++ b/src/util/safe_print.h
@@ -40,10 +40,7 @@
 #include <unistd.h>
 
 #include <cstring>
-#include <type_traits>
-
-#include "lib/clock_gettime.h"
-#include "util/result.h"
+#include <string>
 
 namespace CVC4 {
 
diff --git a/src/util/sampler.cpp b/src/util/sampler.cpp
index 20dfb92a7..8b1a2c3db 100644
--- a/src/util/sampler.cpp
+++ b/src/util/sampler.cpp
@@ -17,8 +17,11 @@
 
 #include "util/sampler.h"
 
+#include <sstream>
+
 #include "base/check.h"
 #include "util/bitvector.h"
+#include "util/random.h"
 
 namespace CVC4 {
 
diff --git a/src/util/sampler.h b/src/util/sampler.h
index 8968f5dc7..dad6605a5 100644
--- a/src/util/sampler.h
+++ b/src/util/sampler.h
@@ -21,7 +21,6 @@
 #define CVC4__UTIL_FLOATINGPOINT_SAMPLER_H
 
 #include "util/floatingpoint.h"
-#include "util/random.h"
 
 namespace CVC4 {
 
diff --git a/src/util/sexpr.h b/src/util/sexpr.h
index 3bcf36abf..5c47fa4fd 100644
--- a/src/util/sexpr.h
+++ b/src/util/sexpr.h
@@ -26,12 +26,10 @@
 #ifndef CVC4__SEXPR_H
 #define CVC4__SEXPR_H
 
-#include <iomanip>
 #include <iosfwd>
 #include <string>
 #include <vector>
 
-#include "base/exception.h"
 #include "options/language.h"
 #include "util/integer.h"
 #include "util/rational.h"
diff --git a/src/util/string.h b/src/util/string.h
index 9e503bb07..f908c2f0f 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -17,10 +17,10 @@
 #ifndef CVC4__UTIL__STRING_H
 #define CVC4__UTIL__STRING_H
 
-#include <functional>
-#include <ostream>
+#include <iosfwd>
 #include <string>
 #include <vector>
+
 #include "util/rational.h"
 
 namespace CVC4 {