diff --git a/configure.ac b/configure.ac
index 072462ca4..e78286dd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -910,6 +910,7 @@ hw/xfree86/dixmods/Makefile
 hw/xfree86/dixmods/extmod/Makefile
 hw/xfree86/dri/Makefile
 hw/xfree86/dummylib/Makefile
+hw/xfree86/exa/Makefile
 hw/xfree86/fbdevhw/Makefile
 hw/xfree86/i2c/Makefile
 hw/xfree86/int10/Makefile
diff --git a/exa/exa.c b/exa/exa.c
index 50550b0a4..f7574586d 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <xorg-config.h>
 #endif
 #include "exaPriv.h"
 #include <X11/fonts/fontstruct.h>
diff --git a/exa/exa_accel.c b/exa/exa_accel.c
index 50550b0a4..f7574586d 100644
--- a/exa/exa_accel.c
+++ b/exa/exa_accel.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <xorg-config.h>
 #endif
 #include "exaPriv.h"
 #include <X11/fonts/fontstruct.h>
diff --git a/exa/exa_migration.c b/exa/exa_migration.c
index 50550b0a4..f7574586d 100644
--- a/exa/exa_migration.c
+++ b/exa/exa_migration.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <xorg-config.h>
 #endif
 #include "exaPriv.h"
 #include <X11/fonts/fontstruct.h>
diff --git a/hw/xfree86/exa/exa.c b/hw/xfree86/exa/exa.c
index 50550b0a4..f7574586d 100644
--- a/hw/xfree86/exa/exa.c
+++ b/hw/xfree86/exa/exa.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <xorg-config.h>
 #endif
 #include "exaPriv.h"
 #include <X11/fonts/fontstruct.h>
diff --git a/hw/xfree86/exa/exa_accel.c b/hw/xfree86/exa/exa_accel.c
index 50550b0a4..f7574586d 100644
--- a/hw/xfree86/exa/exa_accel.c
+++ b/hw/xfree86/exa/exa_accel.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <xorg-config.h>
 #endif
 #include "exaPriv.h"
 #include <X11/fonts/fontstruct.h>
diff --git a/hw/xfree86/exa/exa_migration.c b/hw/xfree86/exa/exa_migration.c
index 50550b0a4..f7574586d 100644
--- a/hw/xfree86/exa/exa_migration.c
+++ b/hw/xfree86/exa/exa_migration.c
@@ -23,7 +23,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include <xorg-config.h>
 #endif
 #include "exaPriv.h"
 #include <X11/fonts/fontstruct.h>