Move back primary header includes next to config.h