Added transitive includes for in-project deps