Clean up includes in BackgroundFitter
Clean up includes in fitEffAcc