diff --git a/canvas/src/lib.rs b/canvas/src/lib.rs
index da53b1a1..a92a19ab 100644
--- a/canvas/src/lib.rs
+++ b/canvas/src/lib.rs
@@ -26,7 +26,6 @@ use pathfinder_geometry::transform2d::Transform2F;
 use pathfinder_geometry::vector::{Vector2F, vec2f};
 use pathfinder_renderer::paint::{Paint, PaintId};
 use pathfinder_renderer::scene::{ClipPath, ClipPathId, DrawPath, RenderTarget, Scene};
-use skribo::FontCollection;
 use std::borrow::Cow;
 use std::default::Default;
 use std::f32::consts::PI;
@@ -36,9 +35,15 @@ use std::sync::Arc;
 
 pub use text::CanvasFontContext;
 
+#[cfg(feature = "pf-text")]
+use skribo::FontCollection;
+#[cfg(not(feature = "pf-text"))]
+use crate::text::FontCollection;
+
 #[cfg(feature = "pf-text")]
 pub use text::TextMetrics;
 
+
 const HAIRLINE_STROKE_WIDTH: f32 = 0.0333;
 const DEFAULT_FONT_SIZE: f32 = 10.0;
 
diff --git a/examples/canvas_minimal/src/main.rs b/examples/canvas_minimal/src/main.rs
index b3ef74d7..ab0eafa7 100644
--- a/examples/canvas_minimal/src/main.rs
+++ b/examples/canvas_minimal/src/main.rs
@@ -11,7 +11,7 @@
 use pathfinder_canvas::{CanvasFontContext, CanvasRenderingContext2D, Path2D};
 use pathfinder_color::ColorF;
 use pathfinder_geometry::rect::RectF;
-use pathfinder_geometry::vector::{Vector2F, Vector2I, vec2i};
+use pathfinder_geometry::vector::{vec2f, vec2i};
 use pathfinder_gl::{GLDevice, GLVersion};
 use pathfinder_renderer::concurrent::rayon::RayonExecutor;
 use pathfinder_renderer::concurrent::scene_proxy::SceneProxy;