diff --git a/README.md b/README.md
index 6383ccbc00cafae02ed6325a1809dc9af4bb51dd..ff98b0e16b0c6378d1c7772dc9c266c3cb767644 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Various examples of different complexity using this deepcopy utility with HPVM c
     ```
     where `{libclang_flags}` could be anything you pass into the clang-frontend, e,g `-std=c++23`. 
     
-2. Build and link run-time library with the program.
+2. (This is no longer needed if using the most recent release of HPVM. The run-time module have been bundled together with the hpvm-rt library)~~Build and link run-time library with the program.~~
     ```bash
     {HPVM_PATH}/build/bin/clang++ -fPIC -c src/hpvm_dclib.cpp -o hpvm_dclib.o
     # Then link hpvm_dclib.o with the rest of your project
diff --git a/build.sh b/build.sh
index e24ab439b44dc4fb32a338cbbe1d79de3c2ef3af..35b638690d3dabf9edd540ed7b5357cd7dc80588 100755
--- a/build.sh
+++ b/build.sh
@@ -17,8 +17,8 @@ set -o xtrace
 /home/xiaoboh2/hpvm/hpvm/build/bin/opt -enable-new-pm=0 -load HPVMBuildDFG.so -load HPVMLocalMem.so -load HPVMDFG2LLVM_GPU_OCL.so -load HPVMDFG2LLVM_CPU.so -load HPVMClearDFG.so -buildDFG -localmem -dfg2llvm-gpu-ocl -dfg2llvm-cpu -clearDFG -S $1.hpvm.ll -o $1.llvm.ll
 /home/xiaoboh2/hpvm/hpvm/build/bin/llvm-link $1.llvm.ll /home/xiaoboh2/hpvm/hpvm/build/tools/hpvm/projects/hpvm-rt/hpvm-rt.bc -S -o $1.linked.bc
 
-/home/xiaoboh2/hpvm/hpvm/build/bin/clang++ $1.linked.bc hpvm_dclib.o -o main.gpu -L/home/xiaoboh2/hpvm/hpvm/build/lib -Wl,-rpath=/home/xiaoboh2/hpvm/hpvm/build/lib -L/usr/local/cuda/lib64 -Wl,-rpath=/usr/local/cuda/lib64 -lpthread -l:libOpenCL.so 
-#/home/xiaoboh2/hpvm/hpvm/build/bin/clang++ $1.linked.bc hpvm_dclib.o -o main.gpu -L/home/xiaoboh2/hpvm/hpvm/build/lib -Wl,-rpath=/home/xiaoboh2/hpvm/hpvm/build/lib -L/usr/local/cuda/lib64 -Wl,-rpath=/usr/local/cuda/lib64 -lpthread -l:libtensor_runtime.so -l:libOpenCL.so 
-#/home/xiaoboh2/hpvm/hpvm/build/bin/clang++ $1.linked.bc -o main.gpu -L/home/xiaoboh2/hpvm/hpvm/build/lib -Wl,-rpath=/home/xiaoboh2/hpvm/hpvm/build/lib -L/usr/local/cuda/lib64 -Wl,-rpath=/usr/local/cuda/lib64 -lpthread  -l:libOpenCL.so 
+# Run time linking no longer necessary. Run time module included in hpvm-rt
+#/home/xiaoboh2/hpvm/hpvm/build/bin/clang++ $1.linked.bc hpvm_dclib.o -o main.gpu -L/home/xiaoboh2/hpvm/hpvm/build/lib -Wl,-rpath=/home/xiaoboh2/hpvm/hpvm/build/lib -L/usr/local/cuda/lib64 -Wl,-rpath=/usr/local/cuda/lib64 -lpthread -l:libOpenCL.so 
+/home/xiaoboh2/hpvm/hpvm/build/bin/clang++ $1.linked.bc -o main.gpu -L/home/xiaoboh2/hpvm/hpvm/build/lib -Wl,-rpath=/home/xiaoboh2/hpvm/hpvm/build/lib -L/usr/local/cuda/lib64 -Wl,-rpath=/usr/local/cuda/lib64 -lpthread -l:libOpenCL.so 
 /home/xiaoboh2/hpvm/hpvm/build/bin/llvm-ocl $1.hpvm.kernels.ll
 #cd -
diff --git a/src/frontend/CMakeLists.txt b/src/frontend/CMakeLists.txt
index 3bdf24b000e3bf548696fab456fcb2dfbcbb6531..e09ea9f6f75e8a829978086ecef70e3b4395cd2a 100644
--- a/src/frontend/CMakeLists.txt
+++ b/src/frontend/CMakeLists.txt
@@ -1,6 +1,6 @@
-include_directories(../../include)
-include_directories(../../../../llvm/tools/clang/include)
-include_directories(../../../../build/tools/clang/include)
+include_directories(../../../../include)
+include_directories(../../../../../../llvm/tools/clang/include)
+include_directories(../../../../../../build/tools/clang/include)
 
 set(LLVM_LINK_COMPONENTS support)
 #add_llvm_library(HeteroDeepCopy MODULE