diff --git a/src/hb-blob.cc b/src/hb-blob.cc
index 7a659b26b..d6acca0fc 100644
--- a/src/hb-blob.cc
+++ b/src/hb-blob.cc
@@ -29,7 +29,6 @@
 
 #include "hb-private.hh"
 
-#include "hb-blob.h"
 #include "hb-object-private.hh"
 
 #ifdef HAVE_SYS_MMAN_H
diff --git a/src/hb-buffer-private.hh b/src/hb-buffer-private.hh
index 49773f1c9..3a2b9ab48 100644
--- a/src/hb-buffer-private.hh
+++ b/src/hb-buffer-private.hh
@@ -31,7 +31,6 @@
 #define HB_BUFFER_PRIVATE_HH
 
 #include "hb-private.hh"
-#include "hb-buffer.h"
 #include "hb-object-private.hh"
 #include "hb-unicode-private.hh"
 
diff --git a/src/hb-common.cc b/src/hb-common.cc
index cf24660f7..0fd790bc0 100644
--- a/src/hb-common.cc
+++ b/src/hb-common.cc
@@ -28,8 +28,6 @@
 
 #include "hb-private.hh"
 
-#include "hb-version.h"
-
 #include "hb-mutex-private.hh"
 #include "hb-object-private.hh"
 
diff --git a/src/hb-face-private.hh b/src/hb-face-private.hh
index b33be0e5f..6520d3dbd 100644
--- a/src/hb-face-private.hh
+++ b/src/hb-face-private.hh
@@ -31,7 +31,6 @@
 
 #include "hb-private.hh"
 
-#include "hb-font.h"
 #include "hb-object-private.hh"
 #include "hb-shaper-private.hh"
 #include "hb-shape-plan-private.hh"
diff --git a/src/hb-face.cc b/src/hb-face.cc
index ebe8ec5e5..71cf49a5b 100644
--- a/src/hb-face.cc
+++ b/src/hb-face.cc
@@ -31,7 +31,6 @@
 #include "hb-ot-layout-private.hh"
 
 #include "hb-font-private.hh"
-#include "hb-blob.h"
 #include "hb-open-file-private.hh"
 #include "hb-ot-head-table.hh"
 #include "hb-ot-maxp-table.hh"
diff --git a/src/hb-font-private.hh b/src/hb-font-private.hh
index aa6c515bc..431d0477c 100644
--- a/src/hb-font-private.hh
+++ b/src/hb-font-private.hh
@@ -31,7 +31,6 @@
 
 #include "hb-private.hh"
 
-#include "hb-font.h"
 #include "hb-object-private.hh"
 #include "hb-face-private.hh"
 #include "hb-shaper-private.hh"
diff --git a/src/hb-font.cc b/src/hb-font.cc
index 855864377..fc4c8ebf0 100644
--- a/src/hb-font.cc
+++ b/src/hb-font.cc
@@ -31,7 +31,6 @@
 #include "hb-ot-layout-private.hh"
 
 #include "hb-font-private.hh"
-#include "hb-blob.h"
 #include "hb-open-file-private.hh"
 #include "hb-ot-head-table.hh"
 #include "hb-ot-maxp-table.hh"
diff --git a/src/hb-graphite2.cc b/src/hb-graphite2.cc
index 60d68d6b5..ea442a376 100644
--- a/src/hb-graphite2.cc
+++ b/src/hb-graphite2.cc
@@ -34,8 +34,6 @@
 
 #include <graphite2/Segment.h>
 
-#include "hb-ot-tag.h"
-
 
 HB_SHAPER_DATA_ENSURE_DECLARE(graphite2, face)
 HB_SHAPER_DATA_ENSURE_DECLARE(graphite2, font)
diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index ee3a21dc3..437ecd57f 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -31,8 +31,6 @@
 
 #include "hb-private.hh"
 
-#include "hb-blob.h"
-
 
 namespace OT {
 
diff --git a/src/hb-ot-layout-private.hh b/src/hb-ot-layout-private.hh
index 139e33fe7..0a0a54b25 100644
--- a/src/hb-ot-layout-private.hh
+++ b/src/hb-ot-layout-private.hh
@@ -31,8 +31,6 @@
 
 #include "hb-private.hh"
 
-#include "hb-ot-layout.h"
-
 #include "hb-font-private.hh"
 #include "hb-buffer-private.hh"
 #include "hb-set-private.hh"
diff --git a/src/hb-ot-shape-normalize-private.hh b/src/hb-ot-shape-normalize-private.hh
index 085d48511..fb8048caa 100644
--- a/src/hb-ot-shape-normalize-private.hh
+++ b/src/hb-ot-shape-normalize-private.hh
@@ -29,8 +29,6 @@
 
 #include "hb-private.hh"
 
-#include "hb-font.h"
-#include "hb-buffer.h"
 
 /* buffer var allocations, used during the normalization process */
 #define glyph_index()	var1.u32
diff --git a/src/hb-ot-tag.cc b/src/hb-ot-tag.cc
index d9bc2f6b0..5594ef507 100644
--- a/src/hb-ot-tag.cc
+++ b/src/hb-ot-tag.cc
@@ -27,7 +27,6 @@
  */
 
 #include "hb-private.hh"
-#include "hb-ot.h"
 
 #include <string.h>
 
diff --git a/src/hb-set-private.hh b/src/hb-set-private.hh
index ca2a07b76..705f554ce 100644
--- a/src/hb-set-private.hh
+++ b/src/hb-set-private.hh
@@ -28,7 +28,6 @@
 #define HB_SET_PRIVATE_HH
 
 #include "hb-private.hh"
-#include "hb-set.h"
 #include "hb-object-private.hh"
 
 
diff --git a/src/hb-shape-plan-private.hh b/src/hb-shape-plan-private.hh
index e12b05f97..607da5e77 100644
--- a/src/hb-shape-plan-private.hh
+++ b/src/hb-shape-plan-private.hh
@@ -28,7 +28,6 @@
 #define HB_SHAPE_PLAN_PRIVATE_HH
 
 #include "hb-private.hh"
-#include "hb-shape-plan.h"
 #include "hb-object-private.hh"
 #include "hb-shaper-private.hh"
 
diff --git a/src/hb-tt-font.cc b/src/hb-tt-font.cc
index c503a4043..2233a4f1d 100644
--- a/src/hb-tt-font.cc
+++ b/src/hb-tt-font.cc
@@ -31,8 +31,6 @@
 #include "hb-ot-hhea-table.hh"
 #include "hb-ot-hmtx-table.hh"
 
-#include "hb-blob.h"
-
 #include <string.h>
 
 
diff --git a/src/hb-unicode-private.hh b/src/hb-unicode-private.hh
index dd4d00138..779d8ae22 100644
--- a/src/hb-unicode-private.hh
+++ b/src/hb-unicode-private.hh
@@ -32,8 +32,6 @@
 #define HB_UNICODE_PRIVATE_HH
 
 #include "hb-private.hh"
-
-#include "hb-unicode.h"
 #include "hb-object-private.hh"