diff --git a/rEFIt_UEFI/Platform/plist.cpp b/rEFIt_UEFI/Platform/plist.cpp
index 3343ebe47..34ac1d4c7 100644
--- a/rEFIt_UEFI/Platform/plist.cpp
+++ b/rEFIt_UEFI/Platform/plist.cpp
@@ -870,7 +870,7 @@ EFI_STATUS FixDataMatchingTag( CHAR8* buffer, CONST CHAR8* tag, UINT32* lenPtr)
   buffer[start + stop] = '\0';
   *lenPtr = start + length;
 
-  if (*lenPtr == (__typeof(*lenPtr))-1) { // Why is this test. -1 is UINTN_MAX.
+  if (*lenPtr == (__typeof__(*lenPtr))-1) { // Why is this test. -1 is UINTN_MAX.
     return EFI_UNSUPPORTED;
   }
 
diff --git a/rEFIt_UEFI/libeg/lodepng.cpp b/rEFIt_UEFI/libeg/lodepng.cpp
index 5f15f978f..44ee5ec01 100644
--- a/rEFIt_UEFI/libeg/lodepng.cpp
+++ b/rEFIt_UEFI/libeg/lodepng.cpp
@@ -4730,7 +4730,7 @@ static unsigned readChunk_iCCP(LodePNGInfo* info, const LodePNGDecompressSetting
                           length, zlibsettings);
   if(!error) {
     if(decoded.size) {
-      info->iccp_profile_size = (__typeof(info->iccp_profile_size))decoded.size; // Unsafe cast
+      info->iccp_profile_size = (__typeof__(info->iccp_profile_size))decoded.size; // Unsafe cast
       if ( info->iccp_profile_size != decoded.size ) panic("info->iccp_profile_size != decoded.size"); // Check the cast
       info->iccp_profile = (unsigned char*)lodepng_malloc(decoded.size);
       if(info->iccp_profile) {