diff --git a/legacy_property_service.c b/legacy_property_service.c
index 24d3aa9..490a245 100644
--- a/legacy_property_service.c
+++ b/legacy_property_service.c
@@ -25,6 +25,8 @@
 #include <limits.h>
 #include <errno.h>
 
+#include "../../bionic/libc/private/bionic_futex.h"
+
 #include <cutils/properties.h>
 
 #include "legacy_properties.h"
@@ -181,7 +183,7 @@
         memcpy(pi->value, value, valuelen + 1);
 
         pa->toc[pa->count] =
-            (namelen << 24) | (((unsigned) pi) - ((unsigned) pa));
+            (namelen << 24) | (((unsigned long) pi) - ((unsigned long) pa));
 
         pa->count++;
         pa->serial++;