[PATCH] Some config.h removals