Move includes from base class to common hiera

That is where it should live.