diff --git a/src/Makefile.am b/src/Makefile.am
index c64c2036..1680123a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,6 +44,7 @@ i810_drv_la_SOURCES = \
          i810_video.c \
          i810_wmark.c \
          i830_accel.c \
+         i830_agp.c \
          i830_common.h \
          i830_cursor.c \
          i830_dga.c \
@@ -54,7 +55,9 @@ i810_drv_la_SOURCES = \
          i830_modes.c \
          i830_video.c \
          i830_rotate.c \
-	 i830_randr.c
+	 i830_randr.c \
+	 intel_randr.c \
+	 intel_acpi.c
 
 if DRI
 i810_drv_la_SOURCES += \
diff --git a/src/i810_driver.c b/src/i810_driver.c
index cf3725a9..37c20d80 100644
--- a/src/i810_driver.c
+++ b/src/i810_driver.c
@@ -327,13 +327,6 @@ const char *I810driSymbols[] = {
    NULL
 };
 
-#ifdef XF86DRI
-
-const char *I810shadowFBSymbols[] = {
-    "ShadowFBInit",
-    NULL
-};
-
 const char *I810shadowSymbols[] = {
     "shadowInit",
     "shadowSetup",
@@ -341,8 +334,6 @@ const char *I810shadowSymbols[] = {
     NULL
 };
 
-#endif
-
 #endif /* I830_ONLY */
 
 #ifndef I810_DEBUG
diff --git a/src/i830.h b/src/i830.h
index 2ff20a7c..29506eae 100644
--- a/src/i830.h
+++ b/src/i830.h
@@ -47,6 +47,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _I830_H_
 #define _I830_H_
 
+#include "xf86_OSproc.h"
 #include "compiler.h"
 #include "xf86PciInfo.h"
 #include "xf86Pci.h"
@@ -220,6 +221,7 @@ typedef struct _I830Rec {
 #endif
    unsigned int LinearAlloc;
   
+   XF86ModReqInfo shadowReq; /* to test for later libshadow */
    I830MemRange RotatedMem;
    I830MemRange RotatedMem2;
    Rotation rotation;
diff --git a/src/i830_agp.c b/src/i830_agp.c
index b10af0e1..aba5bcf7 100644
--- a/src/i830_agp.c
+++ b/src/i830_agp.c
@@ -13,11 +13,13 @@
 #include <sys/types.h>
 #include <linux/agpgart.h>
 #elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/agpio.h>
+#include <sys/errno.h>
+#include <sys/fcntl.h>
 #endif
 
-#include "X.h"
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "i830.h"
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 1886c52a..f4cdfdcf 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -169,6 +169,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <string.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 #include "xf86.h"
 #include "xf86_OSproc.h"
diff --git a/src/i830_rotate.c b/src/i830_rotate.c
index 9c91cc40..1f1d7291 100644
--- a/src/i830_rotate.c
+++ b/src/i830_rotate.c
@@ -680,10 +680,13 @@ I830Rotate(ScrnInfoPtr pScrn, DisplayModePtr mode)
 	 0
    };
 
-   if (IS_I9XX(pI830))
-      func = I915UpdateRotate;
+   if (pI830->noAccel)
+      func = LoaderSymbol("shadowUpdateRotatePacked");
    else
-      func = I830UpdateRotate;
+      if (IS_I9XX(pI830))
+	 func = I915UpdateRotate;
+      else
+	 func = I830UpdateRotate;
 
    if (I830IsPrimary(pScrn)) {
       pI8301 = pI830;