Fix everything except for the make specific config.h.
Comment out config.h (in a separate commit.)