diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
index 4738210005f..5c9bc794d82 100644
--- a/src/mesa/drivers/dri/radeon/Makefile
+++ b/src/mesa/drivers/dri/radeon/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.1.2.24 2003/02/23 19:37:52 keithw Exp $
+# $Id: Makefile,v 1.1.2.25 2003/02/23 20:24:11 keithw Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -23,7 +23,7 @@ DEFINES = \
 	-D_HAVE_USERCLIP=0 \
 	-D_HAVE_FULL_GL=0
 
-CFLAGS = $(INCLUDES) $(DEFINES) -O1 -MD -Wall -Wpointer-arith \
+CFLAGS = $(INCLUDES) $(DEFINES) -g -MD -Wall -Wpointer-arith \
 	 -Wstrict-prototypes -Wmissing-prototypes \
 	 -Wmissing-declarations -Wnested-externs
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index 41b28e04d51..fa76b8966f8 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -104,7 +104,6 @@ static void radeonGetBufferSize( GLframebuffer *buffer,
  */
 static const GLubyte *radeonGetString( GLcontext *ctx, GLenum name )
 {
-   radeonContextPtr rmesa = RADEON_CONTEXT(ctx);
    static char buffer[128];
 
    switch ( name ) {
diff --git a/src/mesa/drivers/dri/radeon/radeon_lock.c b/src/mesa/drivers/dri/radeon/radeon_lock.c
index d1c0b7f87ea..3ef8b82312f 100644
--- a/src/mesa/drivers/dri/radeon/radeon_lock.c
+++ b/src/mesa/drivers/dri/radeon/radeon_lock.c
@@ -40,6 +40,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "radeon_state.h"
 #include "radeon_ioctl.h"
 
+#if _HAVE_FULL_GL
+#include "radeon_tex.h"
+#else
+#include "radeon_subset.h"
+#endif
+
 #if DEBUG_LOCKING
 char *prevLockFile = NULL;
 int prevLockLine = 0;
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index aa2a73da0ed..a1c57b5f15f 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
@@ -54,6 +54,15 @@
 #include "radeon_ioctl.h"
 #include "radeon_state.h"
 
+#if _HAVE_FULL_GL
+#include "radeon_tex.h"
+#include "radeon_vtxfmt.h"
+#else
+#include "radeon_subset.h"
+#endif
+
+
+
 
 #define MODEL_PROJ 0
 #define MODEL      1
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.h b/src/mesa/drivers/dri/radeon/radeon_state.h
index c377cddddb6..79d413c090f 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state.h
+++ b/src/mesa/drivers/dri/radeon/radeon_state.h
@@ -81,6 +81,7 @@ extern void radeonUploadMatrixTranspose( radeonContextPtr rmesa, GLfloat *src,
 					 int idx );
 extern void radeonUploadMatrix( radeonContextPtr rmesa, GLfloat *src, int idx );
 
+extern void radeonUpdateScissor( GLcontext *ctx );
 
 
 #endif
diff --git a/src/mesa/drivers/dri/radeon/radeon_subset_bitmap.c b/src/mesa/drivers/dri/radeon/radeon_subset_bitmap.c
index 400d267a9e6..a6730f461b8 100644
--- a/src/mesa/drivers/dri/radeon/radeon_subset_bitmap.c
+++ b/src/mesa/drivers/dri/radeon/radeon_subset_bitmap.c
@@ -39,6 +39,7 @@
 #include "colormac.h"
 #include "enums.h"
 #include "imports.h"
+#include "image.h"
 #include "mmath.h"
 #include "macros.h"