Adds extra includes needed because sched.h doesn't include them anymore,
and removes includes of sched.h where they're not really necessary.