diff --git a/rocclr/device/devhcprintf.cpp b/rocclr/device/devhcprintf.cpp
index a5aba4a41..839cf8190 100644
--- a/rocclr/device/devhcprintf.cpp
+++ b/rocclr/device/devhcprintf.cpp
@@ -27,6 +27,7 @@
 #include <cstdio>
 #include <cstring>
 #include <string>
+#include <cstdint>
 
 static void checkPrintf(FILE* stream, int* outCount, const char* fmt, ...) {
   va_list args;
diff --git a/rocclr/device/rocm/rocblit.hpp b/rocclr/device/rocm/rocblit.hpp
index 545e205b3..879abf11a 100644
--- a/rocclr/device/rocm/rocblit.hpp
+++ b/rocclr/device/rocm/rocblit.hpp
@@ -291,13 +291,13 @@ class KernelBlitManager : public DmaBlitManager {
     StreamOpsWait,
     Scheduler,
     GwsInit,
+    InitHeap,
     BlitLinearTotal,
     FillImage = BlitLinearTotal,
     BlitCopyImage,
     BlitCopyImage1DA,
     BlitCopyImageToBuffer,
     BlitCopyBufferToImage,
-    InitHeap,
     BlitTotal
   };
 
@@ -596,9 +596,9 @@ static const char* BlitName[KernelBlitManager::BlitTotal] = {
   "__amd_rocclr_fillBufferAligned", "__amd_rocclr_fillBufferAligned2D", "__amd_rocclr_copyBuffer",
   "__amd_rocclr_copyBufferAligned", "__amd_rocclr_copyBufferRect",
   "__amd_rocclr_copyBufferRectAligned", "__amd_rocclr_streamOpsWrite", "__amd_rocclr_streamOpsWait",
-  "__amd_rocclr_scheduler", "__amd_rocclr_gwsInit", "__amd_rocclr_fillImage",
+  "__amd_rocclr_scheduler", "__amd_rocclr_gwsInit", "__amd_rocclr_initHeap", "__amd_rocclr_fillImage",
   "__amd_rocclr_copyImage", "__amd_rocclr_copyImage1DA", "__amd_rocclr_copyImageToBuffer",
-  "__amd_rocclr_copyBufferToImage", "__amd_rocclr_initHeap"
+  "__amd_rocclr_copyBufferToImage"
 };
 
 inline void KernelBlitManager::setArgument(amd::Kernel* kernel, size_t index,