Clean-up headers

Remove unneeded headers from include files

3 files changed, 39 insertions, 8 deletions

diff --git a/lib/Expr/ArrayExprOptimizer.cpp b/lib/Expr/ArrayExprOptimizer.cpp
index 0929efb5..dc0b2002 100644
--- a/lib/Expr/ArrayExprOptimizer.cpp
+++ b/lib/Expr/ArrayExprOptimizer.cpp
@@ -9,11 +9,23 @@
 
 #include "klee/ArrayExprOptimizer.h"
 
+#include <algorithm>
+#include <cassert>
+#include <llvm/ADT/APInt.h>
+#include <llvm/Support/Casting.h>
+#include <llvm/Support/CommandLine.h>
+#include <set>
+#include <stddef.h>
+
 #include "klee/ArrayExprRewriter.h"
+#include "klee/AssignmentGenerator.h"
+#include "klee/Config/Version.h"
+#include "klee/ExprBuilder.h"
+#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/util/ArrayExprVisitor.h"
+#include "klee/util/Assignment.h"
 #include "klee/util/BitArray.h"
 
-#include <iostream>
-
 using namespace klee;
 
 namespace klee {
@@ -163,7 +175,7 @@ bool ExprOptimizer::computeIndexes(array2idx_ty &arrays, const ref<Expr> &e,
     // For each concrete value 'i' stored in the array
     for (size_t aIdx = 0; aIdx < arr->constantValues.size(); aIdx += width) {
       Assignment *a = new Assignment();
-      v_arr_ty objects;
+      std::vector<const Array *> objects;
       std::vector<std::vector<unsigned char>> values;
 
       // For each symbolic index Expr(k) found
diff --git a/lib/Expr/ArrayExprRewriter.cpp b/lib/Expr/ArrayExprRewriter.cpp
index 5e5dac0d..26aef1ff 100644
--- a/lib/Expr/ArrayExprRewriter.cpp
+++ b/lib/Expr/ArrayExprRewriter.cpp
@@ -9,9 +9,15 @@
 
 #include "klee/ArrayExprRewriter.h"
 
-#include "klee/util/BitArray.h"
+#include <cassert>
+#include <cstdint>
+#include <llvm/ADT/APInt.h>
+#include <llvm/Support/Casting.h>
+#include <set>
+#include <utility>
 
-#include "llvm/Support/CommandLine.h"
+#include "klee/util/ArrayExprVisitor.h"
+#include "klee/util/BitArray.h"
 
 using namespace klee;
 
diff --git a/lib/Expr/AssignmentGenerator.cpp b/lib/Expr/AssignmentGenerator.cpp
index 4a1d68d8..a906f796 100644
--- a/lib/Expr/AssignmentGenerator.cpp
+++ b/lib/Expr/AssignmentGenerator.cpp
@@ -7,9 +7,22 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/AssignmentGenerator.h"
-
-#include "llvm/Support/raw_ostream.h"
+#include "../../include/klee/AssignmentGenerator.h"
+
+#include <cassert>
+#include <cstdint>
+#include <llvm/ADT/APInt.h>
+#include <llvm/Support/Casting.h>
+#include <llvm/Support/raw_ostream.h>
+#include <map>
+#include <set>
+#include <stddef.h>
+#include <string>
+#include <utility>
+
+#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/klee.h"
+#include "klee/util/Assignment.h"
 
 using namespace klee;