Consolidated Expr-related include files into a single include/klee/Expr directory. This improves the organization of the code, and also makes it easier to reuse Expr outside KLEE.

3 files changed, 13 insertions, 9 deletions

diff --git a/unittests/Assignment/AssignmentTest.cpp b/unittests/Assignment/AssignmentTest.cpp
index 0eaa28f1..872d3301 100644
--- a/unittests/Assignment/AssignmentTest.cpp
+++ b/unittests/Assignment/AssignmentTest.cpp
@@ -1,6 +1,8 @@
-#include "klee/util/ArrayCache.h"
-#include "klee/util/Assignment.h"
 #include "gtest/gtest.h"
+
+#include "klee/Expr/ArrayCache.h"
+#include "klee/Expr/Assignment.h"
+
 #include <iostream>
 #include <vector>
 
diff --git a/unittests/Expr/ExprTest.cpp b/unittests/Expr/ExprTest.cpp
index fba15535..3a7541e9 100644
--- a/unittests/Expr/ExprTest.cpp
+++ b/unittests/Expr/ExprTest.cpp
@@ -10,8 +10,8 @@
 #include <iostream>
 #include "gtest/gtest.h"
 
-#include "klee/Expr.h"
-#include "klee/util/ArrayCache.h"
+#include "klee/Expr/ArrayCache.h"
+#include "klee/Expr/Expr.h"
 
 using namespace klee;
 
diff --git a/unittests/Solver/SolverTest.cpp b/unittests/Solver/SolverTest.cpp
index b178ced3..b15fd64b 100644
--- a/unittests/Solver/SolverTest.cpp
+++ b/unittests/Solver/SolverTest.cpp
@@ -7,16 +7,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <iostream>
 #include "gtest/gtest.h"
 
-#include "klee/SolverCmdLine.h"
-#include "klee/Constraints.h"
-#include "klee/Expr.h"
+#include "klee/Expr/ArrayCache.h"
+#include "klee/Expr/Constraints.h"
+#include "klee/Expr/Expr.h"
 #include "klee/Solver.h"
-#include "klee/util/ArrayCache.h"
+#include "klee/SolverCmdLine.h"
+
 #include "llvm/ADT/StringExtras.h"
 
+#include <iostream>
+
 using namespace klee;
 
 namespace {