The issue is sys/sysmacros.h has been dropped from sys/types.h in glibc 2.23

Do you know if this can be safely added in for everything or will it need some
ifdeffery?

If it's straight forward I'll get the patches out later today (there's one for
xorg-server too)