[#54802244] fixed missing includes and removed schedule compact