Generic image handler
Moved new-style image headers to include/internal