diff --git a/source/build/include/compat.h b/source/build/include/compat.h
index 0cf64c827..1a56dd50d 100644
--- a/source/build/include/compat.h
+++ b/source/build/include/compat.h
@@ -750,8 +750,6 @@ typedef struct MAY_ALIAS {
     int16_t x, y;
 } vec2_16_t;
 
-using vec2_16_t = vec2_16_t;
-
 typedef struct {
     uint32_t x, y;
 } vec2u_t;
diff --git a/source/build/src/defs.cpp b/source/build/src/defs.cpp
index afa086d75..a9c62f816 100644
--- a/source/build/src/defs.cpp
+++ b/source/build/src/defs.cpp
@@ -649,8 +649,8 @@ static int32_t defsparser(scriptfile *script)
             int32_t havexoffset = 0, haveyoffset = 0, haveextra = 0;
             int32_t xoffset = 0, yoffset = 0;
             int32_t istexture = 0;
-            int32_t tilecrc = 0;
-            uint8_t have_ifcrc = 0;
+            int32_t tile_crc32 = 0;
+            uint8_t have_crc32 = 0;
             int32_t extra = 0;
 
             static const tokenlist tilefromtexturetokens[] =
@@ -694,8 +694,8 @@ static int32_t defsparser(scriptfile *script)
                     yoffset = clamp(yoffset, -128, 127);
                     break;
                 case T_IFCRC:
-                    scriptfile_getsymbol(script, &tilecrc);
-                    have_ifcrc = 1;
+                    scriptfile_getsymbol(script, &tile_crc32);
+                    have_crc32 = 1;
                     break;
                 case T_TEXHITSCAN:
                     flags |= PICANM_TEXHITSCAN_BIT;
@@ -722,12 +722,12 @@ static int32_t defsparser(scriptfile *script)
                 break;
             }
 
-            if (have_ifcrc)
+            if (have_crc32)
             {
-                int32_t origcrc = tileCRC(tile);
-                if (origcrc != tilecrc)
+                int32_t const orig_crc32 = tileCRC(tile);
+                if (orig_crc32 != tile_crc32)
                 {
-                    //initprintf("CRC of tile %d doesn't match! CRC: %d, Expected: %d\n", tile, origcrc, tilecrc);
+                    // initprintf("CRC32 of tile %d doesn't match! CRC32: %d, Expected: %d\n", tile, orig_crc32, tile_crc32);
                     break;
                 }
             }