diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h
index 4f30b306e3..9c3624b422 100644
--- a/apps/codecs/lib/codeclib.h
+++ b/apps/codecs/lib/codeclib.h
@@ -76,8 +76,7 @@ unsigned udiv32_arm(unsigned a, unsigned b);
 
 /* TODO figure out if we really need to care about calculating
    av_log2(0) */
-#ifdef CPU_ARM
-#if ARM_ARCH > 5
+#if defined(CPU_ARM) && ARM_ARCH >= 6
 static inline unsigned int av_log2(uint32_t v)
 {
     unsigned int r;
@@ -87,12 +86,11 @@ static inline unsigned int av_log2(uint32_t v)
                  :[r] "=r" (r) : [v] "r" (v));
     return(r);
 }
-#elif ARM_ARCH > 4
+#elif defined(CPU_ARM) && ARM_ARCH >= 5
 static inline unsigned int av_log2(uint32_t v)
 {
     return v ? 31 - __builtin_clz(v) : 0;
 }
-#endif
 #else /* CPU_ARM */
 /* From libavutil/common.h */
 extern const uint8_t ff_log2_tab[256] ICONST_ATTR;
diff --git a/apps/codecs/libcook/cook.c b/apps/codecs/libcook/cook.c
index 74f695e627..3212c57abb 100644
--- a/apps/codecs/libcook/cook.c
+++ b/apps/codecs/libcook/cook.c
@@ -47,6 +47,7 @@
 #include <stdio.h>
 #include <limits.h>
 #include <string.h>
+#include "codeclib.h"
 
 #include "cook.h"
 #include "cookdata.h"
diff --git a/apps/codecs/libffmpegFLAC/shndec.c b/apps/codecs/libffmpegFLAC/shndec.c
index 1afcff6fbe..fb11f77bfa 100644
--- a/apps/codecs/libffmpegFLAC/shndec.c
+++ b/apps/codecs/libffmpegFLAC/shndec.c
@@ -27,6 +27,7 @@
 #include "bitstream.h"
 #include "golomb.h"
 #include "shndec.h"
+#include "codeclib.h"
 
 #define ULONGSIZE 2