diff --git a/src/modules/media_file/source/avi_file.cc b/src/modules/media_file/source/avi_file.cc
index 7c4d07a5e..0375c711d 100644
--- a/src/modules/media_file/source/avi_file.cc
+++ b/src/modules/media_file/source/avi_file.cc
@@ -1504,7 +1504,7 @@ WebRtc_Word32 AviFile::ReadAVIVideoStreamHeader(WebRtc_Word32 endpos)
 
     if (chunksize >  _videoFormatHeader.biSize)
     {
-        const WebRtc_Word32 size = chunksize - _videoFormatHeader.biSize;
+        const WebRtc_UWord32 size = chunksize - _videoFormatHeader.biSize;
         const WebRtc_Word32 readSize = (size > CODEC_CONFIG_LENGTH) ?
             CODEC_CONFIG_LENGTH : size;
         _bytesRead += GetBuffer(
diff --git a/src/modules/media_file/source/avi_file.h b/src/modules/media_file/source/avi_file.h
index 6a30aba66..03a3f1074 100644
--- a/src/modules/media_file/source/avi_file.h
+++ b/src/modules/media_file/source/avi_file.h
@@ -85,8 +85,8 @@ public:
         AVI_VIDEO = 1
     };
 
-    static const WebRtc_UWord32 CODEC_CONFIG_LENGTH = 64;
-    static const WebRtc_UWord32 STREAM_NAME_LENGTH  = 32;
+    enum {CODEC_CONFIG_LENGTH = 64};
+    enum {STREAM_NAME_LENGTH  = 32};
 
     AviFile();
     ~AviFile();