#include <limits.h>
#include <libcitadel.h>
#include "../server/sysdep.h"
-#include "../server/citadel.h"
+#include "../server/citadel_defs.h"
+#include "../server/server.h"
#include "../server/citadel_dirs.h"
int serv_sock;
for (i=0; i<num_recp_on_this_line; ++i) {
extract_token(this_recp, add_these_recipients,
i, ',', sizeof this_recp);
- striplt(this_recp);
+ string_trim(this_recp);
if (!IsEmptyStr(this_recp)) {
++num_recipients;
recipients = realloc(recipients,