Misreading build errors.

Was looking at the wrong file in the error log. Reverted to my first
fix. Applied it to the other two files.