Cleanup Raspberry Pi / EGL / X11 defines
Minor tweaks.