diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index e8252decf..57424135a 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -32,6 +32,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 ab2073d79..d07c41926 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -37,6 +37,7 @@ in this Software without prior written authorization from the X Consortium.
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "miext/extinit_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.
 
 Bool noScreenSaverExtension = FALSE;
 
+// 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 b13bea020..0d3343f65 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -35,6 +35,7 @@ in this Software without prior written authorization from The Open Group.
 #include "miext/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 6c4fb960c..8bea2c986 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -60,6 +60,7 @@ PERFORMANCE OF THIS SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "miext/extinit_priv.h"
+#include "os/osdep.h"
 
 #include "scrnintstr.h"
 #include "os.h"
diff --git a/composite/compinit.c b/composite/compinit.c
index e645ff6aa..88e69d37e 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -44,6 +44,7 @@
 #include <dix-config.h>
 
 #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 96712b4fd..cf58ecb46 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -61,6 +61,7 @@ SOFTWARE.
 #include "dix/input_priv.h"
 #include "dix/ptrveloc_priv.h"
 #include "os/log_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 8ee94d2e5..f99716db3 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -52,6 +52,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 e825aa92e..220a99511 100644
--- a/fb/fbscreen.c
+++ b/fb/fbscreen.c
@@ -22,6 +22,8 @@
 
 #include <dix-config.h>
 
+#include "os/osdep.h"
+
 #include "fb.h"
 
 Bool
diff --git a/include/misc.h b/include/misc.h
index 674074927..615da815d 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 90e5e84d9..45ee3dda4 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -212,4 +212,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 b80b58172..ac376eb71 100644
--- a/render/mipict.c
+++ b/render/mipict.c
@@ -23,6 +23,8 @@
 
 #include <dix-config.h>
 
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "gcstruct.h"
 #include "pixmapstr.h"
diff --git a/render/picture.c b/render/picture.c
index 439b38864..0d3bb521c 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -25,6 +25,7 @@
 #include <dix-config.h>
 
 #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 f0a28a493..26d6355a4 100644
--- a/render/render.c
+++ b/render/render.c
@@ -34,6 +34,7 @@
 #include "dix/cursor_priv.h"
 #include "dix/dix_priv.h"
 #include "miext/extinit_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "os.h"
diff --git a/xkb/xkb.c b/xkb/xkb.c
index c99c8940a..8081d48e4 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -34,6 +34,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "dix/dix_priv.h"
 #include "miext/extinit_priv.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "inputstr.h"