2 files changed, 1 insertions, 9 deletions

diff --git a/tools/database/SOURCES b/tools/database/SOURCES
index 36d6247092..ca1775022c 100644
--- a/tools/database/SOURCES
+++ b/tools/database/SOURCES
@@ -20,10 +20,4 @@ database.c
 #else /* !APPLICATION */
 ../../uisimulator/common/filesystem-sim.c
 #endif /* APPLICATION */
-#if CONFIG_CODEC != SWCODEC
-../../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 7fc360232e..dfe632446b 100644
--- a/tools/database/database.make
+++ b/tools/database/database.make
@@ -38,10 +38,8 @@ INCLUDES += -I$(ROOTDIR)/apps/gui \
             -I$(ROOTDIR)/lib/rbcodec/dsp \
             -I$(APPSDIR) \
             -I$(BUILDDIR)
-            
-ifdef SOFTWARECODECS
+
 OTHERLIBS := $(FIXEDPOINTLIB)
-endif
 
 .SECONDEXPANSION: # $$(OBJ) is not populated until after this