diff --git a/llvm/include/llvm/BuildDFG/BuildDFG.h b/llvm/tools/hpvm/include/BuildDFG/BuildDFG.h
similarity index 100%
rename from llvm/include/llvm/BuildDFG/BuildDFG.h
rename to llvm/tools/hpvm/include/BuildDFG/BuildDFG.h
diff --git a/llvm/include/llvm/GenVISC/GenVISC.h b/llvm/tools/hpvm/include/GenVISC/GenVISC.h
similarity index 97%
rename from llvm/include/llvm/GenVISC/GenVISC.h
rename to llvm/tools/hpvm/include/GenVISC/GenVISC.h
index fcdb636a0533cebb2abf534c747dc77d4fb0371e..21ccf68b6f31bbccd6586ff9c737165cecc77b1b 100644
--- a/llvm/include/llvm/GenVISC/GenVISC.h
+++ b/llvm/tools/hpvm/include/GenVISC/GenVISC.h
@@ -13,7 +13,7 @@
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Pass.h"
-#include "llvm/SupportVISC/VISCTimer.h"
+#include "SupportVISC/VISCTimer.h"
 
 using namespace llvm;
 
diff --git a/llvm/include/llvm/SupportVISC/DFG2LLVM.h b/llvm/tools/hpvm/include/SupportVISC/DFG2LLVM.h
similarity index 99%
rename from llvm/include/llvm/SupportVISC/DFG2LLVM.h
rename to llvm/tools/hpvm/include/SupportVISC/DFG2LLVM.h
index 355fb18570573078dce3c88a601d81bbe50e384f..1e45e87ccb5fff42edfa73e077134e7f9337473a 100644
--- a/llvm/include/llvm/SupportVISC/DFG2LLVM.h
+++ b/llvm/tools/hpvm/include/SupportVISC/DFG2LLVM.h
@@ -16,10 +16,10 @@
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Value.h"
 #include "llvm/Pass.h"
-#include "llvm/BuildDFG/BuildDFG.h"
-#include "llvm/SupportVISC/VISCHint.h"
-#include "llvm/SupportVISC/VISCTimer.h"
-#include "llvm/SupportVISC/VISCUtils.h"
+#include "BuildDFG/BuildDFG.h"
+#include "SupportVISC/VISCHint.h"
+#include "SupportVISC/VISCTimer.h"
+#include "SupportVISC/VISCUtils.h"
 
 using namespace llvm;
 using namespace builddfg;
diff --git a/llvm/include/llvm/SupportVISC/DFGTreeTraversal.h b/llvm/tools/hpvm/include/SupportVISC/DFGTreeTraversal.h
similarity index 100%
rename from llvm/include/llvm/SupportVISC/DFGTreeTraversal.h
rename to llvm/tools/hpvm/include/SupportVISC/DFGTreeTraversal.h
diff --git a/llvm/include/llvm/IR/DFGraph.h b/llvm/tools/hpvm/include/SupportVISC/DFGraph.h
similarity index 99%
rename from llvm/include/llvm/IR/DFGraph.h
rename to llvm/tools/hpvm/include/SupportVISC/DFGraph.h
index 3b78849924ba5497703c5bdf4b62588a50d774b8..dd6a2f0bbb6c8ddc4ae2bb8b7a6df883b1e25a35 100644
--- a/llvm/include/llvm/IR/DFGraph.h
+++ b/llvm/tools/hpvm/include/SupportVISC/DFGraph.h
@@ -28,8 +28,8 @@
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/Casting.h"
 #include "llvm/Support/GraphWriter.h"
-#include "llvm/SupportVISC/VISCHint.h"
-#include "llvm/SupportVISC/VISCUtils.h"
+#include "SupportVISC/VISCHint.h"
+#include "SupportVISC/VISCUtils.h"
 
 
 namespace llvm {
diff --git a/llvm/include/llvm/SupportVISC/VISCHint.h b/llvm/tools/hpvm/include/SupportVISC/VISCHint.h
similarity index 100%
rename from llvm/include/llvm/SupportVISC/VISCHint.h
rename to llvm/tools/hpvm/include/SupportVISC/VISCHint.h
diff --git a/llvm/include/llvm/SupportVISC/VISCTimer.h b/llvm/tools/hpvm/include/SupportVISC/VISCTimer.h
similarity index 100%
rename from llvm/include/llvm/SupportVISC/VISCTimer.h
rename to llvm/tools/hpvm/include/SupportVISC/VISCTimer.h
diff --git a/llvm/include/llvm/SupportVISC/VISCUtils.h b/llvm/tools/hpvm/include/SupportVISC/VISCUtils.h
similarity index 99%
rename from llvm/include/llvm/SupportVISC/VISCUtils.h
rename to llvm/tools/hpvm/include/SupportVISC/VISCUtils.h
index a20ce8bccd2a18aec83d826f49b57b246ff530de..02a44518ee7d1a309cd9a904f3bada4d98c47a43 100644
--- a/llvm/include/llvm/SupportVISC/VISCUtils.h
+++ b/llvm/tools/hpvm/include/SupportVISC/VISCUtils.h
@@ -23,7 +23,7 @@
 #include "llvm/IR/Metadata.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
-#include "llvm/SupportVISC/VISCHint.h"
+#include "SupportVISC/VISCHint.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Transforms/Utils/ValueMapper.h"
 
diff --git a/llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp b/llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp
index 04b01e332b4e6a81392ae1d076ce3e4e941db72e..447ffdc9b1c1d0e2cb07ffeedc56d67f15d6cc9a 100644
--- a/llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp
@@ -8,15 +8,15 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "buildDFG"
-#include "llvm/BuildDFG/BuildDFG.h"
+#include "BuildDFG/BuildDFG.h"
 
 #include "llvm/ADT/Statistic.h"
 #include "llvm/IR/ValueSymbolTable.h"
 #include "llvm/IR/InstIterator.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/Debug.h"
-#include "llvm/SupportVISC/VISCHint.h"
-#include "llvm/SupportVISC/VISCUtils.h"
+#include "SupportVISC/VISCHint.h"
+#include "SupportVISC/VISCUtils.h"
 
 using namespace llvm;
 
diff --git a/llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp b/llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp
index 37f74325a74a04e11fad7352115214565c41a689..7ba4db3ed79d90745499cf156a7daefd7993255f 100644
--- a/llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp
@@ -13,7 +13,7 @@
 #include "llvm/IR/InstIterator.h"
 #include "llvm/Transforms/Utils/ValueMapper.h"
 #include "llvm/Support/Debug.h"
-#include "llvm/BuildDFG/BuildDFG.h"
+#include "BuildDFG/BuildDFG.h"
 
 using namespace llvm;
 using namespace builddfg;
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 3670c2ef5516b6c5787b24da4d9454947224ef1b..abadb75aec32d2f4fcbfe5ca034fa9eea8019765 100644
--- a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
@@ -29,9 +29,9 @@
 #include "llvm/Support/FileSystem.h"
 #include "llvm/IR/Attributes.h"
 #include "llvm-c/Core.h"
-#include "llvm/SupportVISC/VISCTimer.h"
-#include "llvm/SupportVISC/DFG2LLVM.h"
-#include "llvm/SupportVISC/VISCUtils.h"
+#include "SupportVISC/VISCTimer.h"
+#include "SupportVISC/DFG2LLVM.h"
+#include "SupportVISC/VISCUtils.h"
 
 #include "llvm/IR/IRPrintingPasses.h"
 #include "llvm/IR/LegacyPassManager.h"
@@ -999,11 +999,17 @@ void CGT_NVPTX::codeGen(DFLeafNode* N) {
   // Clone the function
   ValueToValueMapTy VMap;
 
-  Twine FName = F->getName();
   F_nvptx = CloneFunction(F, VMap);
-  F_nvptx->setName(FName+"_nvptx");
-//  errs() << "Old Function Name: " << F->getName() << "\n";
-//  errs() << "New Function Name: " << F_nvptx->getName() << "\n";
+  //F_nvptx->setName(FName+"_nvptx");
+
+  Twine FName = F->getName();
+  StringRef fStr = FName.getSingleStringRef();
+  Twine newFName = Twine(fStr, "_nvptx"); 
+  F_nvptx->setName(newFName);
+
+  
+  //  errs() << "Old Function Name: " << F->getName() << "\n";
+  //  errs() << "New Function Name: " << F_nvptx->getName() << "\n";
 
   F_nvptx->removeFromParent();
 
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 b693bd0be4ce326c92ba3ec1f0251f6ad3d8138e..1d3a49b72a4c9b09e33da8c8b911da4bc3ae03ef 100644
--- a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
@@ -19,7 +19,7 @@
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Constant.h"
-#include "llvm/SupportVISC/DFG2LLVM.h"
+#include "SupportVISC/DFG2LLVM.h"
 
 using namespace llvm;
 using namespace builddfg;
diff --git a/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp b/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
index faab312087eade9f5d1e622555de270260f3259d..89d92f8083d137f6c71f8294e77b6f92fd9bcaa6 100644
--- a/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
+++ b/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
@@ -8,7 +8,7 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "genvisc"
-#include "llvm/GenVISC/GenVISC.h"
+#include "GenVISC/GenVISC.h"
 
 #include "llvm/ADT/Statistic.h"
 #include "llvm/IR/CallSite.h"
@@ -17,14 +17,14 @@
 #include "llvm/Support/SourceMgr.h"
 #include "llvm/IRReader/IRReader.h"
 #include "llvm/IR/DerivedTypes.h"
-#include "llvm/SupportVISC/VISCHint.h"
-#include "llvm/SupportVISC/VISCUtils.h"
+#include "SupportVISC/VISCHint.h"
+#include "SupportVISC/VISCUtils.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/Support/Debug.h"
 #include "llvm/Transforms/Utils/ValueMapper.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/Transforms/Utils/Cloning.h"
-#include "llvm/SupportVISC/VISCUtils.h"
+#include "SupportVISC/VISCUtils.h"
 
 
 #define TIMER(X) do { if (VISCTimer) { X; } } while (0)