Fix include gaurds and include order in hb-subset-glyf and hb-subset-plan
diff --git a/src/hb-subset-glyf.hh b/src/hb-subset-glyf.hh
index c802da2..035085f 100644
--- a/src/hb-subset-glyf.hh
+++ b/src/hb-subset-glyf.hh
@@ -24,8 +24,10 @@
* Google Author(s): Garret Rieger
*/
-#ifndef HB_SUBSET_GLYF_H
-#define HB_SUBSET_GLYF_H
+#ifndef HB_SUBSET_GLYF_HH
+#define HB_SUBSET_GLYF_HH
+
+#include "hb-private.hh"
#include "hb-subset-plan.hh"
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 20185e1..6f889b3 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -24,9 +24,9 @@
* Google Author(s): Garret Rieger, Roderick Sheeter
*/
-#include "hb-subset-plan.hh"
#include "hb-subset-private.hh"
+#include "hb-subset-plan.hh"
#include "hb-ot-cmap-table.hh"
hb_bool_t
diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh
index 1e572a4..a1e4e9e 100644
--- a/src/hb-subset-plan.hh
+++ b/src/hb-subset-plan.hh
@@ -24,10 +24,11 @@
* Google Author(s): Garret Rieger
*/
-#ifndef HB_SUBSET_PLAN_H
-#define HB_SUBSET_PLAN_H
+#ifndef HB_SUBSET_PLAN_HH
+#define HB_SUBSET_PLAN_HH
#include "hb-private.hh"
+
#include "hb-object-private.hh"
struct hb_subset_plan_t {
