#include <ctype.h>
#include <unistd.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/str.h>
+#include <lib-lib/lib-lib.h>
#include "mutt.h"
#include "alias.h"
const char *mutt_get_name (address_t * a)
{
- address_t *ali;
+ const address_t *ali;
const char *name = "";
if (a) {