[Olena-patches] 666: Simplfy header inclusions of oln::image[123]d.