Merge branch 'remove_unneeded_include' into 'master'

Prefer not to include interfaces from one to another as such. Factor out the part that is needed

See merge request atlas/athena!14747

Former-commit-id: a7f7e204