diff --git a/rocclr/device/gpu/gpuprogram.hpp b/rocclr/device/gpu/gpuprogram.hpp
index f78eec7e89..f4924d656c 100644
--- a/rocclr/device/gpu/gpuprogram.hpp
+++ b/rocclr/device/gpu/gpuprogram.hpp
@@ -470,11 +470,6 @@ class HSAILProgram : public device::Program {
 
   const std::vector<Memory*>& globalStores() const { return globalStores_; }
 
-  //! Return a typecasted GPU null device.
-  gpu::NullDevice& gpuNullDevice() {
-    return const_cast<gpu::NullDevice&>(static_cast<const gpu::NullDevice&>(device()));
-  }
-
   //! Return a typecasted GPU device. The device must not be the NullDevice.
   gpu::Device& gpuDevice() {
     assert(!isNull());
@@ -519,6 +514,11 @@ class HSAILProgram : public device::Program {
   //! Allocate kernel table
   bool allocKernelTable();
 
+  //! Return a typecasted GPU null device.
+  gpu::NullDevice& gpuNullDevice() {
+    return const_cast<gpu::NullDevice&>(static_cast<const gpu::NullDevice&>(device()));
+  }
+
   void* rawBinary_;                    //!< Pointer to the raw binary
   std::vector<Memory*> globalStores_;  //!< Global memory for the program
   Memory* kernels_;                    //!< Table with kernel object pointers