Make some other feeble attempts to update these very outdated files, including dropping '+' from GTK, and most references to GTK 1.