Get rid of some scaler header dependencies