composite: clean up including panoramix headers

* use their actual path instead of relying this to be in compiler's
  include path list.
* no need to do it only conditionally, no #ifdef needed

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

Xext/panoramiX.h

@@ -37,6 +37,7 @@ Equipment Corporation.
 #ifndef _PANORAMIX_H_
 #define _PANORAMIX_H_
 
+#include <X11/Xmd.h>
 #include <X11/extensions/panoramiXproto.h>
 
 #include "gcstruct.h"

composite/compext.c

@@ -44,6 +44,7 @@
 #include <dix-config.h>
 
 #include "dix/dix_priv.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "compint.h"
 #include "xace.h"
@@ -572,7 +573,6 @@ CompositeExtensionInit(void)
 }
 
 #ifdef XINERAMA
-#include "panoramiXsrv.h"
 
 int (*PanoramiXSaveCompositeVector[CompositeNumberRequests]) (ClientPtr);
 

composite/compoverlay.c

@@ -42,16 +42,15 @@
  */
 
 #include <dix-config.h>
+#include <X11/Xmd.h>
+
+#include "Xext/panoramiXsrv.h"
 
 #include "dix/window_priv.h"
 
 #include "compint.h"
 #include "xace.h"
 
-#ifdef XINERAMA
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
-
 /*
  * Delete the given overlay client list element from its screen list.
  */

composite/compwindow.c

@@ -46,14 +46,11 @@
 #include "dix/dix_priv.h"
 #include "dix/resource_priv.h"
 #include "os/osdep.h"
+#include "Xext/panoramiXsrv.h"
 
 #include "compint.h"
 #include "compositeext_priv.h"
 
-#ifdef XINERAMA
-#include "panoramiXsrv.h"
-#endif /* XINERAMA */
-
 #ifdef COMPOSITE_DEBUG
 static int
 compCheckWindow(WindowPtr pWin, void *data)