diff --git a/src/Makefile.sources b/src/Makefile.sources
index a4cf4bc68..ab8be248e 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -224,6 +224,7 @@ HB_SUBSET_sources = \
 	hb-subset-cff1.cc \
 	hb-subset-cff2.cc \
 	hb-subset-cff-common.cc \
+	hb-ot-cff1-table.cc \
 	hb-subset-input.cc \
 	hb-subset-plan.cc \
 	hb-subset-plan.hh \
diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
index c637be677..6d28599b9 100644
--- a/src/hb-subset-cff1.cc
+++ b/src/hb-subset-cff1.cc
@@ -292,7 +292,6 @@ struct cff_subset_plan {
 
   inline unsigned int plan_subset_charset (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan)
   {
-    const Charset *charset = acc.charset;
     unsigned int  size0, size_ranges;
     hb_codepoint_t  sid, last_sid = CFF_UNDEF_CODE;
     bool  two_byte = false;