Removing unnecessary includes

Part 1 of 2, removing some of the include files that just shouldn't be
there. Using forward declaration instead.