diff --git a/src/Makefile.am b/src/Makefile.am
index c64c2036..83025fa3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS = xvmc
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV
+AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@ -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
 
 i810_drv_la_LTLIBRARIES = i810_drv.la
 i810_drv_la_LDFLAGS = -module -avoid-version
@@ -54,7 +54,9 @@ i810_drv_la_SOURCES = \
          i830_modes.c \
          i830_video.c \
          i830_rotate.c \
-	 i830_randr.c
+	 i830_randr.c \
+	 i830_exa.c \
+	 i830_xaa.c
 
 if DRI
 i810_drv_la_SOURCES += \
diff --git a/src/i830_driver.c b/src/i830_driver.c
index de510e69..d6f686da 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -5724,7 +5724,7 @@ I830BIOSSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 
    /* Sync the engine before mode switch */
 #ifdef I830_USE_XAA
-   if (!pI830->noAccel && !pI830->useEXA)
+   if (!pI830->noAccel && !pI830->useEXA) {
       (*pI830->AccelInfoRec->Sync)(pScrn);
       pI830->AccelInfoRec->NeedToSync = FALSE;
    }