Pull in doc.images.mk as necessary.
Also pull in doc.html.mk when DOCFORMAT==html, something I missed from an earlier commit.