diff --git a/daemon/codec.c b/daemon/codec.c
index f8b94ddcb..a3b0831b6 100644
--- a/daemon/codec.c
+++ b/daemon/codec.c
@@ -20,7 +20,7 @@
 #include "mqtt.h"
 #include "audio_player.h"
 #ifdef WITH_TRANSCODING
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 #endif
 #include "bufferpool.h"
 #include "ng_client.h"
@@ -101,7 +101,7 @@ static rtp_pt_list *__codec_store_delete_link(rtp_pt_list *link, struct codec_st
 #include <spandsp/logging.h>
 #include <spandsp/dtmf.h>
 #include "resample.h"
-#include "dtmf_rx_fillin.h"
+#include "dtmf_rx_fillin.compat"
 
 
 
diff --git a/daemon/media_player.c b/daemon/media_player.c
index 4918d5210..11a15d351 100644
--- a/daemon/media_player.c
+++ b/daemon/media_player.c
@@ -19,7 +19,7 @@
 #include "main.h"
 #include "rtcp.h"
 #ifdef WITH_TRANSCODING
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 #endif
 #include "kernel.h"
 #include "bufferpool.h"
diff --git a/daemon/t38.c b/daemon/t38.c
index c873142d3..412875ce3 100644
--- a/daemon/t38.c
+++ b/daemon/t38.c
@@ -4,7 +4,7 @@
 #include <assert.h>
 #include <spandsp/t30.h>
 #include <spandsp/logging.h>
-#include "spandsp_logging.h"
+#include "spandsp_logging.compat"
 #include "codec.h"
 #include "call.h"
 #include "log_d.h"
diff --git a/lib/.gitignore b/lib/.gitignore
index ec3888ff8..43703f5cf 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -2,3 +2,4 @@
 dtmf_rx_fillin.h
 fix_frame_channel_layout.h
 spandsp_logging.h
+*.compat
diff --git a/lib/codeclib.c b/lib/codeclib.c
index c66f5099f..a6f709b95 100644
--- a/lib/codeclib.c
+++ b/lib/codeclib.c
@@ -21,7 +21,7 @@
 #include "rtplib.h"
 #include "bitstr.h"
 #include "dtmflib.h"
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 
 
 
diff --git a/lib/common.Makefile b/lib/common.Makefile
index b42e974b6..813200ae9 100644
--- a/lib/common.Makefile
+++ b/lib/common.Makefile
@@ -22,11 +22,13 @@ debug:
 	$(MAKE) DBG=yes all
 
 
-BUILD_TEST_ALTS = ../lib/fix_frame_channel_layout.h ../lib/dtmf_rx_fillin.h ../lib/spandsp_logging.h
+BUILD_TEST_ALTS := ../lib/fix_frame_channel_layout.compat \
+		   ../lib/dtmf_rx_fillin.compat \
+		   ../lib/spandsp_logging.compat
 
 clean:
 	rm -f $(OBJS) $(TARGET) $(MANS) $(ADD_CLEAN) core core.*
-	rm -f $(BUILD_TEST_ALTS) $(BUILD_TEST_ALTS:.h=-test) *.strhash.c
+	rm -f $(BUILD_TEST_ALTS) $(BUILD_TEST_ALTS:.compat=-test) *.strhash.c
 
 install:
 
@@ -39,19 +41,19 @@ $(OBJS):	Makefile ../include/* ../lib/*.h ../kernel-module/*.h
 			-M "date:$(BUILD_DATE)" \
 			-o "$@"
 
-resample.c codeclib.strhash.c mix.c packet.c:	../lib/fix_frame_channel_layout.h
+resample.c codeclib.strhash.c mix.c packet.c:	../lib/fix_frame_channel_layout.compat
 
 ifeq ($(with_transcoding),yes)
-../daemon/codec.c codec.c:	../lib/dtmf_rx_fillin.h
-media_player.c ../daemon/media_player.c ../daemon/codec.c codec.c test-resample.c:	../lib/fix_frame_channel_layout.h
+../daemon/codec.c codec.c:	../lib/dtmf_rx_fillin.compat
+media_player.c ../daemon/media_player.c ../daemon/codec.c codec.c test-resample.c:	../lib/fix_frame_channel_layout.compat
 endif
 
-t38.c ../daemon/t38.c:		../lib/spandsp_logging.h
+t38.c ../daemon/t38.c:		../lib/spandsp_logging.compat
 
 %.strhash.c:	%.c ../utils/const_str_hash
 	../utils/const_str_hash "$<" $(CFLAGS) < "$<" > "$@"
 
-$(BUILD_TEST_ALTS):	$(wildcard $(subst .h,-*,$(BUILD_TEST_ALTS)))
+$(BUILD_TEST_ALTS):	$(wildcard $(subst .compat,-*,$(BUILD_TEST_ALTS)))
 	../utils/build_test_wrapper "$@"
 
 .PHONY: all debug clean install
diff --git a/lib/dtmf_rx_fillin-test.c b/lib/dtmf_rx_fillin-test.c
index 28ddda527..6f3f78989 100644
--- a/lib/dtmf_rx_fillin-test.c
+++ b/lib/dtmf_rx_fillin-test.c
@@ -1,4 +1,4 @@
-#include "dtmf_rx_fillin.h"
+#include "dtmf_rx_fillin.compat"
 int main(void) {
 	dtmf_rx_state_t *dsp = NULL;
 	dtmf_rx_fillin(dsp, 0);
diff --git a/lib/fix_frame_channel_layout-test.c b/lib/fix_frame_channel_layout-test.c
index 4c61be9ef..98c704ffc 100644
--- a/lib/fix_frame_channel_layout-test.c
+++ b/lib/fix_frame_channel_layout-test.c
@@ -1,4 +1,4 @@
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 int main(void) {
 	AVFrame *f = NULL;
 	fix_frame_channel_layout(f);
diff --git a/lib/resample.c b/lib/resample.c
index 6c2e51a43..cfa384679 100644
--- a/lib/resample.c
+++ b/lib/resample.c
@@ -11,7 +11,7 @@
 #include <libavutil/frame.h>
 #include "loglib.h"
 #include "codeclib.h"
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 
 
 
diff --git a/lib/spandsp_logging-test.c b/lib/spandsp_logging-test.c
index 52fd96db0..2f94c928e 100644
--- a/lib/spandsp_logging-test.c
+++ b/lib/spandsp_logging-test.c
@@ -6,7 +6,7 @@
 #include <spandsp/telephony.h>
 #include <spandsp/logging.h>
 #include "compat.h"
-#include "spandsp_logging.h"
+#include "spandsp_logging.compat"
 
 void logfunc(SPAN_LOG_ARGS) {
 	return;
diff --git a/perf-tester/Makefile b/perf-tester/Makefile
index e00f77a91..6840813fc 100644
--- a/perf-tester/Makefile
+++ b/perf-tester/Makefile
@@ -51,7 +51,7 @@ LIBASM := mvr2s_x64_avx2.S mvr2s_x64_avx512.S
 
 include ../lib/common.Makefile
 
-main.o: ../lib/fix_frame_channel_layout.h
+main.o: ../lib/fix_frame_channel_layout.compat
 
 install: $(TARGET)
 	install -m 0755 -D $(TARGET) $(DESTDIR)/usr/bin/$(TARGET)
diff --git a/perf-tester/main.c b/perf-tester/main.c
index e09ebb247..1a596ed34 100644
--- a/perf-tester/main.c
+++ b/perf-tester/main.c
@@ -15,7 +15,7 @@
 #include "poller.h"
 #include "ssllib.h"
 #include "obj.h"
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 #include "log.h"
 
 
diff --git a/recording-daemon/mix.c b/recording-daemon/mix.c
index 8d1599510..ad717c8bb 100644
--- a/recording-daemon/mix.c
+++ b/recording-daemon/mix.c
@@ -13,7 +13,7 @@
 #include "output.h"
 #include "resample.h"
 #include "main.h"
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 
 
 
diff --git a/recording-daemon/output.c b/recording-daemon/output.c
index 5883786f8..615c415a8 100644
--- a/recording-daemon/output.c
+++ b/recording-daemon/output.c
@@ -13,7 +13,7 @@
 #include "recaux.h"
 #include "notify.h"
 #include "resample.h"
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 #include "s3.h"
 #include "gcs.h"
 
diff --git a/recording-daemon/packet.c b/recording-daemon/packet.c
index 412245e7e..84b751041 100644
--- a/recording-daemon/packet.c
+++ b/recording-daemon/packet.c
@@ -17,7 +17,7 @@
 #include "streambuf.h"
 #include "resample.h"
 #include "tag.h"
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 #include "tls_send.h"
 #include "mix.h"
 
diff --git a/recording-daemon/tls_send.c b/recording-daemon/tls_send.c
index e7f19827c..86e061231 100644
--- a/recording-daemon/tls_send.c
+++ b/recording-daemon/tls_send.c
@@ -8,7 +8,7 @@
 #include "resample.h"
 #include "main.h"
 #include "streambuf.h"
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 #include "output.h"
 #include "tag.h"
 
diff --git a/t/Makefile b/t/Makefile
index 02b312a0e..fa9e2f773 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -499,7 +499,7 @@ tests-preload.so:	tests-preload.c
 time-fudge-preload.so:	time-fudge-preload.c
 	$(CC) $(PRELOAD_CFLAGS) -o $@ -shared -fPIC $< $(PRELOAD_LIBS)
 
-spandsp_send_fax_pcm.c:	../lib/spandsp_logging.h
-spandsp_send_fax_t38.c:	../lib/spandsp_logging.h
-spandsp_recv_fax_t38.c:	../lib/spandsp_logging.h
-spandsp_recv_fax_pcm.c:	../lib/spandsp_logging.h
+spandsp_send_fax_pcm.c:	../lib/spandsp_logging.compat
+spandsp_send_fax_t38.c:	../lib/spandsp_logging.compat
+spandsp_recv_fax_t38.c:	../lib/spandsp_logging.compat
+spandsp_recv_fax_pcm.c:	../lib/spandsp_logging.compat
diff --git a/t/spandsp_recv_fax_pcm.c b/t/spandsp_recv_fax_pcm.c
index ab9b3f467..4aea970d0 100644
--- a/t/spandsp_recv_fax_pcm.c
+++ b/t/spandsp_recv_fax_pcm.c
@@ -13,7 +13,7 @@
 #include <spandsp/t30_api.h>
 #include <spandsp/fax.h>
 #include "compat.h"
-#include "spandsp_logging.h"
+#include "spandsp_logging.compat"
 
 
 
diff --git a/t/spandsp_recv_fax_t38.c b/t/spandsp_recv_fax_t38.c
index c11e04e96..f9fae8046 100644
--- a/t/spandsp_recv_fax_t38.c
+++ b/t/spandsp_recv_fax_t38.c
@@ -16,7 +16,7 @@
 #include <spandsp/t38_terminal.h>
 #include <spandsp/fax.h>
 #include "compat.h"
-#include "spandsp_logging.h"
+#include "spandsp_logging.compat"
 
 
 
diff --git a/t/spandsp_send_fax_pcm.c b/t/spandsp_send_fax_pcm.c
index 42703d415..6892bbd23 100644
--- a/t/spandsp_send_fax_pcm.c
+++ b/t/spandsp_send_fax_pcm.c
@@ -13,7 +13,7 @@
 #include <spandsp/t30_api.h>
 #include <spandsp/fax.h>
 #include "compat.h"
-#include "spandsp_logging.h"
+#include "spandsp_logging.compat"
 
 
 
diff --git a/t/spandsp_send_fax_t38.c b/t/spandsp_send_fax_t38.c
index cec221518..d2fb2f313 100644
--- a/t/spandsp_send_fax_t38.c
+++ b/t/spandsp_send_fax_t38.c
@@ -16,7 +16,7 @@
 #include <spandsp/t38_terminal.h>
 #include <spandsp/fax.h>
 #include "compat.h"
-#include "spandsp_logging.h"
+#include "spandsp_logging.compat"
 
 
 
diff --git a/t/test-amr-encode.c b/t/test-amr-encode.c
index 65deea688..cea698aa4 100644
--- a/t/test-amr-encode.c
+++ b/t/test-amr-encode.c
@@ -1,6 +1,6 @@
 #include "codeclib.h"
 #include "str.h"
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 #include "main.h"
 #include <assert.h>
 
diff --git a/t/test-resample.c b/t/test-resample.c
index 986f955ff..890cdb0f4 100644
--- a/t/test-resample.c
+++ b/t/test-resample.c
@@ -3,7 +3,7 @@
 #include <assert.h>
 #include "resample.h"
 #include "codeclib.h"
-#include "fix_frame_channel_layout.h"
+#include "fix_frame_channel_layout.compat"
 #include "main.h"
 
 struct rtpengine_config rtpe_config;
diff --git a/utils/build_test_wrapper b/utils/build_test_wrapper
index ea101b0b5..d9925d16d 100755
--- a/utils/build_test_wrapper
+++ b/utils/build_test_wrapper
@@ -1,6 +1,6 @@
 #!/bin/sh
 TARGET=$1
-ROOT=$(echo "$TARGET" | sed 's/\.h$//')
+ROOT=$(echo "$TARGET" | sed 's/\.compat$//')
 if test "$MAKE" = ""; then
 	# shellcheck disable=SC2209
 	MAKE=make