diff --git a/rocclr/CMakeLists.txt b/rocclr/CMakeLists.txt
index 274d0c2bc7..455a3bfd98 100644
--- a/rocclr/CMakeLists.txt
+++ b/rocclr/CMakeLists.txt
@@ -139,6 +139,8 @@ set(oclruntime_src
   device/devkernel.cpp
   device/devwavelimiter.cpp
   device/devprogram.cpp
+  device/devhcprintf.cpp
+  device/devhcmessages.cpp
   platform/activity.cpp
   platform/kernel.cpp
   platform/context.cpp
diff --git a/rocclr/device/rocm/rochcmessages.cpp b/rocclr/device/devhcmessages.cpp
similarity index 98%
rename from rocclr/device/rocm/rochcmessages.cpp
rename to rocclr/device/devhcmessages.cpp
index c65f0bb8b8..7b57c0a2f5 100644
--- a/rocclr/device/rocm/rochcmessages.cpp
+++ b/rocclr/device/devhcmessages.cpp
@@ -22,7 +22,7 @@
 #include "top.hpp"
 #include "utils/flags.hpp"
 
-#include "rochcmessages.hpp"
+#include "devhcmessages.hpp"
 
 #include <vector>
 
@@ -132,7 +132,7 @@ void MessageHandler::discardMessage(Message* message) {
   // some busy-ness heuristic.
 }
 
-// Defined in rochcprintf.cpp
+// Defined in devhcprintf.cpp
 void handlePrintf(uint64_t* output, const uint64_t* input, uint64_t len);
 
 bool MessageHandler::handlePayload(uint32_t service, uint64_t* payload) {
diff --git a/rocclr/device/rocm/rochcmessages.hpp b/rocclr/device/devhcmessages.hpp
similarity index 100%
rename from rocclr/device/rocm/rochcmessages.hpp
rename to rocclr/device/devhcmessages.hpp
diff --git a/rocclr/device/rocm/rochcprintf.cpp b/rocclr/device/devhcprintf.cpp
similarity index 100%
rename from rocclr/device/rocm/rochcprintf.cpp
rename to rocclr/device/devhcprintf.cpp
diff --git a/rocclr/device/rocm/CMakeLists.txt b/rocclr/device/rocm/CMakeLists.txt
index 3c3301b0f8..35683571e5 100644
--- a/rocclr/device/rocm/CMakeLists.txt
+++ b/rocclr/device/rocm/CMakeLists.txt
@@ -11,8 +11,6 @@ add_library(oclrocm OBJECT
   rocappprofile.cpp
   rocsettings.cpp
   rocschedcl.cpp
-  rochcmessages.cpp
-  rochcprintf.cpp
   rochostcall.cpp
 )
 
diff --git a/rocclr/device/rocm/rochostcall.cpp b/rocclr/device/rocm/rochostcall.cpp
index c8a6493fcb..810a466208 100644
--- a/rocclr/device/rocm/rochostcall.cpp
+++ b/rocclr/device/rocm/rochostcall.cpp
@@ -23,7 +23,7 @@
 #include "utils/flags.hpp"
 
 #include "rochostcall.hpp"
-#include "rochcmessages.hpp"
+#include "device/devhcmessages.hpp"
 
 #include "os/os.hpp"
 #include "thread/monitor.hpp"