Fix missing/misplaced #include's
5 files changed