Moved header files that were placed directly in include/klee/ into appropriate existing directories and a new directory Statistics; a few missing renames.

11 files changed, 13 insertions, 18 deletions

diff --git a/lib/Core/AddressSpace.cpp b/lib/Core/AddressSpace.cpp
index 114e9c8b..82913aa7 100644
--- a/lib/Core/AddressSpace.cpp
+++ b/lib/Core/AddressSpace.cpp
@@ -13,7 +13,7 @@
 #include "TimingSolver.h"
 
 #include "klee/Expr/Expr.h"
-#include "klee/TimerStatIncrementer.h"
+#include "klee/Statistics/TimerStatIncrementer.h"
 
 #include "CoreStats.h"
 
diff --git a/lib/Core/CallPathManager.cpp b/lib/Core/CallPathManager.cpp
index 6d5ef1a8..2c0e4ae3 100644
--- a/lib/Core/CallPathManager.cpp
+++ b/lib/Core/CallPathManager.cpp
@@ -9,14 +9,14 @@
 
 #include "CallPathManager.h"
 
-#include "klee/Statistics.h"
+#include "klee/Statistics/Statistics.h"
 
-#include <map>
-#include <vector>
 #include "llvm/IR/Function.h"
-
 #include "llvm/Support/raw_ostream.h"
 
+#include <map>
+#include <vector>
+
 using namespace klee;
 
 ///
diff --git a/lib/Core/CallPathManager.h b/lib/Core/CallPathManager.h
index d78c8d8f..3d6acf4b 100644
--- a/lib/Core/CallPathManager.h
+++ b/lib/Core/CallPathManager.h
@@ -10,7 +10,7 @@
 #ifndef KLEE_CALLPATHMANAGER_H
 #define KLEE_CALLPATHMANAGER_H
 
-#include "klee/Statistics.h"
+#include "klee/Statistics/Statistics.h"
 
 #include <map>
 #include <memory>
diff --git a/lib/Core/CoreStats.h b/lib/Core/CoreStats.h
index 42e81de7..1e463c65 100644
--- a/lib/Core/CoreStats.h
+++ b/lib/Core/CoreStats.h
@@ -10,7 +10,7 @@
 #ifndef KLEE_CORESTATS_H
 #define KLEE_CORESTATS_H
 
-#include "klee/Statistic.h"
+#include "klee/Statistics/Statistic.h"
 
 namespace klee {
 namespace stats {
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 0664e606..651dd035 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -25,9 +25,7 @@
 #include "TimingSolver.h"
 #include "UserSearcher.h"
 
-#include "klee/ADT/KTest.h"
 #include "klee/ADT/RNG.h"
-#include "klee/Common.h"
 #include "klee/Config/Version.h"
 #include "klee/Core/Interpreter.h"
 #include "klee/Expr/ArrayExprOptimizer.h"
@@ -36,11 +34,14 @@
 #include "klee/Expr/ExprPPrinter.h"
 #include "klee/Expr/ExprSMTLIBPrinter.h"
 #include "klee/Expr/ExprUtil.h"
+#include "klee/Solver/Common.h"
+#include "klee/ADT/KTest.h"
+#include "klee/Support/OptionCategories.h"
+#include "klee/Statistics/TimerStatIncrementer.h"
 #include "klee/Module/Cell.h"
 #include "klee/Module/InstructionInfoTable.h"
 #include "klee/Module/KInstruction.h"
 #include "klee/Module/KModule.h"
-#include "klee/OptionCategories.h"
 #include "klee/Solver/SolverCmdLine.h"
 #include "klee/Solver/SolverStats.h"
 #include "klee/Support/ErrorHandling.h"
@@ -49,7 +50,6 @@
 #include "klee/Support/ModuleUtil.h"
 #include "klee/System/MemoryUsage.h"
 #include "klee/System/Time.h"
-#include "klee/TimerStatIncrementer.h"
 
 #include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/StringExtras.h"
diff --git a/lib/Core/Memory.cpp b/lib/Core/Memory.cpp
index 35b09011..cb40cd81 100644
--- a/lib/Core/Memory.cpp
+++ b/lib/Core/Memory.cpp
@@ -15,7 +15,7 @@
 #include "klee/ADT/BitArray.h"
 #include "klee/Expr/ArrayCache.h"
 #include "klee/Expr/Expr.h"
-#include "klee/OptionCategories.h"
+#include "klee/Support/OptionCategories.h"
 #include "klee/Solver/Solver.h"
 #include "klee/Support/ErrorHandling.h"
 
diff --git a/lib/Core/Searcher.cpp b/lib/Core/Searcher.cpp
index d8119e49..a9c7d318 100644
--- a/lib/Core/Searcher.cpp
+++ b/lib/Core/Searcher.cpp
@@ -22,7 +22,6 @@
 #include "klee/Module/InstructionInfoTable.h"
 #include "klee/Module/KInstruction.h"
 #include "klee/Module/KModule.h"
-#include "klee/Statistics.h"
 #include "klee/Support/ErrorHandling.h"
 #include "klee/Support/ModuleUtil.h"
 #include "klee/System/Time.h"
diff --git a/lib/Core/SeedInfo.cpp b/lib/Core/SeedInfo.cpp
index 423e9861..d3688313 100644
--- a/lib/Core/SeedInfo.cpp
+++ b/lib/Core/SeedInfo.cpp
@@ -13,10 +13,10 @@
 #include "Memory.h"
 #include "TimingSolver.h"
 
-
 #include "klee/ADT/KTest.h"
 #include "klee/Expr/Expr.h"
 #include "klee/Expr/ExprUtil.h"
+#include "klee/ADT/KTest.h"
 #include "klee/Support/ErrorHandling.h"
 
 using namespace klee;
diff --git a/lib/Core/SpecialFunctionHandler.cpp b/lib/Core/SpecialFunctionHandler.cpp
index 52beb89d..d6429883 100644
--- a/lib/Core/SpecialFunctionHandler.cpp
+++ b/lib/Core/SpecialFunctionHandler.cpp
@@ -19,7 +19,6 @@
 
 #include "klee/Module/KInstruction.h"
 #include "klee/Module/KModule.h"
-#include "klee/OptionCategories.h"
 #include "klee/Solver/SolverCmdLine.h"
 #include "klee/Support/Debug.h"
 #include "klee/Support/ErrorHandling.h"
diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
index 81db25e3..395babf0 100644
--- a/lib/Core/StatsTracker.cpp
+++ b/lib/Core/StatsTracker.cpp
@@ -12,7 +12,6 @@
 #include "ExecutionState.h"
 
 #include "klee/Config/Version.h"
-
 #include "klee/Module/InstructionInfoTable.h"
 #include "klee/Module/KInstruction.h"
 #include "klee/Module/KModule.h"
diff --git a/lib/Core/TimingSolver.cpp b/lib/Core/TimingSolver.cpp
index ee829a35..d525a9db 100644
--- a/lib/Core/TimingSolver.cpp
+++ b/lib/Core/TimingSolver.cpp
@@ -15,8 +15,6 @@
 #include "klee/Statistics/Statistics.h"
 #include "klee/Statistics/TimerStatIncrementer.h"
 #include "klee/Solver/Solver.h"
-#include "klee/Statistics.h"
-#include "klee/TimerStatIncrementer.h"
 
 #include "CoreStats.h"