diff --git a/lib/rbcodec/codecs/SOURCES b/lib/rbcodec/codecs/SOURCES
index 039772c..010aa71 100644
--- a/lib/rbcodec/codecs/SOURCES
+++ b/lib/rbcodec/codecs/SOURCES
@@ -18,7 +18,7 @@ atrac3_oma.c
mpc.c
wma.c
sid.c
-ape.c
+//ape.c
asap.c
aac.c
spc.c
@@ -48,7 +48,7 @@ kss.c
/* encoders */
aiff_enc.c
-mp3_enc.c
+//mp3_enc.c
wav_enc.c
wavpack_enc.c
diff --git a/lib/rbcodec/codecs/codecs.make b/lib/rbcodec/codecs/codecs.make
index eea8950..7cde625 100644
--- a/lib/rbcodec/codecs/codecs.make
+++ b/lib/rbcodec/codecs/codecs.make
@@ -22,7 +22,7 @@ OTHER_INC += -I$(RBCODECLIB_DIR)/codecs/lib
CODEC_LIBS := $(CODECLIB)
# the codec libraries
-include $(RBCODECLIB_DIR)/codecs/demac/libdemac.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
diff --git a/tools/configure b/tools/configure
index 442b238..1ce9480 100755
--- a/tools/configure
+++ b/tools/configure
@@ -8,7 +8,7 @@
#
# global CC options for all platforms
-CCOPTS="-W -Wall -Wundef -O -nostdlib -ffreestanding -Wstrict-prototypes -pipe -std=gnu99"
+CCOPTS="-W -Wall -Wundef -O -nostdlib -ffreestanding -Wstrict-prototypes -pipe"
# LD options for the core
LDOPTS=""
@@ -4004,7 +4004,7 @@ export SOFTWARECODECS=${swcodec}
export EXTRA_DEFINES=${extradefines}
export HOSTCC=${HOSTCC}
export HOSTAR=${HOSTAR}
-export CC=${CC}
+export CC=clang
export CPP=${CPP}
export LD=${LD}
export AR=${AR}