Fix a UINT16 redefinition problem.