diff --git a/src/opus_demo.c b/src/opus_demo.c
index cc2505614e5b17ca85676b8f7eb4f0adef512a43..8d0449d204c267b8e1536c4a0fc49674403f8e5f 100644
--- a/src/opus_demo.c
+++ b/src/opus_demo.c
@@ -223,7 +223,7 @@ int main(int argc, char *argv[])
     int packet_loss_perc;
     opus_int32 count=0, count_act=0;
     int k;
-    int skip=0;
+    opus_int32 skip=0;
     int stop=0;
     short *in, *out;
     int application=OPUS_APPLICATION_AUDIO;
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index 22462f31af19ae55990700f297b350441a2f1b4a..5d613c81808b3a30e551301961b88b58668763b2 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -437,7 +437,7 @@ static opus_int32 user_bitrate_to_bitrate(OpusEncoder *st, int frame_size, int m
 
 #ifdef FIXED_POINT
 #define opus_encode_native opus_encode
-int opus_encode(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
+opus_int32 opus_encode(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
                 unsigned char *data, opus_int32 out_data_bytes)
 #else
 #define opus_encode_native opus_encode_float
@@ -1248,7 +1248,7 @@ opus_int32 opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_s
 #ifdef FIXED_POINT
 
 #ifndef DISABLE_FLOAT_API
-int opus_encode_float(OpusEncoder *st, const float *pcm, int frame_size,
+opus_int32 opus_encode_float(OpusEncoder *st, const float *pcm, int frame_size,
       unsigned char *data, opus_int32 max_data_bytes)
 {
    int i, ret;
diff --git a/tests/test_opus_api.c b/tests/test_opus_api.c
index 545ef68908283aa14124f7b2480ed209c66585d9..f94009e71174049937cd4cc6ae2a2d1eff0212bd 100644
--- a/tests/test_opus_api.c
+++ b/tests/test_opus_api.c
@@ -92,7 +92,7 @@ opus_int32 test_dec_api(void)
 #endif
    short sbuf[960*2];
    int c,err;
-   int *nullvalue;
+   opus_int32 *nullvalue;
    nullvalue=0;
 
    cfgs=0;