diff --git a/rocclr/device/gpu/gpudevice.cpp b/rocclr/device/gpu/gpudevice.cpp
index 35537858b3..96c5a56e3c 100644
--- a/rocclr/device/gpu/gpudevice.cpp
+++ b/rocclr/device/gpu/gpudevice.cpp
@@ -49,15 +49,15 @@
 #endif  // _WIN32
 
 #include "os_if.h"  // for osInit()
+#include "gpudebugmanager.hpp"
 
+#include <algorithm>
+#include <ctype.h>
 #include <cstring>
 #include <fstream>
-#include <sstream>
 #include <iostream>
-#include <ctype.h>
-#include <algorithm>
+#include <sstream>
 
-#include "gpudebugmanager.hpp"
 
 bool DeviceLoad() {
   bool ret = false;
diff --git a/rocclr/device/gpu/gpuprogram.cpp b/rocclr/device/gpu/gpuprogram.cpp
index b35f9e599d..af3616eddf 100644
--- a/rocclr/device/gpu/gpuprogram.cpp
+++ b/rocclr/device/gpu/gpuprogram.cpp
@@ -27,16 +27,17 @@
 #include "device/gpu/gpublit.hpp"
 #include "macrodata.h"
 #include "MDParser/AMDILMDInterface.h"
-#include <fstream>
-#include <sstream>
-#include <cstdio>
-#include <algorithm>
-#include <iterator>
 #include "utils/options.hpp"
 #include "hsa.h"
 #include "hsa_ext_image.h"
 #include "amd_hsa_loader.hpp"
 
+#include <algorithm>
+#include <cstdio>
+#include <fstream>
+#include <iterator>
+#include <sstream>
+
 namespace gpu {
 
 const aclTargetInfo& NullProgram::info(const char* str) {
diff --git a/rocclr/device/pal/paldevice.cpp b/rocclr/device/pal/paldevice.cpp
index 72016d5c58..698f0197bb 100644
--- a/rocclr/device/pal/paldevice.cpp
+++ b/rocclr/device/pal/paldevice.cpp
@@ -47,12 +47,12 @@
 #include "CL/cl_dx9_media_sharing.h"
 #endif  // _WIN32
 
-#include <cstring>
-#include <fstream>
-#include <sstream>
-#include <iostream>
-#include <ctype.h>
 #include <algorithm>
+#include <cstring>
+#include <ctype.h>
+#include <fstream>
+#include <iostream>
+#include <sstream>
 
 bool PalDeviceLoad() {
   bool ret = false;
diff --git a/rocclr/device/pal/palprogram.cpp b/rocclr/device/pal/palprogram.cpp
index 38934c89dd..16e2f678e1 100644
--- a/rocclr/device/pal/palprogram.cpp
+++ b/rocclr/device/pal/palprogram.cpp
@@ -23,16 +23,17 @@
 #include "aclTypes.h"
 #include "device/pal/palprogram.hpp"
 #include "device/pal/palblit.hpp"
-#include <fstream>
-#include <sstream>
-#include <cstdio>
-#include <algorithm>
-#include <iterator>
 #include "utils/options.hpp"
 #include "hsa.h"
 #include "hsa_ext_image.h"
 #include "amd_hsa_loader.hpp"
 
+#include <algorithm>
+#include <cstdio>
+#include <fstream>
+#include <iterator>
+#include <sstream>
+
 namespace pal {
 
 Segment::Segment() : gpuAccess_(nullptr), cpuAccess_(nullptr), cpuMem_(nullptr) {}
diff --git a/rocclr/device/rocm/rocdevice.cpp b/rocclr/device/rocm/rocdevice.cpp
index 59ccf67cac..df452aeb1f 100644
--- a/rocclr/device/rocm/rocdevice.cpp
+++ b/rocclr/device/rocm/rocdevice.cpp
@@ -44,15 +44,15 @@
 #include "platform/sampler.hpp"
 #include "rochostcall.hpp"
 
+#include <algorithm>
 #include <cstring>
 #include <fstream>
-#include <sstream>
 #include <iostream>
-#include <vector>
-#include <algorithm>
 #ifdef ROCCLR_SUPPORT_NUMA_POLICY
 #include <numaif.h>
 #endif // ROCCLR_SUPPORT_NUMA_POLICY
+#include <sstream>
+#include <vector>
 #endif // WITHOUT_HSA_BaCKEND
 
 #define OPENCL_VERSION_STR XSTR(OPENCL_MAJOR) "." XSTR(OPENCL_MINOR)