diff --git a/appl/popper/maildir.c b/appl/popper/maildir.c
index 278a3510d..0a1bda135 100644
--- a/appl/popper/maildir.c
+++ b/appl/popper/maildir.c
@@ -45,7 +45,7 @@ make_path(POP *p, MsgInfoList *mp, int new, char *buf, size_t len)
 static int
 scan_file(POP *p, MsgInfoList *mp)
 {
-    char path[MAXDROPLEN];
+    char path[MAXPATHLEN];
     FILE *f;
     char buf[1024];
     int eoh = 0;
@@ -80,7 +80,7 @@ scan_file(POP *p, MsgInfoList *mp)
 static int
 scan_dir(POP *p, int new)
 {
-    char tmp[MAXDROPLEN];
+    char tmp[MAXPATHLEN];
     DIR *dir;
     struct dirent *dent;
     MsgInfoList *mp = p->mlp;
@@ -145,7 +145,7 @@ int
 pop_maildir_update(POP *p)
 {
     int i;
-    char tmp1[MAXDROPLEN], tmp2[MAXDROPLEN];
+    char tmp1[MAXPATHLEN], tmp2[MAXPATHLEN];
     for(i = 0; i < p->msg_count; i++) {
 	make_path(p, &p->mlp[i], p->mlp[i].flags & NEW_FLAG, 
 		  tmp1, sizeof(tmp1));
@@ -205,7 +205,7 @@ pop_maildir_update(POP *p)
 int
 pop_maildir_open(POP *p, MsgInfoList *mp)
 {
-    char tmp[MAXDROPLEN];
+    char tmp[MAXPATHLEN];
     make_path(p, mp, mp->flags & NEW_FLAG, tmp, sizeof(tmp));
     if(p->drop)
 	fclose(p->drop);
diff --git a/appl/popper/popper.h b/appl/popper/popper.h
index 372a280a4..eb0d1c19f 100644
--- a/appl/popper/popper.h
+++ b/appl/popper/popper.h
@@ -85,6 +85,10 @@
 #include <netdb.h>
 #endif
 #ifdef HAVE_ARPA_INET_H
+#ifdef _AIX
+struct sockaddr_dl; /* AIX fun */
+struct ether_addr;
+#endif
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_SYSLOG_H
@@ -115,7 +119,6 @@
 #endif
 
 #define MAXUSERNAMELEN  65
-#define MAXDROPLEN      64
 #define MAXLINELEN      1024
 #define MAXMSGLINELEN   1024
 #define MAXCMDLEN       4
@@ -242,9 +245,9 @@ typedef struct  {                               /*  POP parameter block */
                                                     the user */
     long                bytes_deleted;          /*  Number of maildrop bytes 
                                                     flagged for deletion */
-    char                drop_name[MAXDROPLEN];  /*  The name of the user's 
+    char                drop_name[MAXPATHLEN];  /*  The name of the user's 
                                                     maildrop */
-    char                temp_drop[MAXDROPLEN];  /*  The name of the user's 
+    char                temp_drop[MAXPATHLEN];  /*  The name of the user's 
                                                     temporary maildrop */
     long                drop_size;              /*  Size of the maildrop in
                                                     bytes */