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.

1 files changed, 8 insertions, 8 deletions

diff --git a/lib/Solver/IndependentSolver.cpp b/lib/Solver/IndependentSolver.cpp
index 447e5575..12017e5c 100644
--- a/lib/Solver/IndependentSolver.cpp
+++ b/lib/Solver/IndependentSolver.cpp
@@ -10,19 +10,19 @@
 #define DEBUG_TYPE "independent-solver"
 #include "klee/Solver.h"
 
-#include "klee/Expr.h"
-#include "klee/Constraints.h"
-#include "klee/SolverImpl.h"
+#include "klee/Expr/Assignment.h"
+#include "klee/Expr/Constraints.h"
+#include "klee/Expr/Expr.h"
+#include "klee/Expr/ExprUtil.h"
 #include "klee/Internal/Support/Debug.h"
-
-#include "klee/util/ExprUtil.h"
-#include "klee/util/Assignment.h"
+#include "klee/SolverImpl.h"
 
 #include "llvm/Support/raw_ostream.h"
+
+#include <list>
 #include <map>
-#include <vector>
 #include <ostream>
-#include <list>
+#include <vector>
 
 using namespace klee;
 using namespace llvm;