Merge "Organize header dependencies" into oc-mr1-dev