Adding missing headers, source