--- src/mga_storm.c.orig	2007-10-02 13:59:18.000000000 -0600
+++ src/mga_storm.c	2009-02-01 11:23:03.000000000 -0700
@@ -1,7 +1,5 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c,v 1.99tsi Exp $ */
 
-#define PSZ 8
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -27,7 +25,6 @@
 #include "servermd.h"
 
 #ifdef XF86DRI
-#include "cfb.h"
 #include "GL/glxtokens.h"
 #endif