diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elf_types.hpp b/projects/clr/hipamd/src/elfio/elf_types.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elf_types.hpp
rename to projects/clr/hipamd/src/elfio/elf_types.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio.hpp b/projects/clr/hipamd/src/elfio/elfio.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio.hpp
rename to projects/clr/hipamd/src/elfio/elfio.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_dump.hpp b/projects/clr/hipamd/src/elfio/elfio_dump.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_dump.hpp
rename to projects/clr/hipamd/src/elfio/elfio_dump.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_dynamic.hpp b/projects/clr/hipamd/src/elfio/elfio_dynamic.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_dynamic.hpp
rename to projects/clr/hipamd/src/elfio/elfio_dynamic.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_header.hpp b/projects/clr/hipamd/src/elfio/elfio_header.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_header.hpp
rename to projects/clr/hipamd/src/elfio/elfio_header.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_note.hpp b/projects/clr/hipamd/src/elfio/elfio_note.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_note.hpp
rename to projects/clr/hipamd/src/elfio/elfio_note.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_relocation.hpp b/projects/clr/hipamd/src/elfio/elfio_relocation.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_relocation.hpp
rename to projects/clr/hipamd/src/elfio/elfio_relocation.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_section.hpp b/projects/clr/hipamd/src/elfio/elfio_section.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_section.hpp
rename to projects/clr/hipamd/src/elfio/elfio_section.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_segment.hpp b/projects/clr/hipamd/src/elfio/elfio_segment.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_segment.hpp
rename to projects/clr/hipamd/src/elfio/elfio_segment.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_strings.hpp b/projects/clr/hipamd/src/elfio/elfio_strings.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_strings.hpp
rename to projects/clr/hipamd/src/elfio/elfio_strings.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_symbols.hpp b/projects/clr/hipamd/src/elfio/elfio_symbols.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_symbols.hpp
rename to projects/clr/hipamd/src/elfio/elfio_symbols.hpp
diff --git a/projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_utils.hpp b/projects/clr/hipamd/src/elfio/elfio_utils.hpp
similarity index 100%
rename from projects/clr/hipamd/include/hip/hcc_detail/elfio/elfio_utils.hpp
rename to projects/clr/hipamd/src/elfio/elfio_utils.hpp
diff --git a/projects/clr/hipamd/src/hip_module.cpp b/projects/clr/hipamd/src/hip_module.cpp
index b6bc9d63fd..dee69e7ba0 100644
--- a/projects/clr/hipamd/src/hip_module.cpp
+++ b/projects/clr/hipamd/src/hip_module.cpp
@@ -34,7 +34,7 @@ THE SOFTWARE.
 #include <hsa/hsa_ext_amd.h>
 #include <hsa/amd_hsa_kernel_code.h>
 
-#include "hip/hcc_detail/elfio/elfio.hpp"
+#include "elfio/elfio.hpp"
 #include "hip/hip_runtime.h"
 #include "hip_hcc_internal.h"
 #include "trace_helper.h"