diff --git a/src/hb-graphite2.h b/src/hb-graphite2.h
index f3b7a6851..3037868f3 100644
--- a/src/hb-graphite2.h
+++ b/src/hb-graphite2.h
@@ -26,7 +26,6 @@
 #ifndef HB_GRAPHITE2_H
 #define HB_GRAPHITE2_H
 
-#include "hb.h"
 #include "hb-shape.h"
 
 HB_BEGIN_DECLS
@@ -34,11 +33,12 @@ HB_BEGIN_DECLS
 
 #define HB_GRAPHITE_TAG_Silf HB_TAG('S','i','l','f')
 
-hb_bool_t hb_graphite_shape (hb_font_t    *font,
-			hb_buffer_t  *buffer,
-			const hb_feature_t *features,
-			unsigned int  num_features,
-            const char * const *shaper_options);
+hb_bool_t
+hb_graphite_shape (hb_font_t          *font,
+		   hb_buffer_t        *buffer,
+		   const hb_feature_t *features,
+		   unsigned int        num_features,
+		   const char * const *shaper_options);
 
 HB_END_DECLS
 
diff --git a/src/hb-ot-shape.h b/src/hb-ot-shape.h
index 1897e8458..644b11ec8 100644
--- a/src/hb-ot-shape.h
+++ b/src/hb-ot-shape.h
@@ -27,7 +27,6 @@
 #ifndef HB_OT_SHAPE_H
 #define HB_OT_SHAPE_H
 
-#include "hb-common.h"
 #include "hb-shape.h"
 
 
diff --git a/src/hb-uniscribe.h b/src/hb-uniscribe.h
index dbcacd7f7..7dc830eaa 100644
--- a/src/hb-uniscribe.h
+++ b/src/hb-uniscribe.h
@@ -27,7 +27,6 @@
 #ifndef HB_UNISCRIBE_H
 #define HB_UNISCRIBE_H
 
-#include "hb-common.h"
 #include "hb-shape.h"
 
 #define _WIN32_WINNT 0x0500