diff --git a/lib/rbcodec/codecs/codecs.h b/lib/rbcodec/codecs/codecs.h
index aa9d2e8a0d..9dc4d322cc 100644
--- a/lib/rbcodec/codecs/codecs.h
+++ b/lib/rbcodec/codecs/codecs.h
@@ -60,6 +60,10 @@
 #ifdef ROCKBOX_HAS_LOGF
 #undef LOGF
 #define LOGF ci->logf
+#elifdef LOGF_ENABLE
+#include "logf.h"
+#undef LOGF
+#define LOGF logf
 #else
 #define LOGF(...)
 #endif
diff --git a/lib/rbcodec/codecs/libfaad/common.h b/lib/rbcodec/codecs/libfaad/common.h
index c5eaa0aa51..8f66a14ce0 100644
--- a/lib/rbcodec/codecs/libfaad/common.h
+++ b/lib/rbcodec/codecs/libfaad/common.h
@@ -35,22 +35,6 @@ extern "C" {
 #include "faad_config.h"
 #include "codeclib.h"
 
-extern struct codec_api* ci;
-
-#if defined(DEBUG) || defined(SIMULATOR)
-#undef DEBUGF
-#define DEBUGF ci->debugf
-#else
-#define DEBUGF(...)
-#endif
-
-#ifdef ROCKBOX_HAS_LOGF
-#undef LOGF
-#define LOGF ci->logf
-#else
-#define LOGF(...)
-#endif
-
 #if   (CONFIG_CPU == MCF5250)
 /* Enough IRAM but performance suffers with ICODE_ATTR. */
 #define IBSS_ATTR_FAAD_LARGE_IRAM   IBSS_ATTR