I get the following errors building in jhbuild:

sna_display.c: In function 'sna_mode_disable_shadow':
sna_display.c:850:2: warning: passing argument 1 of 'DamageUnregister' from incompatible pointer type [enabled by default]
  DamageUnregister(&sna->front->drawable, sna->mode.shadow_damage);
  ^
In file included from /opt/jhbuild-gnome/include/xorg/pixmapstr.h:53:0,
                 from /opt/jhbuild-gnome/include/xorg/xf86str.h:40,
                 from /opt/jhbuild-gnome/include/xorg/xf86.h:44,
                 from /opt/jhbuild-gnome/include/xorg/xf86i2c.h:9,
                 from /opt/jhbuild-gnome/include/xorg/xf86DDC.h:16,
                 from sna_display.c:46:
/opt/jhbuild-gnome/include/xorg/damage.h:77:2: note: expected 'DamagePtr' but argument is of type 'struct DrawableRec *'
  DamageUnregister(DamagePtr pDamage);
  ^
sna_display.c:850:2: error: too many arguments to function 'DamageUnregister'
  DamageUnregister(&sna->front->drawable, sna->mode.shadow_damage);
  ^
In file included from /opt/jhbuild-gnome/include/xorg/pixmapstr.h:53:0,
                 from /opt/jhbuild-gnome/include/xorg/xf86str.h:40,
                 from /opt/jhbuild-gnome/include/xorg/xf86.h:44,
                 from /opt/jhbuild-gnome/include/xorg/xf86i2c.h:9,
                 from /opt/jhbuild-gnome/include/xorg/xf86DDC.h:16,
                 from sna_display.c:46:
/opt/jhbuild-gnome/include/xorg/damage.h:77:2: note: declared here
  DamageUnregister(DamagePtr pDamage);
  ^
Makefile:585: recipe for target 'sna_display.lo' failed
make[4]: *** [sna_display.lo] Error 1
make[4]: *** Waiting for unfinished jobs....
sna_accel.c: In function 'sna_poly_zero_line_blt':
sna_accel.c:7629:11: warning: variable 'intersects' set but not used [-Wunused-but-set-variable]
      bool intersects;
           ^
sna_accel.c:7528:7: warning: variable 'degenerate' set but not used [-Wunused-but-set-variable]
  bool degenerate = true;
       ^
sna_accel.c: In function 'migrate_dirty_tracking':
sna_accel.c:15226:3: warning: passing argument 1 of 'DamageUnregister' from incompatible pointer type [enabled by default]
   DamageUnregister(&dirty->src->drawable, dirty->damage);
   ^
In file included from /opt/jhbuild-gnome/include/xorg/pixmapstr.h:53:0,
                 from /opt/jhbuild-gnome/include/xorg/xf86str.h:40,
                 from /opt/jhbuild-gnome/include/xorg/xf86.h:44,
                 from ../../src/intel_options.h:4,
                 from sna_accel.c:32:
/opt/jhbuild-gnome/include/xorg/damage.h:77:2: note: expected 'DamagePtr' but argument is of type 'struct DrawableRec *'
  DamageUnregister(DamagePtr pDamage);
  ^
sna_accel.c:15226:3: error: too many arguments to function 'DamageUnregister'
   DamageUnregister(&dirty->src->drawable, dirty->damage);
   ^
In file included from /opt/jhbuild-gnome/include/xorg/pixmapstr.h:53:0,
                 from /opt/jhbuild-gnome/include/xorg/xf86str.h:40,
                 from /opt/jhbuild-gnome/include/xorg/xf86.h:44,
                 from ../../src/intel_options.h:4,
                 from sna_accel.c:32:
/opt/jhbuild-gnome/include/xorg/damage.h:77:2: note: declared here
  DamageUnregister(DamagePtr pDamage);
  ^

I wasn't sure if it was more appropriate to report this for xwayland or xorg, but this is my best guess.