diff --git a/libavcodec/mxpegdec.c b/libavcodec/mxpegdec.c
index fff5c7eef9..dda4b32073 100644
--- a/libavcodec/mxpegdec.c
+++ b/libavcodec/mxpegdec.c
@@ -27,6 +27,7 @@
 
 #include "mjpeg.h"
 #include "mjpegdec.h"
+#include "internal.h"
 
 typedef struct MXpegDecodeContext {
     MJpegDecodeContext jpg;
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c
index 345456ce6e..7a89cc4e82 100644
--- a/libavcodec/pthread.c
+++ b/libavcodec/pthread.c
@@ -573,7 +573,7 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt)
                 pthread_cond_wait(&p->progress_cond, &p->progress_mutex);
 
             if (p->state == STATE_GET_BUFFER) {
-                p->result = p-ff_get_buffer(p->avctx, p->requested_frame);
+                p->result = ff_get_buffer(p->avctx, p->requested_frame);
                 p->state  = STATE_SETTING_UP;
                 pthread_cond_signal(&p->progress_cond);
             }
diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c
index 58dd255a55..2683a4ad0e 100644
--- a/libavcodec/roqvideoenc.c
+++ b/libavcodec/roqvideoenc.c
@@ -60,6 +60,7 @@
 #include "bytestream.h"
 #include "elbg.h"
 #include "mathops.h"
+#include "internal.h"
 
 #define CHROMA_BIAS 1