$NetBSD: patch-bh,v 1.1 2008/08/31 06:52:29 dholland Exp $

--- server/cmapwin.c.orig	1998-04-30 10:33:41.000000000 -0400
+++ server/cmapwin.c	2008-08-31 01:08:28.000000000 -0400
@@ -28,11 +28,16 @@
 *	value of the WM_COLORMAP_WINDOWS property.			*
 *									*
 ************************************************************************/
+#include <stdlib.h>
+#include <string.h>
 #include "xmx.h"
 #include "incl/cmapwin.pvt.h"
 
 #define WINVECINCR	32
 
+/* avoid conflict with legacy version of strchr */
+#define index myindex
+
 static rid_t *winvec;
 static int winvecsz;
 static int index;