diff --git a/src/Makefile.am b/src/Makefile.am
index ab2c5267..edb95adb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,8 @@ stream_core_files = \
 	stream/stream_proto.h \
 	stream/stream_media.h \
 	stream/stream_media.c \
+	stream/stream_playback_clock.h \
+	stream/stream_playback_clock.c \
 	stream/stream_block.h \
 	stream/stream_block.c \
 	stream/stream_buffer.h \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5e512b1e..371296bc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -99,6 +99,7 @@ endif
 check_PROGRAMS += \
     test_stream_core \
     test_stream_media \
+    test_stream_playback \
     test_android_stream \
     test_stream_service \
     test_u_async_comprehensive \
@@ -474,6 +475,9 @@ test_stream_core_LDFLAGS = $(test_clock_ldflags)
 test_stream_media_SOURCES = test_stream_media.c
 test_stream_media_LDADD = $(LIBUTUN) $(COMMON_LIBS)
 
+test_stream_playback_SOURCES = test_stream_playback.c
+test_stream_playback_LDADD = $(LIBUTUN) $(COMMON_LIBS)
+
 test_android_stream_SOURCES = test_android_stream.c $(test_clock_sources) ../tools/chatgui-android/libutun_lite/stream_bridge.c
 test_android_stream_LDADD = $(LIBUTUN) $(COMMON_LIBS)
 test_android_stream_LDFLAGS = $(test_clock_ldflags)