Move optimization specific headers away from the project include directory

Don't pollute the project include directory with optimization specific
headers.

10 files changed, 25 insertions, 30 deletions

diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 9e53c340..ecebe916 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -24,7 +24,6 @@
 #include "ExecutorTimerInfo.h"
 
 
-#include "klee/ArrayExprOptimizer.h"
 #include "klee/ExecutionState.h"
 #include "klee/Expr.h"
 #include "klee/Interpreter.h"
@@ -50,6 +49,7 @@
 #include "klee/Internal/System/MemoryUsage.h"
 #include "klee/SolverStats.h"
 
+#include "../Expr/ArrayExprOptimizer.h"
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/IR/Attributes.h"
diff --git a/lib/Core/Executor.h b/lib/Core/Executor.h
index 6a640905..d9e20f1e 100644
--- a/lib/Core/Executor.h
+++ b/lib/Core/Executor.h
@@ -16,7 +16,6 @@
 #define KLEE_EXECUTOR_H
 
 #include "klee/ExecutionState.h"
-#include "klee/ArrayExprOptimizer.h"
 #include "klee/Interpreter.h"
 #include "klee/Internal/Module/Cell.h"
 #include "klee/Internal/Module/KInstruction.h"
@@ -26,10 +25,11 @@
 
 #include "llvm/ADT/Twine.h"
 
-#include <vector>
-#include <string>
+#include "../Expr/ArrayExprOptimizer.h"
 #include <map>
 #include <set>
+#include <string>
+#include <vector>
 
 struct KTest;
 
diff --git a/lib/Expr/ArrayExprOptimizer.cpp b/lib/Expr/ArrayExprOptimizer.cpp
index dc0b2002..63a9fb96 100644
--- a/lib/Expr/ArrayExprOptimizer.cpp
+++ b/lib/Expr/ArrayExprOptimizer.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/ArrayExprOptimizer.h"
+#include "ArrayExprOptimizer.h"
 
 #include <algorithm>
 #include <cassert>
@@ -17,12 +17,12 @@
 #include <set>
 #include <stddef.h>
 
-#include "klee/ArrayExprRewriter.h"
-#include "klee/AssignmentGenerator.h"
+#include "ArrayExprRewriter.h"
+#include "ArrayExprVisitor.h"
+#include "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"
 
diff --git a/include/klee/ArrayExprOptimizer.h b/lib/Expr/ArrayExprOptimizer.h
index aafe1d27..7d895a48 100644
--- a/include/klee/ArrayExprOptimizer.h
+++ b/lib/Expr/ArrayExprOptimizer.h
@@ -17,17 +17,12 @@
 #include <utility>
 #include <vector>
 
-#include "Expr.h"
-#include "util/Ref.h"
+#include "klee/Expr.h"
+#include "klee/util/Ref.h"
 
 namespace klee {
 
-enum ArrayOptimizationType {
-  NONE,
-  ALL,
-  INDEX,
-  VALUE
-};
+enum ArrayOptimizationType { NONE, ALL, INDEX, VALUE };
 
 typedef std::map<const Array *, std::vector<ref<Expr>>> array2idx_ty;
 typedef std::map<ref<Expr>, std::vector<ref<Expr>>> mapIndexOptimizedExpr_ty;
@@ -64,6 +59,6 @@ private:
                        std::vector<std::pair<uint64_t, bool>> &arrayValues,
                        Expr::Width width, unsigned elementsInArray) const;
 };
-}
+} // namespace klee
 
 #endif
diff --git a/lib/Expr/ArrayExprRewriter.cpp b/lib/Expr/ArrayExprRewriter.cpp
index 26aef1ff..507ea753 100644
--- a/lib/Expr/ArrayExprRewriter.cpp
+++ b/lib/Expr/ArrayExprRewriter.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/ArrayExprRewriter.h"
+#include "ArrayExprRewriter.h"
 
 #include <cassert>
 #include <cstdint>
@@ -16,7 +16,7 @@
 #include <set>
 #include <utility>
 
-#include "klee/util/ArrayExprVisitor.h"
+#include "ArrayExprVisitor.h"
 #include "klee/util/BitArray.h"
 
 using namespace klee;
diff --git a/include/klee/ArrayExprRewriter.h b/lib/Expr/ArrayExprRewriter.h
index 2b6c78b4..310ae8dd 100644
--- a/include/klee/ArrayExprRewriter.h
+++ b/lib/Expr/ArrayExprRewriter.h
@@ -14,8 +14,8 @@
 #include <map>
 #include <vector>
 
-#include "Expr.h"
-#include "util/Ref.h"
+#include "klee/Expr.h"
+#include "klee/util/Ref.h"
 
 namespace klee {
 
@@ -42,6 +42,6 @@ private:
                                    const ref<Expr> &valStart,
                                    const ref<Expr> &valEnd);
 };
-}
+} // namespace klee
 
 #endif /* LIB_EXPRREWRITER_H_ */
diff --git a/lib/Expr/ArrayExprVisitor.cpp b/lib/Expr/ArrayExprVisitor.cpp
index dae4c451..407c4c64 100644
--- a/lib/Expr/ArrayExprVisitor.cpp
+++ b/lib/Expr/ArrayExprVisitor.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "klee/util/ArrayExprVisitor.h"
+#include "ArrayExprVisitor.h"
 
 #include "klee/Internal/Support/ErrorHandling.h"
 
diff --git a/include/klee/util/ArrayExprVisitor.h b/lib/Expr/ArrayExprVisitor.h
index d8c64c2d..c1eb7f58 100644
--- a/include/klee/util/ArrayExprVisitor.h
+++ b/lib/Expr/ArrayExprVisitor.h
@@ -10,9 +10,9 @@
 #ifndef KLEE_ARRAYEXPRVISITOR_H_
 #define KLEE_ARRAYEXPRVISITOR_H_
 
-#include "klee/util/ExprVisitor.h"
-#include "klee/ExprBuilder.h"
 #include "klee/CommandLine.h"
+#include "klee/ExprBuilder.h"
+#include "klee/util/ExprVisitor.h"
 
 #include <unordered_map>
 #include <unordered_set>
@@ -138,6 +138,6 @@ public:
   IndexCleanerVisitor() : ExprVisitor(true), mul(true) {}
   inline ref<Expr> getIndex() { return index; }
 };
-}
+} // namespace klee
 
 #endif
diff --git a/lib/Expr/AssignmentGenerator.cpp b/lib/Expr/AssignmentGenerator.cpp
index a906f796..87b75820 100644
--- a/lib/Expr/AssignmentGenerator.cpp
+++ b/lib/Expr/AssignmentGenerator.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "../../include/klee/AssignmentGenerator.h"
+#include "AssignmentGenerator.h"
 
 #include <cassert>
 #include <cstdint>
diff --git a/include/klee/AssignmentGenerator.h b/lib/Expr/AssignmentGenerator.h
index 404c8632..fea1168a 100644
--- a/include/klee/AssignmentGenerator.h
+++ b/lib/Expr/AssignmentGenerator.h
@@ -12,8 +12,8 @@
 
 #include <vector>
 
-#include "Expr.h"
-#include "util/Ref.h"
+#include "klee/Expr.h"
+#include "klee/util/Ref.h"
 
 namespace klee {
 class Assignment;
@@ -54,6 +54,6 @@ private:
   getIndexedValue(const std::vector<unsigned char> &c_val, ConstantExpr &index,
                   const unsigned int size);
 };
-}
+} // namespace klee
 
 #endif