More viro breakage.  I wonder if 'int i' is missing from several other 
files I did not compile...