r22030: Simplify include parsing for config.mk files, making sure we get