-int lbximg_loadpalette(FILE *f, struct lbx_colour palette[static 256]);
-int lbximg_getpalette(LBX_IMG *img, struct lbx_colour palette[static 256]);
+int lbx_img_loadpalette(void *f, const struct lbx_file_ops *fops,
+ struct lbx_colour palette[static 256]);
+int lbx_img_getpalette(struct lbx_image *img,
+ struct lbx_colour palette[static 256]);