Added missing #includes