Include fixes.
Merge branch 'master' into yandex_rhel5