Fixed PHP-786: Sort out includes.
Merged pull request #480