diff --git a/doc/filters.texi b/doc/filters.texi
index e50e55b4105225e4904d42cb3a43f788fa68d00d..b86b1468f7a0b1c2530bee75400d5891c1fd274d 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -268,7 +268,7 @@ corresponding numeric value defined in @file{libavutil/samplefmt.h}. Use 'p'
 suffix for a planar sample format.
 
 @var{channel_layout} specifies the channel layout, and can be a string
-or the corresponding number value defined in @file{libavutil/audioconvert.h}.
+or the corresponding number value defined in @file{libavutil/channel_layout.h}.
 
 The special parameter "auto", signifies that the filter will
 automatically select the output format depending on the output filter.
@@ -949,8 +949,8 @@ the enum AVSampleFormat in @file{libavutil/samplefmt.h}
 @item channel_layout
 The channel layout of the incoming audio buffers.
 Either a channel layout name from channel_layout_map in
-@file{libavutil/audioconvert.c} or its corresponding integer representation
-from the AV_CH_LAYOUT_* macros in @file{libavutil/audioconvert.h}
+@file{libavutil/channel_layout.c} or its corresponding integer representation
+from the AV_CH_LAYOUT_* macros in @file{libavutil/channel_layout.h}
 
 @end table
 
diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index 104fd87cdaf54c80bed4a2e465c27e04781705ec..7d55bb5ce91638a0e40e5ff567bbb2981936b966 100644
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -21,9 +21,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/avassert.h"
-#include "libavutil/audioconvert.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "internal.h"
diff --git a/libavcodec/vima.c b/libavcodec/vima.c
index 648ae5501652953de43d691310dd3146b0842ec7..35e2a3cdd5f683a82dacf244dd1cb5ff515806e6 100644
--- a/libavcodec/vima.c
+++ b/libavcodec/vima.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "get_bits.h"
 #include "adpcm_data.h"
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c
index f4a54148c4d16ae1afb5426fad6959290591242e..4f1ba582e7120a8995ce7f48fb3917e8ad025c0e 100644
--- a/libavdevice/lavfi.c
+++ b/libavdevice/lavfi.c
@@ -28,13 +28,13 @@
 #include "float.h"              /* DBL_MIN, DBL_MAX */
 
 #include "libavutil/bprint.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/file.h"
 #include "libavutil/log.h"
 #include "libavutil/mem.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "libavutil/pixdesc.h"
-#include "libavutil/audioconvert.h"
 #include "libavfilter/avfilter.h"
 #include "libavfilter/avfiltergraph.h"
 #include "libavfilter/buffersink.h"
diff --git a/libavfilter/af_aconvert.c b/libavfilter/af_aconvert.c
index 6dd845259e3bd9ef67466ba400bfcb58b829f72e..84e5e3ca7878b56e3300e5c512d5e8fc7c1d76c4 100644
--- a/libavfilter/af_aconvert.c
+++ b/libavfilter/af_aconvert.c
@@ -25,8 +25,8 @@
  * sample format and channel layout conversion audio filter
  */
 
-#include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libswresample/swresample.h"
 #include "avfilter.h"
 #include "audio.h"
diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c
index 77ea297cd105efc63f33b3215a3cae95c48531ad..fa4f9f108e9fef4bd33dfc8f0385d9258d548cf6 100644
--- a/libavfilter/af_amerge.c
+++ b/libavfilter/af_amerge.c
@@ -23,9 +23,9 @@
  * Audio merging filter
  */
 
-#include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
 #include "libavutil/bprint.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libswresample/swresample.h" // only for SWR_CH_MAX
 #include "avfilter.h"
diff --git a/libavfilter/af_aresample.c b/libavfilter/af_aresample.c
index e400e1f0bbcfbc93cfaa1275992f7e23eb5985a8..53c5dcd52f48f985e02239d18137a68124b2a763 100644
--- a/libavfilter/af_aresample.c
+++ b/libavfilter/af_aresample.c
@@ -24,8 +24,8 @@
  * resampling audio filter
  */
 
-#include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
 #include "libavutil/avassert.h"
diff --git a/libavfilter/af_asetnsamples.c b/libavfilter/af_asetnsamples.c
index 467af76571f47c3bc451049bacf888554e42273c..0c075f6193a8f838ab0e4fea4f04673fbfa90c1d 100644
--- a/libavfilter/af_asetnsamples.c
+++ b/libavfilter/af_asetnsamples.c
@@ -25,8 +25,8 @@
  */
 
 #include "libavutil/audio_fifo.h"
-#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "audio.h"
diff --git a/libavfilter/af_atempo.c b/libavfilter/af_atempo.c
index c2d1fc15739ced01567cf54f66d1c8125787875b..06c80ac01dece07904c1222153c49aed3950f5ec 100644
--- a/libavfilter/af_atempo.c
+++ b/libavfilter/af_atempo.c
@@ -40,9 +40,9 @@
 
 #include <float.h>
 #include "libavcodec/avfft.h"
-#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/eval.h"
 #include "libavutil/opt.h"
 #include "libavutil/samplefmt.h"
diff --git a/libavfilter/af_earwax.c b/libavfilter/af_earwax.c
index 2e2cac39e40cbea7cca78de29673483d6797c6c6..6ce4a78f6adfff7ce78c7a8f28763cfda1803a73 100644
--- a/libavfilter/af_earwax.c
+++ b/libavfilter/af_earwax.c
@@ -29,7 +29,7 @@
  * front of the listener. Adapted from the libsox earwax effect.
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "avfilter.h"
 #include "audio.h"
 #include "formats.h"
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c
index 8d1bb5b323afc423d9724f450e3e0aab8db8a7c2..3199efa3587c221f10da81690b5bdb0daedbd6fd 100644
--- a/libavfilter/af_pan.c
+++ b/libavfilter/af_pan.c
@@ -28,8 +28,8 @@
  */
 
 #include <stdio.h>
-#include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libswresample/swresample.h"
 #include "audio.h"
diff --git a/libavfilter/af_silencedetect.c b/libavfilter/af_silencedetect.c
index c456ac4970eada4f1b0b4ea51bcf1cf6250711f2..97d1ec7b7e95c14143f560bc35779fedc3dbcb06 100644
--- a/libavfilter/af_silencedetect.c
+++ b/libavfilter/af_silencedetect.c
@@ -23,7 +23,7 @@
  * Audio silence detector
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/timestamp.h"
 #include "audio.h"
diff --git a/libavfilter/af_volume.c b/libavfilter/af_volume.c
index 1aca7d95ba59c5f8f3b683813132f9bc83d48c5e..9438108c25a621b020cc5931aadfb4205698f327 100644
--- a/libavfilter/af_volume.c
+++ b/libavfilter/af_volume.c
@@ -24,7 +24,7 @@
  * based on ffmpeg.c code
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/eval.h"
 #include "audio.h"
 #include "avfilter.h"
diff --git a/libavfilter/af_volumedetect.c b/libavfilter/af_volumedetect.c
index 0ec69604b740585351502e307bac2d6934fd9c38..ab77a9cbef3b0cfb69e2434be1f58b5a44bed505 100644
--- a/libavfilter/af_volumedetect.c
+++ b/libavfilter/af_volumedetect.c
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/avassert.h"
 #include "audio.h"
 #include "avfilter.h"
diff --git a/libavfilter/asrc_aevalsrc.c b/libavfilter/asrc_aevalsrc.c
index c8b5e02700b84fe5a7762119334c6033817efbfd..9baf3e2ecc3b100e881750d6a5842b9f6e4ba463 100644
--- a/libavfilter/asrc_aevalsrc.c
+++ b/libavfilter/asrc_aevalsrc.c
@@ -23,9 +23,9 @@
  * eval audio source
  */
 
-#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/eval.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
diff --git a/libavfilter/asrc_flite.c b/libavfilter/asrc_flite.c
index 6f8cc9583a1de77d96da9f70fd262aaa39f3b7ca..24bccd654066d6c7835c37bcc79f3cabf3f36797 100644
--- a/libavfilter/asrc_flite.c
+++ b/libavfilter/asrc_flite.c
@@ -24,7 +24,7 @@
  */
 
 #include <flite/flite.h>
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/file.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c
index f13e8d0120e94d0ad1ebd72920e68f8d817cfbdc..8812c9ebb2b4923143027ad1a88bfe7681a61403 100644
--- a/libavfilter/avf_concat.c
+++ b/libavfilter/avf_concat.c
@@ -23,8 +23,8 @@
  * concat audio-video filter
  */
 
-#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #define FF_BUFQUEUE_SIZE 256
diff --git a/libavfilter/avf_showspectrum.c b/libavfilter/avf_showspectrum.c
index 4ef7f4f67be182e7669cc60f53f72cb45701a22d..e98e7b433ab94ab36029b9066ca3a786008d49b1 100644
--- a/libavfilter/avf_showspectrum.c
+++ b/libavfilter/avf_showspectrum.c
@@ -27,7 +27,7 @@
 #include <math.h>
 
 #include "libavcodec/avfft.h"
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "avfilter.h"
 #include "internal.h"
diff --git a/libavfilter/avf_showwaves.c b/libavfilter/avf_showwaves.c
index 50a114baed44948e7ec5291cca718c0ec592c383..2adaa1f600acb2f513d71fa47282bf81a04731b1 100644
--- a/libavfilter/avf_showwaves.c
+++ b/libavfilter/avf_showwaves.c
@@ -23,7 +23,7 @@
  * audio to video multimedia filter
  */
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
 #include "avfilter.h"
diff --git a/libavfilter/f_ebur128.c b/libavfilter/f_ebur128.c
index e850669659a485f7d86f20d54a636b14912d7fe0..23396db4af4d5bd3ea419d1065b4cf043533e0da 100644
--- a/libavfilter/f_ebur128.c
+++ b/libavfilter/f_ebur128.c
@@ -30,9 +30,9 @@
 
 #include <math.h>
 
-#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/xga_font_data.h"
 #include "libavutil/opt.h"
 #include "libavutil/timestamp.h"
diff --git a/libavfilter/formats.c b/libavfilter/formats.c
index c8c2257bb72b281b613b6ae0e18e8e1383fadf4b..be69a1a3df6ff2d3dffb8acf776477e0db5b7814 100644
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@@ -19,11 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/eval.h"
 #include "libavutil/pixdesc.h"
 #include "libavutil/parseutils.h"
-#include "libavutil/audioconvert.h"
 #include "avfilter.h"
 #include "internal.h"
 #include "formats.h"
diff --git a/libavfilter/graphdump.c b/libavfilter/graphdump.c
index c9d0fb0a7cd68cd017b2742abf37c7d143d03b6b..45f64c0146bfdf0fe5df7c3b795b3a06ddadeacb 100644
--- a/libavfilter/graphdump.c
+++ b/libavfilter/graphdump.c
@@ -21,7 +21,7 @@
 
 #include <string.h>
 
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/bprint.h"
 #include "libavutil/pixdesc.h"
 #include "avfilter.h"
diff --git a/libavfilter/sink_buffer.c b/libavfilter/sink_buffer.c
index 358b3e86f7708da6398de4e357e85f6d28298daa..1c84989ee852f37e5deeb3b9b6f412e1b1fe0f3a 100644
--- a/libavfilter/sink_buffer.c
+++ b/libavfilter/sink_buffer.c
@@ -23,8 +23,8 @@
  * buffer sink
  */
 
-#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/fifo.h"
 #include "avfilter.h"
 #include "buffersink.h"
diff --git a/libavfilter/src_buffer.c b/libavfilter/src_buffer.c
index 354a516e20185c8a2493c68c8d189a4df6494189..acd490b974e255b1f138c08d83ae8dd63132006f 100644
--- a/libavfilter/src_buffer.c
+++ b/libavfilter/src_buffer.c
@@ -31,8 +31,8 @@
 #include "avcodec.h"
 #include "buffersrc.h"
 #include "asrc_abuffer.h"
-#include "libavutil/audioconvert.h"
 #include "libavutil/avstring.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/fifo.h"
 #include "libavutil/imgutils.h"
 
diff --git a/libswresample/audioconvert.h b/libswresample/audioconvert.h
index 9a234d4b93ebf05bae0b42b76355456e5f18af24..d8af0036713bd4e84e3bde8933f823c8b0fc199f 100644
--- a/libswresample/audioconvert.h
+++ b/libswresample/audioconvert.h
@@ -31,7 +31,6 @@
 
 #include "swresample_internal.h"
 #include "libavutil/cpu.h"
-#include "libavutil/audioconvert.h"
 
 
 typedef void (conv_func_type)(uint8_t *po, const uint8_t *pi, int is, int os, uint8_t *end);
diff --git a/libswresample/rematrix.c b/libswresample/rematrix.c
index 3115c99ddeb74542857ea5777c2d526a511c7b87..e23c45e852f8ea4886311dc9551e59e4551dc467 100644
--- a/libswresample/rematrix.c
+++ b/libswresample/rematrix.c
@@ -19,8 +19,8 @@
  */
 
 #include "swresample_internal.h"
-#include "libavutil/audioconvert.h"
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 
 #define ONE (1.0)
 #define R(x) x
diff --git a/libswresample/swresample-test.c b/libswresample/swresample-test.c
index a0dfe289082c225b58b17ba8bad89ff60b5fa3d9..7f50cb48d0e405230d64c9e051729a7f5c2668a8 100644
--- a/libswresample/swresample-test.c
+++ b/libswresample/swresample-test.c
@@ -20,8 +20,8 @@
  */
 
 #include "libavutil/avassert.h"
+#include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
-#include "libavutil/audioconvert.h"
 #include "libavutil/opt.h"
 #include "swresample.h"
 
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 4564d440c99e2bd6972c127006a79c4a8d215ca8..041d2b231931539a26f9740143a4048da87c308e 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -22,7 +22,7 @@
 #include "swresample_internal.h"
 #include "audioconvert.h"
 #include "libavutil/avassert.h"
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 
 #include <float.h>
 
diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h
index 38b18d9d7edb31fde0e8276014fb288f31eae03c..459b1b086834993cbfebaa56fc69e11573e84779 100644
--- a/libswresample/swresample_internal.h
+++ b/libswresample/swresample_internal.h
@@ -22,7 +22,7 @@
 #define SWR_INTERNAL_H
 
 #include "swresample.h"
-#include "libavutil/audioconvert.h"
+#include "libavutil/channel_layout.h"
 #include "config.h"
 
 #define SQRT3_2      1.22474487139158904909  /* sqrt(3/2) */
diff --git a/tools/graph2dot.c b/tools/graph2dot.c
index 4a30beb754b35b57da8869571838619567aa6b69..74075c7af294d23db8f84fbfe9000f258b3cf7df 100644
--- a/tools/graph2dot.c
+++ b/tools/graph2dot.c
@@ -25,9 +25,9 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "libavutil/channel_layout.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
-#include "libavutil/audioconvert.h"
 #include "libavfilter/avfiltergraph.h"
 
 #if !HAVE_GETOPT