Merge "Fix transitive includes." into oc-dev