Fixed some forward declarations and removed some includes from header files