diff --git a/src/hb-ot-name.cc b/src/hb-ot-name.cc
index 5cd1cc118..2f37c6768 100644
--- a/src/hb-ot-name.cc
+++ b/src/hb-ot-name.cc
@@ -26,6 +26,8 @@
 
 #include "hb.hh"
 
+#ifndef HB_NO_NAME
+
 #include "hb-ot-name-table.hh"
 
 #include "hb-ot-face.hh"
@@ -58,11 +60,6 @@ const hb_ot_name_entry_t *
 hb_ot_name_list_names (hb_face_t    *face,
 		       unsigned int *num_entries /* OUT */)
 {
-#ifdef HB_NO_NAME
-  if (num_entries)
-    *num_entries = 0;
-  return 0;
-#endif
   const OT::name_accelerator_t &name = *face->table.name;
   if (num_entries) *num_entries = name.names.length;
   return (const hb_ot_name_entry_t *) name.names;
@@ -172,11 +169,6 @@ hb_ot_name_get_utf8 (hb_face_t       *face,
 		     unsigned int    *text_size /* IN/OUT */,
 		     char            *text      /* OUT */)
 {
-#ifdef HB_NO_NAME
-  if (text_size)
-    *text_size = 0;
-  return 0;
-#endif
   return hb_ot_name_get_utf<hb_utf8_t> (face, name_id, language, text_size,
 					(hb_utf8_t::codepoint_t *) text);
 }
@@ -204,11 +196,6 @@ hb_ot_name_get_utf16 (hb_face_t       *face,
 		      unsigned int    *text_size /* IN/OUT */,
 		      uint16_t        *text      /* OUT */)
 {
-#ifdef HB_NO_NAME
-  if (text_size)
-    *text_size = 0;
-  return 0;
-#endif
   return hb_ot_name_get_utf<hb_utf16_t> (face, name_id, language, text_size, text);
 }
 
@@ -235,10 +222,8 @@ hb_ot_name_get_utf32 (hb_face_t       *face,
 		      unsigned int    *text_size /* IN/OUT */,
 		      uint32_t        *text      /* OUT */)
 {
-#ifdef HB_NO_NAME
-  if (text_size)
-    *text_size = 0;
-  return 0;
-#endif
   return hb_ot_name_get_utf<hb_utf32_t> (face, name_id, language, text_size, text);
 }
+
+
+#endif
diff --git a/src/test-ot-name.cc b/src/test-ot-name.cc
index 518e4eb6e..44c2c179c 100644
--- a/src/test-ot-name.cc
+++ b/src/test-ot-name.cc
@@ -43,7 +43,9 @@ main (int argc, char **argv)
   hb_blob_destroy (blob);
   blob = nullptr;
 
-  unsigned int count;
+  unsigned int count = 0;
+
+#ifndef HB_NO_NAME
   const hb_ot_name_entry_t *entries = hb_ot_name_list_names (face, &count);
 
   for (unsigned int i = 0; i < count; i++)
@@ -62,6 +64,7 @@ main (int argc, char **argv)
 
     printf ("%s\n", buf);
   }
+#endif
 
   hb_face_destroy (face);