PHP-1267: Fix header includes