diff --git a/hipamd/api/hip/fixme.cpp b/hipamd/api/hip/fixme.cpp
index 5d7f8144f7..95880cd630 100644
--- a/hipamd/api/hip/fixme.cpp
+++ b/hipamd/api/hip/fixme.cpp
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
-#include "cl_common.hpp"
+#include "vdi_common.hpp"
 #include <icd/loader/icd_dispatch.h>
 
 KHRicdVendorDispatch amd::ICDDispatchedObject::icdVendorDispatch_[] = {0};
diff --git a/hipamd/api/hip/hip_internal.hpp b/hipamd/api/hip/hip_internal.hpp
index 7e1b5e941c..dd6639488f 100644
--- a/hipamd/api/hip/hip_internal.hpp
+++ b/hipamd/api/hip/hip_internal.hpp
@@ -23,7 +23,7 @@ THE SOFTWARE.
 #ifndef HIP_SRC_HIP_INTERNAL_H
 #define HIP_SRC_HIP_INTERNAL_H
 
-#include "cl_common.hpp"
+#include "vdi_common.hpp"
 #include "hip_prof_api.h"
 #include "trace_helper.h"
 #include "utils/debug.hpp"
@@ -34,7 +34,6 @@ THE SOFTWARE.
 #include <iterator>
 
 
-
 /*! IHIP IPC MEMORY Structure */
 #define IHIP_IPC_MEM_HANDLE_SIZE   32
 #define IHIP_IPC_MEM_RESERVED_SIZE LP64_SWITCH(28,24)
@@ -55,7 +54,7 @@ typedef struct ihipIpcMemHandle_st {
 #define HIP_INIT_API(cid, ...)                               \
   ClPrint(amd::LOG_INFO, amd::LOG_API, "[%zx] %s ( %s )", std::this_thread::get_id(), __func__, ToString( __VA_ARGS__ ).c_str()); \
   amd::Thread* thread = amd::Thread::current();              \
-  if (!CL_CHECK_THREAD(thread)) {                            \
+  if (!VDI_CHECK_THREAD(thread)) {                           \
     HIP_RETURN(hipErrorOutOfMemory);                         \
   }                                                          \
   HIP_INIT()                                                 \
diff --git a/hipamd/api/hip/hiprtc_internal.hpp b/hipamd/api/hip/hiprtc_internal.hpp
index e97ac9eb09..5f1838ffac 100644
--- a/hipamd/api/hip/hiprtc_internal.hpp
+++ b/hipamd/api/hip/hiprtc_internal.hpp
@@ -29,8 +29,8 @@ THE SOFTWARE.
 #define HIPRTC_INIT_API(...)                                 \
   ClPrint(amd::LOG_INFO, amd::LOG_API, "[%zx] %s ( %s )", std::this_thread::get_id(), __func__, ToString( __VA_ARGS__ ).c_str()); \
   amd::Thread* thread = amd::Thread::current();              \
-  if (!CL_CHECK_THREAD(thread)) {                            \
-    HIPRTC_RETURN(HIPRTC_ERROR_INTERNAL_ERROR);               \
+  if (!VDI_CHECK_THREAD(thread)) {                           \
+    HIPRTC_RETURN(HIPRTC_ERROR_INTERNAL_ERROR);              \
   }                                                          \
   HIP_INIT();