cleanup includes
cleanup includes and forward declarations
further reorganization and cleanup of includes and forward declarations
fixing and cleaning up includes in test cases