5 files changed, 3 insertions, 5 deletions
diff --git a/src/mesa/math/m_debug_clip.c b/src/mesa/math/m_debug_clip.c
index 7ea5428aa2..e97afafac3 100644
--- a/src/mesa/math/m_debug_clip.c
+++ b/src/mesa/math/m_debug_clip.c
@@ -360,7 +360,7 @@ void _math_test_all_cliptest_functions( char *description )
 	    char buf[100];
 	    sprintf( buf, "%s[%d] failed test (%s)",
 		     cnames[np], psize, description );
-	    _mesa_problem( NULL, buf );
+	    _mesa_problem( NULL, "%s", buf );
 	 }
 #ifdef RUN_DEBUG_BENCHMARK
 	 if ( mesa_profile )
diff --git a/src/mesa/math/m_debug_norm.c b/src/mesa/math/m_debug_norm.c
index 710bad14dd..02eb1f989f 100644
--- a/src/mesa/math/m_debug_norm.c
+++ b/src/mesa/math/m_debug_norm.c
@@ -362,7 +362,7 @@ void _math_test_all_normal_transform_functions( char *description )
 	 char buf[100];
 	 sprintf( buf, "_mesa_normal_tab[0][%s] failed test (%s)",
 		  norm_strings[mtype], description );
-	 _mesa_problem( NULL, buf );
+	 _mesa_problem( NULL, "%s", buf );
       }
 
 #ifdef RUN_DEBUG_BENCHMARK
diff --git a/src/mesa/math/m_debug_xform.c b/src/mesa/math/m_debug_xform.c
index 46bd454517..7d815664a1 100644
--- a/src/mesa/math/m_debug_xform.c
+++ b/src/mesa/math/m_debug_xform.c
@@ -317,7 +317,7 @@ void _math_test_all_transform_functions( char *description )
 	    char buf[100];
 	    sprintf(buf, "_mesa_transform_tab[0][%d][%s] failed test (%s)",
 		    psize, mstrings[mtype], description );
-	    _mesa_problem( NULL, buf );
+	    _mesa_problem( NULL, "%s", buf );
 	 }
 #ifdef RUN_DEBUG_BENCHMARK
 	 if ( mesa_profile )
diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c
index 048b231c4e..02aedbad85 100644
--- a/src/mesa/math/m_matrix.c
+++ b/src/mesa/math/m_matrix.c
@@ -37,7 +37,6 @@
 #include "main/glheader.h"
 #include "main/imports.h"
 #include "main/macros.h"
-#include "main/imports.h"
 
 #include "m_matrix.h"
 
diff --git a/src/mesa/math/m_vector.c b/src/mesa/math/m_vector.c
index fbd63fd923..4bded31e09 100644
--- a/src/mesa/math/m_vector.c
+++ b/src/mesa/math/m_vector.c
@@ -30,7 +30,6 @@
 #include "main/glheader.h"
 #include "main/imports.h"
 #include "main/macros.h"
-#include "main/imports.h"
 
 #include "m_vector.h"