Merge "Mac build break: remove include that's not there"