Moved local config to config.h, restored config.def.h