diff --git a/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/approxhpvm_runtime_utils.h b/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/approxhpvm_runtime_utils.h
index 6bf99a576dcac05f96a1598002f5a12d1705055e..6577d3a9ae833e0d4ac14202e959414df03aac5c 100644
--- a/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/approxhpvm_runtime_utils.h
+++ b/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/approxhpvm_runtime_utils.h
@@ -1,10 +1,10 @@
 
 
-
 #ifndef APPROXHPVM_RUNTIME_UTILS
 #define APPROXHPVM_RUNTIME_UTILS
 
 
+#include "tensor_runtime.h"
 #include "configuration.h"
 #include "hpvm-rt-controller.h"
 
diff --git a/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/half_precision_api.h b/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/half_precision_api.h
index ae5f04be0a1448e69c6947a78badddf48d62b2f4..89e74f3bf8887be12b59bb1e40e3032760cba3de 100644
--- a/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/half_precision_api.h
+++ b/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/half_precision_api.h
@@ -4,6 +4,8 @@
 #define HALF_API_HEADER
 
 
+extern "C"{
+
 void* tensorHalfGemm(void* lhs_ptr, void* rhs_ptr);
 void* tensorHalfGemmGPU(void* lhs_ptr, void* rhs_ptr);
 
@@ -29,6 +31,6 @@ void* tensorHalfTanh(void* input_ptr);
 void* tensorHalfAdd(void* x_ptr, void* bias_ptr);
 
 
-
+}
 
 #endif
diff --git a/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/tensor_runtime.h b/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/tensor_runtime.h
index eb7f85756daf88fde20ffc200fdae6c5a8708fc8..8deddc88264bc4327bec8dad1709eac0d1a40322 100644
--- a/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/tensor_runtime.h
+++ b/llvm/projects/hpvm-tensor-rt/tensor_runtime/include/tensor_runtime.h
@@ -1,5 +1,9 @@
 
 
+#ifndef CUDNN_HEADER
+#define CUDNN_HEADER
+
+
 #include <stdio.h>
 #include <cstdlib>
 #include <cmath>
@@ -11,8 +15,6 @@
 
 #include "img_tensor_runtime.h"
 
-#ifndef CUDNN_HEADER
-#define CUDNN_HEADER
 
 
 extern "C"{
diff --git a/llvm/projects/hpvm-tensor-rt/tensor_runtime/src/wrapper_runtime.cu b/llvm/projects/hpvm-tensor-rt/tensor_runtime/src/wrapper_runtime.cu
index 4846e7cf684c1117663dfaa305d49665ad114f0f..7f8cbbeceeca1c94b4759582509ed793bcf07018 100644
--- a/llvm/projects/hpvm-tensor-rt/tensor_runtime/src/wrapper_runtime.cu
+++ b/llvm/projects/hpvm-tensor-rt/tensor_runtime/src/wrapper_runtime.cu
@@ -17,7 +17,6 @@
 
 
 // Tensor runtime header files
-#include "tensor_runtime.h"
 #include "tensor_utils.h"
 #include "debug.h"
 #include "profiling.h"