This fixes various violations of the newly-added RTS includes linter.