Clean up a few headers, remove unused headers, add headers that are used

Mostly in the JobOptionsSvc folder that I just found.

Merge request reports

Loading