Renamed old system OS ifdef's to reflect the fact that they don't get defined anymore