--- src/applications/mailer/mail_call.cc.orig	2012-09-02 12:22:44.960457490 -0700
+++ src/applications/mailer/mail_call.cc	2012-09-02 12:23:03.102583261 -0700
@@ -77,7 +77,7 @@
 char *addr_bbs(const char *addr)
 {
    static char ret[64];
-   char *p = strchr(addr, '@');
+   const char *p = strchr(addr, '@');
    if (p)
    {
       strncpy(ret, p+1, 63); ret[63] = '\0';
--- src/applications/mailer/mail_route.cc.orig	2012-09-02 12:26:01.193817231 -0700
+++ src/applications/mailer/mail_route.cc	2012-09-02 12:26:43.991113589 -0700
@@ -14,6 +14,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/time.h>
+#include <string.h>
 
 #define OUT_FILE "/var/ax25/mail_routes"
 
--- src/applications/forward.cc.orig	2012-09-02 12:27:55.769610478 -0700
+++ src/applications/forward.cc	2012-09-02 12:28:17.030757623 -0700
@@ -128,7 +128,7 @@
 char *bbs(const char *src)
 {
   static char addr[30];
-  char *p;
+  const char *p;
 
   p = strchr(src, '@');
   if (p == NULL) strcpy(addr, "");
--- src/keyboard.cc.orig	2012-09-02 12:29:52.905420956 -0700
+++ src/keyboard.cc	2012-09-02 12:30:16.190582010 -0700
@@ -19,6 +19,8 @@
 #include "data.h"
 #include "keyboard.h"
 
+#include <string.h>
+
 //--------------------------------------------------------------------------
 // Class Keyscan
 //--------------------------------------------------------------------------