diff --git a/Xext/xres.c b/Xext/xres.c
index ecef0c032..dbefeebdb 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -29,7 +29,10 @@
 #include <string.h>
 #include "hashtable.h"
 #include "picturestr.h"
+
+#ifdef COMPOSITE
 #include "compint.h"
+#endif
 
 /** @brief Holds fragments of responses for ConstructClientIds.
  *
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 3815525fa..f6c3f2244 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -251,8 +251,9 @@ cat > sdksyms.c << EOF
 #include "exa.h"
  */
 
-
+#ifdef COMPOSITE
 #include "compositeext.h"
+#endif
 
 /* xfixes/Makefile.am */
 #include "xfixes.h"