-extern void Image_Copy8bitRGBA(byte *in, byte *out, int pixels, int *pal);
-extern void Image_CopyRGBAGamma(byte *in, byte *out, int pixels);
-extern int image_makemask (byte *in, byte *out, int size);
-extern byte* loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight);
-extern int loadtextureimage (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap);
-extern byte* loadimagepixelsmask (char* filename, qboolean complain, int matchwidth, int matchheight);
-extern int loadtextureimagemask (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap);
-extern int image_masktexnum;
-extern int loadtextureimagewithmask (char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap);
-extern void Image_WriteTGARGB (char *filename, int width, int height, byte *data);
-extern void Image_WriteTGARGBA (char *filename, int width, int height, byte *data);
+void Image_GammaRemapRGB(qbyte *in, qbyte *out, int pixels, qbyte *gammar, qbyte *gammag, qbyte *gammab);
+void Image_Copy8bitRGBA(qbyte *in, qbyte *out, int pixels, int *pal);
+int image_makemask (qbyte *in, qbyte *out, int size);
+qbyte *loadimagepixels (char* filename, qboolean complain, int matchwidth, int matchheight);
+rtexture_t *loadtextureimage (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
+qbyte *loadimagepixelsmask (char* filename, qboolean complain, int matchwidth, int matchheight);
+rtexture_t *loadtextureimagemask (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
+rtexture_t *image_masktex;
+rtexture_t *loadtextureimagewithmask (rtexturepool_t *pool, char* filename, int matchwidth, int matchheight, qboolean complain, qboolean mipmap, qboolean precache);
+void Image_WriteTGARGB_preflipped (char *filename, int width, int height, qbyte *data);
+void Image_WriteTGARGB (char *filename, int width, int height, qbyte *data);
+void Image_WriteTGARGBA (char *filename, int width, int height, qbyte *data);
+qboolean Image_CheckAlpha(qbyte *data, int size, qboolean rgba);