--- 9wm-1.2.orig/menu.c

+++ 9wm-1.2/menu.c

@@ -1,6 +1,8 @@

 /* Copyright (c) 1994-1996 David Hogan, see README for licence details */

+#include <stdlib.h>

 #include <stdio.h>

 #include <signal.h>

+#include <unistd.h>

 #include <X11/X.h>

 #include <X11/Xlib.h>

 #include <X11/Xutil.h>

@@ -191,7 +193,7 @@

 	}

 	XUnmapWindow(dpy, c->parent);

 	XUnmapWindow(dpy, c->window);

-	setstate(c, IconicState);

+	setwinstate(c, IconicState);

 	if (c == current)

 		nofocus();

 	hiddenc[numhidden] = c;

@@ -222,7 +224,7 @@

 	if (map) {

 		XMapWindow(dpy, c->window);

 		XMapRaised(dpy, c->parent);

-		setstate(c, NormalState);

+		setwinstate(c, NormalState);

 		active(c);

 		top(c);

 	}

--- 9wm-1.2.orig/manage.c

+++ 9wm-1.2/manage.c

@@ -50,7 +50,7 @@

 	/* Figure out what to do with the window from hints */

-	if (!getstate(c->window, &state))

+	if (!getwinstate(c->window, &state))

 		state = hints ? hints->initial_state : NormalState;

 	dohide = (state == IconicState);

@@ -135,7 +135,7 @@

 			active(c);

 		else

 			setactive(c, 0);

-		setstate(c, NormalState);

+		setwinstate(c, NormalState);

 	}

 	if (current && (current != c))

 		cmapfocus(current);

@@ -195,7 +195,7 @@

 	XReparentWindow(dpy, c->window, c->screen->root, c->x, c->y);

 	gravitate(c, 0);

 	XRemoveFromSaveSet(dpy, c->window);

-	setstate(c, WithdrawnState);

+	setwinstate(c, WithdrawnState);

 	/* flush any errors */

 	ignore_badwindow = 1;

@@ -452,7 +452,7 @@

 }

 void

-setstate(c, state)

+setwinstate(c, state)

 Client *c;

 int state;

 {

@@ -467,7 +467,7 @@

 }

 int

-getstate(w, state)

+getwinstate(w, state)

 Window w;

 int *state;

 {

--- 9wm-1.2.orig/client.c

+++ 9wm-1.2/client.c

@@ -1,5 +1,7 @@

 /* Copyright (c) 1994-1996 David Hogan, see README for licence details */

+#include <stdlib.h>

 #include <stdio.h>

+#include <string.h>

 #include <X11/X.h>

 #include <X11/Xlib.h>

 #include <X11/Xutil.h>

--- 9wm-1.2.orig/main.c

+++ 9wm-1.2/main.c

@@ -1,4 +1,5 @@

 /* Copyright (c) 1994-1996 David Hogan, see README for licence details */

+#include <stdlib.h>

 #include <stdio.h>

 #include <signal.h>

 #include <errno.h>

--- 9wm-1.2.orig/event.c

+++ 9wm-1.2/event.c

@@ -1,4 +1,5 @@

 /* Copyright (c) 1994-1996 David Hogan, see README for licence details */

+#include <stdlib.h>

 #include <stdio.h>

 #include <X11/X.h>

 #include <X11/Xos.h>

@@ -200,7 +201,7 @@

 		XMapWindow(dpy, c->window);

 		XMapRaised(dpy, c->parent);

 		top(c);

-		setstate(c, NormalState);

+		setwinstate(c, NormalState);

 		if (c->trans != None && current && c->trans == current->window)

 				active(c);

 		break;

--- 9wm-1.2.orig/error.c

+++ 9wm-1.2/error.c

@@ -1,4 +1,5 @@

 /* Copyright (c) 1994-1996 David Hogan, see README for licence details */

+#include <stdlib.h>

 #include <stdio.h>

 #include <X11/X.h>

 #include <X11/Xlib.h>

--- 9wm-1.2.orig/fns.h

+++ 9wm-1.2/fns.h

@@ -46,8 +46,8 @@

 char	*getprop();

 Window	getwprop();

 int 	getiprop();

-int 	getstate();

-void	setstate();

+int 	getwinstate();

+void	setwinstate();

 void	setlabel();

 void	getproto();

 void	gettrans();