Patches to cleanup panoramix compile issues

[Benjamin Close]

Hi folks these patches fix the compilation issues with xserver as reported 
at http://www.mail-archive.com/xorg@lists.freedesktop.org/msg04615.html

The xserver should only be using the header from the proto rather than
pulling in the header from libXinerama which also has Xlib related code in it.
However the proto doesn't have the required defines. Hence we shift the defines
back to proto, cleanup unneeded code in the lib and some stale includes in the server
making things compile out the box and breaking the dependancy of xserver on libXinerama