diff --git a/src/Makefile.sources b/src/Makefile.sources
index 1ed64fec6..9fbb71e99 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -2,6 +2,7 @@
 
 HB_BASE_sources = \
 	hb-atomic-private.hh \
+	hb-blob-private.hh \
 	hb-blob.cc \
 	hb-buffer-private.hh \
 	hb-buffer-serialize.cc \
diff --git a/src/hb-blob.cc b/src/hb-blob.cc
index 710765d10..1435d3079 100644
--- a/src/hb-blob.cc
+++ b/src/hb-blob.cc
@@ -31,8 +31,7 @@
 
 #include "hb-private.hh"
 #include "hb-debug.hh"
-
-#include "hb-object-private.hh"
+#include "hb-blob-private.hh"
 
 #ifdef HAVE_SYS_MMAN_H
 #ifdef HAVE_UNISTD_H
@@ -49,20 +48,6 @@
 #include <fcntl.h>
 
 
-struct hb_blob_t {
-  hb_object_header_t header;
-  ASSERT_POD ();
-
-  bool immutable;
-
-  const char *data;
-  unsigned int length;
-  hb_memory_mode_t mode;
-
-  void *user_data;
-  hb_destroy_func_t destroy;
-};
-
 
 static bool _try_writable (hb_blob_t *blob);
 
@@ -507,6 +492,10 @@ _try_writable (hb_blob_t *blob)
   return true;
 }
 
+/*
+ * Mmap
+ */
+
 #if defined(_WIN32) || defined(__CYGWIN__)
 #include <windows.h>
 #include <io.h>