The make lint target doesn't seem to have been run for a couple of years. This commit fixes all of the errors, but not the warnings.