Fix misplaced includes
3 files changed