Continue adding include config.h

#2057