Merge "Remove unnecessary includes and forward declarations"