diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index e283fbb6c..f928660e6 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -32,6 +32,9 @@ Equipment Corporation.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+
+#include "os/osdep.h"
+
 #include "windowstr.h"
 #include "dixfontstr.h"
 #include "gcstruct.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index a1d07ec78..50be28d7d 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -32,6 +32,10 @@ in this Software without prior written authorization from the X Consortium.
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/saverproto.h>
+
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "os.h"
 #include "windowstr.h"
@@ -41,7 +45,6 @@ in this Software without prior written authorization from the X Consortium.
 #include "dixstruct.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/saverproto.h>
 #include "gcstruct.h"
 #include "cursorstr.h"
 #include "colormapst.h"
@@ -61,6 +64,10 @@ in this Software without prior written authorization from the X Consortium.
 
 #include "extinit.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 d42e37916..82f872526 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -32,6 +32,8 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/extensions/securproto.h>
 #include <X11/Xfuncproto.h>
 
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "inputstr.h"
 #include "windowstr.h"
diff --git a/Xext/shm.c b/Xext/shm.c
index 075577652..65bf63764 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -43,6 +43,7 @@ in this Software without prior written authorization from The Open Group.
 #include <X11/Xproto.h>
 
 #include "os/busfault.h"
+#include "os/osdep.h"
 
 #include "misc.h"
 #include "os.h"
diff --git a/Xext/sync.c b/Xext/sync.c
index 6f1131755..bce7d76a5 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -58,6 +58,10 @@ PERFORMANCE OF THIS SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xproto.h>
 #include <X11/Xmd.h>
+#include <X11/extensions/syncproto.h>
+
+#include "os/osdep.h"
+
 #include "scrnintstr.h"
 #include "os.h"
 #include "extnsionst.h"
@@ -65,7 +69,6 @@ PERFORMANCE OF THIS SOFTWARE.
 #include "pixmapstr.h"
 #include "resource.h"
 #include "opaque.h"
-#include <X11/extensions/syncproto.h>
 #include "syncsrv.h"
 #include "syncsdk.h"
 #include "protocol-versions.h"
diff --git a/composite/compinit.c b/composite/compinit.c
index 7e324afdc..c7a06e015 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -45,6 +45,8 @@
 #include <dix-config.h>
 #endif
 
+#include "os/osdep.h"
+
 #include "compint.h"
 #include "compositeext.h"
 
diff --git a/dix/devices.c b/dix/devices.c
index 491a012df..c3a31ea80 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -48,11 +48,19 @@ SOFTWARE.
 #include <dix-config.h>
 #endif
 
+#include <math.h>
+#include <pixman.h>
 #include <X11/X.h>
-#include "misc.h"
-#include "resource.h"
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XI2.h>
+#include <X11/extensions/XIproto.h>
+
+#include "os/osdep.h"
+
+#include "misc.h"
+#include "resource.h"
 #include "windowstr.h"
 #include "inputstr.h"
 #include "scrnintstr.h"
@@ -71,11 +79,6 @@ SOFTWARE.
 #include "eventstr.h"
 #include "dixgrabs.h"
 
-#include <X11/extensions/XI.h>
-#include <X11/extensions/XI2.h>
-#include <X11/extensions/XIproto.h>
-#include <math.h>
-#include <pixman.h>
 #include "exglobals.h"
 #include "exevents.h"
 #include "xiquerydevice.h"      /* for SizeDeviceClasses */
diff --git a/dix/gc.c b/dix/gc.c
index 827dfba32..28fee5191 100644
--- a/dix/gc.c
+++ b/dix/gc.c
@@ -51,6 +51,9 @@ SOFTWARE.
 #include <X11/X.h>
 #include <X11/Xmd.h>
 #include <X11/Xproto.h>
+
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "resource.h"
 #include "gcstruct.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/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 71d239934..fce7c401d 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -50,6 +50,8 @@
 #include <sys/types.h>
 #include <grp.h>
 
+#include "os/osdep.h"
+
 #include "xf86.h"
 #include "xf86Modes.h"
 #include "xf86Parser.h"
diff --git a/include/misc.h b/include/misc.h
index 3e1834f54..2c778456d 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -394,8 +394,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 8c8b982d2..fb93cd0ff 100644
--- a/os/osdep.h
+++ b/os/osdep.h
@@ -246,4 +246,6 @@ void ForceClockId(clockid_t forced_clockid);
 Bool WaitForSomething(Bool clients_are_ready);
 void CloseDownConnection(ClientPtr client);
 
+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 042adf00b..901fe7cbf 100644
--- a/render/picture.c
+++ b/render/picture.c
@@ -26,6 +26,8 @@
 #include <dix-config.h>
 #endif
 
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "scrnintstr.h"
 #include "os.h"
diff --git a/render/render.c b/render/render.c
index 466de72fb..cf777297d 100644
--- a/render/render.c
+++ b/render/render.c
@@ -28,6 +28,12 @@
 
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/render.h>
+#include <X11/extensions/renderproto.h>
+#include <X11/Xfuncproto.h>
+
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "os.h"
 #include "dixstruct.h"
@@ -39,11 +45,8 @@
 #include "extnsionst.h"
 #include "extinit.h"
 #include "servermd.h"
-#include <X11/extensions/render.h>
-#include <X11/extensions/renderproto.h>
 #include "picturestr.h"
 #include "glyphstr.h"
-#include <X11/Xfuncproto.h>
 #include "cursorstr.h"
 #include "xace.h"
 #include "protocol-versions.h"
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 35bfb3816..a02d0f816 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -31,6 +31,11 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <stdio.h>
 #include <X11/X.h>
 #include <X11/Xproto.h>
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XKMformat.h>
+
+#include "os/osdep.h"
+
 #include "misc.h"
 #include "inputstr.h"
 #include <xkbsrv.h>