diff --git a/dix/dispatch.c b/dix/dispatch.c
index e3a254e63..1d34f1db7 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -128,6 +128,9 @@ Equipment Corporation.
 #include "client.h"
 #include "xfixesint.h"
 
+// temporary workaround for win32/mingw32 name clash
+#undef CreateWindow
+
 #ifdef XSERVER_DTRACE
 #include "registry.h"
 #include "probes.h"