Reordering of header includes for convert_imageset.cpp