Merge "Include missing headers"