diff --git a/src/hb-cairo-utils.cc b/src/hb-cairo-utils.cc
index 808496d8e..9d2183477 100644
--- a/src/hb-cairo-utils.cc
+++ b/src/hb-cairo-utils.cc
@@ -91,13 +91,13 @@ _hb_cairo_destroy_blob (void *p)
 }
 
 hb_bool_t
-hb_cairo_paint_glyph_image (cairo_t *cr,
-                            hb_blob_t *blob,
-                            unsigned width,
-                            unsigned height,
-                            hb_tag_t format,
-                            float slant,
-                            hb_glyph_extents_t *extents)
+_hb_cairo_paint_glyph_image (cairo_t *cr,
+			     hb_blob_t *blob,
+			     unsigned width,
+			     unsigned height,
+			     hb_tag_t format,
+			     float slant,
+			     hb_glyph_extents_t *extents)
 {
   if (!extents) /* SVG currently. */
     return false;
@@ -273,11 +273,11 @@ _hb_cairo_normalize_color_line (hb_color_stop_t *stops,
 }
 
 void
-hb_cairo_paint_linear_gradient (cairo_t *cr,
-                                hb_color_line_t *color_line,
-                                float x0, float y0,
-                                float x1, float y1,
-                                float x2, float y2)
+_hb_cairo_paint_linear_gradient (cairo_t *cr,
+				 hb_color_line_t *color_line,
+				 float x0, float y0,
+				 float x1, float y1,
+				 float x2, float y2)
 {
   hb_color_stop_t stops_[PREALLOCATED_COLOR_STOPS];
   hb_color_stop_t *stops = stops_;
@@ -322,10 +322,10 @@ hb_cairo_paint_linear_gradient (cairo_t *cr,
 }
 
 void
-hb_cairo_paint_radial_gradient (cairo_t *cr,
-                                hb_color_line_t *color_line,
-                                float x0, float y0, float r0,
-                                float x1, float y1, float r1)
+_hb_cairo_paint_radial_gradient (cairo_t *cr,
+				 hb_color_line_t *color_line,
+				 float x0, float y0, float r0,
+				 float x1, float y1, float r1)
 {
   hb_color_stop_t stops_[PREALLOCATED_COLOR_STOPS];
   hb_color_stop_t *stops = stops_;
@@ -789,11 +789,11 @@ done:
 }
 
 void
-hb_cairo_paint_sweep_gradient (cairo_t *cr,
-                               hb_color_line_t *color_line,
-                               float cx, float cy,
-                               float start_angle,
-                               float end_angle)
+_hb_cairo_paint_sweep_gradient (cairo_t *cr,
+				hb_color_line_t *color_line,
+				float cx, float cy,
+				float start_angle,
+				float end_angle)
 {
   unsigned int len;
   hb_color_stop_t stops_[PREALLOCATED_COLOR_STOPS];
diff --git a/src/hb-cairo-utils.hh b/src/hb-cairo-utils.hh
index 369a1b0e7..213cbc467 100644
--- a/src/hb-cairo-utils.hh
+++ b/src/hb-cairo-utils.hh
@@ -32,7 +32,7 @@
 
 
 static inline cairo_operator_t
-hb_paint_composite_mode_to_cairo (hb_paint_composite_mode_t mode)
+_hb_paint_composite_mode_to_cairo (hb_paint_composite_mode_t mode)
 {
   switch (mode)
     {
@@ -69,32 +69,32 @@ hb_paint_composite_mode_to_cairo (hb_paint_composite_mode_t mode)
 }
 
 HB_INTERNAL hb_bool_t
-hb_cairo_paint_glyph_image (cairo_t *cr,
-			    hb_blob_t *blob,
-			    unsigned width,
-			    unsigned height,
-			    hb_tag_t format,
-			    float slant,
-			    hb_glyph_extents_t *extents);
+_hb_cairo_paint_glyph_image (cairo_t *cr,
+			     hb_blob_t *blob,
+			     unsigned width,
+			     unsigned height,
+			     hb_tag_t format,
+			     float slant,
+			     hb_glyph_extents_t *extents);
 
 HB_INTERNAL void
-hb_cairo_paint_linear_gradient (cairo_t *cr,
-			        hb_color_line_t *color_line,
-			        float x0, float y0,
-			        float x1, float y1,
-			        float x2, float y2);
+_hb_cairo_paint_linear_gradient (cairo_t *cr,
+				 hb_color_line_t *color_line,
+				 float x0, float y0,
+				 float x1, float y1,
+				 float x2, float y2);
 
 HB_INTERNAL void
-hb_cairo_paint_radial_gradient (cairo_t *cr,
-			        hb_color_line_t *color_line,
-			        float x0, float y0, float r0,
-			        float x1, float y1, float r1);
+_hb_cairo_paint_radial_gradient (cairo_t *cr,
+				 hb_color_line_t *color_line,
+				 float x0, float y0, float r0,
+				 float x1, float y1, float r1);
 
 HB_INTERNAL void
-hb_cairo_paint_sweep_gradient (cairo_t *cr,
-			       hb_color_line_t *color_line,
-			       float x0, float y0,
-			       float start_angle, float end_angle);
+_hb_cairo_paint_sweep_gradient (cairo_t *cr,
+				hb_color_line_t *color_line,
+				float x0, float y0,
+				float start_angle, float end_angle);
 
 
 #endif /* HB_CAIRO_UTILS_H */
diff --git a/src/hb-cairo.cc b/src/hb-cairo.cc
index 656a9d4f9..a0b4f3bf2 100644
--- a/src/hb-cairo.cc
+++ b/src/hb-cairo.cc
@@ -227,7 +227,7 @@ hb_cairo_pop_group (hb_paint_funcs_t *pfuncs HB_UNUSED,
   cairo_t *cr = (cairo_t *) paint_data;
 
   cairo_pop_group_to_source (cr);
-  cairo_set_operator (cr, hb_paint_composite_mode_to_cairo (mode));
+  cairo_set_operator (cr, _hb_paint_composite_mode_to_cairo (mode));
   cairo_paint (cr);
 
   cairo_restore (cr);
@@ -263,7 +263,7 @@ hb_cairo_paint_image (hb_paint_funcs_t *pfuncs HB_UNUSED,
 {
   cairo_t *cr = (cairo_t *) paint_data;
 
-  return hb_cairo_paint_glyph_image (cr, blob, width, height, format, slant, extents);
+  return _hb_cairo_paint_glyph_image (cr, blob, width, height, format, slant, extents);
 }
 
 static void
@@ -277,7 +277,7 @@ hb_cairo_paint_linear_gradient (hb_paint_funcs_t *pfuncs HB_UNUSED,
 {
   cairo_t *cr = (cairo_t *)paint_data;
 
-  hb_cairo_paint_linear_gradient (cr, color_line, x0, y0, x1, y1, x2, y2);
+  _hb_cairo_paint_linear_gradient (cr, color_line, x0, y0, x1, y1, x2, y2);
 }
 
 static void
@@ -290,7 +290,7 @@ hb_cairo_paint_radial_gradient (hb_paint_funcs_t *pfuncs HB_UNUSED,
 {
   cairo_t *cr = (cairo_t *)paint_data;
 
-  hb_cairo_paint_radial_gradient (cr, color_line, x0, y0, r0, x1, y1, r1);
+  _hb_cairo_paint_radial_gradient (cr, color_line, x0, y0, r0, x1, y1, r1);
 }
 
 static void
@@ -303,7 +303,7 @@ hb_cairo_paint_sweep_gradient (hb_paint_funcs_t *pfuncs HB_UNUSED,
 {
   cairo_t *cr = (cairo_t *) paint_data;
 
-  hb_cairo_paint_sweep_gradient (cr, color_line, x0, y0, start_angle, end_angle);
+  _hb_cairo_paint_sweep_gradient (cr, color_line, x0, y0, start_angle, end_angle);
 }
 
 static inline void free_static_cairo_paint_funcs ();