5 files changed, 15 insertions, 6 deletions
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index b522e62..af6d036 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -62,8 +62,6 @@
 #include "rhd_cp.h"
 
 #include "radeon_accel.h"
-#include "radeon_xaa.h"
-#include "radeon_exa.h"
 
 #include "radeon_reg.h"
 #ifdef USE_DRI
diff --git a/src/radeon_accel.h b/src/radeon_accel.h
index c67e66a..4fc84cc 100644
--- a/src/radeon_accel.h
+++ b/src/radeon_accel.h
@@ -133,4 +133,19 @@ extern void RADEONWaitForIdleMMIO(ScrnInfoPtr pScrn);
 extern void RADEONWaitForIdleCP(ScrnInfoPtr pScrn);
 #endif
 
+# ifdef USE_EXA
+/* radeon_exa.c */
+extern Bool RADEONSetupMemEXA(ScreenPtr pScreen);
+extern Bool RADEON_EXAInit(ScreenPtr pScreen);
+extern void RADEONCloseEXA(ScreenPtr pScreen);
+
+# endif /* USE_EXA */
+# ifdef USE_XAA
+
+extern Bool RADEONSetupMemXAA(int scrnIndex, ScreenPtr pScreen);
+extern Bool RADEON_XAAInit(ScreenPtr pScreen);
+extern void RADEONCloseXAA(ScreenPtr pScreen);
+
+# endif /* USE_XAA */
+
 #endif /*  _RADEON_ACCEL_H */
diff --git a/src/radeon_exa.c b/src/radeon_exa.c
index 5877560..b26d707 100644
--- a/src/radeon_exa.c
+++ b/src/radeon_exa.c
@@ -35,7 +35,6 @@
 
 #include "rhd.h"
 #include "radeon_accel.h"
-#include "radeon_exa.h"
 #include "rhd_dri.h"
 #include "rhd_cp.h"
 
diff --git a/src/radeon_xaa.c b/src/radeon_xaa.c
index 480964e..8da414f 100644
--- a/src/radeon_xaa.c
+++ b/src/radeon_xaa.c
@@ -69,7 +69,6 @@
 				/* Driver data structures */
 #include "rhd.h"
 #include "radeon_accel.h"
-#include "radeon_xaa.h"
 #include "rhd_dri.h"
 #include "rhd_cp.h"
 
diff --git a/src/rhd_driver.c b/src/rhd_driver.c
index c363034..590f5a3 100644
--- a/src/rhd_driver.c
+++ b/src/rhd_driver.c
@@ -115,8 +115,6 @@
 #include "r5xx_accel.h"
 #endif
 #include "radeon_accel.h"
-#include "radeon_xaa.h"
-#include "radeon_exa.h"
 
 #ifdef USE_DRI
 #include "rhd_dri.h"