Removed a lot of unnecessary includes and fixed the compile errors.

31 files changed