diff --git a/libavformat/iamf.h b/libavformat/iamf.h
index ce94cb5bc4..d88a24c435 100644
--- a/libavformat/iamf.h
+++ b/libavformat/iamf.h
@@ -22,13 +22,13 @@
 #ifndef AVFORMAT_IAMF_H
 #define AVFORMAT_IAMF_H
 
+#include <stddef.h>
 #include <stdint.h>
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/iamf.h"
 #include "libavcodec/codec_id.h"
 #include "libavcodec/codec_par.h"
-#include "avformat.h"
 
 #define MAX_IAMF_OBU_HEADER_SIZE (1 + 8 * 3)
 
diff --git a/libavformat/iamf_parse.h b/libavformat/iamf_parse.h
index f4f297ecd4..bb506486d7 100644
--- a/libavformat/iamf_parse.h
+++ b/libavformat/iamf_parse.h
@@ -24,7 +24,6 @@
 
 #include <stdint.h>
 
-#include "libavutil/iamf.h"
 #include "avio.h"
 #include "iamf.h"
 
diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c
index 5850c53c8e..1a360dee2f 100644
--- a/libavformat/iamf_writer.c
+++ b/libavformat/iamf_writer.c
@@ -24,8 +24,6 @@
 #include "libavutil/iamf.h"
 #include "libavutil/mem.h"
 #include "libavcodec/get_bits.h"
-#include "libavcodec/flac.h"
-#include "libavcodec/mpeg4audio.h"
 #include "libavcodec/put_bits.h"
 #include "avformat.h"
 #include "avio_internal.h"
diff --git a/libavformat/iamf_writer.h b/libavformat/iamf_writer.h
index 93354670b8..24f1c14769 100644
--- a/libavformat/iamf_writer.h
+++ b/libavformat/iamf_writer.h
@@ -22,9 +22,8 @@
 #ifndef AVFORMAT_IAMF_WRITER_H
 #define AVFORMAT_IAMF_WRITER_H
 
-#include <stdint.h>
+#include <stddef.h>
 
-#include "libavutil/common.h"
 #include "avformat.h"
 #include "avio.h"
 #include "iamf.h"
diff --git a/libavformat/iamfdec.c b/libavformat/iamfdec.c
index 3b8d2ff358..99622f697b 100644
--- a/libavformat/iamfdec.c
+++ b/libavformat/iamfdec.c
@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "config_components.h"
-
 #include "libavutil/avassert.h"
 #include "libavutil/iamf.h"
 #include "libavutil/intreadwrite.h"
@@ -28,7 +26,6 @@
 #include "libavcodec/mathops.h"
 #include "avformat.h"
 #include "avio_internal.h"
-#include "demux.h"
 #include "iamf.h"
 #include "iamf_parse.h"
 #include "internal.h"
diff --git a/libavformat/iamfenc.c b/libavformat/iamfenc.c
index e1003d5495..b588a507bb 100644
--- a/libavformat/iamfenc.c
+++ b/libavformat/iamfenc.c
@@ -24,7 +24,6 @@
 #include "libavutil/avassert.h"
 #include "libavutil/common.h"
 #include "libavutil/iamf.h"
-#include "libavcodec/get_bits.h"
 #include "libavcodec/put_bits.h"
 #include "avformat.h"
 #include "avio_internal.h"