diff --git a/rocclr/runtime/device/rocm/CMakeLists.txt b/rocclr/runtime/device/rocm/CMakeLists.txt
index 5870b6540f..a7628cf575 100644
--- a/rocclr/runtime/device/rocm/CMakeLists.txt
+++ b/rocclr/runtime/device/rocm/CMakeLists.txt
@@ -26,6 +26,7 @@ add_library(oclrocm OBJECT
   rocappprofile.cpp
   rocsettings.cpp
   rocschedcl.cpp
+  rochostcall.cpp
 )
 set_target_properties(oclrocm PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
diff --git a/rocclr/runtime/device/rocm/rochostcall.cpp b/rocclr/runtime/device/rocm/rochostcall.cpp
index e3f725b794..d9245a03f5 100644
--- a/rocclr/runtime/device/rocm/rochostcall.cpp
+++ b/rocclr/runtime/device/rocm/rochostcall.cpp
@@ -2,15 +2,14 @@
 // Copyright (c) 2019 Advanced Micro Devices, Inc. All rights reserved.
 //
 
-#include "runtime/utils/debug.hpp"
-#include "runtime/top.hpp"
-#include "runtime/utils/flags.hpp"
-
-#include "rochostcall.hpp"
-
+#include "top.hpp"
 #include "os/os.hpp"
 #include "thread/monitor.hpp"
 #include "utils/util.hpp"
+#include "utils/debug.hpp"
+#include "utils/flags.hpp"
+
+#include "rochostcall.hpp"
 
 #include <hsa.h>