diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
index 4bf4e854f81..e58840f6787 100644
--- a/src/mesa/drivers/dri/i965/brw_state.h
+++ b/src/mesa/drivers/dri/i965/brw_state.h
@@ -191,6 +191,12 @@ GLuint translate_tex_format(gl_format mesa_format,
 			    GLenum depth_mode,
 			    GLenum srgb_decode);
 
+/* brw_wm_sampler_state.c */
+GLuint translate_wrap_mode(GLenum wrap);
+void upload_default_color(struct brw_context *brw,
+			  struct gl_sampler_object *sampler,
+			  int unit);
+
 /* gen6_sf_state.c */
 uint32_t
 get_attr_override(struct brw_context *brw, int fs_attr, int two_side_color);
diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
index 7b93bf90241..6f5057b7347 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
@@ -48,7 +48,8 @@
  * Intel drivers for "other operating systems" implement GL_CLAMP as
  * GL_CLAMP_TO_EDGE, so the same is done here.
  */
-static GLuint translate_wrap_mode( GLenum wrap )
+GLuint
+translate_wrap_mode(GLenum wrap)
 {
    switch( wrap ) {
    case GL_REPEAT: 
@@ -66,7 +67,7 @@ static GLuint translate_wrap_mode( GLenum wrap )
    }
 }
 
-static void
+void
 upload_default_color(struct brw_context *brw, struct gl_sampler_object *sampler,
 		     int unit)
 {