diff --git a/sfntly/table/core/cmap_table.cc b/sfntly/table/core/cmap_table.cc
index bfc7f86..6911660 100644
--- a/sfntly/table/core/cmap_table.cc
+++ b/sfntly/table/core/cmap_table.cc
@@ -593,7 +593,7 @@
  ******************************************************************************/
 CMapTable::CMapFormat4::CMapFormat4(ReadableFontData* data,
                                     const CMapId& cmap_id)
-    : CMapTable::CMap::CMap(data, CMapFormat::kFormat4, cmap_id),
+    : CMap(data, CMapFormat::kFormat4, cmap_id),
       seg_count_(SegCount(data)),
       start_code_offset_(StartCodeOffset(seg_count_)),
       end_code_offset_(Offset::kFormat4EndCount),
diff --git a/test/cmap_test.cc b/test/cmap_test.cc
index f870184..e67137c 100644
--- a/test/cmap_test.cc
+++ b/test/cmap_test.cc
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include "sfntly/port/type.h"
 #include <assert.h>
 #include <unicode/ucnv.h>