Merge "Correct deprecated include syntax"