diff --git a/driver/xf86-video-wsudl/config.h.in b/driver/xf86-video-wsudl/config.h.in
index 94228c2ff..a6aea89c9 100644
--- a/driver/xf86-video-wsudl/config.h.in
+++ b/driver/xf86-video-wsudl/config.h.in
@@ -32,12 +32,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Have 1bpp support */
-#undef HAVE_XF1BPP
-
-/* Have 4bpp support */
-#undef HAVE_XF4BPP
-
 /* Name of package */
 #undef PACKAGE
 
diff --git a/driver/xf86-video-wsudl/configure b/driver/xf86-video-wsudl/configure
index 2b3ca0e8b..e6b217398 100644
--- a/driver/xf86-video-wsudl/configure
+++ b/driver/xf86-video-wsudl/configure
@@ -20840,295 +20840,6 @@ $as_echo "yes" >&6; }
 	:
 fi
 
-# Checks for libraries.
-
-# Check for xf1bpp & xf4bpp (removed in xorg-server 1.6 & later)
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-if test "${ac_cv_header_xf1bpp_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for xf1bpp.h" >&5
-$as_echo_n "checking for xf1bpp.h... " >&6; }
-if test "${ac_cv_header_xf1bpp_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_xf1bpp_h" >&5
-$as_echo "$ac_cv_header_xf1bpp_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking xf1bpp.h usability" >&5
-$as_echo_n "checking xf1bpp.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <xf1bpp.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking xf1bpp.h presence" >&5
-$as_echo_n "checking xf1bpp.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <xf1bpp.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: xf1bpp.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: xf1bpp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf1bpp.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: xf1bpp.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: xf1bpp.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: xf1bpp.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf1bpp.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: xf1bpp.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf1bpp.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: xf1bpp.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf1bpp.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: xf1bpp.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf1bpp.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: xf1bpp.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf1bpp.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: xf1bpp.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for xf1bpp.h" >&5
-$as_echo_n "checking for xf1bpp.h... " >&6; }
-if test "${ac_cv_header_xf1bpp_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_xf1bpp_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_xf1bpp_h" >&5
-$as_echo "$ac_cv_header_xf1bpp_h" >&6; }
-
-fi
-if test $ac_cv_header_xf1bpp_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XF1BPP 1
-_ACEOF
-
-fi
-
-
-if test "${ac_cv_header_xf4bpp_h+set}" = set; then
-  { $as_echo "$as_me:$LINENO: checking for xf4bpp.h" >&5
-$as_echo_n "checking for xf4bpp.h... " >&6; }
-if test "${ac_cv_header_xf4bpp_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_xf4bpp_h" >&5
-$as_echo "$ac_cv_header_xf4bpp_h" >&6; }
-else
-  # Is the header compilable?
-{ $as_echo "$as_me:$LINENO: checking xf4bpp.h usability" >&5
-$as_echo_n "checking xf4bpp.h usability... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <xf4bpp.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_header_compiler=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_header_compiler=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:$LINENO: checking xf4bpp.h presence" >&5
-$as_echo_n "checking xf4bpp.h presence... " >&6; }
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <xf4bpp.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null && {
-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       }; then
-  ac_header_preproc=yes
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-
-rm -f conftest.err conftest.$ac_ext
-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { $as_echo "$as_me:$LINENO: WARNING: xf4bpp.h: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: xf4bpp.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf4bpp.h: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: xf4bpp.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { $as_echo "$as_me:$LINENO: WARNING: xf4bpp.h: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: xf4bpp.h: present but cannot be compiled" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf4bpp.h:     check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: xf4bpp.h:     check for missing prerequisite headers?" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf4bpp.h: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: xf4bpp.h: see the Autoconf documentation" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf4bpp.h:     section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: xf4bpp.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf4bpp.h: proceeding with the preprocessor's result" >&5
-$as_echo "$as_me: WARNING: xf4bpp.h: proceeding with the preprocessor's result" >&2;}
-    { $as_echo "$as_me:$LINENO: WARNING: xf4bpp.h: in the future, the compiler will take precedence" >&5
-$as_echo "$as_me: WARNING: xf4bpp.h: in the future, the compiler will take precedence" >&2;}
-    ( cat <<\_ASBOX
-## ---------------------------------------------------------------------- ##
-## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
-## ---------------------------------------------------------------------- ##
-_ASBOX
-     ) | sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-{ $as_echo "$as_me:$LINENO: checking for xf4bpp.h" >&5
-$as_echo_n "checking for xf4bpp.h... " >&6; }
-if test "${ac_cv_header_xf4bpp_h+set}" = set; then
-  $as_echo_n "(cached) " >&6
-else
-  ac_cv_header_xf4bpp_h=$ac_header_preproc
-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_xf4bpp_h" >&5
-$as_echo "$ac_cv_header_xf4bpp_h" >&6; }
-
-fi
-if test $ac_cv_header_xf4bpp_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XF4BPP 1
-_ACEOF
-
-fi
-
-
-CPPFLAGS="$SAVE_CPPFLAGS"
-
 
 
 DRIVER_NAME=wsudl
diff --git a/driver/xf86-video-wsudl/configure.ac b/driver/xf86-video-wsudl/configure.ac
index f2a35a17e..4da75075a 100644
--- a/driver/xf86-video-wsudl/configure.ac
+++ b/driver/xf86-video-wsudl/configure.ac
@@ -62,15 +62,6 @@ AC_ARG_WITH(xorg-module-dir,
 # Obtain compiler/linker options for the driver dependencies
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto $REQUIRED_MODULES])
 
-# Checks for libraries.
-
-# Check for xf1bpp & xf4bpp (removed in xorg-server 1.6 & later)
-SAVE_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $XORG_CFLAGS"
-AC_CHECK_HEADER(xf1bpp.h,[AC_DEFINE(HAVE_XF1BPP, 1, [Have 1bpp support])],[])
-AC_CHECK_HEADER(xf4bpp.h,[AC_DEFINE(HAVE_XF4BPP, 1, [Have 4bpp support])],[])
-CPPFLAGS="$SAVE_CPPFLAGS"
-
 AC_SUBST([moduledir])
 
 DRIVER_NAME=wsudl