diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 6dffbda731755be86ed1dc7b9f4f633af4268904..3c50ff8e9e7249852b16fbb53194cdf02afa36e1 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -908,7 +908,6 @@ SKIPHEADERS                            += %_tablegen.h                  \
                                           %_tables.h                    \
                                           aac_tablegen_decl.h           \
                                           fft-internal.h                \
-                                          libutvideo.h                  \
                                           old_codec_ids.h               \
                                           tableprint.h                  \
                                           tableprint_vlc.h              \
@@ -918,6 +917,7 @@ SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
 SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
 SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h
 SKIPHEADERS-$(CONFIG_LIBUTVIDEO)       += libutvideo.h
+SKIPHEADERS-$(CONFIG_LIBWEBP_ENCODER)  += libwebpenc_common.h
 SKIPHEADERS-$(CONFIG_QSV)              += qsv.h qsv_internal.h
 SKIPHEADERS-$(CONFIG_QSVDEC)           += qsvdec.h
 SKIPHEADERS-$(CONFIG_QSVENC)           += qsvenc.h
diff --git a/libavcodec/aacenc_is.h b/libavcodec/aacenc_is.h
index f4ca8e25e2c45dc4ded6299bb9b87f21593a1ce8..e35f0aa695241f5b387e41a94192c525d13f237a 100644
--- a/libavcodec/aacenc_is.h
+++ b/libavcodec/aacenc_is.h
@@ -28,6 +28,8 @@
 #ifndef AVCODEC_AACENC_IS_H
 #define AVCODEC_AACENC_IS_H
 
+#include "aacenc.h"
+
 /** Frequency in Hz for lower limit of intensity stereo **/
 #define INT_STEREO_LOW_LIMIT 6100
 
diff --git a/libavcodec/aacenc_tns.h b/libavcodec/aacenc_tns.h
index 44afe0318bb48d01159d26be99f64c2e5ec7bd22..789e9a64fef4b4fa2d32fc26264fddbd3f44b82b 100644
--- a/libavcodec/aacenc_tns.h
+++ b/libavcodec/aacenc_tns.h
@@ -28,7 +28,7 @@
 #ifndef AVCODEC_AACENC_TNS_H
 #define AVCODEC_AACENC_TNS_H
 
-#include "aac.h"
+#include "aacenc.h"
 
 /** Frequency in Hz for lower limit of TNS **/
 #define TNS_LOW_LIMIT 2150