diff --git a/src/hb-array.hh b/src/hb-array.hh
index cfef75dba..c744a2fd9 100644
--- a/src/hb-array.hh
+++ b/src/hb-array.hh
@@ -86,8 +86,8 @@ struct hb_array_t : hb_iter_with_fallback_t<hb_array_t<Type>, Type&>
   operator hb_array_t<const Type> () { return hb_array_t<const Type> (arrayZ, length); }
   template <typename T> operator T * () const { return arrayZ; }
 
-  bool operator == (const hb_array_t &o) const;
-  uint32_t hash () const;
+  HB_INTERNAL bool operator == (const hb_array_t &o) const;
+  HB_INTERNAL uint32_t hash () const;
 
   /*
    * Compare, Sort, and Search.
diff --git a/src/hb-meta.hh b/src/hb-meta.hh
index c0095637e..c7c91ea50 100644
--- a/src/hb-meta.hh
+++ b/src/hb-meta.hh
@@ -75,12 +75,12 @@ static const struct
 /* std::move and std::forward */
 
 template <typename T>
-hb_remove_reference (T)&& hb_move (T&& t) { return (hb_remove_reference (T)&&) (t); }
+static hb_remove_reference (T)&& hb_move (T&& t) { return (hb_remove_reference (T)&&) (t); }
 
 template <typename T>
-T&& hb_forward (hb_remove_reference (T)& t) { return (T&&) t; }
+static T&& hb_forward (hb_remove_reference (T)& t) { return (T&&) t; }
 template <typename T>
-T&& hb_forward (hb_remove_reference (T)&& t) { return (T&&) t; }
+static T&& hb_forward (hb_remove_reference (T)&& t) { return (T&&) t; }
 
 
 /* Void!  For when we need a expression-type of void. */