Added some missing headers