Rationalize X11-related include files