diff --git a/x11-drivers/xf86-video-vmware/files/patch-saa_saa.h b/x11-drivers/xf86-video-vmware/files/patch-saa_saa.h
new file mode 100644
index 000000000000..f730407cefcf
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/files/patch-saa_saa.h
@@ -0,0 +1,10 @@
+--- saa/saa.h.orig	2021-12-02 13:55:48 UTC
++++ saa/saa.h
+@@ -40,6 +40,7 @@
+ #else
+ #include <xorg-server.h>
+ #endif
++#undef bool
+ #include <xf86.h>
+ #include <damage.h>
+ #include <picturestr.h>
diff --git a/x11-drivers/xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h b/x11-drivers/xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h
new file mode 100644
index 000000000000..36a748b34756
--- /dev/null
+++ b/x11-drivers/xf86-video-vmware/files/patch-vmwgfx_vmwgfx__driver.h
@@ -0,0 +1,10 @@
+--- vmwgfx/vmwgfx_driver.h.orig	2021-12-02 13:55:36 UTC
++++ vmwgfx/vmwgfx_driver.h
+@@ -40,6 +40,7 @@
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
+ #include <xorg-server.h>
++#undef bool
+ #include <xf86.h>
+ #include <xf86Crtc.h>
+ #include <xf86xv.h>