diff --git a/rocclr/runtime/device/cpu/cpucommand.cpp b/rocclr/runtime/device/cpu/cpucommand.cpp
index 2ef12af280..e8c3488b8c 100644
--- a/rocclr/runtime/device/cpu/cpucommand.cpp
+++ b/rocclr/runtime/device/cpu/cpucommand.cpp
@@ -17,6 +17,7 @@
 #include "utils/options.hpp"
 
 #include <amdocl/cl_kernel.h>
+#include <algorithm>
 
 namespace cpu {
 
diff --git a/rocclr/runtime/device/cpu/cpudevice.cpp b/rocclr/runtime/device/cpu/cpudevice.cpp
index fe1ee198bd..2e4a575c13 100644
--- a/rocclr/runtime/device/cpu/cpudevice.cpp
+++ b/rocclr/runtime/device/cpu/cpudevice.cpp
@@ -12,6 +12,8 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
+#include <algorithm>
+
 #if defined(__linux__)
 #if !defined(ATI_ARCH_ARM)
 #include <sys/sysinfo.h>
diff --git a/rocclr/runtime/device/cpu/cpumapping.cpp b/rocclr/runtime/device/cpu/cpumapping.cpp
index 1ee5092f24..1d46f355b9 100644
--- a/rocclr/runtime/device/cpu/cpumapping.cpp
+++ b/rocclr/runtime/device/cpu/cpumapping.cpp
@@ -11,6 +11,8 @@
 #include <functional>
 #include <string>
 #include <iostream>
+#include <algorithm>
+
 #if defined(_WIN32)
 #include <windows.h>
 #endif
diff --git a/rocclr/runtime/device/cpu/cpumapping.hpp b/rocclr/runtime/device/cpu/cpumapping.hpp
index 263d22a63e..0ea5d2f350 100644
--- a/rocclr/runtime/device/cpu/cpumapping.hpp
+++ b/rocclr/runtime/device/cpu/cpumapping.hpp
@@ -7,9 +7,6 @@
 #ifndef CPUMAPPING_HPP_
 #define CPUMAPPING_HPP_
 
-using std::min;
-using std::max;
-
 namespace cpu {
 
 class HCtoDCmap
diff --git a/rocclr/runtime/device/cpu/cpuvirtual.cpp b/rocclr/runtime/device/cpu/cpuvirtual.cpp
index c8df4a7806..0f94cbbb24 100644
--- a/rocclr/runtime/device/cpu/cpuvirtual.cpp
+++ b/rocclr/runtime/device/cpu/cpuvirtual.cpp
@@ -11,6 +11,7 @@
 #include "platform/memory.hpp"
 #include "platform/sampler.hpp"
 #include "os/os.hpp"
+#include <algorithm>
 
 namespace cpu {
 
diff --git a/rocclr/runtime/device/device.cpp b/rocclr/runtime/device/device.cpp
index 8829f6c170..ba952f6155 100644
--- a/rocclr/runtime/device/device.cpp
+++ b/rocclr/runtime/device/device.cpp
@@ -42,6 +42,7 @@ extern void DeviceUnload();
 #include <sstream>
 #include <fstream>
 #include <set>
+#include <algorithm>
 
 
 
diff --git a/rocclr/runtime/device/gpu/gpublit.cpp b/rocclr/runtime/device/gpu/gpublit.cpp
index d5116992de..35fe409b65 100644
--- a/rocclr/runtime/device/gpu/gpublit.cpp
+++ b/rocclr/runtime/device/gpu/gpublit.cpp
@@ -8,6 +8,7 @@
 #include "device/gpu/gpumemory.hpp"
 #include "device/gpu/gpuvirtual.hpp"
 #include "utils/debug.hpp"
+#include <algorithm>
 
 namespace gpu {
 
diff --git a/rocclr/runtime/device/gpu/gpudevice.cpp b/rocclr/runtime/device/gpu/gpudevice.cpp
index b48d497bc0..08c5e5c4ae 100644
--- a/rocclr/runtime/device/gpu/gpudevice.cpp
+++ b/rocclr/runtime/device/gpu/gpudevice.cpp
@@ -37,6 +37,7 @@
 #include <sstream>
 #include <iostream>
 #include <ctype.h>
+#include <algorithm>
 
 #include "gpudebugmanager.hpp"
 
diff --git a/rocclr/runtime/device/gpu/gpukernel.cpp b/rocclr/runtime/device/gpu/gpukernel.cpp
index 01b65d18c1..41694e2d8e 100644
--- a/rocclr/runtime/device/gpu/gpukernel.cpp
+++ b/rocclr/runtime/device/gpu/gpukernel.cpp
@@ -20,6 +20,7 @@
 #include <sstream>
 #include <iostream>
 #include <ctime>
+#include <algorithm>
 
 namespace gpu {
 
diff --git a/rocclr/runtime/device/gpu/gpuprintf.cpp b/rocclr/runtime/device/gpu/gpuprintf.cpp
index bcfb17fa32..3cfb87bf72 100644
--- a/rocclr/runtime/device/gpu/gpuprintf.cpp
+++ b/rocclr/runtime/device/gpu/gpuprintf.cpp
@@ -11,6 +11,7 @@
 #include "device/gpu/gpuprogram.hpp"
 #include "device/gpu/gpuprintf.hpp"
 #include <cstdio>
+#include <algorithm>
 #include <math.h>
 
 namespace gpu {
diff --git a/rocclr/runtime/device/gpu/gpuprogram.cpp b/rocclr/runtime/device/gpu/gpuprogram.cpp
index 888bd0afcb..f34b6d6d8e 100644
--- a/rocclr/runtime/device/gpu/gpuprogram.cpp
+++ b/rocclr/runtime/device/gpu/gpuprogram.cpp
@@ -14,6 +14,7 @@
 #include <fstream>
 #include <sstream>
 #include <cstdio>
+#include <algorithm>
 #include "utils/options.hpp"
 #include "hsa.h"
 #include "hsa_ext_image.h"
diff --git a/rocclr/runtime/device/gpu/gpuvirtual.cpp b/rocclr/runtime/device/gpu/gpuvirtual.cpp
index 7002d5c196..1d58a32ec8 100644
--- a/rocclr/runtime/device/gpu/gpuvirtual.cpp
+++ b/rocclr/runtime/device/gpu/gpuvirtual.cpp
@@ -21,6 +21,7 @@
 #include "amd_hsa_queue.h"
 #include <fstream>
 #include <sstream>
+#include <algorithm>
 
 #ifdef _WIN32
 #include <d3d10_1.h>
diff --git a/rocclr/runtime/device/hsa/hsadevice.cpp b/rocclr/runtime/device/hsa/hsadevice.cpp
index 0297f75db6..5525619e1e 100644
--- a/rocclr/runtime/device/hsa/hsadevice.cpp
+++ b/rocclr/runtime/device/hsa/hsadevice.cpp
@@ -44,6 +44,7 @@
 #include <sstream>
 #include <iostream>
 #include <vector>
+#include <algorithm>
 #endif  // WITHOUT_FSA_BACKEND
 
 const HsaCoreApiTable *hsacoreapi = NULL;
diff --git a/rocclr/runtime/device/hsa/hsakernel.cpp b/rocclr/runtime/device/hsa/hsakernel.cpp
index eae1809f54..844d28f646 100644
--- a/rocclr/runtime/device/hsa/hsakernel.cpp
+++ b/rocclr/runtime/device/hsa/hsakernel.cpp
@@ -6,6 +6,8 @@
 
 #include "device/hsa/oclhsa_common.hpp"
 
+#include <algorithm>
+
 #ifndef WITHOUT_FSA_BACKEND
 
 namespace oclhsa {
diff --git a/rocclr/runtime/os/os_posix.cpp b/rocclr/runtime/os/os_posix.cpp
index 9cc5a76d2f..e7b6a9905f 100644
--- a/rocclr/runtime/os/os_posix.cpp
+++ b/rocclr/runtime/os/os_posix.cpp
@@ -41,6 +41,7 @@
 #include <cstdio> // for tempnam
 #include <limits.h>
 #include <memory>
+#include <algorithm>
 
 
 
diff --git a/rocclr/runtime/os/os_win32.cpp b/rocclr/runtime/os/os_win32.cpp
index 8983b6a1d9..bea0efac62 100644
--- a/rocclr/runtime/os/os_win32.cpp
+++ b/rocclr/runtime/os/os_win32.cpp
@@ -17,6 +17,7 @@
 #include <string>
 #include <sstream>
 #include <cstdlib>
+#include <algorithm>
 
 #ifndef WINAPI
 #define WINAPI