Add many missing slim_hidden calls to bypass PLT entries for local use of public functions

(cherry picked from d7f08794ef194d0b86a749381472bfeb0a32d993 commit)

15 files changed, 145 insertions, 16 deletions

diff --git a/src/cairo-font-options.c b/src/cairo-font-options.c
index e3a5f75c0..2b0cd988b 100644
--- a/src/cairo-font-options.c
+++ b/src/cairo-font-options.c
@@ -95,6 +95,7 @@ cairo_font_options_create (void)
 
     return options;
 }
+slim_hidden_def (cairo_font_options_create);
 
 /**
  * cairo_font_options_copy:
@@ -137,6 +138,7 @@ cairo_font_options_destroy (cairo_font_options_t *options)
 
     free (options);
 }
+slim_hidden_def (cairo_font_options_destroy);
 
 /**
  * cairo_font_options_status:
@@ -182,6 +184,7 @@ cairo_font_options_merge (cairo_font_options_t       *options,
     if (other->hint_metrics != CAIRO_HINT_METRICS_DEFAULT)
 	options->hint_metrics = other->hint_metrics;
 }
+slim_hidden_def (cairo_font_options_merge);
 
 /**
  * cairo_font_options_equal:
@@ -201,6 +204,7 @@ cairo_font_options_equal (const cairo_font_options_t *options,
 	    options->hint_style == other->hint_style &&
 	    options->hint_metrics == other->hint_metrics);
 }
+slim_hidden_def (cairo_font_options_equal);
 
 /**
  * cairo_font_options_hash:
@@ -222,6 +226,7 @@ cairo_font_options_hash (const cairo_font_options_t *options)
 	    (options->hint_style << 8) |
 	    (options->hint_metrics << 16));
 }
+slim_hidden_def (cairo_font_options_hash);
 
 /**
  * cairo_font_options_set_antialias:
@@ -240,6 +245,7 @@ cairo_font_options_set_antialias (cairo_font_options_t *options,
 
     options->antialias = antialias;
 }
+slim_hidden_def (cairo_font_options_set_antialias);
 
 /**
  * cairo_font_options_get_antialias:
@@ -275,6 +281,7 @@ cairo_font_options_set_subpixel_order (cairo_font_options_t   *options,
 
     options->subpixel_order = subpixel_order;
 }
+slim_hidden_def (cairo_font_options_set_subpixel_order);
 
 /**
  * cairo_font_options_get_subpixel_order:
@@ -310,6 +317,7 @@ cairo_font_options_set_hint_style (cairo_font_options_t *options,
 
     options->hint_style = hint_style;
 }
+slim_hidden_def (cairo_font_options_set_hint_style);
 
 /**
  * cairo_font_options_get_hint_style:
@@ -345,6 +353,7 @@ cairo_font_options_set_hint_metrics (cairo_font_options_t *options,
 
     options->hint_metrics = hint_metrics;
 }
+slim_hidden_def (cairo_font_options_set_hint_metrics);
 
 /**
  * cairo_font_options_get_hint_metrics:
diff --git a/src/cairo-font.c b/src/cairo-font.c
index fc68affc4..373068673 100644
--- a/src/cairo-font.c
+++ b/src/cairo-font.c
@@ -93,6 +93,7 @@ cairo_font_face_reference (cairo_font_face_t *font_face)
 
     return font_face;
 }
+slim_hidden_def (cairo_font_face_reference);
 
 /**
  * cairo_font_face_destroy:
@@ -129,6 +130,7 @@ cairo_font_face_destroy (cairo_font_face_t *font_face)
 
     free (font_face);
 }
+slim_hidden_def (cairo_font_face_destroy);
 
 /**
  * cairo_font_face_get_type:
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 38897a82f..25fabc994 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -552,6 +552,7 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled)
 
     return face;
 }
+slim_hidden_def (cairo_ft_scaled_font_lock_face);
 
 /* Unlock unscaled font locked with _cairo_ft_unscaled_font_lock_face
  */
@@ -562,6 +563,7 @@ _cairo_ft_unscaled_font_unlock_face (cairo_ft_unscaled_font_t *unscaled)
 
     unscaled->lock--;
 }
+slim_hidden_def (cairo_ft_scaled_font_unlock_face);
 
 static void
 _compute_transform (cairo_ft_font_transform_t *sf,
@@ -2268,6 +2270,7 @@ cairo_ft_font_options_substitute (const cairo_font_options_t *options,
 #endif
     }
 }
+slim_hidden_def (cairo_ft_font_options_substitute);
 
 /**
  * cairo_ft_font_face_create_for_pattern:
diff --git a/src/cairo-ft-private.h b/src/cairo-ft-private.h
index 34c5d9c86..5457e3b54 100644
--- a/src/cairo-ft-private.h
+++ b/src/cairo-ft-private.h
@@ -64,11 +64,14 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled);
 cairo_private void
 _cairo_ft_unscaled_font_unlock_face (cairo_ft_unscaled_font_t *unscaled);
 
-cairo_bool_t
+cairo_private cairo_bool_t
 _cairo_ft_scaled_font_is_vertical (cairo_scaled_font_t *scaled_font);
 
+slim_hidden_proto(cairo_ft_font_options_substitute)
+slim_hidden_proto(cairo_ft_scaled_font_lock_face)
+slim_hidden_proto(cairo_ft_scaled_font_unlock_face)
+
 CAIRO_END_DECLS
 
 #endif /* CAIRO_HAS_FT_FONT */
-
 #endif /* CAIRO_FT_PRIVATE_H */
diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c
index 86562b97f..49a463836 100644
--- a/src/cairo-image-surface.c
+++ b/src/cairo-image-surface.c
@@ -275,6 +275,7 @@ cairo_image_surface_create (cairo_format_t	format,
 
     return surface;
 }
+slim_hidden_def (cairo_image_surface_create);
 
 cairo_surface_t *
 _cairo_image_surface_create_with_content (cairo_content_t	content,
@@ -354,6 +355,7 @@ cairo_image_surface_create_for_data (unsigned char     *data,
 
     return surface;
 }
+slim_hidden_def (cairo_image_surface_create_for_data);
 
 cairo_surface_t *
 _cairo_image_surface_create_for_data_with_content (unsigned char	*data,
@@ -440,6 +442,7 @@ cairo_image_surface_get_width (cairo_surface_t *surface)
 
     return image_surface->width;
 }
+slim_hidden_def (cairo_image_surface_get_width);
 
 /**
  * cairo_image_surface_get_height:
@@ -461,6 +464,7 @@ cairo_image_surface_get_height (cairo_surface_t *surface)
 
     return image_surface->height;
 }
+slim_hidden_def (cairo_image_surface_get_height);
 
 /**
  * cairo_image_surface_get_stride:
diff --git a/src/cairo-matrix.c b/src/cairo-matrix.c
index e418ef38e..60cdca30f 100644
--- a/src/cairo-matrix.c
+++ b/src/cairo-matrix.c
@@ -170,6 +170,7 @@ cairo_matrix_translate (cairo_matrix_t *matrix, double tx, double ty)
 
     cairo_matrix_multiply (matrix, &tmp, matrix);
 }
+slim_hidden_def (cairo_matrix_translate);
 
 /**
  * cairo_matrix_init_scale:
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index ebdb13638..a859e5267 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -331,6 +331,7 @@ cairo_pattern_create_rgb (double red, double green, double blue)
 
     return pattern;
 }
+slim_hidden_def (cairo_pattern_create_rgb);
 
 /**
  * cairo_pattern_create_rgba:
@@ -373,6 +374,7 @@ cairo_pattern_create_rgba (double red, double green, double blue,
 
     return pattern;
 }
+slim_hidden_def (cairo_pattern_create_rgba);
 
 /**
  * cairo_pattern_create_for_surface:
@@ -410,6 +412,7 @@ cairo_pattern_create_for_surface (cairo_surface_t *surface)
 
     return &pattern->base;
 }
+slim_hidden_def (cairo_pattern_create_for_surface);
 
 /**
  * cairo_pattern_create_linear:
@@ -523,6 +526,7 @@ cairo_pattern_reference (cairo_pattern_t *pattern)
 
     return pattern;
 }
+slim_hidden_def (cairo_pattern_reference);
 
 /**
  * cairo_pattern_get_type:
@@ -540,6 +544,7 @@ cairo_pattern_get_type (cairo_pattern_t *pattern)
 {
     return pattern->type;
 }
+slim_hidden_def (cairo_pattern_get_type);
 
 /**
  * cairo_pattern_status:
@@ -583,6 +588,7 @@ cairo_pattern_destroy (cairo_pattern_t *pattern)
     _cairo_pattern_fini (pattern);
     free (pattern);
 }
+slim_hidden_def (cairo_pattern_destroy);
 
 static void
 _cairo_pattern_add_color_stop (cairo_gradient_pattern_t *pattern,
@@ -764,6 +770,7 @@ cairo_pattern_set_matrix (cairo_pattern_t      *pattern,
 
     pattern->matrix = *matrix;
 }
+slim_hidden_def (cairo_pattern_set_matrix);
 
 /**
  * cairo_pattern_get_matrix:
@@ -827,6 +834,7 @@ cairo_pattern_get_extend (cairo_pattern_t *pattern)
 {
     return pattern->extend;
 }
+slim_hidden_def (cairo_pattern_get_extend);
 
 void
 _cairo_pattern_transform (cairo_pattern_t	*pattern,
diff --git a/src/cairo-png.c b/src/cairo-png.c
index 3155cad9d..3b33b5463 100644
--- a/src/cairo-png.c
+++ b/src/cairo-png.c
@@ -287,6 +287,7 @@ cairo_surface_write_to_png_stream (cairo_surface_t	*surface,
 
     return write_png (surface, stream_write_func, &png_closure);
 }
+slim_hidden_def (cairo_surface_write_to_png_stream);
 
 static INLINE int
 multiply_alpha (int alpha, int color)
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 9a13fb731..3f028dbbe 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -493,6 +493,7 @@ UNWIND_FONT_MAP_LOCK:
 UNWIND:
     return NULL;
 }
+slim_hidden_def (cairo_scaled_font_create);
 
 /**
  * cairo_scaled_font_reference:
@@ -551,6 +552,7 @@ cairo_scaled_font_reference (cairo_scaled_font_t *scaled_font)
 
     return scaled_font;
 }
+slim_hidden_def (cairo_scaled_font_reference);
 
 /**
  * cairo_scaled_font_destroy:
@@ -611,6 +613,7 @@ cairo_scaled_font_destroy (cairo_scaled_font_t *scaled_font)
     }
     _cairo_scaled_font_map_unlock ();
 }
+slim_hidden_def (cairo_scaled_font_destroy);
 
 /* Public font API follows. */
 
@@ -627,6 +630,7 @@ cairo_scaled_font_extents (cairo_scaled_font_t  *scaled_font,
 {
     *extents = scaled_font->extents;
 }
+slim_hidden_def (cairo_scaled_font_extents);
 
 /**
  * cairo_scaled_font_text_extents:
@@ -752,6 +756,7 @@ cairo_scaled_font_glyph_extents (cairo_scaled_font_t   *scaled_font,
     extents->x_advance = x_pos - glyphs[0].x;
     extents->y_advance = y_pos - glyphs[0].y;
 }
+slim_hidden_def (cairo_scaled_font_glyph_extents);
 
 cairo_status_t
 _cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font,
@@ -1408,6 +1413,7 @@ cairo_scaled_font_get_font_face (cairo_scaled_font_t *scaled_font)
 
     return scaled_font->font_face;
 }
+slim_hidden_def (cairo_scaled_font_get_font_face);
 
 /**
  * cairo_scaled_font_get_font_matrix:
@@ -1430,6 +1436,7 @@ cairo_scaled_font_get_font_matrix (cairo_scaled_font_t	*scaled_font,
 
     *font_matrix = scaled_font->font_matrix;
 }
+slim_hidden_def (cairo_scaled_font_get_font_matrix);
 
 /**
  * cairo_scaled_font_get_ctm:
@@ -1451,6 +1458,7 @@ cairo_scaled_font_get_ctm (cairo_scaled_font_t	*scaled_font,
 
     *ctm = scaled_font->ctm;
 }
+slim_hidden_def (cairo_scaled_font_get_ctm);
 
 /**
  * cairo_scaled_font_get_font_options:
@@ -1473,3 +1481,4 @@ cairo_scaled_font_get_font_options (cairo_scaled_font_t		*scaled_font,
 
     _cairo_font_options_init_copy (options, &scaled_font->options);
 }
+slim_hidden_def (cairo_scaled_font_get_font_options);
diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index 0468ca2d8..cbbe89a0a 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -197,6 +197,7 @@ cairo_surface_get_type (cairo_surface_t *surface)
      * surface. */
     return surface->type;
 }
+slim_hidden_def (cairo_surface_get_type);
 
 /**
  * cairo_surface_get_content:
@@ -232,6 +233,7 @@ cairo_surface_status (cairo_surface_t *surface)
 {
     return surface->status;
 }
+slim_hidden_def (cairo_surface_status);
 
 void
 _cairo_surface_init (cairo_surface_t			*surface,
@@ -338,6 +340,7 @@ cairo_surface_create_similar (cairo_surface_t  *other,
 						width, height,
 						CAIRO_COLOR_TRANSPARENT);
 }
+slim_hidden_def (cairo_surface_create_similar);
 
 cairo_surface_t *
 _cairo_surface_create_similar_solid (cairo_surface_t	 *other,
@@ -416,6 +419,7 @@ cairo_surface_reference (cairo_surface_t *surface)
 
     return surface;
 }
+slim_hidden_def (cairo_surface_reference);
 
 /**
  * cairo_surface_destroy:
@@ -497,6 +501,7 @@ cairo_surface_finish (cairo_surface_t *surface)
 
     surface->finished = TRUE;
 }
+slim_hidden_def (cairo_surface_finish);
 
 /**
  * cairo_surface_get_user_data:
@@ -602,6 +607,7 @@ cairo_surface_get_font_options (cairo_surface_t       *surface,
 
     _cairo_font_options_init_copy (options, &surface->font_options);
 }
+slim_hidden_def (cairo_surface_get_font_options);
 
 /**
  * cairo_surface_flush:
@@ -708,6 +714,7 @@ cairo_surface_mark_dirty_rectangle (cairo_surface_t *surface,
 	    _cairo_surface_set_error (surface, status);
     }
 }
+slim_hidden_def (cairo_surface_mark_dirty_rectangle);
 
 /**
  * _cairo_surface_set_device_scale:
@@ -790,6 +797,7 @@ cairo_surface_set_device_offset (cairo_surface_t *surface,
     surface->device_transform_inverse.x0 = - x_offset;
     surface->device_transform_inverse.y0 = - y_offset;
 }
+slim_hidden_def (cairo_surface_set_device_offset);
 
 /**
  * cairo_surface_get_device_offset:
@@ -810,6 +818,7 @@ cairo_surface_get_device_offset (cairo_surface_t *surface,
     *x_offset = surface->device_transform.x0;
     *y_offset = surface->device_transform.y0;
 }
+slim_hidden_def (cairo_surface_get_device_offset);
 
 /**
  * cairo_surface_set_fallback_resolution:
@@ -849,6 +858,7 @@ cairo_surface_set_fallback_resolution (cairo_surface_t	*surface,
     surface->x_fallback_resolution = x_pixels_per_inch;
     surface->y_fallback_resolution = y_pixels_per_inch;
 }
+slim_hidden_def (cairo_surface_set_fallback_resolution);
 
 cairo_bool_t
 _cairo_surface_has_device_transform (cairo_surface_t *surface)
diff --git a/src/cairo-xlib-private.h b/src/cairo-xlib-private.h
index f319dcc74..053cae71f 100644
--- a/src/cairo-xlib-private.h
+++ b/src/cairo-xlib-private.h
@@ -51,4 +51,11 @@ struct _cairo_xlib_screen_info {
 cairo_private cairo_xlib_screen_info_t *
 _cairo_xlib_screen_info_get (Display *display, Screen *screen);
 
+#if CAIRO_HAS_XLIB_XRENDER_SURFACE
+
+#include "cairo-xlib-xrender.h"
+slim_hidden_proto (cairo_xlib_surface_create_with_xrender_format)
+
+#endif
+
 #endif /* CAIRO_XLIB_PRIVATE_H */
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 55f95e86a..365e40d5d 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -2010,6 +2010,7 @@ cairo_xlib_surface_create_with_xrender_format (Display		    *dpy,
     return _cairo_xlib_surface_create_internal (dpy, drawable, screen,
 						NULL, format, width, height, 0);
 }
+slim_hidden_def (cairo_xlib_surface_create_with_xrender_format);
 
 /**
  * cairo_xlib_surface_set_size:
diff --git a/src/cairo.c b/src/cairo.c
index 928ebca4e..425a71761 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -206,6 +206,7 @@ cairo_create (cairo_surface_t *target)
 
     return cr;
 }
+slim_hidden_def (cairo_create);
 
 /**
  * cairo_reference:
@@ -267,6 +268,7 @@ cairo_destroy (cairo_t *cr)
 
     free (cr);
 }
+slim_hidden_def (cairo_destroy);
 
 /**
  * cairo_save:
@@ -571,6 +573,7 @@ cairo_set_operator (cairo_t *cr, cairo_operator_t op)
     if (cr->status)
 	_cairo_set_error (cr, cr->status);
 }
+slim_hidden_def (cairo_set_operator);
 
 /**
  * cairo_set_source_rgb
@@ -674,6 +677,7 @@ cairo_set_source_surface (cairo_t	  *cr,
     cairo_set_source (cr, pattern);
     cairo_pattern_destroy (pattern);
 }
+slim_hidden_def (cairo_set_source_surface);
 
 /**
  * cairo_set_source
@@ -714,6 +718,7 @@ cairo_set_source (cairo_t *cr, cairo_pattern_t *source)
     if (cr->status)
 	_cairo_set_error (cr, cr->status);
 }
+slim_hidden_def (cairo_set_source);
 
 /**
  * cairo_get_source:
@@ -1268,6 +1273,7 @@ cairo_line_to (cairo_t *cr, double x, double y)
     if (cr->status)
 	_cairo_set_error (cr, cr->status);
 }
+slim_hidden_def (cairo_line_to);
 
 /**
  * cairo_curve_to:
@@ -1321,6 +1327,7 @@ cairo_curve_to (cairo_t *cr,
     if (cr->status)
 	_cairo_set_error (cr, cr->status);
 }
+slim_hidden_def (cairo_curve_to);
 
 /**
  * cairo_arc:
@@ -1683,6 +1690,7 @@ cairo_paint (cairo_t *cr)
     if (cr->status)
 	_cairo_set_error (cr, cr->status);
 }
+slim_hidden_def (cairo_paint);
 
 /**
  * cairo_paint_with_alpha:
@@ -1754,6 +1762,7 @@ cairo_mask (cairo_t         *cr,
     if (cr->status)
 	_cairo_set_error (cr, cr->status);
 }
+slim_hidden_def (cairo_mask);
 
 /**
  * cairo_mask_surface:
@@ -2614,6 +2623,7 @@ cairo_get_tolerance (cairo_t *cr)
 {
     return _cairo_gstate_get_tolerance (cr->gstate);
 }
+slim_hidden_def (cairo_get_tolerance);
 
 /**
  * cairo_get_antialias:
@@ -2757,6 +2767,7 @@ cairo_get_matrix (cairo_t *cr, cairo_matrix_t *matrix)
 {
     _cairo_gstate_get_matrix (cr->gstate, matrix);
 }
+slim_hidden_def (cairo_get_matrix);
 
 /**
  * cairo_get_target:
@@ -2942,6 +2953,7 @@ cairo_status (cairo_t *cr)
 {
     return cr->status;
 }
+slim_hidden_def (cairo_status);
 
 /**
  * cairo_status_to_string:
diff --git a/src/cairoint.h b/src/cairoint.h
index 119ee26e4..0de43a976 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -1720,7 +1720,7 @@ _cairo_surface_init (cairo_surface_t			*surface,
 		     const cairo_surface_backend_t	*backend,
 		     cairo_content_t			 content);
 
-void
+cairo_private void
 _cairo_surface_set_font_options (cairo_surface_t       *surface,
 				 cairo_font_options_t  *options);
 
@@ -2025,7 +2025,7 @@ cairo_private cairo_int_status_t
 _cairo_image_surface_set_clip_region (void *abstract_surface,
 				      pixman_region16_t *region);
 
-cairo_image_surface_t *
+cairo_private cairo_image_surface_t *
 _cairo_image_surface_clone (cairo_image_surface_t	*surface,
 			    cairo_format_t		 format);
 
@@ -2234,7 +2234,7 @@ _cairo_pattern_transform (cairo_pattern_t      *pattern,
 cairo_private cairo_bool_t
 _cairo_pattern_is_opaque_solid (const cairo_pattern_t *pattern);
 
-cairo_bool_t
+cairo_private cairo_bool_t
 _cairo_pattern_is_opaque (const cairo_pattern_t *abstract_pattern);
 
 cairo_private cairo_int_status_t
@@ -2308,32 +2308,88 @@ cairo_private int
 _cairo_dtostr (char *buffer, size_t size, double d);
 
 /* Avoid unnecessary PLT entries.  */
-slim_hidden_proto(cairo_get_current_point)
-slim_hidden_proto(cairo_fill_preserve)
 slim_hidden_proto(cairo_clip_preserve)
 slim_hidden_proto(cairo_close_path)
-slim_hidden_proto(cairo_matrix_invert)
-slim_hidden_proto(cairo_matrix_multiply)
-slim_hidden_proto(cairo_matrix_scale)
+slim_hidden_proto(cairo_create)
+slim_hidden_proto(cairo_curve_to)
+slim_hidden_proto(cairo_destroy)
+slim_hidden_proto(cairo_fill_preserve)
+slim_hidden_proto(cairo_font_face_destroy)
+slim_hidden_proto(cairo_font_face_reference)
+slim_hidden_proto(cairo_font_options_create)
+slim_hidden_proto(cairo_font_options_destroy)
+slim_hidden_proto(cairo_font_options_equal)
+slim_hidden_proto(cairo_font_options_hash)
+slim_hidden_proto(cairo_font_options_merge)
+slim_hidden_proto(cairo_font_options_set_antialias)
+slim_hidden_proto(cairo_font_options_set_hint_metrics)
+slim_hidden_proto(cairo_font_options_set_hint_style)
+slim_hidden_proto(cairo_font_options_set_subpixel_order)
+slim_hidden_proto(cairo_get_current_point)
+slim_hidden_proto(cairo_get_matrix)
+slim_hidden_proto(cairo_get_tolerance)
+slim_hidden_proto(cairo_image_surface_create)
+slim_hidden_proto(cairo_image_surface_create_for_data)
+slim_hidden_proto(cairo_image_surface_get_height)
+slim_hidden_proto(cairo_image_surface_get_width)
+slim_hidden_proto(cairo_line_to)
+slim_hidden_proto(cairo_mask)
 slim_hidden_proto(cairo_matrix_init)
 slim_hidden_proto(cairo_matrix_init_identity)
-slim_hidden_proto(cairo_matrix_init_translate)
-slim_hidden_proto(cairo_matrix_init_scale)
 slim_hidden_proto(cairo_matrix_init_rotate)
+slim_hidden_proto(cairo_matrix_init_scale)
+slim_hidden_proto(cairo_matrix_init_translate)
+slim_hidden_proto(cairo_matrix_invert)
+slim_hidden_proto(cairo_matrix_multiply)
+slim_hidden_proto(cairo_matrix_scale)
 slim_hidden_proto(cairo_matrix_transform_distance)
 slim_hidden_proto(cairo_matrix_transform_point)
+slim_hidden_proto(cairo_matrix_translate)
 slim_hidden_proto(cairo_move_to)
 slim_hidden_proto(cairo_new_path)
+slim_hidden_proto(cairo_paint)
+slim_hidden_proto(cairo_pattern_create_for_surface)
+slim_hidden_proto(cairo_pattern_create_rgb)
+slim_hidden_proto(cairo_pattern_create_rgba)
+slim_hidden_proto(cairo_pattern_destroy)
+slim_hidden_proto(cairo_pattern_get_extend)
+slim_hidden_proto(cairo_pattern_get_type)
+slim_hidden_proto(cairo_pattern_reference)
+slim_hidden_proto(cairo_pattern_set_matrix)
+slim_hidden_proto(cairo_pop_group)
+slim_hidden_proto(cairo_pop_group_to_source)
+slim_hidden_proto(cairo_push_group)
+slim_hidden_proto(cairo_push_group_with_content)
 slim_hidden_proto(cairo_rel_line_to)
 slim_hidden_proto(cairo_restore)
 slim_hidden_proto(cairo_save)
+slim_hidden_proto(cairo_scaled_font_create)
+slim_hidden_proto(cairo_scaled_font_destroy)
+slim_hidden_proto(cairo_scaled_font_extents)
+slim_hidden_proto(cairo_scaled_font_get_ctm)
+slim_hidden_proto(cairo_scaled_font_get_font_face)
+slim_hidden_proto(cairo_scaled_font_get_font_matrix)
+slim_hidden_proto(cairo_scaled_font_get_font_options)
+slim_hidden_proto(cairo_scaled_font_glyph_extents)
+slim_hidden_proto(cairo_scaled_font_reference)
+slim_hidden_proto(cairo_set_operator)
+slim_hidden_proto(cairo_set_source)
+slim_hidden_proto(cairo_set_source_surface)
+slim_hidden_proto(cairo_status)
 slim_hidden_proto(cairo_stroke_preserve)
+slim_hidden_proto(cairo_surface_create_similar)
 slim_hidden_proto(cairo_surface_destroy)
+slim_hidden_proto(cairo_surface_finish)
 slim_hidden_proto(cairo_surface_get_content)
-slim_hidden_proto(cairo_push_group)
-slim_hidden_proto(cairo_push_group_with_content)
-slim_hidden_proto(cairo_pop_group)
-slim_hidden_proto(cairo_pop_group_to_source)
+slim_hidden_proto(cairo_surface_get_device_offset)
+slim_hidden_proto(cairo_surface_get_font_options)
+slim_hidden_proto(cairo_surface_get_type)
+slim_hidden_proto(cairo_surface_mark_dirty_rectangle)
+slim_hidden_proto(cairo_surface_reference)
+slim_hidden_proto(cairo_surface_set_device_offset)
+slim_hidden_proto(cairo_surface_set_fallback_resolution)
+slim_hidden_proto(cairo_surface_status)
+slim_hidden_proto(cairo_surface_write_to_png_stream)
 
 CAIRO_END_DECLS
 
diff --git a/src/test-fallback-surface.c b/src/test-fallback-surface.c
index 5c3c08c3b..8d3ebdaee 100644
--- a/src/test-fallback-surface.c
+++ b/src/test-fallback-surface.c
@@ -64,6 +64,8 @@ typedef struct _test_fallback_surface {
 
 const cairo_private cairo_surface_backend_t test_fallback_surface_backend;
 
+slim_hidden_proto (_test_fallback_surface_create)
+
 cairo_surface_t *
 _test_fallback_surface_create (cairo_content_t	content,
 			       int		width,
@@ -89,6 +91,7 @@ _test_fallback_surface_create (cairo_content_t	content,
 
     return &surface->base;
 }
+slim_hidden_def (_test_fallback_surface_create);
 
 static cairo_surface_t *
 _test_fallback_surface_create_similar (void		*abstract_surface,