--- a/wm.h	Mon Jul 10 16:49:43 2006 +0200
+++ b/wm.h	Mon Jul 10 18:35:39 2006 +0200
@@ -3,7 +3,9 @@
  * See LICENSE file for license details.
  */
 
-#include <X11/Xlib.h>
+#include "draw.h"
+#include "util.h"
+
 #include <X11/Xutil.h>
 
 /* WM atoms */
@@ -54,4 +56,3 @@
 extern Pixmap pmap;
 
 /* wm.c */
-extern void error(char *errstr, ...);