@@ -21,40 +21,57 @@
 
 #import "runtime.h"
 #import "runtime-private.h"
 
 static struct objc_sparsearray_level2 *empty_level2 = NULL;
+#ifndef OF_SELUID16
 static struct objc_sparsearray_level3 *empty_level3 = NULL;
+#endif
 
 static void
 init(void)
 {
 	uint_fast16_t i;
 
 	empty_level2 = malloc(sizeof(struct objc_sparsearray_level2));
-	empty_level3 = malloc(sizeof(struct objc_sparsearray_level3));
-
-	if (empty_level2 == NULL || empty_level3 == NULL)
+	if (empty_level2 == NULL)
 		ERROR("Not enough memory to allocate sparse array!");
 
 	empty_level2->empty = YES;
+
+#ifndef OF_SELUID16
+	empty_level3 = malloc(sizeof(struct objc_sparsearray_level3));
+	if (empty_level3 == NULL)
+		ERROR("Not enough memory to allocate sparse array!");
+
 	empty_level3->empty = YES;
+#endif
 
+#ifndef OF_SELUID16
 	for (i = 0; i < 256; i++) {
 		empty_level2->buckets[i] = empty_level3;
 		empty_level3->buckets[i] = NULL;
 	}
+#else
+	for (i = 0; i < 256; i++)
+		empty_level2->buckets[i] = NULL;
+#endif
 }
 
 struct objc_sparsearray*
 objc_sparsearray_new(void)
 {
 	struct objc_sparsearray *s;
 	uint_fast16_t i;
 
+#ifndef OF_SELUID16
 	if (empty_level2 == NULL || empty_level3 == NULL)
 		init();
+#else
+	if (empty_level2 == NULL)
+		init();
+#endif
 
 	if ((s = malloc(sizeof(struct objc_sparsearray))) == NULL)
 		ERROR("Not enough memory to allocate sparse array!");
 
 	for (i = 0; i < 256; i++)
@@ -65,17 +82,21 @@
 
 void
 objc_sparsearray_copy(struct objc_sparsearray *dst,
     struct objc_sparsearray *src)
 {
-	uint_fast16_t i, j, k;
+	uint_fast16_t i, j;
+#ifndef OF_SELUID16
+	uint_fast16_t k;
+#endif
 	uint32_t idx;
 
 	for (i = 0; i < 256; i++) {
 		if (src->buckets[i]->empty)
 			continue;
 
+#ifndef OF_SELUID16
 		for (j = 0; j < 256; j++) {
 			if (src->buckets[i]->buckets[j]->empty)
 				continue;
 
 			for (k = 0; k < 256; k++) {
@@ -88,19 +109,37 @@
 
 				idx = (i << 16) | (j << 8) | k;
 				objc_sparsearray_set(dst, idx, obj);
 			}
 		}
+#else
+		for (j = 0; j < 256; j++) {
+			const void *obj;
+
+			obj = src->buckets[i]->buckets[j];
+
+			if (obj == NULL)
+				continue;
+
+			idx = (i << 8) | j;
+			objc_sparsearray_set(dst, idx, obj);
+		}
+#endif
 	}
 }
 
 void
 objc_sparsearray_set(struct objc_sparsearray *s, uint32_t idx, const void *obj)
 {
+#ifndef OF_SELUID16
 	uint8_t i = idx >> 16;
 	uint8_t j = idx >>  8;
 	uint8_t k = idx;
+#else
+	uint8_t i = idx >> 8;
+	uint8_t j = idx;
+#endif
 
 	if (s->buckets[i]->empty) {
 		struct objc_sparsearray_level2 *t;
 		uint_fast16_t l;
 
@@ -110,15 +149,20 @@
 			ERROR("Not enough memory to insert into sparse array!");
 
 		t->empty = NO;
 
 		for (l = 0; l < 256; l++)
+#ifndef OF_SELUID16
 			t->buckets[l] = empty_level3;
+#else
+			t->buckets[l] = NULL;
+#endif
 
 		s->buckets[i] = t;
 	}
 
+#ifndef OF_SELUID16
 	if (s->buckets[i]->buckets[j]->empty) {
 		struct objc_sparsearray_level3 *t;
 		uint_fast16_t l;
 
 		t = malloc(sizeof(struct objc_sparsearray_level3));
@@ -133,24 +177,32 @@
 
 		s->buckets[i]->buckets[j] = t;
 	}
 
 	s->buckets[i]->buckets[j]->buckets[k] = obj;
+#else
+	s->buckets[i]->buckets[j] = obj;
+#endif
 }
 
 void
 objc_sparsearray_free(struct objc_sparsearray *s)
 {
-	uint_fast16_t i, j;
+	uint_fast16_t i;
+#ifndef OF_SELUID16
+	uint_fast16_t j;
+#endif
 
 	for (i = 0; i < 256; i++) {
+#ifndef OF_SELUID16
 		if (s->buckets[i]->empty)
 			continue;
 
 		for (j = 0; j < 256; j++)
 			if (!s->buckets[i]->buckets[j]->empty)
 				free(s->buckets[i]->buckets[j]);
+#endif
 
 		free(s->buckets[i]);
 	}
 
 	free(s);
@@ -159,11 +211,15 @@
 void
 objc_sparsearray_cleanup(void)
 {
 	if (empty_level2 != NULL)
 		free(empty_level2);
+#ifndef OF_SELUID16
 	if (empty_level3 != NULL)
 		free(empty_level3);
+#endif
 
 	empty_level2 = NULL;
+#ifndef OF_SELUID16
 	empty_level3 = NULL;
+#endif
 }