diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc
index 493a9db92..928289262 100644
--- a/src/hb-graphite2.cc
+++ b/src/hb-graphite2.cc
@@ -24,16 +24,16 @@
  */
 
 #include "hb-private.hh"
+
+#include "hb-graphite2.h"
+
 #include "hb-buffer-private.hh"
 #include "hb-font-private.hh"
 #include "hb-ot-tag.h"
+
 #include <graphite2/Font.h>
 #include <graphite2/Segment.h>
-#include "hb-graphite2.h"
-#include <stdlib.h>
-#include <string.h>
 
-HB_BEGIN_DECLS
 
 typedef struct hbgr_tablelist_t {
     hb_blob_t   *blob;
@@ -432,5 +432,3 @@ dieout:
     if (text) free(text);
     return success;
 }
-
-HB_END_DECLS
diff --git a/src/hb-shape.cc b/src/hb-shape.cc
index 2e86c3c3a..9357f8132 100644
--- a/src/hb-shape.cc
+++ b/src/hb-shape.cc
@@ -31,7 +31,6 @@
 #include "hb-buffer-private.hh"
 
 #ifdef HAVE_GRAPHITE
-#include "hb-font-private.hh"
 #include "hb-graphite2.h"
 #endif
 #ifdef HAVE_UNISCRIBE