diff --git a/dix/dispatch.c b/dix/dispatch.c
index 04a50259d..aeb9d0717 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -132,6 +132,9 @@ Equipment Corporation.
 #include "client.h"
 #include "xfixesint.h"
 
+// temporary workaround for win32/mingw32 name clash
+#undef CreateWindow
+
 #ifdef XSERVER_DTRACE
 #include "probes.h"
 #endif