Copy/pasta from php04 header

Migrating header changes from php04