Index: tools/rbspeex/Makefile
===================================================================
--- tools/rbspeex/Makefile	(revision 18182)
+++ tools/rbspeex/Makefile	(working copy)
@@ -12,11 +12,12 @@
 endif
 
 SPEEXSRC = ../../apps/codecs/libspeex
+SPEEXSRC = /usr/include
 
 INCLUDES = -I $(SPEEXSRC)
 SPEEXOPTS = -DHAVE_CONFIG_H -DROCKBOX_VOICE_ENCODER
 
-CFLAGS = $(SPEEXOPTS) $(INCLUDES) -O3 -fomit-frame-pointer -Wno-unused-parameter
+CFLAGS = $(SPEEXOPTS) $(INCLUDES) -O3 -fomit-frame-pointer -Wno-unused-parameter -lspeex -lspeexdsp
 
 #build standalone win32 executables on cygwin
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
@@ -33,7 +34,7 @@
 
 
 # This sets up 'SRC' based on the files mentioned in SOURCES
-SRC := $(shell cat $(SPEEXSRC)/SOURCES | $(CC) $(CFLAGS) -E -P - | grep -v "^\#" | grep -v "^$$")
+#SRC := $(shell cat $(SPEEXSRC)/SOURCES | $(CC) $(CFLAGS) -E -P - | grep -v "^\#" | grep -v "^$$")
 
 OUT = build$(ARCH)
 SOURCES = $(SRC:%.c=$(SPEEXSRC)/%.c) rbspeex.c rbspeexenc.c rbspeexdec.c
Index: rbutil/rbutilqt/rbutilqt.pro
===================================================================
--- rbutil/rbutilqt/rbutilqt.pro	(revision 18182)
+++ rbutil/rbutilqt/rbutilqt.pro	(working copy)
@@ -125,7 +125,7 @@
 # Needed by QT on Win
 INCLUDEPATH = . irivertools zip zlib ../ipodpatcher ../sansapatcher ../../tools/rbspeex ../../tools
  
-LIBS += -L../../tools/rbspeex -lrbspeex
+LIBS += -L../../tools/rbspeex -lrbspeex -lspeex -lspeexdsp
 
 TEMPLATE = app
 dbg {