diff --git a/src/media/audio/audiobuffer.h b/src/media/audio/audiobuffer.h
index c4bb682cf065ed20bd87bf225f7e89c8d459a93e..9a90c067e5babc6e77a172e86292364fbe4304f6 100644
--- a/src/media/audio/audiobuffer.h
+++ b/src/media/audio/audiobuffer.h
@@ -93,7 +93,8 @@ struct AudioFormat
 
 std::ostream& operator<<(std::ostream& stream, const AudioFormat& f);
 
-class AudioBuffer
+class
+[[deprecated("Use AudioFrame instead")]] AudioBuffer
 {
 public:
     /**
diff --git a/src/media/media_buffer.h b/src/media/media_buffer.h
index 9f5409f7fc4f5df13e9835346bf0c89c7b5a3d02..d86ebe86301cc56dbb3aeff1d5f3ad34953aebff 100644
--- a/src/media/media_buffer.h
+++ b/src/media/media_buffer.h
@@ -36,6 +36,9 @@ using MediaFrame = libjami::MediaFrame;
 using AudioFrame = libjami::AudioFrame;
 using MediaObserver = std::function<void(std::shared_ptr<MediaFrame>&&)>;
 
+[[deprecated("Use AudioFrame and AVSampleFormat")]]
+typedef int16_t AudioSample;
+
 #ifdef ENABLE_VIDEO
 
 using VideoFrame = libjami::VideoFrame;
diff --git a/src/ring_types.h b/src/ring_types.h
index 809d691e51af3a08ccc23c0899436a4029262943..1d1ae0f8efa7b9e51d75e058a28b2d4be3e1e0d0 100644
--- a/src/ring_types.h
+++ b/src/ring_types.h
@@ -31,7 +31,6 @@
 
 namespace jami {
 
-typedef int16_t AudioSample;
 
 static constexpr size_t SIZEBUF = 16000; /** About 62.5ms of buffering at 48kHz */