diff --git a/src/server/mux.c b/src/server/mux.c
index 16b7ee5c3d21d40aab248cbef67b6b9da3d15aa9..f1d2701e1bf971f2b601bc386325fe45d30706b5 100644
--- a/src/server/mux.c
+++ b/src/server/mux.c
@@ -238,9 +238,9 @@ mux_getclientbyconn(Mux *mp, Connection *cp)
 
 
 int
-mux_write(Connection  * cp,
-	  const char  * buf,
-	  size_t        size)
+mux_write(Connection  		* cp,
+	  const unsigned char   * buf,
+	  size_t        	  size)
 {
   Mux         * mp = cp->mux;
   Mux_client  * mcp;
diff --git a/src/server/mux.h b/src/server/mux.h
index f4e469d608218bc5f9886f152d273fea605d3dfb..cfde183d28e384908677cd63b034e88a0b271c9a 100644
--- a/src/server/mux.h
+++ b/src/server/mux.h
@@ -88,9 +88,9 @@ mux_getclientbyconn(Mux *mp, Connection *cp);
 */
 
 extern int
-mux_write(Connection  * cp,
-	  const char  * buf,
-	  size_t        size);
+mux_write(Connection  	       * cp,
+	  const unsigned char  * buf,
+	  size_t        	 size);
 
 extern int
 mux_printf(Connection  * cp,
diff --git a/src/server/person.c b/src/server/person.c
index 7738b64a817eb462feead35ba4b9eb5fe28ba425..d2d7fc7770ac8e9388f2820671a588f4bd7ee854 100644
--- a/src/server/person.c
+++ b/src/server/person.c
@@ -16,7 +16,7 @@
 #include "log.h"
 #include "minmax.h"
 #include <config.h>
-#include "parser.h"
+#include <parser.h>
 #include "com.h"
 #include "connections.h"
 #include "send-async.h"
@@ -38,7 +38,8 @@ do_set_passwd( Password        pwd,
 	return FAILURE;
 	
     *pwd++ = new_pwd.len;		/*** Maybe too easy crypt... */
-    strncpy(pwd, new_pwd.string, min( PASSWD_LEN-1, new_pwd.len ));
+    strncpy(pwd, (const char *)new_pwd.string,
+	    min( PASSWD_LEN-1, new_pwd.len ));
     return OK;
 }
 
diff --git a/src/server/prot-a.c b/src/server/prot-a.c
index 5871713f711adfd15717abed19ff06b3c0bf51e4..a6db17fbb29809f2c41fad1e3a73f5a497242283 100644
--- a/src/server/prot-a.c
+++ b/src/server/prot-a.c
@@ -284,7 +284,8 @@ prot_a_parse_packet(Connection *client)
 	client->c_string0 = EMPTY_STRING;     /* "A5B" as first input. */
 				/* Protokoll B will not suffer from this... */
 	
-	if ( s_strcat(&client->username, s_fcrea_str("@")) != OK )
+	if ( s_strcat(&client->username,
+		      s_fcrea_str((const unsigned char *)"@")) != OK )
 	    restart_kom("prot_a_parse_packet: s_strcat\n");
 
 	if ( s_strcat(&client->username, client->hostname) != OK )