treewide: simplify inclusion of subtarget image files