Fixed PHP-786: Sort out includes.