rework several include statements