Log Message:
Add missing includes from libstdc++'s namespace pollution. Let the
compiler figure out which types std::advance is used with.