This is a mechanical change to address tag mismatches for forward declaration.
This is not an error, however, the sheer number of these warnings caused by the
extensive amount of forward declaration usage drowns out the errors. This has
no functional change.