Fix include_once references to dirname
Merge conflicts.