Add missing inclusions of config.h