diff --git a/src/autofit/afglobal.c b/src/autofit/afglobal.c
index b7403fa65..fd55f75e2 100644
--- a/src/autofit/afglobal.c
+++ b/src/autofit/afglobal.c
@@ -356,7 +356,7 @@
     globals->scale_down_factor         = 0;
 
 #ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
-    globals->hb_font = hb_ft_font_create_( face, NULL );
+    globals->hb_font = ft_hb_ft_font_create( face, NULL );
     globals->hb_buf  = hb_buffer_create();
 #endif
 
diff --git a/src/autofit/afshaper.h b/src/autofit/afshaper.h
index 2eb03bb5d..9ace1f1b4 100644
--- a/src/autofit/afshaper.h
+++ b/src/autofit/afshaper.h
@@ -27,7 +27,7 @@
 
 #include <hb.h>
 #include <hb-ot.h>
-#include "ft-hb.h"
+#include "ft-hb-ft.h"
 
 #endif
 
diff --git a/src/autofit/autofit.c b/src/autofit/autofit.c
index 9d4540e0a..a283e694d 100644
--- a/src/autofit/autofit.c
+++ b/src/autofit/autofit.c
@@ -18,7 +18,7 @@
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
 
-#include "ft-hb.c"
+#include "ft-hb-ft.c"
 #include "afadjust.c"
 #include "afblue.c"
 #include "afcjk.c"
diff --git a/src/autofit/ft-hb.c b/src/autofit/ft-hb-ft.c
similarity index 86%
rename from src/autofit/ft-hb.c
rename to src/autofit/ft-hb-ft.c
index 71aee0455..f46bd7b26 100644
--- a/src/autofit/ft-hb.c
+++ b/src/autofit/ft-hb-ft.c
@@ -29,14 +29,14 @@
 
 #ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
 
-#include "ft-hb.h"
+#include "ft-hb-ft.h"
 
 /* The following three functions are a more or less verbatim
  * copy of corresponding HarfBuzz code from hb-ft.cc
  */
 
 static hb_blob_t *
-hb_ft_reference_table_ (hb_face_t *face, hb_tag_t tag, void *user_data)
+ft_hb_ft_reference_table (hb_face_t *face, hb_tag_t tag, void *user_data)
 {
   FT_Face ft_face = (FT_Face) user_data;
   FT_Byte *buffer;
@@ -68,8 +68,8 @@ hb_ft_reference_table_ (hb_face_t *face, hb_tag_t tag, void *user_data)
 }
 
 static hb_face_t *
-hb_ft_face_create_ (FT_Face           ft_face,
-                    hb_destroy_func_t destroy)
+ft_hb_ft_face_create (FT_Face           ft_face,
+                      hb_destroy_func_t destroy)
 {
   hb_face_t *face;
 
@@ -83,7 +83,7 @@ hb_ft_face_create_ (FT_Face           ft_face,
     face = hb_face_create (blob, ft_face->face_index);
     hb_blob_destroy (blob);
   } else {
-    face = hb_face_create_for_tables (hb_ft_reference_table_, ft_face, destroy);
+    face = hb_face_create_for_tables (ft_hb_ft_reference_table, ft_face, destroy);
   }
 
   hb_face_set_index (face, ft_face->face_index);
@@ -93,13 +93,13 @@ hb_ft_face_create_ (FT_Face           ft_face,
 }
 
 FT_LOCAL_DEF(hb_font_t *)
-hb_ft_font_create_ (FT_Face           ft_face,
-                    hb_destroy_func_t destroy)
+ft_hb_ft_font_create (FT_Face           ft_face,
+                      hb_destroy_func_t destroy)
 {
   hb_font_t *font;
   hb_face_t *face;
 
-  face = hb_ft_face_create_ (ft_face, destroy);
+  face = ft_hb_ft_face_create (ft_face, destroy);
   font = hb_font_create (face);
   hb_face_destroy (face);
   return font;
@@ -108,7 +108,7 @@ hb_ft_font_create_ (FT_Face           ft_face,
 #else /* !FT_CONFIG_OPTION_USE_HARFBUZZ */
 
 /* ANSI C doesn't like empty source files */
-typedef int  ft_hb_dummy_;
+typedef int  ft_hb_ft_dummy_;
 
 #endif /* !FT_CONFIG_OPTION_USE_HARFBUZZ */
 
diff --git a/src/autofit/ft-hb.h b/src/autofit/ft-hb-ft.h
similarity index 89%
rename from src/autofit/ft-hb.h
rename to src/autofit/ft-hb-ft.h
index 92a5774bc..efbfba944 100644
--- a/src/autofit/ft-hb.h
+++ b/src/autofit/ft-hb-ft.h
@@ -24,8 +24,8 @@
  * Google Author(s): Behdad Esfahbod
  */
 
-#ifndef FT_HB_H
-#define FT_HB_H
+#ifndef FT_HB_FT_H
+#define FT_HB_FT_H
 
 #include <hb.h>
 
@@ -36,13 +36,13 @@
 FT_BEGIN_HEADER
 
 FT_LOCAL(hb_font_t *)
-hb_ft_font_create_ (FT_Face           ft_face,
-                    hb_destroy_func_t destroy);
+ft_hb_ft_font_create (FT_Face           ft_face,
+                      hb_destroy_func_t destroy);
 
 
 FT_END_HEADER
 
-#endif /* FT_HB_H */
+#endif /* FT_HB_FT_H */
 
 
 /* END */
diff --git a/src/autofit/rules.mk b/src/autofit/rules.mk
index fb6265cee..b8766d399 100644
--- a/src/autofit/rules.mk
+++ b/src/autofit/rules.mk
@@ -40,7 +40,7 @@ AUTOF_DRV_SRC := $(AUTOF_DIR)/afadjust.c \
                  $(AUTOF_DIR)/afmodule.c \
                  $(AUTOF_DIR)/afranges.c \
                  $(AUTOF_DIR)/afshaper.c \
-                 $(AUTOF_DIR)/ft-hb.c
+                 $(AUTOF_DIR)/ft-hb-ft.c
 
 # AUTOF driver headers
 #