Silence a compiler warning introduced by custom changes and fix a possible compile failure by including another header file in a header file that we cleared before. (cherry picked from commit 4393ec8281)
4393ec8281