style updates & added missing includes
style updates & changing unnecessary includes to forward declarations