Use XInclude instead of entities
Closes #111