diff --git a/configure b/configure
index dfad09dc8ea..92f80e77063 100755
--- a/configure
+++ b/configure
@@ -4285,7 +4285,6 @@ if test "$_theoradec" = auto ; then
 	_theoradec=no
 	cat > $TMPC << EOF
 #include <theora/theoradec.h>
-#include <vorbis/codec.h>
 int main(void) { th_ycbcr_buffer yuv; th_decode_ycbcr_out(NULL, yuv);  }
 EOF
 	cc_check $THEORADEC_CFLAGS $THEORADEC_LIBS -ltheoradec && _theoradec=yes
diff --git a/video/theora_decoder.cpp b/video/theora_decoder.cpp
index f00bd485f90..1fef6d5be8d 100644
--- a/video/theora_decoder.cpp
+++ b/video/theora_decoder.cpp
@@ -386,7 +386,7 @@ bool TheoraDecoder::VorbisAudioTrack::decodeSamples() {
 		for (i = 0; i < ret && i < maxsamples; i++) {
 			for (int j = 0; j < channels; j++) {
 #ifdef USE_TREMOR
-				int val = CLIP(pcm[j][i] >> 9, -32768, 32767);
+				int val = CLIP((int)pcm[j][i] >> 9, -32768, 32767);
 #else
 				int val = CLIP((int)rint(pcm[j][i] * 32767.f), -32768, 32767);
 #endif