diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6e23aa65..5bc48ffb 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -32,7 +32,9 @@ libuasync_a_SOURCES = \
 	sqlite3.c \
 	sqlite3.h \
 	opus_codec.c \
-	opus_codec.h
+	opus_codec.h \
+	audio_compressor.c \
+	audio_compressor.h
 
 libuasync_a_CFLAGS = \
 	-D_ISOC99_SOURCE \
diff --git a/tools/chatgui-android/libutun_lite/audio_compressor.c b/lib/audio_compressor.c
similarity index 100%
rename from tools/chatgui-android/libutun_lite/audio_compressor.c
rename to lib/audio_compressor.c
diff --git a/tools/chatgui-android/libutun_lite/audio_compressor.h b/lib/audio_compressor.h
similarity index 100%
rename from tools/chatgui-android/libutun_lite/audio_compressor.h
rename to lib/audio_compressor.h
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e52f47ee..2b706212 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -54,6 +54,7 @@ check_PROGRAMS = \
 	test_chat_sync_stress \
 	test_stcp_traffic \
 	test_bbr_integration \
+	test_audio_compressor \
 	test_intensive_memory_pool \
 	test_tcp_io \
 	test_uasync_socket_race \
@@ -311,6 +312,9 @@ test_opus_codec_SOURCES = test_opus_codec.c
 test_opus_codec_CFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/libopus/include
 test_opus_codec_LDADD = $(COMMON_LIBS) $(top_builddir)/lib/libopus/libopus_internal.a -lm
 
+test_audio_compressor_SOURCES = test_audio_compressor.c
+test_audio_compressor_LDADD = $(COMMON_LIBS) -lm
+
 # Copy test configs to build directory (tests run from build/tests/)
 all-local: copy-test-configs
 
diff --git a/tests/test_audio_compressor.c b/tests/test_audio_compressor.c
index 83227421..ab661628 100644
--- a/tests/test_audio_compressor.c
+++ b/tests/test_audio_compressor.c
@@ -1,7 +1,7 @@
 #define _DEFAULT_SOURCE
 #include "audio_compressor.h"
-#include "../../../lib/debug_config.h"
-#include "../../../lib/mem.h"
+#include "debug_config.h"
+#include "mem.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/tools/chatgui-android/libutun_lite/utun_sources.cmake b/tools/chatgui-android/libutun_lite/utun_sources.cmake
index c3da7bd7..93f6561b 100644
--- a/tools/chatgui-android/libutun_lite/utun_sources.cmake
+++ b/tools/chatgui-android/libutun_lite/utun_sources.cmake
@@ -36,7 +36,6 @@ function(utun_setup_sources LIB_DIR SRC_DIR CONFIG_DIR TOOLS_DIR)
         "${CONFIG_DIR}/utun_config_api.c"
         "${CONFIG_DIR}/invite_link_c.c"
         "${CONFIG_DIR}/instance_lite.c"
-        "${CONFIG_DIR}/audio_compressor.c"
         "${CONFIG_DIR}/voice_recorder.c"
         "${CONFIG_DIR}/attachment_sender.c"
     )