Remove bad includes from SI code