diff --git a/src/mesa/drivers/dri/ffb/ffb_state.c b/src/mesa/drivers/dri/ffb/ffb_state.c
index ba9bab9886a..5a56c945ca1 100644
--- a/src/mesa/drivers/dri/ffb/ffb_state.c
+++ b/src/mesa/drivers/dri/ffb/ffb_state.c
@@ -445,7 +445,7 @@ void ffbCalcViewport(GLcontext *ctx)
 
 	ffbCalcViewportRegs(ctx);
 
-	fmesa->setupnewinputs |= VERT_BIT_CLIP;
+	fmesa->setupnewinputs |= VERT_BIT_POS;
 }
 
 static void ffbDDViewport(GLcontext *ctx, GLint x, GLint y,
diff --git a/src/mesa/drivers/dri/ffb/ffb_tex.c b/src/mesa/drivers/dri/ffb/ffb_tex.c
index ba1103e2e52..4fe5dea96ab 100644
--- a/src/mesa/drivers/dri/ffb/ffb_tex.c
+++ b/src/mesa/drivers/dri/ffb/ffb_tex.c
@@ -28,6 +28,7 @@
 #include <GL/gl.h>
 #include "texformat.h"
 #include "texstore.h"
+#include "teximage.h"
 #include "swrast/swrast.h"
 
 #include "ffb_tex.h"