diff --git a/src/hb-ot-shaper-indic-machine.hh b/src/hb-ot-shaper-indic-machine.hh
index fa4f2886c..9bc12d64d 100644
--- a/src/hb-ot-shaper-indic-machine.hh
+++ b/src/hb-ot-shaper-indic-machine.hh
@@ -38,7 +38,7 @@
 #define indic_category() ot_shaper_var_u8_category() /* indic_category_t */
 #define indic_position() ot_shaper_var_u8_auxiliary() /* indic_position_t */
 
-using indic_category_t = ot_category_t;
+using indic_category_t = unsigned;
 using indic_position_t = ot_position_t;
 
 #define I_Cat(Cat) indic_syllable_machine_ex_##Cat
diff --git a/src/hb-ot-shaper-indic-machine.rl b/src/hb-ot-shaper-indic-machine.rl
index caae5b599..860f7423b 100644
--- a/src/hb-ot-shaper-indic-machine.rl
+++ b/src/hb-ot-shaper-indic-machine.rl
@@ -36,7 +36,7 @@
 #define indic_category() ot_shaper_var_u8_category() /* indic_category_t */
 #define indic_position() ot_shaper_var_u8_auxiliary() /* indic_position_t */
 
-using indic_category_t = ot_category_t;
+using indic_category_t = unsigned;
 using indic_position_t = ot_position_t;
 
 #define I_Cat(Cat) indic_syllable_machine_ex_##Cat
diff --git a/src/hb-ot-shaper-khmer-machine.hh b/src/hb-ot-shaper-khmer-machine.hh
index 5bac24fa3..306717947 100644
--- a/src/hb-ot-shaper-khmer-machine.hh
+++ b/src/hb-ot-shaper-khmer-machine.hh
@@ -37,7 +37,7 @@
 /* buffer var allocations */
 #define khmer_category() ot_shaper_var_u8_category() /* khmer_category_t */
 
-using khmer_category_t = ot_category_t;
+using khmer_category_t = unsigned;
 
 #define K_Cat(Cat) khmer_syllable_machine_ex_##Cat
 
diff --git a/src/hb-ot-shaper-khmer-machine.rl b/src/hb-ot-shaper-khmer-machine.rl
index 4258ab9f3..e50f59e99 100644
--- a/src/hb-ot-shaper-khmer-machine.rl
+++ b/src/hb-ot-shaper-khmer-machine.rl
@@ -35,7 +35,7 @@
 /* buffer var allocations */
 #define khmer_category() ot_shaper_var_u8_category() /* khmer_category_t */
 
-using khmer_category_t = ot_category_t;
+using khmer_category_t = unsigned;
 
 #define K_Cat(Cat) khmer_syllable_machine_ex_##Cat
 
diff --git a/src/hb-ot-shaper-myanmar-machine.hh b/src/hb-ot-shaper-myanmar-machine.hh
index f3293b8cf..bfad071f4 100644
--- a/src/hb-ot-shaper-myanmar-machine.hh
+++ b/src/hb-ot-shaper-myanmar-machine.hh
@@ -38,7 +38,7 @@
 #define myanmar_category() ot_shaper_var_u8_category() /* myanmar_category_t */
 #define myanmar_position() ot_shaper_var_u8_auxiliary() /* myanmar_position_t */
 
-using myanmar_category_t = ot_category_t;
+using myanmar_category_t = unsigned;
 using myanmar_position_t = ot_position_t;
 
 #define M_Cat(Cat) myanmar_syllable_machine_ex_##Cat
diff --git a/src/hb-ot-shaper-myanmar-machine.rl b/src/hb-ot-shaper-myanmar-machine.rl
index a8b19e654..f4c785113 100644
--- a/src/hb-ot-shaper-myanmar-machine.rl
+++ b/src/hb-ot-shaper-myanmar-machine.rl
@@ -36,7 +36,7 @@
 #define myanmar_category() ot_shaper_var_u8_category() /* myanmar_category_t */
 #define myanmar_position() ot_shaper_var_u8_auxiliary() /* myanmar_position_t */
 
-using myanmar_category_t = ot_category_t;
+using myanmar_category_t = unsigned;
 using myanmar_position_t = ot_position_t;
 
 #define M_Cat(Cat) myanmar_syllable_machine_ex_##Cat