diff --git a/src/ftxgpos.c b/src/ftxgpos.c
index 5137719d2..c34696cb7 100644
--- a/src/ftxgpos.c
+++ b/src/ftxgpos.c
@@ -6133,9 +6133,9 @@
     FT_UShort*  properties = gpos->LookupList.Properties;
     FT_UShort*  p_in       = in->properties;
 
-    int      nesting_level = 0;
-    UShort   i;
-    TT_Pos   offset;
+    int       nesting_level = 0;
+    FT_UShort i;
+    FT_Pos    offset;
 
 
     gpi->first = 0xFFFF;
diff --git a/src/ftxopen.c b/src/ftxopen.c
index 5d9cfad31..c9ac66036 100644
--- a/src/ftxopen.c
+++ b/src/ftxopen.c
@@ -584,7 +584,7 @@
 
     TTO_SubTable*  st;
 
-    Bool           is_extension = FALSE;
+    FT_Bool        is_extension = FALSE;
 
 
     base_offset = FILE_Pos();