Fix build without fixx11h.h

This fixes issue #1 by rearrange headers to build in such a way that fixx11h.h isn't needed (the X11 headers are the last ones included).