Merge pull request #2684 from apache/fix-ios-compile

Remove invalid header usage which will cause iOS build failure.