diff -Naur xf86-video-vesa-1.3.0/src/vesa.c xf86-video-vesa-1.3.0-magellan/src/vesa.c
--- xf86-video-vesa-1.3.0/src/vesa.c	2006-11-30 22:03:07.000000000 +0100
+++ xf86-video-vesa-1.3.0-magellan/src/vesa.c	2008-06-02 11:13:42.000000000 +0200
@@ -157,17 +157,6 @@
  * xf86LoaderReqSymLists().  The purpose is this is to avoid warnings about
  * unresolved symbols that are not required.
  */
-#ifdef XFree86LOADER
-static const char *miscfbSymbols[] = {
-    "xf1bppScreenInit",
-    "xf4bppScreenInit",
-#ifdef USE_AFB
-    "afbScreenInit",
-#endif
-    "mfbScreenInit",
-    NULL
-};
-#endif
 
 static const char *fbSymbols[] = {
     "fbPictureInit",
@@ -245,8 +234,7 @@
     {
 	Initialised = TRUE;
 	xf86AddDriver(&VESA, Module, 0);
-	LoaderRefSymLists(miscfbSymbols,
-			  fbSymbols,
+	LoaderRefSymLists(fbSymbols,
 			  shadowSymbols,
 			  vbeSymbols,
 			  ddcSymbols,
@@ -674,23 +662,9 @@
 	    }
 	    else {
 		switch (pScrn->bitsPerPixel) {
-		    case 1:
-			mod = "xf1bpp";
-			reqSym = "xf1bppScreenInit";
-			break;
-		    case 4:
-			mod = "xf4bpp";
-			reqSym = "xf4bppScreenInit";
-			break;
 		    default:
-#ifdef USE_AFB
-			mod = "afb";
-			reqSym = "afbScreenInit";
-			break;
-#else
 			xf86DrvMsg(pScrn->scrnIndex, X_ERROR, 
 				   "Unsupported bpp: %d", pScrn->bitsPerPixel);
-#endif
 		}
 	    }
 	    break;
@@ -860,28 +834,9 @@
 	    return (FALSE);
 	case 0x3:	/* Planar */
 		switch (pScrn->bitsPerPixel) {
-		    case 1:
-			if (!xf1bppScreenInit(pScreen, pVesa->base,
-					      pScrn->virtualX, pScrn->virtualY,
-					      pScrn->xDpi, pScrn->yDpi,
-					      pScrn->displayWidth))
-			    return (FALSE);
-			break;
-		    case 4:
-			if (!xf4bppScreenInit(pScreen, pVesa->base,
-					      pScrn->virtualX, pScrn->virtualY,
-					      pScrn->xDpi, pScrn->yDpi,
-					      pScrn->displayWidth))
-			    return (FALSE);
-			break;
 		    default:
-#ifdef USE_AFB
-			if (!afbScreenInit(pScreen, pVesa->base,
-					   pScrn->virtualX, pScrn->virtualY,
-					   pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth))
-#endif
 			    return (FALSE);
-			break;
+			    break;
 		}
 	    break;
 	case 0x4:	/* Packed pixel */
diff -Naur xf86-video-vesa-1.3.0/src/vesa.h xf86-video-vesa-1.3.0-magellan/src/vesa.h
--- xf86-video-vesa-1.3.0/src/vesa.h	2006-11-30 22:04:02.000000000 +0100
+++ xf86-video-vesa-1.3.0-magellan/src/vesa.h	2008-06-02 11:14:10.000000000 +0200
@@ -69,16 +69,8 @@
 #include "xf86Resources.h"
 #include "xf86RAC.h"
 
-#include "xf1bpp.h"
-#include "xf4bpp.h"
 #include "fb.h"
 
-#ifdef USE_AFB
-#include "afb.h"
-#endif
-
-#include "mfb.h"
-
 #define VESA_VERSION		4000
 #define VESA_NAME		"VESA"
 #define VESA_DRIVER_NAME	"vesa"