diff --git a/src/hb-ot-cbdt-table.hh b/src/hb-ot-cbdt-table.hh
index 000f602..ca2859e 100644
--- a/src/hb-ot-cbdt-table.hh
+++ b/src/hb-ot-cbdt-table.hh
@@ -288,7 +288,7 @@
   BYTE bitDepth;
   CHAR flags;
 
-public:
+  public:
   DEFINE_SIZE_STATIC(48);
 };
 
@@ -315,6 +315,8 @@
 
 struct CBLC
 {
+  friend struct CBDT;
+
   static const hb_tag_t tableTag = HB_OT_TAG_CBLC;
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -325,7 +327,7 @@
 		  sizeTables.sanitize (c, this));
   }
 
-  public:
+  protected:
   const IndexSubtableRecord *find_table (hb_codepoint_t glyph,
 					 unsigned int *x_ppem, unsigned int *y_ppem) const
   {
diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh
index b05c37e..dba1022 100644
--- a/src/hb-ot-glyf-table.hh
+++ b/src/hb-ot-glyf-table.hh
@@ -43,6 +43,8 @@
 
 struct loca
 {
+  friend struct glyf;
+
   static const hb_tag_t tableTag = HB_OT_TAG_loca;
 
   inline bool sanitize (hb_sanitize_context_t *c) const
@@ -51,7 +53,7 @@
     return_trace (true);
   }
 
-  public:
+  protected:
   union {
     USHORT	shortsZ[VAR];		/* Location offset divided by 2. */
     ULONG	longsZ[VAR];		/* Location offset. */
@@ -167,7 +169,7 @@
     unsigned int glyf_len;
   };
 
-  public:
+  protected:
   BYTE		dataX[VAR];		/* Glyphs data. */
 
   DEFINE_SIZE_ARRAY (0, dataX);