2 files changed, 7 insertions, 8 deletions

diff --git a/tools/database/SOURCES b/tools/database/SOURCES
index 65d6ca6aba..9c60fb1e7d 100644
--- a/tools/database/SOURCES
+++ b/tools/database/SOURCES
@@ -1,11 +1,6 @@
 database.c
 ../../apps/fixedpoint.c
-../../apps/metadata.c
-#if CONFIG_CODEC == SWCODEC
-../../apps/replaygain.c
-#endif
 ../../apps/misc.c
-../../apps/mp3data.c
 ../../apps/tagcache.c
 ../../firmware/common/crc32.c
 ../../firmware/common/filefuncs.c
@@ -17,7 +12,9 @@ database.c
 ../../firmware/logf.c
 ../../uisimulator/common/io.c
 #if CONFIG_CODEC != SWCODEC
-../../apps/metadata/id3tags.c
-../../apps/metadata/mp3.c
+../../lib/rbcodec/metadata/id3tags.c
+../../lib/rbcodec/metadata/metadata.c
+../../lib/rbcodec/metadata/mp3.c
+../../lib/rbcodec/metadata/mp3data.c
 #endif
 /* Caution. metadata files do not add!! */
diff --git a/tools/database/database.make b/tools/database/database.make
index 7d02a461bd..c7292a66a9 100644
--- a/tools/database/database.make
+++ b/tools/database/database.make
@@ -15,7 +15,7 @@ createsrc = $(shell cat $(1) > $(3); echo "\#if CONFIG_CODEC == SWCODEC" >> $(3)
                                      echo "\#endif" >> $(3); \
                                      echo $(3))
 
-METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/apps/metadata/*.c))
+METADATAS := $(subst $(ROOTDIR), ../.., $(wildcard $(ROOTDIR)/lib/rbcodec/metadata/*.c))
 
 SRCFILE := $(call createsrc, $(TOOLSDIR)/database/SOURCES, \
                              $(METADATAS), \
@@ -28,6 +28,8 @@ INCLUDES = -I$(ROOTDIR)/apps/gui \
            -I$(ROOTDIR)/firmware/include \
            -I$(ROOTDIR)/apps \
            -I$(ROOTDIR)/apps/recorder \
+           -I$(ROOTDIR)/lib/rbcodec \
+           -I$(ROOTDIR)/lib/rbcodec/metadata \
            -I$(APPSDIR) \
            -I$(BUILDDIR) \