diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 8bedea54ba..4035f6304e 100644
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -52,6 +52,10 @@
 #include <vdpau/vdpau.h>
 #include <vdpau/vdpau_x11.h>
 
+#include "libavutil/attributes.h"
+
+#include "version.h"
+
 #if FF_API_BUFS_VDPAU
 union AVVDPAUPictureInfo {
     VdpPictureInfoH264        h264;
diff --git a/libavcodec/vdpau_internal.h b/libavcodec/vdpau_internal.h
index 9e4ab4e3df..50c4f5e74c 100644
--- a/libavcodec/vdpau_internal.h
+++ b/libavcodec/vdpau_internal.h
@@ -26,8 +26,10 @@
 
 #include <stdint.h>
 #include <vdpau/vdpau.h>
-#include "h264.h"
+
+#include "avcodec.h"
 #include "mpegvideo.h"
+#include "version.h"
 
 /** Extract VdpVideoSurface from a Picture */
 static inline uintptr_t ff_vdpau_get_surface_id(Picture *pic)
@@ -42,6 +44,8 @@ union AVVDPAUPictureInfo {
     VdpPictureInfoVC1          vc1;
     VdpPictureInfoMPEG4Part2 mpeg4;
 };
+#else
+#include "vdpau.h"
 #endif
 
 struct vdpau_picture_context {