diff --git a/src/Makefile.am b/src/Makefile.am
index 1bb4efed5..bfb91df58 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ HBSOURCES =  \
 	hb-font-private.h \
 	hb-private.h \
 	hb-open-file-private.hh \
-	hb-open-types-private.hh \
+	hb-open-type-private.hh \
 	hb-ot-layout.cc \
 	hb-ot-layout-common-private.hh \
 	hb-ot-layout-gdef-private.hh \
diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh
index e66b08a0a..fc898f283 100644
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -27,7 +27,7 @@
 #ifndef HB_OPEN_FILE_PRIVATE_HH
 #define HB_OPEN_FILE_PRIVATE_HH
 
-#include "hb-open-types-private.hh"
+#include "hb-open-type-private.hh"
 
 
 /*
diff --git a/src/hb-open-types-private.hh b/src/hb-open-type-private.hh
similarity index 100%
rename from src/hb-open-types-private.hh
rename to src/hb-open-type-private.hh
diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index 1fbec021c..2d3935e30 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -29,7 +29,7 @@
 
 #include "hb-ot-layout-private.h"
 
-#include "hb-open-types-private.hh"
+#include "hb-open-type-private.hh"
 
 
 /*