diff --git a/hipamd/api/hip/hip_internal.hpp b/hipamd/api/hip/hip_internal.hpp
index 1b422afd3d..fcd40c0ace 100644
--- a/hipamd/api/hip/hip_internal.hpp
+++ b/hipamd/api/hip/hip_internal.hpp
@@ -30,6 +30,9 @@ THE SOFTWARE.
 #include <thread>
 #include <stack>
 #include <mutex>
+#include <iterator>
+
+
 
 /*! IHIP IPC MEMORY Structure */
 #define IHIP_IPC_MEM_HANDLE_SIZE   32
diff --git a/hipamd/api/hip/hip_rtc.cpp b/hipamd/api/hip/hip_rtc.cpp
index 042dea0ab2..9cf3060418 100644
--- a/hipamd/api/hip/hip_rtc.cpp
+++ b/hipamd/api/hip/hip_rtc.cpp
@@ -25,13 +25,6 @@ THE SOFTWARE.
 #include <hip/hiprtc.h>
 #include "platform/program.hpp"
 #include <algorithm>
-#include <iterator>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
 
 namespace hiprtc {
 thread_local hiprtcResult g_lastRtcError = HIPRTC_SUCCESS;