diff --git a/src/hb-common.h b/src/hb-common.h
index 7d72457a6..a5da4e76a 100644
--- a/src/hb-common.h
+++ b/src/hb-common.h
@@ -915,6 +915,14 @@ typedef struct hb_glyph_extents_t {
   hb_position_t height;
 } hb_glyph_extents_t;
 
+/**
+ * hb_font_t:
+ *
+ * Data type for holding fonts.
+ *
+ */
+typedef struct hb_font_t hb_font_t;
+
 HB_END_DECLS
 
 #endif /* HB_COMMON_H */
diff --git a/src/hb-font.h b/src/hb-font.h
index e117eaa4c..4574a5769 100644
--- a/src/hb-font.h
+++ b/src/hb-font.h
@@ -38,15 +38,6 @@
 
 HB_BEGIN_DECLS
 
-/**
- * hb_font_t:
- *
- * Data type for holding fonts.
- *
- */
-typedef struct hb_font_t hb_font_t;
-
-
 /*
  * hb_font_funcs_t
  */
diff --git a/src/hb-paint.h b/src/hb-paint.h
index 041eabb05..7466f5bc8 100644
--- a/src/hb-paint.h
+++ b/src/hb-paint.h
@@ -29,8 +29,7 @@
 #ifndef HB_PAINT_H
 #define HB_PAINT_H
 
-#include "hb.h"
-#include "hb-font.h"
+#include "hb-common.h"
 
 HB_BEGIN_DECLS