diff --git a/doc/APIchanges b/doc/APIchanges
index 30203d8ad5..f8d01caa84 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -14,6 +14,10 @@ libavutil:     2021-04-27
 
 API changes, most recent first:
 
+2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h codec_id.h
+  Move av_get_bits_per_sample() and av_get_exact_bits_per_sample()
+  from avcodec.h to codec_id.h.
+
 2021-xx-xx - xxxxxxxxxx - lavc 59.1.100 - avcodec.h defs.h
   Add new installed header defs.h. The following definitions are moved
   into it from avcodec.h:
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 1838b9dcdb..cec4a0cb24 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3124,14 +3124,6 @@ int avcodec_fill_audio_frame(AVFrame *frame, int nb_channels,
  */
 void avcodec_flush_buffers(AVCodecContext *avctx);
 
-/**
- * Return codec bits per sample.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_bits_per_sample(enum AVCodecID codec_id);
-
 /**
  * Return the PCM codec associated with a sample format.
  * @param be  endianness, 0 for little, 1 for big,
@@ -3140,16 +3132,6 @@ int av_get_bits_per_sample(enum AVCodecID codec_id);
  */
 enum AVCodecID av_get_pcm_codec(enum AVSampleFormat fmt, int be);
 
-/**
- * Return codec bits per sample.
- * Only return non-zero if the bits per sample is exactly correct, not an
- * approximation.
- *
- * @param[in] codec_id the codec
- * @return Number of bits per sample or zero if unknown for the given codec.
- */
-int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
-
 /**
  * Return audio frame duration.
  *
diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h
index 83e1dbb4b3..6141268096 100644
--- a/libavcodec/codec_id.h
+++ b/libavcodec/codec_id.h
@@ -580,6 +580,24 @@ enum AVMediaType avcodec_get_type(enum AVCodecID codec_id);
  */
 const char *avcodec_get_name(enum AVCodecID id);
 
+/**
+ * Return codec bits per sample.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_bits_per_sample(enum AVCodecID codec_id);
+
+/**
+ * Return codec bits per sample.
+ * Only return non-zero if the bits per sample is exactly correct, not an
+ * approximation.
+ *
+ * @param[in] codec_id the codec
+ * @return Number of bits per sample or zero if unknown for the given codec.
+ */
+int av_get_exact_bits_per_sample(enum AVCodecID codec_id);
+
 /**
  * @}
  */