Make Fit for RC2: Del unused includes