diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
index abadb75aec32d2f4fcbfe5ca034fa9eea8019765..dc714af6c2758b75db21ffa327650fbd410db8e4 100644
--- a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
@@ -264,7 +264,7 @@ void CGT_NVPTX::initRuntimeAPI() {
   assert(LLVM_SRC_ROOT != NULL && "Define LLVM_SRC_ROOT environment variable!");
 
   Twine llvmSrcRoot = LLVM_SRC_ROOT;
-  Twine runtimeAPI = llvmSrcRoot+"/../build/projects/visc-rt/visc-rt.ll";
+  Twine runtimeAPI = llvmSrcRoot + "/tools/hpvm/visc-rt/visc-rt.ll";
 
   runtimeModule = parseIRFile(runtimeAPI.str(), Err, M.getContext());
   if(runtimeModule == nullptr)
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp
index 48b1492047d5d98a9018f9cff2d94f7450cb490b..e294a94537576ac5ca748af7fd17d70e5a133717 100644
--- a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp
@@ -30,13 +30,13 @@
 #include "llvm/Bitcode/BitcodeReader.h"
 #include "llvm/Bitcode/BitcodeWriter.h"
 #include "llvm/IR/Attributes.h"
-#include "llvm/SupportVISC/VISCHint.h"
-#include "llvm/SupportVISC/VISCTimer.h"
-#include "llvm/SupportVISC/DFG2LLVM.h"
+#include "SupportVISC/VISCHint.h"
+#include "SupportVISC/VISCTimer.h"
+#include "SupportVISC/DFG2LLVM.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm-c/Core.h"
 
-#include "llvm/SupportVISC/VISCUtils.h"
+#include "SupportVISC/VISCUtils.h"
 #include "llvm/IR/IRPrintingPasses.h"
 #include "llvm/IR/LegacyPassManager.h"
 #include "llvm/Support/ToolOutputFile.h"
@@ -270,7 +270,7 @@ void CGT_SPIR::initRuntimeAPI() {
   assert(LLVM_SRC_ROOT != NULL && "Define LLVM_SRC_ROOT environment variable!");
 
   Twine llvmSrcRoot = LLVM_SRC_ROOT;
-  Twine runtimeAPI = llvmSrcRoot+"/../build/projects/visc-rt/visc-rt.ll";
+  Twine runtimeAPI = llvmSrcRoot + "/tools/hpvm/visc-rt/visc-rt.ll";
   errs() << "Open file: " << runtimeAPI.str() << "\n";
   runtimeModule = parseIRFile(runtimeAPI.str(), Err, M.getContext());
   if(runtimeModule == NULL)
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
index 1d3a49b72a4c9b09e33da8c8b911da4bc3ae03ef..d17429c76b3c0886e4c19061a55af189edd9814c 100644
--- a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
@@ -186,7 +186,7 @@ void CGT_X86::initRuntimeAPI() {
   assert(LLVM_SRC_ROOT != NULL && "Define LLVM_SRC_ROOT environment variable!");
 
   Twine llvmSrcRoot = LLVM_SRC_ROOT;
-  Twine runtimeAPI = llvmSrcRoot+"/../build/projects/visc-rt/visc-rt.ll";
+  Twine runtimeAPI = llvmSrcRoot + "/tools/hpvm/visc-rt/visc-rt.ll";
 
   runtimeModule = parseIRFile(runtimeAPI.str(), Err, M.getContext());
 
diff --git a/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp b/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
index 89d92f8083d137f6c71f8294e77b6f92fd9bcaa6..ccb4afe235e18a939fd9631cca0f1800f2c41335 100644
--- a/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
@@ -821,13 +821,10 @@ bool GenVISC::runOnModule(Module &M) {
          "Define LLVM_SRC_ROOT environment variable!");
 
   Twine llvmSrcRoot = LLVM_SRC_ROOT;
-  Twine runtimeAPI = llvmSrcRoot+"/../build/projects/visc-rt/visc-rt.ll";
+  Twine runtimeAPI = llvmSrcRoot + "/tools/hpvm/visc-rt/visc-rt.ll";
   errs() << llvmSrcRoot << "\n";
 
   std::unique_ptr<Module> runtimeModule = parseIRFile(runtimeAPI.str(), Err, M.getContext());
-  //    Module* runtimeModule =
-  // ParseIRFile("/home/psrivas2/current-src/projects/visc-rt/visc-rt.ll",
-  // Err, M.getContext());
 
   if(runtimeModule == NULL)
     DEBUG(errs() << Err.getMessage());