diff --git a/src/Makefile.sources b/src/Makefile.sources
index 97efda227..654255e20 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -213,6 +213,7 @@ HB_SUBSET_sources = \
 	hb-subset-glyf.cc \
 	hb-subset-glyf.hh \
 	hb-subset-input.cc \
+	hb-subset-input.hh \
 	hb-subset-plan.cc \
 	hb-subset-plan.hh \
 	$(NULL)
diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh
index faf0a2c61..b7db145c6 100644
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
@@ -29,7 +29,7 @@
 
 #include "hb-open-type.hh"
 #include "hb-set.hh"
-#include "hb-subset-plan.hh"
+#include "hb-subset.hh"
 
 /*
  * cmap -- Character to Glyph Index Mapping
diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh
index 65758861a..7c2098360 100644
--- a/src/hb-ot-glyf-table.hh
+++ b/src/hb-ot-glyf-table.hh
@@ -30,8 +30,6 @@
 #include "hb-open-type.hh"
 #include "hb-ot-head-table.hh"
 #include "hb-subset-glyf.hh"
-#include "hb-subset-plan.hh"
-#include "hb-subset.hh"
 
 namespace OT {
 
diff --git a/src/hb-ot-hdmx-table.hh b/src/hb-ot-hdmx-table.hh
index 5ce5fe4ab..3702d84c3 100644
--- a/src/hb-ot-hdmx-table.hh
+++ b/src/hb-ot-hdmx-table.hh
@@ -28,7 +28,7 @@
 #define HB_OT_HDMX_TABLE_HH
 
 #include "hb-open-type.hh"
-#include "hb-subset-plan.hh"
+#include "hb-subset.hh"
 
 /*
  * hdmx -- Horizontal Device Metrics
diff --git a/src/hb-ot-hmtx-table.hh b/src/hb-ot-hmtx-table.hh
index 9bdca7eb9..5500e9cd3 100644
--- a/src/hb-ot-hmtx-table.hh
+++ b/src/hb-ot-hmtx-table.hh
@@ -31,7 +31,7 @@
 #include "hb-ot-hhea-table.hh"
 #include "hb-ot-os2-table.hh"
 #include "hb-ot-var-hvar-table.hh"
-#include "hb-subset-plan.hh"
+#include "hb-subset.hh"
 
 /*
  * hmtx -- Horizontal Metrics
diff --git a/src/hb-ot-maxp-table.hh b/src/hb-ot-maxp-table.hh
index cd2a85ebc..8a889eeda 100644
--- a/src/hb-ot-maxp-table.hh
+++ b/src/hb-ot-maxp-table.hh
@@ -28,7 +28,7 @@
 #define HB_OT_MAXP_TABLE_HH
 
 #include "hb-open-type.hh"
-#include "hb-subset-plan.hh"
+#include "hb-subset.hh"
 
 namespace OT {
 
diff --git a/src/hb-ot-os2-table.hh b/src/hb-ot-os2-table.hh
index c5ad803a2..e00f3cada 100644
--- a/src/hb-ot-os2-table.hh
+++ b/src/hb-ot-os2-table.hh
@@ -29,7 +29,7 @@
 
 #include "hb-open-type.hh"
 #include "hb-ot-os2-unicode-ranges.hh"
-#include "hb-subset-plan.hh"
+#include "hb-subset.hh"
 
 namespace OT {
 
diff --git a/src/hb-ot-post-table.hh b/src/hb-ot-post-table.hh
index 0c3e596a3..955a6d66f 100644
--- a/src/hb-ot-post-table.hh
+++ b/src/hb-ot-post-table.hh
@@ -28,7 +28,7 @@
 #define HB_OT_POST_TABLE_HH
 
 #include "hb-open-type.hh"
-#include "hb-subset-plan.hh"
+#include "hb-subset.hh"
 
 #define HB_STRING_ARRAY_NAME format1_names
 #define HB_STRING_ARRAY_LIST "hb-ot-post-macroman.hh"
diff --git a/src/hb-subset-glyf.cc b/src/hb-subset-glyf.cc
index e335912f6..499380a97 100644
--- a/src/hb-subset-glyf.cc
+++ b/src/hb-subset-glyf.cc
@@ -28,7 +28,6 @@
 #include "hb-ot-glyf-table.hh"
 #include "hb-set.h"
 #include "hb-subset-glyf.hh"
-#include "hb-subset-plan.hh"
 
 static bool
 _calculate_glyf_and_loca_prime_size (const OT::glyf::accelerator_t &glyf,
diff --git a/src/hb-subset-glyf.hh b/src/hb-subset-glyf.hh
index c564206bd..3109ecb64 100644
--- a/src/hb-subset-glyf.hh
+++ b/src/hb-subset-glyf.hh
@@ -29,7 +29,7 @@
 
 #include "hb.hh"
 
-#include "hb-subset-plan.hh"
+#include "hb-subset.hh"
 
 HB_INTERNAL bool
 hb_subset_glyf_and_loca (hb_subset_plan_t *plan,
diff --git a/src/hb-subset-input.hh b/src/hb-subset-input.hh
new file mode 100644
index 000000000..9fc86154e
--- /dev/null
+++ b/src/hb-subset-input.hh
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2018  Google, Inc.
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ *
+ * Google Author(s): Garret Rieger, Roderick Sheeter
+ */
+
+#ifndef HB_SUBSET_INPUT_HH
+#define HB_SUBSET_INPUT_HH
+
+
+#include "hb.hh"
+
+#include "hb-subset.h"
+
+#include "hb-font.hh"
+
+struct hb_subset_input_t
+{
+  hb_object_header_t header;
+  ASSERT_POD ();
+
+  hb_set_t *unicodes;
+  hb_set_t *glyphs;
+
+  bool drop_hints : 1;
+  bool drop_layout : 1;
+  /* TODO
+   *
+   * features
+   * lookups
+   * nameIDs
+   * ...
+   */
+};
+
+
+#endif /* HB_SUBSET_INPUT_HH */
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 2d8538ef0..d9d25b3d0 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -24,11 +24,10 @@
  * Google Author(s): Garret Rieger, Roderick Sheeter
  */
 
+#include "hb-subset-plan.hh"
 #include "hb-map.hh"
-#include "hb-subset.hh"
 #include "hb-set.hh"
 
-#include "hb-subset-plan.hh"
 #include "hb-ot-cmap-table.hh"
 #include "hb-ot-glyf-table.hh"
 
diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh
index af7c5d332..7b6bc77f7 100644
--- a/src/hb-subset-plan.hh
+++ b/src/hb-subset-plan.hh
@@ -30,7 +30,7 @@
 #include "hb.hh"
 
 #include "hb-subset.h"
-#include "hb-subset.hh"
+#include "hb-subset-input.hh"
 
 #include "hb-map.hh"
 
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 332a1e280..f6abdc43b 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -27,9 +27,8 @@
 #include "hb.hh"
 #include "hb-open-type.hh"
 
-#include "hb-subset-glyf.hh"
 #include "hb-subset.hh"
-#include "hb-subset-plan.hh"
+#include "hb-subset-glyf.hh"
 
 #include "hb-open-file.hh"
 #include "hb-ot-cmap-table.hh"
diff --git a/src/hb-subset.hh b/src/hb-subset.hh
index efc354b99..a9d00c6c1 100644
--- a/src/hb-subset.hh
+++ b/src/hb-subset.hh
@@ -32,26 +32,9 @@
 
 #include "hb-subset.h"
 
-#include "hb-font.hh"
+#include "hb-subset-input.hh"
+#include "hb-subset-plan.hh"
 
-struct hb_subset_input_t
-{
-  hb_object_header_t header;
-  ASSERT_POD ();
-
-  hb_set_t *unicodes;
-  hb_set_t *glyphs;
-
-  bool drop_hints : 1;
-  bool drop_layout : 1;
-  /* TODO
-   *
-   * features
-   * lookups
-   * nameIDs
-   * ...
-   */
-};
 
 
 #endif /* HB_SUBSET_HH */