Fix warnings on RHEL6 / non-proper build due to header dependency
ordering. #3475.