diff --git a/projects/roctracer/build.sh b/projects/roctracer/build.sh
index 5bfb5de34f..a8515b69d4 100755
--- a/projects/roctracer/build.sh
+++ b/projects/roctracer/build.sh
@@ -22,7 +22,8 @@ if [ -z "$BUILD_TYPE" ] ; then BUILD_TYPE="release"; fi
 if [ -z "$PACKAGE_ROOT" ] ; then PACKAGE_ROOT=$ROCM_PATH; fi
 if [ -z "$PACKAGE_PREFIX" ] ; then PACKAGE_PREFIX="$ROCM_PATH/$COMPONENT"; fi
 if [ -z "$PREFIX_PATH" ] ; then PREFIX_PATH=$PACKAGE_ROOT; fi
-if [ -n "$HIP_VDI" ] ; then HIP_VDI_OPT="-DHIP_VDI=1"; fi
+if [ -z "$HIP_VDI" ] ; then HIP_VDI=0; fi
+if [ -z "$HIP_API_STRING" ] ; then HIP_API_STRING=1; fi
 if [ -n "$ROCM_RPATH" ] ; then LD_RUNPATH_FLAG=" -Wl,--enable-new-dtags -Wl,--rpath,${ROCM_RPATH}"; fi
 
 ROCTRACER_ROOT=$(cd $ROCTRACER_ROOT && echo $PWD)
@@ -39,8 +40,10 @@ cmake \
     -DCPACK_PACKAGING_INSTALL_PREFIX=$PACKAGE_PREFIX \
     -DCPACK_GENERATOR="DEB;RPM" \
     -DCMAKE_SHARED_LINKER_FLAGS="$LD_RUNPATH_FLAG" \
-    $HIP_VDI_OPT \
+    -DHIP_VDI="$HIP_VDI" \
+    -DHIP_API_STRING="$HIP_API_STRING" \
     $ROCTRACER_ROOT
+
 make
 make mytest
 make package
diff --git a/projects/roctracer/cmake_modules/env.cmake b/projects/roctracer/cmake_modules/env.cmake
index 87cead11fb..d95285575c 100644
--- a/projects/roctracer/cmake_modules/env.cmake
+++ b/projects/roctracer/cmake_modules/env.cmake
@@ -35,7 +35,7 @@ add_definitions ( -DAMD_INTERNAL_BUILD )
 add_definitions ( -DLITTLEENDIAN_CPU=1 )
 add_definitions ( -DHSA_LARGE_MODEL= )
 add_definitions ( -DHSA_DEPRECATED= )
-add_definitions ( -D__HIP_PLATFORM_HCC__ )
+add_definitions ( -D__HIP_PLATFORM_HCC__=1 )
 
 ## Linux Compiler options
 set ( CMAKE_CXX_FLAGS "-std=c++11")
@@ -66,7 +66,7 @@ if ( DEFINED ENV{CMAKE_DEBUG_TRACE} )
 endif()
 
 if ( NOT DEFINED HIP_API_STRING )
-  set ( HIP_API_STRING 0 )
+  set ( HIP_API_STRING 1 )
 endif()
 add_definitions ( -DHIP_PROF_HIP_API_STRING=${HIP_API_STRING} )
 
@@ -76,7 +76,8 @@ if ( NOT DEFINED HIP_VDI )
 endif()
 add_definitions ( -DHIP_VDI=${HIP_VDI} )
 if ( "${HIP_VDI}" STREQUAL "1" )
-  set ( HIP_DEFINES "-D__HIP_ROCclr__=1" )
+  add_definitions ( -D__HIP_ROCclr__=1 )
+  set ( HIP_DEFINES "-D__HIP_PLATFORM_HCC__=1 -D__HIP_ROCclr__=1" )
 else()
   set ( HIP_DEFINES "-D__HIP_PLATFORM_HCC__=1")
 endif()