diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc
index cce860694..6fe16ca93 100644
--- a/src/hb-graphite2.cc
+++ b/src/hb-graphite2.cc
@@ -30,11 +30,10 @@
 #define hb_graphite2_shaper_font_data_t gr_font
 #include "hb-shaper-impl-private.hh"
 
-#include <graphite2/Font.h>
-#include <graphite2/Segment.h>
-
 #include "hb-graphite2.h"
 
+#include <graphite2/Segment.h>
+
 #include "hb-ot-tag.h"
 
 
diff --git a/src/hb-graphite2.h b/src/hb-graphite2.h
index bea68f939..3eae54acb 100644
--- a/src/hb-graphite2.h
+++ b/src/hb-graphite2.h
@@ -28,6 +28,8 @@
 
 #include "hb.h"
 
+#include <graphite2/Font.h>
+
 HB_BEGIN_DECLS