diff --git a/src/Makefile.sources b/src/Makefile.sources
index cb4a63c0d..5428c6b15 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -17,7 +17,7 @@ HB_BASE_sources = \
 	hb-object-private.hh \
 	hb-open-file-private.hh \
 	hb-open-type-private.hh \
-	hb-ot-cbdt-table.hh \
+	hb-ot-color-cbdt-table.hh \
 	hb-ot-cmap-table.hh \
 	hb-ot-glyf-table.hh \
 	hb-ot-hdmx-table.hh \
diff --git a/src/hb-ot-cbdt-table.hh b/src/hb-ot-color-cbdt-table.hh
similarity index 99%
rename from src/hb-ot-cbdt-table.hh
rename to src/hb-ot-color-cbdt-table.hh
index e4519529b..e7ab917e0 100644
--- a/src/hb-ot-cbdt-table.hh
+++ b/src/hb-ot-color-cbdt-table.hh
@@ -24,8 +24,8 @@
  * Google Author(s): Seigo Nonaka
  */
 
-#ifndef HB_OT_CBDT_TABLE_HH
-#define HB_OT_CBDT_TABLE_HH
+#ifndef HB_OT_COLOR_CBDT_TABLE_HH
+#define HB_OT_COLOR_CBDT_TABLE_HH
 
 #include "hb-open-type-private.hh"
 
@@ -468,4 +468,4 @@ struct CBDT
 
 } /* namespace OT */
 
-#endif /* HB_OT_CBDT_TABLE_HH */
+#endif /* HB_OT_COLOR_CBDT_TABLE_HH */
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 9864064b1..0e373d30f 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -31,12 +31,13 @@
 #include "hb-font-private.hh"
 
 #include "hb-ot-cmap-table.hh"
-#include "hb-ot-cbdt-table.hh"
 #include "hb-ot-glyf-table.hh"
 #include "hb-ot-hmtx-table.hh"
 #include "hb-ot-kern-table.hh"
 #include "hb-ot-post-table.hh"
 
+#include "hb-ot-color-cbdt-table.hh"
+
 
 struct hb_ot_font_t
 {