It made more sense for acct_gather_data_t to be back in slurm_acct_gather.h

This made may other include issues.  I would suggest running iwyu to
fix this completely.

Bug 2782