Reverts [24530] & [24531] (preprocessing related) , add $(DEFS) (-DHAVE_CONFIG_H...