diff --git a/hipamd/src/hip_context.cpp b/hipamd/src/hip_context.cpp
index 784805c277..b68fd60b31 100644
--- a/hipamd/src/hip_context.cpp
+++ b/hipamd/src/hip_context.cpp
@@ -22,8 +22,8 @@
 #include "hip_internal.hpp"
 #include "hip_platform.hpp"
 #include "platform/runtime.hpp"
-#include "utils/flags.hpp"
-#include "utils/versions.hpp"
+#include "rocclr/utils/flags.hpp"
+#include "rocclr/utils/versions.hpp"
 
 namespace hip {
 std::once_flag g_ihipInitialized;
diff --git a/hipamd/src/hip_hcc.rc b/hipamd/src/hip_hcc.rc
index 009dc30c18..1074e66de5 100644
--- a/hipamd/src/hip_hcc.rc
+++ b/hipamd/src/hip_hcc.rc
@@ -17,7 +17,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winresrc.h"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/hipamd/src/hip_hcc_in.rc.in b/hipamd/src/hip_hcc_in.rc.in
index a981d9d1ab..a0e2877bab 100755
--- a/hipamd/src/hip_hcc_in.rc.in
+++ b/hipamd/src/hip_hcc_in.rc.in
@@ -19,7 +19,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winresrc.h"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/hipamd/src/hip_internal.hpp b/hipamd/src/hip_internal.hpp
index a445bb77ad..bcbc36e87b 100644
--- a/hipamd/src/hip_internal.hpp
+++ b/hipamd/src/hip_internal.hpp
@@ -24,7 +24,7 @@
 #include "vdi_common.hpp"
 #include "hip_prof_api.h"
 #include "trace_helper.h"
-#include "utils/debug.hpp"
+#include "rocclr/utils/debug.hpp"
 #include "hip_formatting.hpp"
 #include "hip_graph_capture.hpp"
 
diff --git a/hipamd/src/hiprtc/hiprtcComgrHelper.hpp b/hipamd/src/hiprtc/hiprtcComgrHelper.hpp
index 05e1c013d0..31b616cc0f 100644
--- a/hipamd/src/hiprtc/hiprtcComgrHelper.hpp
+++ b/hipamd/src/hiprtc/hiprtcComgrHelper.hpp
@@ -26,7 +26,7 @@ THE SOFTWARE.
 #include <string>
 
 #include "vdi_common.hpp"
-#include "utils/debug.hpp"
+#include "rocclr/utils/debug.hpp"
 #include "device/comgrctx.hpp"
 
 namespace hiprtc {
diff --git a/hipamd/src/hiprtc/hiprtcInternal.cpp b/hipamd/src/hiprtc/hiprtcInternal.cpp
index b799b98774..544f7bb6db 100644
--- a/hipamd/src/hiprtc/hiprtcInternal.cpp
+++ b/hipamd/src/hiprtc/hiprtcInternal.cpp
@@ -29,7 +29,7 @@ THE SOFTWARE.
 #include <sys/stat.h>
 
 #include "vdi_common.hpp"
-#include "utils/flags.hpp"
+#include "rocclr/utils/flags.hpp"
 
 namespace hiprtc {
 using namespace helpers;
diff --git a/hipamd/src/hiprtc/hiprtcInternal.hpp b/hipamd/src/hiprtc/hiprtcInternal.hpp
index ff60746e7b..ed754d85d2 100644
--- a/hipamd/src/hiprtc/hiprtcInternal.hpp
+++ b/hipamd/src/hiprtc/hiprtcInternal.hpp
@@ -33,9 +33,9 @@ THE SOFTWARE.
 #include <string>
 
 #include "top.hpp"
-#include "utils/debug.hpp"
-#include "utils/flags.hpp"
-#include "utils/macros.hpp"
+#include "rocclr/utils/debug.hpp"
+#include "rocclr/utils/flags.hpp"
+#include "rocclr/utils/macros.hpp"
 
 #ifdef __HIP_ENABLE_RTC
 extern "C" {
diff --git a/opencl/amdocl/amdocl.rc b/opencl/amdocl/amdocl.rc
index 1793116e1a..244001e4c0 100644
--- a/opencl/amdocl/amdocl.rc
+++ b/opencl/amdocl/amdocl.rc
@@ -17,7 +17,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winresrc.h"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/opencl/amdocl/amdocl.rc.in b/opencl/amdocl/amdocl.rc.in
index 1c51afd4b1..2a7d8280f6 100644
--- a/opencl/amdocl/amdocl.rc.in
+++ b/opencl/amdocl/amdocl.rc.in
@@ -17,7 +17,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "winresrc.h"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
diff --git a/opencl/amdocl/cl_device.cpp b/opencl/amdocl/cl_device.cpp
index ad9efad2c6..a68dbe16a6 100644
--- a/opencl/amdocl/cl_device.cpp
+++ b/opencl/amdocl/cl_device.cpp
@@ -22,7 +22,7 @@
 #include "vdi_common.hpp"
 #include "device/device.hpp"
 #include "platform/runtime.hpp"
-#include "utils/versions.hpp"
+#include "rocclr/utils/versions.hpp"
 #include "os/os.hpp"
 #include "cl_semaphore_amd.h"
 
diff --git a/rocclr/cmake/ROCclr.cmake b/rocclr/cmake/ROCclr.cmake
index 3f233b72ff..c6ea53ba74 100644
--- a/rocclr/cmake/ROCclr.cmake
+++ b/rocclr/cmake/ROCclr.cmake
@@ -116,6 +116,7 @@ target_compile_definitions(rocclr PUBLIC
   ${AMD_OPENCL_DEFS})
 
 target_include_directories(rocclr PUBLIC
+  ${ROCCLR_SRC_DIR}/../
   ${ROCCLR_SRC_DIR}
   ${ROCCLR_SRC_DIR}/compiler/lib
   ${ROCCLR_SRC_DIR}/compiler/lib/include