gallium: include u_surface.h instead of u_rect.h