diff --git a/src/mesa/drivers/dri/radeon/Makefile b/src/mesa/drivers/dri/radeon/Makefile
index 70bef3f41a3..0ce59de0ba1 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.27 2003/03/05 13:16:20 keithw Exp $
+# $Id: Makefile,v 1.1.2.28 2003/03/05 14:22:28 keithw Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -48,7 +48,7 @@ FULL_MESA = 	$(MESABUILDDIR)/swrast_setup/swrast_setup.a \
 		$(MESABUILDDIR)/math/math.a #kludge
 
 SUBSET_MESA = 	$(MESABUILDDIR)/mesa.a \
-		$(MESABUILDDIR)/math/math.a
+		$(MESABUILDDIR)/math/m_matrix.o
 
 
 
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 61d2421ef9d..4ae19f99567 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -28,7 +28,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: context.c,v 1.188.2.1.2.5 2003/03/04 17:23:34 keithw Exp $ */
+/* $Id: context.c,v 1.188.2.1.2.6 2003/03/05 14:22:21 keithw Exp $ */
 
 /**
  * \mainpage Mesa Core Module
@@ -632,7 +632,9 @@ one_time_init( GLcontext *ctx )
 
       _mesa_init_lists();
 
+#if _HAVE_FULL_GL
       _math_init();
+#endif
       _mesa_init_math();
 
 #ifdef USE_SPARC_ASM
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 744668fd293..079aaf4e7d0 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -1,4 +1,4 @@
-/* $Id: enable.c,v 1.71 2002/10/24 23:57:20 brianp Exp $ */
+/* $Id: enable.c,v 1.71.4.1 2003/03/05 14:22:23 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -200,6 +200,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
          ctx->Color.ColorLogicOpEnabled =
             (ctx->Color.BlendEquation == GL_LOGIC_OP && state);
          break;
+#if FEATURE_userclip
       case GL_CLIP_PLANE0:
       case GL_CLIP_PLANE1:
       case GL_CLIP_PLANE2:
@@ -233,6 +234,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
             }               
          }
          break;
+#endif
       case GL_COLOR_MATERIAL:
          if (ctx->Light.ColorMaterialEnabled == state)
             return;
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 94390486321..e70fb2496b2 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -29,7 +29,7 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/* $Id: mtypes.h,v 1.97.4.1 2003/03/02 00:27:35 jrfonseca Exp $ */
+/* $Id: mtypes.h,v 1.97.4.2 2003/03/05 14:22:24 keithw Exp $ */
 
 
 #ifndef TYPES_H
@@ -2046,9 +2046,9 @@ struct __GLcontextRec {
 /** \brief The string names for GL_POINT, GL_LINE_LOOP, etc */
 extern const char *_mesa_prim_name[GL_POLYGON+4];
 
-#ifndef MESA_DEBUG
-#define MESA_DEBUG
-#endif
+/* #ifndef MESA_DEBUG */
+/* #define MESA_DEBUG */
+/* #endif */
 
 #ifdef MESA_DEBUG
 extern int MESA_VERBOSE;
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 32847fa9a67..47d9d7d7890 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.97.4.3 2003/03/05 14:04:20 keithw Exp $ */
+/* $Id: state.c,v 1.97.4.4 2003/03/05 14:22:25 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -704,6 +704,7 @@ update_projection( GLcontext *ctx )
 {
    _math_matrix_analyse( ctx->ProjectionMatrixStack.Top );
 
+#if FEATURE_userclip
    /* Recompute clip plane positions in clipspace.  This is also done
     * in _mesa_ClipPlane().
     */
@@ -717,6 +718,7 @@ update_projection( GLcontext *ctx )
 	 }
       }
    }
+#endif
 }
 
 
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 2a6abedf823..f854b5c8dec 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -1,4 +1,4 @@
-/* $Id: texstate.c,v 1.87 2002/11/05 20:58:37 brianp Exp $ */
+/* $Id: texstate.c,v 1.87.4.1 2003/03/05 14:22:25 keithw Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1845,7 +1845,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
 /*                    Texture Coord Generation                        */
 /**********************************************************************/
 
-
+#if FEATURE_texgen
 void
 _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params )
 {
@@ -2383,7 +2383,7 @@ _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
 	 return;
    }
 }
-
+#endif
 
 /* GL_ARB_multitexture */
 void