Merge "Add missing headers"