Convert some more header inclusions into forward declarations