More project include and config updates.