Merge pull request #696 from lioncash/more-forward-decls Convert some more header inclusions into forward declarations
