diff --git a/src/Makefile.sources b/src/Makefile.sources
index 20ce77b80..0f83f6ebd 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -68,9 +68,9 @@ HB_NODIST_headers = \
 HB_FALLBACK_sources = hb-fallback-shape.cc
 
 HB_OT_sources = \
-	hb-ot-base-table.hh \
 	hb-ot-font.cc \
 	hb-ot-layout.cc \
+	hb-ot-layout-base-table.hh \
 	hb-ot-layout-common-private.hh \
 	hb-ot-layout-gdef-table.hh \
 	hb-ot-layout-gpos-table.hh \
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 9abdc6757..acbda8de5 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -30,7 +30,7 @@
 
 #include "hb-font-private.hh"
 
-#include "hb-ot-base-table.hh"
+#include "hb-ot-layout-base-table.hh"
 #include "hb-ot-cmap-table.hh"
 #include "hb-ot-cbdt-table.hh"
 #include "hb-ot-glyf-table.hh"
diff --git a/src/hb-ot-base-table.hh b/src/hb-ot-layout-base-table.hh
similarity index 100%
rename from src/hb-ot-base-table.hh
rename to src/hb-ot-layout-base-table.hh