diff --git a/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h b/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
index c4736e4743..220f2189fc 100644
--- a/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
+++ b/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
@@ -1205,900 +1205,720 @@ __MAKE_VECTOR_TYPE__(double, double);
 /*
 this is for compatibility with CUDA as CUDA allows accessing vector components
 in C++ program with MSVC
+structs are wrapped with templates so that mangled names match templated implementation
 */
-typedef union {
-  struct {
-    char x;
-  };
-  char data;
-} char1;
-typedef union {
-  struct {
-    char x;
-    char y;
-  };
-  char data[2];
-} char2;
-typedef union {
-  struct {
-    char x;
-    char y;
-    char z;
-    char w;
-  };
-  char data[4];
-} char4;
-typedef union {
-  struct {
-    char x;
-    char y;
-    char z;
-  };
-  char data[3];
-} char3;
-typedef union {
-  __m64 data;
-} char8;
-typedef union {
-  __m128i data;
-} char16;
 
-typedef union {
-  struct {
-    unsigned char x;
-  };
-  unsigned char data;
-} uchar1;
-typedef union {
-  struct {
-    unsigned char x;
-    unsigned char y;
-  };
-  unsigned char data[2];
-} uchar2;
-typedef union {
-  struct {
-    unsigned char x;
-    unsigned char y;
-    unsigned char z;
-    unsigned char w;
-  };
-  unsigned char data[4];
-} uchar4;
-typedef union {
-  struct {
-    unsigned char x;
-    unsigned char y;
-    unsigned char z;
-  };
-  unsigned char data[3];
-} uchar3;
-typedef union {
-  __m64 data;
-} uchar8;
-typedef union {
-  __m128i data;
-} uchar16;
+template<typename T, unsigned int n> struct HIP_vector_type;
 
-typedef union {
-  struct {
-    short x;
+// One template per vector size
+template<typename T>
+struct HIP_vector_type<T, 1> {
+  union {
+    struct {
+      T x;
+    };
+    T data;
   };
-  short data;
-} short1;
-typedef union {
-  struct {
-    short x;
-    short y;
+};
+template<typename T>
+struct HIP_vector_type<T, 2> {
+  union {
+    struct {
+      T x;
+      T y;
+    };
+    T data[2];
   };
-  short data[2];
-} short2;
-typedef union {
-  struct {
-    short x;
-    short y;
-    short z;
-    short w;
+};
+template<typename T>
+struct HIP_vector_type<T, 3> {
+  union {
+    struct {
+      T x;
+      T y;
+      T z;
+    };
+    T data[3];
   };
-  __m64 data;
-} short4;
-typedef union {
-  struct {
-    short x;
-    short y;
-    short z;
+};
+template<typename T>
+struct HIP_vector_type<T, 4> {
+  union {
+    struct {
+      T x;
+      T y;
+      T z;
+      T w;
+    };
+    T data[4];
   };
-  short data[3];
-} short3;
-typedef union {
-  __m128i data;
-} short8;
-typedef union {
-  __m128i data[2];
-} short16;
+};
+// 8- and 16-length vectors do not have CUDA-style accessible components
+template<typename T>
+struct HIP_vector_type<T, 8> {
+  union {
+    T data[8];
+  };
+};
+template<typename T>
+struct HIP_vector_type<T, 16> {
+  union {
+    T data[16];
+  };
+};
 
-typedef union {
-  struct {
-    unsigned short x;
+// Explicit specialization for vectors using MSVC-specific definitions
+template<>
+struct HIP_vector_type<char, 8> {
+  union {
+    __m64 data;
   };
-  unsigned short data;
-} ushort1;
-typedef union {
-  struct {
-    unsigned short x;
-    unsigned short y;
+};
+template<>
+struct HIP_vector_type<char, 16> {
+  union {
+    __m128i data;
   };
-  unsigned short data[2];
-} ushort2;
-typedef union {
-  struct {
-    unsigned short x;
-    unsigned short y;
-    unsigned short z;
-    unsigned short w;
-  };
-  __m64 data;
-} ushort4;
-typedef union {
-  struct {
-    unsigned short x;
-    unsigned short y;
-    unsigned short z;
-  };
-  unsigned short data[3];
-} ushort3;
-typedef union {
-  __m128i data;
-} ushort8;
-typedef union {
-  __m128i data[2];
-} ushort16;
+};
 
-typedef union {
-  struct {
-    int x;
+template<>
+struct HIP_vector_type<unsigned char, 8> {
+  union {
+    __m64 data;
   };
-  int data;
-} int1;
-typedef union {
-  struct {
-    int x;
-    int y;
+};
+template<>
+struct HIP_vector_type<unsigned char, 16> {
+  union {
+    __m128i data;
   };
-  __m64 data;
-} int2;
-typedef union {
-  struct {
-    int x;
-    int y;
-    int z;
-    int w;
-  };
-  __m128i data;
-} int4;
-typedef union {
-  struct {
-    int x;
-    int y;
-    int z;
-  };
-  int data[3];
-} int3;
-typedef union {
-  __m128i data[2];
-} int8;
-typedef union {
-  __m128i data[4];
-} int16;
+};
 
-typedef union {
-  struct {
-    unsigned int x;
+template<>
+struct HIP_vector_type<short, 4> {
+  union {
+    struct {
+      short x;
+      short y;
+      short z;
+      short w;
+    };
+    __m64 data;
   };
-  unsigned int data;
-} uint1;
-typedef union {
-  struct {
-    unsigned int x;
-    unsigned int y;
+};
+template<>
+struct HIP_vector_type<short, 8> {
+  union {
+    __m128i data;
   };
-  __m64 data;
-} uint2;
-typedef union {
-  struct {
-    unsigned int x;
-    unsigned int y;
-    unsigned int z;
-    unsigned int w;
+};
+template<>
+struct HIP_vector_type<short, 16> {
+  union {
+    __m128i data[2];
   };
-  __m128i data;
-} uint4;
-typedef union {
-  struct {
-    unsigned int x;
-    unsigned int y;
-    unsigned int z;
-  };
-  unsigned int data[3];
-} uint3;
-typedef union {
-  __m128i data[2];
-} uint8;
-typedef union {
-  __m128i data[4];
-} uint16;
+};
 
-typedef union {
-  struct {
-    int x;
+template<>
+struct HIP_vector_type<unsigned short, 4> {
+  union {
+    struct {
+      unsigned short x;
+      unsigned short y;
+      unsigned short z;
+      unsigned short w;
+    };
+    __m64 data;
   };
-  int data;
-} long1;
-typedef union {
-  struct {
-    int x;
-    int y;
+};
+template<>
+struct HIP_vector_type<unsigned short, 8> {
+  union {
+    __m128i data;
   };
-  __m64 data;
-} long2;
-typedef union {
-  struct {
-    int x;
-    int y;
-    int z;
-    int w;
+};
+template<>
+struct HIP_vector_type<unsigned short, 16> {
+  union {
+    __m128i data[2];
   };
-  __m128i data;
-} long4;
-typedef union {
-  struct {
-    int x;
-    int y;
-    int z;
-  };
-  int data[3];
-} long3;
-typedef union {
-  __m128i data[2];
-} long8;
-typedef union {
-  __m128i data[4];
-} long16;
+};
 
-typedef union {
-  struct {
-    unsigned int x;
+template<>
+struct HIP_vector_type<int, 2> {
+  union {
+    struct {
+      int x;
+      int y;
+    };
+    __m64 data;
   };
-  unsigned int data;
-} ulong1;
-typedef union {
-  struct {
-    unsigned int x;
-    unsigned int y;
+};
+template<>
+struct HIP_vector_type<int, 4> {
+  union {
+    struct {
+      int x;
+      int y;
+      int z;
+      int w;
+    };
+    __m128i data;
   };
-  __m64 data;
-} ulong2;
-typedef union {
-  struct {
-    unsigned int x;
-    unsigned int y;
-    unsigned int z;
-    unsigned int w;
+};
+template<>
+struct HIP_vector_type<int, 8> {
+  union {
+    __m128i data[2];
   };
-  __m128i data;
-} ulong4;
-typedef union {
-  struct {
-    unsigned int x;
-    unsigned int y;
-    unsigned int z;
+};
+template<>
+struct HIP_vector_type<int, 16> {
+  union {
+    __m128i data[4];
   };
-  unsigned int data[3];
-} ulong3;
-typedef union {
-  __m128i data[2];
-} ulong8;
-typedef union {
-  __m128i data[4];
-} ulong16;
+};
 
-typedef union {
-  struct {
-    long long x;
+template<>
+struct HIP_vector_type<unsigned int, 2> {
+  union {
+    struct {
+      unsigned int x;
+      unsigned int y;
+    };
+    __m64 data;
   };
-  __m64 data;
-} longlong1;
-typedef union {
-  struct {
-    long long x;
-    long long y;
+};
+template<>
+struct HIP_vector_type<unsigned int, 4> {
+  union {
+    struct {
+      unsigned int x;
+      unsigned int y;
+      unsigned int z;
+      unsigned int w;
+    };
+    __m128i data;
   };
-  __m128i data;
-} longlong2;
-typedef union {
-  struct {
-    long long x;
-    long long y;
-    long long z;
-    long long w;
+};
+template<>
+struct HIP_vector_type<unsigned int, 8> {
+  union {
+    __m128i data[2];
   };
-  __m128i data[2];
-} longlong4;
-typedef union {
-  struct {
-    long long x;
-    long long y;
-    long long z;
+};
+template<>
+struct HIP_vector_type<unsigned int, 16> {
+  union {
+    __m128i data[4];
   };
-  __m64 data[3];
-} longlong3;
-typedef union {
-  __m128i data[4];
-} longlong8;
-typedef union {
-  __m128i data[8];
-} longlong16;
+};
 
-typedef union {
-  struct {
-    __m64 x;
+// MSVC uses 32-bit longs and 64-bit long longs, explicitly defining for clarity
+template<>
+struct HIP_vector_type<long, 1>{
+  union {
+    struct {
+      std::int32_t x;
+    };
+    std::int32_t data;
   };
-  __m64 data;
-} ulonglong1;
-typedef union {
-  struct {
-    __m64 x;
-    __m64 y;
+};
+template<>
+struct HIP_vector_type<long, 2> {
+  union {
+    struct {
+      std::int32_t x;
+      std::int32_t y;
+    };
+    __m64 data;
   };
-  __m128i data;
-} ulonglong2;
-typedef union {
-  struct {
-    __m64 x;
-    __m64 y;
-    __m64 z;
-    __m64 w;
+};
+template<>
+struct HIP_vector_type<long, 3>{
+  union {
+    struct {
+      std::int32_t x;
+      std::int32_t y;
+      std::int32_t z;
+    };
+    std::int32_t data[3];
   };
-  __m128i data[2];
-} ulonglong4;
-typedef union {
-  struct {
-    __m64 x;
-    __m64 y;
-    __m64 z;
+};
+template<>
+struct HIP_vector_type<long, 4> {
+  union {
+    struct {
+      std::int32_t x;
+      std::int32_t y;
+      std::int32_t z;
+      std::int32_t w;
+    };
+    __m128i data;
   };
-  __m64 data[3];
-} ulonglong3;
-typedef union {
-  __m128i data[4];
-} ulonglong8;
-typedef union {
-  __m128i data[8];
-} ulonglong16;
+};
+template<>
+struct HIP_vector_type<long, 8> {
+  union {
+    __m128i data[2];
+  };
+};
+template<>
+struct HIP_vector_type<long, 16> {
+  union {
+    __m128i data[4];
+  };
+};
 
-typedef union {
-  struct {
-    float x;
+template<>
+struct HIP_vector_type<unsigned long, 1> {
+  union {
+    struct {
+      std::uint32_t x;
+    };
+    std::uint32_t data;
   };
-  float data;
-} float1;
-typedef union {
-  struct {
-    float x;
-    float y;
+};
+template<>
+struct HIP_vector_type<unsigned long, 2> {
+  union {
+    struct {
+      std::uint32_t x;
+      std::uint32_t y;
+    };
+    __m64 data;
   };
-  __m64 data;
-} float2;
-typedef union {
-  struct {
-    float x;
-    float y;
-    float z;
-    float w;
+};
+template<>
+struct HIP_vector_type<unsigned long, 3> {
+  union {
+    struct {
+      std::uint32_t x;
+      std::uint32_t y;
+      std::uint32_t z;
+    };
+    std::uint32_t data[3];
   };
-  __m128 data;
-} float4;
-typedef union {
-  struct {
-    float x;
-    float y;
-    float z;
+};
+template<>
+struct HIP_vector_type<unsigned long, 4> {
+  union {
+    struct {
+      std::uint32_t x;
+      std::uint32_t y;
+      std::uint32_t z;
+      std::uint32_t w;
+    };
+    __m128i data;
   };
-  float data[3];
-} float3;
-typedef union {
-  __m256 data;
-} float8;
-typedef union {
-  __m256 data[2];
-} float16;
+};
+template<>
+struct HIP_vector_type<unsigned long, 8> {
+  union {
+    __m128i data[2];
+  };
+};
+template<>
+struct HIP_vector_type<unsigned long, 16> {
+  union {
+    __m128i data[4];
+  };
+};
 
-typedef union {
-  struct {
-    double x;
+template<>
+struct HIP_vector_type<long long, 1> {
+  union {
+    struct {
+      std::int64_t x;
+    };
+    __m64 data;
   };
-  double data;
-} double1;
-typedef union {
-  struct {
-    double x;
-    double y;
+};
+template<>
+struct HIP_vector_type<long long, 2> {
+  union {
+    struct {
+      std::int64_t x;
+      std::int64_t y;
+    };
+    __m128i data;
   };
-  __m128d data;
-} double2;
-typedef union {
-  struct {
-    double x;
-    double y;
-    double z;
-    double w;
+};
+template<>
+struct HIP_vector_type<long long, 3> {
+  union {
+    struct {
+      std::int64_t x;
+      std::int64_t y;
+      std::int64_t z;
+    };
+    __m64 data[3];
   };
-  __m256d data;
-} double4;
-typedef union {
-  struct {
-    double x;
-    double y;
-    double z;
+};
+template<>
+struct HIP_vector_type<long long, 4> {
+  union {
+    struct {
+      std::int64_t x;
+      std::int64_t y;
+      std::int64_t z;
+      std::int64_t w;
+    };
+    __m128i data[2];
   };
-  double data[3];
-} double3;
-typedef union {
-  __m256d data[2];
-} double8;
-typedef union {
-  __m256d data[4];
-} double16;
+};
+template<>
+struct HIP_vector_type<long long, 8> {
+  union {
+    __m128i data[4];
+  };
+};
+template<>
+struct HIP_vector_type<long long, 16> {
+  union {
+    __m128i data[8];
+  };
+};
+
+template<>
+struct HIP_vector_type<unsigned long long, 1>{
+  union{
+    struct {
+      std::uint64_t x;
+    };
+    __m64 data;
+  };
+};
+template<>
+struct HIP_vector_type<unsigned long long, 2> {
+  union {
+    struct {
+      std::uint64_t x;
+      std::uint64_t y;
+    };
+    __m128i data;
+  };
+};
+template<>
+struct HIP_vector_type<unsigned long long, 3> {
+  union {
+    struct {
+      std::uint64_t x;
+      std::uint64_t y;
+      std::uint64_t z;
+    };
+    __m64 data[3];
+  };
+};
+template<>
+struct HIP_vector_type<unsigned long long, 4> {
+  union {
+    struct {
+      std::uint64_t x;
+      std::uint64_t y;
+      std::uint64_t z;
+      std::uint64_t w;
+    };
+    __m128i data[2];
+  };
+};
+template<>
+struct HIP_vector_type<unsigned long long, 8> {
+  union {
+    __m128i data[4];
+  };
+};
+template<>
+struct HIP_vector_type<unsigned long long, 16> {
+  union {
+    __m128i data[8];
+  };
+};
+
+template<>
+struct HIP_vector_type<float, 2> {
+  union {
+    struct {
+      float x;
+      float y;
+    };
+    __m64 data;
+  };
+};
+template<>
+struct HIP_vector_type<float, 4>{
+  union {
+    struct {
+      float x;
+      float y;
+      float z;
+      float w;
+    };
+    __m128 data;
+  };
+};
+template<>
+struct HIP_vector_type<float, 8>{
+  union {
+   __m256 data;
+  };
+};
+template<>
+struct HIP_vector_type<float, 16>{
+  union {
+    __m256 data[2];
+  };
+};
+
+template<>
+struct HIP_vector_type<double, 2>{
+  union {
+    struct {
+      double x;
+      double y;
+    };
+    __m128d data;
+  };
+};
+template<>
+struct HIP_vector_type<double, 4>{
+  union {
+    struct {
+      double x;
+      double y;
+      double z;
+      double w;
+    };
+    __m256d data;
+  };
+};
+template<>
+struct HIP_vector_type<double, 8>{
+  union {
+    __m256d data[2];
+  };
+};
+template<>
+struct HIP_vector_type<double, 16>{
+  union {
+    __m256d data[4];
+  };
+};
+
+// Type aliasing
+using char1  = HIP_vector_type<char, 1>;
+using char2  = HIP_vector_type<char, 2>;
+using char3  = HIP_vector_type<char, 3>;
+using char4  = HIP_vector_type<char, 4>;
+using char8  = HIP_vector_type<char, 8>;
+using char16 = HIP_vector_type<char, 16>;
+using uchar1  = HIP_vector_type<unsigned char, 1>;
+using uchar2  = HIP_vector_type<unsigned char, 2>;
+using uchar3  = HIP_vector_type<unsigned char, 3>;
+using uchar4  = HIP_vector_type<unsigned char, 4>;
+using uchar8  = HIP_vector_type<unsigned char, 8>;
+using uchar16 = HIP_vector_type<unsigned char, 16>;
+using short1  = HIP_vector_type<short, 1>;
+using short2  = HIP_vector_type<short, 2>;
+using short3  = HIP_vector_type<short, 3>;
+using short4  = HIP_vector_type<short, 4>;
+using short8  = HIP_vector_type<short, 8>;
+using short16 = HIP_vector_type<short, 16>;
+using ushort1  = HIP_vector_type<unsigned short, 1>;
+using ushort2  = HIP_vector_type<unsigned short, 2>;
+using ushort3  = HIP_vector_type<unsigned short, 3>;
+using ushort4  = HIP_vector_type<unsigned short, 4>;
+using ushort8  = HIP_vector_type<unsigned short, 8>;
+using ushort16 = HIP_vector_type<unsigned short, 16>;
+using int1  = HIP_vector_type<int, 1>;
+using int2  = HIP_vector_type<int, 2>;
+using int3  = HIP_vector_type<int, 3>;
+using int4  = HIP_vector_type<int, 4>;
+using int8  = HIP_vector_type<int, 8>;
+using int16 = HIP_vector_type<int, 16>;
+using uint1  = HIP_vector_type<unsigned int, 1>;
+using uint2  = HIP_vector_type<unsigned int, 2>;
+using uint3  = HIP_vector_type<unsigned int, 3>;
+using uint4  = HIP_vector_type<unsigned int, 4>;
+using uint8  = HIP_vector_type<unsigned int, 8>;
+using uint16 = HIP_vector_type<unsigned int, 16>;
+using long1  = HIP_vector_type<long, 1>;
+using long2  = HIP_vector_type<long, 2>;
+using long3  = HIP_vector_type<long, 3>;
+using long4  = HIP_vector_type<long, 4>;
+using long8  = HIP_vector_type<long, 8>;
+using long16 = HIP_vector_type<long, 16>;
+using ulong1  = HIP_vector_type<unsigned long, 1>;
+using ulong2  = HIP_vector_type<unsigned long, 2>;
+using ulong3  = HIP_vector_type<unsigned long, 3>;
+using ulong4  = HIP_vector_type<unsigned long, 4>;
+using ulong8  = HIP_vector_type<unsigned long, 8>;
+using ulong16 = HIP_vector_type<unsigned long, 16>;
+using longlong1  = HIP_vector_type<long long, 1>;
+using longlong2  = HIP_vector_type<long long, 2>;
+using longlong3  = HIP_vector_type<long long, 3>;
+using longlong4  = HIP_vector_type<long long, 4>;
+using longlong8  = HIP_vector_type<long long, 8>;
+using longlong16 = HIP_vector_type<long long, 16>;
+using ulonglong1  = HIP_vector_type<unsigned long long, 1>;
+using ulonglong2  = HIP_vector_type<unsigned long long, 2>;
+using ulonglong3  = HIP_vector_type<unsigned long long, 3>;
+using ulonglong4  = HIP_vector_type<unsigned long long, 4>;
+using ulonglong8  = HIP_vector_type<unsigned long long, 8>;
+using ulonglong16 = HIP_vector_type<unsigned long long, 16>;
+using float1  = HIP_vector_type<float, 1>;
+using float2  = HIP_vector_type<float, 2>;
+using float3  = HIP_vector_type<float, 3>;
+using float4  = HIP_vector_type<float, 4>;
+using float8  = HIP_vector_type<float, 8>;
+using float16 = HIP_vector_type<float, 16>;
+using double1  = HIP_vector_type<double, 1>;
+using double2  = HIP_vector_type<double, 2>;
+using double3  = HIP_vector_type<double, 3>;
+using double4  = HIP_vector_type<double, 4>;
+using double8  = HIP_vector_type<double, 8>;
+using double16 = HIP_vector_type<double, 16>;
 
 #else  // !defined(_MSC_VER)
 
 /*
 this is for compatibility with CUDA as CUDA allows accessing vector components
 in C++ program with MSVC
+structs are wrapped with templates so that mangled names match templated implementation
 */
-typedef union {
-  struct {
-    char x;
-  };
-  char data;
-} char1;
-typedef union {
-  struct {
-    char x;
-    char y;
-  };
-  char data[2];
-} char2;
-typedef union {
-  struct {
-    char x;
-    char y;
-    char z;
-    char w;
-  };
-  char data[4];
-} char4;
-typedef union {
-  char data[8];
-} char8;
-typedef union {
-  char data[16];
-} char16;
-typedef union {
-  struct {
-    char x;
-    char y;
-    char z;
-  };
-  char data[3];
-} char3;
 
-typedef union {
-  struct {
-    unsigned char x;
-  };
-  unsigned char data;
-} uchar1;
-typedef union {
-  struct {
-    unsigned char x;
-    unsigned char y;
-  };
-  unsigned char data[2];
-} uchar2;
-typedef union {
-  struct {
-    unsigned char x;
-    unsigned char y;
-    unsigned char z;
-    unsigned char w;
-  };
-  unsigned char data[4];
-} uchar4;
-typedef union {
-  unsigned char data[8];
-} uchar8;
-typedef union {
-  unsigned char data[16];
-} uchar16;
-typedef union {
-  struct {
-    unsigned char x;
-    unsigned char y;
-    unsigned char z;
-  };
-  unsigned char data[3];
-} uchar3;
+template<typename T, unsigned int n> struct HIP_vector_type;
 
-typedef union {
-  struct {
-    short x;
+// One template per vector size
+template<typename T>
+struct HIP_vector_type<T, 1> {
+  union {
+    struct {
+      T x;
+    };
+    T data;
   };
-  short data;
-} short1;
-typedef union {
-  struct {
-    short x;
-    short y;
+};
+template<typename T>
+struct HIP_vector_type<T, 2> {
+  union {
+    struct {
+      T x;
+      T y;
+    };
+    T data[2];
   };
-  short data[2];
-} short2;
-typedef union {
-  struct {
-    short x;
-    short y;
-    short z;
-    short w;
+};
+template<typename T>
+struct HIP_vector_type<T, 3> {
+  union {
+    struct {
+      T x;
+      T y;
+      T z;
+    };
+    T data[3];
   };
-  short data[4];
-} short4;
-typedef union {
-  short data[8];
-} short8;
-typedef union {
-  short data[16];
-} short16;
-typedef union {
-  struct {
-    short x;
-    short y;
-    short z;
+};
+template<typename T>
+struct HIP_vector_type<T, 4> {
+  union {
+    struct {
+      T x;
+      T y;
+      T z;
+      T w;
+    };
+    T data[4];
   };
-  short data[3];
-} short3;
+};
+// 8- and 16-length vectors do not have CUDA-style accessible components
+template<typename T>
+struct HIP_vector_type<T, 8> {
+  union {
+    T data[8];
+  };
+};
+template<typename T>
+struct HIP_vector_type<T, 16> {
+  union {
+    T data[16];
+  };
+};
 
-typedef union {
-  struct {
-    unsigned short x;
-  };
-  unsigned short data;
-} ushort1;
-typedef union {
-  struct {
-    unsigned short x;
-    unsigned short y;
-  };
-  unsigned short data[2];
-} ushort2;
-typedef union {
-  struct {
-    unsigned short x;
-    unsigned short y;
-    unsigned short z;
-    unsigned short w;
-  };
-  unsigned short data[4];
-} ushort4;
-typedef union {
-  unsigned short data[8];
-} ushort8;
-typedef union {
-  unsigned short data[16];
-} ushort16;
-typedef union {
-  struct {
-    unsigned short x;
-    unsigned short y;
-    unsigned short z;
-  };
-  unsigned short data[3];
-} ushort3;
-
-typedef union {
-  struct {
-    int x;
-  };
-  int data;
-} int1;
-typedef union {
-  struct {
-    int x;
-    int y;
-  };
-  int data[2];
-} int2;
-typedef union {
-  struct {
-    int x;
-    int y;
-    int z;
-    int w;
-  };
-  int data[4];
-} int4;
-typedef union {
-  int data[8];
-} int8;
-typedef union {
-  int data[16];
-} int16;
-typedef union {
-  struct {
-    int x;
-    int y;
-    int z;
-  };
-  int data[3];
-} int3;
-
-typedef union {
-  struct {
-    unsigned int x;
-  };
-  unsigned int data;
-} uint1;
-typedef union {
-  struct {
-    unsigned int x;
-    unsigned int y;
-  };
-  unsigned int data[2];
-} uint2;
-typedef union {
-  struct {
-    unsigned int x;
-    unsigned int y;
-    unsigned int z;
-    unsigned int w;
-  };
-  unsigned int data[4];
-} uint4;
-typedef union {
-  unsigned int data[8];
-} uint8;
-typedef union {
-  unsigned int data[16];
-} uint16;
-typedef union {
-  struct {
-    unsigned int x;
-    unsigned int y;
-    unsigned int z;
-  };
-  unsigned int data[3];
-} uint3;
-
-typedef union {
-  struct {
-    long x;
-  };
-  long data;
-} long1;
-typedef union {
-  struct {
-    long x;
-    long y;
-  };
-  long data[2];
-} long2;
-typedef union {
-  struct {
-    long x;
-    long y;
-    long z;
-    long w;
-  };
-  long data[4];
-} long4;
-typedef union {
-  long data[8];
-} long8;
-typedef union {
-  long data[16];
-} long16;
-typedef union {
-  struct {
-    long x;
-    long y;
-    long z;
-  };
-  long data[3];
-} long3;
-
-typedef union {
-  struct {
-    unsigned long x;
-  };
-  unsigned long data;
-} ulong1;
-typedef union {
-  struct {
-    unsigned long x;
-    unsigned long y;
-  };
-  unsigned long data[2];
-} ulong2;
-typedef union {
-  struct {
-    unsigned long x;
-    unsigned long y;
-    unsigned long z;
-    unsigned long w;
-  };
-  unsigned long data[4];
-} ulong4;
-typedef union {
-  unsigned long data[8];
-} ulong8;
-typedef union {
-  unsigned long data[16];
-} ulong16;
-typedef union {
-  struct {
-    unsigned long x;
-    unsigned long y;
-    unsigned long z;
-  };
-  unsigned long data[3];
-} ulong3;
-
-typedef union {
-  struct {
-    long long x;
-  };
-  long long data;
-} longlong1;
-typedef union {
-  struct {
-    long long x;
-    long long y;
-  };
-  long long data[2];
-} longlong2;
-typedef union {
-  struct {
-    long long x;
-    long long y;
-    long long z;
-    long long w;
-  };
-  long long data[4];
-} longlong4;
-typedef union {
-  long long data[8];
-} longlong8;
-typedef union {
-  long long data[16];
-} longlong16;
-typedef union {
-  struct {
-    long long x;
-    long long y;
-    long long z;
-  };
-  long long data[3];
-} longlong3;
-
-typedef union {
-  struct {
-    unsigned long long x;
-  };
-  unsigned long long data;
-} ulonglong1;
-typedef union {
-  struct {
-    unsigned long long x;
-    unsigned long long y;
-  };
-  unsigned long long data[2];
-} ulonglong2;
-typedef union {
-  struct {
-    unsigned long long x;
-    unsigned long long y;
-    unsigned long long z;
-    unsigned long long w;
-  };
-  unsigned long long data[4];
-} ulonglong4;
-typedef union {
-  unsigned long long data[8];
-} ulonglong8;
-typedef union {
-  unsigned long long data[16];
-} ulonglong16;
-typedef union {
-  struct {
-    unsigned long long x;
-    unsigned long long y;
-    unsigned long long z;
-  };
-  unsigned long long data[3];
-} ulonglong3;
-
-typedef union {
-  struct {
-    float x;
-  };
-  float data;
-} float1;
-typedef union {
-  struct {
-    float x;
-    float y;
-  };
-  float data[2];
-} float2;
-typedef union {
-  struct {
-    float x;
-    float y;
-    float z;
-    float w;
-  };
-  float data[4];
-} float4;
-typedef union {
-  float data[8];
-} float8;
-typedef union {
-  float data[16];
-} float16;
-typedef union {
-  struct {
-    float x;
-    float y;
-    float z;
-  };
-  float data[3];
-} float3;
-
-typedef union {
-  struct {
-    double x;
-  };
-  double data;
-} double1;
-typedef union {
-  struct {
-    double x;
-    double y;
-  };
-  double data[2];
-} double2;
-typedef union {
-  struct {
-    double x;
-    double y;
-    double z;
-    double w;
-  };
-  double data[4];
-} double4;
-typedef union {
-  double data[8];
-} double8;
-typedef union {
-  double data[16];
-} double16;
-typedef union {
-  struct {
-    double x;
-    double y;
-    double z;
-  };
-  double data[3];
-} double3;
+// Type aliasing
+using char1  = HIP_vector_type<char, 1>;
+using char2  = HIP_vector_type<char, 2>;
+using char3  = HIP_vector_type<char, 3>;
+using char4  = HIP_vector_type<char, 4>;
+using char8  = HIP_vector_type<char, 8>;
+using char16 = HIP_vector_type<char, 16>;
+using uchar1  = HIP_vector_type<unsigned char, 1>;
+using uchar2  = HIP_vector_type<unsigned char, 2>;
+using uchar3  = HIP_vector_type<unsigned char, 3>;
+using uchar4  = HIP_vector_type<unsigned char, 4>;
+using uchar8  = HIP_vector_type<unsigned char, 8>;
+using uchar16 = HIP_vector_type<unsigned char, 16>;
+using short1  = HIP_vector_type<short, 1>;
+using short2  = HIP_vector_type<short, 2>;
+using short3  = HIP_vector_type<short, 3>;
+using short4  = HIP_vector_type<short, 4>;
+using short8  = HIP_vector_type<short, 8>;
+using short16 = HIP_vector_type<short, 16>;
+using ushort1  = HIP_vector_type<unsigned short, 1>;
+using ushort2  = HIP_vector_type<unsigned short, 2>;
+using ushort3  = HIP_vector_type<unsigned short, 3>;
+using ushort4  = HIP_vector_type<unsigned short, 4>;
+using ushort8  = HIP_vector_type<unsigned short, 8>;
+using ushort16 = HIP_vector_type<unsigned short, 16>;
+using int1  = HIP_vector_type<int, 1>;
+using int2  = HIP_vector_type<int, 2>;
+using int3  = HIP_vector_type<int, 3>;
+using int4  = HIP_vector_type<int, 4>;
+using int8  = HIP_vector_type<int, 8>;
+using int16 = HIP_vector_type<int, 16>;
+using uint1  = HIP_vector_type<unsigned int, 1>;
+using uint2  = HIP_vector_type<unsigned int, 2>;
+using uint3  = HIP_vector_type<unsigned int, 3>;
+using uint4  = HIP_vector_type<unsigned int, 4>;
+using uint8  = HIP_vector_type<unsigned int, 8>;
+using uint16 = HIP_vector_type<unsigned int, 16>;
+using long1  = HIP_vector_type<long, 1>;
+using long2  = HIP_vector_type<long, 2>;
+using long3  = HIP_vector_type<long, 3>;
+using long4  = HIP_vector_type<long, 4>;
+using long8  = HIP_vector_type<long, 8>;
+using long16 = HIP_vector_type<long, 16>;
+using ulong1  = HIP_vector_type<unsigned long, 1>;
+using ulong2  = HIP_vector_type<unsigned long, 2>;
+using ulong3  = HIP_vector_type<unsigned long, 3>;
+using ulong4  = HIP_vector_type<unsigned long, 4>;
+using ulong8  = HIP_vector_type<unsigned long, 8>;
+using ulong16 = HIP_vector_type<unsigned long, 16>;
+using longlong1  = HIP_vector_type<long long, 1>;
+using longlong2  = HIP_vector_type<long long, 2>;
+using longlong3  = HIP_vector_type<long long, 3>;
+using longlong4  = HIP_vector_type<long long, 4>;
+using longlong8  = HIP_vector_type<long long, 8>;
+using longlong16 = HIP_vector_type<long long, 16>;
+using ulonglong1  = HIP_vector_type<unsigned long long, 1>;
+using ulonglong2  = HIP_vector_type<unsigned long long, 2>;
+using ulonglong3  = HIP_vector_type<unsigned long long, 3>;
+using ulonglong4  = HIP_vector_type<unsigned long long, 4>;
+using ulonglong8  = HIP_vector_type<unsigned long long, 8>;
+using ulonglong16 = HIP_vector_type<unsigned long long, 16>;
+using float1  = HIP_vector_type<float, 1>;
+using float2  = HIP_vector_type<float, 2>;
+using float3  = HIP_vector_type<float, 3>;
+using float4  = HIP_vector_type<float, 4>;
+using float8  = HIP_vector_type<float, 8>;
+using float16 = HIP_vector_type<float, 16>;
+using double1  = HIP_vector_type<double, 1>;
+using double2  = HIP_vector_type<double, 2>;
+using double3  = HIP_vector_type<double, 3>;
+using double4  = HIP_vector_type<double, 4>;
+using double8  = HIP_vector_type<double, 8>;
+using double16 = HIP_vector_type<double, 16>;
 
 #endif // defined(_MSC_VER)
 #endif // defined(__has_attribute)