Adds missing file references in public umbrella header
Merge branch 'fix/imports' into develop

* fix/imports:
  Adds missing file references in public umbrella header