Streamline HB_NO_CFF

src/hb-ot-cff1-table.cc

diff --git a/src/hb-ot-cff1-table.cc b/src/hb-ot-cff1-table.cc
index e6dd6a7..3238ad7 100644
--- a/src/hb-ot-cff1-table.cc
+++ b/src/hb-ot-cff1-table.cc
@@ -24,11 +24,13 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
-#include "hb-ot-cff1-table.hh"
-#include "hb-cff1-interp-cs.hh"
+#include "hb.hh"
 
 #ifndef HB_NO_CFF
 
+#include "hb-ot-cff1-table.hh"
+#include "hb-cff1-interp-cs.hh"
+
 using namespace CFF;
 
 /* SID to code */
@@ -391,4 +393,5 @@
   return false;
 }
 
+
 #endif

src/hb-ot-cff2-table.cc

diff --git a/src/hb-ot-cff2-table.cc b/src/hb-ot-cff2-table.cc
index f1fa6ec..9c9e37b 100644
--- a/src/hb-ot-cff2-table.cc
+++ b/src/hb-ot-cff2-table.cc
@@ -24,11 +24,13 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
-#include "hb-ot-cff2-table.hh"
-#include "hb-cff2-interp-cs.hh"
+#include "hb.hh"
 
 #ifndef HB_NO_OT_FONT_CFF
 
+#include "hb-ot-cff2-table.hh"
+#include "hb-cff2-interp-cs.hh"
+
 using namespace CFF;
 
 struct extents_param_t
@@ -142,4 +144,5 @@
   return true;
 }
 
+
 #endif

src/hb-subset-cff-common.cc

diff --git a/src/hb-subset-cff-common.cc b/src/hb-subset-cff-common.cc
index 2aa55b9..54f6dc2 100644
--- a/src/hb-subset-cff-common.cc
+++ b/src/hb-subset-cff-common.cc
@@ -24,6 +24,10 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
+#include "hb.hh"
+
+#ifndef HB_NO_SUBSET_CFF
+
 #include "hb-ot-cff-common.hh"
 #include "hb-ot-cff2-table.hh"
 #include "hb-subset-cff-common.hh"
@@ -223,3 +227,6 @@
     return_trace (false);
   }
 }
+
+
+#endif

src/hb-subset-cff1.cc

diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc
index 688f3f3..ab46808 100644
--- a/src/hb-subset-cff1.cc
+++ b/src/hb-subset-cff1.cc
@@ -24,6 +24,10 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
+#include "hb.hh"
+
+#ifndef HB_NO_SUBSET_CFF
+
 #include "hb-open-type.hh"
 #include "hb-ot-cff1-table.hh"
 #include "hb-set.h"
@@ -32,8 +36,6 @@
 #include "hb-subset-cff-common.hh"
 #include "hb-cff1-interp-cs.hh"
 
-#ifndef HB_NO_SUBSET_CFF
-
 using namespace CFF;
 
 struct remap_sid_t : remap_t
@@ -1121,4 +1123,5 @@
   return result;
 }
 
+
 #endif

src/hb-subset-cff2.cc

diff --git a/src/hb-subset-cff2.cc b/src/hb-subset-cff2.cc
index 78b8c05..afb23ae 100644
--- a/src/hb-subset-cff2.cc
+++ b/src/hb-subset-cff2.cc
@@ -24,6 +24,10 @@
  * Adobe Author(s): Michiharu Ariza
  */
 
+#include "hb.hh"
+
+#ifndef HB_NO_SUBSET_CFF
+
 #include "hb-open-type.hh"
 #include "hb-ot-cff2-table.hh"
 #include "hb-set.h"
@@ -32,8 +36,6 @@
 #include "hb-subset-cff-common.hh"
 #include "hb-cff2-interp-cs.hh"
 
-#ifndef HB_NO_SUBSET_CFF
-
 using namespace CFF;
 
 struct cff2_sub_table_offsets_t : cff_sub_table_offsets_t
@@ -629,4 +631,5 @@
   return result;
 }
 
+
 #endif