diff --git a/bazel/wrlib/wraster.h.in b/bazel/wrlib/wraster.h.in
index 6f6e5df4..0015f5fb 100644
--- a/bazel/wrlib/wraster.h.in
+++ b/bazel/wrlib/wraster.h.in
@@ -46,7 +46,9 @@
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-@USE_XSHM@#include <X11/extensions/XShm.h>
+
+// TODO: XSHM support was originally optional.
+#include <X11/extensions/XShm.h>
 
 
 /*
@@ -258,9 +260,10 @@ typedef struct RImage {
 typedef struct RXImage {
     XImage *image;
 
-@USE_XSHM@    /* Private data. Do not access */
-@USE_XSHM@    XShmSegmentInfo info;
-@USE_XSHM@    char is_shared;
+    // TODO: XSHM support was originally optional.
+    /* Private data. Do not access */
+    XShmSegmentInfo info;
+    char is_shared;
 } RXImage;