Changed many includes to forward decl, more Unicellular stuff