Index: src/mesa/main/imports.h
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/main/imports.h,v
retrieving revision 1.58
diff -u -r1.58 imports.h
--- src/mesa/main/imports.h	3 Oct 2005 20:02:07 -0000	1.58
+++ src/mesa/main/imports.h	12 Oct 2005 12:34:31 -0000
@@ -129,12 +129,6 @@
 #define M_E (2.7182818284590452354)
 #endif
 
-
-/* XXX this is a bit of a hack needed for compilation within XFree86 */
-#ifndef FLT_MIN
-#define FLT_MIN (1.0e-37)
-#endif
-
 /* Degrees to radians conversion: */
 #define DEG2RAD (M_PI/180.0)
 
@@ -644,9 +638,6 @@
 extern double
 _mesa_pow(double x, double y);
 
-extern float
-_mesa_log2(float x);
-
 extern int
 _mesa_ffs(int i);
 
Index: src/mesa/swrast/s_tcc.c
===================================================================
RCS file: /cvs/mesa/Mesa/src/mesa/swrast/s_tcc.c,v
retrieving revision 1.4
diff -u -r1.4 s_tcc.c
--- src/mesa/swrast/s_tcc.c	16 Sep 2005 04:16:48 -0000	1.4
+++ src/mesa/swrast/s_tcc.c	12 Oct 2005 12:34:33 -0000
@@ -29,11 +29,8 @@
  * end up using it as a backend in mesa.
  */
 
-#include <stdlib.h>
-#include <stdio.h>
-
-
 #include "glheader.h"
+#include "imports.h"
 #include "colormac.h"
 #include "context.h"
 #include "nvfragprog.h"