diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index c2e4da7db..38b5fc1d0 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -246,7 +246,7 @@ struct LookupFlag : USHORT
     IgnoreMarks		= 0x0008u,
     UseMarkFilteringSet	= 0x0010u,
     Reserved		= 0x00E0u,
-    MarkAttachmentType	= 0xFF00u,
+    MarkAttachmentType	= 0xFF00u
   };
 };
 ASSERT_SIZE (LookupFlag, 2);
diff --git a/src/hb-ot-layout-gdef-private.hh b/src/hb-ot-layout-gdef-private.hh
index 8b6019ad0..e4e0417b0 100644
--- a/src/hb-ot-layout-gdef-private.hh
+++ b/src/hb-ot-layout-gdef-private.hh
@@ -305,7 +305,7 @@ struct GDEF
     BaseGlyph		= 1,
     LigatureGlyph	= 2,
     MarkGlyph		= 3,
-    ComponentGlyph	= 4,
+    ComponentGlyph	= 4
   };
 
   STATIC_DEFINE_GET_FOR_DATA_CHECK_MAJOR_VERSION (GDEF, 1, 1);
diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index e665c156d..0357522e5 100644
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -49,7 +49,7 @@ struct ValueFormat : USHORT
     xAdvDevice	= 0x0040,	/* Includes horizontal Device table for advance */
     yAdvDevice	= 0x0080,	/* Includes vertical Device table for advance */
     ignored	= 0x0F00,	/* Was used in TrueType Open for MM fonts */
-    reserved	= 0xF000,	/* For future use */
+    reserved	= 0xF000 	/* For future use */
   };
 
   inline unsigned int get_len () const
@@ -1299,7 +1299,7 @@ struct PosLookupSubTable
     MarkMark		= 6,
     Context		= 7,
     ChainContext	= 8,
-    Extension		= 9,
+    Extension		= 9
   };
 
   inline bool apply (APPLY_ARG_DEF, unsigned int lookup_type) const
diff --git a/src/hb-ot-layout-gsub-private.hh b/src/hb-ot-layout-gsub-private.hh
index af278295f..4c682fedf 100644
--- a/src/hb-ot-layout-gsub-private.hh
+++ b/src/hb-ot-layout-gsub-private.hh
@@ -675,7 +675,7 @@ struct SubstLookupSubTable
     Context		= 5,
     ChainContext	= 6,
     Extension		= 7,
-    ReverseChainSingle	= 8,
+    ReverseChainSingle	= 8
   };
 
   inline bool apply (APPLY_ARG_DEF, unsigned int lookup_type) const