diff --git a/hpvm/test/hpvm-cava/src/visc.h b/hpvm/test/hpvm-cava/src/visc.h
deleted file mode 100644
index 917aec5a3773657e63655191b7897b9035b6d378..0000000000000000000000000000000000000000
--- a/hpvm/test/hpvm-cava/src/visc.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/***************************************************************************
- *cr
- *cr            (C) Copyright 2010 The Board of Trustees of the
- *cr                        University of Illinois
- *cr                         All Rights Reserved
- *cr
- ***************************************************************************/
-
-#ifndef DEVICE
-#define DEVICE GPU_TARGET
-#endif
-
-#include "../../../../../include/SupportVISC/VISCHint.h"
-
-#ifdef __cplusplus
-extern "C" {
-void __visc__hint(visc::Target);
-// void __visc__wait(void*);
-#else
-void __visc__hint(enum Target);
-// void __visc__wait(unsigned);
-#endif
-
-#ifdef __cplusplus
-// void* __visc__node(...);
-// void* __visc__createNode(...);
-// void* __visc__createNode1D(...);
-// void* __visc__createNode2D(...);
-// void* __visc__createNode3D(...);
-// void __visc__return(...);
-#endif
-
-void *__visc__createNodeND(unsigned, ...);
-void __visc__return(unsigned, ...);
-
-void __visc__attributes(unsigned, ...);
-void __visc__init();
-void __visc__cleanup();
-
-void __visc__bindIn(void *, unsigned, unsigned, unsigned);
-void __visc__bindOut(void *, unsigned, unsigned, unsigned);
-void *__visc__edge(void *, void *, unsigned, unsigned, unsigned, unsigned);
-void __visc__push(void *, void *);
-void *__visc__pop(void *);
-void *__visc__launch(unsigned, ...);
-void __visc__wait(void *);
-
-void *__visc__getNode();
-void *__visc__getParentNode(void *);
-void __visc__barrier();
-void *__visc__malloc(long);
-long __visc__getNodeInstanceID_x(void *);
-long __visc__getNodeInstanceID_y(void *);
-long __visc__getNodeInstanceID_z(void *);
-long __visc__getNumNodeInstances_x(void *);
-long __visc__getNumNodeInstances_y(void *);
-long __visc__getNumNodeInstances_z(void *);
-
-// Atomic
-// signed int
-int __visc__atomic_cmpxchg(int *, int, int);
-int __visc__atomic_add(int *, int);
-int __visc__atomic_sub(int *, int);
-int __visc__atomic_xchg(int *, int);
-int __visc__atomic_inc(int *);
-int __visc__atomic_dec(int *);
-int __visc__atomic_min(int *, int);
-int __visc__atomic_max(int *, int);
-int __visc__atomic_umax(int *, int);
-int __visc__atomic_umin(int *, int);
-int __visc__atomic_and(int *, int);
-int __visc__atomic_or(int *, int);
-int __visc__atomic_xor(int *, int);
-
-// Special Func
-float __visc__floor(float);
-float __visc__rsqrt(float);
-float __visc__sqrt(float);
-float __visc__sin(float);
-float __visc__cos(float);
-// unsigned int
-// unsigned __visc__atomic_cmpxchg(unsigned*, unsigned, unsigned);
-// unsigned __visc__atomic_add(unsigned*, unsigned);
-// unsigned __visc__atomic_sub(unsigned*, unsigned);
-// unsigned __visc__atomic_xchg(unsigned*, unsigned);
-// unsigned __visc__atomic_inc(unsigned*);
-// unsigned __visc__atomic_dec(unsigned*);
-// unsigned __visc__atomic_min(unsigned*, unsigned);
-// unsigned __visc__atomic_max(unsigned*, unsigned);
-// unsigned __visc__atomic_and(unsigned*, unsigned);
-// unsigned __visc__atomic_or(unsigned*, unsigned);
-// unsigned __visc__atomic_xor(unsigned*, unsigned);
-
-#include <unistd.h>
-
-long get_global_id(int);
-long get_group_id(int);
-long get_local_id(int);
-long get_local_size(int);
-
-void llvm_visc_track_mem(void *, size_t);
-void llvm_visc_untrack_mem(void *);
-void llvm_visc_request_mem(void *, size_t);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/hpvm/test/parboil/common/include/visc.h b/hpvm/test/include/visc.h
similarity index 59%
rename from hpvm/test/parboil/common/include/visc.h
rename to hpvm/test/include/visc.h
index 6edc07a0a39353566d2b8edb72a2a39a83dba288..18b29500261362be66ea23feecf9a5f85ac68005 100644
--- a/hpvm/test/parboil/common/include/visc.h
+++ b/hpvm/test/include/visc.h
@@ -10,7 +10,11 @@
 #define DEVICE GPU_TARGET
 #endif
 
-#include "../../../../include/SupportVISC/VISCHint.h"
+#include "../../include/SupportVISC/VISCHint.h"
+
+#ifndef __cplusplus
+#define noexcept
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -19,14 +23,6 @@ void __visc__hint(visc::Target) noexcept;
 void __visc__hint(enum Target) noexcept;
 #endif
 
-#ifdef __cplusplus
-void *__visc__node(...) noexcept;
-// void* __visc__createNode(...) noexcept;
-// void* __visc__createNode1D(...) noexcept;
-// void* __visc__createNode2D(...) noexcept;
-// void* __visc__createNode3D(...) noexcept;
-// void __visc__return(...) noexcept;
-#endif
 void *__visc__createNodeND(unsigned, ...) noexcept;
 void __visc__return(unsigned, ...) noexcept;
 
@@ -38,6 +34,7 @@ void __visc__bindIn(void *, unsigned, unsigned, unsigned) noexcept;
 void __visc__bindOut(void *, unsigned, unsigned, unsigned) noexcept;
 void *__visc__edge(void *, void *, unsigned, unsigned, unsigned,
                    unsigned) noexcept;
+
 void __visc__push(void *, void *) noexcept;
 void *__visc__pop(void *) noexcept;
 void *__visc__launch(unsigned, ...) noexcept;
@@ -56,7 +53,6 @@ long __visc__getNumNodeInstances_z(void *) noexcept;
 
 // Atomic
 // signed int
-int __visc__atomic_cmpxchg(int *, int, int) noexcept;
 int __visc__atomic_add(int *, int) noexcept;
 int __visc__atomic_sub(int *, int) noexcept;
 int __visc__atomic_xchg(int *, int) noexcept;
@@ -64,38 +60,10 @@ int __visc__atomic_inc(int *) noexcept;
 int __visc__atomic_dec(int *) noexcept;
 int __visc__atomic_min(int *, int) noexcept;
 int __visc__atomic_max(int *, int) noexcept;
-int __visc__atomic_umax(int *, int) noexcept;
-int __visc__atomic_umin(int *, int) noexcept;
 int __visc__atomic_and(int *, int) noexcept;
 int __visc__atomic_or(int *, int) noexcept;
 int __visc__atomic_xor(int *, int) noexcept;
 
-// Special Func
-float __visc__floor(float) noexcept;
-float __visc__rsqrt(float) noexcept;
-float __visc__sqrt(float) noexcept;
-float __visc__sin(float) noexcept;
-float __visc__cos(float) noexcept;
-// unsigned int
-// unsigned __visc__atomic_cmpxchg(unsigned*, unsigned, unsigned) noexcept;
-// unsigned __visc__atomic_add(unsigned*, unsigned) noexcept;
-// unsigned __visc__atomic_sub(unsigned*, unsigned) noexcept;
-// unsigned __visc__atomic_xchg(unsigned*, unsigned) noexcept;
-// unsigned __visc__atomic_inc(unsigned*) noexcept;
-// unsigned __visc__atomic_dec(unsigned*) noexcept;
-// unsigned __visc__atomic_min(unsigned*, unsigned) noexcept;
-// unsigned __visc__atomic_max(unsigned*, unsigned) noexcept;
-// unsigned __visc__atomic_and(unsigned*, unsigned) noexcept;
-// unsigned __visc__atomic_or(unsigned*, unsigned) noexcept;
-// unsigned __visc__atomic_xor(unsigned*, unsigned) noexcept;
-
-#include <unistd.h>
-
-long get_global_id(int) noexcept;
-long get_group_id(int) noexcept;
-long get_local_id(int) noexcept;
-long get_local_size(int) noexcept;
-
 void llvm_visc_track_mem(void *, size_t) noexcept;
 void llvm_visc_untrack_mem(void *) noexcept;
 void llvm_visc_request_mem(void *, size_t) noexcept;
diff --git a/hpvm/test/pipeline/src/visc.h b/hpvm/test/pipeline/src/visc.h
deleted file mode 100644
index 917aec5a3773657e63655191b7897b9035b6d378..0000000000000000000000000000000000000000
--- a/hpvm/test/pipeline/src/visc.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/***************************************************************************
- *cr
- *cr            (C) Copyright 2010 The Board of Trustees of the
- *cr                        University of Illinois
- *cr                         All Rights Reserved
- *cr
- ***************************************************************************/
-
-#ifndef DEVICE
-#define DEVICE GPU_TARGET
-#endif
-
-#include "../../../../../include/SupportVISC/VISCHint.h"
-
-#ifdef __cplusplus
-extern "C" {
-void __visc__hint(visc::Target);
-// void __visc__wait(void*);
-#else
-void __visc__hint(enum Target);
-// void __visc__wait(unsigned);
-#endif
-
-#ifdef __cplusplus
-// void* __visc__node(...);
-// void* __visc__createNode(...);
-// void* __visc__createNode1D(...);
-// void* __visc__createNode2D(...);
-// void* __visc__createNode3D(...);
-// void __visc__return(...);
-#endif
-
-void *__visc__createNodeND(unsigned, ...);
-void __visc__return(unsigned, ...);
-
-void __visc__attributes(unsigned, ...);
-void __visc__init();
-void __visc__cleanup();
-
-void __visc__bindIn(void *, unsigned, unsigned, unsigned);
-void __visc__bindOut(void *, unsigned, unsigned, unsigned);
-void *__visc__edge(void *, void *, unsigned, unsigned, unsigned, unsigned);
-void __visc__push(void *, void *);
-void *__visc__pop(void *);
-void *__visc__launch(unsigned, ...);
-void __visc__wait(void *);
-
-void *__visc__getNode();
-void *__visc__getParentNode(void *);
-void __visc__barrier();
-void *__visc__malloc(long);
-long __visc__getNodeInstanceID_x(void *);
-long __visc__getNodeInstanceID_y(void *);
-long __visc__getNodeInstanceID_z(void *);
-long __visc__getNumNodeInstances_x(void *);
-long __visc__getNumNodeInstances_y(void *);
-long __visc__getNumNodeInstances_z(void *);
-
-// Atomic
-// signed int
-int __visc__atomic_cmpxchg(int *, int, int);
-int __visc__atomic_add(int *, int);
-int __visc__atomic_sub(int *, int);
-int __visc__atomic_xchg(int *, int);
-int __visc__atomic_inc(int *);
-int __visc__atomic_dec(int *);
-int __visc__atomic_min(int *, int);
-int __visc__atomic_max(int *, int);
-int __visc__atomic_umax(int *, int);
-int __visc__atomic_umin(int *, int);
-int __visc__atomic_and(int *, int);
-int __visc__atomic_or(int *, int);
-int __visc__atomic_xor(int *, int);
-
-// Special Func
-float __visc__floor(float);
-float __visc__rsqrt(float);
-float __visc__sqrt(float);
-float __visc__sin(float);
-float __visc__cos(float);
-// unsigned int
-// unsigned __visc__atomic_cmpxchg(unsigned*, unsigned, unsigned);
-// unsigned __visc__atomic_add(unsigned*, unsigned);
-// unsigned __visc__atomic_sub(unsigned*, unsigned);
-// unsigned __visc__atomic_xchg(unsigned*, unsigned);
-// unsigned __visc__atomic_inc(unsigned*);
-// unsigned __visc__atomic_dec(unsigned*);
-// unsigned __visc__atomic_min(unsigned*, unsigned);
-// unsigned __visc__atomic_max(unsigned*, unsigned);
-// unsigned __visc__atomic_and(unsigned*, unsigned);
-// unsigned __visc__atomic_or(unsigned*, unsigned);
-// unsigned __visc__atomic_xor(unsigned*, unsigned);
-
-#include <unistd.h>
-
-long get_global_id(int);
-long get_group_id(int);
-long get_local_id(int);
-long get_local_size(int);
-
-void llvm_visc_track_mem(void *, size_t);
-void llvm_visc_untrack_mem(void *);
-void llvm_visc_request_mem(void *, size_t);
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/hpvm/test/unitTests/visc.h b/hpvm/test/unitTests/visc.h
deleted file mode 100644
index 0b52345b59f7d30e5e00a4dc4102f024444af47c..0000000000000000000000000000000000000000
--- a/hpvm/test/unitTests/visc.h
+++ /dev/null
@@ -1,104 +0,0 @@
-/***************************************************************************
- *cr
- *cr            (C) Copyright 2010 The Board of Trustees of the
- *cr                        University of Illinois
- *cr                         All Rights Reserved
- *cr
- ***************************************************************************/
-
-#ifndef DEVICE
-#define DEVICE GPU_TARGET
-#endif
-
-#include "../../include/SupportVISC/VISCHint.h"
-
-#ifdef __cplusplus
-extern "C" {
-void __visc__hint(visc::Target);
-#else
-void __visc__hint(enum Target);
-#endif
-
-#ifdef __cplusplus
-void *__visc__node(...);
-// void* __visc__createNode(...);
-// void* __visc__createNode1D(...);
-// void* __visc__createNode2D(...);
-// void* __visc__createNode3D(...);
-// void __visc__return(...);
-#endif
-void *__visc__createNodeND(unsigned, ...);
-void __visc__return(unsigned, ...);
-
-void __visc__attributes(unsigned, ...);
-void __visc__init();
-void __visc__cleanup();
-
-void __visc__bindIn(void *, unsigned, unsigned, unsigned);
-void __visc__bindOut(void *, unsigned, unsigned, unsigned);
-void *__visc__edge(void *, void *, unsigned, unsigned, unsigned, unsigned);
-void __visc__push(void *, void *);
-void *__visc__pop(void *);
-void *__visc__launch(unsigned, ...);
-void __visc__wait(void *);
-
-void *__visc__getNode();
-void *__visc__getParentNode(void *);
-void __visc__barrier();
-void *__visc__malloc(long);
-long __visc__getNodeInstanceID_x(void *);
-long __visc__getNodeInstanceID_y(void *);
-long __visc__getNodeInstanceID_z(void *);
-long __visc__getNumNodeInstances_x(void *);
-long __visc__getNumNodeInstances_y(void *);
-long __visc__getNumNodeInstances_z(void *);
-
-// Atomic
-// signed int
-int __visc__atomic_cmpxchg(int *, int, int);
-int __visc__atomic_add(int *, int);
-int __visc__atomic_sub(int *, int);
-int __visc__atomic_xchg(int *, int);
-int __visc__atomic_inc(int *);
-int __visc__atomic_dec(int *);
-int __visc__atomic_min(int *, int);
-int __visc__atomic_max(int *, int);
-int __visc__atomic_umax(int *, int);
-int __visc__atomic_umin(int *, int);
-int __visc__atomic_and(int *, int);
-int __visc__atomic_or(int *, int);
-int __visc__atomic_xor(int *, int);
-
-// Special Func
-float __visc__floor(float);
-float __visc__rsqrt(float);
-float __visc__sqrt(float);
-float __visc__sin(float);
-float __visc__cos(float);
-// unsigned int
-// unsigned __visc__atomic_cmpxchg(unsigned*, unsigned, unsigned);
-// unsigned __visc__atomic_add(unsigned*, unsigned);
-// unsigned __visc__atomic_sub(unsigned*, unsigned);
-// unsigned __visc__atomic_xchg(unsigned*, unsigned);
-// unsigned __visc__atomic_inc(unsigned*);
-// unsigned __visc__atomic_dec(unsigned*);
-// unsigned __visc__atomic_min(unsigned*, unsigned);
-// unsigned __visc__atomic_max(unsigned*, unsigned);
-// unsigned __visc__atomic_and(unsigned*, unsigned);
-// unsigned __visc__atomic_or(unsigned*, unsigned);
-// unsigned __visc__atomic_xor(unsigned*, unsigned);
-
-#include <unistd.h>
-
-long get_global_id(int);
-long get_group_id(int);
-long get_local_id(int);
-long get_local_size(int);
-
-void llvm_visc_track_mem(void *, size_t);
-void llvm_visc_untrack_mem(void *);
-void llvm_visc_request_mem(void *, size_t);
-
-#ifdef __cplusplus
-}
-#endif