---
 jni/src/AtkWrapper.c |    3 ++-
 jni/src/jawimpl.c    |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

--- a/jni/src/AtkWrapper.c
+++ b/jni/src/AtkWrapper.c
@@ -21,6 +21,7 @@
 #include <jni.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <glib.h>
 #include <atk-bridge.h>
 #include <X11/Xlib.h>
@@ -1227,7 +1228,7 @@ JNICALL Java_org_GNOME_Accessibility_Atk
   if (!ac)
     return 0;
 
-  return (jlong) jaw_impl_get_instance(jniEnv, ac);
+  return (jlong) (uintptr_t) jaw_impl_get_instance(jniEnv, ac);
 }
 
 #ifdef __cplusplus
--- a/jni/src/jawimpl.c
+++ b/jni/src/jawimpl.c
@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <glib.h>
 #include <glib-object.h>
 #include <glib/gprintf.h>
@@ -331,7 +332,7 @@ jaw_impl_get_instance_from_jaw (JNIEnv *
   jclass classWrapper = (*jniEnv)->FindClass(jniEnv, "org/GNOME/Accessibility/AtkWrapper");
   jmethodID jmid = (*jniEnv)->GetStaticMethodID(jniEnv, classWrapper, "getInstanceFromSwing", "(Ljavax/accessibility/AccessibleContext;)J");
   jlong ptr = (*jniEnv)->CallStaticLongMethod(jniEnv, classWrapper, jmid, ac);
-  return (JawImpl*) ptr;
+  return (JawImpl*) (uintptr_t) ptr;
 }
 
 JawImpl*
