diff --git a/src/OT/Layout/GDEF/GDEF.hh b/src/OT/Layout/GDEF/GDEF.hh
index 16b232a2a..cc2b084b5 100644
--- a/src/OT/Layout/GDEF/GDEF.hh
+++ b/src/OT/Layout/GDEF/GDEF.hh
@@ -484,7 +484,7 @@ struct MarkGlyphSetsFormat1
 	break;
       }
 
-      //skip empty coverage
+      // skip empty coverage
       c->serializer->push ();
       bool res = false;
       if (offset) res = c->dispatch (this+offset);
diff --git a/src/OT/Layout/GPOS/GPOS.hh b/src/OT/Layout/GPOS/GPOS.hh
index f4af98b25..6839d0b63 100644
--- a/src/OT/Layout/GPOS/GPOS.hh
+++ b/src/OT/Layout/GPOS/GPOS.hh
@@ -135,7 +135,7 @@ GPOS::position_start (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer)
 void
 GPOS::position_finish_advances (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer HB_UNUSED)
 {
-  //_hb_buffer_assert_gsubgpos_vars (buffer);
+  // _hb_buffer_assert_gsubgpos_vars (buffer);
 }
 
 void
diff --git a/src/OT/Layout/GPOS/MarkBasePosFormat1.hh b/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
index 1b8f3c80a..3c4f4f7ed 100644
--- a/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
+++ b/src/OT/Layout/GPOS/MarkBasePosFormat1.hh
@@ -154,7 +154,7 @@ struct MarkBasePosFormat1_2
     unsigned idx = (unsigned) c->last_base;
 
     /* Checking that matched glyph is actually a base glyph by GDEF is too strong; disabled */
-    //if (!_hb_glyph_info_is_base_glyph (&buffer->info[idx])) { return_trace (false); }
+    // if (!_hb_glyph_info_is_base_glyph (&buffer->info[idx])) { return_trace (false); }
 
     unsigned int base_index = (this+baseCoverage).get_coverage  (buffer->info[idx].codepoint);
     if (base_index == NOT_COVERED)
diff --git a/src/OT/Layout/GPOS/MarkLigPosFormat1.hh b/src/OT/Layout/GPOS/MarkLigPosFormat1.hh
index d6bee277c..c8a795177 100644
--- a/src/OT/Layout/GPOS/MarkLigPosFormat1.hh
+++ b/src/OT/Layout/GPOS/MarkLigPosFormat1.hh
@@ -129,7 +129,7 @@ struct MarkLigPosFormat1_2
     unsigned idx = (unsigned) c->last_base;
 
     /* Checking that matched glyph is actually a ligature by GDEF is too strong; disabled */
-    //if (!_hb_glyph_info_is_ligature (&buffer->info[idx])) { return_trace (false); }
+    // if (!_hb_glyph_info_is_ligature (&buffer->info[idx])) { return_trace (false); }
 
     unsigned int lig_index = (this+ligatureCoverage).get_coverage  (buffer->info[idx].codepoint);
     if (lig_index == NOT_COVERED)
diff --git a/src/OT/Layout/GSUB/SubstLookup.hh b/src/OT/Layout/GSUB/SubstLookup.hh
index d49dcc0e0..88ad3ab65 100644
--- a/src/OT/Layout/GSUB/SubstLookup.hh
+++ b/src/OT/Layout/GSUB/SubstLookup.hh
@@ -199,7 +199,7 @@ struct SubstLookup : Lookup
     /* While in theory we should flush here, it will cause timeouts because a recursive
      * lookup can keep growing the glyph set.  Skip, and outer loop will retry up to
      * HB_CLOSURE_MAX_STAGES time, which should be enough for every realistic font. */
-    //c->flush ();
+    // c->flush ();
 
     return ret;
   }
diff --git a/test/api/test-common.c b/test/api/test-common.c
index f2ca82faa..d36f0f25f 100644
--- a/test/api/test-common.c
+++ b/test/api/test-common.c
@@ -88,7 +88,7 @@ test_types_direction (void)
   g_assert_cmpint (HB_DIRECTION_REVERSE (HB_DIRECTION_RTL), ==, HB_DIRECTION_LTR);
   g_assert_cmpint (HB_DIRECTION_REVERSE (HB_DIRECTION_TTB), ==, HB_DIRECTION_BTT);
   g_assert_cmpint (HB_DIRECTION_REVERSE (HB_DIRECTION_BTT), ==, HB_DIRECTION_TTB);
-  //g_assert_cmpint (HB_DIRECTION_REVERSE (HB_DIRECTION_INVALID), ==, HB_DIRECTION_INVALID);
+  // g_assert_cmpint (HB_DIRECTION_REVERSE (HB_DIRECTION_INVALID), ==, HB_DIRECTION_INVALID);
 
   g_assert_cmpint (HB_DIRECTION_INVALID, ==, hb_direction_from_string (NULL, -1));
   g_assert_cmpint (HB_DIRECTION_INVALID, ==, hb_direction_from_string ("", -1));
diff --git a/util/helper-cairo-ft.hh b/util/helper-cairo-ft.hh
index 634659a1a..c7b501c88 100644
--- a/util/helper-cairo-ft.hh
+++ b/util/helper-cairo-ft.hh
@@ -50,7 +50,7 @@ helper_cairo_create_ft_font_face (const font_options_t *font_opts)
   /* We cannot use the FT_Face from hb_font_t, as doing so will confuse hb_font_t because
    * cairo will reset the face size.  As such, create new face...
    * TODO Perhaps add API to hb-ft to encapsulate this code. */
-  FT_Face ft_face = nullptr;//hb_ft_font_get_ft_face (font);
+  FT_Face ft_face = nullptr;// hb_ft_font_get_ft_face (font);
   if (!ft_face)
   {
     if (!ft_library)
diff --git a/util/helper-subset.hh b/util/helper-subset.hh
index 91d5f7b54..8bbb7c012 100644
--- a/util/helper-subset.hh
+++ b/util/helper-subset.hh
@@ -45,7 +45,7 @@ parse_instancing_spec (const char *arg,
   {
     arg = NULL;
     unsigned len = strlen (s);
-    if (len > 4)  //Axis tags are 4 bytes.
+    if (len > 4)  // Axis tags are 4 bytes.
     {
       g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
                    "Failed parsing axis tag at: '%s'", s);
diff --git a/util/options.hh b/util/options.hh
index 26cfeed5a..d0bfc98a7 100644
--- a/util/options.hh
+++ b/util/options.hh
@@ -144,7 +144,7 @@ struct option_parser_t
 					      static_cast<gpointer>(closure), nullptr);
     g_option_group_add_entries (group, entries);
     /* https://gitlab.gnome.org/GNOME/glib/-/issues/2460 */
-    //g_option_group_set_parse_hooks (group, nullptr, post_parse<Type>);
+    // g_option_group_set_parse_hooks (group, nullptr, post_parse<Type>);
     g_option_context_set_main_group (context, group);
   }