Fix order of inclusions in surface.c

Fixes an issue which seems to surface on Arch Linux.