remove unneeded includes
use namespace for readability (cf. r8920)
replace XpsEngine wrapper class with namespace
replace ImagesEngine wrappers with namespaces