diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b25a21394..b3daa69aa6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,9 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
+set(HIPIFY_STANDLONE 1)
+add_subdirectory(clang-hipify)
+
 if(NOT DEFINED HCC_HOME)
     if(NOT DEFINED ENV{HCC_HOME})
         set(HCC_HOME "/opt/hcc" CACHE PATH "Path to which HCC has been installed")
@@ -55,14 +58,7 @@ set(CMAKE_CXX_FLAGS " -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -stdlib=li
 set(CMAKE_C_FLAGS   " -hc -I${HCC_HOME}/include -I${HSA_PATH}/include -stdlib=libc++ ")
 
 set(SOURCE_FILES src/device_util.cpp
-src/hip_hcc.cpp 
-src/hip_device.cpp
-src/hip_error.cpp
-src/hip_event.cpp
-src/hip_memory.cpp
-src/hip_peer.cpp
-src/hip_stream.cpp
-src/staging_buffer.cpp)
+)
 
 if(NOT DEFINED ENV{HIP_USE_SHARED_LIBRARY})
     set(HIP_USE_SHARED_LIBRARY 0)