diff --git a/daemon/call_interfaces.c b/daemon/call_interfaces.c
index 3166dbb68..4b68ef026 100644
--- a/daemon/call_interfaces.c
+++ b/daemon/call_interfaces.c
@@ -1048,6 +1048,7 @@ static void call_ng_codec_flags(struct sdp_ng_flags *out, str *key, bencode_item
 #endif
 	ilog(LOG_WARN, "Unknown 'codec' operation encountered: '" STR_FORMAT "'", STR_FMT(key));
 }
+#ifdef WITH_TRANSCODING
 static void call_ng_parse_block_mode(str *s, enum block_dtmf_mode *output) {
 	switch (__csh_lookup(s)) {
 		case CSH_LOOKUP("off"):
@@ -1077,6 +1078,7 @@ static void call_ng_parse_block_mode(str *s, enum block_dtmf_mode *output) {
 					STR_FMT(s));
 	}
 }
+#endif
 static void call_ng_main_flags(struct sdp_ng_flags *out, str *key, bencode_item_t *value) {
 	str s = STR_NULL;
 	bencode_item_t *it;
diff --git a/daemon/codec.c b/daemon/codec.c
index a13a9caf5..0efe4869d 100644
--- a/daemon/codec.c
+++ b/daemon/codec.c
@@ -17,7 +17,9 @@
 #include "timerthread.h"
 #include "log_funcs.h"
 #include "mqtt.h"
+#ifdef WITH_TRANSCODING
 #include "fix_frame_channel_layout.h"
+#endif
 
 
 
diff --git a/daemon/media_player.c b/daemon/media_player.c
index 2cb379db4..b1a8f1a86 100644
--- a/daemon/media_player.c
+++ b/daemon/media_player.c
@@ -16,7 +16,9 @@
 #include "log_funcs.h"
 #include "main.h"
 #include "rtcp.h"
+#ifdef WITH_TRANSCODING
 #include "fix_frame_channel_layout.h"
+#endif
 
 
 
diff --git a/lib/common.Makefile b/lib/common.Makefile
index 597764ddd..91fefdde3 100644
--- a/lib/common.Makefile
+++ b/lib/common.Makefile
@@ -34,10 +34,11 @@ $(DAEMONSRCS) $(HASHSRCS):	$(patsubst %,../daemon/%,$(DAEMONSRCS)) $(patsubst %,
 		--release="$(RTPENGINE_VERSION)" \
 		$< $@
 
-resample.c media_player.c codec.c codeclib.c mix.c:	fix_frame_channel_layout.h
+resample.c codeclib.c mix.c:	fix_frame_channel_layout.h
 
 ifeq ($(with_transcoding),yes)
 codec.c:	dtmf_rx_fillin.h
+media_player.c codec.c:	fix_frame_channel_layout.h
 endif
 
 t38.c:		spandsp_logging.h