Removed the Internal directory from include/klee

16 files changed, 51 insertions, 51 deletions

diff --git a/lib/Core/AddressSpace.h b/lib/Core/AddressSpace.h
index 10310a1e..bcd4b13d 100644
--- a/lib/Core/AddressSpace.h
+++ b/lib/Core/AddressSpace.h
@@ -12,8 +12,8 @@
 
 #include "Memory.h"
 #include "klee/Expr/Expr.h"
-#include "klee/Internal/ADT/ImmutableMap.h"
-#include "klee/Internal/System/Time.h"
+#include "klee/ADT/ImmutableMap.h"
+#include "klee/System/Time.h"
 
 namespace klee {
   class ExecutionState;
diff --git a/lib/Core/ExecutionState.cpp b/lib/Core/ExecutionState.cpp
index eadf7e11..e526a5fa 100644
--- a/lib/Core/ExecutionState.cpp
+++ b/lib/Core/ExecutionState.cpp
@@ -12,10 +12,10 @@
 #include "klee/ExecutionState.h"
 
 #include "klee/Expr/Expr.h"
-#include "klee/Internal/Module/Cell.h"
-#include "klee/Internal/Module/InstructionInfoTable.h"
-#include "klee/Internal/Module/KInstruction.h"
-#include "klee/Internal/Module/KModule.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 "llvm/IR/Function.h"
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
index 8845f11d..a3e84486 100644
--- a/lib/Core/Executor.cpp
+++ b/lib/Core/Executor.cpp
@@ -32,18 +32,18 @@
 #include "klee/Expr/ExprPPrinter.h"
 #include "klee/Expr/ExprSMTLIBPrinter.h"
 #include "klee/Expr/ExprUtil.h"
-#include "klee/Internal/ADT/KTest.h"
-#include "klee/Internal/ADT/RNG.h"
-#include "klee/Internal/Module/Cell.h"
-#include "klee/Internal/Module/InstructionInfoTable.h"
-#include "klee/Internal/Module/KInstruction.h"
-#include "klee/Internal/Module/KModule.h"
-#include "klee/Internal/Support/ErrorHandling.h"
-#include "klee/Internal/Support/FileHandling.h"
-#include "klee/Internal/Support/FloatEvaluation.h"
-#include "klee/Internal/Support/ModuleUtil.h"
-#include "klee/Internal/System/MemoryUsage.h"
-#include "klee/Internal/System/Time.h"
+#include "klee/ADT/KTest.h"
+#include "klee/ADT/RNG.h"
+#include "klee/Module/Cell.h"
+#include "klee/Module/InstructionInfoTable.h"
+#include "klee/Module/KInstruction.h"
+#include "klee/Module/KModule.h"
+#include "klee/Support/ErrorHandling.h"
+#include "klee/Support/FileHandling.h"
+#include "klee/Support/FloatEvaluation.h"
+#include "klee/Support/ModuleUtil.h"
+#include "klee/System/MemoryUsage.h"
+#include "klee/System/Time.h"
 #include "klee/Interpreter.h"
 #include "klee/OptionCategories.h"
 #include "klee/Solver/SolverCmdLine.h"
diff --git a/lib/Core/Executor.h b/lib/Core/Executor.h
index bf81a1d7..374dd30b 100644
--- a/lib/Core/Executor.h
+++ b/lib/Core/Executor.h
@@ -17,10 +17,10 @@
 
 #include "klee/ExecutionState.h"
 #include "klee/Expr/ArrayCache.h"
-#include "klee/Internal/Module/Cell.h"
-#include "klee/Internal/Module/KInstruction.h"
-#include "klee/Internal/Module/KModule.h"
-#include "klee/Internal/System/Time.h"
+#include "klee/Module/Cell.h"
+#include "klee/Module/KInstruction.h"
+#include "klee/Module/KModule.h"
+#include "klee/System/Time.h"
 #include "klee/Interpreter.h"
 
 #include "llvm/ADT/Twine.h"
diff --git a/lib/Core/ExecutorUtil.cpp b/lib/Core/ExecutorUtil.cpp
index 9cd74355..1e5fc7b0 100644
--- a/lib/Core/ExecutorUtil.cpp
+++ b/lib/Core/ExecutorUtil.cpp
@@ -13,8 +13,8 @@
 
 #include "klee/Config/Version.h"
 #include "klee/Expr/Expr.h"
-#include "klee/Internal/Module/KModule.h"
-#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/Module/KModule.h"
+#include "klee/Support/ErrorHandling.h"
 #include "klee/Interpreter.h"
 #include "klee/Solver/Solver.h"
 
diff --git a/lib/Core/ImpliedValue.cpp b/lib/Core/ImpliedValue.cpp
index 6a17c870..8be796d1 100644
--- a/lib/Core/ImpliedValue.cpp
+++ b/lib/Core/ImpliedValue.cpp
@@ -14,7 +14,7 @@
 #include "klee/Expr/Constraints.h"
 #include "klee/Expr/Expr.h"
 #include "klee/Expr/ExprUtil.h"
-#include "klee/Internal/Support/IntEvaluation.h" // FIXME: Use APInt
+#include "klee/Support/IntEvaluation.h" // FIXME: Use APInt
 #include "klee/Solver/Solver.h"
 
 #include <map>
diff --git a/lib/Core/Memory.cpp b/lib/Core/Memory.cpp
index ce537a4c..e369dd1a 100644
--- a/lib/Core/Memory.cpp
+++ b/lib/Core/Memory.cpp
@@ -14,7 +14,7 @@
 
 #include "klee/Expr/ArrayCache.h"
 #include "klee/Expr/Expr.h"
-#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/Support/ErrorHandling.h"
 #include "klee/OptionCategories.h"
 #include "klee/Solver/Solver.h"
 #include "klee/util/BitArray.h"
diff --git a/lib/Core/MemoryManager.cpp b/lib/Core/MemoryManager.cpp
index af3a2f26..e3fffd9b 100644
--- a/lib/Core/MemoryManager.cpp
+++ b/lib/Core/MemoryManager.cpp
@@ -13,7 +13,7 @@
 #include "Memory.h"
 
 #include "klee/Expr/Expr.h"
-#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/Support/ErrorHandling.h"
 
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/MathExtras.h"
diff --git a/lib/Core/Searcher.cpp b/lib/Core/Searcher.cpp
index 1e9e5b9b..87ef98ad 100644
--- a/lib/Core/Searcher.cpp
+++ b/lib/Core/Searcher.cpp
@@ -17,14 +17,14 @@
 #include "klee/ExecutionState.h"
 #include "klee/MergeHandler.h"
 #include "klee/Statistics.h"
-#include "klee/Internal/Module/InstructionInfoTable.h"
-#include "klee/Internal/Module/KInstruction.h"
-#include "klee/Internal/Module/KModule.h"
-#include "klee/Internal/ADT/DiscretePDF.h"
-#include "klee/Internal/ADT/RNG.h"
-#include "klee/Internal/Support/ModuleUtil.h"
-#include "klee/Internal/System/Time.h"
-#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/Module/InstructionInfoTable.h"
+#include "klee/Module/KInstruction.h"
+#include "klee/Module/KModule.h"
+#include "klee/ADT/DiscretePDF.h"
+#include "klee/ADT/RNG.h"
+#include "klee/Support/ModuleUtil.h"
+#include "klee/System/Time.h"
+#include "klee/Support/ErrorHandling.h"
 #include "llvm/IR/CallSite.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Instructions.h"
diff --git a/lib/Core/Searcher.h b/lib/Core/Searcher.h
index f1e093db..b369057b 100644
--- a/lib/Core/Searcher.h
+++ b/lib/Core/Searcher.h
@@ -10,7 +10,7 @@
 #ifndef KLEE_SEARCHER_H
 #define KLEE_SEARCHER_H
 
-#include "klee/Internal/System/Time.h"
+#include "klee/System/Time.h"
 
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/lib/Core/SeedInfo.cpp b/lib/Core/SeedInfo.cpp
index a896197b..7c3957d2 100644
--- a/lib/Core/SeedInfo.cpp
+++ b/lib/Core/SeedInfo.cpp
@@ -14,8 +14,8 @@
 #include "klee/ExecutionState.h"
 #include "klee/Expr/Expr.h"
 #include "klee/Expr/ExprUtil.h"
-#include "klee/Internal/ADT/KTest.h"
-#include "klee/Internal/Support/ErrorHandling.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 f1a11212..1d6db7e0 100644
--- a/lib/Core/SpecialFunctionHandler.cpp
+++ b/lib/Core/SpecialFunctionHandler.cpp
@@ -16,10 +16,10 @@
 #include "TimingSolver.h"
 
 #include "klee/ExecutionState.h"
-#include "klee/Internal/Module/KInstruction.h"
-#include "klee/Internal/Module/KModule.h"
-#include "klee/Internal/Support/Debug.h"
-#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/Module/KInstruction.h"
+#include "klee/Module/KModule.h"
+#include "klee/Support/Debug.h"
+#include "klee/Support/ErrorHandling.h"
 #include "klee/MergeHandler.h"
 #include "klee/OptionCategories.h"
 #include "klee/Solver/SolverCmdLine.h"
diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp
index 0c2886b8..fba20cdd 100644
--- a/lib/Core/StatsTracker.cpp
+++ b/lib/Core/StatsTracker.cpp
@@ -12,12 +12,12 @@
 #include "klee/ExecutionState.h"
 #include "klee/Statistics.h"
 #include "klee/Config/Version.h"
-#include "klee/Internal/Module/InstructionInfoTable.h"
-#include "klee/Internal/Module/KModule.h"
-#include "klee/Internal/Module/KInstruction.h"
-#include "klee/Internal/Support/ModuleUtil.h"
-#include "klee/Internal/System/MemoryUsage.h"
-#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/Module/InstructionInfoTable.h"
+#include "klee/Module/KModule.h"
+#include "klee/Module/KInstruction.h"
+#include "klee/Support/ModuleUtil.h"
+#include "klee/System/MemoryUsage.h"
+#include "klee/Support/ErrorHandling.h"
 #include "klee/Solver/SolverStats.h"
 
 #include "CallPathManager.h"
diff --git a/lib/Core/StatsTracker.h b/lib/Core/StatsTracker.h
index 98041464..e0234413 100644
--- a/lib/Core/StatsTracker.h
+++ b/lib/Core/StatsTracker.h
@@ -11,7 +11,7 @@
 #define KLEE_STATSTRACKER_H
 
 #include "CallPathManager.h"
-#include "klee/Internal/System/Time.h"
+#include "klee/System/Time.h"
 
 #include <memory>
 #include <set>
diff --git a/lib/Core/TimingSolver.h b/lib/Core/TimingSolver.h
index d74572b8..f6dfd5b9 100644
--- a/lib/Core/TimingSolver.h
+++ b/lib/Core/TimingSolver.h
@@ -12,7 +12,7 @@
 
 #include "klee/Expr/Expr.h"
 #include "klee/Solver/Solver.h"
-#include "klee/Internal/System/Time.h"
+#include "klee/System/Time.h"
 
 #include <vector>
 
diff --git a/lib/Core/UserSearcher.cpp b/lib/Core/UserSearcher.cpp
index 22098231..a7982115 100644
--- a/lib/Core/UserSearcher.cpp
+++ b/lib/Core/UserSearcher.cpp
@@ -12,7 +12,7 @@
 #include "Searcher.h"
 #include "Executor.h"
 
-#include "klee/Internal/Support/ErrorHandling.h"
+#include "klee/Support/ErrorHandling.h"
 #include "klee/MergeHandler.h"
 #include "klee/Solver/SolverCmdLine.h"