[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-subset-private.hh  |    2 +-
 src/hb-subset.cc          |    3 +--
 test/api/hb-subset-test.h |    1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0bff6991de308044b077ce74bd45d57d8c4afe5f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Feb 19 11:51:25 2018 -0800

    Ugh. Really fix build.

diff --git a/src/hb-subset-private.hh b/src/hb-subset-private.hh
index 5473eac0..cf784d72 100644
--- a/src/hb-subset-private.hh
+++ b/src/hb-subset-private.hh
@@ -30,7 +30,7 @@
 
 #include "hb-private.hh"
 
-#include "hb-ot.h"
+#include "hb-subset.h"
 
 #include "hb-font-private.hh"
 
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 2eb4ebd0..1fe266fc 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -24,11 +24,10 @@
  * Google Author(s): Garret Rieger, Rod Sheeter, Behdad Esfahbod
  */
 
+#include "hb-private.hh"
 #include "hb-object-private.hh"
 #include "hb-open-type-private.hh"
 
-#include "hb-private.hh"
-
 #include "hb-subset-glyf.hh"
 #include "hb-subset-private.hh"
 #include "hb-subset-plan.hh"
diff --git a/test/api/hb-subset-test.h b/test/api/hb-subset-test.h
index 31f5145f..12f7868a 100644
--- a/test/api/hb-subset-test.h
+++ b/test/api/hb-subset-test.h
@@ -30,6 +30,7 @@
 #include <stdio.h>
 
 #include "hb-test.h"
+#include "hb-subset.h"
 
 
 HB_BEGIN_DECLS