diff --git a/configure.ac b/configure.ac
index f98d13a..97596ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,13 +44,6 @@ AC_CONFIG_AUX_DIR(.)
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
 
-# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
-
-XORG_MACROS_VERSION(1.8)
-XORG_DEFAULT_OPTIONS
-
 # Initialize libtool
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
@@ -148,6 +141,7 @@ if test "$DRI" = yes; then
         CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $CFLAGS"
 AC_CHECK_HEADER(xf86drmMode.h,[DRM_MODE=yes],[DRM_MODE=no],[#include <stdint.h>
 #include <stdlib.h>])
+        AM_CONDITIONAL(DRM_MODE, test x$DRM_MODE = xyes)
         if test "x$DRM_MODE" = xyes; then
             PKG_CHECK_MODULES(LIBUDEV, [libudev], [LIBUDEV=yes], [LIBUDEV=no])
             if test "x$LIBUDEV" = xyes; then
@@ -181,7 +175,7 @@ AM_CONDITIONAL(XVMC, test x$XVMC = xyes)
 # Check the ABI_VIDEODRV_VERSION
 SAVE_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $XORG_CFLAGS"
-		
+
 AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test x$XSERVER_LIBPCIACCESS = xyes)
 if test "$XSERVER_LIBPCIACCESS" = yes; then
         AC_DEFINE(XSERVER_LIBPCIACCESS,1,[Enable libpciaccess])
@@ -217,6 +211,7 @@ AC_DEFINE(X_NEED_I2CSTART,1,[Compatibility define for older Xen])
 DRIVER_MAN_SUFFIX="4"
 AC_SUBST([DRIVER_MAN_SUFFIX])
 
+XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
 
 AC_OUTPUT([
diff --git a/src/Makefile.am b/src/Makefile.am
index 7f757e4..7381299 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,9 +29,9 @@ SUBDIRS = xvmc
 BUILT_SOURCES = version.h
 EXTRA_DIST = version.h
 CONFIG_CLEAN_FILES= version.h
-AM_CFLAGS = @XORG_CFLAGS@ @DRI_CFLAGS@
+AM_CFLAGS = @XORG_CFLAGS@ @LIBUDEV_CFLAGS@ @DRI_CFLAGS@
 openchrome_drv_la_LTLIBRARIES = openchrome_drv.la
-openchrome_drv_la_LDFLAGS = -module -avoid-version
+openchrome_drv_la_LDFLAGS = -module -avoid-version @LIBUDEV_LIBS@
 openchrome_drv_ladir = @moduledir@/drivers
 
 openchrome_drv_la_SOURCES = \
@@ -83,7 +83,7 @@ openchrome_drv_la_SOURCES += \
          via_drm.h \
          via_drmclient.h \
          via_xvmc.c \
-         via_xvmc.h 
+         via_xvmc.h
 else
 EXTRA_DIST += \
          via_dri.c \
@@ -91,9 +91,18 @@ EXTRA_DIST += \
          via_drm.h \
          via_drmclient.h \
          via_xvmc.c \
-         via_xvmc.h 
+         via_xvmc.h
 endif
 
+if DRM_MODE
+openchrome_drv_la_SOURCES += \
+	via_kms.c \
+	via_kms.h
+else
+EXTRA_DIST += \
+	via_kms.c \
+	via_kms.h
+endif
 
 via_driver.lo: version.h
 version.h: $(openchrome_drv_la_SOURCES)
diff --git a/src/via_driver.h b/src/via_driver.h
index 21f26fb..5ade53b 100644
--- a/src/via_driver.h
+++ b/src/via_driver.h
@@ -69,7 +69,9 @@
 #include "via_memmgr.h"
 
 #include "via_regs.h"
+#ifdef DRM_MODE 
 #include "via_kms.h"
+#endif
 #include "via_ums.h"
 #include "via_dmabuffer.h"
 #include "via_3d.h"
diff --git a/src/via_exa.c b/src/via_exa.c
index 1b44add..739cf9a 100644
--- a/src/via_exa.c
+++ b/src/via_exa.c
@@ -36,6 +36,9 @@
 #include <X11/Xarch.h>
 #include "miline.h"
 
+#include <GL/gl.h>
+#include <sys/mman.h>
+
 #include "via_driver.h"
 #include "via_regs.h"
 #include "via_dmabuffer.h"