Remove some more C junk from these files.