added/removed includes and forward declarations.