diff --git a/runestrdup.c b/runestrdup.c
index 8170e7b..345f2b0 100644
--- a/runestrdup.c
+++ b/runestrdup.c
@@ -7,22 +7,22 @@
  * or modification of this software and in all copies of the supporting
  * documentation for such software.
  * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE
- * ANY REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
  * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
  */
 #include <stdarg.h>
 #include <string.h>
 #include <stdlib.h>
-#include "plan9.h"
 #include "utf.h"
+#include "utfdef.h"
 
 Rune*
-runestrdup(Rune *s) 
+runestrdup(const Rune *s) 
 {  
 	Rune *ns;
 
-	ns = malloc(sizeof(Rune)*(runestrlen(s) + 1));
+	ns = (Rune*)malloc(sizeof(Rune)*(runestrlen(s) + 1));
 	if(ns == 0)
 		return 0;