Some fix to include X11 headers