diff --git a/src/Makefile.sources b/src/Makefile.sources
index bb4a41cef..346139181 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -90,6 +90,7 @@ HB_BASE_sources = \
 	hb-ot-layout-gsub-table.hh \
 	OT/glyf/glyf.hh \
 	OT/glyf/loca.hh \
+	OT/glyf/path-builder.hh \
 	OT/glyf/Glyph.hh \
 	OT/glyf/GlyphHeader.hh \
 	OT/glyf/SimpleGlyph.hh \
diff --git a/src/OT/glyf/glyf.hh b/src/OT/glyf/glyf.hh
index 581350393..cf80fb148 100644
--- a/src/OT/glyf/glyf.hh
+++ b/src/OT/glyf/glyf.hh
@@ -11,6 +11,7 @@
 #include "Glyph.hh"
 #include "SubsetGlyph.hh"
 #include "loca.hh"
+#include "path-builder.hh"
 
 
 namespace OT {
@@ -394,126 +395,9 @@ struct glyf_accelerator_t
     return needs_padding_removal ? glyf_impl::Glyph (glyph.trim_padding ()) : glyph;
   }
 
-  struct path_builder_t
-  {
-    hb_font_t *font;
-    hb_draw_session_t *draw_session;
-
-    struct optional_point_t
-    {
-      optional_point_t () { has_data = false; }
-      optional_point_t (float x_, float y_) { x = x_; y = y_; has_data = true; }
-
-      bool has_data;
-      float x;
-      float y;
-
-      optional_point_t lerp (optional_point_t p, float t)
-      { return optional_point_t (x + t * (p.x - x), y + t * (p.y - y)); }
-    } first_oncurve, first_offcurve, last_offcurve;
-
-    path_builder_t (hb_font_t *font_, hb_draw_session_t &draw_session_)
-    {
-      font = font_;
-      draw_session = &draw_session_;
-      first_oncurve = first_offcurve = last_offcurve = optional_point_t ();
-    }
-
-    /* based on https://github.com/RazrFalcon/ttf-parser/blob/4f32821/src/glyf.rs#L287
-       See also:
-       * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM01/Chap1.html
-       * https://stackoverflow.com/a/20772557 */
-    void consume_point (const contour_point_t &point)
-    {
-      bool is_on_curve = point.flag & glyf_impl::SimpleGlyph::FLAG_ON_CURVE;
-      optional_point_t p (point.x, point.y);
-      if (!first_oncurve.has_data)
-      {
-	if (is_on_curve)
-	{
-	  first_oncurve = p;
-	  draw_session->move_to (font->em_fscalef_x (p.x), font->em_fscalef_y (p.y));
-	}
-	else
-	{
-	  if (first_offcurve.has_data)
-	  {
-	    optional_point_t mid = first_offcurve.lerp (p, .5f);
-	    first_oncurve = mid;
-	    last_offcurve = p;
-	    draw_session->move_to (font->em_fscalef_x (mid.x), font->em_fscalef_y (mid.y));
-	  }
-	  else
-	    first_offcurve = p;
-	}
-      }
-      else
-      {
-	if (last_offcurve.has_data)
-	{
-	  if (is_on_curve)
-	  {
-	    draw_session->quadratic_to (font->em_fscalef_x (last_offcurve.x), font->em_fscalef_y (last_offcurve.y),
-				       font->em_fscalef_x (p.x), font->em_fscalef_y (p.y));
-	    last_offcurve = optional_point_t ();
-	  }
-	  else
-	  {
-	    optional_point_t mid = last_offcurve.lerp (p, .5f);
-	    draw_session->quadratic_to (font->em_fscalef_x (last_offcurve.x), font->em_fscalef_y (last_offcurve.y),
-				       font->em_fscalef_x (mid.x), font->em_fscalef_y (mid.y));
-	    last_offcurve = p;
-	  }
-	}
-	else
-	{
-	  if (is_on_curve)
-	    draw_session->line_to (font->em_fscalef_x (p.x), font->em_fscalef_y (p.y));
-	  else
-	    last_offcurve = p;
-	}
-      }
-
-      if (point.is_end_point)
-      {
-	if (first_offcurve.has_data && last_offcurve.has_data)
-	{
-	  optional_point_t mid = last_offcurve.lerp (first_offcurve, .5f);
-	  draw_session->quadratic_to (font->em_fscalef_x (last_offcurve.x), font->em_fscalef_y (last_offcurve.y),
-				     font->em_fscalef_x (mid.x), font->em_fscalef_y (mid.y));
-	  last_offcurve = optional_point_t ();
-	  /* now check the rest */
-	}
-
-	if (first_offcurve.has_data && first_oncurve.has_data)
-	  draw_session->quadratic_to (font->em_fscalef_x (first_offcurve.x), font->em_fscalef_y (first_offcurve.y),
-				     font->em_fscalef_x (first_oncurve.x), font->em_fscalef_y (first_oncurve.y));
-	else if (last_offcurve.has_data && first_oncurve.has_data)
-	  draw_session->quadratic_to (font->em_fscalef_x (last_offcurve.x), font->em_fscalef_y (last_offcurve.y),
-				     font->em_fscalef_x (first_oncurve.x), font->em_fscalef_y (first_oncurve.y));
-	else if (first_oncurve.has_data)
-	  draw_session->line_to (font->em_fscalef_x (first_oncurve.x), font->em_fscalef_y (first_oncurve.y));
-	else if (first_offcurve.has_data)
-	{
-	  float x = font->em_fscalef_x (first_offcurve.x), y = font->em_fscalef_x (first_offcurve.y);
-	  draw_session->move_to (x, y);
-	  draw_session->quadratic_to (x, y, x, y);
-	}
-
-	/* Getting ready for the next contour */
-	first_oncurve = first_offcurve = last_offcurve = optional_point_t ();
-	draw_session->close_path ();
-      }
-    }
-    void points_end () {}
-
-    bool is_consuming_contour_points () { return true; }
-    contour_point_t *get_phantoms_sink () { return nullptr; }
-  };
-
   bool
   get_path (hb_font_t *font, hb_codepoint_t gid, hb_draw_session_t &draw_session) const
-  { return get_points (font, gid, path_builder_t (font, draw_session)); }
+  { return get_points (font, gid, glyf_impl::path_builder_t (font, draw_session)); }
 
 #ifndef HB_NO_VAR
   const gvar_accelerator_t *gvar;
diff --git a/src/OT/glyf/path-builder.hh b/src/OT/glyf/path-builder.hh
new file mode 100644
index 000000000..ee68b827e
--- /dev/null
+++ b/src/OT/glyf/path-builder.hh
@@ -0,0 +1,134 @@
+#ifndef OT_GLYF_PATHBUILDER_HH
+#define OT_GLYF_PATHBUILDER_HH
+
+
+#include "../../hb.hh"
+
+
+namespace OT {
+namespace glyf_impl {
+
+
+struct path_builder_t
+{
+  hb_font_t *font;
+  hb_draw_session_t *draw_session;
+
+  struct optional_point_t
+  {
+    optional_point_t () { has_data = false; }
+    optional_point_t (float x_, float y_) { x = x_; y = y_; has_data = true; }
+
+    bool has_data;
+    float x;
+    float y;
+
+    optional_point_t lerp (optional_point_t p, float t)
+    { return optional_point_t (x + t * (p.x - x), y + t * (p.y - y)); }
+  } first_oncurve, first_offcurve, last_offcurve;
+
+  path_builder_t (hb_font_t *font_, hb_draw_session_t &draw_session_)
+  {
+    font = font_;
+    draw_session = &draw_session_;
+    first_oncurve = first_offcurve = last_offcurve = optional_point_t ();
+  }
+
+  /* based on https://github.com/RazrFalcon/ttf-parser/blob/4f32821/src/glyf.rs#L287
+     See also:
+     * https://developer.apple.com/fonts/TrueType-Reference-Manual/RM01/Chap1.html
+     * https://stackoverflow.com/a/20772557 */
+  void consume_point (const contour_point_t &point)
+  {
+    bool is_on_curve = point.flag & glyf_impl::SimpleGlyph::FLAG_ON_CURVE;
+    optional_point_t p (point.x, point.y);
+    if (!first_oncurve.has_data)
+    {
+      if (is_on_curve)
+      {
+	first_oncurve = p;
+	draw_session->move_to (font->em_fscalef_x (p.x), font->em_fscalef_y (p.y));
+      }
+      else
+      {
+	if (first_offcurve.has_data)
+	{
+	  optional_point_t mid = first_offcurve.lerp (p, .5f);
+	  first_oncurve = mid;
+	  last_offcurve = p;
+	  draw_session->move_to (font->em_fscalef_x (mid.x), font->em_fscalef_y (mid.y));
+	}
+	else
+	  first_offcurve = p;
+      }
+    }
+    else
+    {
+      if (last_offcurve.has_data)
+      {
+	if (is_on_curve)
+	{
+	  draw_session->quadratic_to (font->em_fscalef_x (last_offcurve.x), font->em_fscalef_y (last_offcurve.y),
+				     font->em_fscalef_x (p.x), font->em_fscalef_y (p.y));
+	  last_offcurve = optional_point_t ();
+	}
+	else
+	{
+	  optional_point_t mid = last_offcurve.lerp (p, .5f);
+	  draw_session->quadratic_to (font->em_fscalef_x (last_offcurve.x), font->em_fscalef_y (last_offcurve.y),
+				     font->em_fscalef_x (mid.x), font->em_fscalef_y (mid.y));
+	  last_offcurve = p;
+	}
+      }
+      else
+      {
+	if (is_on_curve)
+	  draw_session->line_to (font->em_fscalef_x (p.x), font->em_fscalef_y (p.y));
+	else
+	  last_offcurve = p;
+      }
+    }
+
+    if (point.is_end_point)
+    {
+      if (first_offcurve.has_data && last_offcurve.has_data)
+      {
+	optional_point_t mid = last_offcurve.lerp (first_offcurve, .5f);
+	draw_session->quadratic_to (font->em_fscalef_x (last_offcurve.x), font->em_fscalef_y (last_offcurve.y),
+				   font->em_fscalef_x (mid.x), font->em_fscalef_y (mid.y));
+	last_offcurve = optional_point_t ();
+	/* now check the rest */
+      }
+
+      if (first_offcurve.has_data && first_oncurve.has_data)
+	draw_session->quadratic_to (font->em_fscalef_x (first_offcurve.x), font->em_fscalef_y (first_offcurve.y),
+				   font->em_fscalef_x (first_oncurve.x), font->em_fscalef_y (first_oncurve.y));
+      else if (last_offcurve.has_data && first_oncurve.has_data)
+	draw_session->quadratic_to (font->em_fscalef_x (last_offcurve.x), font->em_fscalef_y (last_offcurve.y),
+				   font->em_fscalef_x (first_oncurve.x), font->em_fscalef_y (first_oncurve.y));
+      else if (first_oncurve.has_data)
+	draw_session->line_to (font->em_fscalef_x (first_oncurve.x), font->em_fscalef_y (first_oncurve.y));
+      else if (first_offcurve.has_data)
+      {
+	float x = font->em_fscalef_x (first_offcurve.x), y = font->em_fscalef_x (first_offcurve.y);
+	draw_session->move_to (x, y);
+	draw_session->quadratic_to (x, y, x, y);
+      }
+
+      /* Getting ready for the next contour */
+      first_oncurve = first_offcurve = last_offcurve = optional_point_t ();
+      draw_session->close_path ();
+    }
+  }
+  void points_end () {}
+
+  bool is_consuming_contour_points () { return true; }
+  contour_point_t *get_phantoms_sink () { return nullptr; }
+};
+
+
+} /* namespace glyf_impl */
+} /* namespace OT */
+
+
+#endif /* OT_GLYF_PATHBUILDER_HH */
diff --git a/src/meson.build b/src/meson.build
index bc6cc88c0..216a85ab8 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -94,6 +94,7 @@ hb_base_sources = files(
   'hb-ot-layout-gsub-table.hh',
   'OT/glyf/glyf.hh',
   'OT/glyf/loca.hh',
+  'OT/glyf/path-builder.hh',
   'OT/glyf/Glyph.hh',
   'OT/glyf/GlyphHeader.hh',
   'OT/glyf/SimpleGlyph.hh',