--- src/mga_dri.c.orig 2007-10-02 13:53:00.000000000 -0600 +++ src/mga_dri.c 2009-02-01 11:22:44.000000000 -0700 @@ -38,11 +38,6 @@ #include "xf86PciInfo.h" #include "xf86Pci.h" -#define PSZ 8 -#include "cfb.h" -#undef PSZ -#include "cfb16.h" -#include "cfb32.h" #include "miline.h"