Move some rarely used includes from config.h