Added some missing #includes