diff --git a/lib/Adecode.h b/lib/Adecode.h
index 3c7cb237..def69955 100644
--- a/lib/Adecode.h
+++ b/lib/Adecode.h
@@ -21,7 +21,7 @@
 
 namespace AudioDecoder {
 typedef uint32_t uint32;
-typedef signed int sint32;
+typedef int32_t sint32;
 typedef unsigned short uint16;
 typedef signed short sint16;
 typedef unsigned char uint8;
diff --git a/lib/linux/dyna_glide.h b/lib/linux/dyna_glide.h
index ccaea89d..45a11d45 100644
--- a/lib/linux/dyna_glide.h
+++ b/lib/linux/dyna_glide.h
@@ -173,7 +173,7 @@ typedef unsigned short FxU16;
 
 typedef signed short FxI16;
 
-typedef signed int FxI32;
+typedef int32_t FxI32;
 
 typedef uint32_t FxU32;
 
diff --git a/libacm/aencode.cpp b/libacm/aencode.cpp
index ed7972f5..2d3dbf26 100644
--- a/libacm/aencode.cpp
+++ b/libacm/aencode.cpp
@@ -24,7 +24,7 @@
 #include "Aencode.h"
 
 typedef uint32_t uint32;
-typedef signed int sint32;
+typedef int32_t sint32;
 typedef unsigned short uint16;
 typedef signed short sint16;
 typedef unsigned char uint8;
diff --git a/libmve/SystemInterfaces.h b/libmve/SystemInterfaces.h
index 4b4b2eef..89d6f98b 100644
--- a/libmve/SystemInterfaces.h
+++ b/libmve/SystemInterfaces.h
@@ -87,7 +87,7 @@ public:
   //        0 : no error
   //       -1 : Cannot set volume
   //       -2 : Invalid parameters
-  virtual int SetVolume(signed int vol) = 0;
+  virtual int SetVolume(int32_t vol) = 0;
 
   ///////////////////////////
   // SetPan
@@ -98,7 +98,7 @@ public:
   //        0 : no error
   //       -1 : Cannot set pan
   //       -2 : Invalid parameters
-  virtual int SetPan(signed int pan) = 0;
+  virtual int SetPan(int32_t pan) = 0;
 
   /////////////////////////
   // Stop
diff --git a/libmve/lnxdsound.cpp b/libmve/lnxdsound.cpp
index c55502f0..1b7483b8 100644
--- a/libmve/lnxdsound.cpp
+++ b/libmve/lnxdsound.cpp
@@ -236,7 +236,7 @@ int LnxSoundBuffer_Release(LnxSoundBuffer *buff) {
 //        0 : no error
 //       -1 : Cannot set volume
 //       -2 : Invalid parameters
-int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol) {
+int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, int32_t vol) {
   if (!buff)
     return -1;
 
@@ -278,7 +278,7 @@ int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol) {
 //        0 : no error
 //       -1 : Cannot set pan
 //       -2 : Invalid parameters
-int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, signed int pan) {
+int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, int32_t pan) {
   if (!buff)
     return -1;
 
@@ -679,7 +679,7 @@ static int TempSoundBufferLen = 0;
 static uint32_t LinuxSoundMixInMainBuffer(LnxSoundBuffer *dsb, int len) {
   uint32_t i, ilen, advance = (LnxBuffers[0]->wfx.wBitsPerSample >> 3);
   unsigned char *buf, *ibuf, *obuf;
-  signed int temp, field;
+  int32_t temp, field;
   signed short *ibufs, *obufs;
 
   if (!(dsb->flags & LNXSND_LOOPING)) {
diff --git a/libmve/lnxdsound.h b/libmve/lnxdsound.h
index 4b8a60be..17fb77e9 100644
--- a/libmve/lnxdsound.h
+++ b/libmve/lnxdsound.h
@@ -47,8 +47,8 @@ typedef struct {
 
   unsigned char *buffer;
 
-  signed int volume;
-  signed int pan;
+  int32_t volume;
+  int32_t pan;
 
   WAVEFORMATEX wfx;
 
@@ -90,7 +90,7 @@ int LnxSoundBuffer_Release(LnxSoundBuffer *buff);
 //        0 : no error
 //       -1 : Cannot set volume
 //       -2 : Invalid parameters
-int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol);
+int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, int32_t vol);
 
 ///////////////////////////
 // LnxSoundBuffer_SetPan
@@ -101,7 +101,7 @@ int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol);
 //        0 : no error
 //       -1 : Cannot set pan
 //       -2 : Invalid parameters
-int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, signed int pan);
+int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, int32_t pan);
 
 /////////////////////////
 // LnxSoundBuffer_Stop
diff --git a/libmve/mveasm.cpp b/libmve/mveasm.cpp
index e0da7c8d..2c99209e 100644
--- a/libmve/mveasm.cpp
+++ b/libmve/mveasm.cpp
@@ -149,7 +149,7 @@ void NF_DECOMP_INIT(bool HI_COLOR_FLAG, tNextFrame *nf) {
 //----------------------------------------------------------------------
 
 // signed 8-bit y * nf_width
-signed int nfpk_ShiftY[256];
+int32_t nfpk_ShiftY[256];
 
 // Constant tables
 
diff --git a/lnxmvelib/lnxdsound.cpp b/lnxmvelib/lnxdsound.cpp
index da2c1624..8ae7f36e 100644
--- a/lnxmvelib/lnxdsound.cpp
+++ b/lnxmvelib/lnxdsound.cpp
@@ -236,7 +236,7 @@ int LnxSoundBuffer_Release(LnxSoundBuffer *buff) {
 //        0 : no error
 //       -1 : Cannot set volume
 //       -2 : Invalid parameters
-int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol) {
+int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, int32_t vol) {
   if (!buff)
     return -1;
 
@@ -278,7 +278,7 @@ int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol) {
 //        0 : no error
 //       -1 : Cannot set pan
 //       -2 : Invalid parameters
-int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, signed int pan) {
+int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, int32_t pan) {
   if (!buff)
     return -1;
 
@@ -663,7 +663,7 @@ static int TempSoundBufferLen = 0;
 static uint32_t LinuxSoundMixInMainBuffer(LnxSoundBuffer *dsb, int len) {
   uint32_t i, ilen, advance = (LnxBuffers[0]->wfx.wBitsPerSample >> 3);
   unsigned char *buf, *ibuf, *obuf;
-  signed int temp, field;
+  int32_t temp, field;
   signed short *ibufs, *obufs;
 
   if (!(dsb->flags & LNXSND_LOOPING)) {
diff --git a/lnxmvelib/lnxdsound.h b/lnxmvelib/lnxdsound.h
index 966017ab..8f7b510d 100644
--- a/lnxmvelib/lnxdsound.h
+++ b/lnxmvelib/lnxdsound.h
@@ -82,8 +82,8 @@ typedef struct {
 
   unsigned char *buffer;
 
-  signed int volume;
-  signed int pan;
+  int32_t volume;
+  int32_t pan;
 
   WAVEFORMATEX wfx;
 
@@ -125,7 +125,7 @@ int LnxSoundBuffer_Release(LnxSoundBuffer *buff);
 //        0 : no error
 //       -1 : Cannot set volume
 //       -2 : Invalid parameters
-int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol);
+int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, int32_t vol);
 
 ///////////////////////////
 // LnxSoundBuffer_SetPan
@@ -136,7 +136,7 @@ int LnxSoundBuffer_SetVolume(LnxSoundBuffer *buff, signed int vol);
 //        0 : no error
 //       -1 : Cannot set pan
 //       -2 : Invalid parameters
-int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, signed int pan);
+int LnxSoundBuffer_SetPan(LnxSoundBuffer *buff, int32_t pan);
 
 /////////////////////////
 // LnxSoundBuffer_Stop
diff --git a/lnxmvelib/mveasm.cpp b/lnxmvelib/mveasm.cpp
index b3777a6d..fee2423a 100644
--- a/lnxmvelib/mveasm.cpp
+++ b/lnxmvelib/mveasm.cpp
@@ -147,7 +147,7 @@ void NF_DECOMP_INIT(bool HI_COLOR_FLAG, tNextFrame *nf) {
 //----------------------------------------------------------------------
 
 // signed 8-bit y * nf_width
-signed int nfpk_ShiftY[256];
+int32_t nfpk_ShiftY[256];
 
 // Constant tables
 
diff --git a/movie/d3movie.cpp b/movie/d3movie.cpp
index b748cfc0..52c0bedf 100644
--- a/movie/d3movie.cpp
+++ b/movie/d3movie.cpp
@@ -93,7 +93,7 @@ public:
   //        0 : no error
   //       -1 : Cannot set volume
   //       -2 : Invalid parameters
-  int SetVolume(signed int vol) { return m_pBuffer->SetVolume(vol); }
+  int SetVolume(int32_t vol) { return m_pBuffer->SetVolume(vol); }
 
   ///////////////////////////
   // SetPan
@@ -104,7 +104,7 @@ public:
   //        0 : no error
   //       -1 : Cannot set pan
   //       -2 : Invalid parameters
-  int SetPan(signed int pan) { return m_pBuffer->SetPan(pan); }
+  int SetPan(int32_t pan) { return m_pBuffer->SetPan(pan); }
 
   /////////////////////////
   // Stop
@@ -288,7 +288,7 @@ public:
   //        0 : no error
   //       -1 : Cannot set volume
   //       -2 : Invalid parameters
-  int SetVolume(signed int vol) { return LnxSoundBuffer_SetVolume(m_pBuffer, vol); }
+  int SetVolume(int32_t vol) { return LnxSoundBuffer_SetVolume(m_pBuffer, vol); }
 
   ///////////////////////////
   // SetPan
@@ -299,7 +299,7 @@ public:
   //        0 : no error
   //       -1 : Cannot set pan
   //       -2 : Invalid parameters
-  int SetPan(signed int pan) { return LnxSoundBuffer_SetPan(m_pBuffer, pan); }
+  int SetPan(int32_t pan) { return LnxSoundBuffer_SetPan(m_pBuffer, pan); }
 
   /////////////////////////
   // Stop