diff --git a/src/hb-ot-shape-complex-arabic-win1256.hh b/src/hb-ot-shape-complex-arabic-win1256.hh
index 41e3dd38a..cf35d6252 100644
--- a/src/hb-ot-shape-complex-arabic-win1256.hh
+++ b/src/hb-ot-shape-complex-arabic-win1256.hh
@@ -300,6 +300,12 @@ OT_TABLE_END
 /*
  * Clean up
  */
+
+#undef G
+
+#undef MANIFEST
+#undef MANIFEST_LOOKUP
+
 #undef OT_TABLE_START
 #undef OT_TABLE_END
 #undef OT_LABEL_START
@@ -309,6 +315,16 @@ OT_TABLE_END
 #undef OT_DISTANCE
 #undef OT_COUNT
 
+#undef OT_LABEL
+
+#undef OT_LIST
+#undef OT_TAG
+#undef OT_OFFSET
+#undef OT_GLYPHID
+#undef OT_UARRAY
+#undef OT_UHEAD
+
+
 /*
  * Include a second time to get the table data...
  */