diff --git a/exa/Makefile.am b/exa/Makefile.am
index 734bea65f..045033165 100644
--- a/exa/Makefile.am
+++ b/exa/Makefile.am
@@ -5,4 +5,5 @@ sdk_HEADERS = exa.h
 libexa_la_LDFLAGS = -avoid-version
 
 INCLUDES = $(XORG_INCS)
+DEFS += -DPIXPRIV
 libexa_la_SOURCES = exa.c exaasync.c exaoffscreen.c exapict.c
diff --git a/exa/exa_render.c b/exa/exa_render.c
index 630bed856..438c876e8 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <xorg-config.h>
 #endif
 #include "exaPriv.h"
 
diff --git a/hw/xfree86/exa/Makefile.am b/hw/xfree86/exa/Makefile.am
index 734bea65f..045033165 100644
--- a/hw/xfree86/exa/Makefile.am
+++ b/hw/xfree86/exa/Makefile.am
@@ -5,4 +5,5 @@ sdk_HEADERS = exa.h
 libexa_la_LDFLAGS = -avoid-version
 
 INCLUDES = $(XORG_INCS)
+DEFS += -DPIXPRIV
 libexa_la_SOURCES = exa.c exaasync.c exaoffscreen.c exapict.c
diff --git a/hw/xfree86/exa/exa_render.c b/hw/xfree86/exa/exa_render.c
index 630bed856..438c876e8 100644
--- a/hw/xfree86/exa/exa_render.c
+++ b/hw/xfree86/exa/exa_render.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <xorg-config.h>
 #endif
 #include "exaPriv.h"
 
diff --git a/hw/xfree86/exa/exapict.c b/hw/xfree86/exa/exapict.c
index 630bed856..438c876e8 100644
--- a/hw/xfree86/exa/exapict.c
+++ b/hw/xfree86/exa/exapict.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <xorg-config.h>
 #endif
 #include "exaPriv.h"