8 files changed, 7 insertions, 7 deletions
diff --git a/include/klee/Common.h b/include/klee/Common.h
index 611b137c..7b244158 100644
--- a/include/klee/Common.h
+++ b/include/klee/Common.h
@@ -14,7 +14,8 @@
 #ifndef KLEE_COMMON_H
 #define KLEE_COMMON_H
 
-#include "klee/Solver.h"
+#include "klee/Solver/Solver.h"
+
 #include <string>
 
 namespace klee {
diff --git a/include/klee/Expr/ArrayExprHash.h b/include/klee/Expr/ArrayExprHash.h
index 04660fe0..f8bef491 100644
--- a/include/klee/Expr/ArrayExprHash.h
+++ b/include/klee/Expr/ArrayExprHash.h
@@ -11,11 +11,10 @@
 #define KLEE_ARRAYEXPRHASH_H
 
 #include "klee/Expr/Expr.h"
+#include "klee/Solver/SolverStats.h"
 #include "klee/TimerStatIncrementer.h"
-#include "klee/SolverStats.h"
 
 #include <map>
-
 #include <unordered_map>
 
 namespace klee {
diff --git a/include/klee/Expr/ExprSMTLIBPrinter.h b/include/klee/Expr/ExprSMTLIBPrinter.h
index a7a604e1..38ae2fa1 100644
--- a/include/klee/Expr/ExprSMTLIBPrinter.h
+++ b/include/klee/Expr/ExprSMTLIBPrinter.h
@@ -13,7 +13,7 @@
 
 #include "klee/Expr/Constraints.h"
 #include "klee/Expr/Expr.h"
-#include "klee/Solver.h"
+#include "klee/Solver/Solver.h"
 #include "klee/util/PrintContext.h"
 
 #include <map>
diff --git a/include/klee/IncompleteSolver.h b/include/klee/Solver/IncompleteSolver.h
index 6511584e..3841c38b 100644
--- a/include/klee/IncompleteSolver.h
+++ b/include/klee/Solver/IncompleteSolver.h
@@ -10,8 +10,8 @@
 #ifndef KLEE_INCOMPLETESOLVER_H
 #define KLEE_INCOMPLETESOLVER_H
 
-#include "klee/Solver.h"
-#include "klee/SolverImpl.h"
+#include "klee/Solver/Solver.h"
+#include "klee/Solver/SolverImpl.h"
 
 namespace klee {
 
diff --git a/include/klee/Solver.h b/include/klee/Solver/Solver.h
index f320a5b6..fe4d7e88 100644
--- a/include/klee/Solver.h
+++ b/include/klee/Solver/Solver.h
@@ -11,8 +11,8 @@
 #define KLEE_SOLVER_H
 
 #include "klee/Expr/Expr.h"
-#include "klee/SolverCmdLine.h"
 #include "klee/Internal/System/Time.h"
+#include "klee/Solver/SolverCmdLine.h"
 
 #include <vector>
 
diff --git a/include/klee/SolverCmdLine.h b/include/klee/Solver/SolverCmdLine.h
index b453d058..b453d058 100644
--- a/include/klee/SolverCmdLine.h
+++ b/include/klee/Solver/SolverCmdLine.h
diff --git a/include/klee/SolverImpl.h b/include/klee/Solver/SolverImpl.h
index 90d5af24..90d5af24 100644
--- a/include/klee/SolverImpl.h
+++ b/include/klee/Solver/SolverImpl.h
diff --git a/include/klee/SolverStats.h b/include/klee/Solver/SolverStats.h
index dd39043a..dd39043a 100644
--- a/include/klee/SolverStats.h
+++ b/include/klee/Solver/SolverStats.h