diff -ur gnokii-0.5.0rc1/include/config.h.in gnokii-0.5.0rc1-fixed/include/config.h.in
--- gnokii-0.5.0rc1/include/config.h.in	2003-03-09 16:13:59.000000000 -0800
+++ gnokii-0.5.0rc1-fixed/include/config.h.in	2003-03-13 04:00:22.000000000 -0800
@@ -34,6 +34,7 @@
 #ifndef __CONFIG_H__
 #define __CONFIG_H__
 
+#define _GNU_SOURCE
 
 #undef VERSION
 #undef XVERSION
diff -ur gnokii-0.5.0rc1/include/gnokii/data.h gnokii-0.5.0rc1-fixed/include/gnokii/data.h
--- gnokii-0.5.0rc1/include/gnokii/data.h	2003-03-09 16:13:31.000000000 -0800
+++ gnokii-0.5.0rc1-fixed/include/gnokii/data.h	2003-03-13 01:59:15.000000000 -0800
@@ -113,7 +113,7 @@
 	gn_error (*loop)(struct timeval *timeout, struct gn_statemachine *state);
 	/* A pointer to the function used to send out a message. This is used
 	 * by the phone specific code to send a message over the link */
-	gn_error (*send_message)(unsigned int messagesize, unsigned char messagetype, unsigned char *message,
+	gn_error (*send_message)(u16 messagesize, unsigned char messagetype, unsigned char *message,
 				 struct gn_statemachine *state);
 	void *link_instance;
 } gn_link;
 
diff -ur gnokii-0.5.0rc1/utils/mgnokiidev.c gnokii-0.5.0rc1-fixed/utils/mgnokiidev.c
--- gnokii-0.5.0rc1/utils/mgnokiidev.c	2003-03-09 16:13:32.000000000 -0800
+++ gnokii-0.5.0rc1-fixed/utils/mgnokiidev.c	2003-03-13 03:40:59.000000000 -0800
@@ -38,6 +38,7 @@
 #include "misc.h"
 
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
diff -ur gnokii-0.5.0rc1/xgnokii/xgnokii.c gnokii-0.5.0rc1-fixed/xgnokii/xgnokii.c
--- gnokii-0.5.0rc1/xgnokii/xgnokii.c	2003-03-09 16:13:32.000000000 -0800
+++ gnokii-0.5.0rc1-fixed/xgnokii/xgnokii.c	2003-03-13 03:42:30.000000000 -0800
@@ -27,14 +27,11 @@
 
 */
 
+
 #include "config.h"
 #include "compat.h"
 #include "misc.h"
 
-#ifdef HAVE_ASPRINTF
-#  define _GNU_SOURCE
-#  include <stdio.h>
-#endif
 
 #include <stdlib.h>		/* for getenv */
 #include <locale.h>