diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 3e3567590..f0c54ee73 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -34,6 +34,7 @@ Equipment Corporation.
 #include <X11/Xproto.h>
 
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "windowstr.h"
 #include "dixfontstr.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index f76ff8e10..4adf59ccf 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -38,6 +38,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "dix/colormap_priv.h"
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 #include "os/screensaver.h"
 
 #include "misc.h"
@@ -64,6 +65,10 @@ in this Software without prior written authorization from the X Consortium.
 #include "protocol-versions.h"
 #include "extinit_priv.h"
 
+// temporary workaround for win32/mingw32 name clash
+// see: https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355
+#undef CreateWindow
+
 static int ScreenSaverEventBase = 0;
 
 static Bool ScreenSaverHandle(ScreenPtr pScreen, int xstate, Bool force);
diff --git a/Xext/security.c b/Xext/security.c
index 426dc8601..3dc010618 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -37,6 +37,7 @@ in this Software without prior written authorization from The Open Group.
 #include "include/extinit_priv.h"
 #include "os/audit.h"
 #include "os/auth.h"
+#include "os/osdep.h"
 
 #include "scrnintstr.h"
 #include "inputstr.h"
diff --git a/Xext/sync.c b/Xext/sync.c
index c71d919c1..12b37721a 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -61,6 +61,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/syncproto.h>
 
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "scrnintstr.h"
 #include "os.h"
diff --git a/composite/compinit.c b/composite/compinit.c
index ecb36897d..182f1f895 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -46,6 +46,7 @@
 #endif
 
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "compint.h"
 #include "compositeext.h"
diff --git a/dix/devices.c b/dix/devices.c
index d93429e86..cf2526405 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -61,6 +61,7 @@ SOFTWARE.
 #include "dix/exevents_priv.h"
 #include "dix/input_priv.h"
 #include "dix/ptrveloc_priv.h"
+#include "os/osdep.h"
 #include "xkb/xkbsrv_priv.h"
 
 #include "misc.h"
diff --git a/dix/gc.c b/dix/gc.c
index a546d3dfa..b704955ef 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -54,6 +54,7 @@ SOFTWARE.
 #include <X11/Xproto.h>
 
 #include "dix/gc_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "resource.h"
diff --git a/fb/fbscreen.c b/fb/fbscreen.c
index 42efaa911..f5a8e8be3 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -24,6 +24,8 @@
 #include <dix-config.h>
 #endif
 
+#include "os/osdep.h"
+
 #include "fb.h"
 
 Bool
diff --git a/include/misc.h b/include/misc.h
index 795cf1890..7cc05c4f6 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -390,8 +390,6 @@ extern _X_EXPORT void SwapShorts(short *list, unsigned long count);
 
 extern _X_EXPORT void MakePredeclaredAtoms(void);
 
-extern _X_EXPORT int Ones(unsigned long /*mask */ );
-
 typedef struct _xPoint *DDXPointPtr;
 typedef struct pixman_box16 *BoxPtr;
 typedef struct _xEvent *xEventPtr;
diff --git a/os/osdep.h b/os/osdep.h
index 50d72b218..90df49d35 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -215,4 +215,6 @@ extern Bool CoreDump;
 extern Bool NoListenAll;
 extern Bool AllowByteSwappedClients;
 
+int Ones(unsigned long mask);
+
 #endif                          /* _OSDEP_H_ */
diff --git a/render/mipict.c b/render/mipict.c
index 7fb03435b..fbaf32aef 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -25,6 +25,8 @@
 #include <dix-config.h>
 #endif
 
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/render/picture.c b/render/picture.c
index d41a0ed91..0d9fc07c2 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -27,6 +27,7 @@
 #endif
 
 #include "dix/colormap_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "scrnintstr.h"
diff --git a/render/render.c b/render/render.c
index 122bfead1..f1dce4794 100644
--- a/render/render.c
+++ b/render/render.c
@@ -35,6 +35,7 @@
 
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "os.h"
diff --git a/xkb/xkb.c b/xkb/xkb.c
index f203270d5..7f21b1894 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -35,6 +35,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/XKMformat.h>
 
 #include "dix/dix_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "inputstr.h"