--- a/source/fitz/subset-cff.c
+++ b/source/fitz/subset-cff.c
@@ -24,6 +24,11 @@
 
 #include <math.h>
 
+/* illumos <sys/types.h> already typedefs index_t (SVR4 STREAMS-era
+ * short). Rename ours to avoid the redefinition conflict - see the
+ * same fix in deskew.c. */
+#define index_t mu_index_t
+
 /*
 	For the purposes of this code, and to save my tiny brain from
 	overload, we will adopt the following notation: