#include <errno.h>
#include <stdarg.h>
#include <sys/stat.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "database.h"
#include "file_ops.h"
#include "config.h"
#include "control.h"
-#include "tools.h"
-#include "mime_parser.h"
#include "html.h"
#include "genstamp.h"
#include "internet_addressing.h"