More warning fixes
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 22f31f4..96a0d9a 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -595,8 +595,8 @@
 }
 
 void
-hb_ot_layout_position_finish (hb_font_t    *font,
-			      hb_face_t    *face,
+hb_ot_layout_position_finish (hb_font_t    *font HB_GNUC_UNUSED,
+			      hb_face_t    *face HB_GNUC_UNUSED,
 			      hb_buffer_t  *buffer)
 {
   unsigned int i, j;
diff --git a/src/hb-ot-shape.c b/src/hb-ot-shape.c
index f535183..54d2895 100644
--- a/src/hb-ot-shape.c
+++ b/src/hb-ot-shape.c
@@ -68,8 +68,7 @@
 }
 
 static void
-setup_lookups (hb_font_t    *font,
-	       hb_face_t    *face,
+setup_lookups (hb_face_t    *face,
 	       hb_buffer_t  *buffer,
 	       hb_feature_t *features,
 	       unsigned int  num_features,
@@ -115,7 +114,7 @@
 
 
 hb_bool_t
-_hb_ot_substitute_complex (hb_font_t    *font,
+_hb_ot_substitute_complex (hb_font_t    *font HB_GNUC_UNUSED,
 			   hb_face_t    *face,
 			   hb_buffer_t  *buffer,
 			   hb_feature_t *features,
@@ -128,7 +127,7 @@
   if (!hb_ot_layout_has_substitution (face))
     return FALSE;
 
-  setup_lookups (font, face, buffer, features, num_features,
+  setup_lookups (face, buffer, features, num_features,
 		 HB_OT_TAG_GSUB,
 		 lookups, &num_lookups);
 
@@ -152,7 +151,7 @@
   if (!hb_ot_layout_has_positioning (face))
     return FALSE;
 
-  setup_lookups (font, face, buffer, features, num_features,
+  setup_lookups (face, buffer, features, num_features,
 		 HB_OT_TAG_GPOS,
 		 lookups, &num_lookups);
 
diff --git a/src/hb-shape.c b/src/hb-shape.c
index a3315bb..2754dac 100644
--- a/src/hb-shape.c
+++ b/src/hb-shape.c
@@ -113,8 +113,8 @@
 hb_substitute_default (hb_font_t    *font,
 		       hb_face_t    *face,
 		       hb_buffer_t  *buffer,
-		       hb_feature_t *features,
-		       unsigned int  num_features)
+		       hb_feature_t *features HB_GNUC_UNUSED,
+		       unsigned int  num_features HB_GNUC_UNUSED)
 {
   hb_mirror_chars (buffer);
   hb_map_glyphs (font, face, buffer);
@@ -131,11 +131,11 @@
 }
 
 static void
-hb_substitute_fallback (hb_font_t    *font,
-			hb_face_t    *face,
-			hb_buffer_t  *buffer,
-			hb_feature_t *features,
-			unsigned int  num_features)
+hb_substitute_fallback (hb_font_t    *font HB_GNUC_UNUSED,
+			hb_face_t    *face HB_GNUC_UNUSED,
+			hb_buffer_t  *buffer HB_GNUC_UNUSED,
+			hb_feature_t *features HB_GNUC_UNUSED,
+			unsigned int  num_features HB_GNUC_UNUSED)
 {
   /* TODO Arabic */
 }
@@ -147,8 +147,8 @@
 hb_position_default (hb_font_t    *font,
 		     hb_face_t    *face,
 		     hb_buffer_t  *buffer,
-		     hb_feature_t *features,
-		     unsigned int  num_features)
+		     hb_feature_t *features HB_GNUC_UNUSED,
+		     unsigned int  num_features HB_GNUC_UNUSED)
 {
   unsigned int count;
 
@@ -174,11 +174,11 @@
 }
 
 static void
-hb_position_fallback (hb_font_t    *font,
-		      hb_face_t    *face,
-		      hb_buffer_t  *buffer,
-		      hb_feature_t *features,
-		      unsigned int  num_features)
+hb_position_fallback (hb_font_t    *font HB_GNUC_UNUSED,
+		      hb_face_t    *face HB_GNUC_UNUSED,
+		      hb_buffer_t  *buffer HB_GNUC_UNUSED,
+		      hb_feature_t *features HB_GNUC_UNUSED,
+		      unsigned int  num_features HB_GNUC_UNUSED)
 {
   /* TODO Mark pos */
 }
@@ -187,8 +187,8 @@
 hb_truetype_kern (hb_font_t    *font,
 		  hb_face_t    *face,
 		  hb_buffer_t  *buffer,
-		  hb_feature_t *features,
-		  unsigned int  num_features)
+		  hb_feature_t *features HB_GNUC_UNUSED,
+		  unsigned int  num_features HB_GNUC_UNUSED)
 {
   unsigned int count;