1 files changed, 14 insertions, 14 deletions
diff --git a/util.h b/util.h
index 5bea7b3..236365d 100644
--- a/util.h
+++ b/util.h
@@ -5,8 +5,6 @@
 #include "compat.h"
 #endif
 
-#include "queue.h"
-
 #define ISUTF8(c) (((c) & 0xc0) != 0x80)
 #define LEN(x) (sizeof (x) / sizeof *(x))
 
@@ -17,20 +15,22 @@ struct feed {
 	unsigned long  total;    /* total items */
 	time_t         timenewest;
 	char           timenewestformat[64];
-	SLIST_ENTRY(feed) entry;
 };
 
 enum { FieldUnixTimestamp = 0, FieldTimeFormatted, FieldTitle, FieldLink,
        FieldContent, FieldContentType, FieldId, FieldAuthor, FieldFeedType,
-       FieldFeedName, FieldFeedUrl, FieldBaseSiteUrl, FieldLast };
+       FieldLast };
+
+ssize_t chartoxmlentity(int, char *, size_t);
+int     parseline(char **, size_t *, char **, unsigned int, int, FILE *);
+void    printcontent(const char *, FILE *);
+void    printxmlencoded(const char *, FILE *);
+void    printlink(const char *, const char *, FILE *);
+void    printurlencoded(const char *, size_t, FILE *);
+void    printutf8pad(FILE *, const char *, size_t, int);
+int     strtotime(const char *, time_t *);
+char   *trimstart(const char *);
+char   *trimend(const char *);
+char   *xbasename(const char *);
+
 
-int          esnprintf(char *, size_t, const char *, ...);
-int          parseline(char **, size_t *, char **, unsigned int, int, FILE *);
-void         printcontent(const char *, FILE *);
-void         printfeednameid(const char *, FILE *);
-void         printhtmlencoded(const char *, FILE *);
-void         printlink(const char *, const char *, FILE *);
-void         printutf8pad(FILE *, const char *, size_t, int);
-int          strtotime(const char *, time_t *);
-const char * trimstart(const char *);
-const char * trimend(const char *);