diff --git a/src/hb-cff-interp-common-private.hh b/src/hb-cff-interp-common-private.hh
index 0f81b48a4..8cfa20a5a 100644
--- a/src/hb-cff-interp-common-private.hh
+++ b/src/hb-cff-interp-common-private.hh
@@ -26,6 +26,8 @@
 #ifndef HB_CFF_INTERP_COMMON_PRIVATE_HH
 #define HB_CFF_INTERP_COMMON_PRIVATE_HH
 
+#include "hb-common.h"
+
 namespace CFF {
 
 using namespace OT;
diff --git a/src/hb-cff-interp-cs-common-private.hh b/src/hb-cff-interp-cs-common-private.hh
index 8da90059b..5507ee6cb 100644
--- a/src/hb-cff-interp-cs-common-private.hh
+++ b/src/hb-cff-interp-cs-common-private.hh
@@ -23,8 +23,8 @@
  *
  * Adobe Author(s): Michiharu Ariza
  */
-#ifndef HB_CFF_CS_INTERP_COMMON_PRIVATE_HH
-#define HB_CFF_CS_INTERP_COMMON_PRIVATE_HH
+#ifndef HB_CFF_INTERP_CS_COMMON_PRIVATE_HH
+#define HB_CFF_INTERP_CS_COMMON_PRIVATE_HH
 
 #include "hb-cff-interp-common-private.hh"
 
@@ -171,4 +171,4 @@ struct CSInterpreter : Interpreter<ENV>
 
 } /* namespace CFF */
 
-#endif /* HB_CFF_CS_INTERP_COMMON_PRIVATE_HH */
+#endif /* HB_CFF_INTERP_CS_COMMON_PRIVATE_HH */
diff --git a/src/hb-cff-interp-cs.hh b/src/hb-cff-interp-cs.hh
index 60ef5f768..274c947d6 100644
--- a/src/hb-cff-interp-cs.hh
+++ b/src/hb-cff-interp-cs.hh
@@ -23,8 +23,8 @@
  *
  * Adobe Author(s): Michiharu Ariza
  */
-#ifndef HB_CFF_CS_INTERP_HH
-#define HB_CFF_CS_INTERP_HH
+#ifndef HB_CFF_INTERP_CS_HH
+#define HB_CFF_INTERP_CS_HH
 
 #include "hb-cff-interp-cs.hh"
 
@@ -279,4 +279,4 @@ struct CFFCSInterpreter : CSInterpreter<CFFCSInterpEnv, OPSET, PARAM> {};
 
 } /* namespace CFF */
 
-#endif /* HB_CFF_CS_INTERP_HH */
+#endif /* HB_CFF_INTERP_CS_HH */
diff --git a/src/hb-cff-interp-dict-common-private.hh b/src/hb-cff-interp-dict-common-private.hh
index da7b5908a..60764fd3a 100644
--- a/src/hb-cff-interp-dict-common-private.hh
+++ b/src/hb-cff-interp-dict-common-private.hh
@@ -23,8 +23,8 @@
  *
  * Adobe Author(s): Michiharu Ariza
  */
-#ifndef HB_CFF_DICT_INTERP_COMMON_PRIVATE_HH
-#define HB_CFF_DICT_INTERP_COMMON_PRIVATE_HH
+#ifndef HB_CFF_INTERP_DICT_COMMON_PRIVATE_HH
+#define HB_CFF_INTERP_DICT_COMMON_PRIVATE_HH
 
 #include "hb-cff-interp-common-private.hh"
 
@@ -180,4 +180,4 @@ struct DictInterpreter : Interpreter<InterpEnv>
 
 } /* namespace CFF */
 
-#endif /* HB_CFF_DICT_INTERP_COMMON_PRIVATE_HH */
+#endif /* HB_CFF_INTERP_DICT_COMMON_PRIVATE_HH */
diff --git a/src/hb-subset-cff.cc b/src/hb-subset-cff.cc
index c778e1ecf..03484dbe2 100644
--- a/src/hb-subset-cff.cc
+++ b/src/hb-subset-cff.cc
@@ -34,9 +34,6 @@
 
 using namespace CFF;
 
-char RETURN_OP[1] = { OpCode_return };
-static const ByteStr NULL_SUBR = { RETURN_OP/* str */, 1/* len */ };
-
 struct CFFSubTableOffsets {
   inline CFFSubTableOffsets (void)
   {
@@ -384,6 +381,9 @@ static inline bool _write_cff (const cff_subset_plan &plan,
 {
   hb_serialize_context_t c (dest, dest_sz);
 
+  char RETURN_OP[1] = { OpCode_return };
+  const ByteStr NULL_SUBR = { RETURN_OP/* str */, 1/* len */ };
+
   OT::cff *cff = c.start_serialize<OT::cff> ();
   if (unlikely (!c.extend_min (*cff)))
     return false;