-#ifndef _IO_H_
-#define _IO_H_
+#ifndef IMAGER_IMIO_H_
+#define IMAGER_IMIO_H_
#include <stdio.h>
#include <sys/stat.h>
#ifndef _MSC_VER
#undef max
#endif
+extern unsigned long i_utf8_advance(char const **p, int *len);
+
/* XXX Shouldn't these go away? */
-int min(int a,int b);
-int max(int x,int y);
+int i_min(int a,int b);
+int i_max(int x,int y);
#endif