Index: image/new.c
--- image/new.c.orig	2004-09-01 05:50:32 +0200
+++ image/new.c	2007-12-17 10:56:09 +0100
@@ -11,11 +11,7 @@
 #include "copyright.h"
 #include "image.h"
 
-#ifdef __APPLE__
 #include <stdlib.h>
-#else
-#include <malloc.h>
-#endif
 
 extern int _Xdebug;
 extern void memoryExhausted(void);
Index: image/path.c
--- image/path.c.orig	2004-07-28 17:47:31 +0200
+++ image/path.c	2007-12-17 10:56:09 +0100
@@ -8,8 +8,6 @@
  * See included file "copyright.h" for complete copyright information.
  */
 
-#include "copyright.h"
-#include "xloadimage.h"
 #include <X11/Xos.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -24,6 +22,9 @@
 #include <stdlib.h>
 #endif
 
+#include "copyright.h"
+#include "xloadimage.h"
+
 /* SUPPRESS 530 */
 /* SUPPRESS 560 */
 
Index: mgp.h
--- mgp.h.orig	2007-02-16 14:50:04 +0100
+++ mgp.h	2007-12-17 10:56:09 +0100
@@ -814,17 +814,6 @@
 extern void embed_file __P((FILE *, struct ctrl *, int *));
 extern void cleandir __P((void));
 
-/* missing/ *.c */
-#ifndef HAVE_STRDUP
-extern char *strdup __P((const char *));
-#endif
-#ifndef HAVE_STRSEP
-extern char *strsep __P((char **, const char *));
-#endif
-#ifndef HAVE_USLEEP
-extern void usleep __P((u_int));
-#endif
-
 #ifdef FREETYPE
 #define RASTERLIB
 #endif
Index: scanner.l
--- scanner.l.orig	2007-11-24 18:47:28 +0100
+++ scanner.l	2007-12-17 10:56:25 +0100
@@ -104,10 +104,6 @@
 JSTR	{JISIN}([\041-\176][\041-\176])*{ASCIIIN}
 XSTR	[\240-\377]*
 
-%a 6000
-%p 4000
-%o 8000
-
 %%
 (NOOP|noop)		return KW_NOOP;
 (DEFAULT|default)	return KW_DEFAULT;