diff --git a/libavdevice/decklink_common.cpp b/libavdevice/decklink_common.cpp
index 58502eecec..ac7964cd17 100644
--- a/libavdevice/decklink_common.cpp
+++ b/libavdevice/decklink_common.cpp
@@ -26,7 +26,11 @@
 #include <DeckLinkAPIDispatch.cpp>
 #endif
 
+#include <pthread.h>
+#include <semaphore.h>
+
 extern "C" {
+#include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 #include "libavutil/imgutils.h"
 }
diff --git a/libavdevice/decklink_common.h b/libavdevice/decklink_common.h
index c7e3ef2e39..3bc30f062c 100644
--- a/libavdevice/decklink_common.h
+++ b/libavdevice/decklink_common.h
@@ -19,15 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <pthread.h>
-#include <semaphore.h>
-#include <DeckLinkAPI.h>
-
-extern "C" {
-#include "libavformat/avformat.h"
+#include <DeckLinkAPIVersion.h>
 
 #include "decklink_common_c.h"
-}
 
 class decklink_output_callback;
 class decklink_input_callback;
diff --git a/libavdevice/decklink_common_c.h b/libavdevice/decklink_common_c.h
index 3644fb4dd8..fb2b788628 100644
--- a/libavdevice/decklink_common_c.h
+++ b/libavdevice/decklink_common_c.h
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/log.h"
-
 struct decklink_cctx {
     const AVClass *cclass;
 
diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp
index 4bbc92edea..6c5bc5dbed 100644
--- a/libavdevice/decklink_dec.cpp
+++ b/libavdevice/decklink_dec.cpp
@@ -21,7 +21,11 @@
 
 #include <DeckLinkAPI.h>
 
+#include <pthread.h>
+#include <semaphore.h>
+
 extern "C" {
+#include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 #include "libavutil/imgutils.h"
 }
diff --git a/libavdevice/decklink_dec.h b/libavdevice/decklink_dec.h
index c499bc9adf..6bd9226cd0 100644
--- a/libavdevice/decklink_dec.h
+++ b/libavdevice/decklink_dec.h
@@ -23,8 +23,6 @@
 extern "C" {
 #endif
 
-#include "libavformat/avformat.h"
-
 int ff_decklink_read_header(AVFormatContext *avctx);
 int ff_decklink_read_packet(AVFormatContext *avctx, AVPacket *pkt);
 int ff_decklink_read_close(AVFormatContext *avctx);
diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp
index 334c3dcd33..6c5450f4ec 100644
--- a/libavdevice/decklink_enc.cpp
+++ b/libavdevice/decklink_enc.cpp
@@ -21,7 +21,11 @@
 
 #include <DeckLinkAPI.h>
 
+#include <pthread.h>
+#include <semaphore.h>
+
 extern "C" {
+#include "libavformat/avformat.h"
 #include "libavformat/internal.h"
 #include "libavutil/imgutils.h"
 }
diff --git a/libavdevice/decklink_enc.h b/libavdevice/decklink_enc.h
index 23c59a2041..6086947e6c 100644
--- a/libavdevice/decklink_enc.h
+++ b/libavdevice/decklink_enc.h
@@ -23,8 +23,6 @@
 extern "C" {
 #endif
 
-#include "libavformat/avformat.h"
-
 int ff_decklink_write_header(AVFormatContext *avctx);
 int ff_decklink_write_packet(AVFormatContext *avctx, AVPacket *pkt);
 int ff_decklink_write_trailer(AVFormatContext *avctx);