#ifndef _POP_H
#define _POP_H 1
+#include <lib-ui/curses.h>
+
#include "mx.h"
-#include "mutt_socket.h"
-#include "mutt_curses.h"
+#include <lib-sys/mutt_socket.h>
#define POP_PORT 110
#define POP_SSL_PORT 995
int pop_parse_path (const char *, ACCOUNT *);
int pop_connect (POP_DATA *);
pop_query_status pop_open_connection (POP_DATA *);
-pop_query_status pop_query_d (POP_DATA *, char *, size_t, char *);
-pop_query_status pop_fetch_data (POP_DATA *, char *, progress_t*, int (*funct) (char *, void *),
- void *);
+pop_query_status pop_query_d (POP_DATA *, char *, size_t, const char *);
+pop_query_status pop_fetch_data (POP_DATA *, const char *, progress_t*,
+ int (*funct) (char *, void *), void *);
pop_query_status pop_reconnect (CONTEXT *);
void pop_logout (CONTEXT *);
void pop_error (POP_DATA *, char *);