diff --git a/libavutil/bswap.h b/libavutil/bswap.h
index 2f04cd4fdd..a49e6e2c0a 100644
--- a/libavutil/bswap.h
+++ b/libavutil/bswap.h
@@ -27,6 +27,7 @@
 #define FFMPEG_BSWAP_H
 
 #include <stdint.h>
+#include "config.h"
 #include "common.h"
 
 #ifdef HAVE_BYTESWAP_H
diff --git a/libavutil/internal.h b/libavutil/internal.h
index 749a85c450..d2f08788e8 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
@@ -105,6 +105,7 @@
 #    define PIC
 #endif
 
+#include "config.h"
 #include "intreadwrite.h"
 #include "bswap.h"
 
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
index dd77104f24..cbf5163b3e 100644
--- a/libavutil/intreadwrite.h
+++ b/libavutil/intreadwrite.h
@@ -20,6 +20,7 @@
 #define FFMPEG_INTREADWRITE_H
 
 #include <stdint.h>
+#include "config.h"
 #include "bswap.h"
 
 #ifdef __GNUC__
diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h
index 5ab570405d..69ac0581b4 100644
--- a/libavutil/x86_cpu.h
+++ b/libavutil/x86_cpu.h
@@ -21,6 +21,8 @@
 #ifndef FFMPEG_X86CPU_H
 #define FFMPEG_X86CPU_H
 
+#include "config.h"
+
 #ifdef ARCH_X86_64
 #    define REG_a "rax"
 #    define REG_b "rbx"