Add codecs to librbcodec.

Change-Id: Id7f4717d51ed02d67cb9f9cb3c0ada4a81843f97
Reviewed-on: http://gerrit.rockbox.org/137
Reviewed-by: Nils Wallménius <nils@rockbox.org>
Tested-by: Nils Wallménius <nils@rockbox.org>

757 files changed, 122 insertions, 122 deletions

diff --git a/android/android.make b/android/android.make
index 5ec9a68ca8..c0d72a7a05 100644
--- a/android/android.make
+++ b/android/android.make
@@ -124,7 +124,7 @@ $(BINLIB_DIR)/$(BINARY): $(BUILDDIR)/$(BINARY)
 $(BINLIB_DIR)/libmisc.so: $(BUILDDIR)/rockbox.zip
         $(call PRINTS,CP rockbox.zip)cp $^ $@
 
-$(BINLIB_DIR)/lib%.so: $(BUILDDIR)/apps/codecs/%.codec
+$(BINLIB_DIR)/lib%.so: $(RBCODEC_BLD)/codecs/%.codec
         $(call PRINTS,CP $(@F))cp $^ $@
 
 libs: $(DIRS) $(LIBS)
diff --git a/apps/codecs/lib/fixedpoint.c b/apps/codecs/lib/fixedpoint.c
deleted file mode 100644
index 352e246673..0000000000
--- a/apps/codecs/lib/fixedpoint.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../fixedpoint.c"
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make
index 27bc69f1ca..12344ae590 100644
--- a/apps/plugins/plugins.make
+++ b/apps/plugins/plugins.make
@@ -87,7 +87,7 @@ $(BUILDDIR)/credits.raw credits.raw: $(DOCSDIR)/CREDITS
         $(call PRINTS,Create credits.raw)perl $(APPSDIR)/plugins/credits.pl < $< > $(BUILDDIR)/$(@F)
 
 # special dependencies
-$(BUILDDIR)/apps/plugins/wav2wv.rock: $(BUILDDIR)/apps/codecs/libwavpack.a $(PLUGIN_LIBS)
+$(BUILDDIR)/apps/plugins/wav2wv.rock: $(RBCODEC_BLD)/codecs/libwavpack.a $(PLUGIN_LIBS)
 
 # Do not use '-ffunction-sections' and '-fdata-sections' when compiling sdl-sim
 ifeq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim)
diff --git a/firmware/target/hosted/ypr0/ypr0.make b/firmware/target/hosted/ypr0/ypr0.make
index d0f4cb7fe2..67ff326de0 100644
--- a/firmware/target/hosted/ypr0/ypr0.make
+++ b/firmware/target/hosted/ypr0/ypr0.make
@@ -16,7 +16,7 @@ SIMFLAGS += $(INCLUDES) $(DEFINES) -DHAVE_CONFIG_H $(GCCOPTS)
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS)
         $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -o $@ $(OBJ) \
                 -L$(BUILDDIR)/firmware -lfirmware \
-                -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                 -L$(BUILDDIR)/lib $(call a2lnk,$(CORE_LIBS)) \
                 $(LDOPTS) $(GLOBAL_LDOPTS) -Wl,-Map,$(BUILDDIR)/rockbox.map
 
diff --git a/apps/codecs/SOURCES b/lib/rbcodec/codecs/SOURCES
index db6e82c75f..db6e82c75f 100644
--- a/apps/codecs/SOURCES
+++ b/lib/rbcodec/codecs/SOURCES
diff --git a/apps/codecs/a52.c b/lib/rbcodec/codecs/a52.c
index cb6e66dd05..cb6e66dd05 100644
--- a/apps/codecs/a52.c
+++ b/lib/rbcodec/codecs/a52.c
diff --git a/apps/codecs/a52_rm.c b/lib/rbcodec/codecs/a52_rm.c
index 207c28272e..2db126f5b1 100644
--- a/apps/codecs/a52_rm.c
+++ b/lib/rbcodec/codecs/a52_rm.c
@@ -45,7 +45,7 @@ static void init_rm(RMContext *rmctx)
 /* used outside liba52 */
 static uint8_t buf[3840] IBSS_ATTR;
 
-/* The following two functions, a52_decode_data and output_audio are taken from apps/codecs/a52.c */
+/* The following two functions, a52_decode_data and output_audio are taken from a52.c */
 static inline void output_audio(sample_t *samples)
 {
     ci->yield();
diff --git a/apps/codecs/aac.c b/lib/rbcodec/codecs/aac.c
index 365dca804d..365dca804d 100644
--- a/apps/codecs/aac.c
+++ b/lib/rbcodec/codecs/aac.c
diff --git a/apps/codecs/adx.c b/lib/rbcodec/codecs/adx.c
index 0c67fc8d6e..0c67fc8d6e 100644
--- a/apps/codecs/adx.c
+++ b/lib/rbcodec/codecs/adx.c
diff --git a/apps/codecs/aiff.c b/lib/rbcodec/codecs/aiff.c
index 333bcd0455..333bcd0455 100644
--- a/apps/codecs/aiff.c
+++ b/lib/rbcodec/codecs/aiff.c
diff --git a/apps/codecs/aiff_enc.c b/lib/rbcodec/codecs/aiff_enc.c
index fc44196eb0..fc44196eb0 100644
--- a/apps/codecs/aiff_enc.c
+++ b/lib/rbcodec/codecs/aiff_enc.c
diff --git a/apps/codecs/alac.c b/lib/rbcodec/codecs/alac.c
index 144d796e5f..144d796e5f 100644
--- a/apps/codecs/alac.c
+++ b/lib/rbcodec/codecs/alac.c
diff --git a/apps/codecs/ape.c b/lib/rbcodec/codecs/ape.c
index ed6ea21685..ed6ea21685 100644
--- a/apps/codecs/ape.c
+++ b/lib/rbcodec/codecs/ape.c
diff --git a/apps/codecs/asap.c b/lib/rbcodec/codecs/asap.c
index 19b39a44c4..19b39a44c4 100644
--- a/apps/codecs/asap.c
+++ b/lib/rbcodec/codecs/asap.c
diff --git a/apps/codecs/atrac3_oma.c b/lib/rbcodec/codecs/atrac3_oma.c
index 50f7c8f163..50f7c8f163 100644
--- a/apps/codecs/atrac3_oma.c
+++ b/lib/rbcodec/codecs/atrac3_oma.c
diff --git a/apps/codecs/atrac3_rm.c b/lib/rbcodec/codecs/atrac3_rm.c
index 997507425e..997507425e 100644
--- a/apps/codecs/atrac3_rm.c
+++ b/lib/rbcodec/codecs/atrac3_rm.c
diff --git a/apps/codecs/au.c b/lib/rbcodec/codecs/au.c
index cb75c7423d..cb75c7423d 100644
--- a/apps/codecs/au.c
+++ b/lib/rbcodec/codecs/au.c
diff --git a/apps/codecs/ay.c b/lib/rbcodec/codecs/ay.c
index b11ad84294..b11ad84294 100644
--- a/apps/codecs/ay.c
+++ b/lib/rbcodec/codecs/ay.c
diff --git a/apps/codecs/codec_crt0.c b/lib/rbcodec/codecs/codec_crt0.c
index e3c3321e54..e3c3321e54 100644
--- a/apps/codecs/codec_crt0.c
+++ b/lib/rbcodec/codecs/codec_crt0.c
diff --git a/apps/codecs.h b/lib/rbcodec/codecs/codecs.h
index 1334953b82..bad8cdd469 100644
--- a/apps/codecs.h
+++ b/lib/rbcodec/codecs/codecs.h
@@ -22,7 +22,7 @@
 #define _CODECS_H_
 
 /* instruct simulator code to not redefine any symbols when compiling codecs.
-   (the CODEC macro is defined in apps/codecs/Makefile) */
+   (the CODEC macro is defined in codecs.make) */
 #ifdef CODEC
 #define NO_REDEFINES_PLEASE
 #endif
diff --git a/apps/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
index eac3089260..919aef2024 100644
--- a/apps/codecs/codecs.make
+++ b/lib/rbcodec/codecs/codecs.make
@@ -7,54 +7,54 @@
 # $Id$
 #
 
-CODECDIR = $(BUILDDIR)/apps/codecs
-CODECS_SRC := $(call preprocess, $(APPSDIR)/codecs/SOURCES)
+CODECDIR = $(RBCODEC_BLD)/codecs
+CODECS_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/SOURCES)
 OTHER_SRC += $(CODECS_SRC)
 
 CODECS := $(CODECS_SRC:.c=.codec)
-CODECS := $(subst $(ROOTDIR),$(BUILDDIR),$(CODECS))
+CODECS := $(subst $(RBCODECLIB_DIR),$(RBCODEC_BLD),$(CODECS))
 
 # the codec helper library
-include $(APPSDIR)/codecs/lib/libcodec.make
-OTHER_INC += -I$(APPSDIR)/codecs/lib
+include $(RBCODECLIB_DIR)/codecs/lib/libcodec.make
+OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib
 
 # extra libraries
 CODEC_LIBS := $(EXTRA_LIBS) $(CODECLIB)
 
 # the codec libraries
-include $(APPSDIR)/codecs/demac/libdemac.make
-include $(APPSDIR)/codecs/liba52/liba52.make
-include $(APPSDIR)/codecs/libalac/libalac.make
-include $(APPSDIR)/codecs/libasap/libasap.make
-include $(APPSDIR)/codecs/libasf/libasf.make
-include $(APPSDIR)/codecs/libfaad/libfaad.make
-include $(APPSDIR)/codecs/libffmpegFLAC/libffmpegFLAC.make
-include $(APPSDIR)/codecs/libm4a/libm4a.make
-include $(APPSDIR)/codecs/libmad/libmad.make
-include $(APPSDIR)/codecs/libmusepack/libmusepack.make
-include $(APPSDIR)/codecs/libspc/libspc.make
-include $(APPSDIR)/codecs/libspeex/libspeex.make
-include $(APPSDIR)/codecs/libtremor/libtremor.make
-include $(APPSDIR)/codecs/libwavpack/libwavpack.make
-include $(APPSDIR)/codecs/libwma/libwma.make
-include $(APPSDIR)/codecs/libwmapro/libwmapro.make
-include $(APPSDIR)/codecs/libcook/libcook.make
-include $(APPSDIR)/codecs/librm/librm.make
-include $(APPSDIR)/codecs/libatrac/libatrac.make
-include $(APPSDIR)/codecs/libpcm/libpcm.make
-include $(APPSDIR)/codecs/libtta/libtta.make
-include $(APPSDIR)/codecs/libgme/libay.make
-include $(APPSDIR)/codecs/libgme/libgbs.make
-include $(APPSDIR)/codecs/libgme/libhes.make
-include $(APPSDIR)/codecs/libgme/libnsf.make
-include $(APPSDIR)/codecs/libgme/libsgc.make
-include $(APPSDIR)/codecs/libgme/libvgm.make
-include $(APPSDIR)/codecs/libgme/libkss.make
-include $(APPSDIR)/codecs/libgme/libemu2413.make
+include $(RBCODECLIB_DIR)/codecs/demac/libdemac.make
+include $(RBCODECLIB_DIR)/codecs/liba52/liba52.make
+include $(RBCODECLIB_DIR)/codecs/libalac/libalac.make
+include $(RBCODECLIB_DIR)/codecs/libasap/libasap.make
+include $(RBCODECLIB_DIR)/codecs/libasf/libasf.make
+include $(RBCODECLIB_DIR)/codecs/libfaad/libfaad.make
+include $(RBCODECLIB_DIR)/codecs/libffmpegFLAC/libffmpegFLAC.make
+include $(RBCODECLIB_DIR)/codecs/libm4a/libm4a.make
+include $(RBCODECLIB_DIR)/codecs/libmad/libmad.make
+include $(RBCODECLIB_DIR)/codecs/libmusepack/libmusepack.make
+include $(RBCODECLIB_DIR)/codecs/libspc/libspc.make
+include $(RBCODECLIB_DIR)/codecs/libspeex/libspeex.make
+include $(RBCODECLIB_DIR)/codecs/libtremor/libtremor.make
+include $(RBCODECLIB_DIR)/codecs/libwavpack/libwavpack.make
+include $(RBCODECLIB_DIR)/codecs/libwma/libwma.make
+include $(RBCODECLIB_DIR)/codecs/libwmapro/libwmapro.make
+include $(RBCODECLIB_DIR)/codecs/libcook/libcook.make
+include $(RBCODECLIB_DIR)/codecs/librm/librm.make
+include $(RBCODECLIB_DIR)/codecs/libatrac/libatrac.make
+include $(RBCODECLIB_DIR)/codecs/libpcm/libpcm.make
+include $(RBCODECLIB_DIR)/codecs/libtta/libtta.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libay.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libgbs.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libhes.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libnsf.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libsgc.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libvgm.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libkss.make
+include $(RBCODECLIB_DIR)/codecs/libgme/libemu2413.make
 
 # compile flags for codecs
-CODECFLAGS = $(CFLAGS) -fstrict-aliasing -I$(APPSDIR)/codecs \
-        -I$(APPSDIR)/codecs/lib -DCODEC
+CODECFLAGS = $(CFLAGS) $(RBCODEC_CFLAGS) -fstrict-aliasing \
+                         -I$(RBCODECLIB_DIR)/codecs -I$(RBCODECLIB_DIR)/codecs/lib -DCODEC
 
 # set CODECFLAGS per codec lib, since gcc takes the last -Ox and the last
 # in a -ffoo -fno-foo pair, there is no need to filter them out
@@ -172,13 +172,13 @@ $(CODECDIR)/kss.codec : $(CODECDIR)/libkss.a $(CODECDIR)/libemu2413.a
 $(CODECS): $(CODEC_LIBS) # this must be last in codec dependency list
 
 # pattern rule for compiling codecs
-$(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.c
+$(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.c
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
                 -I$(dir $<) $(CODECFLAGS) -c $< -o $@
 
 # pattern rule for compiling codecs
-$(CODECDIR)/%.o: $(ROOTDIR)/apps/codecs/%.S
+$(CODECDIR)/%.o: $(RBCODECLIB_DIR)/codecs/%.S
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
                 -I$(dir $<) $(CODECFLAGS) $(ASMFLAGS) -c $< -o $@
diff --git a/apps/codecs/cook.c b/lib/rbcodec/codecs/cook.c
index 55188aad36..55188aad36 100644
--- a/apps/codecs/cook.c
+++ b/lib/rbcodec/codecs/cook.c
diff --git a/apps/codecs/demac/COPYING b/lib/rbcodec/codecs/demac/COPYING
index d511905c16..d511905c16 100644
--- a/apps/codecs/demac/COPYING
+++ b/lib/rbcodec/codecs/demac/COPYING
diff --git a/apps/codecs/demac/Makefile b/lib/rbcodec/codecs/demac/Makefile
index 7843be6e49..7843be6e49 100644
--- a/apps/codecs/demac/Makefile
+++ b/lib/rbcodec/codecs/demac/Makefile
diff --git a/apps/codecs/demac/README b/lib/rbcodec/codecs/demac/README
index 2fcdd95edf..73a1c22485 100644
--- a/apps/codecs/demac/README
+++ b/lib/rbcodec/codecs/demac/README
@@ -41,14 +41,14 @@ demac/libdemac/*.[ch] - The main libdemac code
 Latest Version
 
 The latest version of demac and libdemac can always be found in the
-"apps/codecs/demac/" directory in the Rockbox source.  You can check
+"lib/rbcodec/codecs/demac/" directory in the Rockbox source.  You can check
 this out from svn with the command:
 
-svn co svn://svn.rockbox.org/rockbox/trunk/apps/codecs/demac demac
+svn co svn://svn.rockbox.org/rockbox/trunk/lib/rbcodec/codecs/demac demac
 
 Or browse the source code online here:
 
-http://svn.rockbox.org/viewvc.cgi/trunk/apps/codecs/demac
+http://svn.rockbox.org/viewvc.cgi/trunk/lib/rbcodec/codecs/demac
 
 
 
diff --git a/apps/codecs/demac/demac.c b/lib/rbcodec/codecs/demac/demac.c
index 3e97fff2c9..3e97fff2c9 100644
--- a/apps/codecs/demac/demac.c
+++ b/lib/rbcodec/codecs/demac/demac.c
diff --git a/apps/codecs/demac/libdemac.make b/lib/rbcodec/codecs/demac/libdemac.make
index 62ad53dfcc..6f64b2ff10 100644
--- a/apps/codecs/demac/libdemac.make
+++ b/lib/rbcodec/codecs/demac/libdemac.make
@@ -9,11 +9,11 @@
 
 # libdemac
 DEMACLIB := $(CODECDIR)/libdemac.a
-DEMACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/demac/libdemac/SOURCES)
+DEMACLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/demac/libdemac/SOURCES)
 DEMACLIB_OBJ := $(call c2obj, $(DEMACLIB_SRC))
 OTHER_SRC += $(DEMACLIB_SRC)
 ifeq ($(ARCH),arch_arm)
-OTHER_SRC += $(APPSDIR)/codecs/demac/libdemac/udiv32_arm-pre.S
+OTHER_SRC += $(RBCODECLIB_DIR)/codecs/demac/libdemac/udiv32_arm-pre.S
 endif
 DEMACLIB_PRE := $(subst .a,-pre.a,$(DEMACLIB))
 DEMACLIB_OBJ_PRE := $(subst udiv32_arm.o,udiv32_arm-pre.o,$(DEMACLIB_OBJ))
diff --git a/apps/codecs/demac/libdemac/SOURCES b/lib/rbcodec/codecs/demac/libdemac/SOURCES
index 018f35a73c..018f35a73c 100644
--- a/apps/codecs/demac/libdemac/SOURCES
+++ b/lib/rbcodec/codecs/demac/libdemac/SOURCES
diff --git a/apps/codecs/demac/libdemac/crc.c b/lib/rbcodec/codecs/demac/libdemac/crc.c
index fa3ea89d7e..fa3ea89d7e 100644
--- a/apps/codecs/demac/libdemac/crc.c
+++ b/lib/rbcodec/codecs/demac/libdemac/crc.c
diff --git a/apps/codecs/demac/libdemac/decoder.c b/lib/rbcodec/codecs/demac/libdemac/decoder.c
index b0339a75d9..b0339a75d9 100644
--- a/apps/codecs/demac/libdemac/decoder.c
+++ b/lib/rbcodec/codecs/demac/libdemac/decoder.c
diff --git a/apps/codecs/demac/libdemac/decoder.h b/lib/rbcodec/codecs/demac/libdemac/decoder.h
index aeac569509..aeac569509 100644
--- a/apps/codecs/demac/libdemac/decoder.h
+++ b/lib/rbcodec/codecs/demac/libdemac/decoder.h
diff --git a/apps/codecs/demac/libdemac/demac.h b/lib/rbcodec/codecs/demac/libdemac/demac.h
index 696b2aba73..696b2aba73 100644
--- a/apps/codecs/demac/libdemac/demac.h
+++ b/lib/rbcodec/codecs/demac/libdemac/demac.h
diff --git a/apps/codecs/demac/libdemac/demac_config.h b/lib/rbcodec/codecs/demac/libdemac/demac_config.h
index fa4f008036..fa4f008036 100644
--- a/apps/codecs/demac/libdemac/demac_config.h
+++ b/lib/rbcodec/codecs/demac/libdemac/demac_config.h
diff --git a/apps/codecs/demac/libdemac/entropy.c b/lib/rbcodec/codecs/demac/libdemac/entropy.c
index 1cef979808..1cef979808 100644
--- a/apps/codecs/demac/libdemac/entropy.c
+++ b/lib/rbcodec/codecs/demac/libdemac/entropy.c
diff --git a/apps/codecs/demac/libdemac/entropy.h b/lib/rbcodec/codecs/demac/libdemac/entropy.h
index fac2a44d99..fac2a44d99 100644
--- a/apps/codecs/demac/libdemac/entropy.h
+++ b/lib/rbcodec/codecs/demac/libdemac/entropy.h
diff --git a/apps/codecs/demac/libdemac/filter.c b/lib/rbcodec/codecs/demac/libdemac/filter.c
index 903885cf00..903885cf00 100644
--- a/apps/codecs/demac/libdemac/filter.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter.c
diff --git a/apps/codecs/demac/libdemac/filter.h b/lib/rbcodec/codecs/demac/libdemac/filter.h
index 609ea12496..609ea12496 100644
--- a/apps/codecs/demac/libdemac/filter.h
+++ b/lib/rbcodec/codecs/demac/libdemac/filter.h
diff --git a/apps/codecs/demac/libdemac/filter_1280_15.c b/lib/rbcodec/codecs/demac/libdemac/filter_1280_15.c
index f2301fb02a..f2301fb02a 100644
--- a/apps/codecs/demac/libdemac/filter_1280_15.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_1280_15.c
diff --git a/apps/codecs/demac/libdemac/filter_16_11.c b/lib/rbcodec/codecs/demac/libdemac/filter_16_11.c
index 94c56e247f..94c56e247f 100644
--- a/apps/codecs/demac/libdemac/filter_16_11.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_16_11.c
diff --git a/apps/codecs/demac/libdemac/filter_256_13.c b/lib/rbcodec/codecs/demac/libdemac/filter_256_13.c
index 9e4b9fcb13..9e4b9fcb13 100644
--- a/apps/codecs/demac/libdemac/filter_256_13.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_256_13.c
diff --git a/apps/codecs/demac/libdemac/filter_32_10.c b/lib/rbcodec/codecs/demac/libdemac/filter_32_10.c
index 5ec85089db..5ec85089db 100644
--- a/apps/codecs/demac/libdemac/filter_32_10.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_32_10.c
diff --git a/apps/codecs/demac/libdemac/filter_64_11.c b/lib/rbcodec/codecs/demac/libdemac/filter_64_11.c
index cd74fa5f6b..cd74fa5f6b 100644
--- a/apps/codecs/demac/libdemac/filter_64_11.c
+++ b/lib/rbcodec/codecs/demac/libdemac/filter_64_11.c
diff --git a/apps/codecs/demac/libdemac/parser.c b/lib/rbcodec/codecs/demac/libdemac/parser.c
index 2af4a292b8..2af4a292b8 100644
--- a/apps/codecs/demac/libdemac/parser.c
+++ b/lib/rbcodec/codecs/demac/libdemac/parser.c
diff --git a/apps/codecs/demac/libdemac/parser.h b/lib/rbcodec/codecs/demac/libdemac/parser.h
index 6f07deac12..6f07deac12 100644
--- a/apps/codecs/demac/libdemac/parser.h
+++ b/lib/rbcodec/codecs/demac/libdemac/parser.h
diff --git a/apps/codecs/demac/libdemac/predictor-arm.S b/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S
index 92a78ed9b4..92a78ed9b4 100644
--- a/apps/codecs/demac/libdemac/predictor-arm.S
+++ b/lib/rbcodec/codecs/demac/libdemac/predictor-arm.S
diff --git a/apps/codecs/demac/libdemac/predictor-cf.S b/lib/rbcodec/codecs/demac/libdemac/predictor-cf.S
index fc1d901a59..fc1d901a59 100644
--- a/apps/codecs/demac/libdemac/predictor-cf.S
+++ b/lib/rbcodec/codecs/demac/libdemac/predictor-cf.S
diff --git a/apps/codecs/demac/libdemac/predictor.c b/lib/rbcodec/codecs/demac/libdemac/predictor.c
index 45912dddbd..45912dddbd 100644
--- a/apps/codecs/demac/libdemac/predictor.c
+++ b/lib/rbcodec/codecs/demac/libdemac/predictor.c
diff --git a/apps/codecs/demac/libdemac/predictor.h b/lib/rbcodec/codecs/demac/libdemac/predictor.h
index 6a0a81983b..6a0a81983b 100644
--- a/apps/codecs/demac/libdemac/predictor.h
+++ b/lib/rbcodec/codecs/demac/libdemac/predictor.h
diff --git a/apps/codecs/demac/libdemac/udiv32_arm-pre.S b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm-pre.S
index 459cab8240..459cab8240 100644
--- a/apps/codecs/demac/libdemac/udiv32_arm-pre.S
+++ b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm-pre.S
diff --git a/apps/codecs/demac/libdemac/udiv32_arm.S b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
index 10c0731db1..7b851659bd 100644
--- a/apps/codecs/demac/libdemac/udiv32_arm.S
+++ b/lib/rbcodec/codecs/demac/libdemac/udiv32_arm.S
@@ -33,7 +33,7 @@
    link of the APE codec, stating the amount of IRAM remaining for use by the
    reciprocal lookup table. */
 #if !defined(APE_PRE) && defined(USE_IRAM) && ARM_ARCH < 5
-#include "apps/codecs/ape_free_iram.h"
+#include "lib/rbcodec/codecs/ape_free_iram.h"
 #endif
 
 /* Codecs should not normally do this, but we need to check a macro, and
diff --git a/apps/codecs/demac/libdemac/vector_math16_armv5te.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv5te.h
index ae7427c137..ae7427c137 100644
--- a/apps/codecs/demac/libdemac/vector_math16_armv5te.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv5te.h
diff --git a/apps/codecs/demac/libdemac/vector_math16_armv6.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv6.h
index 8d27331b62..8d27331b62 100644
--- a/apps/codecs/demac/libdemac/vector_math16_armv6.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv6.h
diff --git a/apps/codecs/demac/libdemac/vector_math16_armv7.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv7.h
index 84afda3e5d..84afda3e5d 100644
--- a/apps/codecs/demac/libdemac/vector_math16_armv7.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_armv7.h
diff --git a/apps/codecs/demac/libdemac/vector_math16_cf.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_cf.h
index 4d77d3be31..4d77d3be31 100644
--- a/apps/codecs/demac/libdemac/vector_math16_cf.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_cf.h
diff --git a/apps/codecs/demac/libdemac/vector_math16_mmx.h b/lib/rbcodec/codecs/demac/libdemac/vector_math16_mmx.h
index 2177fe88ea..2177fe88ea 100644
--- a/apps/codecs/demac/libdemac/vector_math16_mmx.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math16_mmx.h
diff --git a/apps/codecs/demac/libdemac/vector_math32_armv4.h b/lib/rbcodec/codecs/demac/libdemac/vector_math32_armv4.h
index d6bb9b0d9c..d6bb9b0d9c 100644
--- a/apps/codecs/demac/libdemac/vector_math32_armv4.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math32_armv4.h
diff --git a/apps/codecs/demac/libdemac/vector_math_generic.h b/lib/rbcodec/codecs/demac/libdemac/vector_math_generic.h
index 00bf07a007..00bf07a007 100644
--- a/apps/codecs/demac/libdemac/vector_math_generic.h
+++ b/lib/rbcodec/codecs/demac/libdemac/vector_math_generic.h
diff --git a/apps/codecs/demac/wavwrite.c b/lib/rbcodec/codecs/demac/wavwrite.c
index 71d2b7bb97..71d2b7bb97 100644
--- a/apps/codecs/demac/wavwrite.c
+++ b/lib/rbcodec/codecs/demac/wavwrite.c
diff --git a/apps/codecs/demac/wavwrite.h b/lib/rbcodec/codecs/demac/wavwrite.h
index a124353229..a124353229 100644
--- a/apps/codecs/demac/wavwrite.h
+++ b/lib/rbcodec/codecs/demac/wavwrite.h
diff --git a/apps/codecs/flac.c b/lib/rbcodec/codecs/flac.c
index e10403819c..e10403819c 100644
--- a/apps/codecs/flac.c
+++ b/lib/rbcodec/codecs/flac.c
diff --git a/apps/codecs/gbs.c b/lib/rbcodec/codecs/gbs.c
index def05ed351..def05ed351 100644
--- a/apps/codecs/gbs.c
+++ b/lib/rbcodec/codecs/gbs.c
diff --git a/apps/codecs/hes.c b/lib/rbcodec/codecs/hes.c
index 849fd88f12..849fd88f12 100644
--- a/apps/codecs/hes.c
+++ b/lib/rbcodec/codecs/hes.c
diff --git a/apps/codecs/kss.c b/lib/rbcodec/codecs/kss.c
index 92efcd4e5f..92efcd4e5f 100644
--- a/apps/codecs/kss.c
+++ b/lib/rbcodec/codecs/kss.c
diff --git a/apps/codecs/lib/SOURCES b/lib/rbcodec/codecs/lib/SOURCES
index 257dcb5838..257dcb5838 100644
--- a/apps/codecs/lib/SOURCES
+++ b/lib/rbcodec/codecs/lib/SOURCES
diff --git a/apps/codecs/lib/asm_arm.h b/lib/rbcodec/codecs/lib/asm_arm.h
index 8e5d0e68df..8e5d0e68df 100644
--- a/apps/codecs/lib/asm_arm.h
+++ b/lib/rbcodec/codecs/lib/asm_arm.h
diff --git a/apps/codecs/lib/asm_mcf5249.h b/lib/rbcodec/codecs/lib/asm_mcf5249.h
index 841c413a94..841c413a94 100644
--- a/apps/codecs/lib/asm_mcf5249.h
+++ b/lib/rbcodec/codecs/lib/asm_mcf5249.h
diff --git a/apps/codecs/lib/codeclib.c b/lib/rbcodec/codecs/lib/codeclib.c
index 36f4279941..36f4279941 100644
--- a/apps/codecs/lib/codeclib.c
+++ b/lib/rbcodec/codecs/lib/codeclib.c
diff --git a/apps/codecs/lib/codeclib.h b/lib/rbcodec/codecs/lib/codeclib.h
index d0f985b8e1..d0f985b8e1 100644
--- a/apps/codecs/lib/codeclib.h
+++ b/lib/rbcodec/codecs/lib/codeclib.h
diff --git a/apps/codecs/lib/codeclib_misc.h b/lib/rbcodec/codecs/lib/codeclib_misc.h
index 8ebe22e37b..8ebe22e37b 100644
--- a/apps/codecs/lib/codeclib_misc.h
+++ b/lib/rbcodec/codecs/lib/codeclib_misc.h
diff --git a/apps/codecs/lib/ffmpeg_bitstream.c b/lib/rbcodec/codecs/lib/ffmpeg_bitstream.c
index e16df8dcce..e16df8dcce 100644
--- a/apps/codecs/lib/ffmpeg_bitstream.c
+++ b/lib/rbcodec/codecs/lib/ffmpeg_bitstream.c
diff --git a/apps/codecs/lib/ffmpeg_bswap.h b/lib/rbcodec/codecs/lib/ffmpeg_bswap.h
index 24a2aab7ea..24a2aab7ea 100644
--- a/apps/codecs/lib/ffmpeg_bswap.h
+++ b/lib/rbcodec/codecs/lib/ffmpeg_bswap.h
diff --git a/apps/codecs/lib/ffmpeg_get_bits.h b/lib/rbcodec/codecs/lib/ffmpeg_get_bits.h
index 04eda021a7..04eda021a7 100644
--- a/apps/codecs/lib/ffmpeg_get_bits.h
+++ b/lib/rbcodec/codecs/lib/ffmpeg_get_bits.h
diff --git a/apps/codecs/lib/ffmpeg_intreadwrite.h b/lib/rbcodec/codecs/lib/ffmpeg_intreadwrite.h
index 24f03292e8..24f03292e8 100644
--- a/apps/codecs/lib/ffmpeg_intreadwrite.h
+++ b/lib/rbcodec/codecs/lib/ffmpeg_intreadwrite.h
diff --git a/apps/codecs/lib/ffmpeg_put_bits.h b/lib/rbcodec/codecs/lib/ffmpeg_put_bits.h
index 38db55fe18..38db55fe18 100644
--- a/apps/codecs/lib/ffmpeg_put_bits.h
+++ b/lib/rbcodec/codecs/lib/ffmpeg_put_bits.h
diff --git a/apps/codecs/lib/fft-ffmpeg.c b/lib/rbcodec/codecs/lib/fft-ffmpeg.c
index 807f606038..807f606038 100644
--- a/apps/codecs/lib/fft-ffmpeg.c
+++ b/lib/rbcodec/codecs/lib/fft-ffmpeg.c
diff --git a/apps/codecs/lib/fft-ffmpeg_arm.h b/lib/rbcodec/codecs/lib/fft-ffmpeg_arm.h
index 073ad8ee46..073ad8ee46 100644
--- a/apps/codecs/lib/fft-ffmpeg_arm.h
+++ b/lib/rbcodec/codecs/lib/fft-ffmpeg_arm.h
diff --git a/apps/codecs/lib/fft-ffmpeg_cf.h b/lib/rbcodec/codecs/lib/fft-ffmpeg_cf.h
index a29464a23d..a29464a23d 100644
--- a/apps/codecs/lib/fft-ffmpeg_cf.h
+++ b/lib/rbcodec/codecs/lib/fft-ffmpeg_cf.h
diff --git a/apps/codecs/lib/fft.h b/lib/rbcodec/codecs/lib/fft.h
index 302a3b3996..302a3b3996 100644
--- a/apps/codecs/lib/fft.h
+++ b/lib/rbcodec/codecs/lib/fft.h
diff --git a/lib/rbcodec/codecs/lib/fixedpoint.c b/lib/rbcodec/codecs/lib/fixedpoint.c
new file mode 100644
index 0000000000..a66dcb1270
--- /dev/null
+++ b/lib/rbcodec/codecs/lib/fixedpoint.c
@@ -0,0 +1 @@
+#include "../../../apps/fixedpoint.c"
diff --git a/apps/codecs/lib/fixedpoint.h b/lib/rbcodec/codecs/lib/fixedpoint.h
index 1cbd1573bb..1cbd1573bb 100644
--- a/apps/codecs/lib/fixedpoint.h
+++ b/lib/rbcodec/codecs/lib/fixedpoint.h
diff --git a/apps/codecs/lib/libcodec.make b/lib/rbcodec/codecs/lib/libcodec.make
index 7aef72f2b1..4931d36b74 100644
--- a/apps/codecs/lib/libcodec.make
+++ b/lib/rbcodec/codecs/lib/libcodec.make
@@ -8,7 +8,7 @@
 #
 
 CODECLIB := $(CODECDIR)/libcodec.a
-CODECLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/lib/SOURCES)
+CODECLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/lib/SOURCES)
 CODECLIB_OBJ := $(call c2obj, $(CODECLIB_SRC))
 OTHER_SRC += $(CODECLIB_SRC)
 
@@ -31,7 +31,7 @@ ifneq ($(findstring sdl-sim, $(APP_TYPE)), sdl-sim)
     CODECLIBFLAGS += -ffunction-sections
 endif
 
-$(CODECDIR)/lib/%.o: $(ROOTDIR)/apps/codecs/lib/%.c
+$(CODECDIR)/lib/%.o: $(RBCODECLIB_DIR)/codecs/lib/%.c
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) \
                 -I$(dir $<) $(CODECLIBFLAGS) -c $< -o $@
diff --git a/apps/codecs/lib/mdct.c b/lib/rbcodec/codecs/lib/mdct.c
index 777aec4a55..777aec4a55 100644
--- a/apps/codecs/lib/mdct.c
+++ b/lib/rbcodec/codecs/lib/mdct.c
diff --git a/apps/codecs/lib/mdct.h b/lib/rbcodec/codecs/lib/mdct.h
index 48d1c25a55..48d1c25a55 100644
--- a/apps/codecs/lib/mdct.h
+++ b/lib/rbcodec/codecs/lib/mdct.h
diff --git a/apps/codecs/lib/mdct_lookup.c b/lib/rbcodec/codecs/lib/mdct_lookup.c
index a8ca748206..a8ca748206 100644
--- a/apps/codecs/lib/mdct_lookup.c
+++ b/lib/rbcodec/codecs/lib/mdct_lookup.c
diff --git a/apps/codecs/lib/mdct_lookup.h b/lib/rbcodec/codecs/lib/mdct_lookup.h
index 909b95ddbb..909b95ddbb 100644
--- a/apps/codecs/lib/mdct_lookup.h
+++ b/lib/rbcodec/codecs/lib/mdct_lookup.h
diff --git a/apps/codecs/lib/osx.dummy.c b/lib/rbcodec/codecs/lib/osx.dummy.c
index e69de29bb2..e69de29bb2 100644
--- a/apps/codecs/lib/osx.dummy.c
+++ b/lib/rbcodec/codecs/lib/osx.dummy.c
diff --git a/apps/codecs/liba52/AUTHORS b/lib/rbcodec/codecs/liba52/AUTHORS
index a6bd695228..a6bd695228 100644
--- a/apps/codecs/liba52/AUTHORS
+++ b/lib/rbcodec/codecs/liba52/AUTHORS
diff --git a/apps/codecs/liba52/COPYING b/lib/rbcodec/codecs/liba52/COPYING
index 60549be514..60549be514 100644
--- a/apps/codecs/liba52/COPYING
+++ b/lib/rbcodec/codecs/liba52/COPYING
diff --git a/apps/codecs/liba52/ChangeLog b/lib/rbcodec/codecs/liba52/ChangeLog
index 4adac364eb..4adac364eb 100644
--- a/apps/codecs/liba52/ChangeLog
+++ b/lib/rbcodec/codecs/liba52/ChangeLog
diff --git a/apps/codecs/liba52/HISTORY b/lib/rbcodec/codecs/liba52/HISTORY
index c2b9d02ee1..c2b9d02ee1 100644
--- a/apps/codecs/liba52/HISTORY
+++ b/lib/rbcodec/codecs/liba52/HISTORY
diff --git a/apps/codecs/liba52/INSTALL b/lib/rbcodec/codecs/liba52/INSTALL
index 30a07fecff..30a07fecff 100644
--- a/apps/codecs/liba52/INSTALL
+++ b/lib/rbcodec/codecs/liba52/INSTALL
diff --git a/apps/codecs/liba52/NEWS b/lib/rbcodec/codecs/liba52/NEWS
index 4bee9cac8d..4bee9cac8d 100644
--- a/apps/codecs/liba52/NEWS
+++ b/lib/rbcodec/codecs/liba52/NEWS
diff --git a/apps/codecs/liba52/README b/lib/rbcodec/codecs/liba52/README
index eb6c64df84..eb6c64df84 100644
--- a/apps/codecs/liba52/README
+++ b/lib/rbcodec/codecs/liba52/README
diff --git a/apps/codecs/liba52/README.rockbox b/lib/rbcodec/codecs/liba52/README.rockbox
index 79768c5d72..79768c5d72 100644
--- a/apps/codecs/liba52/README.rockbox
+++ b/lib/rbcodec/codecs/liba52/README.rockbox
diff --git a/apps/codecs/liba52/SOURCES b/lib/rbcodec/codecs/liba52/SOURCES
index 733b95e8a6..733b95e8a6 100644
--- a/apps/codecs/liba52/SOURCES
+++ b/lib/rbcodec/codecs/liba52/SOURCES
diff --git a/apps/codecs/liba52/TODO b/lib/rbcodec/codecs/liba52/TODO
index dc5fb84203..dc5fb84203 100644
--- a/apps/codecs/liba52/TODO
+++ b/lib/rbcodec/codecs/liba52/TODO
diff --git a/apps/codecs/liba52/a52.h b/lib/rbcodec/codecs/liba52/a52.h
index e852e8d6bb..e852e8d6bb 100644
--- a/apps/codecs/liba52/a52.h
+++ b/lib/rbcodec/codecs/liba52/a52.h
diff --git a/apps/codecs/liba52/a52_internal.h b/lib/rbcodec/codecs/liba52/a52_internal.h
index 3b3d21c9a3..3b3d21c9a3 100644
--- a/apps/codecs/liba52/a52_internal.h
+++ b/lib/rbcodec/codecs/liba52/a52_internal.h
diff --git a/apps/codecs/liba52/attributes.h b/lib/rbcodec/codecs/liba52/attributes.h
index 988abc0311..988abc0311 100644
--- a/apps/codecs/liba52/attributes.h
+++ b/lib/rbcodec/codecs/liba52/attributes.h
diff --git a/apps/codecs/liba52/bit_allocate.c b/lib/rbcodec/codecs/liba52/bit_allocate.c
index aaac245913..aaac245913 100644
--- a/apps/codecs/liba52/bit_allocate.c
+++ b/lib/rbcodec/codecs/liba52/bit_allocate.c
diff --git a/apps/codecs/liba52/bitstream.c b/lib/rbcodec/codecs/liba52/bitstream.c
index 155368f1ed..155368f1ed 100644
--- a/apps/codecs/liba52/bitstream.c
+++ b/lib/rbcodec/codecs/liba52/bitstream.c
diff --git a/apps/codecs/liba52/bitstream.h b/lib/rbcodec/codecs/liba52/bitstream.h
index 56de1571b7..56de1571b7 100644
--- a/apps/codecs/liba52/bitstream.h
+++ b/lib/rbcodec/codecs/liba52/bitstream.h
diff --git a/apps/codecs/liba52/config-a52.h b/lib/rbcodec/codecs/liba52/config-a52.h
index ade7ecf9b8..ade7ecf9b8 100644
--- a/apps/codecs/liba52/config-a52.h
+++ b/lib/rbcodec/codecs/liba52/config-a52.h
diff --git a/apps/codecs/liba52/downmix.c b/lib/rbcodec/codecs/liba52/downmix.c
index dd2867cb92..dd2867cb92 100644
--- a/apps/codecs/liba52/downmix.c
+++ b/lib/rbcodec/codecs/liba52/downmix.c
diff --git a/apps/codecs/liba52/imdct.c b/lib/rbcodec/codecs/liba52/imdct.c
index e93424c5fa..e93424c5fa 100644
--- a/apps/codecs/liba52/imdct.c
+++ b/lib/rbcodec/codecs/liba52/imdct.c
diff --git a/apps/codecs/liba52/imdct_lookups.h b/lib/rbcodec/codecs/liba52/imdct_lookups.h
index 9d14fe21a7..9d14fe21a7 100644
--- a/apps/codecs/liba52/imdct_lookups.h
+++ b/lib/rbcodec/codecs/liba52/imdct_lookups.h
diff --git a/apps/codecs/liba52/liba52.make b/lib/rbcodec/codecs/liba52/liba52.make
index 79b2eb222e..04cae4f080 100644
--- a/apps/codecs/liba52/liba52.make
+++ b/lib/rbcodec/codecs/liba52/liba52.make
@@ -9,7 +9,7 @@
 
 # liba52
 A52LIB := $(CODECDIR)/liba52.a
-A52LIB_SRC := $(call preprocess, $(APPSDIR)/codecs/liba52/SOURCES)
+A52LIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/liba52/SOURCES)
 A52LIB_OBJ := $(call c2obj, $(A52LIB_SRC))
 OTHER_SRC += $(A52LIB_SRC)
 
diff --git a/apps/codecs/liba52/mm_accel.h b/lib/rbcodec/codecs/liba52/mm_accel.h
index aafc3fed82..aafc3fed82 100644
--- a/apps/codecs/liba52/mm_accel.h
+++ b/lib/rbcodec/codecs/liba52/mm_accel.h
diff --git a/apps/codecs/liba52/parse.c b/lib/rbcodec/codecs/liba52/parse.c
index c61c13cdb5..c61c13cdb5 100644
--- a/apps/codecs/liba52/parse.c
+++ b/lib/rbcodec/codecs/liba52/parse.c
diff --git a/apps/codecs/liba52/tables.h b/lib/rbcodec/codecs/liba52/tables.h
index b067c63f69..b067c63f69 100644
--- a/apps/codecs/liba52/tables.h
+++ b/lib/rbcodec/codecs/liba52/tables.h
diff --git a/apps/codecs/liba52/tendra.h b/lib/rbcodec/codecs/liba52/tendra.h
index cc740fceeb..cc740fceeb 100644
--- a/apps/codecs/liba52/tendra.h
+++ b/lib/rbcodec/codecs/liba52/tendra.h
diff --git a/apps/codecs/libalac/README b/lib/rbcodec/codecs/libalac/README
index 1b304d2d93..1b304d2d93 100644
--- a/apps/codecs/libalac/README
+++ b/lib/rbcodec/codecs/libalac/README
diff --git a/apps/codecs/libalac/README.rockbox b/lib/rbcodec/codecs/libalac/README.rockbox
index 891e581cfc..891e581cfc 100644
--- a/apps/codecs/libalac/README.rockbox
+++ b/lib/rbcodec/codecs/libalac/README.rockbox
diff --git a/apps/codecs/libalac/SOURCES b/lib/rbcodec/codecs/libalac/SOURCES
index 854b9e6f88..854b9e6f88 100644
--- a/apps/codecs/libalac/SOURCES
+++ b/lib/rbcodec/codecs/libalac/SOURCES
diff --git a/apps/codecs/libalac/alac.c b/lib/rbcodec/codecs/libalac/alac.c
index fd24656504..fd24656504 100644
--- a/apps/codecs/libalac/alac.c
+++ b/lib/rbcodec/codecs/libalac/alac.c
diff --git a/apps/codecs/libalac/decomp.h b/lib/rbcodec/codecs/libalac/decomp.h
index 21dabd86b0..21dabd86b0 100644
--- a/apps/codecs/libalac/decomp.h
+++ b/lib/rbcodec/codecs/libalac/decomp.h
diff --git a/apps/codecs/libalac/libalac.make b/lib/rbcodec/codecs/libalac/libalac.make
index a0300554c3..8b8a842f8e 100644
--- a/apps/codecs/libalac/libalac.make
+++ b/lib/rbcodec/codecs/libalac/libalac.make
@@ -9,7 +9,7 @@
 
 # libalac
 ALACLIB := $(CODECDIR)/libalac.a
-ALACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libalac/SOURCES)
+ALACLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libalac/SOURCES)
 ALACLIB_OBJ := $(call c2obj, $(ALACLIB_SRC))
 OTHER_SRC += $(ALACLIB_SRC)
 
diff --git a/apps/codecs/libasap/CREDITS b/lib/rbcodec/codecs/libasap/CREDITS
index 387cbb6266..387cbb6266 100644
--- a/apps/codecs/libasap/CREDITS
+++ b/lib/rbcodec/codecs/libasap/CREDITS
diff --git a/apps/codecs/libasap/README b/lib/rbcodec/codecs/libasap/README
index d4fbfe6297..d4fbfe6297 100644
--- a/apps/codecs/libasap/README
+++ b/lib/rbcodec/codecs/libasap/README
diff --git a/apps/codecs/libasap/README.rockbox b/lib/rbcodec/codecs/libasap/README.rockbox
index 62184822d4..62184822d4 100644
--- a/apps/codecs/libasap/README.rockbox
+++ b/lib/rbcodec/codecs/libasap/README.rockbox
diff --git a/apps/codecs/libasap/SOURCES b/lib/rbcodec/codecs/libasap/SOURCES
index 0d1f1f46fa..0d1f1f46fa 100644
--- a/apps/codecs/libasap/SOURCES
+++ b/lib/rbcodec/codecs/libasap/SOURCES
diff --git a/apps/codecs/libasap/acpu.c b/lib/rbcodec/codecs/libasap/acpu.c
index 0fd5988b83..0fd5988b83 100644
--- a/apps/codecs/libasap/acpu.c
+++ b/lib/rbcodec/codecs/libasap/acpu.c
diff --git a/apps/codecs/libasap/anylang.h b/lib/rbcodec/codecs/libasap/anylang.h
index e56dfbae0e..e56dfbae0e 100644
--- a/apps/codecs/libasap/anylang.h
+++ b/lib/rbcodec/codecs/libasap/anylang.h
diff --git a/apps/codecs/libasap/apokeysnd.c b/lib/rbcodec/codecs/libasap/apokeysnd.c
index 811e2f9b4a..811e2f9b4a 100644
--- a/apps/codecs/libasap/apokeysnd.c
+++ b/lib/rbcodec/codecs/libasap/apokeysnd.c
diff --git a/apps/codecs/libasap/asap.c b/lib/rbcodec/codecs/libasap/asap.c
index 1aeb843fa3..1aeb843fa3 100644
--- a/apps/codecs/libasap/asap.c
+++ b/lib/rbcodec/codecs/libasap/asap.c
diff --git a/apps/codecs/libasap/asap.h b/lib/rbcodec/codecs/libasap/asap.h
index 1cbf8d0100..1cbf8d0100 100644
--- a/apps/codecs/libasap/asap.h
+++ b/lib/rbcodec/codecs/libasap/asap.h
diff --git a/apps/codecs/libasap/asap_internal.h b/lib/rbcodec/codecs/libasap/asap_internal.h
index def444bc2f..def444bc2f 100644
--- a/apps/codecs/libasap/asap_internal.h
+++ b/lib/rbcodec/codecs/libasap/asap_internal.h
diff --git a/apps/codecs/libasap/libasap.make b/lib/rbcodec/codecs/libasap/libasap.make
index d904c14257..cbf461d4fb 100644
--- a/apps/codecs/libasap/libasap.make
+++ b/lib/rbcodec/codecs/libasap/libasap.make
@@ -9,7 +9,7 @@
 
 # libasap
 ASAPLIB := $(CODECDIR)/libasap.a
-ASAPLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libasap/SOURCES)
+ASAPLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libasap/SOURCES)
 ASAPLIB_OBJ := $(call c2obj, $(ASAPLIB_SRC))
 OTHER_SRC += $(ASAPLIB_SRC)
 
diff --git a/apps/codecs/libasap/players.h b/lib/rbcodec/codecs/libasap/players.h
index fb90b0c76a..fb90b0c76a 100644
--- a/apps/codecs/libasap/players.h
+++ b/lib/rbcodec/codecs/libasap/players.h
diff --git a/apps/codecs/libasf/SOURCES b/lib/rbcodec/codecs/libasf/SOURCES
index 1fee336990..1fee336990 100644
--- a/apps/codecs/libasf/SOURCES
+++ b/lib/rbcodec/codecs/libasf/SOURCES
diff --git a/apps/codecs/libasf/asf.c b/lib/rbcodec/codecs/libasf/asf.c
index 4e3235a422..4e3235a422 100644
--- a/apps/codecs/libasf/asf.c
+++ b/lib/rbcodec/codecs/libasf/asf.c
diff --git a/apps/codecs/libasf/asf.h b/lib/rbcodec/codecs/libasf/asf.h
index a7d384cf3d..a7d384cf3d 100644
--- a/apps/codecs/libasf/asf.h
+++ b/lib/rbcodec/codecs/libasf/asf.h
diff --git a/apps/codecs/libasf/libasf.make b/lib/rbcodec/codecs/libasf/libasf.make
index 143d83f549..dad0570402 100644
--- a/apps/codecs/libasf/libasf.make
+++ b/lib/rbcodec/codecs/libasf/libasf.make
@@ -9,7 +9,7 @@
 
 # libasf
 ASFLIB := $(CODECDIR)/libasf.a
-ASFLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libasf/SOURCES)
+ASFLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libasf/SOURCES)
 ASFLIB_OBJ := $(call c2obj, $(ASFLIB_SRC))
 OTHER_SRC += $(ASFLIB_SRC)
 
diff --git a/apps/codecs/libatrac/README.rockbox b/lib/rbcodec/codecs/libatrac/README.rockbox
index 30703a3e49..30703a3e49 100644
--- a/apps/codecs/libatrac/README.rockbox
+++ b/lib/rbcodec/codecs/libatrac/README.rockbox
diff --git a/apps/codecs/libatrac/SOURCES b/lib/rbcodec/codecs/libatrac/SOURCES
index 85f011cb87..85f011cb87 100644
--- a/apps/codecs/libatrac/SOURCES
+++ b/lib/rbcodec/codecs/libatrac/SOURCES
diff --git a/apps/codecs/libatrac/atrac3.c b/lib/rbcodec/codecs/libatrac/atrac3.c
index bb52dd4cf0..bb52dd4cf0 100644
--- a/apps/codecs/libatrac/atrac3.c
+++ b/lib/rbcodec/codecs/libatrac/atrac3.c
diff --git a/apps/codecs/libatrac/atrac3.h b/lib/rbcodec/codecs/libatrac/atrac3.h
index 64086b6411..64086b6411 100644
--- a/apps/codecs/libatrac/atrac3.h
+++ b/lib/rbcodec/codecs/libatrac/atrac3.h
diff --git a/apps/codecs/libatrac/atrac3_arm.S b/lib/rbcodec/codecs/libatrac/atrac3_arm.S
index 68f8de2c4e..68f8de2c4e 100644
--- a/apps/codecs/libatrac/atrac3_arm.S
+++ b/lib/rbcodec/codecs/libatrac/atrac3_arm.S
diff --git a/apps/codecs/libatrac/atrac3_armv5e.S b/lib/rbcodec/codecs/libatrac/atrac3_armv5e.S
index 1d9d35a5da..1d9d35a5da 100644
--- a/apps/codecs/libatrac/atrac3_armv5e.S
+++ b/lib/rbcodec/codecs/libatrac/atrac3_armv5e.S
diff --git a/apps/codecs/libatrac/atrac3data.h b/lib/rbcodec/codecs/libatrac/atrac3data.h
index 30abb37572..30abb37572 100644
--- a/apps/codecs/libatrac/atrac3data.h
+++ b/lib/rbcodec/codecs/libatrac/atrac3data.h
diff --git a/apps/codecs/libatrac/atrac3data_fixed.h b/lib/rbcodec/codecs/libatrac/atrac3data_fixed.h
index 9eb79731ce..9eb79731ce 100644
--- a/apps/codecs/libatrac/atrac3data_fixed.h
+++ b/lib/rbcodec/codecs/libatrac/atrac3data_fixed.h
diff --git a/apps/codecs/libatrac/fixp_math.h b/lib/rbcodec/codecs/libatrac/fixp_math.h
index 014c5aa559..014c5aa559 100644
--- a/apps/codecs/libatrac/fixp_math.h
+++ b/lib/rbcodec/codecs/libatrac/fixp_math.h
diff --git a/apps/codecs/libatrac/libatrac.make b/lib/rbcodec/codecs/libatrac/libatrac.make
index 01606e1f15..69a66eb6f5 100644
--- a/apps/codecs/libatrac/libatrac.make
+++ b/lib/rbcodec/codecs/libatrac/libatrac.make
@@ -9,7 +9,7 @@
 
 # libatrac
 ATRACLIB := $(CODECDIR)/libatrac.a
-ATRACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libatrac/SOURCES)
+ATRACLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libatrac/SOURCES)
 ATRACLIB_OBJ := $(call c2obj, $(ATRACLIB_SRC))
 OTHER_SRC += $(ATRACLIB_SRC)
 
diff --git a/apps/codecs/libcook/README.rockbox b/lib/rbcodec/codecs/libcook/README.rockbox
index ae72f2a2f2..ae72f2a2f2 100644
--- a/apps/codecs/libcook/README.rockbox
+++ b/lib/rbcodec/codecs/libcook/README.rockbox
diff --git a/apps/codecs/libcook/SOURCES b/lib/rbcodec/codecs/libcook/SOURCES
index b656fdd2f7..b656fdd2f7 100644
--- a/apps/codecs/libcook/SOURCES
+++ b/lib/rbcodec/codecs/libcook/SOURCES
diff --git a/apps/codecs/libcook/cook.c b/lib/rbcodec/codecs/libcook/cook.c
index 29a1bab7d6..29a1bab7d6 100644
--- a/apps/codecs/libcook/cook.c
+++ b/lib/rbcodec/codecs/libcook/cook.c
diff --git a/apps/codecs/libcook/cook.h b/lib/rbcodec/codecs/libcook/cook.h
index fcb437a0e1..fcb437a0e1 100644
--- a/apps/codecs/libcook/cook.h
+++ b/lib/rbcodec/codecs/libcook/cook.h
diff --git a/apps/codecs/libcook/cook_fixpoint.h b/lib/rbcodec/codecs/libcook/cook_fixpoint.h
index 5c4a5d1a5a..5c4a5d1a5a 100644
--- a/apps/codecs/libcook/cook_fixpoint.h
+++ b/lib/rbcodec/codecs/libcook/cook_fixpoint.h
diff --git a/apps/codecs/libcook/cookdata.h b/lib/rbcodec/codecs/libcook/cookdata.h
index a73b96c5f5..a73b96c5f5 100644
--- a/apps/codecs/libcook/cookdata.h
+++ b/lib/rbcodec/codecs/libcook/cookdata.h
diff --git a/apps/codecs/libcook/cookdata_fixpoint.h b/lib/rbcodec/codecs/libcook/cookdata_fixpoint.h
index b58666031d..b58666031d 100644
--- a/apps/codecs/libcook/cookdata_fixpoint.h
+++ b/lib/rbcodec/codecs/libcook/cookdata_fixpoint.h
diff --git a/apps/codecs/libcook/libcook.make b/lib/rbcodec/codecs/libcook/libcook.make
index c3f1c10319..c7bdca90c5 100644
--- a/apps/codecs/libcook/libcook.make
+++ b/lib/rbcodec/codecs/libcook/libcook.make
@@ -9,7 +9,7 @@
 
 # libcook
 COOKLIB := $(CODECDIR)/libcook.a
-COOKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libcook/SOURCES)
+COOKLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libcook/SOURCES)
 COOKLIB_OBJ := $(call c2obj, $(COOKLIB_SRC))
 OTHER_SRC += $(COOKLIB_SRC)
 
diff --git a/apps/codecs/libfaad/COPYING b/lib/rbcodec/codecs/libfaad/COPYING
index 920c4e6744..920c4e6744 100644
--- a/apps/codecs/libfaad/COPYING
+++ b/lib/rbcodec/codecs/libfaad/COPYING
diff --git a/apps/codecs/libfaad/README b/lib/rbcodec/codecs/libfaad/README
index a3a3d5a833..a3a3d5a833 100644
--- a/apps/codecs/libfaad/README
+++ b/lib/rbcodec/codecs/libfaad/README
diff --git a/apps/codecs/libfaad/README.rockbox b/lib/rbcodec/codecs/libfaad/README.rockbox
index 5b70f231ba..5b70f231ba 100644
--- a/apps/codecs/libfaad/README.rockbox
+++ b/lib/rbcodec/codecs/libfaad/README.rockbox
diff --git a/apps/codecs/libfaad/SOURCES b/lib/rbcodec/codecs/libfaad/SOURCES
index 8447354fd3..8447354fd3 100644
--- a/apps/codecs/libfaad/SOURCES
+++ b/lib/rbcodec/codecs/libfaad/SOURCES
diff --git a/apps/codecs/libfaad/analysis.h b/lib/rbcodec/codecs/libfaad/analysis.h
index f1c3da7a8f..f1c3da7a8f 100644
--- a/apps/codecs/libfaad/analysis.h
+++ b/lib/rbcodec/codecs/libfaad/analysis.h
diff --git a/apps/codecs/libfaad/bits.c b/lib/rbcodec/codecs/libfaad/bits.c
index a3640077d8..a3640077d8 100644
--- a/apps/codecs/libfaad/bits.c
+++ b/lib/rbcodec/codecs/libfaad/bits.c
diff --git a/apps/codecs/libfaad/bits.h b/lib/rbcodec/codecs/libfaad/bits.h
index f9417b8670..f9417b8670 100644
--- a/apps/codecs/libfaad/bits.h
+++ b/lib/rbcodec/codecs/libfaad/bits.h
diff --git a/apps/codecs/libfaad/codebook/hcb.h b/lib/rbcodec/codecs/libfaad/codebook/hcb.h
index eaefdbf437..eaefdbf437 100644
--- a/apps/codecs/libfaad/codebook/hcb.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb.h
diff --git a/apps/codecs/libfaad/codebook/hcb_1.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_1.h
index 88c04b6012..88c04b6012 100644
--- a/apps/codecs/libfaad/codebook/hcb_1.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_1.h
diff --git a/apps/codecs/libfaad/codebook/hcb_10.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_10.h
index af48711460..af48711460 100644
--- a/apps/codecs/libfaad/codebook/hcb_10.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_10.h
diff --git a/apps/codecs/libfaad/codebook/hcb_11.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_11.h
index 49e97af23f..49e97af23f 100644
--- a/apps/codecs/libfaad/codebook/hcb_11.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_11.h
diff --git a/apps/codecs/libfaad/codebook/hcb_2.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_2.h
index 15e7d57084..15e7d57084 100644
--- a/apps/codecs/libfaad/codebook/hcb_2.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_2.h
diff --git a/apps/codecs/libfaad/codebook/hcb_3.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_3.h
index 3b12fdff60..3b12fdff60 100644
--- a/apps/codecs/libfaad/codebook/hcb_3.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_3.h
diff --git a/apps/codecs/libfaad/codebook/hcb_4.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_4.h
index 67397e1fb0..67397e1fb0 100644
--- a/apps/codecs/libfaad/codebook/hcb_4.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_4.h
diff --git a/apps/codecs/libfaad/codebook/hcb_5.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_5.h
index 0143482901..0143482901 100644
--- a/apps/codecs/libfaad/codebook/hcb_5.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_5.h
diff --git a/apps/codecs/libfaad/codebook/hcb_6.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_6.h
index 9988133552..9988133552 100644
--- a/apps/codecs/libfaad/codebook/hcb_6.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_6.h
diff --git a/apps/codecs/libfaad/codebook/hcb_7.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_7.h
index 3b378dc5cd..3b378dc5cd 100644
--- a/apps/codecs/libfaad/codebook/hcb_7.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_7.h
diff --git a/apps/codecs/libfaad/codebook/hcb_8.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_8.h
index b76eb8f667..b76eb8f667 100644
--- a/apps/codecs/libfaad/codebook/hcb_8.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_8.h
diff --git a/apps/codecs/libfaad/codebook/hcb_9.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_9.h
index 2932001294..2932001294 100644
--- a/apps/codecs/libfaad/codebook/hcb_9.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_9.h
diff --git a/apps/codecs/libfaad/codebook/hcb_sf.h b/lib/rbcodec/codecs/libfaad/codebook/hcb_sf.h
index 66762e2fce..66762e2fce 100644
--- a/apps/codecs/libfaad/codebook/hcb_sf.h
+++ b/lib/rbcodec/codecs/libfaad/codebook/hcb_sf.h
diff --git a/apps/codecs/libfaad/common.c b/lib/rbcodec/codecs/libfaad/common.c
index bedf56a212..bedf56a212 100644
--- a/apps/codecs/libfaad/common.c
+++ b/lib/rbcodec/codecs/libfaad/common.c
diff --git a/apps/codecs/libfaad/common.h b/lib/rbcodec/codecs/libfaad/common.h
index 720042b4aa..720042b4aa 100644
--- a/apps/codecs/libfaad/common.h
+++ b/lib/rbcodec/codecs/libfaad/common.h
diff --git a/apps/codecs/libfaad/decoder.c b/lib/rbcodec/codecs/libfaad/decoder.c
index d68d093b0b..d68d093b0b 100644
--- a/apps/codecs/libfaad/decoder.c
+++ b/lib/rbcodec/codecs/libfaad/decoder.c
diff --git a/apps/codecs/libfaad/decoder.h b/lib/rbcodec/codecs/libfaad/decoder.h
index f5c477e186..f5c477e186 100644
--- a/apps/codecs/libfaad/decoder.h
+++ b/lib/rbcodec/codecs/libfaad/decoder.h
diff --git a/apps/codecs/libfaad/drc.c b/lib/rbcodec/codecs/libfaad/drc.c
index 6e081489aa..6e081489aa 100644
--- a/apps/codecs/libfaad/drc.c
+++ b/lib/rbcodec/codecs/libfaad/drc.c
diff --git a/apps/codecs/libfaad/drc.h b/lib/rbcodec/codecs/libfaad/drc.h
index 38037a1a12..38037a1a12 100644
--- a/apps/codecs/libfaad/drc.h
+++ b/lib/rbcodec/codecs/libfaad/drc.h
diff --git a/apps/codecs/libfaad/drm_dec.c b/lib/rbcodec/codecs/libfaad/drm_dec.c
index f0b0f01f2b..f0b0f01f2b 100644
--- a/apps/codecs/libfaad/drm_dec.c
+++ b/lib/rbcodec/codecs/libfaad/drm_dec.c
diff --git a/apps/codecs/libfaad/drm_dec.h b/lib/rbcodec/codecs/libfaad/drm_dec.h
index d7ae9d0166..d7ae9d0166 100644
--- a/apps/codecs/libfaad/drm_dec.h
+++ b/lib/rbcodec/codecs/libfaad/drm_dec.h
diff --git a/apps/codecs/libfaad/error.c b/lib/rbcodec/codecs/libfaad/error.c
index ff2f9c3d13..ff2f9c3d13 100644
--- a/apps/codecs/libfaad/error.c
+++ b/lib/rbcodec/codecs/libfaad/error.c
diff --git a/apps/codecs/libfaad/error.h b/lib/rbcodec/codecs/libfaad/error.h
index 94ca7bba75..94ca7bba75 100644
--- a/apps/codecs/libfaad/error.h
+++ b/lib/rbcodec/codecs/libfaad/error.h
diff --git a/apps/codecs/libfaad/faad_config.h b/lib/rbcodec/codecs/libfaad/faad_config.h
index 163b55669e..163b55669e 100644
--- a/apps/codecs/libfaad/faad_config.h
+++ b/lib/rbcodec/codecs/libfaad/faad_config.h
diff --git a/apps/codecs/libfaad/filtbank.c b/lib/rbcodec/codecs/libfaad/filtbank.c
index fd7a4dc91f..fd7a4dc91f 100644
--- a/apps/codecs/libfaad/filtbank.c
+++ b/lib/rbcodec/codecs/libfaad/filtbank.c
diff --git a/apps/codecs/libfaad/filtbank.h b/lib/rbcodec/codecs/libfaad/filtbank.h
index 8c9f1e3490..8c9f1e3490 100644
--- a/apps/codecs/libfaad/filtbank.h
+++ b/lib/rbcodec/codecs/libfaad/filtbank.h
diff --git a/apps/codecs/libfaad/fixed.h b/lib/rbcodec/codecs/libfaad/fixed.h
index ca0402e4d3..ca0402e4d3 100644
--- a/apps/codecs/libfaad/fixed.h
+++ b/lib/rbcodec/codecs/libfaad/fixed.h
diff --git a/apps/codecs/libfaad/hcr.c b/lib/rbcodec/codecs/libfaad/hcr.c
index f968ea7bec..f968ea7bec 100644
--- a/apps/codecs/libfaad/hcr.c
+++ b/lib/rbcodec/codecs/libfaad/hcr.c
diff --git a/apps/codecs/libfaad/huffman.c b/lib/rbcodec/codecs/libfaad/huffman.c
index bea0dd7bf2..bea0dd7bf2 100644
--- a/apps/codecs/libfaad/huffman.c
+++ b/lib/rbcodec/codecs/libfaad/huffman.c
diff --git a/apps/codecs/libfaad/huffman.h b/lib/rbcodec/codecs/libfaad/huffman.h
index 214d3a220f..214d3a220f 100644
--- a/apps/codecs/libfaad/huffman.h
+++ b/lib/rbcodec/codecs/libfaad/huffman.h
diff --git a/apps/codecs/libfaad/ic_predict.c b/lib/rbcodec/codecs/libfaad/ic_predict.c
index 02cadd65b1..02cadd65b1 100644
--- a/apps/codecs/libfaad/ic_predict.c
+++ b/lib/rbcodec/codecs/libfaad/ic_predict.c
diff --git a/apps/codecs/libfaad/ic_predict.h b/lib/rbcodec/codecs/libfaad/ic_predict.h
index 1f2d2c657e..1f2d2c657e 100644
--- a/apps/codecs/libfaad/ic_predict.h
+++ b/lib/rbcodec/codecs/libfaad/ic_predict.h
diff --git a/apps/codecs/libfaad/iq_table.h b/lib/rbcodec/codecs/libfaad/iq_table.h
index eaf2fe4671..eaf2fe4671 100644
--- a/apps/codecs/libfaad/iq_table.h
+++ b/lib/rbcodec/codecs/libfaad/iq_table.h
diff --git a/apps/codecs/libfaad/is.c b/lib/rbcodec/codecs/libfaad/is.c
index 89c6fcf228..89c6fcf228 100644
--- a/apps/codecs/libfaad/is.c
+++ b/lib/rbcodec/codecs/libfaad/is.c
diff --git a/apps/codecs/libfaad/is.h b/lib/rbcodec/codecs/libfaad/is.h
index 1b68f3ec49..1b68f3ec49 100644
--- a/apps/codecs/libfaad/is.h
+++ b/lib/rbcodec/codecs/libfaad/is.h
diff --git a/apps/codecs/libfaad/kbd_win.h b/lib/rbcodec/codecs/libfaad/kbd_win.h
index 8abd3c070c..8abd3c070c 100644
--- a/apps/codecs/libfaad/kbd_win.h
+++ b/lib/rbcodec/codecs/libfaad/kbd_win.h
diff --git a/apps/codecs/libfaad/libfaad.make b/lib/rbcodec/codecs/libfaad/libfaad.make
index 4f5fbc322c..ec6998f4d3 100644
--- a/apps/codecs/libfaad/libfaad.make
+++ b/lib/rbcodec/codecs/libfaad/libfaad.make
@@ -9,10 +9,10 @@
 
 # libfaad
 FAADLIB := $(CODECDIR)/libfaad.a
-FAADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libfaad/SOURCES)
+FAADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libfaad/SOURCES)
 FAADLIB_OBJ := $(call c2obj, $(FAADLIB_SRC))
 OTHER_SRC += $(FAADLIB_SRC)
-OTHER_INC += -I$(APPSDIR)/codecs/libfaad
+OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/libfaad
 
 $(FAADLIB): $(FAADLIB_OBJ)
         $(SILENT)$(shell rm -f $@)
diff --git a/apps/codecs/libfaad/lt_predict.c b/lib/rbcodec/codecs/libfaad/lt_predict.c
index f03354fc01..f03354fc01 100644
--- a/apps/codecs/libfaad/lt_predict.c
+++ b/lib/rbcodec/codecs/libfaad/lt_predict.c
diff --git a/apps/codecs/libfaad/lt_predict.h b/lib/rbcodec/codecs/libfaad/lt_predict.h
index 1c10751888..1c10751888 100644
--- a/apps/codecs/libfaad/lt_predict.h
+++ b/lib/rbcodec/codecs/libfaad/lt_predict.h
diff --git a/apps/codecs/libfaad/mp4.c b/lib/rbcodec/codecs/libfaad/mp4.c
index 94e1a1daaa..94e1a1daaa 100644
--- a/apps/codecs/libfaad/mp4.c
+++ b/lib/rbcodec/codecs/libfaad/mp4.c
diff --git a/apps/codecs/libfaad/mp4.h b/lib/rbcodec/codecs/libfaad/mp4.h
index afcf094796..afcf094796 100644
--- a/apps/codecs/libfaad/mp4.h
+++ b/lib/rbcodec/codecs/libfaad/mp4.h
diff --git a/apps/codecs/libfaad/ms.c b/lib/rbcodec/codecs/libfaad/ms.c
index b42e95a408..b42e95a408 100644
--- a/apps/codecs/libfaad/ms.c
+++ b/lib/rbcodec/codecs/libfaad/ms.c
diff --git a/apps/codecs/libfaad/ms.h b/lib/rbcodec/codecs/libfaad/ms.h
index 384fa4294b..384fa4294b 100644
--- a/apps/codecs/libfaad/ms.h
+++ b/lib/rbcodec/codecs/libfaad/ms.h
diff --git a/apps/codecs/libfaad/output.c b/lib/rbcodec/codecs/libfaad/output.c
index 6594582bbd..6594582bbd 100644
--- a/apps/codecs/libfaad/output.c
+++ b/lib/rbcodec/codecs/libfaad/output.c
diff --git a/apps/codecs/libfaad/output.h b/lib/rbcodec/codecs/libfaad/output.h
index 9fe8356541..9fe8356541 100644
--- a/apps/codecs/libfaad/output.h
+++ b/lib/rbcodec/codecs/libfaad/output.h
diff --git a/apps/codecs/libfaad/pns.c b/lib/rbcodec/codecs/libfaad/pns.c
index b75cf9f1ed..b75cf9f1ed 100644
--- a/apps/codecs/libfaad/pns.c
+++ b/lib/rbcodec/codecs/libfaad/pns.c
diff --git a/apps/codecs/libfaad/pns.h b/lib/rbcodec/codecs/libfaad/pns.h
index e789f5708a..e789f5708a 100644
--- a/apps/codecs/libfaad/pns.h
+++ b/lib/rbcodec/codecs/libfaad/pns.h
diff --git a/apps/codecs/libfaad/ps_dec.c b/lib/rbcodec/codecs/libfaad/ps_dec.c
index 3fed4e6a0a..3fed4e6a0a 100644
--- a/apps/codecs/libfaad/ps_dec.c
+++ b/lib/rbcodec/codecs/libfaad/ps_dec.c
diff --git a/apps/codecs/libfaad/ps_dec.h b/lib/rbcodec/codecs/libfaad/ps_dec.h
index 14e4bd54e6..14e4bd54e6 100644
--- a/apps/codecs/libfaad/ps_dec.h
+++ b/lib/rbcodec/codecs/libfaad/ps_dec.h
diff --git a/apps/codecs/libfaad/ps_syntax.c b/lib/rbcodec/codecs/libfaad/ps_syntax.c
index 290d7e5523..290d7e5523 100644
--- a/apps/codecs/libfaad/ps_syntax.c
+++ b/lib/rbcodec/codecs/libfaad/ps_syntax.c
diff --git a/apps/codecs/libfaad/ps_tables.h b/lib/rbcodec/codecs/libfaad/ps_tables.h
index 83cd20abbf..83cd20abbf 100644
--- a/apps/codecs/libfaad/ps_tables.h
+++ b/lib/rbcodec/codecs/libfaad/ps_tables.h
diff --git a/apps/codecs/libfaad/pulse.c b/lib/rbcodec/codecs/libfaad/pulse.c
index d75877db70..d75877db70 100644
--- a/apps/codecs/libfaad/pulse.c
+++ b/lib/rbcodec/codecs/libfaad/pulse.c
diff --git a/apps/codecs/libfaad/pulse.h b/lib/rbcodec/codecs/libfaad/pulse.h
index 84d7fd38d8..84d7fd38d8 100644
--- a/apps/codecs/libfaad/pulse.h
+++ b/lib/rbcodec/codecs/libfaad/pulse.h
diff --git a/apps/codecs/libfaad/rvlc.c b/lib/rbcodec/codecs/libfaad/rvlc.c
index 5b17edd06c..5b17edd06c 100644
--- a/apps/codecs/libfaad/rvlc.c
+++ b/lib/rbcodec/codecs/libfaad/rvlc.c
diff --git a/apps/codecs/libfaad/rvlc.h b/lib/rbcodec/codecs/libfaad/rvlc.h
index b17246a452..b17246a452 100644
--- a/apps/codecs/libfaad/rvlc.h
+++ b/lib/rbcodec/codecs/libfaad/rvlc.h
diff --git a/apps/codecs/libfaad/sbr_dct.c b/lib/rbcodec/codecs/libfaad/sbr_dct.c
index e9c56c3a18..e9c56c3a18 100644
--- a/apps/codecs/libfaad/sbr_dct.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_dct.c
diff --git a/apps/codecs/libfaad/sbr_dct.h b/lib/rbcodec/codecs/libfaad/sbr_dct.h
index 95394df307..95394df307 100644
--- a/apps/codecs/libfaad/sbr_dct.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_dct.h
diff --git a/apps/codecs/libfaad/sbr_dec.c b/lib/rbcodec/codecs/libfaad/sbr_dec.c
index 21e8e028a1..21e8e028a1 100644
--- a/apps/codecs/libfaad/sbr_dec.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_dec.c
diff --git a/apps/codecs/libfaad/sbr_dec.h b/lib/rbcodec/codecs/libfaad/sbr_dec.h
index 89fe72b7e9..89fe72b7e9 100644
--- a/apps/codecs/libfaad/sbr_dec.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_dec.h
diff --git a/apps/codecs/libfaad/sbr_e_nf.c b/lib/rbcodec/codecs/libfaad/sbr_e_nf.c
index ea2cbb8e35..ea2cbb8e35 100644
--- a/apps/codecs/libfaad/sbr_e_nf.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_e_nf.c
diff --git a/apps/codecs/libfaad/sbr_e_nf.h b/lib/rbcodec/codecs/libfaad/sbr_e_nf.h
index 6c8b30f06d..6c8b30f06d 100644
--- a/apps/codecs/libfaad/sbr_e_nf.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_e_nf.h
diff --git a/apps/codecs/libfaad/sbr_fbt.c b/lib/rbcodec/codecs/libfaad/sbr_fbt.c
index c685c710d5..c685c710d5 100644
--- a/apps/codecs/libfaad/sbr_fbt.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_fbt.c
diff --git a/apps/codecs/libfaad/sbr_fbt.h b/lib/rbcodec/codecs/libfaad/sbr_fbt.h
index ac25335268..ac25335268 100644
--- a/apps/codecs/libfaad/sbr_fbt.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_fbt.h
diff --git a/apps/codecs/libfaad/sbr_hfadj.c b/lib/rbcodec/codecs/libfaad/sbr_hfadj.c
index b562bf904a..b562bf904a 100644
--- a/apps/codecs/libfaad/sbr_hfadj.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_hfadj.c
diff --git a/apps/codecs/libfaad/sbr_hfadj.h b/lib/rbcodec/codecs/libfaad/sbr_hfadj.h
index 1411769799..1411769799 100644
--- a/apps/codecs/libfaad/sbr_hfadj.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_hfadj.h
diff --git a/apps/codecs/libfaad/sbr_hfgen.c b/lib/rbcodec/codecs/libfaad/sbr_hfgen.c
index 3a5b250aa7..3a5b250aa7 100644
--- a/apps/codecs/libfaad/sbr_hfgen.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_hfgen.c
diff --git a/apps/codecs/libfaad/sbr_hfgen.h b/lib/rbcodec/codecs/libfaad/sbr_hfgen.h
index a69e53e47d..a69e53e47d 100644
--- a/apps/codecs/libfaad/sbr_hfgen.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_hfgen.h
diff --git a/apps/codecs/libfaad/sbr_huff.c b/lib/rbcodec/codecs/libfaad/sbr_huff.c
index 92fe07a392..92fe07a392 100644
--- a/apps/codecs/libfaad/sbr_huff.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_huff.c
diff --git a/apps/codecs/libfaad/sbr_huff.h b/lib/rbcodec/codecs/libfaad/sbr_huff.h
index d81c5dc528..d81c5dc528 100644
--- a/apps/codecs/libfaad/sbr_huff.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_huff.h
diff --git a/apps/codecs/libfaad/sbr_noise.h b/lib/rbcodec/codecs/libfaad/sbr_noise.h
index 48f0ea9d18..48f0ea9d18 100644
--- a/apps/codecs/libfaad/sbr_noise.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_noise.h
diff --git a/apps/codecs/libfaad/sbr_qmf.c b/lib/rbcodec/codecs/libfaad/sbr_qmf.c
index 5f8203e5b1..5f8203e5b1 100644
--- a/apps/codecs/libfaad/sbr_qmf.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_qmf.c
diff --git a/apps/codecs/libfaad/sbr_qmf.h b/lib/rbcodec/codecs/libfaad/sbr_qmf.h
index 87bfe5a9ef..87bfe5a9ef 100644
--- a/apps/codecs/libfaad/sbr_qmf.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_qmf.h
diff --git a/apps/codecs/libfaad/sbr_qmf_c.h b/lib/rbcodec/codecs/libfaad/sbr_qmf_c.h
index 0ceb487bec..0ceb487bec 100644
--- a/apps/codecs/libfaad/sbr_qmf_c.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_qmf_c.h
diff --git a/apps/codecs/libfaad/sbr_syntax.c b/lib/rbcodec/codecs/libfaad/sbr_syntax.c
index 519a37b137..519a37b137 100644
--- a/apps/codecs/libfaad/sbr_syntax.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_syntax.c
diff --git a/apps/codecs/libfaad/sbr_syntax.h b/lib/rbcodec/codecs/libfaad/sbr_syntax.h
index 33aecaaf73..33aecaaf73 100644
--- a/apps/codecs/libfaad/sbr_syntax.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_syntax.h
diff --git a/apps/codecs/libfaad/sbr_tf_grid.c b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.c
index 2c21173490..2c21173490 100644
--- a/apps/codecs/libfaad/sbr_tf_grid.c
+++ b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.c
diff --git a/apps/codecs/libfaad/sbr_tf_grid.h b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.h
index b7a6b32290..b7a6b32290 100644
--- a/apps/codecs/libfaad/sbr_tf_grid.h
+++ b/lib/rbcodec/codecs/libfaad/sbr_tf_grid.h
diff --git a/apps/codecs/libfaad/sine_win.h b/lib/rbcodec/codecs/libfaad/sine_win.h
index 3e042f15f7..3e042f15f7 100644
--- a/apps/codecs/libfaad/sine_win.h
+++ b/lib/rbcodec/codecs/libfaad/sine_win.h
diff --git a/apps/codecs/libfaad/specrec.c b/lib/rbcodec/codecs/libfaad/specrec.c
index 200239bddc..200239bddc 100644
--- a/apps/codecs/libfaad/specrec.c
+++ b/lib/rbcodec/codecs/libfaad/specrec.c
diff --git a/apps/codecs/libfaad/specrec.h b/lib/rbcodec/codecs/libfaad/specrec.h
index c3540ac973..c3540ac973 100644
--- a/apps/codecs/libfaad/specrec.h
+++ b/lib/rbcodec/codecs/libfaad/specrec.h
diff --git a/apps/codecs/libfaad/structs.h b/lib/rbcodec/codecs/libfaad/structs.h
index a6114f412a..a6114f412a 100644
--- a/apps/codecs/libfaad/structs.h
+++ b/lib/rbcodec/codecs/libfaad/structs.h
diff --git a/apps/codecs/libfaad/syntax.c b/lib/rbcodec/codecs/libfaad/syntax.c
index d3d7f9e3d4..d3d7f9e3d4 100644
--- a/apps/codecs/libfaad/syntax.c
+++ b/lib/rbcodec/codecs/libfaad/syntax.c
diff --git a/apps/codecs/libfaad/syntax.h b/lib/rbcodec/codecs/libfaad/syntax.h
index f9efde7d9b..f9efde7d9b 100644
--- a/apps/codecs/libfaad/syntax.h
+++ b/lib/rbcodec/codecs/libfaad/syntax.h
diff --git a/apps/codecs/libfaad/tns.c b/lib/rbcodec/codecs/libfaad/tns.c
index a2bec86519..a2bec86519 100644
--- a/apps/codecs/libfaad/tns.c
+++ b/lib/rbcodec/codecs/libfaad/tns.c
diff --git a/apps/codecs/libfaad/tns.h b/lib/rbcodec/codecs/libfaad/tns.h
index dd10a61f3b..dd10a61f3b 100644
--- a/apps/codecs/libfaad/tns.h
+++ b/lib/rbcodec/codecs/libfaad/tns.h
diff --git a/apps/codecs/libffmpegFLAC/COPYING b/lib/rbcodec/codecs/libffmpegFLAC/COPYING
index 223ede7de3..223ede7de3 100644
--- a/apps/codecs/libffmpegFLAC/COPYING
+++ b/lib/rbcodec/codecs/libffmpegFLAC/COPYING
diff --git a/apps/codecs/libffmpegFLAC/README b/lib/rbcodec/codecs/libffmpegFLAC/README
index 9bc0f6ed8a..9bc0f6ed8a 100644
--- a/apps/codecs/libffmpegFLAC/README
+++ b/lib/rbcodec/codecs/libffmpegFLAC/README
diff --git a/apps/codecs/libffmpegFLAC/README.rockbox b/lib/rbcodec/codecs/libffmpegFLAC/README.rockbox
index 850cdfcb7d..850cdfcb7d 100644
--- a/apps/codecs/libffmpegFLAC/README.rockbox
+++ b/lib/rbcodec/codecs/libffmpegFLAC/README.rockbox
diff --git a/apps/codecs/libffmpegFLAC/SOURCES b/lib/rbcodec/codecs/libffmpegFLAC/SOURCES
index 63094b30a6..63094b30a6 100644
--- a/apps/codecs/libffmpegFLAC/SOURCES
+++ b/lib/rbcodec/codecs/libffmpegFLAC/SOURCES
diff --git a/apps/codecs/libffmpegFLAC/arm.S b/lib/rbcodec/codecs/libffmpegFLAC/arm.S
index 8adca77ce5..8adca77ce5 100644
--- a/apps/codecs/libffmpegFLAC/arm.S
+++ b/lib/rbcodec/codecs/libffmpegFLAC/arm.S
diff --git a/apps/codecs/libffmpegFLAC/arm.h b/lib/rbcodec/codecs/libffmpegFLAC/arm.h
index 39080d7f75..39080d7f75 100644
--- a/apps/codecs/libffmpegFLAC/arm.h
+++ b/lib/rbcodec/codecs/libffmpegFLAC/arm.h
diff --git a/apps/codecs/libffmpegFLAC/bitstream.h b/lib/rbcodec/codecs/libffmpegFLAC/bitstream.h
index 5fc3460c8e..5fc3460c8e 100644
--- a/apps/codecs/libffmpegFLAC/bitstream.h
+++ b/lib/rbcodec/codecs/libffmpegFLAC/bitstream.h
diff --git a/apps/codecs/libffmpegFLAC/coldfire.S b/lib/rbcodec/codecs/libffmpegFLAC/coldfire.S
index efbb907874..efbb907874 100644
--- a/apps/codecs/libffmpegFLAC/coldfire.S
+++ b/lib/rbcodec/codecs/libffmpegFLAC/coldfire.S
diff --git a/apps/codecs/libffmpegFLAC/coldfire.h b/lib/rbcodec/codecs/libffmpegFLAC/coldfire.h
index d6f0996935..d6f0996935 100644
--- a/apps/codecs/libffmpegFLAC/coldfire.h
+++ b/lib/rbcodec/codecs/libffmpegFLAC/coldfire.h
diff --git a/apps/codecs/libffmpegFLAC/decoder.c b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
index 2e92c4b90d..2e92c4b90d 100644
--- a/apps/codecs/libffmpegFLAC/decoder.c
+++ b/lib/rbcodec/codecs/libffmpegFLAC/decoder.c
diff --git a/apps/codecs/libffmpegFLAC/decoder.h b/lib/rbcodec/codecs/libffmpegFLAC/decoder.h
index 677a21ac98..677a21ac98 100644
--- a/apps/codecs/libffmpegFLAC/decoder.h
+++ b/lib/rbcodec/codecs/libffmpegFLAC/decoder.h
diff --git a/apps/codecs/libffmpegFLAC/golomb.h b/lib/rbcodec/codecs/libffmpegFLAC/golomb.h
index 197b78ee1c..197b78ee1c 100644
--- a/apps/codecs/libffmpegFLAC/golomb.h
+++ b/lib/rbcodec/codecs/libffmpegFLAC/golomb.h
diff --git a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make b/lib/rbcodec/codecs/libffmpegFLAC/libffmpegFLAC.make
index 734f3d2d8e..7ae7e96b26 100644
--- a/apps/codecs/libffmpegFLAC/libffmpegFLAC.make
+++ b/lib/rbcodec/codecs/libffmpegFLAC/libffmpegFLAC.make
@@ -9,7 +9,7 @@
 
 # libffmpegFLAC
 FFMPEGFLACLIB := $(CODECDIR)/libffmpegFLAC.a
-FFMPEGFLACLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libffmpegFLAC/SOURCES)
+FFMPEGFLACLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libffmpegFLAC/SOURCES)
 FFMPEGFLACLIB_OBJ := $(call c2obj, $(FFMPEGFLACLIB_SRC))
 OTHER_SRC += $(FFMPEGFLACLIB_SRC)
 
diff --git a/apps/codecs/libffmpegFLAC/shndec.c b/lib/rbcodec/codecs/libffmpegFLAC/shndec.c
index 40e7211b87..40e7211b87 100644
--- a/apps/codecs/libffmpegFLAC/shndec.c
+++ b/lib/rbcodec/codecs/libffmpegFLAC/shndec.c
diff --git a/apps/codecs/libffmpegFLAC/shndec.h b/lib/rbcodec/codecs/libffmpegFLAC/shndec.h
index 068f4faf28..068f4faf28 100644
--- a/apps/codecs/libffmpegFLAC/shndec.h
+++ b/lib/rbcodec/codecs/libffmpegFLAC/shndec.h
diff --git a/apps/codecs/libgme/2413tone.h b/lib/rbcodec/codecs/libgme/2413tone.h
index c0922c1225..c0922c1225 100644
--- a/apps/codecs/libgme/2413tone.h
+++ b/lib/rbcodec/codecs/libgme/2413tone.h
diff --git a/apps/codecs/libgme/281btone.h b/lib/rbcodec/codecs/libgme/281btone.h
index 83f63bff00..83f63bff00 100644
--- a/apps/codecs/libgme/281btone.h
+++ b/lib/rbcodec/codecs/libgme/281btone.h
diff --git a/apps/codecs/libgme/AYSOURCES b/lib/rbcodec/codecs/libgme/AYSOURCES
index f2b52a51d9..f2b52a51d9 100644
--- a/apps/codecs/libgme/AYSOURCES
+++ b/lib/rbcodec/codecs/libgme/AYSOURCES
diff --git a/apps/codecs/libgme/EMU2413SOURCES b/lib/rbcodec/codecs/libgme/EMU2413SOURCES
index 901c49eccf..901c49eccf 100644
--- a/apps/codecs/libgme/EMU2413SOURCES
+++ b/lib/rbcodec/codecs/libgme/EMU2413SOURCES
diff --git a/apps/codecs/libgme/GBSSOURCES b/lib/rbcodec/codecs/libgme/GBSSOURCES
index a839a2156e..a839a2156e 100644
--- a/apps/codecs/libgme/GBSSOURCES
+++ b/lib/rbcodec/codecs/libgme/GBSSOURCES
diff --git a/apps/codecs/libgme/HESSOURCES b/lib/rbcodec/codecs/libgme/HESSOURCES
index d529388978..d529388978 100644
--- a/apps/codecs/libgme/HESSOURCES
+++ b/lib/rbcodec/codecs/libgme/HESSOURCES
diff --git a/apps/codecs/libgme/KSSSOURCES b/lib/rbcodec/codecs/libgme/KSSSOURCES
index bde213364b..bde213364b 100644
--- a/apps/codecs/libgme/KSSSOURCES
+++ b/lib/rbcodec/codecs/libgme/KSSSOURCES
diff --git a/apps/codecs/libgme/NSFSOURCES b/lib/rbcodec/codecs/libgme/NSFSOURCES
index 60537ff8e4..60537ff8e4 100644
--- a/apps/codecs/libgme/NSFSOURCES
+++ b/lib/rbcodec/codecs/libgme/NSFSOURCES
diff --git a/apps/codecs/libgme/SGCSOURCES b/lib/rbcodec/codecs/libgme/SGCSOURCES
index d0e8abc2b7..d0e8abc2b7 100644
--- a/apps/codecs/libgme/SGCSOURCES
+++ b/lib/rbcodec/codecs/libgme/SGCSOURCES
diff --git a/apps/codecs/libgme/VGMSOURCES b/lib/rbcodec/codecs/libgme/VGMSOURCES
index bb57e16e82..bb57e16e82 100644
--- a/apps/codecs/libgme/VGMSOURCES
+++ b/lib/rbcodec/codecs/libgme/VGMSOURCES
diff --git a/apps/codecs/libgme/ay_apu.c b/lib/rbcodec/codecs/libgme/ay_apu.c
index c84e92d43d..c84e92d43d 100644
--- a/apps/codecs/libgme/ay_apu.c
+++ b/lib/rbcodec/codecs/libgme/ay_apu.c
diff --git a/apps/codecs/libgme/ay_apu.h b/lib/rbcodec/codecs/libgme/ay_apu.h
index 3df6ba1118..3df6ba1118 100644
--- a/apps/codecs/libgme/ay_apu.h
+++ b/lib/rbcodec/codecs/libgme/ay_apu.h
diff --git a/apps/codecs/libgme/ay_cpu.c b/lib/rbcodec/codecs/libgme/ay_cpu.c
index 5fbfe7c1ea..5fbfe7c1ea 100644
--- a/apps/codecs/libgme/ay_cpu.c
+++ b/lib/rbcodec/codecs/libgme/ay_cpu.c
diff --git a/apps/codecs/libgme/ay_emu.c b/lib/rbcodec/codecs/libgme/ay_emu.c
index 92faba4929..92faba4929 100644
--- a/apps/codecs/libgme/ay_emu.c
+++ b/lib/rbcodec/codecs/libgme/ay_emu.c
diff --git a/apps/codecs/libgme/ay_emu.h b/lib/rbcodec/codecs/libgme/ay_emu.h
index 7334167876..7334167876 100644
--- a/apps/codecs/libgme/ay_emu.h
+++ b/lib/rbcodec/codecs/libgme/ay_emu.h
diff --git a/apps/codecs/libgme/blargg_common.h b/lib/rbcodec/codecs/libgme/blargg_common.h
index 74cc227eed..74cc227eed 100644
--- a/apps/codecs/libgme/blargg_common.h
+++ b/lib/rbcodec/codecs/libgme/blargg_common.h
diff --git a/apps/codecs/libgme/blargg_config.h b/lib/rbcodec/codecs/libgme/blargg_config.h
index 398913d1fe..398913d1fe 100644
--- a/apps/codecs/libgme/blargg_config.h
+++ b/lib/rbcodec/codecs/libgme/blargg_config.h
diff --git a/apps/codecs/libgme/blargg_endian.h b/lib/rbcodec/codecs/libgme/blargg_endian.h
index dce5cb2048..dce5cb2048 100644
--- a/apps/codecs/libgme/blargg_endian.h
+++ b/lib/rbcodec/codecs/libgme/blargg_endian.h
diff --git a/apps/codecs/libgme/blargg_source.h b/lib/rbcodec/codecs/libgme/blargg_source.h
index ab8e1b072b..ab8e1b072b 100644
--- a/apps/codecs/libgme/blargg_source.h
+++ b/lib/rbcodec/codecs/libgme/blargg_source.h
diff --git a/apps/codecs/libgme/blip_buffer.c b/lib/rbcodec/codecs/libgme/blip_buffer.c
index ba0a6558d2..ba0a6558d2 100644
--- a/apps/codecs/libgme/blip_buffer.c
+++ b/lib/rbcodec/codecs/libgme/blip_buffer.c
diff --git a/apps/codecs/libgme/blip_buffer.h b/lib/rbcodec/codecs/libgme/blip_buffer.h
index 5fe1f4b9c6..5fe1f4b9c6 100644
--- a/apps/codecs/libgme/blip_buffer.h
+++ b/lib/rbcodec/codecs/libgme/blip_buffer.h
diff --git a/apps/codecs/libgme/emu2413.c b/lib/rbcodec/codecs/libgme/emu2413.c
index 01075821cb..01075821cb 100644
--- a/apps/codecs/libgme/emu2413.c
+++ b/lib/rbcodec/codecs/libgme/emu2413.c
diff --git a/apps/codecs/libgme/emu2413.h b/lib/rbcodec/codecs/libgme/emu2413.h
index 254f042957..254f042957 100644
--- a/apps/codecs/libgme/emu2413.h
+++ b/lib/rbcodec/codecs/libgme/emu2413.h
diff --git a/apps/codecs/libgme/emu8950.c b/lib/rbcodec/codecs/libgme/emu8950.c
index 2f8a32044f..2f8a32044f 100644
--- a/apps/codecs/libgme/emu8950.c
+++ b/lib/rbcodec/codecs/libgme/emu8950.c
diff --git a/apps/codecs/libgme/emu8950.h b/lib/rbcodec/codecs/libgme/emu8950.h
index 02169050d2..02169050d2 100644
--- a/apps/codecs/libgme/emu8950.h
+++ b/lib/rbcodec/codecs/libgme/emu8950.h
diff --git a/apps/codecs/libgme/emuadpcm.c b/lib/rbcodec/codecs/libgme/emuadpcm.c
index b426a74de5..b426a74de5 100644
--- a/apps/codecs/libgme/emuadpcm.c
+++ b/lib/rbcodec/codecs/libgme/emuadpcm.c
diff --git a/apps/codecs/libgme/emuadpcm.h b/lib/rbcodec/codecs/libgme/emuadpcm.h
index 0fc39a1709..0fc39a1709 100644
--- a/apps/codecs/libgme/emuadpcm.h
+++ b/lib/rbcodec/codecs/libgme/emuadpcm.h
diff --git a/apps/codecs/libgme/emutables.h b/lib/rbcodec/codecs/libgme/emutables.h
index 739c8c390a..739c8c390a 100644
--- a/apps/codecs/libgme/emutables.h
+++ b/lib/rbcodec/codecs/libgme/emutables.h
diff --git a/apps/codecs/libgme/emutypes.h b/lib/rbcodec/codecs/libgme/emutypes.h
index bc523db072..bc523db072 100644
--- a/apps/codecs/libgme/emutypes.h
+++ b/lib/rbcodec/codecs/libgme/emutypes.h
diff --git a/apps/codecs/libgme/gb_apu.c b/lib/rbcodec/codecs/libgme/gb_apu.c
index e8bf3afcf5..e8bf3afcf5 100644
--- a/apps/codecs/libgme/gb_apu.c
+++ b/lib/rbcodec/codecs/libgme/gb_apu.c
diff --git a/apps/codecs/libgme/gb_apu.h b/lib/rbcodec/codecs/libgme/gb_apu.h
index 69307b9840..69307b9840 100644
--- a/apps/codecs/libgme/gb_apu.h
+++ b/lib/rbcodec/codecs/libgme/gb_apu.h
diff --git a/apps/codecs/libgme/gb_cpu.c b/lib/rbcodec/codecs/libgme/gb_cpu.c
index 4b2df63a17..4b2df63a17 100644
--- a/apps/codecs/libgme/gb_cpu.c
+++ b/lib/rbcodec/codecs/libgme/gb_cpu.c
diff --git a/apps/codecs/libgme/gb_cpu.h b/lib/rbcodec/codecs/libgme/gb_cpu.h
index 37b22141d7..37b22141d7 100644
--- a/apps/codecs/libgme/gb_cpu.h
+++ b/lib/rbcodec/codecs/libgme/gb_cpu.h
diff --git a/apps/codecs/libgme/gb_cpu_run.h b/lib/rbcodec/codecs/libgme/gb_cpu_run.h
index 1ea8b59249..1ea8b59249 100644
--- a/apps/codecs/libgme/gb_cpu_run.h
+++ b/lib/rbcodec/codecs/libgme/gb_cpu_run.h
diff --git a/apps/codecs/libgme/gb_oscs.c b/lib/rbcodec/codecs/libgme/gb_oscs.c
index 09bb98238e..09bb98238e 100644
--- a/apps/codecs/libgme/gb_oscs.c
+++ b/lib/rbcodec/codecs/libgme/gb_oscs.c
diff --git a/apps/codecs/libgme/gb_oscs.h b/lib/rbcodec/codecs/libgme/gb_oscs.h
index 3c8dfef51f..3c8dfef51f 100644
--- a/apps/codecs/libgme/gb_oscs.h
+++ b/lib/rbcodec/codecs/libgme/gb_oscs.h
diff --git a/apps/codecs/libgme/gbs_cpu.c b/lib/rbcodec/codecs/libgme/gbs_cpu.c
index 1015dd5358..1015dd5358 100644
--- a/apps/codecs/libgme/gbs_cpu.c
+++ b/lib/rbcodec/codecs/libgme/gbs_cpu.c
diff --git a/apps/codecs/libgme/gbs_emu.c b/lib/rbcodec/codecs/libgme/gbs_emu.c
index 7a6d484673..7a6d484673 100644
--- a/apps/codecs/libgme/gbs_emu.c
+++ b/lib/rbcodec/codecs/libgme/gbs_emu.c
diff --git a/apps/codecs/libgme/gbs_emu.h b/lib/rbcodec/codecs/libgme/gbs_emu.h
index 72671b4658..72671b4658 100644
--- a/apps/codecs/libgme/gbs_emu.h
+++ b/lib/rbcodec/codecs/libgme/gbs_emu.h
diff --git a/apps/codecs/libgme/gme.h b/lib/rbcodec/codecs/libgme/gme.h
index d6803704ce..d6803704ce 100644
--- a/apps/codecs/libgme/gme.h
+++ b/lib/rbcodec/codecs/libgme/gme.h
diff --git a/apps/codecs/libgme/hes_apu.c b/lib/rbcodec/codecs/libgme/hes_apu.c
index a9cd32c8aa..a9cd32c8aa 100644
--- a/apps/codecs/libgme/hes_apu.c
+++ b/lib/rbcodec/codecs/libgme/hes_apu.c
diff --git a/apps/codecs/libgme/hes_apu.h b/lib/rbcodec/codecs/libgme/hes_apu.h
index 0265e6a3ad..0265e6a3ad 100644
--- a/apps/codecs/libgme/hes_apu.h
+++ b/lib/rbcodec/codecs/libgme/hes_apu.h
diff --git a/apps/codecs/libgme/hes_apu_adpcm.c b/lib/rbcodec/codecs/libgme/hes_apu_adpcm.c
index de9b894f5d..de9b894f5d 100644
--- a/apps/codecs/libgme/hes_apu_adpcm.c
+++ b/lib/rbcodec/codecs/libgme/hes_apu_adpcm.c
diff --git a/apps/codecs/libgme/hes_apu_adpcm.h b/lib/rbcodec/codecs/libgme/hes_apu_adpcm.h
index afe160bb9c..afe160bb9c 100644
--- a/apps/codecs/libgme/hes_apu_adpcm.h
+++ b/lib/rbcodec/codecs/libgme/hes_apu_adpcm.h
diff --git a/apps/codecs/libgme/hes_cpu.c b/lib/rbcodec/codecs/libgme/hes_cpu.c
index 6b833b3b98..6b833b3b98 100644
--- a/apps/codecs/libgme/hes_cpu.c
+++ b/lib/rbcodec/codecs/libgme/hes_cpu.c
diff --git a/apps/codecs/libgme/hes_cpu.h b/lib/rbcodec/codecs/libgme/hes_cpu.h
index 0429eeaba0..0429eeaba0 100644
--- a/apps/codecs/libgme/hes_cpu.h
+++ b/lib/rbcodec/codecs/libgme/hes_cpu.h
diff --git a/apps/codecs/libgme/hes_cpu_run.h b/lib/rbcodec/codecs/libgme/hes_cpu_run.h
index bfba2b6109..bfba2b6109 100644
--- a/apps/codecs/libgme/hes_cpu_run.h
+++ b/lib/rbcodec/codecs/libgme/hes_cpu_run.h
diff --git a/apps/codecs/libgme/hes_emu.c b/lib/rbcodec/codecs/libgme/hes_emu.c
index d6bafea334..d6bafea334 100644
--- a/apps/codecs/libgme/hes_emu.c
+++ b/lib/rbcodec/codecs/libgme/hes_emu.c
diff --git a/apps/codecs/libgme/hes_emu.h b/lib/rbcodec/codecs/libgme/hes_emu.h
index a1dd048498..a1dd048498 100644
--- a/apps/codecs/libgme/hes_emu.h
+++ b/lib/rbcodec/codecs/libgme/hes_emu.h
diff --git a/apps/codecs/libgme/inflate/bbfuncs.c b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.c
index 3b23c3b6db..3b23c3b6db 100644
--- a/apps/codecs/libgme/inflate/bbfuncs.c
+++ b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.c
diff --git a/apps/codecs/libgme/inflate/bbfuncs.h b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.h
index fe03ec1a3c..fe03ec1a3c 100644
--- a/apps/codecs/libgme/inflate/bbfuncs.h
+++ b/lib/rbcodec/codecs/libgme/inflate/bbfuncs.h
diff --git a/apps/codecs/libgme/inflate/inflate.c b/lib/rbcodec/codecs/libgme/inflate/inflate.c
index 130abe89be..130abe89be 100644
--- a/apps/codecs/libgme/inflate/inflate.c
+++ b/lib/rbcodec/codecs/libgme/inflate/inflate.c
diff --git a/apps/codecs/libgme/inflate/inflate.h b/lib/rbcodec/codecs/libgme/inflate/inflate.h
index 05164621b9..05164621b9 100644
--- a/apps/codecs/libgme/inflate/inflate.h
+++ b/lib/rbcodec/codecs/libgme/inflate/inflate.h
diff --git a/apps/codecs/libgme/inflate/mallocer.c b/lib/rbcodec/codecs/libgme/inflate/mallocer.c
index 41abedd09f..41abedd09f 100644
--- a/apps/codecs/libgme/inflate/mallocer.c
+++ b/lib/rbcodec/codecs/libgme/inflate/mallocer.c
diff --git a/apps/codecs/libgme/inflate/mallocer.h b/lib/rbcodec/codecs/libgme/inflate/mallocer.h
index 091643443c..091643443c 100644
--- a/apps/codecs/libgme/inflate/mallocer.h
+++ b/lib/rbcodec/codecs/libgme/inflate/mallocer.h
diff --git a/apps/codecs/libgme/inflate/mbreader.c b/lib/rbcodec/codecs/libgme/inflate/mbreader.c
index 825787927c..825787927c 100644
--- a/apps/codecs/libgme/inflate/mbreader.c
+++ b/lib/rbcodec/codecs/libgme/inflate/mbreader.c
diff --git a/apps/codecs/libgme/inflate/mbreader.h b/lib/rbcodec/codecs/libgme/inflate/mbreader.h
index d345c0c424..d345c0c424 100644
--- a/apps/codecs/libgme/inflate/mbreader.h
+++ b/lib/rbcodec/codecs/libgme/inflate/mbreader.h
diff --git a/apps/codecs/libgme/kss_cpu.c b/lib/rbcodec/codecs/libgme/kss_cpu.c
index 20601e608f..20601e608f 100644
--- a/apps/codecs/libgme/kss_cpu.c
+++ b/lib/rbcodec/codecs/libgme/kss_cpu.c
diff --git a/apps/codecs/libgme/kss_emu.c b/lib/rbcodec/codecs/libgme/kss_emu.c
index ba80ef613e..ba80ef613e 100644
--- a/apps/codecs/libgme/kss_emu.c
+++ b/lib/rbcodec/codecs/libgme/kss_emu.c
diff --git a/apps/codecs/libgme/kss_emu.h b/lib/rbcodec/codecs/libgme/kss_emu.h
index 382e4b807b..382e4b807b 100644
--- a/apps/codecs/libgme/kss_emu.h
+++ b/lib/rbcodec/codecs/libgme/kss_emu.h
diff --git a/apps/codecs/libgme/kss_scc_apu.c b/lib/rbcodec/codecs/libgme/kss_scc_apu.c
index 1bec9b7f0e..1bec9b7f0e 100644
--- a/apps/codecs/libgme/kss_scc_apu.c
+++ b/lib/rbcodec/codecs/libgme/kss_scc_apu.c
diff --git a/apps/codecs/libgme/kss_scc_apu.h b/lib/rbcodec/codecs/libgme/kss_scc_apu.h
index a6962469ac..a6962469ac 100644
--- a/apps/codecs/libgme/kss_scc_apu.h
+++ b/lib/rbcodec/codecs/libgme/kss_scc_apu.h
diff --git a/apps/codecs/libgme/libay.make b/lib/rbcodec/codecs/libgme/libay.make
index 0b5691c1f1..135ad041d3 100644
--- a/apps/codecs/libgme/libay.make
+++ b/lib/rbcodec/codecs/libgme/libay.make
@@ -1,7 +1,7 @@
 
 # libay
 AYLIB := $(CODECDIR)/libay.a
-AYLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/AYSOURCES)
+AYLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/AYSOURCES)
 AYLIB_OBJ := $(call c2obj, $(AYLIB_SRC))
 OTHER_SRC += $(AYLIB_SRC)
 
diff --git a/apps/codecs/libgme/libemu2413.make b/lib/rbcodec/codecs/libgme/libemu2413.make
index 2f489ced46..4d596dd93e 100644
--- a/apps/codecs/libgme/libemu2413.make
+++ b/lib/rbcodec/codecs/libgme/libemu2413.make
@@ -1,7 +1,7 @@
 
 # libemu2413
 EMU2413LIB := $(CODECDIR)/libemu2413.a
-EMU2413LIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/EMU2413SOURCES)
+EMU2413LIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/EMU2413SOURCES)
 EMU2413LIB_OBJ := $(call c2obj, $(EMU2413LIB_SRC))
 OTHER_SRC += $(EMU2413LIB_SRC)
 
diff --git a/apps/codecs/libgme/libgbs.make b/lib/rbcodec/codecs/libgme/libgbs.make
index 6661a4994f..c6f872d6be 100644
--- a/apps/codecs/libgme/libgbs.make
+++ b/lib/rbcodec/codecs/libgme/libgbs.make
@@ -1,7 +1,7 @@
 
 # libgbs
 GBSLIB := $(CODECDIR)/libgbs.a
-GBSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/GBSSOURCES)
+GBSLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/GBSSOURCES)
 GBSLIB_OBJ := $(call c2obj, $(GBSLIB_SRC))
 OTHER_SRC += $(GBSLIB_SRC)
 
diff --git a/apps/codecs/libgme/libhes.make b/lib/rbcodec/codecs/libgme/libhes.make
index 81e29f8c5a..1d99f6a192 100644
--- a/apps/codecs/libgme/libhes.make
+++ b/lib/rbcodec/codecs/libgme/libhes.make
@@ -1,7 +1,7 @@
 
 # libhes
 HESLIB := $(CODECDIR)/libhes.a
-HESLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/HESSOURCES)
+HESLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/HESSOURCES)
 HESLIB_OBJ := $(call c2obj, $(HESLIB_SRC))
 OTHER_SRC += $(HESLIB_SRC)
 
diff --git a/apps/codecs/libgme/libkss.make b/lib/rbcodec/codecs/libgme/libkss.make
index c93d8d169f..fc12bc22b4 100644
--- a/apps/codecs/libgme/libkss.make
+++ b/lib/rbcodec/codecs/libgme/libkss.make
@@ -1,7 +1,7 @@
 
 # libkss
 KSSLIB := $(CODECDIR)/libkss.a
-KSSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/KSSSOURCES)
+KSSLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/KSSSOURCES)
 KSSLIB_OBJ := $(call c2obj, $(KSSLIB_SRC))
 OTHER_SRC += $(KSSLIB_SRC)
 
diff --git a/apps/codecs/libgme/libnsf.make b/lib/rbcodec/codecs/libgme/libnsf.make
index 9ab171711a..1e7d56b88a 100644
--- a/apps/codecs/libgme/libnsf.make
+++ b/lib/rbcodec/codecs/libgme/libnsf.make
@@ -1,7 +1,7 @@
 
 # libnsf
 NSFLIB := $(CODECDIR)/libnsf.a
-NSFLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/NSFSOURCES)
+NSFLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/NSFSOURCES)
 NSFLIB_OBJ := $(call c2obj, $(NSFLIB_SRC))
 OTHER_SRC += $(NSFLIB_SRC)
 
diff --git a/apps/codecs/libgme/libsgc.make b/lib/rbcodec/codecs/libgme/libsgc.make
index ddaec96081..3caa3abd05 100644
--- a/apps/codecs/libgme/libsgc.make
+++ b/lib/rbcodec/codecs/libgme/libsgc.make
@@ -1,7 +1,7 @@
 
 # libsgc
 SGCLIB := $(CODECDIR)/libsgc.a
-SGCLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/SGCSOURCES)
+SGCLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/SGCSOURCES)
 SGCLIB_OBJ := $(call c2obj, $(SGCLIB_SRC))
 OTHER_SRC += $(SGCLIB_SRC)
 
diff --git a/apps/codecs/libgme/libvgm.make b/lib/rbcodec/codecs/libgme/libvgm.make
index cc492d5143..24efc6ae3d 100644
--- a/apps/codecs/libgme/libvgm.make
+++ b/lib/rbcodec/codecs/libgme/libvgm.make
@@ -1,7 +1,7 @@
 
 # libvgm
 VGMLIB := $(CODECDIR)/libvgm.a
-VGMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libgme/VGMSOURCES)
+VGMLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libgme/VGMSOURCES)
 VGMLIB_OBJ := $(call c2obj, $(VGMLIB_SRC))
 OTHER_SRC += $(VGMLIB_SRC)
 
diff --git a/apps/codecs/libgme/m3u_playlist.h b/lib/rbcodec/codecs/libgme/m3u_playlist.h
index 06a5d3024b..06a5d3024b 100644
--- a/apps/codecs/libgme/m3u_playlist.h
+++ b/lib/rbcodec/codecs/libgme/m3u_playlist.h
diff --git a/apps/codecs/libgme/msxtypes.h b/lib/rbcodec/codecs/libgme/msxtypes.h
index 6224e0760c..6224e0760c 100644
--- a/apps/codecs/libgme/msxtypes.h
+++ b/lib/rbcodec/codecs/libgme/msxtypes.h
diff --git a/apps/codecs/libgme/multi_buffer.c b/lib/rbcodec/codecs/libgme/multi_buffer.c
index 554778c3de..554778c3de 100644
--- a/apps/codecs/libgme/multi_buffer.c
+++ b/lib/rbcodec/codecs/libgme/multi_buffer.c
diff --git a/apps/codecs/libgme/multi_buffer.h b/lib/rbcodec/codecs/libgme/multi_buffer.h
index e5efa5a230..e5efa5a230 100644
--- a/apps/codecs/libgme/multi_buffer.h
+++ b/lib/rbcodec/codecs/libgme/multi_buffer.h
diff --git a/apps/codecs/libgme/nes_apu.c b/lib/rbcodec/codecs/libgme/nes_apu.c
index b6c88bc7e7..b6c88bc7e7 100644
--- a/apps/codecs/libgme/nes_apu.c
+++ b/lib/rbcodec/codecs/libgme/nes_apu.c
diff --git a/apps/codecs/libgme/nes_apu.h b/lib/rbcodec/codecs/libgme/nes_apu.h
index 152ec94a17..152ec94a17 100644
--- a/apps/codecs/libgme/nes_apu.h
+++ b/lib/rbcodec/codecs/libgme/nes_apu.h
diff --git a/apps/codecs/libgme/nes_cpu.c b/lib/rbcodec/codecs/libgme/nes_cpu.c
index 20925918c2..20925918c2 100644
--- a/apps/codecs/libgme/nes_cpu.c
+++ b/lib/rbcodec/codecs/libgme/nes_cpu.c
diff --git a/apps/codecs/libgme/nes_cpu.h b/lib/rbcodec/codecs/libgme/nes_cpu.h
index e4538cd00c..e4538cd00c 100644
--- a/apps/codecs/libgme/nes_cpu.h
+++ b/lib/rbcodec/codecs/libgme/nes_cpu.h
diff --git a/apps/codecs/libgme/nes_cpu_run.h b/lib/rbcodec/codecs/libgme/nes_cpu_run.h
index fd1fea9659..fd1fea9659 100644
--- a/apps/codecs/libgme/nes_cpu_run.h
+++ b/lib/rbcodec/codecs/libgme/nes_cpu_run.h
diff --git a/apps/codecs/libgme/nes_fds_apu.c b/lib/rbcodec/codecs/libgme/nes_fds_apu.c
index dc0775d5d3..dc0775d5d3 100644
--- a/apps/codecs/libgme/nes_fds_apu.c
+++ b/lib/rbcodec/codecs/libgme/nes_fds_apu.c
diff --git a/apps/codecs/libgme/nes_fds_apu.h b/lib/rbcodec/codecs/libgme/nes_fds_apu.h
index 8dac3b721a..8dac3b721a 100644
--- a/apps/codecs/libgme/nes_fds_apu.h
+++ b/lib/rbcodec/codecs/libgme/nes_fds_apu.h
diff --git a/apps/codecs/libgme/nes_fme7_apu.c b/lib/rbcodec/codecs/libgme/nes_fme7_apu.c
index 3e47e0b17c..3e47e0b17c 100644
--- a/apps/codecs/libgme/nes_fme7_apu.c
+++ b/lib/rbcodec/codecs/libgme/nes_fme7_apu.c
diff --git a/apps/codecs/libgme/nes_fme7_apu.h b/lib/rbcodec/codecs/libgme/nes_fme7_apu.h
index c0eac4c765..c0eac4c765 100644
--- a/apps/codecs/libgme/nes_fme7_apu.h
+++ b/lib/rbcodec/codecs/libgme/nes_fme7_apu.h
diff --git a/apps/codecs/libgme/nes_mmc5_apu.h b/lib/rbcodec/codecs/libgme/nes_mmc5_apu.h
index b696b49e97..b696b49e97 100644
--- a/apps/codecs/libgme/nes_mmc5_apu.h
+++ b/lib/rbcodec/codecs/libgme/nes_mmc5_apu.h
diff --git a/apps/codecs/libgme/nes_namco_apu.c b/lib/rbcodec/codecs/libgme/nes_namco_apu.c
index 34df200bb6..34df200bb6 100644
--- a/apps/codecs/libgme/nes_namco_apu.c
+++ b/lib/rbcodec/codecs/libgme/nes_namco_apu.c
diff --git a/apps/codecs/libgme/nes_namco_apu.h b/lib/rbcodec/codecs/libgme/nes_namco_apu.h
index c428c894c3..c428c894c3 100644
--- a/apps/codecs/libgme/nes_namco_apu.h
+++ b/lib/rbcodec/codecs/libgme/nes_namco_apu.h
diff --git a/apps/codecs/libgme/nes_oscs.c b/lib/rbcodec/codecs/libgme/nes_oscs.c
index ac6e5759da..ac6e5759da 100644
--- a/apps/codecs/libgme/nes_oscs.c
+++ b/lib/rbcodec/codecs/libgme/nes_oscs.c
diff --git a/apps/codecs/libgme/nes_oscs.h b/lib/rbcodec/codecs/libgme/nes_oscs.h
index 1eeb302e6c..1eeb302e6c 100644
--- a/apps/codecs/libgme/nes_oscs.h
+++ b/lib/rbcodec/codecs/libgme/nes_oscs.h
diff --git a/apps/codecs/libgme/nes_vrc6_apu.c b/lib/rbcodec/codecs/libgme/nes_vrc6_apu.c
index 99a9ae3fed..99a9ae3fed 100644
--- a/apps/codecs/libgme/nes_vrc6_apu.c
+++ b/lib/rbcodec/codecs/libgme/nes_vrc6_apu.c
diff --git a/apps/codecs/libgme/nes_vrc6_apu.h b/lib/rbcodec/codecs/libgme/nes_vrc6_apu.h
index 57b8a42a79..57b8a42a79 100644
--- a/apps/codecs/libgme/nes_vrc6_apu.h
+++ b/lib/rbcodec/codecs/libgme/nes_vrc6_apu.h
diff --git a/apps/codecs/libgme/nes_vrc7_apu.c b/lib/rbcodec/codecs/libgme/nes_vrc7_apu.c
index 8d3c2e88a6..8d3c2e88a6 100644
--- a/apps/codecs/libgme/nes_vrc7_apu.c
+++ b/lib/rbcodec/codecs/libgme/nes_vrc7_apu.c
diff --git a/apps/codecs/libgme/nes_vrc7_apu.h b/lib/rbcodec/codecs/libgme/nes_vrc7_apu.h
index 1f45a435db..1f45a435db 100644
--- a/apps/codecs/libgme/nes_vrc7_apu.h
+++ b/lib/rbcodec/codecs/libgme/nes_vrc7_apu.h
diff --git a/apps/codecs/libgme/nsf_cpu.c b/lib/rbcodec/codecs/libgme/nsf_cpu.c
index 1f44bd3c3c..1f44bd3c3c 100644
--- a/apps/codecs/libgme/nsf_cpu.c
+++ b/lib/rbcodec/codecs/libgme/nsf_cpu.c
diff --git a/apps/codecs/libgme/nsf_emu.c b/lib/rbcodec/codecs/libgme/nsf_emu.c
index d9fc4e031d..d9fc4e031d 100644
--- a/apps/codecs/libgme/nsf_emu.c
+++ b/lib/rbcodec/codecs/libgme/nsf_emu.c
diff --git a/apps/codecs/libgme/nsf_emu.h b/lib/rbcodec/codecs/libgme/nsf_emu.h
index 00bdad4a4e..00bdad4a4e 100644
--- a/apps/codecs/libgme/nsf_emu.h
+++ b/lib/rbcodec/codecs/libgme/nsf_emu.h
diff --git a/apps/codecs/libgme/nsfe_info.c b/lib/rbcodec/codecs/libgme/nsfe_info.c
index 337b1e580a..337b1e580a 100644
--- a/apps/codecs/libgme/nsfe_info.c
+++ b/lib/rbcodec/codecs/libgme/nsfe_info.c
diff --git a/apps/codecs/libgme/nsfe_info.h b/lib/rbcodec/codecs/libgme/nsfe_info.h
index 9dcde7b68a..9dcde7b68a 100644
--- a/apps/codecs/libgme/nsfe_info.h
+++ b/lib/rbcodec/codecs/libgme/nsfe_info.h
diff --git a/apps/codecs/libgme/opl_apu.c b/lib/rbcodec/codecs/libgme/opl_apu.c
index b573baef11..b573baef11 100644
--- a/apps/codecs/libgme/opl_apu.c
+++ b/lib/rbcodec/codecs/libgme/opl_apu.c
diff --git a/apps/codecs/libgme/opl_apu.h b/lib/rbcodec/codecs/libgme/opl_apu.h
index 76fa766492..76fa766492 100644
--- a/apps/codecs/libgme/opl_apu.h
+++ b/lib/rbcodec/codecs/libgme/opl_apu.h
diff --git a/apps/codecs/libgme/opltables.h b/lib/rbcodec/codecs/libgme/opltables.h
index 50fc0a86c6..50fc0a86c6 100644
--- a/apps/codecs/libgme/opltables.h
+++ b/lib/rbcodec/codecs/libgme/opltables.h
diff --git a/apps/codecs/libgme/resampler.c b/lib/rbcodec/codecs/libgme/resampler.c
index c4f42a9794..c4f42a9794 100644
--- a/apps/codecs/libgme/resampler.c
+++ b/lib/rbcodec/codecs/libgme/resampler.c
diff --git a/apps/codecs/libgme/resampler.h b/lib/rbcodec/codecs/libgme/resampler.h
index 3f3710a54a..3f3710a54a 100644
--- a/apps/codecs/libgme/resampler.h
+++ b/lib/rbcodec/codecs/libgme/resampler.h
diff --git a/apps/codecs/libgme/rom_data.c b/lib/rbcodec/codecs/libgme/rom_data.c
index 9c36a99d2d..9c36a99d2d 100644
--- a/apps/codecs/libgme/rom_data.c
+++ b/lib/rbcodec/codecs/libgme/rom_data.c
diff --git a/apps/codecs/libgme/rom_data.h b/lib/rbcodec/codecs/libgme/rom_data.h
index b8bc54cd3f..b8bc54cd3f 100644
--- a/apps/codecs/libgme/rom_data.h
+++ b/lib/rbcodec/codecs/libgme/rom_data.h
diff --git a/apps/codecs/libgme/sgc_cpu.c b/lib/rbcodec/codecs/libgme/sgc_cpu.c
index d23c01499b..d23c01499b 100644
--- a/apps/codecs/libgme/sgc_cpu.c
+++ b/lib/rbcodec/codecs/libgme/sgc_cpu.c
diff --git a/apps/codecs/libgme/sgc_emu.c b/lib/rbcodec/codecs/libgme/sgc_emu.c
index 267f2c9271..267f2c9271 100644
--- a/apps/codecs/libgme/sgc_emu.c
+++ b/lib/rbcodec/codecs/libgme/sgc_emu.c
diff --git a/apps/codecs/libgme/sgc_emu.h b/lib/rbcodec/codecs/libgme/sgc_emu.h
index 83cde1e6ae..83cde1e6ae 100644
--- a/apps/codecs/libgme/sgc_emu.h
+++ b/lib/rbcodec/codecs/libgme/sgc_emu.h
diff --git a/apps/codecs/libgme/sms_apu.c b/lib/rbcodec/codecs/libgme/sms_apu.c
index 379fcf1cbf..379fcf1cbf 100644
--- a/apps/codecs/libgme/sms_apu.c
+++ b/lib/rbcodec/codecs/libgme/sms_apu.c
diff --git a/apps/codecs/libgme/sms_apu.h b/lib/rbcodec/codecs/libgme/sms_apu.h
index 6dd65591ce..6dd65591ce 100644
--- a/apps/codecs/libgme/sms_apu.h
+++ b/lib/rbcodec/codecs/libgme/sms_apu.h
diff --git a/apps/codecs/libgme/sms_fm_apu.c b/lib/rbcodec/codecs/libgme/sms_fm_apu.c
index ee5ce48932..ee5ce48932 100644
--- a/apps/codecs/libgme/sms_fm_apu.c
+++ b/lib/rbcodec/codecs/libgme/sms_fm_apu.c
diff --git a/apps/codecs/libgme/sms_fm_apu.h b/lib/rbcodec/codecs/libgme/sms_fm_apu.h
index 921db6cef1..921db6cef1 100644
--- a/apps/codecs/libgme/sms_fm_apu.h
+++ b/lib/rbcodec/codecs/libgme/sms_fm_apu.h
diff --git a/apps/codecs/libgme/track_filter.c b/lib/rbcodec/codecs/libgme/track_filter.c
index d0d75f2ded..d0d75f2ded 100644
--- a/apps/codecs/libgme/track_filter.c
+++ b/lib/rbcodec/codecs/libgme/track_filter.c
diff --git a/apps/codecs/libgme/track_filter.h b/lib/rbcodec/codecs/libgme/track_filter.h
index 3689be9620..3689be9620 100644
--- a/apps/codecs/libgme/track_filter.h
+++ b/lib/rbcodec/codecs/libgme/track_filter.h
diff --git a/apps/codecs/libgme/vgm_emu.c b/lib/rbcodec/codecs/libgme/vgm_emu.c
index 4b8953ccf4..4b8953ccf4 100644
--- a/apps/codecs/libgme/vgm_emu.c
+++ b/lib/rbcodec/codecs/libgme/vgm_emu.c
diff --git a/apps/codecs/libgme/vgm_emu.h b/lib/rbcodec/codecs/libgme/vgm_emu.h
index 8c39482008..8c39482008 100644
--- a/apps/codecs/libgme/vgm_emu.h
+++ b/lib/rbcodec/codecs/libgme/vgm_emu.h
diff --git a/apps/codecs/libgme/vrc7tone.h b/lib/rbcodec/codecs/libgme/vrc7tone.h
index c589335c3c..c589335c3c 100644
--- a/apps/codecs/libgme/vrc7tone.h
+++ b/lib/rbcodec/codecs/libgme/vrc7tone.h
diff --git a/apps/codecs/libgme/ym2413_emu.c b/lib/rbcodec/codecs/libgme/ym2413_emu.c
index d9ada431ca..d9ada431ca 100644
--- a/apps/codecs/libgme/ym2413_emu.c
+++ b/lib/rbcodec/codecs/libgme/ym2413_emu.c
diff --git a/apps/codecs/libgme/ym2413_emu.h b/lib/rbcodec/codecs/libgme/ym2413_emu.h
index 8f52b04fbd..8f52b04fbd 100644
--- a/apps/codecs/libgme/ym2413_emu.h
+++ b/lib/rbcodec/codecs/libgme/ym2413_emu.h
diff --git a/apps/codecs/libgme/ym2612_emu.c b/lib/rbcodec/codecs/libgme/ym2612_emu.c
index 60df30a33c..60df30a33c 100644
--- a/apps/codecs/libgme/ym2612_emu.c
+++ b/lib/rbcodec/codecs/libgme/ym2612_emu.c
diff --git a/apps/codecs/libgme/ym2612_emu.h b/lib/rbcodec/codecs/libgme/ym2612_emu.h
index 146d92a0a3..146d92a0a3 100644
--- a/apps/codecs/libgme/ym2612_emu.h
+++ b/lib/rbcodec/codecs/libgme/ym2612_emu.h
diff --git a/apps/codecs/libgme/ymtables.h b/lib/rbcodec/codecs/libgme/ymtables.h
index c1619026b2..c1619026b2 100644
--- a/apps/codecs/libgme/ymtables.h
+++ b/lib/rbcodec/codecs/libgme/ymtables.h
diff --git a/apps/codecs/libgme/z80_cpu.c b/lib/rbcodec/codecs/libgme/z80_cpu.c
index a31236020e..a31236020e 100644
--- a/apps/codecs/libgme/z80_cpu.c
+++ b/lib/rbcodec/codecs/libgme/z80_cpu.c
diff --git a/apps/codecs/libgme/z80_cpu.h b/lib/rbcodec/codecs/libgme/z80_cpu.h
index 341119b6b1..341119b6b1 100644
--- a/apps/codecs/libgme/z80_cpu.h
+++ b/lib/rbcodec/codecs/libgme/z80_cpu.h
diff --git a/apps/codecs/libgme/z80_cpu_run.h b/lib/rbcodec/codecs/libgme/z80_cpu_run.h
index a453487bb0..a453487bb0 100644
--- a/apps/codecs/libgme/z80_cpu_run.h
+++ b/lib/rbcodec/codecs/libgme/z80_cpu_run.h
diff --git a/apps/codecs/libm4a/SOURCES b/lib/rbcodec/codecs/libm4a/SOURCES
index 01b93bef01..01b93bef01 100644
--- a/apps/codecs/libm4a/SOURCES
+++ b/lib/rbcodec/codecs/libm4a/SOURCES
diff --git a/apps/codecs/libm4a/demux.c b/lib/rbcodec/codecs/libm4a/demux.c
index 7b09074c52..7b09074c52 100644
--- a/apps/codecs/libm4a/demux.c
+++ b/lib/rbcodec/codecs/libm4a/demux.c
diff --git a/apps/codecs/libm4a/libm4a.make b/lib/rbcodec/codecs/libm4a/libm4a.make
index 9a8a4cb74a..c25f63fa70 100644
--- a/apps/codecs/libm4a/libm4a.make
+++ b/lib/rbcodec/codecs/libm4a/libm4a.make
@@ -9,7 +9,7 @@
 
 # libm4a
 M4ALIB := $(CODECDIR)/libm4a.a
-M4ALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libm4a/SOURCES)
+M4ALIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libm4a/SOURCES)
 M4ALIB_OBJ := $(call c2obj, $(M4ALIB_SRC))
 OTHER_SRC += $(M4ALIB_SRC)
 
diff --git a/apps/codecs/libm4a/m4a.c b/lib/rbcodec/codecs/libm4a/m4a.c
index 5fe778ac03..5fe778ac03 100644
--- a/apps/codecs/libm4a/m4a.c
+++ b/lib/rbcodec/codecs/libm4a/m4a.c
diff --git a/apps/codecs/libm4a/m4a.h b/lib/rbcodec/codecs/libm4a/m4a.h
index aa8e768045..aa8e768045 100644
--- a/apps/codecs/libm4a/m4a.h
+++ b/lib/rbcodec/codecs/libm4a/m4a.h
diff --git a/apps/codecs/libmad/CHANGES b/lib/rbcodec/codecs/libmad/CHANGES
index 3fa57ef0cf..3fa57ef0cf 100644
--- a/apps/codecs/libmad/CHANGES
+++ b/lib/rbcodec/codecs/libmad/CHANGES
diff --git a/apps/codecs/libmad/COPYING b/lib/rbcodec/codecs/libmad/COPYING
index d60c31a97a..d60c31a97a 100644
--- a/apps/codecs/libmad/COPYING
+++ b/lib/rbcodec/codecs/libmad/COPYING
diff --git a/apps/codecs/libmad/COPYRIGHT b/lib/rbcodec/codecs/libmad/COPYRIGHT
index ed91d2bac1..ed91d2bac1 100644
--- a/apps/codecs/libmad/COPYRIGHT
+++ b/lib/rbcodec/codecs/libmad/COPYRIGHT
diff --git a/apps/codecs/libmad/CREDITS b/lib/rbcodec/codecs/libmad/CREDITS
index 69016c201d..69016c201d 100644
--- a/apps/codecs/libmad/CREDITS
+++ b/lib/rbcodec/codecs/libmad/CREDITS
diff --git a/apps/codecs/libmad/D.dat b/lib/rbcodec/codecs/libmad/D.dat
index 2bff1a8890..2bff1a8890 100644
--- a/apps/codecs/libmad/D.dat
+++ b/lib/rbcodec/codecs/libmad/D.dat
diff --git a/apps/codecs/libmad/README b/lib/rbcodec/codecs/libmad/README
index 524a94b29d..524a94b29d 100644
--- a/apps/codecs/libmad/README
+++ b/lib/rbcodec/codecs/libmad/README
diff --git a/apps/codecs/libmad/README.rockbox b/lib/rbcodec/codecs/libmad/README.rockbox
index faddc0d391..faddc0d391 100644
--- a/apps/codecs/libmad/README.rockbox
+++ b/lib/rbcodec/codecs/libmad/README.rockbox
diff --git a/apps/codecs/libmad/SOURCES b/lib/rbcodec/codecs/libmad/SOURCES
index d81804ca38..d81804ca38 100644
--- a/apps/codecs/libmad/SOURCES
+++ b/lib/rbcodec/codecs/libmad/SOURCES
diff --git a/apps/codecs/libmad/TODO b/lib/rbcodec/codecs/libmad/TODO
index a397655c6c..a397655c6c 100644
--- a/apps/codecs/libmad/TODO
+++ b/lib/rbcodec/codecs/libmad/TODO
diff --git a/apps/codecs/libmad/VERSION b/lib/rbcodec/codecs/libmad/VERSION
index d4e8f64aa2..d4e8f64aa2 100644
--- a/apps/codecs/libmad/VERSION
+++ b/lib/rbcodec/codecs/libmad/VERSION
diff --git a/apps/codecs/libmad/bit.c b/lib/rbcodec/codecs/libmad/bit.c
index c08806d385..c08806d385 100644
--- a/apps/codecs/libmad/bit.c
+++ b/lib/rbcodec/codecs/libmad/bit.c
diff --git a/apps/codecs/libmad/bit.h b/lib/rbcodec/codecs/libmad/bit.h
index 1c49522af5..1c49522af5 100644
--- a/apps/codecs/libmad/bit.h
+++ b/lib/rbcodec/codecs/libmad/bit.h
diff --git a/apps/codecs/libmad/dct32_arm.S b/lib/rbcodec/codecs/libmad/dct32_arm.S
index 440841bb5e..440841bb5e 100644
--- a/apps/codecs/libmad/dct32_arm.S
+++ b/lib/rbcodec/codecs/libmad/dct32_arm.S
diff --git a/apps/codecs/libmad/fixed.h b/lib/rbcodec/codecs/libmad/fixed.h
index 6015684644..6015684644 100644
--- a/apps/codecs/libmad/fixed.h
+++ b/lib/rbcodec/codecs/libmad/fixed.h
diff --git a/apps/codecs/libmad/frame.c b/lib/rbcodec/codecs/libmad/frame.c
index 61671c7e13..f17306285c 100644
--- a/apps/codecs/libmad/frame.c
+++ b/lib/rbcodec/codecs/libmad/frame.c
@@ -94,7 +94,7 @@ void mad_frame_init(struct mad_frame *frame)
 
   frame->options = 0;
 /* rockbox: comment this to proper zero this array in mad_frame_mute(). overlap
- * is linked to an array in rockbox' apps/codecs/mpa.c before calling this.
+ * is linked to an array in ../mpa.c before calling this.
   frame->overlap = 0;
 */
   mad_frame_mute(frame);
diff --git a/apps/codecs/libmad/frame.h b/lib/rbcodec/codecs/libmad/frame.h
index b1c6e0289d..b1c6e0289d 100644
--- a/apps/codecs/libmad/frame.h
+++ b/lib/rbcodec/codecs/libmad/frame.h
diff --git a/apps/codecs/libmad/global.h b/lib/rbcodec/codecs/libmad/global.h
index 50051f45b3..50051f45b3 100644
--- a/apps/codecs/libmad/global.h
+++ b/lib/rbcodec/codecs/libmad/global.h
diff --git a/apps/codecs/libmad/huffman.c b/lib/rbcodec/codecs/libmad/huffman.c
index bec44434a7..bec44434a7 100644
--- a/apps/codecs/libmad/huffman.c
+++ b/lib/rbcodec/codecs/libmad/huffman.c
diff --git a/apps/codecs/libmad/huffman.h b/lib/rbcodec/codecs/libmad/huffman.h
index e4c1b35d93..e4c1b35d93 100644
--- a/apps/codecs/libmad/huffman.h
+++ b/lib/rbcodec/codecs/libmad/huffman.h
diff --git a/apps/codecs/libmad/imdct_l_arm.S b/lib/rbcodec/codecs/libmad/imdct_l_arm.S
index b511ff169d..b511ff169d 100644
--- a/apps/codecs/libmad/imdct_l_arm.S
+++ b/lib/rbcodec/codecs/libmad/imdct_l_arm.S
diff --git a/apps/codecs/libmad/imdct_mcf5249.S b/lib/rbcodec/codecs/libmad/imdct_mcf5249.S
index b5e2a12b0f..b5e2a12b0f 100644
--- a/apps/codecs/libmad/imdct_mcf5249.S
+++ b/lib/rbcodec/codecs/libmad/imdct_mcf5249.S
diff --git a/apps/codecs/libmad/imdct_s.dat b/lib/rbcodec/codecs/libmad/imdct_s.dat
index 0f1f3c9b60..0f1f3c9b60 100644
--- a/apps/codecs/libmad/imdct_s.dat
+++ b/lib/rbcodec/codecs/libmad/imdct_s.dat
diff --git a/apps/codecs/libmad/layer12.c b/lib/rbcodec/codecs/libmad/layer12.c
index e00bb64530..e00bb64530 100644
--- a/apps/codecs/libmad/layer12.c
+++ b/lib/rbcodec/codecs/libmad/layer12.c
diff --git a/apps/codecs/libmad/layer12.h b/lib/rbcodec/codecs/libmad/layer12.h
index 3fe6bd8b0f..3fe6bd8b0f 100644
--- a/apps/codecs/libmad/layer12.h
+++ b/lib/rbcodec/codecs/libmad/layer12.h
diff --git a/apps/codecs/libmad/layer3.c b/lib/rbcodec/codecs/libmad/layer3.c
index a598ff2c95..ffb0fb20ff 100644
--- a/apps/codecs/libmad/layer3.c
+++ b/lib/rbcodec/codecs/libmad/layer3.c
@@ -2926,8 +2926,8 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
 
 #if 0 /* rockbox: do not allocate */
   /* allocate Layer III dynamic structures */
-  /* rockbox: not used. Both pointers are linked to an array in rockbox' 
-   * apps/codecs/mpa.c before calling this. */
+  /* rockbox: not used. Both pointers are linked to an array in
+   * ../mpa.c before calling this. */
   if (stream->main_data == 0) {
     stream->main_data = malloc(MAD_BUFFER_MDLEN);
     if (stream->main_data == 0) {
diff --git a/apps/codecs/libmad/layer3.h b/lib/rbcodec/codecs/libmad/layer3.h
index 15948037e9..15948037e9 100644
--- a/apps/codecs/libmad/layer3.h
+++ b/lib/rbcodec/codecs/libmad/layer3.h
diff --git a/apps/codecs/libmad/libmad.make b/lib/rbcodec/codecs/libmad/libmad.make
index 4ed8ab1e8c..2a8c7b220f 100644
--- a/apps/codecs/libmad/libmad.make
+++ b/lib/rbcodec/codecs/libmad/libmad.make
@@ -12,7 +12,7 @@
 # so a little trickery is necessary
 
 # Extract optimization level ('-O') from compile flags. Will be set later.
-MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(APPSDIR)/codecs/libmad
+MADFLAGS = $(filter-out -O%,$(CODECFLAGS)) -I$(RBCODECLIB_DIR)/codecs/libmad
 MADFLAGS += -UDEBUG -DNDEBUG -DHAVE_LIMITS_H
 
 # libmad is faster on ARM-targets with -O1 than -O2
@@ -27,7 +27,7 @@ MPEGMADFLAGS = $(MADFLAGS) -DMPEGPLAYER
 
 # libmad
 MADLIB := $(CODECDIR)/libmad.a
-MADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmad/SOURCES)
+MADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmad/SOURCES)
 MADLIB_OBJ := $(call c2obj, $(MADLIB_SRC))
 OTHER_SRC += $(MADLIB_SRC)
 
@@ -37,30 +37,30 @@ $(MADLIB): $(MADLIB_OBJ)
 
 # libmad-mpeg
 MPEGMADLIB := $(CODECDIR)/libmad-mpeg.a
-MPEGMADLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmad/SOURCES)
-MPEGMADLIB_OBJ := $(addsuffix .o,$(basename $(subst $(ROOTDIR)/apps/codecs/libmad,$(BUILDDIR)/apps/codecs/libmad-mpeg,$(MPEGMADLIB_SRC))))
+MPEGMADLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmad/SOURCES)
+MPEGMADLIB_OBJ := $(addsuffix .o,$(basename $(subst $(RBCODECLIB_DIR)/codecs/libmad,$(RBCODEC_BLD)/codecs/libmad-mpeg,$(MPEGMADLIB_SRC))))
 
 $(MPEGMADLIB): $(MPEGMADLIB_OBJ)
         $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
 # pattern rules
 
-$(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.c
+$(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.c
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
                 $(CC) $(MPEGMADFLAGS) -c $< -o $@
 
-$(CODECDIR)/libmad-mpeg/%.o : $(ROOTDIR)/apps/codecs/libmad/%.S
+$(CODECDIR)/libmad-mpeg/%.o : $(RBCODECLIB_DIR)/codecs/libmad/%.S
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
                 $(CC) $(MPEGMADFLAGS) $(ASMFLAGS) -c $< -o $@
 
-$(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.c
+$(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.c
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
                 $(CC) $(MADFLAGS) -c $< -o $@
 
-$(CODECDIR)/libmad/%.o: $(ROOTDIR)/apps/codecs/libmad/%.S
+$(CODECDIR)/libmad/%.o: $(RBCODECLIB_DIR)/codecs/libmad/%.S
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<)) \
                 $(CC) $(MADFLAGS) $(ASMFLAGS) -c $< -o $@
diff --git a/apps/codecs/libmad/mad.h b/lib/rbcodec/codecs/libmad/mad.h
index 3ae0d88a0e..3ae0d88a0e 100644
--- a/apps/codecs/libmad/mad.h
+++ b/lib/rbcodec/codecs/libmad/mad.h
diff --git a/apps/codecs/libmad/mad_iram.h b/lib/rbcodec/codecs/libmad/mad_iram.h
index ac0b64cca9..ac0b64cca9 100644
--- a/apps/codecs/libmad/mad_iram.h
+++ b/lib/rbcodec/codecs/libmad/mad_iram.h
diff --git a/apps/codecs/libmad/qc_table.dat b/lib/rbcodec/codecs/libmad/qc_table.dat
index d28a207049..d28a207049 100644
--- a/apps/codecs/libmad/qc_table.dat
+++ b/lib/rbcodec/codecs/libmad/qc_table.dat
diff --git a/apps/codecs/libmad/rq_table.dat b/lib/rbcodec/codecs/libmad/rq_table.dat
index b3a37c13cd..b3a37c13cd 100644
--- a/apps/codecs/libmad/rq_table.dat
+++ b/lib/rbcodec/codecs/libmad/rq_table.dat
diff --git a/apps/codecs/libmad/sf_table.dat b/lib/rbcodec/codecs/libmad/sf_table.dat
index de084d97da..de084d97da 100644
--- a/apps/codecs/libmad/sf_table.dat
+++ b/lib/rbcodec/codecs/libmad/sf_table.dat
diff --git a/apps/codecs/libmad/stream.c b/lib/rbcodec/codecs/libmad/stream.c
index 2958afc118..6c8bbcf850 100644
--- a/apps/codecs/libmad/stream.c
+++ b/lib/rbcodec/codecs/libmad/stream.c
@@ -50,7 +50,7 @@ void mad_stream_init(struct mad_stream *stream)
   stream->anc_bitlen = 0;
 
 /* rockbox: comment this to avoid allocation in following code. main_data is
- * linked to an array in rockbox' apps/codecs/mpa.c before calling this.
+ * linked to an array in ../mpa.c before calling this.
   stream->main_data  = 0;
 */
   stream->md_len     = 0;
diff --git a/apps/codecs/libmad/stream.h b/lib/rbcodec/codecs/libmad/stream.h
index 0aafb98787..0aafb98787 100644
--- a/apps/codecs/libmad/stream.h
+++ b/lib/rbcodec/codecs/libmad/stream.h
diff --git a/apps/codecs/libmad/synth.c b/lib/rbcodec/codecs/libmad/synth.c
index ebcf3d5015..ebcf3d5015 100644
--- a/apps/codecs/libmad/synth.c
+++ b/lib/rbcodec/codecs/libmad/synth.c
diff --git a/apps/codecs/libmad/synth.h b/lib/rbcodec/codecs/libmad/synth.h
index 93dd3946d4..93dd3946d4 100644
--- a/apps/codecs/libmad/synth.h
+++ b/lib/rbcodec/codecs/libmad/synth.h
diff --git a/apps/codecs/libmad/synth_full_arm.S b/lib/rbcodec/codecs/libmad/synth_full_arm.S
index 0a4f9b93c2..0a4f9b93c2 100644
--- a/apps/codecs/libmad/synth_full_arm.S
+++ b/lib/rbcodec/codecs/libmad/synth_full_arm.S
diff --git a/apps/codecs/libmusepack/AUTHORS b/lib/rbcodec/codecs/libmusepack/AUTHORS
index 1bcac63765..1bcac63765 100644
--- a/apps/codecs/libmusepack/AUTHORS
+++ b/lib/rbcodec/codecs/libmusepack/AUTHORS
diff --git a/apps/codecs/libmusepack/COPYING b/lib/rbcodec/codecs/libmusepack/COPYING
index 10190c014a..10190c014a 100644
--- a/apps/codecs/libmusepack/COPYING
+++ b/lib/rbcodec/codecs/libmusepack/COPYING
diff --git a/apps/codecs/libmusepack/ChangeLog b/lib/rbcodec/codecs/libmusepack/ChangeLog
index 6c998480bd..6c998480bd 100644
--- a/apps/codecs/libmusepack/ChangeLog
+++ b/lib/rbcodec/codecs/libmusepack/ChangeLog
diff --git a/apps/codecs/libmusepack/SOURCES b/lib/rbcodec/codecs/libmusepack/SOURCES
index 60d762afd2..60d762afd2 100644
--- a/apps/codecs/libmusepack/SOURCES
+++ b/lib/rbcodec/codecs/libmusepack/SOURCES
diff --git a/apps/codecs/libmusepack/crc32.c b/lib/rbcodec/codecs/libmusepack/crc32.c
index 7613f1c2c8..7613f1c2c8 100644
--- a/apps/codecs/libmusepack/crc32.c
+++ b/lib/rbcodec/codecs/libmusepack/crc32.c
diff --git a/apps/codecs/libmusepack/decoder.h b/lib/rbcodec/codecs/libmusepack/decoder.h
index 1acacae8d9..1acacae8d9 100644
--- a/apps/codecs/libmusepack/decoder.h
+++ b/lib/rbcodec/codecs/libmusepack/decoder.h
diff --git a/apps/codecs/libmusepack/huffman.c b/lib/rbcodec/codecs/libmusepack/huffman.c
index c304775623..c304775623 100644
--- a/apps/codecs/libmusepack/huffman.c
+++ b/lib/rbcodec/codecs/libmusepack/huffman.c
diff --git a/apps/codecs/libmusepack/huffman.h b/lib/rbcodec/codecs/libmusepack/huffman.h
index 1244149184..1244149184 100644
--- a/apps/codecs/libmusepack/huffman.h
+++ b/lib/rbcodec/codecs/libmusepack/huffman.h
diff --git a/apps/codecs/libmusepack/internal.h b/lib/rbcodec/codecs/libmusepack/internal.h
index 897e6a7b17..897e6a7b17 100644
--- a/apps/codecs/libmusepack/internal.h
+++ b/lib/rbcodec/codecs/libmusepack/internal.h
diff --git a/apps/codecs/libmusepack/libmusepack.make b/lib/rbcodec/codecs/libmusepack/libmusepack.make
index ac201c4552..53b07869bf 100644
--- a/apps/codecs/libmusepack/libmusepack.make
+++ b/lib/rbcodec/codecs/libmusepack/libmusepack.make
@@ -9,7 +9,7 @@
 
 # libmusepack
 MUSEPACKLIB := $(CODECDIR)/libmusepack.a
-MUSEPACKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libmusepack/SOURCES)
+MUSEPACKLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libmusepack/SOURCES)
 MUSEPACKLIB_OBJ := $(call c2obj, $(MUSEPACKLIB_SRC))
 OTHER_SRC += $(MUSEPACKLIB_SRC)
 
diff --git a/apps/codecs/libmusepack/minimax.h b/lib/rbcodec/codecs/libmusepack/minimax.h
index 1192626567..1192626567 100644
--- a/apps/codecs/libmusepack/minimax.h
+++ b/lib/rbcodec/codecs/libmusepack/minimax.h
diff --git a/apps/codecs/libmusepack/mpc_bits_reader.c b/lib/rbcodec/codecs/libmusepack/mpc_bits_reader.c
index c917ad510a..c917ad510a 100644
--- a/apps/codecs/libmusepack/mpc_bits_reader.c
+++ b/lib/rbcodec/codecs/libmusepack/mpc_bits_reader.c
diff --git a/apps/codecs/libmusepack/mpc_bits_reader.h b/lib/rbcodec/codecs/libmusepack/mpc_bits_reader.h
index 1233720c74..1233720c74 100644
--- a/apps/codecs/libmusepack/mpc_bits_reader.h
+++ b/lib/rbcodec/codecs/libmusepack/mpc_bits_reader.h
diff --git a/apps/codecs/libmusepack/mpc_decoder.c b/lib/rbcodec/codecs/libmusepack/mpc_decoder.c
index 3bfc4cc7fc..3bfc4cc7fc 100644
--- a/apps/codecs/libmusepack/mpc_decoder.c
+++ b/lib/rbcodec/codecs/libmusepack/mpc_decoder.c
diff --git a/apps/codecs/libmusepack/mpc_demux.c b/lib/rbcodec/codecs/libmusepack/mpc_demux.c
index 9523163c0e..9523163c0e 100644
--- a/apps/codecs/libmusepack/mpc_demux.c
+++ b/lib/rbcodec/codecs/libmusepack/mpc_demux.c
diff --git a/apps/codecs/libmusepack/mpc_types.h b/lib/rbcodec/codecs/libmusepack/mpc_types.h
index 0e7aa9d2c3..0e7aa9d2c3 100644
--- a/apps/codecs/libmusepack/mpc_types.h
+++ b/lib/rbcodec/codecs/libmusepack/mpc_types.h
diff --git a/apps/codecs/libmusepack/mpcdec.h b/lib/rbcodec/codecs/libmusepack/mpcdec.h
index 85536e726a..85536e726a 100644
--- a/apps/codecs/libmusepack/mpcdec.h
+++ b/lib/rbcodec/codecs/libmusepack/mpcdec.h
diff --git a/apps/codecs/libmusepack/mpcdec_math.h b/lib/rbcodec/codecs/libmusepack/mpcdec_math.h
index 955681f4e5..955681f4e5 100644
--- a/apps/codecs/libmusepack/mpcdec_math.h
+++ b/lib/rbcodec/codecs/libmusepack/mpcdec_math.h
diff --git a/apps/codecs/libmusepack/reader.h b/lib/rbcodec/codecs/libmusepack/reader.h
index c46844cd59..c46844cd59 100644
--- a/apps/codecs/libmusepack/reader.h
+++ b/lib/rbcodec/codecs/libmusepack/reader.h
diff --git a/apps/codecs/libmusepack/requant.c b/lib/rbcodec/codecs/libmusepack/requant.c
index fc27dfd199..fc27dfd199 100644
--- a/apps/codecs/libmusepack/requant.c
+++ b/lib/rbcodec/codecs/libmusepack/requant.c
diff --git a/apps/codecs/libmusepack/requant.h b/lib/rbcodec/codecs/libmusepack/requant.h
index 908fda30eb..908fda30eb 100644
--- a/apps/codecs/libmusepack/requant.h
+++ b/lib/rbcodec/codecs/libmusepack/requant.h
diff --git a/apps/codecs/libmusepack/streaminfo.c b/lib/rbcodec/codecs/libmusepack/streaminfo.c
index 6b4d3df0c1..6b4d3df0c1 100644
--- a/apps/codecs/libmusepack/streaminfo.c
+++ b/lib/rbcodec/codecs/libmusepack/streaminfo.c
diff --git a/apps/codecs/libmusepack/streaminfo.h b/lib/rbcodec/codecs/libmusepack/streaminfo.h
index 52e97936a0..52e97936a0 100644
--- a/apps/codecs/libmusepack/streaminfo.h
+++ b/lib/rbcodec/codecs/libmusepack/streaminfo.h
diff --git a/apps/codecs/libmusepack/synth_filter.c b/lib/rbcodec/codecs/libmusepack/synth_filter.c
index 3ad2b236a0..3ad2b236a0 100644
--- a/apps/codecs/libmusepack/synth_filter.c
+++ b/lib/rbcodec/codecs/libmusepack/synth_filter.c
diff --git a/apps/codecs/libmusepack/synth_filter_arm.S b/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S
index 9bd4e04626..9bd4e04626 100644
--- a/apps/codecs/libmusepack/synth_filter_arm.S
+++ b/lib/rbcodec/codecs/libmusepack/synth_filter_arm.S
diff --git a/apps/codecs/libmusepack/synth_filter_coldfire.S b/lib/rbcodec/codecs/libmusepack/synth_filter_coldfire.S
index 758ab3d496..758ab3d496 100644
--- a/apps/codecs/libmusepack/synth_filter_coldfire.S
+++ b/lib/rbcodec/codecs/libmusepack/synth_filter_coldfire.S
diff --git a/apps/codecs/libpcm/SOURCES b/lib/rbcodec/codecs/libpcm/SOURCES
index 356c9cdbb7..356c9cdbb7 100644
--- a/apps/codecs/libpcm/SOURCES
+++ b/lib/rbcodec/codecs/libpcm/SOURCES
diff --git a/apps/codecs/libpcm/adpcm_seek.c b/lib/rbcodec/codecs/libpcm/adpcm_seek.c
index ce49d5fcd3..ce49d5fcd3 100644
--- a/apps/codecs/libpcm/adpcm_seek.c
+++ b/lib/rbcodec/codecs/libpcm/adpcm_seek.c
diff --git a/apps/codecs/libpcm/adpcm_seek.h b/lib/rbcodec/codecs/libpcm/adpcm_seek.h
index 2dd3f000b1..2dd3f000b1 100644
--- a/apps/codecs/libpcm/adpcm_seek.h
+++ b/lib/rbcodec/codecs/libpcm/adpcm_seek.h
diff --git a/apps/codecs/libpcm/dialogic_oki_adpcm.c b/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
index 60090aaa89..60090aaa89 100644
--- a/apps/codecs/libpcm/dialogic_oki_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/dialogic_oki_adpcm.c
diff --git a/apps/codecs/libpcm/dvi_adpcm.c b/lib/rbcodec/codecs/libpcm/dvi_adpcm.c
index 2e702ca394..2e702ca394 100644
--- a/apps/codecs/libpcm/dvi_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/dvi_adpcm.c
diff --git a/apps/codecs/libpcm/ieee_float.c b/lib/rbcodec/codecs/libpcm/ieee_float.c
index 639390bcd5..639390bcd5 100644
--- a/apps/codecs/libpcm/ieee_float.c
+++ b/lib/rbcodec/codecs/libpcm/ieee_float.c
diff --git a/apps/codecs/libpcm/ima_adpcm_common.c b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.c
index 724cce31b0..724cce31b0 100644
--- a/apps/codecs/libpcm/ima_adpcm_common.c
+++ b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.c
diff --git a/apps/codecs/libpcm/ima_adpcm_common.h b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.h
index 46fd6083ec..46fd6083ec 100644
--- a/apps/codecs/libpcm/ima_adpcm_common.h
+++ b/lib/rbcodec/codecs/libpcm/ima_adpcm_common.h
diff --git a/apps/codecs/libpcm/itut_g711.c b/lib/rbcodec/codecs/libpcm/itut_g711.c
index 88ff5f59e6..88ff5f59e6 100644
--- a/apps/codecs/libpcm/itut_g711.c
+++ b/lib/rbcodec/codecs/libpcm/itut_g711.c
diff --git a/apps/codecs/libpcm/libpcm.make b/lib/rbcodec/codecs/libpcm/libpcm.make
index 1188bde1b0..15c23bedf2 100644
--- a/apps/codecs/libpcm/libpcm.make
+++ b/lib/rbcodec/codecs/libpcm/libpcm.make
@@ -9,7 +9,7 @@
 
 # libpcm
 PCMSLIB := $(CODECDIR)/libpcm.a
-PCMSLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libpcm/SOURCES)
+PCMSLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libpcm/SOURCES)
 PCMSLIB_OBJ := $(call c2obj, $(PCMSLIB_SRC))
 OTHER_SRC += $(PCMSLIB_SRC)
 
diff --git a/apps/codecs/libpcm/linear_pcm.c b/lib/rbcodec/codecs/libpcm/linear_pcm.c
index 5c3c140b8c..5c3c140b8c 100644
--- a/apps/codecs/libpcm/linear_pcm.c
+++ b/lib/rbcodec/codecs/libpcm/linear_pcm.c
diff --git a/apps/codecs/libpcm/ms_adpcm.c b/lib/rbcodec/codecs/libpcm/ms_adpcm.c
index a385d6c99f..a385d6c99f 100644
--- a/apps/codecs/libpcm/ms_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/ms_adpcm.c
diff --git a/apps/codecs/libpcm/pcm_common.h b/lib/rbcodec/codecs/libpcm/pcm_common.h
index 90e29c98ee..90e29c98ee 100644
--- a/apps/codecs/libpcm/pcm_common.h
+++ b/lib/rbcodec/codecs/libpcm/pcm_common.h
diff --git a/apps/codecs/libpcm/qt_ima_adpcm.c b/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
index d7b3360eb3..d7b3360eb3 100644
--- a/apps/codecs/libpcm/qt_ima_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/qt_ima_adpcm.c
diff --git a/apps/codecs/libpcm/support_formats.h b/lib/rbcodec/codecs/libpcm/support_formats.h
index b1e089e464..b1e089e464 100644
--- a/apps/codecs/libpcm/support_formats.h
+++ b/lib/rbcodec/codecs/libpcm/support_formats.h
diff --git a/apps/codecs/libpcm/swf_adpcm.c b/lib/rbcodec/codecs/libpcm/swf_adpcm.c
index c440fd1303..c440fd1303 100644
--- a/apps/codecs/libpcm/swf_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/swf_adpcm.c
diff --git a/apps/codecs/libpcm/yamaha_adpcm.c b/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
index c67fe7524a..c67fe7524a 100644
--- a/apps/codecs/libpcm/yamaha_adpcm.c
+++ b/lib/rbcodec/codecs/libpcm/yamaha_adpcm.c
diff --git a/apps/codecs/librm/SOURCES b/lib/rbcodec/codecs/librm/SOURCES
index e0ff169fae..e0ff169fae 100644
--- a/apps/codecs/librm/SOURCES
+++ b/lib/rbcodec/codecs/librm/SOURCES
diff --git a/apps/codecs/librm/bytestream.h b/lib/rbcodec/codecs/librm/bytestream.h
index c2a968a4bd..c2a968a4bd 100644
--- a/apps/codecs/librm/bytestream.h
+++ b/lib/rbcodec/codecs/librm/bytestream.h
diff --git a/apps/codecs/librm/librm.make b/lib/rbcodec/codecs/librm/librm.make
index 7f2c34c9ac..3c736abec9 100644
--- a/apps/codecs/librm/librm.make
+++ b/lib/rbcodec/codecs/librm/librm.make
@@ -9,7 +9,7 @@
 
 # librm
 RMLIB := $(CODECDIR)/librm.a
-RMLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/librm/SOURCES)
+RMLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/librm/SOURCES)
 RMLIB_OBJ := $(call c2obj, $(RMLIB_SRC))
 OTHER_SRC += $(RMLIB_SRC)
 
diff --git a/apps/codecs/librm/rm.c b/lib/rbcodec/codecs/librm/rm.c
index eabbe5d92a..eabbe5d92a 100644
--- a/apps/codecs/librm/rm.c
+++ b/lib/rbcodec/codecs/librm/rm.c
diff --git a/apps/codecs/librm/rm.h b/lib/rbcodec/codecs/librm/rm.h
index c4a4e3a77e..c4a4e3a77e 100644
--- a/apps/codecs/librm/rm.h
+++ b/lib/rbcodec/codecs/librm/rm.h
diff --git a/apps/codecs/libspc/SOURCES b/lib/rbcodec/codecs/libspc/SOURCES
index 901232a6eb..901232a6eb 100644
--- a/apps/codecs/libspc/SOURCES
+++ b/lib/rbcodec/codecs/libspc/SOURCES
diff --git a/apps/codecs/libspc/libspc.make b/lib/rbcodec/codecs/libspc/libspc.make
index 8cf04dc5c8..a005f7914a 100644
--- a/apps/codecs/libspc/libspc.make
+++ b/lib/rbcodec/codecs/libspc/libspc.make
@@ -9,7 +9,7 @@
 
 # libspc
 SPCLIB := $(CODECDIR)/libspc.a
-SPCLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspc/SOURCES)
+SPCLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libspc/SOURCES)
 SPCLIB_OBJ := $(call c2obj, $(SPCLIB_SRC))
 OTHER_SRC += $(SPCLIB_SRC)
 
diff --git a/apps/codecs/libspc/spc_codec.h b/lib/rbcodec/codecs/libspc/spc_codec.h
index 7f6b6e2e9f..7f6b6e2e9f 100644
--- a/apps/codecs/libspc/spc_codec.h
+++ b/lib/rbcodec/codecs/libspc/spc_codec.h
diff --git a/apps/codecs/libspc/spc_cpu.c b/lib/rbcodec/codecs/libspc/spc_cpu.c
index 23dcc257de..23dcc257de 100644
--- a/apps/codecs/libspc/spc_cpu.c
+++ b/lib/rbcodec/codecs/libspc/spc_cpu.c
diff --git a/apps/codecs/libspc/spc_dsp.c b/lib/rbcodec/codecs/libspc/spc_dsp.c
index 6350c4c331..6350c4c331 100644
--- a/apps/codecs/libspc/spc_dsp.c
+++ b/lib/rbcodec/codecs/libspc/spc_dsp.c
diff --git a/apps/codecs/libspc/spc_emu.c b/lib/rbcodec/codecs/libspc/spc_emu.c
index 5ea5b0cdeb..5ea5b0cdeb 100644
--- a/apps/codecs/libspc/spc_emu.c
+++ b/lib/rbcodec/codecs/libspc/spc_emu.c
diff --git a/apps/codecs/libspc/spc_profiler.c b/lib/rbcodec/codecs/libspc/spc_profiler.c
index 0ced8b5bd3..0ced8b5bd3 100644
--- a/apps/codecs/libspc/spc_profiler.c
+++ b/lib/rbcodec/codecs/libspc/spc_profiler.c
diff --git a/apps/codecs/libspc/spc_profiler.h b/lib/rbcodec/codecs/libspc/spc_profiler.h
index 405ee43ef9..405ee43ef9 100644
--- a/apps/codecs/libspc/spc_profiler.h
+++ b/lib/rbcodec/codecs/libspc/spc_profiler.h
diff --git a/apps/codecs/libspeex/COPYING b/lib/rbcodec/codecs/libspeex/COPYING
index 3b6b579cf3..3b6b579cf3 100644
--- a/apps/codecs/libspeex/COPYING
+++ b/lib/rbcodec/codecs/libspeex/COPYING
diff --git a/apps/codecs/libspeex/README.rockbox b/lib/rbcodec/codecs/libspeex/README.rockbox
index 84fff59b60..84fff59b60 100644
--- a/apps/codecs/libspeex/README.rockbox
+++ b/lib/rbcodec/codecs/libspeex/README.rockbox
diff --git a/apps/codecs/libspeex/SOURCES b/lib/rbcodec/codecs/libspeex/SOURCES
index 575bcb5bae..575bcb5bae 100644
--- a/apps/codecs/libspeex/SOURCES
+++ b/lib/rbcodec/codecs/libspeex/SOURCES
diff --git a/apps/codecs/libspeex/_kiss_fft_guts.h b/lib/rbcodec/codecs/libspeex/_kiss_fft_guts.h
index 12c055040f..12c055040f 100644
--- a/apps/codecs/libspeex/_kiss_fft_guts.h
+++ b/lib/rbcodec/codecs/libspeex/_kiss_fft_guts.h
diff --git a/apps/codecs/libspeex/arch.h b/lib/rbcodec/codecs/libspeex/arch.h
index 35b5363837..35b5363837 100644
--- a/apps/codecs/libspeex/arch.h
+++ b/lib/rbcodec/codecs/libspeex/arch.h
diff --git a/apps/codecs/libspeex/bits.c b/lib/rbcodec/codecs/libspeex/bits.c
index c7a5c14ede..c7a5c14ede 100644
--- a/apps/codecs/libspeex/bits.c
+++ b/lib/rbcodec/codecs/libspeex/bits.c
diff --git a/apps/codecs/libspeex/cb_search.c b/lib/rbcodec/codecs/libspeex/cb_search.c
index 35fe3a2f67..35fe3a2f67 100644
--- a/apps/codecs/libspeex/cb_search.c
+++ b/lib/rbcodec/codecs/libspeex/cb_search.c
diff --git a/apps/codecs/libspeex/cb_search.h b/lib/rbcodec/codecs/libspeex/cb_search.h
index 50b530a725..50b530a725 100644
--- a/apps/codecs/libspeex/cb_search.h
+++ b/lib/rbcodec/codecs/libspeex/cb_search.h
diff --git a/apps/codecs/libspeex/cb_search_arm4.h b/lib/rbcodec/codecs/libspeex/cb_search_arm4.h
index 19b752a4bc..19b752a4bc 100644
--- a/apps/codecs/libspeex/cb_search_arm4.h
+++ b/lib/rbcodec/codecs/libspeex/cb_search_arm4.h
diff --git a/apps/codecs/libspeex/cb_search_bfin.h b/lib/rbcodec/codecs/libspeex/cb_search_bfin.h
index ae9cf8343d..ae9cf8343d 100644
--- a/apps/codecs/libspeex/cb_search_bfin.h
+++ b/lib/rbcodec/codecs/libspeex/cb_search_bfin.h
diff --git a/apps/codecs/libspeex/cb_search_sse.h b/lib/rbcodec/codecs/libspeex/cb_search_sse.h
index 8b039686fb..8b039686fb 100644
--- a/apps/codecs/libspeex/cb_search_sse.h
+++ b/lib/rbcodec/codecs/libspeex/cb_search_sse.h
diff --git a/apps/codecs/libspeex/config-speex.h b/lib/rbcodec/codecs/libspeex/config-speex.h
index 7e0672c150..7e0672c150 100644
--- a/apps/codecs/libspeex/config-speex.h
+++ b/lib/rbcodec/codecs/libspeex/config-speex.h
diff --git a/apps/codecs/libspeex/exc_10_16_table.c b/lib/rbcodec/codecs/libspeex/exc_10_16_table.c
index 755c5a0b7f..755c5a0b7f 100644
--- a/apps/codecs/libspeex/exc_10_16_table.c
+++ b/lib/rbcodec/codecs/libspeex/exc_10_16_table.c
diff --git a/apps/codecs/libspeex/exc_10_32_table.c b/lib/rbcodec/codecs/libspeex/exc_10_32_table.c
index 1c94b5511c..1c94b5511c 100644
--- a/apps/codecs/libspeex/exc_10_32_table.c
+++ b/lib/rbcodec/codecs/libspeex/exc_10_32_table.c
diff --git a/apps/codecs/libspeex/exc_20_32_table.c b/lib/rbcodec/codecs/libspeex/exc_20_32_table.c
index 40dbb34e9e..40dbb34e9e 100644
--- a/apps/codecs/libspeex/exc_20_32_table.c
+++ b/lib/rbcodec/codecs/libspeex/exc_20_32_table.c
diff --git a/apps/codecs/libspeex/exc_5_256_table.c b/lib/rbcodec/codecs/libspeex/exc_5_256_table.c
index 1a32057956..1a32057956 100644
--- a/apps/codecs/libspeex/exc_5_256_table.c
+++ b/lib/rbcodec/codecs/libspeex/exc_5_256_table.c
diff --git a/apps/codecs/libspeex/exc_5_64_table.c b/lib/rbcodec/codecs/libspeex/exc_5_64_table.c
index 7d29f60373..7d29f60373 100644
--- a/apps/codecs/libspeex/exc_5_64_table.c
+++ b/lib/rbcodec/codecs/libspeex/exc_5_64_table.c
diff --git a/apps/codecs/libspeex/exc_8_128_table.c b/lib/rbcodec/codecs/libspeex/exc_8_128_table.c
index 02a58e052c..02a58e052c 100644
--- a/apps/codecs/libspeex/exc_8_128_table.c
+++ b/lib/rbcodec/codecs/libspeex/exc_8_128_table.c
diff --git a/apps/codecs/libspeex/fftwrap.c b/lib/rbcodec/codecs/libspeex/fftwrap.c
index 2312f755d6..2312f755d6 100644
--- a/apps/codecs/libspeex/fftwrap.c
+++ b/lib/rbcodec/codecs/libspeex/fftwrap.c
diff --git a/apps/codecs/libspeex/fftwrap.h b/lib/rbcodec/codecs/libspeex/fftwrap.h
index dfaf489441..dfaf489441 100644
--- a/apps/codecs/libspeex/fftwrap.h
+++ b/lib/rbcodec/codecs/libspeex/fftwrap.h
diff --git a/apps/codecs/libspeex/filterbank.c b/lib/rbcodec/codecs/libspeex/filterbank.c
index d2a8f1af90..d2a8f1af90 100644
--- a/apps/codecs/libspeex/filterbank.c
+++ b/lib/rbcodec/codecs/libspeex/filterbank.c
diff --git a/apps/codecs/libspeex/filterbank.h b/lib/rbcodec/codecs/libspeex/filterbank.h
index 3e889a22f7..3e889a22f7 100644
--- a/apps/codecs/libspeex/filterbank.h
+++ b/lib/rbcodec/codecs/libspeex/filterbank.h
diff --git a/apps/codecs/libspeex/filters.c b/lib/rbcodec/codecs/libspeex/filters.c
index 09f93c2a59..09f93c2a59 100644
--- a/apps/codecs/libspeex/filters.c
+++ b/lib/rbcodec/codecs/libspeex/filters.c
diff --git a/apps/codecs/libspeex/filters.h b/lib/rbcodec/codecs/libspeex/filters.h
index e3a5980e70..e3a5980e70 100644
--- a/apps/codecs/libspeex/filters.h
+++ b/lib/rbcodec/codecs/libspeex/filters.h
diff --git a/apps/codecs/libspeex/filters_arm4.S b/lib/rbcodec/codecs/libspeex/filters_arm4.S
index e652ede554..e652ede554 100644
--- a/apps/codecs/libspeex/filters_arm4.S
+++ b/lib/rbcodec/codecs/libspeex/filters_arm4.S
diff --git a/apps/codecs/libspeex/filters_arm4.h b/lib/rbcodec/codecs/libspeex/filters_arm4.h
index 18c2a7d448..18c2a7d448 100644
--- a/apps/codecs/libspeex/filters_arm4.h
+++ b/lib/rbcodec/codecs/libspeex/filters_arm4.h
diff --git a/apps/codecs/libspeex/filters_bfin.h b/lib/rbcodec/codecs/libspeex/filters_bfin.h
index 1e433ee167..1e433ee167 100644
--- a/apps/codecs/libspeex/filters_bfin.h
+++ b/lib/rbcodec/codecs/libspeex/filters_bfin.h
diff --git a/apps/codecs/libspeex/filters_cf.S b/lib/rbcodec/codecs/libspeex/filters_cf.S
index a48af85095..a48af85095 100644
--- a/apps/codecs/libspeex/filters_cf.S
+++ b/lib/rbcodec/codecs/libspeex/filters_cf.S
diff --git a/apps/codecs/libspeex/filters_sse.h b/lib/rbcodec/codecs/libspeex/filters_sse.h
index 4bb333daf3..4bb333daf3 100644
--- a/apps/codecs/libspeex/filters_sse.h
+++ b/lib/rbcodec/codecs/libspeex/filters_sse.h
diff --git a/apps/codecs/libspeex/fixed_arm4.h b/lib/rbcodec/codecs/libspeex/fixed_arm4.h
index b6981cae72..b6981cae72 100644
--- a/apps/codecs/libspeex/fixed_arm4.h
+++ b/lib/rbcodec/codecs/libspeex/fixed_arm4.h
diff --git a/apps/codecs/libspeex/fixed_arm5e.h b/lib/rbcodec/codecs/libspeex/fixed_arm5e.h
index 9b4861c9a7..9b4861c9a7 100644
--- a/apps/codecs/libspeex/fixed_arm5e.h
+++ b/lib/rbcodec/codecs/libspeex/fixed_arm5e.h
diff --git a/apps/codecs/libspeex/fixed_bfin.h b/lib/rbcodec/codecs/libspeex/fixed_bfin.h
index aa26f6a87d..aa26f6a87d 100644
--- a/apps/codecs/libspeex/fixed_bfin.h
+++ b/lib/rbcodec/codecs/libspeex/fixed_bfin.h
diff --git a/apps/codecs/libspeex/fixed_debug.h b/lib/rbcodec/codecs/libspeex/fixed_debug.h
index d5c449f4d9..d5c449f4d9 100644
--- a/apps/codecs/libspeex/fixed_debug.h
+++ b/lib/rbcodec/codecs/libspeex/fixed_debug.h
diff --git a/apps/codecs/libspeex/fixed_generic.h b/lib/rbcodec/codecs/libspeex/fixed_generic.h
index 2948177c0b..2948177c0b 100644
--- a/apps/codecs/libspeex/fixed_generic.h
+++ b/lib/rbcodec/codecs/libspeex/fixed_generic.h
diff --git a/apps/codecs/libspeex/gain_table.c b/lib/rbcodec/codecs/libspeex/gain_table.c
index bf236e80fc..bf236e80fc 100644
--- a/apps/codecs/libspeex/gain_table.c
+++ b/lib/rbcodec/codecs/libspeex/gain_table.c
diff --git a/apps/codecs/libspeex/gain_table_lbr.c b/lib/rbcodec/codecs/libspeex/gain_table_lbr.c
index b74df318a3..b74df318a3 100644
--- a/apps/codecs/libspeex/gain_table_lbr.c
+++ b/lib/rbcodec/codecs/libspeex/gain_table_lbr.c
diff --git a/apps/codecs/libspeex/hexc_10_32_table.c b/lib/rbcodec/codecs/libspeex/hexc_10_32_table.c
index 9a924e7ff0..9a924e7ff0 100644
--- a/apps/codecs/libspeex/hexc_10_32_table.c
+++ b/lib/rbcodec/codecs/libspeex/hexc_10_32_table.c
diff --git a/apps/codecs/libspeex/hexc_table.c b/lib/rbcodec/codecs/libspeex/hexc_table.c
index d892abd18c..d892abd18c 100644
--- a/apps/codecs/libspeex/hexc_table.c
+++ b/lib/rbcodec/codecs/libspeex/hexc_table.c
diff --git a/apps/codecs/libspeex/high_lsp_tables.c b/lib/rbcodec/codecs/libspeex/high_lsp_tables.c
index 56dc0f9faa..56dc0f9faa 100644
--- a/apps/codecs/libspeex/high_lsp_tables.c
+++ b/lib/rbcodec/codecs/libspeex/high_lsp_tables.c
diff --git a/apps/codecs/libspeex/jitter.c b/lib/rbcodec/codecs/libspeex/jitter.c
index d9f6c67b86..d9f6c67b86 100644
--- a/apps/codecs/libspeex/jitter.c
+++ b/lib/rbcodec/codecs/libspeex/jitter.c
diff --git a/apps/codecs/libspeex/kiss_fft.c b/lib/rbcodec/codecs/libspeex/kiss_fft.c
index 5b699a362f..5b699a362f 100644
--- a/apps/codecs/libspeex/kiss_fft.c
+++ b/lib/rbcodec/codecs/libspeex/kiss_fft.c
diff --git a/apps/codecs/libspeex/kiss_fft.h b/lib/rbcodec/codecs/libspeex/kiss_fft.h
index 43319b1ba8..43319b1ba8 100644
--- a/apps/codecs/libspeex/kiss_fft.h
+++ b/lib/rbcodec/codecs/libspeex/kiss_fft.h
diff --git a/apps/codecs/libspeex/kiss_fftr.c b/lib/rbcodec/codecs/libspeex/kiss_fftr.c
index 1c694b195d..1c694b195d 100644
--- a/apps/codecs/libspeex/kiss_fftr.c
+++ b/lib/rbcodec/codecs/libspeex/kiss_fftr.c
diff --git a/apps/codecs/libspeex/kiss_fftr.h b/lib/rbcodec/codecs/libspeex/kiss_fftr.h
index 7bfb423340..7bfb423340 100644
--- a/apps/codecs/libspeex/kiss_fftr.h
+++ b/lib/rbcodec/codecs/libspeex/kiss_fftr.h
diff --git a/apps/codecs/libspeex/libspeex.make b/lib/rbcodec/codecs/libspeex/libspeex.make
index 1089982d27..6138dff4a9 100644
--- a/apps/codecs/libspeex/libspeex.make
+++ b/lib/rbcodec/codecs/libspeex/libspeex.make
@@ -15,7 +15,7 @@
 # some horrid typecasting
 _SPEEXFLAGS = $(filter-out -fstrict-aliasing, $(CODECFLAGS)) \
                 -fno-strict-aliasing -DHAVE_CONFIG_H -DSPEEX_DISABLE_ENCODER \
-                -I$(APPSDIR)/codecs/libspeex
+                -I$(RBCODECLIB_DIR)/codecs/libspeex
 
 # build voice codec with core -O switch
 VOICESPEEXFLAGS = $(filter-out -ffunction-sections, $(filter-out -DCODEC,$(_SPEEXFLAGS))) -DROCKBOX_VOICE_CODEC
@@ -31,7 +31,7 @@ endif
 
 # libspeex
 SPEEXLIB := $(CODECDIR)/libspeex.a
-SPEEXLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspeex/SOURCES)
+SPEEXLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libspeex/SOURCES)
 SPEEXLIB_OBJ := $(call c2obj, $(SPEEXLIB_SRC))
 OTHER_SRC += $(SPEEXLIB_SRC)
 
@@ -41,26 +41,26 @@ $(SPEEXLIB): $(SPEEXLIB_OBJ)
 
 # libspeex-voice
 VOICESPEEXLIB := $(CODECDIR)/libspeex-voice.a
-VOICESPEEXLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libspeex/SOURCES)
-VOICESPEEXLIB_OBJ := $(addsuffix .o,$(basename $(subst $(ROOTDIR)/apps/codecs/libspeex,$(BUILDDIR)/apps/codecs/libspeex-voice,$(VOICESPEEXLIB_SRC))))
+VOICESPEEXLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libspeex/SOURCES)
+VOICESPEEXLIB_OBJ := $(addsuffix .o,$(basename $(subst $(RBCODECLIB_DIR)/codecs/libspeex,$(RBCODEC_BLD)/codecs/libspeex-voice,$(VOICESPEEXLIB_SRC))))
 
 $(VOICESPEEXLIB): $(VOICESPEEXLIB_OBJ)
         $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
 # pattern rules
 
-$(CODECDIR)/libspeex-voice/%.o : $(ROOTDIR)/apps/codecs/libspeex/%.c
+$(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.c
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) -c $< -o $@
 
-$(CODECDIR)/libspeex-voice/%.o : $(ROOTDIR)/apps/codecs/libspeex/%.S
+$(CODECDIR)/libspeex-voice/%.o : $(RBCODECLIB_DIR)/codecs/libspeex/%.S
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(VOICESPEEXFLAGS) $(ASMFLAGS) -c $< -o $@
 
-$(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.c
+$(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.c
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) -c $< -o $@
 
-$(CODECDIR)/libspeex/%.o: $(ROOTDIR)/apps/codecs/libspeex/%.S
+$(CODECDIR)/libspeex/%.o: $(RBCODECLIB_DIR)/codecs/libspeex/%.S
         $(SILENT)mkdir -p $(dir $@)
         $(call PRINTS,CC $(subst $(ROOTDIR)/,,$<))$(CC) $(SPEEXFLAGS) $(ASMFLAGS) -c $< -o $@
diff --git a/apps/codecs/libspeex/lpc.c b/lib/rbcodec/codecs/libspeex/lpc.c
index 9845633a6c..9845633a6c 100644
--- a/apps/codecs/libspeex/lpc.c
+++ b/lib/rbcodec/codecs/libspeex/lpc.c
diff --git a/apps/codecs/libspeex/lpc.h b/lib/rbcodec/codecs/libspeex/lpc.h
index 952ecdd933..952ecdd933 100644
--- a/apps/codecs/libspeex/lpc.h
+++ b/lib/rbcodec/codecs/libspeex/lpc.h
diff --git a/apps/codecs/libspeex/lpc_bfin.h b/lib/rbcodec/codecs/libspeex/lpc_bfin.h
index 7310ffba52..7310ffba52 100644
--- a/apps/codecs/libspeex/lpc_bfin.h
+++ b/lib/rbcodec/codecs/libspeex/lpc_bfin.h
diff --git a/apps/codecs/libspeex/lsp.c b/lib/rbcodec/codecs/libspeex/lsp.c
index 8408d782aa..8408d782aa 100644
--- a/apps/codecs/libspeex/lsp.c
+++ b/lib/rbcodec/codecs/libspeex/lsp.c
diff --git a/apps/codecs/libspeex/lsp.h b/lib/rbcodec/codecs/libspeex/lsp.h
index c53e7769d3..c53e7769d3 100644
--- a/apps/codecs/libspeex/lsp.h
+++ b/lib/rbcodec/codecs/libspeex/lsp.h
diff --git a/apps/codecs/libspeex/lsp_bfin.h b/lib/rbcodec/codecs/libspeex/lsp_bfin.h
index 20e505287e..20e505287e 100644
--- a/apps/codecs/libspeex/lsp_bfin.h
+++ b/lib/rbcodec/codecs/libspeex/lsp_bfin.h
diff --git a/apps/codecs/libspeex/lsp_tables_nb.c b/lib/rbcodec/codecs/libspeex/lsp_tables_nb.c
index 6bdd2e4d0f..6bdd2e4d0f 100644
--- a/apps/codecs/libspeex/lsp_tables_nb.c
+++ b/lib/rbcodec/codecs/libspeex/lsp_tables_nb.c
diff --git a/apps/codecs/libspeex/ltp.c b/lib/rbcodec/codecs/libspeex/ltp.c
index 9f10bc09d8..9f10bc09d8 100644
--- a/apps/codecs/libspeex/ltp.c
+++ b/lib/rbcodec/codecs/libspeex/ltp.c
diff --git a/apps/codecs/libspeex/ltp.h b/lib/rbcodec/codecs/libspeex/ltp.h
index 872f072e4e..872f072e4e 100644
--- a/apps/codecs/libspeex/ltp.h
+++ b/lib/rbcodec/codecs/libspeex/ltp.h
diff --git a/apps/codecs/libspeex/ltp_arm4.h b/lib/rbcodec/codecs/libspeex/ltp_arm4.h
index 46ecfa40ec..46ecfa40ec 100644
--- a/apps/codecs/libspeex/ltp_arm4.h
+++ b/lib/rbcodec/codecs/libspeex/ltp_arm4.h
diff --git a/apps/codecs/libspeex/ltp_bfin.h b/lib/rbcodec/codecs/libspeex/ltp_bfin.h
index 8d7225b017..8d7225b017 100644
--- a/apps/codecs/libspeex/ltp_bfin.h
+++ b/lib/rbcodec/codecs/libspeex/ltp_bfin.h
diff --git a/apps/codecs/libspeex/ltp_cf.S b/lib/rbcodec/codecs/libspeex/ltp_cf.S
index a1baed6d41..a1baed6d41 100644
--- a/apps/codecs/libspeex/ltp_cf.S
+++ b/lib/rbcodec/codecs/libspeex/ltp_cf.S
diff --git a/apps/codecs/libspeex/ltp_sse.h b/lib/rbcodec/codecs/libspeex/ltp_sse.h
index bed6eaac9a..bed6eaac9a 100644
--- a/apps/codecs/libspeex/ltp_sse.h
+++ b/lib/rbcodec/codecs/libspeex/ltp_sse.h
diff --git a/apps/codecs/libspeex/math_approx.h b/lib/rbcodec/codecs/libspeex/math_approx.h
index 9ca830755d..9ca830755d 100644
--- a/apps/codecs/libspeex/math_approx.h
+++ b/lib/rbcodec/codecs/libspeex/math_approx.h
diff --git a/apps/codecs/libspeex/mdf.c b/lib/rbcodec/codecs/libspeex/mdf.c
index 1994f2a886..1994f2a886 100644
--- a/apps/codecs/libspeex/mdf.c
+++ b/lib/rbcodec/codecs/libspeex/mdf.c
diff --git a/apps/codecs/libspeex/misc_bfin.h b/lib/rbcodec/codecs/libspeex/misc_bfin.h
index 77b082c057..77b082c057 100644
--- a/apps/codecs/libspeex/misc_bfin.h
+++ b/lib/rbcodec/codecs/libspeex/misc_bfin.h
diff --git a/apps/codecs/libspeex/modes.c b/lib/rbcodec/codecs/libspeex/modes.c
index d1046f1cfb..d1046f1cfb 100644
--- a/apps/codecs/libspeex/modes.c
+++ b/lib/rbcodec/codecs/libspeex/modes.c
diff --git a/apps/codecs/libspeex/modes.h b/lib/rbcodec/codecs/libspeex/modes.h
index 0fa1c3460e..0fa1c3460e 100644
--- a/apps/codecs/libspeex/modes.h
+++ b/lib/rbcodec/codecs/libspeex/modes.h
diff --git a/apps/codecs/libspeex/modes_wb.c b/lib/rbcodec/codecs/libspeex/modes_wb.c
index 93922afa2f..93922afa2f 100644
--- a/apps/codecs/libspeex/modes_wb.c
+++ b/lib/rbcodec/codecs/libspeex/modes_wb.c
diff --git a/apps/codecs/libspeex/nb_celp.c b/lib/rbcodec/codecs/libspeex/nb_celp.c
index 364f987472..364f987472 100644
--- a/apps/codecs/libspeex/nb_celp.c
+++ b/lib/rbcodec/codecs/libspeex/nb_celp.c
diff --git a/apps/codecs/libspeex/nb_celp.h b/lib/rbcodec/codecs/libspeex/nb_celp.h
index 30edbefaeb..30edbefaeb 100644
--- a/apps/codecs/libspeex/nb_celp.h
+++ b/lib/rbcodec/codecs/libspeex/nb_celp.h
diff --git a/apps/codecs/libspeex/oggframing.c b/lib/rbcodec/codecs/libspeex/oggframing.c
index 42d29502a8..42d29502a8 100644
--- a/apps/codecs/libspeex/oggframing.c
+++ b/lib/rbcodec/codecs/libspeex/oggframing.c
diff --git a/apps/codecs/libspeex/os_support.h b/lib/rbcodec/codecs/libspeex/os_support.h
index 71d24753c1..71d24753c1 100644
--- a/apps/codecs/libspeex/os_support.h
+++ b/lib/rbcodec/codecs/libspeex/os_support.h
diff --git a/apps/codecs/libspeex/preprocess.c b/lib/rbcodec/codecs/libspeex/preprocess.c
index 07a2ad3479..07a2ad3479 100644
--- a/apps/codecs/libspeex/preprocess.c
+++ b/lib/rbcodec/codecs/libspeex/preprocess.c
diff --git a/apps/codecs/libspeex/pseudofloat.h b/lib/rbcodec/codecs/libspeex/pseudofloat.h
index 448dd61ffe..448dd61ffe 100644
--- a/apps/codecs/libspeex/pseudofloat.h
+++ b/lib/rbcodec/codecs/libspeex/pseudofloat.h
diff --git a/apps/codecs/libspeex/quant_lsp.c b/lib/rbcodec/codecs/libspeex/quant_lsp.c
index 9b9104c842..9b9104c842 100644
--- a/apps/codecs/libspeex/quant_lsp.c
+++ b/lib/rbcodec/codecs/libspeex/quant_lsp.c
diff --git a/apps/codecs/libspeex/quant_lsp.h b/lib/rbcodec/codecs/libspeex/quant_lsp.h
index 0fc206be6f..0fc206be6f 100644
--- a/apps/codecs/libspeex/quant_lsp.h
+++ b/lib/rbcodec/codecs/libspeex/quant_lsp.h
diff --git a/apps/codecs/libspeex/quant_lsp_bfin.h b/lib/rbcodec/codecs/libspeex/quant_lsp_bfin.h
index 917047bb56..917047bb56 100644
--- a/apps/codecs/libspeex/quant_lsp_bfin.h
+++ b/lib/rbcodec/codecs/libspeex/quant_lsp_bfin.h
diff --git a/apps/codecs/libspeex/resample.c b/lib/rbcodec/codecs/libspeex/resample.c
index 65dfef28a3..65dfef28a3 100644
--- a/apps/codecs/libspeex/resample.c
+++ b/lib/rbcodec/codecs/libspeex/resample.c
diff --git a/apps/codecs/libspeex/rockbox.h b/lib/rbcodec/codecs/libspeex/rockbox.h
index 459c8b532f..459c8b532f 100644
--- a/apps/codecs/libspeex/rockbox.h
+++ b/lib/rbcodec/codecs/libspeex/rockbox.h
diff --git a/apps/codecs/libspeex/sb_celp.c b/lib/rbcodec/codecs/libspeex/sb_celp.c
index b28744812f..b28744812f 100644
--- a/apps/codecs/libspeex/sb_celp.c
+++ b/lib/rbcodec/codecs/libspeex/sb_celp.c
diff --git a/apps/codecs/libspeex/sb_celp.h b/lib/rbcodec/codecs/libspeex/sb_celp.h
index 5a65d1ff8d..5a65d1ff8d 100644
--- a/apps/codecs/libspeex/sb_celp.h
+++ b/lib/rbcodec/codecs/libspeex/sb_celp.h
diff --git a/apps/codecs/libspeex/smallft.c b/lib/rbcodec/codecs/libspeex/smallft.c
index 6e3a927b5f..6e3a927b5f 100644
--- a/apps/codecs/libspeex/smallft.c
+++ b/lib/rbcodec/codecs/libspeex/smallft.c
diff --git a/apps/codecs/libspeex/smallft.h b/lib/rbcodec/codecs/libspeex/smallft.h
index 4ef9e58c7d..4ef9e58c7d 100644
--- a/apps/codecs/libspeex/smallft.h
+++ b/lib/rbcodec/codecs/libspeex/smallft.h
diff --git a/apps/codecs/libspeex/speex.c b/lib/rbcodec/codecs/libspeex/speex.c
index 0dcfb3f7f6..0dcfb3f7f6 100644
--- a/apps/codecs/libspeex/speex.c
+++ b/lib/rbcodec/codecs/libspeex/speex.c
diff --git a/apps/codecs/libspeex/speex/ogg.h b/lib/rbcodec/codecs/libspeex/speex/ogg.h
index 8898b99582..8898b99582 100644
--- a/apps/codecs/libspeex/speex/ogg.h
+++ b/lib/rbcodec/codecs/libspeex/speex/ogg.h
diff --git a/apps/codecs/libspeex/speex/speex.h b/lib/rbcodec/codecs/libspeex/speex/speex.h
index 086d492670..086d492670 100644
--- a/apps/codecs/libspeex/speex/speex.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex.h
diff --git a/apps/codecs/libspeex/speex/speex_bits.h b/lib/rbcodec/codecs/libspeex/speex/speex_bits.h
index fee2893380..fee2893380 100644
--- a/apps/codecs/libspeex/speex/speex_bits.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_bits.h
diff --git a/apps/codecs/libspeex/speex/speex_callbacks.h b/lib/rbcodec/codecs/libspeex/speex/speex_callbacks.h
index 6f450b3a3a..6f450b3a3a 100644
--- a/apps/codecs/libspeex/speex/speex_callbacks.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_callbacks.h
diff --git a/apps/codecs/libspeex/speex/speex_config_types.h b/lib/rbcodec/codecs/libspeex/speex/speex_config_types.h
index ef328d48c1..ef328d48c1 100644
--- a/apps/codecs/libspeex/speex/speex_config_types.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_config_types.h
diff --git a/apps/codecs/libspeex/speex/speex_echo.h b/lib/rbcodec/codecs/libspeex/speex/speex_echo.h
index 6fcb0c00d7..6fcb0c00d7 100644
--- a/apps/codecs/libspeex/speex/speex_echo.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_echo.h
diff --git a/apps/codecs/libspeex/speex/speex_header.h b/lib/rbcodec/codecs/libspeex/speex/speex_header.h
index 2b60003fe9..2b60003fe9 100644
--- a/apps/codecs/libspeex/speex/speex_header.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_header.h
diff --git a/apps/codecs/libspeex/speex/speex_jitter.h b/lib/rbcodec/codecs/libspeex/speex/speex_jitter.h
index 03bac15636..03bac15636 100644
--- a/apps/codecs/libspeex/speex/speex_jitter.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_jitter.h
diff --git a/apps/codecs/libspeex/speex/speex_preprocess.h b/lib/rbcodec/codecs/libspeex/speex/speex_preprocess.h
index 273efaff79..273efaff79 100644
--- a/apps/codecs/libspeex/speex/speex_preprocess.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_preprocess.h
diff --git a/apps/codecs/libspeex/speex/speex_resampler.h b/lib/rbcodec/codecs/libspeex/speex/speex_resampler.h
index c44fbcd0d1..c44fbcd0d1 100644
--- a/apps/codecs/libspeex/speex/speex_resampler.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_resampler.h
diff --git a/apps/codecs/libspeex/speex/speex_stereo.h b/lib/rbcodec/codecs/libspeex/speex/speex_stereo.h
index 67e2a8d4e0..67e2a8d4e0 100644
--- a/apps/codecs/libspeex/speex/speex_stereo.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_stereo.h
diff --git a/apps/codecs/libspeex/speex/speex_types.h b/lib/rbcodec/codecs/libspeex/speex/speex_types.h
index a2ff1d6b53..a2ff1d6b53 100644
--- a/apps/codecs/libspeex/speex/speex_types.h
+++ b/lib/rbcodec/codecs/libspeex/speex/speex_types.h
diff --git a/apps/codecs/libspeex/speex_callbacks.c b/lib/rbcodec/codecs/libspeex/speex_callbacks.c
index f1de038488..f1de038488 100644
--- a/apps/codecs/libspeex/speex_callbacks.c
+++ b/lib/rbcodec/codecs/libspeex/speex_callbacks.c
diff --git a/apps/codecs/libspeex/speex_header.c b/lib/rbcodec/codecs/libspeex/speex_header.c
index b0e98b7c9c..b0e98b7c9c 100644
--- a/apps/codecs/libspeex/speex_header.c
+++ b/lib/rbcodec/codecs/libspeex/speex_header.c
diff --git a/apps/codecs/libspeex/stack_alloc.h b/lib/rbcodec/codecs/libspeex/stack_alloc.h
index f06f2f6f7f..f06f2f6f7f 100644
--- a/apps/codecs/libspeex/stack_alloc.h
+++ b/lib/rbcodec/codecs/libspeex/stack_alloc.h
diff --git a/apps/codecs/libspeex/stereo.c b/lib/rbcodec/codecs/libspeex/stereo.c
index 652d2a6e90..652d2a6e90 100644
--- a/apps/codecs/libspeex/stereo.c
+++ b/lib/rbcodec/codecs/libspeex/stereo.c
diff --git a/apps/codecs/libspeex/vbr.c b/lib/rbcodec/codecs/libspeex/vbr.c
index 32b33bc10e..32b33bc10e 100644
--- a/apps/codecs/libspeex/vbr.c
+++ b/lib/rbcodec/codecs/libspeex/vbr.c
diff --git a/apps/codecs/libspeex/vbr.h b/lib/rbcodec/codecs/libspeex/vbr.h
index ff1e3e46f2..ff1e3e46f2 100644
--- a/apps/codecs/libspeex/vbr.h
+++ b/lib/rbcodec/codecs/libspeex/vbr.h
diff --git a/apps/codecs/libspeex/vorbis_psy.c b/lib/rbcodec/codecs/libspeex/vorbis_psy.c
index 2032bf63e2..2032bf63e2 100644
--- a/apps/codecs/libspeex/vorbis_psy.c
+++ b/lib/rbcodec/codecs/libspeex/vorbis_psy.c
diff --git a/apps/codecs/libspeex/vorbis_psy.h b/lib/rbcodec/codecs/libspeex/vorbis_psy.h
index 6871057753..6871057753 100644
--- a/apps/codecs/libspeex/vorbis_psy.h
+++ b/lib/rbcodec/codecs/libspeex/vorbis_psy.h
diff --git a/apps/codecs/libspeex/vq.c b/lib/rbcodec/codecs/libspeex/vq.c
index fff470a588..fff470a588 100644
--- a/apps/codecs/libspeex/vq.c
+++ b/lib/rbcodec/codecs/libspeex/vq.c
diff --git a/apps/codecs/libspeex/vq.h b/lib/rbcodec/codecs/libspeex/vq.h
index 5a4ced249c..5a4ced249c 100644
--- a/apps/codecs/libspeex/vq.h
+++ b/lib/rbcodec/codecs/libspeex/vq.h
diff --git a/apps/codecs/libspeex/vq_arm4.h b/lib/rbcodec/codecs/libspeex/vq_arm4.h
index d2697e5784..d2697e5784 100644
--- a/apps/codecs/libspeex/vq_arm4.h
+++ b/lib/rbcodec/codecs/libspeex/vq_arm4.h
diff --git a/apps/codecs/libspeex/vq_bfin.h b/lib/rbcodec/codecs/libspeex/vq_bfin.h
index 2cc9ea5f17..2cc9ea5f17 100644
--- a/apps/codecs/libspeex/vq_bfin.h
+++ b/lib/rbcodec/codecs/libspeex/vq_bfin.h
diff --git a/apps/codecs/libspeex/vq_sse.h b/lib/rbcodec/codecs/libspeex/vq_sse.h
index 00a42ce354..00a42ce354 100644
--- a/apps/codecs/libspeex/vq_sse.h
+++ b/lib/rbcodec/codecs/libspeex/vq_sse.h
diff --git a/apps/codecs/libspeex/window.c b/lib/rbcodec/codecs/libspeex/window.c
index 84ed4916cf..84ed4916cf 100644
--- a/apps/codecs/libspeex/window.c
+++ b/lib/rbcodec/codecs/libspeex/window.c
diff --git a/apps/codecs/libtremor/CHANGELOG b/lib/rbcodec/codecs/libtremor/CHANGELOG
index 53f23351e2..53f23351e2 100644
--- a/apps/codecs/libtremor/CHANGELOG
+++ b/lib/rbcodec/codecs/libtremor/CHANGELOG
diff --git a/apps/codecs/libtremor/COPYING b/lib/rbcodec/codecs/libtremor/COPYING
index 6111c6c5a6..6111c6c5a6 100644
--- a/apps/codecs/libtremor/COPYING
+++ b/lib/rbcodec/codecs/libtremor/COPYING
diff --git a/apps/codecs/libtremor/README b/lib/rbcodec/codecs/libtremor/README
index 1321175322..1321175322 100644
--- a/apps/codecs/libtremor/README
+++ b/lib/rbcodec/codecs/libtremor/README
diff --git a/apps/codecs/libtremor/README.rockbox b/lib/rbcodec/codecs/libtremor/README.rockbox
index a4e141f6b3..a4e141f6b3 100644
--- a/apps/codecs/libtremor/README.rockbox
+++ b/lib/rbcodec/codecs/libtremor/README.rockbox
diff --git a/apps/codecs/libtremor/SOURCES b/lib/rbcodec/codecs/libtremor/SOURCES
index c622699599..c622699599 100644
--- a/apps/codecs/libtremor/SOURCES
+++ b/lib/rbcodec/codecs/libtremor/SOURCES
diff --git a/apps/codecs/libtremor/asm_arm.h b/lib/rbcodec/codecs/libtremor/asm_arm.h
index 42834a2581..42834a2581 100644
--- a/apps/codecs/libtremor/asm_arm.h
+++ b/lib/rbcodec/codecs/libtremor/asm_arm.h
diff --git a/apps/codecs/libtremor/asm_mcf5249.h b/lib/rbcodec/codecs/libtremor/asm_mcf5249.h
index 38aa117d84..38aa117d84 100644
--- a/apps/codecs/libtremor/asm_mcf5249.h
+++ b/lib/rbcodec/codecs/libtremor/asm_mcf5249.h
diff --git a/apps/codecs/libtremor/backends.h b/lib/rbcodec/codecs/libtremor/backends.h
index e27f1f2b80..e27f1f2b80 100644
--- a/apps/codecs/libtremor/backends.h
+++ b/lib/rbcodec/codecs/libtremor/backends.h
diff --git a/apps/codecs/libtremor/bitwise.c b/lib/rbcodec/codecs/libtremor/bitwise.c
index 040384abc6..040384abc6 100644
--- a/apps/codecs/libtremor/bitwise.c
+++ b/lib/rbcodec/codecs/libtremor/bitwise.c
diff --git a/apps/codecs/libtremor/block.c b/lib/rbcodec/codecs/libtremor/block.c
index b820f1cbc2..b820f1cbc2 100644
--- a/apps/codecs/libtremor/block.c
+++ b/lib/rbcodec/codecs/libtremor/block.c
diff --git a/apps/codecs/libtremor/codebook.c b/lib/rbcodec/codecs/libtremor/codebook.c
index 7087f0a323..7087f0a323 100644
--- a/apps/codecs/libtremor/codebook.c
+++ b/lib/rbcodec/codecs/libtremor/codebook.c
diff --git a/apps/codecs/libtremor/codebook.h b/lib/rbcodec/codecs/libtremor/codebook.h
index 29ac9fd923..29ac9fd923 100644
--- a/apps/codecs/libtremor/codebook.h
+++ b/lib/rbcodec/codecs/libtremor/codebook.h
diff --git a/apps/codecs/libtremor/codec_internal.h b/lib/rbcodec/codecs/libtremor/codec_internal.h
index 3cbd7cde89..3cbd7cde89 100644
--- a/apps/codecs/libtremor/codec_internal.h
+++ b/lib/rbcodec/codecs/libtremor/codec_internal.h
diff --git a/apps/codecs/libtremor/config-tremor.h b/lib/rbcodec/codecs/libtremor/config-tremor.h
index cf2dbe977d..cf2dbe977d 100644
--- a/apps/codecs/libtremor/config-tremor.h
+++ b/lib/rbcodec/codecs/libtremor/config-tremor.h
diff --git a/apps/codecs/libtremor/config_types.h b/lib/rbcodec/codecs/libtremor/config_types.h
index 1fdcb27fe7..1fdcb27fe7 100644
--- a/apps/codecs/libtremor/config_types.h
+++ b/lib/rbcodec/codecs/libtremor/config_types.h
diff --git a/apps/codecs/libtremor/ctype.c b/lib/rbcodec/codecs/libtremor/ctype.c
index 9f22047675..9f22047675 100644
--- a/apps/codecs/libtremor/ctype.c
+++ b/lib/rbcodec/codecs/libtremor/ctype.c
diff --git a/apps/codecs/libtremor/ffmpeg_stuff.h b/lib/rbcodec/codecs/libtremor/ffmpeg_stuff.h
index d7fa846507..d7fa846507 100644
--- a/apps/codecs/libtremor/ffmpeg_stuff.h
+++ b/lib/rbcodec/codecs/libtremor/ffmpeg_stuff.h
diff --git a/apps/codecs/libtremor/floor0.c b/lib/rbcodec/codecs/libtremor/floor0.c
index cd0a9f89f6..cd0a9f89f6 100644
--- a/apps/codecs/libtremor/floor0.c
+++ b/lib/rbcodec/codecs/libtremor/floor0.c
diff --git a/apps/codecs/libtremor/floor1.c b/lib/rbcodec/codecs/libtremor/floor1.c
index d2268db121..d2268db121 100644
--- a/apps/codecs/libtremor/floor1.c
+++ b/lib/rbcodec/codecs/libtremor/floor1.c
diff --git a/apps/codecs/libtremor/framing.c b/lib/rbcodec/codecs/libtremor/framing.c
index 582084853a..582084853a 100644
--- a/apps/codecs/libtremor/framing.c
+++ b/lib/rbcodec/codecs/libtremor/framing.c
diff --git a/apps/codecs/libtremor/info.c b/lib/rbcodec/codecs/libtremor/info.c
index d922711e34..d922711e34 100644
--- a/apps/codecs/libtremor/info.c
+++ b/lib/rbcodec/codecs/libtremor/info.c
diff --git a/apps/codecs/libtremor/ivorbiscodec.h b/lib/rbcodec/codecs/libtremor/ivorbiscodec.h
index 4fb041603d..4fb041603d 100644
--- a/apps/codecs/libtremor/ivorbiscodec.h
+++ b/lib/rbcodec/codecs/libtremor/ivorbiscodec.h
diff --git a/apps/codecs/libtremor/ivorbisfile.h b/lib/rbcodec/codecs/libtremor/ivorbisfile.h
index 076783514e..076783514e 100644
--- a/apps/codecs/libtremor/ivorbisfile.h
+++ b/lib/rbcodec/codecs/libtremor/ivorbisfile.h
diff --git a/apps/codecs/libtremor/libtremor.make b/lib/rbcodec/codecs/libtremor/libtremor.make
index 586c703346..4a581508b0 100644
--- a/apps/codecs/libtremor/libtremor.make
+++ b/lib/rbcodec/codecs/libtremor/libtremor.make
@@ -9,7 +9,7 @@
 
 # libtremor
 TREMORLIB := $(CODECDIR)/libtremor.a
-TREMORLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libtremor/SOURCES)
+TREMORLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libtremor/SOURCES)
 TREMORLIB_OBJ := $(call c2obj, $(TREMORLIB_SRC))
 OTHER_SRC += $(TREMORLIB_SRC)
 
diff --git a/apps/codecs/libtremor/lsp_lookup.h b/lib/rbcodec/codecs/libtremor/lsp_lookup.h
index d996677ca1..d996677ca1 100644
--- a/apps/codecs/libtremor/lsp_lookup.h
+++ b/lib/rbcodec/codecs/libtremor/lsp_lookup.h
diff --git a/apps/codecs/libtremor/mapping0.c b/lib/rbcodec/codecs/libtremor/mapping0.c
index 084d5e076d..084d5e076d 100644
--- a/apps/codecs/libtremor/mapping0.c
+++ b/lib/rbcodec/codecs/libtremor/mapping0.c
diff --git a/apps/codecs/libtremor/misc.h b/lib/rbcodec/codecs/libtremor/misc.h
index 592a60ffd8..592a60ffd8 100644
--- a/apps/codecs/libtremor/misc.h
+++ b/lib/rbcodec/codecs/libtremor/misc.h
diff --git a/apps/codecs/libtremor/ogg.h b/lib/rbcodec/codecs/libtremor/ogg.h
index d3af919b85..d3af919b85 100644
--- a/apps/codecs/libtremor/ogg.h
+++ b/lib/rbcodec/codecs/libtremor/ogg.h
diff --git a/apps/codecs/libtremor/oggmalloc.c b/lib/rbcodec/codecs/libtremor/oggmalloc.c
index 783e0f7240..783e0f7240 100644
--- a/apps/codecs/libtremor/oggmalloc.c
+++ b/lib/rbcodec/codecs/libtremor/oggmalloc.c
diff --git a/apps/codecs/libtremor/os.h b/lib/rbcodec/codecs/libtremor/os.h
index bafcaedb62..bafcaedb62 100644
--- a/apps/codecs/libtremor/os.h
+++ b/lib/rbcodec/codecs/libtremor/os.h
diff --git a/apps/codecs/libtremor/os_types.h b/lib/rbcodec/codecs/libtremor/os_types.h
index b5bd0b713a..b5bd0b713a 100644
--- a/apps/codecs/libtremor/os_types.h
+++ b/lib/rbcodec/codecs/libtremor/os_types.h
diff --git a/apps/codecs/libtremor/registry.c b/lib/rbcodec/codecs/libtremor/registry.c
index b1592628a1..b1592628a1 100644
--- a/apps/codecs/libtremor/registry.c
+++ b/lib/rbcodec/codecs/libtremor/registry.c
diff --git a/apps/codecs/libtremor/registry.h b/lib/rbcodec/codecs/libtremor/registry.h
index 2bc8068f69..2bc8068f69 100644
--- a/apps/codecs/libtremor/registry.h
+++ b/lib/rbcodec/codecs/libtremor/registry.h
diff --git a/apps/codecs/libtremor/res012.c b/lib/rbcodec/codecs/libtremor/res012.c
index e4ff440a6d..e4ff440a6d 100644
--- a/apps/codecs/libtremor/res012.c
+++ b/lib/rbcodec/codecs/libtremor/res012.c
diff --git a/apps/codecs/libtremor/sharedbook.c b/lib/rbcodec/codecs/libtremor/sharedbook.c
index 8b046217c7..8b046217c7 100644
--- a/apps/codecs/libtremor/sharedbook.c
+++ b/lib/rbcodec/codecs/libtremor/sharedbook.c
diff --git a/apps/codecs/libtremor/synthesis.c b/lib/rbcodec/codecs/libtremor/synthesis.c
index d1ef99ae37..d1ef99ae37 100644
--- a/apps/codecs/libtremor/synthesis.c
+++ b/lib/rbcodec/codecs/libtremor/synthesis.c
diff --git a/apps/codecs/libtremor/vorbisfile.c b/lib/rbcodec/codecs/libtremor/vorbisfile.c
index 271e5a09e3..271e5a09e3 100644
--- a/apps/codecs/libtremor/vorbisfile.c
+++ b/lib/rbcodec/codecs/libtremor/vorbisfile.c
diff --git a/apps/codecs/libtremor/window.c b/lib/rbcodec/codecs/libtremor/window.c
index 3bc947f0e5..3bc947f0e5 100644
--- a/apps/codecs/libtremor/window.c
+++ b/lib/rbcodec/codecs/libtremor/window.c
diff --git a/apps/codecs/libtremor/window.h b/lib/rbcodec/codecs/libtremor/window.h
index 166d0b8e9c..166d0b8e9c 100644
--- a/apps/codecs/libtremor/window.h
+++ b/lib/rbcodec/codecs/libtremor/window.h
diff --git a/apps/codecs/libtremor/window_lookup.h b/lib/rbcodec/codecs/libtremor/window_lookup.h
index 5363b81042..5363b81042 100644
--- a/apps/codecs/libtremor/window_lookup.h
+++ b/lib/rbcodec/codecs/libtremor/window_lookup.h
diff --git a/apps/codecs/libtta/README b/lib/rbcodec/codecs/libtta/README
index 8b1a1b23c0..8b1a1b23c0 100644
--- a/apps/codecs/libtta/README
+++ b/lib/rbcodec/codecs/libtta/README
diff --git a/apps/codecs/libtta/README.rockbox b/lib/rbcodec/codecs/libtta/README.rockbox
index 549aa4e097..549aa4e097 100644
--- a/apps/codecs/libtta/README.rockbox
+++ b/lib/rbcodec/codecs/libtta/README.rockbox
diff --git a/apps/codecs/libtta/SOURCES b/lib/rbcodec/codecs/libtta/SOURCES
index 0a8f1171eb..0a8f1171eb 100644
--- a/apps/codecs/libtta/SOURCES
+++ b/lib/rbcodec/codecs/libtta/SOURCES
diff --git a/apps/codecs/libtta/filter.h b/lib/rbcodec/codecs/libtta/filter.h
index 228757b9a0..228757b9a0 100644
--- a/apps/codecs/libtta/filter.h
+++ b/lib/rbcodec/codecs/libtta/filter.h
diff --git a/apps/codecs/libtta/filter_arm.S b/lib/rbcodec/codecs/libtta/filter_arm.S
index f3959b83ca..f3959b83ca 100644
--- a/apps/codecs/libtta/filter_arm.S
+++ b/lib/rbcodec/codecs/libtta/filter_arm.S
diff --git a/apps/codecs/libtta/filter_coldfire.S b/lib/rbcodec/codecs/libtta/filter_coldfire.S
index 3950eb52e6..3950eb52e6 100644
--- a/apps/codecs/libtta/filter_coldfire.S
+++ b/lib/rbcodec/codecs/libtta/filter_coldfire.S
diff --git a/apps/codecs/libtta/libtta.make b/lib/rbcodec/codecs/libtta/libtta.make
index f8b7c650b2..3fe3db1989 100644
--- a/apps/codecs/libtta/libtta.make
+++ b/lib/rbcodec/codecs/libtta/libtta.make
@@ -9,7 +9,7 @@
 
 # libtta
 TTALIB := $(CODECDIR)/libtta.a
-TTALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libtta/SOURCES)
+TTALIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libtta/SOURCES)
 TTALIB_OBJ := $(call c2obj, $(TTALIB_SRC))
 OTHER_SRC += $(TTALIB_SRC)
 
diff --git a/apps/codecs/libtta/ttadec.c b/lib/rbcodec/codecs/libtta/ttadec.c
index 06ca431084..06ca431084 100644
--- a/apps/codecs/libtta/ttadec.c
+++ b/lib/rbcodec/codecs/libtta/ttadec.c
diff --git a/apps/codecs/libtta/ttadec.h b/lib/rbcodec/codecs/libtta/ttadec.h
index c185e5c858..c185e5c858 100644
--- a/apps/codecs/libtta/ttadec.h
+++ b/lib/rbcodec/codecs/libtta/ttadec.h
diff --git a/apps/codecs/libtta/ttalib.h b/lib/rbcodec/codecs/libtta/ttalib.h
index 45da71813a..45da71813a 100644
--- a/apps/codecs/libtta/ttalib.h
+++ b/lib/rbcodec/codecs/libtta/ttalib.h
diff --git a/apps/codecs/libwavpack/LICENSE b/lib/rbcodec/codecs/libwavpack/LICENSE
index 3ee485817d..3ee485817d 100644
--- a/apps/codecs/libwavpack/LICENSE
+++ b/lib/rbcodec/codecs/libwavpack/LICENSE
diff --git a/apps/codecs/libwavpack/README b/lib/rbcodec/codecs/libwavpack/README
index b373235e1c..b373235e1c 100644
--- a/apps/codecs/libwavpack/README
+++ b/lib/rbcodec/codecs/libwavpack/README
diff --git a/apps/codecs/libwavpack/README.rockbox b/lib/rbcodec/codecs/libwavpack/README.rockbox
index a74b0c511c..a74b0c511c 100644
--- a/apps/codecs/libwavpack/README.rockbox
+++ b/lib/rbcodec/codecs/libwavpack/README.rockbox
diff --git a/apps/codecs/libwavpack/SOURCES b/lib/rbcodec/codecs/libwavpack/SOURCES
index b2518e59e0..b2518e59e0 100644
--- a/apps/codecs/libwavpack/SOURCES
+++ b/lib/rbcodec/codecs/libwavpack/SOURCES
diff --git a/apps/codecs/libwavpack/arm.S b/lib/rbcodec/codecs/libwavpack/arm.S
index 32de1df7de..32de1df7de 100644
--- a/apps/codecs/libwavpack/arm.S
+++ b/lib/rbcodec/codecs/libwavpack/arm.S
diff --git a/apps/codecs/libwavpack/arml.S b/lib/rbcodec/codecs/libwavpack/arml.S
index 60818aa1e6..60818aa1e6 100644
--- a/apps/codecs/libwavpack/arml.S
+++ b/lib/rbcodec/codecs/libwavpack/arml.S
diff --git a/apps/codecs/libwavpack/bits.c b/lib/rbcodec/codecs/libwavpack/bits.c
index 0f0e79c292..0f0e79c292 100644
--- a/apps/codecs/libwavpack/bits.c
+++ b/lib/rbcodec/codecs/libwavpack/bits.c
diff --git a/apps/codecs/libwavpack/coldfire.S b/lib/rbcodec/codecs/libwavpack/coldfire.S
index 884a0ac90f..884a0ac90f 100644
--- a/apps/codecs/libwavpack/coldfire.S
+++ b/lib/rbcodec/codecs/libwavpack/coldfire.S
diff --git a/apps/codecs/libwavpack/float.c b/lib/rbcodec/codecs/libwavpack/float.c
index 6e5c4e4f61..6e5c4e4f61 100644
--- a/apps/codecs/libwavpack/float.c
+++ b/lib/rbcodec/codecs/libwavpack/float.c
diff --git a/apps/codecs/libwavpack/libwavpack.make b/lib/rbcodec/codecs/libwavpack/libwavpack.make
index a2e5377418..27a2d214a1 100644
--- a/apps/codecs/libwavpack/libwavpack.make
+++ b/lib/rbcodec/codecs/libwavpack/libwavpack.make
@@ -9,7 +9,7 @@
 
 # libwavpack
 WAVPACKLIB := $(CODECDIR)/libwavpack.a
-WAVPACKLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwavpack/SOURCES)
+WAVPACKLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libwavpack/SOURCES)
 WAVPACKLIB_OBJ := $(call c2obj, $(WAVPACKLIB_SRC))
 OTHER_SRC += $(WAVPACKLIB_SRC)
 
diff --git a/apps/codecs/libwavpack/make.bat b/lib/rbcodec/codecs/libwavpack/make.bat
index 0ca72d7e55..0ca72d7e55 100644
--- a/apps/codecs/libwavpack/make.bat
+++ b/lib/rbcodec/codecs/libwavpack/make.bat
diff --git a/apps/codecs/libwavpack/metadata.c b/lib/rbcodec/codecs/libwavpack/metadata.c
index 4dce10100f..4dce10100f 100644
--- a/apps/codecs/libwavpack/metadata.c
+++ b/lib/rbcodec/codecs/libwavpack/metadata.c
diff --git a/apps/codecs/libwavpack/pack.c b/lib/rbcodec/codecs/libwavpack/pack.c
index a46d05fe14..a46d05fe14 100644
--- a/apps/codecs/libwavpack/pack.c
+++ b/lib/rbcodec/codecs/libwavpack/pack.c
diff --git a/apps/codecs/libwavpack/unpack.c b/lib/rbcodec/codecs/libwavpack/unpack.c
index 69252f24ad..69252f24ad 100644
--- a/apps/codecs/libwavpack/unpack.c
+++ b/lib/rbcodec/codecs/libwavpack/unpack.c
diff --git a/apps/codecs/libwavpack/wavpack.h b/lib/rbcodec/codecs/libwavpack/wavpack.h
index b15a176f33..b15a176f33 100644
--- a/apps/codecs/libwavpack/wavpack.h
+++ b/lib/rbcodec/codecs/libwavpack/wavpack.h
diff --git a/apps/codecs/libwavpack/words.c b/lib/rbcodec/codecs/libwavpack/words.c
index 3d9e753e4b..3d9e753e4b 100644
--- a/apps/codecs/libwavpack/words.c
+++ b/lib/rbcodec/codecs/libwavpack/words.c
diff --git a/apps/codecs/libwavpack/wputils.c b/lib/rbcodec/codecs/libwavpack/wputils.c
index b0ccd3ba83..b0ccd3ba83 100644
--- a/apps/codecs/libwavpack/wputils.c
+++ b/lib/rbcodec/codecs/libwavpack/wputils.c
diff --git a/apps/codecs/libwma/SOURCES b/lib/rbcodec/codecs/libwma/SOURCES
index 14cf0c8922..14cf0c8922 100644
--- a/apps/codecs/libwma/SOURCES
+++ b/lib/rbcodec/codecs/libwma/SOURCES
diff --git a/apps/codecs/libwma/libwma.make b/lib/rbcodec/codecs/libwma/libwma.make
index 71c4cdc626..a916a4f90f 100644
--- a/apps/codecs/libwma/libwma.make
+++ b/lib/rbcodec/codecs/libwma/libwma.make
@@ -9,7 +9,7 @@
 
 # libwma
 WMALIB := $(CODECDIR)/libwma.a
-WMALIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwma/SOURCES)
+WMALIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libwma/SOURCES)
 WMALIB_OBJ := $(call c2obj, $(WMALIB_SRC))
 OTHER_SRC += $(WMALIB_SRC)
 
diff --git a/apps/codecs/libwma/types.h b/lib/rbcodec/codecs/libwma/types.h
index 8a5e2a992e..8a5e2a992e 100644
--- a/apps/codecs/libwma/types.h
+++ b/lib/rbcodec/codecs/libwma/types.h
diff --git a/apps/codecs/libwma/wmadata.h b/lib/rbcodec/codecs/libwma/wmadata.h
index 07a55df19a..07a55df19a 100644
--- a/apps/codecs/libwma/wmadata.h
+++ b/lib/rbcodec/codecs/libwma/wmadata.h
diff --git a/apps/codecs/libwma/wmadec.h b/lib/rbcodec/codecs/libwma/wmadec.h
index 76429dede1..76429dede1 100644
--- a/apps/codecs/libwma/wmadec.h
+++ b/lib/rbcodec/codecs/libwma/wmadec.h
diff --git a/apps/codecs/libwma/wmadeci.c b/lib/rbcodec/codecs/libwma/wmadeci.c
index d7a836dd97..d7a836dd97 100644
--- a/apps/codecs/libwma/wmadeci.c
+++ b/lib/rbcodec/codecs/libwma/wmadeci.c
diff --git a/apps/codecs/libwma/wmafixed.c b/lib/rbcodec/codecs/libwma/wmafixed.c
index bdf87a548b..bdf87a548b 100644
--- a/apps/codecs/libwma/wmafixed.c
+++ b/lib/rbcodec/codecs/libwma/wmafixed.c
diff --git a/apps/codecs/libwma/wmafixed.h b/lib/rbcodec/codecs/libwma/wmafixed.h
index 4225f165c9..4225f165c9 100644
--- a/apps/codecs/libwma/wmafixed.h
+++ b/lib/rbcodec/codecs/libwma/wmafixed.h
diff --git a/apps/codecs/libwmapro/README.rockbox b/lib/rbcodec/codecs/libwmapro/README.rockbox
index 5d15bdd42c..5d15bdd42c 100644
--- a/apps/codecs/libwmapro/README.rockbox
+++ b/lib/rbcodec/codecs/libwmapro/README.rockbox
diff --git a/apps/codecs/libwmapro/SOURCES b/lib/rbcodec/codecs/libwmapro/SOURCES
index 296f26ab7f..296f26ab7f 100644
--- a/apps/codecs/libwmapro/SOURCES
+++ b/lib/rbcodec/codecs/libwmapro/SOURCES
diff --git a/apps/codecs/libwmapro/libwmapro.make b/lib/rbcodec/codecs/libwmapro/libwmapro.make
index 9177eafb20..3db9000b43 100644
--- a/apps/codecs/libwmapro/libwmapro.make
+++ b/lib/rbcodec/codecs/libwmapro/libwmapro.make
@@ -9,7 +9,7 @@
 
 # libwmapro
 WMAPROLIB := $(CODECDIR)/libwmapro.a
-WMAPROLIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwmapro/SOURCES)
+WMAPROLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libwmapro/SOURCES)
 WMAPROLIB_OBJ := $(call c2obj, $(WMAPROLIB_SRC))
 OTHER_SRC += $(WMAPROLIB_SRC)
 
diff --git a/apps/codecs/libwmapro/mdct_tables.c b/lib/rbcodec/codecs/libwmapro/mdct_tables.c
index bec3c37ee7..bec3c37ee7 100644
--- a/apps/codecs/libwmapro/mdct_tables.c
+++ b/lib/rbcodec/codecs/libwmapro/mdct_tables.c
diff --git a/apps/codecs/libwmapro/mdct_tables.h b/lib/rbcodec/codecs/libwmapro/mdct_tables.h
index 5e54868b01..5e54868b01 100644
--- a/apps/codecs/libwmapro/mdct_tables.h
+++ b/lib/rbcodec/codecs/libwmapro/mdct_tables.h
diff --git a/apps/codecs/libwmapro/quant.h b/lib/rbcodec/codecs/libwmapro/quant.h
index 3500615fde..3500615fde 100644
--- a/apps/codecs/libwmapro/quant.h
+++ b/lib/rbcodec/codecs/libwmapro/quant.h
diff --git a/apps/codecs/libwmapro/wma.c b/lib/rbcodec/codecs/libwmapro/wma.c
index 83cec89a4c..83cec89a4c 100644
--- a/apps/codecs/libwmapro/wma.c
+++ b/lib/rbcodec/codecs/libwmapro/wma.c
diff --git a/apps/codecs/libwmapro/wma.h b/lib/rbcodec/codecs/libwmapro/wma.h
index 6fa7b94724..6fa7b94724 100644
--- a/apps/codecs/libwmapro/wma.h
+++ b/lib/rbcodec/codecs/libwmapro/wma.h
diff --git a/apps/codecs/libwmapro/wmapro_math.h b/lib/rbcodec/codecs/libwmapro/wmapro_math.h
index c78d6b627f..c78d6b627f 100644
--- a/apps/codecs/libwmapro/wmapro_math.h
+++ b/lib/rbcodec/codecs/libwmapro/wmapro_math.h
diff --git a/apps/codecs/libwmapro/wmaprodata.h b/lib/rbcodec/codecs/libwmapro/wmaprodata.h
index 94762f7dbf..94762f7dbf 100644
--- a/apps/codecs/libwmapro/wmaprodata.h
+++ b/lib/rbcodec/codecs/libwmapro/wmaprodata.h
diff --git a/apps/codecs/libwmapro/wmaprodec.c b/lib/rbcodec/codecs/libwmapro/wmaprodec.c
index 9d42c6de0f..9d42c6de0f 100644
--- a/apps/codecs/libwmapro/wmaprodec.c
+++ b/lib/rbcodec/codecs/libwmapro/wmaprodec.c
diff --git a/apps/codecs/libwmapro/wmaprodec.h b/lib/rbcodec/codecs/libwmapro/wmaprodec.h
index d8398fc9f1..d8398fc9f1 100644
--- a/apps/codecs/libwmapro/wmaprodec.h
+++ b/lib/rbcodec/codecs/libwmapro/wmaprodec.h
diff --git a/apps/codecs/libwmavoice/Makefile b/lib/rbcodec/codecs/libwmavoice/Makefile
index 2bd7b94f9b..2bd7b94f9b 100644
--- a/apps/codecs/libwmavoice/Makefile
+++ b/lib/rbcodec/codecs/libwmavoice/Makefile
diff --git a/apps/codecs/libwmavoice/README.rockbox b/lib/rbcodec/codecs/libwmavoice/README.rockbox
index 8115619bf0..8115619bf0 100644
--- a/apps/codecs/libwmavoice/README.rockbox
+++ b/lib/rbcodec/codecs/libwmavoice/README.rockbox
diff --git a/apps/codecs/libwmavoice/SOURCES b/lib/rbcodec/codecs/libwmavoice/SOURCES
index c98821c42a..c98821c42a 100644
--- a/apps/codecs/libwmavoice/SOURCES
+++ b/lib/rbcodec/codecs/libwmavoice/SOURCES
diff --git a/apps/codecs/libwmavoice/acelp_filters.c b/lib/rbcodec/codecs/libwmavoice/acelp_filters.c
index c48c0e72ce..c48c0e72ce 100644
--- a/apps/codecs/libwmavoice/acelp_filters.c
+++ b/lib/rbcodec/codecs/libwmavoice/acelp_filters.c
diff --git a/apps/codecs/libwmavoice/acelp_filters.h b/lib/rbcodec/codecs/libwmavoice/acelp_filters.h
index 0b1ccf4e71..0b1ccf4e71 100644
--- a/apps/codecs/libwmavoice/acelp_filters.h
+++ b/lib/rbcodec/codecs/libwmavoice/acelp_filters.h
diff --git a/apps/codecs/libwmavoice/acelp_vectors.c b/lib/rbcodec/codecs/libwmavoice/acelp_vectors.c
index e41e5facb6..e41e5facb6 100644
--- a/apps/codecs/libwmavoice/acelp_vectors.c
+++ b/lib/rbcodec/codecs/libwmavoice/acelp_vectors.c
diff --git a/apps/codecs/libwmavoice/acelp_vectors.h b/lib/rbcodec/codecs/libwmavoice/acelp_vectors.h
index f3bc781446..f3bc781446 100644
--- a/apps/codecs/libwmavoice/acelp_vectors.h
+++ b/lib/rbcodec/codecs/libwmavoice/acelp_vectors.h
diff --git a/apps/codecs/libwmavoice/avcodec.h b/lib/rbcodec/codecs/libwmavoice/avcodec.h
index db08ab3c5f..db08ab3c5f 100644
--- a/apps/codecs/libwmavoice/avcodec.h
+++ b/lib/rbcodec/codecs/libwmavoice/avcodec.h
diff --git a/apps/codecs/libwmavoice/avfft.c b/lib/rbcodec/codecs/libwmavoice/avfft.c
index 7d5d08390f..7d5d08390f 100644
--- a/apps/codecs/libwmavoice/avfft.c
+++ b/lib/rbcodec/codecs/libwmavoice/avfft.c
diff --git a/apps/codecs/libwmavoice/avfft.h b/lib/rbcodec/codecs/libwmavoice/avfft.h
index be2d9c7e10..be2d9c7e10 100644
--- a/apps/codecs/libwmavoice/avfft.h
+++ b/lib/rbcodec/codecs/libwmavoice/avfft.h
diff --git a/apps/codecs/libwmavoice/bitstream.c b/lib/rbcodec/codecs/libwmavoice/bitstream.c
index d408f66650..d408f66650 100644
--- a/apps/codecs/libwmavoice/bitstream.c
+++ b/lib/rbcodec/codecs/libwmavoice/bitstream.c
diff --git a/apps/codecs/libwmavoice/celp_filters.c b/lib/rbcodec/codecs/libwmavoice/celp_filters.c
index 26a62eed14..26a62eed14 100644
--- a/apps/codecs/libwmavoice/celp_filters.c
+++ b/lib/rbcodec/codecs/libwmavoice/celp_filters.c
diff --git a/apps/codecs/libwmavoice/celp_filters.h b/lib/rbcodec/codecs/libwmavoice/celp_filters.h
index 145e3d3346..145e3d3346 100644
--- a/apps/codecs/libwmavoice/celp_filters.h
+++ b/lib/rbcodec/codecs/libwmavoice/celp_filters.h
diff --git a/apps/codecs/libwmavoice/celp_math.c b/lib/rbcodec/codecs/libwmavoice/celp_math.c
index 09111da819..09111da819 100644
--- a/apps/codecs/libwmavoice/celp_math.c
+++ b/lib/rbcodec/codecs/libwmavoice/celp_math.c
diff --git a/apps/codecs/libwmavoice/celp_math.h b/lib/rbcodec/codecs/libwmavoice/celp_math.h
index 4cf656fb7e..4cf656fb7e 100644
--- a/apps/codecs/libwmavoice/celp_math.h
+++ b/lib/rbcodec/codecs/libwmavoice/celp_math.h
diff --git a/apps/codecs/libwmavoice/dct.c b/lib/rbcodec/codecs/libwmavoice/dct.c
index 95aef5af6c..95aef5af6c 100644
--- a/apps/codecs/libwmavoice/dct.c
+++ b/lib/rbcodec/codecs/libwmavoice/dct.c
diff --git a/apps/codecs/libwmavoice/dct32.c b/lib/rbcodec/codecs/libwmavoice/dct32.c
index 4e843ee832..4e843ee832 100644
--- a/apps/codecs/libwmavoice/dct32.c
+++ b/lib/rbcodec/codecs/libwmavoice/dct32.c
diff --git a/apps/codecs/libwmavoice/fft.c b/lib/rbcodec/codecs/libwmavoice/fft.c
index a030534a26..a030534a26 100644
--- a/apps/codecs/libwmavoice/fft.c
+++ b/lib/rbcodec/codecs/libwmavoice/fft.c
diff --git a/apps/codecs/libwmavoice/fft.h b/lib/rbcodec/codecs/libwmavoice/fft.h
index 2c54b56658..2c54b56658 100644
--- a/apps/codecs/libwmavoice/fft.h
+++ b/lib/rbcodec/codecs/libwmavoice/fft.h
diff --git a/apps/codecs/libwmavoice/get_bits.h b/lib/rbcodec/codecs/libwmavoice/get_bits.h
index f4b3646e69..f4b3646e69 100644
--- a/apps/codecs/libwmavoice/get_bits.h
+++ b/lib/rbcodec/codecs/libwmavoice/get_bits.h
diff --git a/apps/codecs/libwmavoice/internal.h b/lib/rbcodec/codecs/libwmavoice/internal.h
index 24aca6b28b..24aca6b28b 100644
--- a/apps/codecs/libwmavoice/internal.h
+++ b/lib/rbcodec/codecs/libwmavoice/internal.h
diff --git a/apps/codecs/libwmavoice/libavutil/attributes.h b/lib/rbcodec/codecs/libwmavoice/libavutil/attributes.h
index a95bb02e89..a95bb02e89 100644
--- a/apps/codecs/libwmavoice/libavutil/attributes.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/attributes.h
diff --git a/apps/codecs/libwmavoice/libavutil/avutil.h b/lib/rbcodec/codecs/libwmavoice/libavutil/avutil.h
index 457829ac7f..457829ac7f 100644
--- a/apps/codecs/libwmavoice/libavutil/avutil.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/avutil.h
diff --git a/apps/codecs/libwmavoice/libavutil/bswap.h b/lib/rbcodec/codecs/libwmavoice/libavutil/bswap.h
index 303bcf3532..303bcf3532 100644
--- a/apps/codecs/libwmavoice/libavutil/bswap.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/bswap.h
diff --git a/apps/codecs/libwmavoice/libavutil/common.h b/lib/rbcodec/codecs/libwmavoice/libavutil/common.h
index f9c03db559..f9c03db559 100644
--- a/apps/codecs/libwmavoice/libavutil/common.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/common.h
diff --git a/apps/codecs/libwmavoice/libavutil/internal.h b/lib/rbcodec/codecs/libwmavoice/libavutil/internal.h
index 53d2b94c50..53d2b94c50 100644
--- a/apps/codecs/libwmavoice/libavutil/internal.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/internal.h
diff --git a/apps/codecs/libwmavoice/libavutil/intreadwrite.h b/lib/rbcodec/codecs/libwmavoice/libavutil/intreadwrite.h
index 1849a64661..1849a64661 100644
--- a/apps/codecs/libwmavoice/libavutil/intreadwrite.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/intreadwrite.h
diff --git a/apps/codecs/libwmavoice/libavutil/log.c b/lib/rbcodec/codecs/libwmavoice/libavutil/log.c
index 2e225b3b50..2e225b3b50 100644
--- a/apps/codecs/libwmavoice/libavutil/log.c
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/log.c
diff --git a/apps/codecs/libwmavoice/libavutil/log.h b/lib/rbcodec/codecs/libwmavoice/libavutil/log.h
index 831c26eae6..831c26eae6 100644
--- a/apps/codecs/libwmavoice/libavutil/log.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/log.h
diff --git a/apps/codecs/libwmavoice/libavutil/lzo.c b/lib/rbcodec/codecs/libwmavoice/libavutil/lzo.c
index 7f07cc2ee5..7f07cc2ee5 100644
--- a/apps/codecs/libwmavoice/libavutil/lzo.c
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/lzo.c
diff --git a/apps/codecs/libwmavoice/libavutil/lzo.h b/lib/rbcodec/codecs/libwmavoice/libavutil/lzo.h
index 6788054bff..6788054bff 100644
--- a/apps/codecs/libwmavoice/libavutil/lzo.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/lzo.h
diff --git a/apps/codecs/libwmavoice/libavutil/mathematics.c b/lib/rbcodec/codecs/libwmavoice/libavutil/mathematics.c
index c4fbe3b7bc..c4fbe3b7bc 100644
--- a/apps/codecs/libwmavoice/libavutil/mathematics.c
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/mathematics.c
diff --git a/apps/codecs/libwmavoice/libavutil/mathematics.h b/lib/rbcodec/codecs/libwmavoice/libavutil/mathematics.h
index e07d4fe807..e07d4fe807 100644
--- a/apps/codecs/libwmavoice/libavutil/mathematics.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/mathematics.h
diff --git a/apps/codecs/libwmavoice/libavutil/mem.c b/lib/rbcodec/codecs/libwmavoice/libavutil/mem.c
index a9a3283775..a9a3283775 100644
--- a/apps/codecs/libwmavoice/libavutil/mem.c
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/mem.c
diff --git a/apps/codecs/libwmavoice/libavutil/mem.h b/lib/rbcodec/codecs/libwmavoice/libavutil/mem.h
index c5ec2ab3c3..c5ec2ab3c3 100644
--- a/apps/codecs/libwmavoice/libavutil/mem.h
+++ b/lib/rbcodec/codecs/libwmavoice/libavutil/mem.h
diff --git a/apps/codecs/libwmavoice/libwmavoice.make b/lib/rbcodec/codecs/libwmavoice/libwmavoice.make
index b35756c64a..609e5612f8 100644
--- a/apps/codecs/libwmavoice/libwmavoice.make
+++ b/lib/rbcodec/codecs/libwmavoice/libwmavoice.make
@@ -9,7 +9,7 @@
 
 # libwmavoice
 WMAVOICELIB := $(CODECDIR)/libwmavoice.a
-WMAVOICELIB_SRC := $(call preprocess, $(APPSDIR)/codecs/libwmavoice/SOURCES)
+WMAVOICELIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/codecs/libwmavoice/SOURCES)
 WMAVOICELIB_OBJ := $(call c2obj, $(WMAVOICELIB_SRC))
 OTHER_SRC += $(WMAVOICELIB_SRC)
 
@@ -17,7 +17,7 @@ $(WMAVOICELIB): $(WMAVOICELIB_OBJ)
         $(SILENT)$(shell rm -f $@)
         $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
 
-WMAVOICEFLAGS = -I$(APPSDIR)/codecs/libwmavoice $(filter-out -O%,$(CODECFLAGS))
+WMAVOICEFLAGS = -I$(RBCODECLIB_DIR)/codecs/libwmavoice $(filter-out -O%,$(CODECFLAGS))
 
 ifeq ($(ARCH),arch_m68k)
         WMAVOICEFLAGS += -O2
diff --git a/apps/codecs/libwmavoice/lsp.c b/lib/rbcodec/codecs/libwmavoice/lsp.c
index 4dba9c1df9..4dba9c1df9 100644
--- a/apps/codecs/libwmavoice/lsp.c
+++ b/lib/rbcodec/codecs/libwmavoice/lsp.c
diff --git a/apps/codecs/libwmavoice/lsp.h b/lib/rbcodec/codecs/libwmavoice/lsp.h
index 5ee5c277bc..5ee5c277bc 100644
--- a/apps/codecs/libwmavoice/lsp.h
+++ b/lib/rbcodec/codecs/libwmavoice/lsp.h
diff --git a/apps/codecs/libwmavoice/mathops.h b/lib/rbcodec/codecs/libwmavoice/mathops.h
index 4d88ed14c9..4d88ed14c9 100644
--- a/apps/codecs/libwmavoice/mathops.h
+++ b/lib/rbcodec/codecs/libwmavoice/mathops.h
diff --git a/apps/codecs/libwmavoice/mdct.c b/lib/rbcodec/codecs/libwmavoice/mdct.c
index 58bff3517b..58bff3517b 100644
--- a/apps/codecs/libwmavoice/mdct.c
+++ b/lib/rbcodec/codecs/libwmavoice/mdct.c
diff --git a/apps/codecs/libwmavoice/mdct_tablegen.h b/lib/rbcodec/codecs/libwmavoice/mdct_tablegen.h
index 51a0094221..51a0094221 100644
--- a/apps/codecs/libwmavoice/mdct_tablegen.h
+++ b/lib/rbcodec/codecs/libwmavoice/mdct_tablegen.h
diff --git a/apps/codecs/libwmavoice/put_bits.h b/lib/rbcodec/codecs/libwmavoice/put_bits.h
index d301d0afcc..d301d0afcc 100644
--- a/apps/codecs/libwmavoice/put_bits.h
+++ b/lib/rbcodec/codecs/libwmavoice/put_bits.h
diff --git a/apps/codecs/libwmavoice/rdft.c b/lib/rbcodec/codecs/libwmavoice/rdft.c
index bc44f5aef2..bc44f5aef2 100644
--- a/apps/codecs/libwmavoice/rdft.c
+++ b/lib/rbcodec/codecs/libwmavoice/rdft.c
diff --git a/apps/codecs/libwmavoice/utils.c b/lib/rbcodec/codecs/libwmavoice/utils.c
index ad098f4636..ad098f4636 100644
--- a/apps/codecs/libwmavoice/utils.c
+++ b/lib/rbcodec/codecs/libwmavoice/utils.c
diff --git a/apps/codecs/libwmavoice/wmavoice.c b/lib/rbcodec/codecs/libwmavoice/wmavoice.c
index 4d31334c36..4d31334c36 100644
--- a/apps/codecs/libwmavoice/wmavoice.c
+++ b/lib/rbcodec/codecs/libwmavoice/wmavoice.c
diff --git a/apps/codecs/libwmavoice/wmavoice.h b/lib/rbcodec/codecs/libwmavoice/wmavoice.h
index 33ec72b4e2..33ec72b4e2 100644
--- a/apps/codecs/libwmavoice/wmavoice.h
+++ b/lib/rbcodec/codecs/libwmavoice/wmavoice.h
diff --git a/apps/codecs/libwmavoice/wmavoice_data.h b/lib/rbcodec/codecs/libwmavoice/wmavoice_data.h
index cbf65b043e..cbf65b043e 100644
--- a/apps/codecs/libwmavoice/wmavoice_data.h
+++ b/lib/rbcodec/codecs/libwmavoice/wmavoice_data.h
diff --git a/apps/codecs/libwmavoice/wmavoice_mainbuild.patch b/lib/rbcodec/codecs/libwmavoice/wmavoice_mainbuild.patch
index cf349299bd..cf349299bd 100644
--- a/apps/codecs/libwmavoice/wmavoice_mainbuild.patch
+++ b/lib/rbcodec/codecs/libwmavoice/wmavoice_mainbuild.patch
diff --git a/apps/codecs/mod.c b/lib/rbcodec/codecs/mod.c
index 5bd64994f1..5bd64994f1 100644
--- a/apps/codecs/mod.c
+++ b/lib/rbcodec/codecs/mod.c
diff --git a/apps/codecs/mp3_enc.c b/lib/rbcodec/codecs/mp3_enc.c
index 2f5528f74c..2f5528f74c 100644
--- a/apps/codecs/mp3_enc.c
+++ b/lib/rbcodec/codecs/mp3_enc.c
diff --git a/apps/codecs/mpa.c b/lib/rbcodec/codecs/mpa.c
index f9bf7e600f..f9bf7e600f 100644
--- a/apps/codecs/mpa.c
+++ b/lib/rbcodec/codecs/mpa.c
diff --git a/apps/codecs/mpc.c b/lib/rbcodec/codecs/mpc.c
index b2628f988e..b2628f988e 100644
--- a/apps/codecs/mpc.c
+++ b/lib/rbcodec/codecs/mpc.c
diff --git a/apps/codecs/nsf.c b/lib/rbcodec/codecs/nsf.c
index 4c5b37c3fa..4c5b37c3fa 100644
--- a/apps/codecs/nsf.c
+++ b/lib/rbcodec/codecs/nsf.c
diff --git a/apps/codecs/raac.c b/lib/rbcodec/codecs/raac.c
index 0ef7e715bc..0ef7e715bc 100644
--- a/apps/codecs/raac.c
+++ b/lib/rbcodec/codecs/raac.c
diff --git a/apps/codecs/sgc.c b/lib/rbcodec/codecs/sgc.c
index 348a54a2d3..348a54a2d3 100644
--- a/apps/codecs/sgc.c
+++ b/lib/rbcodec/codecs/sgc.c
diff --git a/apps/codecs/shorten.c b/lib/rbcodec/codecs/shorten.c
index a8ab3f30a0..a8ab3f30a0 100644
--- a/apps/codecs/shorten.c
+++ b/lib/rbcodec/codecs/shorten.c
diff --git a/apps/codecs/sid.c b/lib/rbcodec/codecs/sid.c
index 9b19a20ba7..9b19a20ba7 100644
--- a/apps/codecs/sid.c
+++ b/lib/rbcodec/codecs/sid.c
diff --git a/apps/codecs/smaf.c b/lib/rbcodec/codecs/smaf.c
index 0203d1b4e3..0203d1b4e3 100644
--- a/apps/codecs/smaf.c
+++ b/lib/rbcodec/codecs/smaf.c
diff --git a/apps/codecs/spc.c b/lib/rbcodec/codecs/spc.c
index 809562e2a0..809562e2a0 100644
--- a/apps/codecs/spc.c
+++ b/lib/rbcodec/codecs/spc.c
diff --git a/apps/codecs/speex.c b/lib/rbcodec/codecs/speex.c
index ac3bc963b1..ac3bc963b1 100644
--- a/apps/codecs/speex.c
+++ b/lib/rbcodec/codecs/speex.c
diff --git a/apps/codecs/tta.c b/lib/rbcodec/codecs/tta.c
index dda33b3f5e..dda33b3f5e 100644
--- a/apps/codecs/tta.c
+++ b/lib/rbcodec/codecs/tta.c
diff --git a/apps/codecs/vgm.c b/lib/rbcodec/codecs/vgm.c
index 416f772f1d..416f772f1d 100644
--- a/apps/codecs/vgm.c
+++ b/lib/rbcodec/codecs/vgm.c
diff --git a/apps/codecs/vorbis.c b/lib/rbcodec/codecs/vorbis.c
index 944dd6d60c..944dd6d60c 100644
--- a/apps/codecs/vorbis.c
+++ b/lib/rbcodec/codecs/vorbis.c
diff --git a/apps/codecs/vox.c b/lib/rbcodec/codecs/vox.c
index 279d003162..279d003162 100644
--- a/apps/codecs/vox.c
+++ b/lib/rbcodec/codecs/vox.c
diff --git a/apps/codecs/wav.c b/lib/rbcodec/codecs/wav.c
index d20331bc6c..d20331bc6c 100644
--- a/apps/codecs/wav.c
+++ b/lib/rbcodec/codecs/wav.c
diff --git a/apps/codecs/wav64.c b/lib/rbcodec/codecs/wav64.c
index 184f39bf18..184f39bf18 100644
--- a/apps/codecs/wav64.c
+++ b/lib/rbcodec/codecs/wav64.c
diff --git a/apps/codecs/wav_enc.c b/lib/rbcodec/codecs/wav_enc.c
index e4afeaf93c..e4afeaf93c 100644
--- a/apps/codecs/wav_enc.c
+++ b/lib/rbcodec/codecs/wav_enc.c
diff --git a/apps/codecs/wavpack.c b/lib/rbcodec/codecs/wavpack.c
index 4d42391fc1..4d42391fc1 100644
--- a/apps/codecs/wavpack.c
+++ b/lib/rbcodec/codecs/wavpack.c
diff --git a/apps/codecs/wavpack_enc.c b/lib/rbcodec/codecs/wavpack_enc.c
index 730cf0734b..730cf0734b 100644
--- a/apps/codecs/wavpack_enc.c
+++ b/lib/rbcodec/codecs/wavpack_enc.c
diff --git a/apps/codecs/wma.c b/lib/rbcodec/codecs/wma.c
index f9501ffad3..f9501ffad3 100755
--- a/apps/codecs/wma.c
+++ b/lib/rbcodec/codecs/wma.c
diff --git a/apps/codecs/wmapro.c b/lib/rbcodec/codecs/wmapro.c
index bab3b5a027..bab3b5a027 100644
--- a/apps/codecs/wmapro.c
+++ b/lib/rbcodec/codecs/wmapro.c
diff --git a/apps/codecs/wmavoice.c b/lib/rbcodec/codecs/wmavoice.c
index 9cf5a49f1a..9cf5a49f1a 100644
--- a/apps/codecs/wmavoice.c
+++ b/lib/rbcodec/codecs/wmavoice.c
diff --git a/lib/rbcodec/rbcodec.make b/lib/rbcodec/rbcodec.make
index cd669d22c9..3dfade1826 100644
--- a/lib/rbcodec/rbcodec.make
+++ b/lib/rbcodec/rbcodec.make
@@ -11,9 +11,14 @@ RBCODECLIB_SRC := $(call preprocess, $(RBCODECLIB_DIR)/SOURCES)
 RBCODECLIB_OBJ := $(call c2obj, $(RBCODECLIB_SRC))
 RBCODECLIB := $(BUILDDIR)/lib/librbcodec.a
 
-INCLUDES += -I$(RBCODECLIB_DIR) -I$(RBCODECLIB_DIR)/dsp -I$(RBCODECLIB_DIR)/metadata
+INCLUDES += -I$(RBCODECLIB_DIR) -I$(RBCODECLIB_DIR)/codecs \
+                        -I$(RBCODECLIB_DIR)/dsp -I$(RBCODECLIB_DIR)/metadata
 OTHER_SRC += $(RBCODECLIB_SRC)
 CORE_LIBS += $(RBCODECLIB)
 
 $(RBCODECLIB): $(RBCODECLIB_OBJ)
         $(call PRINTS,AR $(@F))$(AR) rcs $@ $^ >/dev/null
+
+ifdef SOFTWARECODECS
+  include $(RBCODECLIB_DIR)/codecs/codecs.make
+endif
diff --git a/lib/rbcodec/test/warble.make b/lib/rbcodec/test/warble.make
index 2c1fb13889..f2234c03b5 100644
--- a/lib/rbcodec/test/warble.make
+++ b/lib/rbcodec/test/warble.make
@@ -9,15 +9,14 @@
 
 
 
-RBCODEC_DIR = $(ROOTDIR)/lib/rbcodec
+RBCODECLIB_DIR = $(ROOTDIR)/lib/rbcodec
 RBCODEC_BLD = $(BUILDDIR)/lib/rbcodec
 
 GCCOPTS += -D__PCTOOL__ $(TARGET) -DDEBUG -g -std=gnu99 `$(SDLCONFIG) --cflags` -DCODECDIR="\"$(CODECDIR)\""
 
 SRC= $(call preprocess, $(ROOTDIR)/lib/rbcodec/test/SOURCES)
 
-INCLUDES += -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/codecs -I$(ROOTDIR)/apps/codecs/lib \
-                        -I$(ROOTDIR)/apps/gui
+INCLUDES += -I$(ROOTDIR)/apps -I$(ROOTDIR)/apps/gui
 INCLUDES += -I$(ROOTDIR)/firmware/export -I$(ROOTDIR)/firmware/include \
                         -I$(ROOTDIR)/firmware/target/hosted \
                         -I$(ROOTDIR)/firmware/target/hosted/sdl
diff --git a/rbutil/rbutilqt/INSTALL b/rbutil/rbutilqt/INSTALL
index 9795a8ede4..2476eb2902 100644
--- a/rbutil/rbutilqt/INSTALL
+++ b/rbutil/rbutilqt/INSTALL
@@ -23,7 +23,7 @@ Requirements:
 - gcc
 - Qt 4.5.0 or later
 - at least the following folders from Rockbox svn:
-  o apps/codecs/libspeex
+  o lib/rbcodec/codecs/libspeex
   o rbutil/
   o tools/
 - libusb (Linux only)
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index e7eff5212f..2dd317032e 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -2,7 +2,7 @@
     <qresource prefix="/">
         <file>../../docs/CREDITS</file>
         <file>../../docs/gpl-2.0.html</file>
-        <file alias="docs/COPYING.SPEEX">../../apps/codecs/libspeex/COPYING</file>
+        <file alias="docs/COPYING.SPEEX">../../lib/rbcodec/codecs/libspeex/COPYING</file>
     </qresource>
     <qresource>
         <file alias="builtin/VOICE_PAUSE.wav">../../tools/VOICE_PAUSE.wav</file>
diff --git a/tools/buildzip.pl b/tools/buildzip.pl
index 2aa990ac7d..82074016f3 100755
--- a/tools/buildzip.pl
+++ b/tools/buildzip.pl
@@ -486,7 +486,7 @@ STOP
     # Android has codecs installed as native libraries so they are not needed
     # in the zip.
     if ($modelname !~ /android/) {
-        find(find_copyfile(qr/.*\.codec/, abs_path("$temp_dir/codecs/")), 'apps/codecs');
+        find(find_copyfile(qr/.*\.codec/, abs_path("$temp_dir/codecs/")), 'lib/rbcodec/codecs');
     }
 
     # remove directory again if no codec was copied
diff --git a/tools/codecscan.pl b/tools/codecscan.pl
index c21295d49f..4f0cbc73af 100755
--- a/tools/codecscan.pl
+++ b/tools/codecscan.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$codecs="apps/codecs";
+$codecs="lib/rbcodec/codecs";
 
 opendir(DIR, $codecs) || die "can't opendir $some_dir: $!";
 my @maps = sort grep { /\.map/ && -f "$codecs/$_" } readdir(DIR);
diff --git a/tools/configure b/tools/configure
index 73639cfb5c..23731530d1 100755
--- a/tools/configure
+++ b/tools/configure
@@ -3849,6 +3849,7 @@ export CPU=${t_cpu}
 export MANUFACTURER=${t_manufacturer}
 export OBJDIR=${pwd}
 export BUILDDIR=${pwd}
+export RBCODEC_BLD=${pwd}/lib/rbcodec
 export LANGUAGE=${language}
 export VOICELANGUAGE=${voicelanguage}
 export MEMORYSIZE=${memory}
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 247d25e1db..2435caeaf4 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -11,7 +11,7 @@ ifndef V
 SILENT = @
 endif
 
-SPEEXSRC = ../../apps/codecs/libspeex
+SPEEXSRC = ../../lib/rbcodec/codecs/libspeex
 
 INCLUDES = -I $(SPEEXSRC)
 SPEEXOPTS = -DHAVE_CONFIG_H -DROCKBOX_VOICE_ENCODER
diff --git a/tools/root.make b/tools/root.make
index 0fc6c55403..689047e9db 100644
--- a/tools/root.make
+++ b/tools/root.make
@@ -101,17 +101,12 @@ else ifneq (,$(findstring database,$(APP_TYPE)))
 else ifneq (,$(findstring warble,$(APP_TYPE)))
   include $(ROOTDIR)/lib/rbcodec/test/warble.make
   include $(ROOTDIR)/lib/tlsf/libtlsf.make
-  include $(APPSDIR)/codecs/codecs.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
 else
   include $(APPSDIR)/apps.make
   include $(ROOTDIR)/lib/rbcodec/rbcodec.make
   include $(APPSDIR)/lang/lang.make
 
-  ifdef SOFTWARECODECS
-    include $(APPSDIR)/codecs/codecs.make
-  endif
-
   ifdef ENABLEDPLUGINS
     include $(APPSDIR)/plugins/bitmaps/pluginbitmaps.make
     include $(APPSDIR)/plugins/plugins.make
@@ -206,7 +201,7 @@ $(LINKROM): $(ROMLDS)
 $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKRAM)
         $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
                 -L$(BUILDDIR)/firmware -lfirmware \
-                -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                 -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
                 -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \
                 -T$(LINKRAM) -Wl,-Map,$(BUILDDIR)/rockbox.map
@@ -214,7 +209,7 @@ $(BUILDDIR)/rockbox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LI
 $(BUILDDIR)/rombox.elf : $$(OBJ) $(FIRMLIB) $(VOICESPEEXLIB) $(CORE_LIBS) $$(LINKROM)
         $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJ) \
                 -L$(BUILDDIR)/firmware -lfirmware \
-                -L$(BUILDDIR)/apps/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
+                -L$(RBCODEC_BLD)/codecs $(call a2lnk, $(VOICESPEEXLIB)) \
                 -L$(BUILDDIR)/lib $(call a2lnk, $(CORE_LIBS)) \
                 -lgcc $(BOOTBOXLDOPTS) $(GLOBAL_LDOPTS) \
                 -T$(LINKROM) -Wl,-Map,$(BUILDDIR)/rombox.map
diff --git a/utils/analysis/cmp-plugins-size.py b/utils/analysis/cmp-plugins-size.py
index 05c97486aa..d8f482c017 100755
--- a/utils/analysis/cmp-plugins-size.py
+++ b/utils/analysis/cmp-plugins-size.py
@@ -149,8 +149,8 @@ newver = rb_version(sys.argv[2])
 
 oldplugindir = sys.argv[1] + '/apps/plugins'
 newplugindir = sys.argv[2] + '/apps/plugins'
-oldcodecsdir = sys.argv[1] + '/apps/codecs'
-newcodecsdir = sys.argv[2] + '/apps/codecs'
+oldcodecsdir = sys.argv[1] + '/lib/rbcodec/codecs'
+newcodecsdir = sys.argv[2] + '/lib/rbcodec/codecs'
 
 if os.path.lexists(oldplugindir) and os.path.lexists(newplugindir):
     compare(oldplugindir, newplugindir, oldver, newver)
diff --git a/utils/analysis/find_addr.pl b/utils/analysis/find_addr.pl
index dd42ef6dd8..628fb3dda8 100755
--- a/utils/analysis/find_addr.pl
+++ b/utils/analysis/find_addr.pl
@@ -100,12 +100,12 @@ if($lookaddr != 0)
     close MAKEFILE;
 
     # Generate a list of all codecs
-    open FINDCODECS, "find apps/codecs/ -name '*.elf' 2>&1 |" or die "Can't open pipe: $!";
+    open FINDCODECS, "find lib/rbcodec/codecs/ -name '*.elf' 2>&1 |" or die "Can't open pipe: $!";
     my @codecs;
     while(<FINDCODECS>)
     {
         chomp($_);
-        $_ =~ s/apps\/codecs\///;
+        $_ =~ s/lib\/rbcodec\/codecs\///;
         push(@codecs, $_);
     }
     close FINDCODECS;
diff --git a/utils/common/deploy-rbutil.py b/utils/common/deploy-rbutil.py
index 0a68dbe805..6db45eec4c 100755
--- a/utils/common/deploy-rbutil.py
+++ b/utils/common/deploy-rbutil.py
@@ -26,7 +26,7 @@ deploy.svnpaths = \
              "tools/ucl",
              "tools/rbspeex",
              "utils/imxtools",
-             "apps/codecs/libspeex",
+             "lib/rbcodec/codecs/libspeex",
              "docs/COPYING",
              "docs/gpl-2.0.html",
              "docs/logo/rockbox-clef.svg",