Several changes to config.h mean that I probably broke compilation on some platforms. That really needs cleaning up.