Another batch of added config.h