diff --git a/src/Makefile.am b/src/Makefile.am
index d209c0b13..6e2826af1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -196,9 +196,9 @@ BUILT_SOURCES += harfbuzz-subset.cc
 lib_LTLIBRARIES += libharfbuzz-cairo.la
 libharfbuzz_cairo_la_LINK = $(chosen_linker) $(libharfbuzz_cairo_la_LDFLAGS)
 libharfbuzz_cairo_la_SOURCES = $(HB_CAIRO_sources)
-libharfbuzz_cairo_la_CPPFLAGS = $(HBCFLAGS) $(CODE_COVERAGE_CFLAGS)
+libharfbuzz_cairo_la_CPPFLAGS = $(HBCFLAGS) $(CAIRO_CFLAGS) $(CODE_COVERAGE_CFLAGS)
 libharfbuzz_cairo_la_LDFLAGS = $(base_link_flags) $(export_symbols_subset) $(CODE_COVERAGE_LDFLAGS)
-libharfbuzz_cairo_la_LIBADD = libharfbuzz.la
+libharfbuzz_cairo_la_LIBADD = $(CAIRO_LIBS) libharfbuzz.la
 pkginclude_HEADERS += $(HB_CAIRO_headers)
 pkgconfig_DATA += harfbuzz-cairo.pc
 EXTRA_DIST += harfbuzz-cairo.pc.in
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 3550dd86b..e607ed5eb 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -376,8 +376,15 @@ HB_SUBSET_headers = \
 	hb-subset-repacker.h \
 	$(NULL)
 
-HB_CAIRO_sources = hb-cairo.cc hb-cairo-utils.cc hb-cairo-utils.hh
-HB_CAIRO_headers = hb-cairo.h
+HB_CAIRO_sources = \
+	hb-cairo.cc \
+	hb-cairo-utils.cc \
+	hb-cairo-utils.hh \
+	hb-static.cc \
+	$(NULL)
+HB_CAIRO_headers = \
+	hb-cairo.h \
+	$(NULL)
 
 HB_GOBJECT_DIST_sources = hb-gobject-structs.cc
 HB_GOBJECT_DIST_headers = hb-gobject.h hb-gobject-structs.h