30 files changed, 8 insertions, 11 deletions
diff --git a/include/klee/Internal/ADT/DiscretePDF.h b/include/klee/ADT/DiscretePDF.h
index 74a1ce9e..74a1ce9e 100644
--- a/include/klee/Internal/ADT/DiscretePDF.h
+++ b/include/klee/ADT/DiscretePDF.h
diff --git a/include/klee/Internal/ADT/DiscretePDF.inc b/include/klee/ADT/DiscretePDF.inc
index 743a69b5..743a69b5 100644
--- a/include/klee/Internal/ADT/DiscretePDF.inc
+++ b/include/klee/ADT/DiscretePDF.inc
diff --git a/include/klee/Internal/ADT/ImmutableMap.h b/include/klee/ADT/ImmutableMap.h
index a7a18a89..a7a18a89 100644
--- a/include/klee/Internal/ADT/ImmutableMap.h
+++ b/include/klee/ADT/ImmutableMap.h
diff --git a/include/klee/Internal/ADT/ImmutableSet.h b/include/klee/ADT/ImmutableSet.h
index 1618e559..1618e559 100644
--- a/include/klee/Internal/ADT/ImmutableSet.h
+++ b/include/klee/ADT/ImmutableSet.h
diff --git a/include/klee/Internal/ADT/ImmutableTree.h b/include/klee/ADT/ImmutableTree.h
index ada3c211..ada3c211 100644
--- a/include/klee/Internal/ADT/ImmutableTree.h
+++ b/include/klee/ADT/ImmutableTree.h
diff --git a/include/klee/Internal/ADT/KTest.h b/include/klee/ADT/KTest.h
index 5b5c45ef..5b5c45ef 100644
--- a/include/klee/Internal/ADT/KTest.h
+++ b/include/klee/ADT/KTest.h
diff --git a/include/klee/Internal/ADT/MapOfSets.h b/include/klee/ADT/MapOfSets.h
index b30934d8..b30934d8 100644
--- a/include/klee/Internal/ADT/MapOfSets.h
+++ b/include/klee/ADT/MapOfSets.h
diff --git a/include/klee/Internal/ADT/RNG.h b/include/klee/ADT/RNG.h
index 5ea375b5..5ea375b5 100644
--- a/include/klee/Internal/ADT/RNG.h
+++ b/include/klee/ADT/RNG.h
diff --git a/include/klee/Internal/ADT/TreeStream.h b/include/klee/ADT/TreeStream.h
index 32c856c9..32c856c9 100644
--- a/include/klee/Internal/ADT/TreeStream.h
+++ b/include/klee/ADT/TreeStream.h
diff --git a/include/klee/ExecutionState.h b/include/klee/ExecutionState.h
index e647d0ab..b5625a00 100644
--- a/include/klee/ExecutionState.h
+++ b/include/klee/ExecutionState.h
@@ -12,13 +12,13 @@
 
 #include "klee/Expr/Constraints.h"
 #include "klee/Expr/Expr.h"
-#include "klee/Internal/ADT/TreeStream.h"
-#include "klee/Internal/System/Time.h"
+#include "klee/ADT/TreeStream.h"
+#include "klee/System/Time.h"
 #include "klee/MergeHandler.h"
 
 // FIXME: We do not want to be exposing these? :(
 #include "../../lib/Core/AddressSpace.h"
-#include "klee/Internal/Module/KInstIterator.h"
+#include "klee/Module/KInstIterator.h"
 
 #include <map>
 #include <set>
diff --git a/include/klee/Internal/README.txt b/include/klee/Internal/README.txt
deleted file mode 100644
index 9cedb653..00000000
--- a/include/klee/Internal/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This directory holds header files for things which are exposed as part
-of the internal API of a library, but shouldn't be exposed to
-externally.
diff --git a/include/klee/Internal/Module/Cell.h b/include/klee/Module/Cell.h
index c7d9ae18..c7d9ae18 100644
--- a/include/klee/Internal/Module/Cell.h
+++ b/include/klee/Module/Cell.h
diff --git a/include/klee/Internal/Module/InstructionInfoTable.h b/include/klee/Module/InstructionInfoTable.h
index e3684802..e3684802 100644
--- a/include/klee/Internal/Module/InstructionInfoTable.h
+++ b/include/klee/Module/InstructionInfoTable.h
diff --git a/include/klee/Internal/Module/KInstIterator.h b/include/klee/Module/KInstIterator.h
index e5bd37f8..e5bd37f8 100644
--- a/include/klee/Internal/Module/KInstIterator.h
+++ b/include/klee/Module/KInstIterator.h
diff --git a/include/klee/Internal/Module/KInstruction.h b/include/klee/Module/KInstruction.h
index d641b4e3..2873db45 100644
--- a/include/klee/Internal/Module/KInstruction.h
+++ b/include/klee/Module/KInstruction.h
@@ -11,7 +11,7 @@
 #define KLEE_KINSTRUCTION_H
 
 #include "klee/Config/Version.h"
-#include "klee/Internal/Module/InstructionInfoTable.h"
+#include "klee/Module/InstructionInfoTable.h"
 
 #include "llvm/Support/DataTypes.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/include/klee/Internal/Module/KModule.h b/include/klee/Module/KModule.h
index 89606e2e..89606e2e 100644
--- a/include/klee/Internal/Module/KModule.h
+++ b/include/klee/Module/KModule.h
diff --git a/include/klee/Solver/Solver.h b/include/klee/Solver/Solver.h
index fe4d7e88..ec107c20 100644
--- a/include/klee/Solver/Solver.h
+++ b/include/klee/Solver/Solver.h
@@ -11,7 +11,7 @@
 #define KLEE_SOLVER_H
 
 #include "klee/Expr/Expr.h"
-#include "klee/Internal/System/Time.h"
+#include "klee/System/Time.h"
 #include "klee/Solver/SolverCmdLine.h"
 
 #include <vector>
diff --git a/include/klee/Solver/SolverImpl.h b/include/klee/Solver/SolverImpl.h
index 90d5af24..f03db964 100644
--- a/include/klee/Solver/SolverImpl.h
+++ b/include/klee/Solver/SolverImpl.h
@@ -10,7 +10,7 @@
 #ifndef KLEE_SOLVERIMPL_H
 #define KLEE_SOLVERIMPL_H
 
-#include "klee/Internal/System/Time.h"
+#include "klee/System/Time.h"
 #include "Solver.h"
 
 #include <vector>
diff --git a/include/klee/Internal/Support/CompressionStream.h b/include/klee/Support/CompressionStream.h
index bc9119dd..bc9119dd 100644
--- a/include/klee/Internal/Support/CompressionStream.h
+++ b/include/klee/Support/CompressionStream.h
diff --git a/include/klee/Internal/Support/Debug.h b/include/klee/Support/Debug.h
index 0fe7906a..0fe7906a 100644
--- a/include/klee/Internal/Support/Debug.h
+++ b/include/klee/Support/Debug.h
diff --git a/include/klee/Internal/Support/ErrorHandling.h b/include/klee/Support/ErrorHandling.h
index 92762c03..92762c03 100644
--- a/include/klee/Internal/Support/ErrorHandling.h
+++ b/include/klee/Support/ErrorHandling.h
diff --git a/include/klee/Internal/Support/FileHandling.h b/include/klee/Support/FileHandling.h
index 90ce20b3..90ce20b3 100644
--- a/include/klee/Internal/Support/FileHandling.h
+++ b/include/klee/Support/FileHandling.h
diff --git a/include/klee/Internal/Support/FloatEvaluation.h b/include/klee/Support/FloatEvaluation.h
index 37392576..37392576 100644
--- a/include/klee/Internal/Support/FloatEvaluation.h
+++ b/include/klee/Support/FloatEvaluation.h
diff --git a/include/klee/Internal/Support/IntEvaluation.h b/include/klee/Support/IntEvaluation.h
index 27a8daf0..27a8daf0 100644
--- a/include/klee/Internal/Support/IntEvaluation.h
+++ b/include/klee/Support/IntEvaluation.h
diff --git a/include/klee/Internal/Support/ModuleUtil.h b/include/klee/Support/ModuleUtil.h
index e80fc673..e80fc673 100644
--- a/include/klee/Internal/Support/ModuleUtil.h
+++ b/include/klee/Support/ModuleUtil.h
diff --git a/include/klee/Internal/Support/PrintVersion.h b/include/klee/Support/PrintVersion.h
index fbd20e39..fbd20e39 100644
--- a/include/klee/Internal/Support/PrintVersion.h
+++ b/include/klee/Support/PrintVersion.h
diff --git a/include/klee/Internal/Support/Timer.h b/include/klee/Support/Timer.h
index 30b1b758..48cbbdea 100644
--- a/include/klee/Internal/Support/Timer.h
+++ b/include/klee/Support/Timer.h
@@ -10,7 +10,7 @@
 #ifndef KLEE_TIMER_H
 #define KLEE_TIMER_H
 
-#include "klee/Internal/System/Time.h"
+#include "klee/System/Time.h"
 
 #include "llvm/ADT/SmallVector.h"
 
diff --git a/include/klee/Internal/System/MemoryUsage.h b/include/klee/System/MemoryUsage.h
index c3cf3c74..c3cf3c74 100644
--- a/include/klee/Internal/System/MemoryUsage.h
+++ b/include/klee/System/MemoryUsage.h
diff --git a/include/klee/Internal/System/Time.h b/include/klee/System/Time.h
index 2ebebdfd..2ebebdfd 100644
--- a/include/klee/Internal/System/Time.h
+++ b/include/klee/System/Time.h
diff --git a/include/klee/TimerStatIncrementer.h b/include/klee/TimerStatIncrementer.h
index c467c82b..26ead0e6 100644
--- a/include/klee/TimerStatIncrementer.h
+++ b/include/klee/TimerStatIncrementer.h
@@ -11,7 +11,7 @@
 #define KLEE_TIMERSTATINCREMENTER_H
 
 #include "klee/Statistics.h"
-#include "klee/Internal/Support/Timer.h"
+#include "klee/Support/Timer.h"
 
 namespace klee {