diff --git a/src/hb-ot-glyf-table.hh b/src/hb-ot-glyf-table.hh
index a6dec40d2..f568cf0cd 100644
--- a/src/hb-ot-glyf-table.hh
+++ b/src/hb-ot-glyf-table.hh
@@ -200,8 +200,8 @@ struct glyf
     };
 
     static bool get_iterator (const char * glyph_data,
-				     unsigned int length,
-				     CompositeGlyphHeader::Iterator *iterator /* OUT */)
+			      unsigned int length,
+			      CompositeGlyphHeader::Iterator *iterator /* OUT */)
     {
       if (length < GlyphHeader::static_size)
 	return false; /* Empty glyph; zero extents. */
@@ -355,8 +355,8 @@ struct glyf
     }
 
     bool get_offsets (hb_codepoint_t  glyph,
-			     unsigned int   *start_offset /* OUT */,
-			     unsigned int   *end_offset   /* OUT */) const
+		      unsigned int   *start_offset /* OUT */,
+		      unsigned int   *end_offset   /* OUT */) const
     {
       if (unlikely (glyph >= num_glyphs))
 	return false;
diff --git a/src/hb-subset-cff-common.hh b/src/hb-subset-cff-common.hh
index 512649a8d..2cec4d032 100644
--- a/src/hb-subset-cff-common.hh
+++ b/src/hb-subset-cff-common.hh
@@ -286,12 +286,9 @@ template <typename ACC, typename ENV, typename OPSET>
 struct subr_flattener_t
 {
   subr_flattener_t (const ACC &acc_,
-			const hb_vector_t<hb_codepoint_t> &glyphs_,
-			bool drop_hints_)
-    : acc (acc_),
-      glyphs (glyphs_),
-      drop_hints (drop_hints_)
-  {}
+		    const hb_vector_t<hb_codepoint_t> &glyphs_,
+		    bool drop_hints_) : acc (acc_), glyphs (glyphs_),
+					drop_hints (drop_hints_) {}
 
   bool flatten (str_buff_vec_t &flat_charstrings)
   {
@@ -479,9 +476,9 @@ struct parsed_cs_str_vec_t : hb_vector_t<parsed_cs_str_t>
 struct subr_subset_param_t
 {
   void init (parsed_cs_str_t *parsed_charstring_,
-		    parsed_cs_str_vec_t *parsed_global_subrs_, parsed_cs_str_vec_t *parsed_local_subrs_,
-		    hb_set_t *global_closure_, hb_set_t *local_closure_,
-		    bool drop_hints_)
+	     parsed_cs_str_vec_t *parsed_global_subrs_, parsed_cs_str_vec_t *parsed_local_subrs_,
+	     hb_set_t *global_closure_, hb_set_t *local_closure_,
+	     bool drop_hints_)
   {
     parsed_charstring = parsed_charstring_;
     current_parsed_str = parsed_charstring;