Clean up some unnecessary headers and forward declarations