-extern void *sat_malloc(size_t);
-extern void *sat_malloc2(size_t, size_t);
-extern void *sat_calloc(size_t, size_t);
-extern void *sat_realloc(void *, size_t);
-extern void *sat_realloc2(void *, size_t, size_t);
-extern void *sat_free(void *);
-extern void sat_oom(size_t, size_t);
-extern unsigned int sat_timems(unsigned int subtract);
-extern void sat_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard);
-extern char *sat_dupjoin(const char *str1, const char *str2, const char *str3);
+extern void *solv_malloc(size_t);
+extern void *solv_malloc2(size_t, size_t);
+extern void *solv_calloc(size_t, size_t);
+extern void *solv_realloc(void *, size_t);
+extern void *solv_realloc2(void *, size_t, size_t);
+extern void *solv_extend_realloc(void *, size_t, size_t, size_t);
+extern void *solv_free(void *);
+extern char *solv_strdup(const char *);
+extern void solv_oom(size_t, size_t);
+extern unsigned int solv_timems(unsigned int subtract);
+extern void solv_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard);
+extern char *solv_dupjoin(const char *str1, const char *str2, const char *str3);
+extern char *solv_dupappend(const char *str1, const char *str2, const char *str3);
+extern int solv_hex2bin(const char **strp, unsigned char *buf, int bufl);
+extern char *solv_bin2hex(const unsigned char *buf, int l, char *str);
+extern size_t solv_validutf8(const char *buf);
+extern char *solv_latin1toutf8(const char *buf);
+extern char *solv_replacebadutf8(const char *buf, int replchar);
+