Consolidate includes to top level application