diff --git a/src/mesa/swrast/s_spantemp.h b/src/mesa/swrast/s_spantemp.h
index df08f14760a..95d9358a16d 100644
--- a/src/mesa/swrast/s_spantemp.h
+++ b/src/mesa/swrast/s_spantemp.h
@@ -366,6 +366,7 @@ NAME(read_index_pixels)( const GLcontext *ctx,
 
 
 #undef NAME
+#undef SPAN_VARS
 #undef INIT_PIXEL_PTR
 #undef INC_PIXEL_PTR
 #undef STORE_RGB_PIXEL