4 files changed, 17 insertions, 0 deletions
diff --git a/include/klee/Internal/Module/InstructionInfoTable.h b/include/klee/Internal/Module/InstructionInfoTable.h
index c93f5ddb..98af6ac9 100644
--- a/include/klee/Internal/Module/InstructionInfoTable.h
+++ b/include/klee/Internal/Module/InstructionInfoTable.h
@@ -55,6 +55,8 @@ namespace klee {
 
   private:
     const std::string *internString(std::string s);
+    bool getInstructionDebugInfo(const llvm::Instruction *I,
+                                 const std::string *&File, unsigned &Line);
 
   public:
     InstructionInfoTable(llvm::Module *m);
diff --git a/include/klee/Internal/Module/KInstruction.h b/include/klee/Internal/Module/KInstruction.h
index 89b9dbfc..b35cf107 100644
--- a/include/klee/Internal/Module/KInstruction.h
+++ b/include/klee/Internal/Module/KInstruction.h
@@ -10,7 +10,12 @@
 #ifndef KLEE_KINSTRUCTION_H
 #define KLEE_KINSTRUCTION_H
 
+#include "klee/Config/config.h"
+#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 7)
 #include "llvm/Support/DataTypes.h"
+#else
+#include "llvm/System/DataTypes.h"
+#endif
 #include <vector>
 
 namespace llvm {
diff --git a/include/klee/Statistic.h b/include/klee/Statistic.h
index 6baaedf4..7ade8dd0 100644
--- a/include/klee/Statistic.h
+++ b/include/klee/Statistic.h
@@ -10,7 +10,12 @@
 #ifndef KLEE_STATISTIC_H
 #define KLEE_STATISTIC_H
 
+#include "klee/Config/config.h"
+#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 7)
 #include "llvm/Support/DataTypes.h"
+#else
+#include "llvm/System/DataTypes.h"
+#endif
 #include <string>
 
 namespace klee {
diff --git a/include/klee/util/Bits.h b/include/klee/util/Bits.h
index ffbda09e..db45acac 100644
--- a/include/klee/util/Bits.h
+++ b/include/klee/util/Bits.h
@@ -10,7 +10,12 @@
 #ifndef KLEE_UTIL_BITS_H
 #define KLEE_UTIL_BITS_H
 
+#include "klee/Config/config.h"
+#if (LLVM_VERSION_MAJOR == 2 && LLVM_VERSION_MINOR < 7)
 #include "llvm/Support/DataTypes.h"
+#else
+#include "llvm/System/DataTypes.h"
+#endif
 
 namespace klee {
   namespace bits32 {