Move header files from lib/Expr to include/klee/Expr to eliminate includes using "../"

11 files changed, 22 insertions, 19 deletions

diff --git a/lib/Expr/ArrayExprOptimizer.h b/include/klee/Expr/ArrayExprOptimizer.h
index 8fc040e5..8fc040e5 100644
--- a/lib/Expr/ArrayExprOptimizer.h
+++ b/include/klee/Expr/ArrayExprOptimizer.h
diff --git a/lib/Expr/ArrayExprRewriter.h b/include/klee/Expr/ArrayExprRewriter.h
index 098cb0a6..098cb0a6 100644
--- a/lib/Expr/ArrayExprRewriter.h
+++ b/include/klee/Expr/ArrayExprRewriter.h
diff --git a/lib/Expr/ArrayExprVisitor.h b/include/klee/Expr/ArrayExprVisitor.h
index 28f485d9..28f485d9 100644
--- a/lib/Expr/ArrayExprVisitor.h
+++ b/include/klee/Expr/ArrayExprVisitor.h
diff --git a/lib/Expr/AssignmentGenerator.h b/include/klee/Expr/AssignmentGenerator.h
index 173b863e..173b863e 100644
--- a/lib/Expr/AssignmentGenerator.h
+++ b/include/klee/Expr/AssignmentGenerator.h
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index a3e84486..74965625 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -9,9 +9,9 @@
 
 #include "Executor.h"
 
-#include "../Expr/ArrayExprOptimizer.h"
 #include "Context.h"
 #include "CoreStats.h"
+#include "ExecutionState.h"
 #include "ExternalDispatcher.h"
 #include "ImpliedValue.h"
 #include "Memory.h"
@@ -26,7 +26,8 @@
 
 #include "klee/Common.h"
 #include "klee/Config/Version.h"
-#include "klee/ExecutionState.h"
+#include "klee/Core/Interpreter.h"
+#include "klee/Expr/ArrayExprOptimizer.h"
 #include "klee/Expr/Assignment.h"
 #include "klee/Expr/Expr.h"
 #include "klee/Expr/ExprPPrinter.h"
diff --git a/lib/Core/Executor.h b/lib/Core/Executor.h
index 374dd30b..cd6b173a 100644
--- a/lib/Core/Executor.h
+++ b/lib/Core/Executor.h
@@ -17,6 +17,7 @@
 
 #include "klee/ExecutionState.h"
 #include "klee/Expr/ArrayCache.h"
+#include "klee/Expr/ArrayExprOptimizer.h"
 #include "klee/Module/Cell.h"
 #include "klee/Module/KInstruction.h"
 #include "klee/Module/KModule.h"
@@ -26,8 +27,6 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include "../Expr/ArrayExprOptimizer.h"
-
 #include <map>
 #include <memory>
 #include <set>
diff --git a/lib/Expr/ArrayExprOptimizer.cpp b/lib/Expr/ArrayExprOptimizer.cpp
index c3be0690..6e10461f 100644
--- a/lib/Expr/ArrayExprOptimizer.cpp
+++ b/lib/Expr/ArrayExprOptimizer.cpp
@@ -7,16 +7,16 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ArrayExprOptimizer.h"
-#include "ArrayExprRewriter.h"
-#include "ArrayExprVisitor.h"
-#include "AssignmentGenerator.h"
+#include "klee/Expr/ArrayExprOptimizer.h"
 
 #include "klee/Config/Version.h"
+#include "klee/Expr/ArrayExprRewriter.h"
+#include "klee/Expr/ArrayExprVisitor.h"
 #include "klee/Expr/Assignment.h"
+#include "klee/Expr/AssignmentGenerator.h"
 #include "klee/Expr/ExprBuilder.h"
-#include "klee/Support/ErrorHandling.h"
 #include "klee/OptionCategories.h"
+#include "klee/Support/ErrorHandling.h"
 #include "klee/util/BitArray.h"
 
 #include <llvm/ADT/APInt.h>
diff --git a/lib/Expr/ArrayExprRewriter.cpp b/lib/Expr/ArrayExprRewriter.cpp
index 8306e20a..32851679 100644
--- a/lib/Expr/ArrayExprRewriter.cpp
+++ b/lib/Expr/ArrayExprRewriter.cpp
@@ -7,18 +7,19 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ArrayExprRewriter.h"
+#include "klee/Expr/ArrayExprRewriter.h"
+
+#include "klee/Expr/ArrayExprVisitor.h"
+#include "klee/util/BitArray.h"
 
-#include <cassert>
-#include <cstdint>
 #include <llvm/ADT/APInt.h>
 #include <llvm/Support/Casting.h>
+
+#include <cassert>
+#include <cstdint>
 #include <set>
 #include <utility>
 
-#include "ArrayExprVisitor.h"
-#include "klee/util/BitArray.h"
-
 using namespace klee;
 
 ref<Expr>
diff --git a/lib/Expr/ArrayExprVisitor.cpp b/lib/Expr/ArrayExprVisitor.cpp
index dd82c4d6..d3119754 100644
--- a/lib/Expr/ArrayExprVisitor.cpp
+++ b/lib/Expr/ArrayExprVisitor.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "ArrayExprVisitor.h"
+#include "klee/Expr/ArrayExprVisitor.h"
 
 #include "klee/Support/ErrorHandling.h"
 
diff --git a/lib/Expr/AssignmentGenerator.cpp b/lib/Expr/AssignmentGenerator.cpp
index 0301b702..e7d2eb61 100644
--- a/lib/Expr/AssignmentGenerator.cpp
+++ b/lib/Expr/AssignmentGenerator.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "AssignmentGenerator.h"
+#include "klee/Expr/AssignmentGenerator.h"
 
 #include "klee/Expr/Assignment.h"
 #include "klee/Support/ErrorHandling.h"
diff --git a/unittests/Expr/ArrayExprTest.cpp b/unittests/Expr/ArrayExprTest.cpp
index 47375abd..c7f3806a 100644
--- a/unittests/Expr/ArrayExprTest.cpp
+++ b/unittests/Expr/ArrayExprTest.cpp
@@ -8,14 +8,16 @@
 //===----------------------------------------------------------------------===//
 
 #include "gtest/gtest.h"
-#include <iostream>
 
-#include "../../lib/Expr/ArrayExprOptimizer.h"
 #include "klee/Expr/ArrayCache.h"
+#include "klee/Expr/ArrayExprOptimizer.h"
 #include "klee/Expr/Assignment.h"
 #include "klee/Expr/Expr.h"
+
 #include <llvm/Support/CommandLine.h>
 
+#include <iostream>
+
 using namespace klee;
 namespace klee {
 extern llvm::cl::opt<ArrayOptimizationType> OptimizeArray;