Tidy includes after redesign