diff --git a/rocclr/elf/elfio/elf_types.hpp b/rocclr/elf/elfio/elf_types.hpp
index 7bfe08f086..61d6eba971 100644
--- a/rocclr/elf/elfio/elf_types.hpp
+++ b/rocclr/elf/elfio/elf_types.hpp
@@ -368,108 +368,6 @@ typedef uint64_t Elf64_Off;
 #define ELFOSABI_AROS          15 // Amiga Research OS
 #define ELFOSABI_FENIXOS       16 // The FenixOS highly scalable multi-core OS
 
-#if defined(__HIP_ROCclr__)
-
-//                             64-255 Architecture-specific value range
-#define ELFOSABI_AMDGPU_HSA    64 // AMDGPU OS for HSA compatible compute
-                                  // kernels.
-#define ELFOSABI_AMDGPU_PAL    65 // AMDGPU OS for AMD PAL compatible graphics
-                                  // shaders and compute kernels.
-#define ELFOSABI_AMDGPU_MESA3D 66 // AMDGPU OS for Mesa3D compatible graphics
-                                  // shaders and compute kernels.
-
-#define ELFABIVERSION_AMDGPU_HSA_V2 0
-#define ELFABIVERSION_AMDGPU_HSA_V3 1
-#define ELFABIVERSION_AMDGPU_HSA_V4 2
-
-// AMDGPU specific e_flags
-#define EF_AMDGPU_MACH  0x0ff // AMDGPU processor selection mask.
-//#define EF_AMDGPU_XNACK 0x100 // Indicates if the XNACK target feature is
-                              // enabled for all code contained in the ELF.
-// AMDGPU processors
-#define EF_AMDGPU_MACH_NONE                0x000 // Unspecified processor.
-#define EF_AMDGPU_MACH_R600_R600           0x001
-#define EF_AMDGPU_MACH_R600_R630           0x002
-#define EF_AMDGPU_MACH_R600_RS880          0x003
-#define EF_AMDGPU_MACH_R600_RV670          0x004
-#define EF_AMDGPU_MACH_R600_RV710          0x005
-#define EF_AMDGPU_MACH_R600_RV730          0x006
-#define EF_AMDGPU_MACH_R600_RV770          0x007
-#define EF_AMDGPU_MACH_R600_CEDAR          0x008
-#define EF_AMDGPU_MACH_R600_CYPRESS        0x009
-#define EF_AMDGPU_MACH_R600_JUNIPER        0x00a
-#define EF_AMDGPU_MACH_R600_REDWOOD        0x00b
-#define EF_AMDGPU_MACH_R600_SUMO           0x00c
-#define EF_AMDGPU_MACH_R600_BARTS          0x00d
-#define EF_AMDGPU_MACH_R600_CAICOS         0x00e
-#define EF_AMDGPU_MACH_R600_CAYMAN         0x00f
-#define EF_AMDGPU_MACH_R600_TURKS          0x010
-#define EF_AMDGPU_MACH_R600_RESERVED_FIRST 0x011
-#define EF_AMDGPU_MACH_R600_RESERVED_LAST  0x01f
-#define EF_AMDGPU_MACH_R600_FIRST          EF_AMDGPU_MACH_R600_R600
-#define EF_AMDGPU_MACH_R600_LAST           EF_AMDGPU_MACH_R600_TURKS
-#define EF_AMDGPU_MACH_AMDGCN_GFX600       0x020
-#define EF_AMDGPU_MACH_AMDGCN_GFX601       0x021
-#define EF_AMDGPU_MACH_AMDGCN_GFX700       0x022
-#define EF_AMDGPU_MACH_AMDGCN_GFX701       0x023
-#define EF_AMDGPU_MACH_AMDGCN_GFX702       0x024
-#define EF_AMDGPU_MACH_AMDGCN_GFX703       0x025
-#define EF_AMDGPU_MACH_AMDGCN_GFX704       0x026
-#define EF_AMDGPU_MACH_AMDGCN_RESERVED_0X027 0x027
-#define EF_AMDGPU_MACH_AMDGCN_GFX801       0x028
-#define EF_AMDGPU_MACH_AMDGCN_GFX802       0x029
-#define EF_AMDGPU_MACH_AMDGCN_GFX803       0x02a
-#define EF_AMDGPU_MACH_AMDGCN_GFX810       0x02b
-#define EF_AMDGPU_MACH_AMDGCN_GFX900       0x02c
-#define EF_AMDGPU_MACH_AMDGCN_GFX902       0x02d
-#define EF_AMDGPU_MACH_AMDGCN_GFX904       0x02e
-#define EF_AMDGPU_MACH_AMDGCN_GFX906       0x02f
-#define EF_AMDGPU_MACH_AMDGCN_GFX908       0x030
-#define EF_AMDGPU_MACH_AMDGCN_GFX909       0x031
-#define EF_AMDGPU_MACH_AMDGCN_GFX90C       0x032
-#define EF_AMDGPU_MACH_AMDGCN_GFX1010      0x033
-#define EF_AMDGPU_MACH_AMDGCN_GFX1011      0x034
-#define EF_AMDGPU_MACH_AMDGCN_GFX1012      0x035
-#define EF_AMDGPU_MACH_AMDGCN_GFX1030      0x036
-#define EF_AMDGPU_MACH_AMDGCN_GFX1031      0x037
-#define EF_AMDGPU_MACH_AMDGCN_GFX1032      0x038
-#define EF_AMDGPU_MACH_AMDGCN_GFX1033      0x039
-#define EF_AMDGPU_MACH_AMDGCN_GFX602       0x03a
-#define EF_AMDGPU_MACH_AMDGCN_GFX705       0x03b
-#define EF_AMDGPU_MACH_AMDGCN_GFX805       0x03c
-
-
-#define EF_AMDGPU_MACH_AMDGCN_FIRST        EF_AMDGPU_MACH_AMDGCN_GFX600
-#define EF_AMDGPU_MACH_AMDGCN_LAST         EF_AMDGPU_MACH_AMDGCN_GFX805
-
-// Indicates if the "xnack" target feature is enabled for all code contained
-// in the object.
-//
-// Only valid for ELFOSABI_AMDGPU_HSA and ELFABIVERSION_AMDGPU_HSA_V3.
-#define EF_AMDGPU_FEATURE_XNACK_V3               0x100
-// Indicates if the "sramecc" target feature is enabled for all code
-// contained in the object.
-//
-// Only valid for ELFOSABI_AMDGPU_HSA and ELFABIVERSION_AMDGPU_HSA_V3.
-#define EF_AMDGPU_FEATURE_SRAMECC_V3             0x200
-
-// Only valid for ELFOSABI_AMDGPU_HSA and ELFABIVERSION_AMDGPU_HSA_V4.
-#define EF_AMDGPU_FEATURE_XNACK_V4               0x300
-#define EF_AMDGPU_FEATURE_XNACK_UNSUPPORTED_V4   0x000
-#define EF_AMDGPU_FEATURE_XNACK_ANY_V4           0x100
-#define EF_AMDGPU_FEATURE_XNACK_OFF_V4           0x200
-#define EF_AMDGPU_FEATURE_XNACK_ON_V4            0x300
-
-// SRAMECC selection mask for EF_AMDGPU_FEATURE_SRAMECC_* values.
-// Only valid for ELFOSABI_AMDGPU_HSA and ELFABIVERSION_AMDGPU_HSA_V4.
-#define EF_AMDGPU_FEATURE_SRAMECC_V4             0xc00
-#define EF_AMDGPU_FEATURE_SRAMECC_UNSUPPORTED_V4 0x000
-#define EF_AMDGPU_FEATURE_SRAMECC_ANY_V4         0x400
-#define EF_AMDGPU_FEATURE_SRAMECC_OFF_V4         0x800
-#define EF_AMDGPU_FEATURE_SRAMECC_ON_V4          0xc00
-
-#endif //__HIP_ROCclr__
-
 /////////////////////
 // Sections constants