diff --git a/include/Z2AudioLib/Z2SoundHandles.h b/include/Z2AudioLib/Z2SoundHandles.h
index 2d9d490f5e..5915e5967b 100644
--- a/include/Z2AudioLib/Z2SoundHandles.h
+++ b/include/Z2AudioLib/Z2SoundHandles.h
@@ -22,7 +22,7 @@ public:
     bool isActive() const;
 
     Z2SoundHandlePool* getHandleSoundID(JAISoundID soundID);
-    Z2SoundHandlePool* getHandleUserData(u32 userData);
+    Z2SoundHandlePool* getHandleUserData(uintptr_t userData);
 
     void stopAllSounds(u32 fadeTime);
 
diff --git a/src/Z2AudioLib/Z2SoundHandles.cpp b/src/Z2AudioLib/Z2SoundHandles.cpp
index 9b6aa5a9ba..de7e265ae7 100644
--- a/src/Z2AudioLib/Z2SoundHandles.cpp
+++ b/src/Z2AudioLib/Z2SoundHandles.cpp
@@ -40,7 +40,7 @@ Z2SoundHandlePool* Z2SoundHandles::getHandleSoundID(JAISoundID soundID) {
     return NULL;
 }
 
-Z2SoundHandlePool* Z2SoundHandles::getHandleUserData(u32 userData) {
+Z2SoundHandlePool* Z2SoundHandles::getHandleUserData(uintptr_t userData) {
     JSULink<Z2SoundHandlePool>* i;
     for (i = getFirst(); i != NULL; i = i->getNext()) {
         Z2SoundHandlePool* handle = i->getObject();
diff --git a/src/Z2AudioLib/Z2SoundObject.cpp b/src/Z2AudioLib/Z2SoundObject.cpp
index 0978842251..4581ca389e 100644
--- a/src/Z2AudioLib/Z2SoundObject.cpp
+++ b/src/Z2AudioLib/Z2SoundObject.cpp
@@ -500,7 +500,7 @@ void Z2SoundObjAnime::startSoundInner(const JGeometry::TVec3<f32>& pos, f32 para
     JUT_ASSERT(747, curSoundIndex_ < animation_->getNumSounds());
 
     const JAUSoundAnimationSound* animationSound = animation_->getSound(curSoundIndex_);
-    u32 user_data = (uintptr_t)animationSound;
+    uintptr_t user_data = (uintptr_t)animationSound;
     if (reverse_) {
         curSoundIndex_--;
     } else {