diff --git a/src/hb-ot-base.h b/src/hb-ot-base.h
index 9d82d2289..0437c1689 100644
--- a/src/hb-ot-base.h
+++ b/src/hb-ot-base.h
@@ -48,8 +48,8 @@ HB_BEGIN_DECLS
 
 /* Methods */
 
-HB_EXTERN hb_bool_t
-hb_ot_base_has_data (hb_face_t *face);
+// HB_EXTERN hb_bool_t
+// hb_ot_base_has_data (hb_face_t *face);
 
 HB_END_DECLS
 
diff --git a/src/hb-ot-layout-base-table.hh b/src/hb-ot-layout-base-table.hh
index 169a13f3b..3c3d3ade3 100644
--- a/src/hb-ot-layout-base-table.hh
+++ b/src/hb-ot-layout-base-table.hh
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef HB_OT_BASE_TABLE_HH
-#define HB_OT_BASE_TABLE_HH
+#ifndef HB_OT_LAYOUT_BASE_TABLE_HH
+#define HB_OT_LAYOUT_BASE_TABLE_HH
 
 #include "hb-open-type-private.hh"
 #include "hb-ot-layout-common-private.hh"
@@ -312,7 +312,7 @@ struct BaseScript {
       return (this+defaultMinMax).get_min_value(featureTableTagIndex);
     }
     if (unlikely(baseLangSysIndex >= baseLangSysCount)) return NO_COORD;
-    return baseLangSysRecords[baseLangSysIndex].get_max_value(featureTableTagIndex); 
+    return baseLangSysRecords[baseLangSysIndex].get_max_value(featureTableTagIndex);
   }
 
   inline HBINT16 get_max_value (unsigned int baseLangSysIndex, unsigned int featureTableTagIndex) const
@@ -401,7 +401,7 @@ struct BaseScriptList {
   }
 
   inline unsigned int get_default_base_tag_index (unsigned int baseScriptIndex) const
-  { 
+  {
     if (unlikely(baseScriptIndex >= baseScriptCount)) return NOT_INDEXED;
     return baseScriptRecords[baseScriptIndex].get_default_base_tag_index();
   }
@@ -449,7 +449,7 @@ struct BaseScriptList {
 
   public:
   DEFINE_SIZE_ARRAY (4, baseScriptRecords);
-  
+
 };
 
 struct BaseTagList
@@ -487,7 +487,7 @@ struct Axis
   }
 
   inline unsigned int get_default_base_tag_index_for_script_index (unsigned int baseScriptIndex) const
-  { 
+  {
     if (unlikely(baseScriptList == Null(OffsetTo<BaseScriptList>))) return NOT_INDEXED;
     return (this+baseScriptList).get_default_base_tag_index(baseScriptIndex);
   }
@@ -546,7 +546,7 @@ struct BASEFormat1_1
     TRACE_SANITIZE (this);
     return_trace (c->check_struct (this) &&
       horizAxis.sanitize (c, this) &&
-      vertAxis.sanitize (c, this) && 
+      vertAxis.sanitize (c, this) &&
       itemVarStore.sanitize (c, this));
   }
 
@@ -578,7 +578,7 @@ struct BASEFormat1_0
   }
 
   inline unsigned int get_horiz_default_base_tag_index_for_script_index (unsigned int baseScriptIndex) const
-  { 
+  {
     if (unlikely(horizAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
     return (this+horizAxis).get_default_base_tag_index_for_script_index(baseScriptIndex);
   }
@@ -598,7 +598,7 @@ struct BASEFormat1_0
   }
 
   inline unsigned int get_vert_default_base_tag_index_for_script_index (unsigned int baseScriptIndex) const
-  { 
+  {
     if (unlikely(vertAxis == Null(OffsetTo<Axis>))) return NOT_INDEXED;
     return (this+vertAxis).get_default_base_tag_index_for_script_index(baseScriptIndex);
   }
@@ -796,4 +796,4 @@ struct BASE
 } /* namespace OT */
 
 
-#endif /* HB_OT_BASE_TABLE_HH */
+#endif /* HB_OT_LAYOUT_BASE_TABLE_HH */
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 3a1332122..e02ff115f 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -222,13 +222,13 @@ _hb_ot_layout_destroy (hb_ot_layout_t *layout)
   free (layout);
 }
 
-static inline const OT::BASE&
-_get_base (hb_face_t *face)
-{
-  if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::BASE);
-  hb_ot_layout_t * layout = hb_ot_layout_from_face (face);
-  return *(layout->base.get ());
-}
+// static inline const OT::BASE&
+// _get_base (hb_face_t *face)
+// {
+//   if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::BASE);
+//   hb_ot_layout_t * layout = hb_ot_layout_from_face (face);
+//   return *(layout->base.get ());
+// }
 
 static inline const OT::GDEF&
 _get_gdef (hb_face_t *face)
@@ -1283,21 +1283,19 @@ hb_ot_layout_substitute_lookup (OT::hb_ot_apply_context_t *c,
  * OT::BASE
  */
 
-#if 0
-/**
- * hb_ot_base_has_data:
- * @face: #hb_face_t to test
- *
- * This function allows to verify the presence of an OpenType BASE table on the
- * face.
- *
- * Return value: true if face has a BASE table, false otherwise
- *
- * Since: XXX
- **/
-hb_bool_t
-hb_ot_base_has_data (hb_face_t *face)
-{
-  return &_get_base (face) != &OT::Null(OT::BASE);
-}
-#endif
+// /**
+//  * hb_ot_base_has_data:
+//  * @face: #hb_face_t to test
+//  *
+//  * This function allows to verify the presence of an OpenType BASE table on the
+//  * face.
+//  *
+//  * Return value: true if face has a BASE table, false otherwise
+//  *
+//  * Since: XXX
+//  **/
+// hb_bool_t
+// hb_ot_base_has_data (hb_face_t *face)
+// {
+//   return &_get_base (face) != &OT::Null(OT::BASE);
+// }