diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 5.0.1), pkg
 	libesd0-dev, libgnomevfs2-dev,
 	liblircclient-dev,
 	libdirectfb-dev, libgtk2.0-dev,
-	libflac-dev, libsdl1.2-dev, libwavpack-dev,
+	libfaad-dev, libflac-dev, libsdl1.2-dev, libwavpack-dev,
 	libsmbclient-dev, libspeex-dev, libmng-dev,
 	libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1),
 	zlib1g-dev, w3m, transfig, sgmltools-lite,
diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am
--- a/src/libfaad/Makefile.am
+++ b/src/libfaad/Makefile.am
@@ -12,6 +12,12 @@ VPATH = @srcdir@:@srcdir@/codebook:
 
 xineplug_decode_faad_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) -fno-strict-aliasing
 xineplug_decode_faad_la_SOURCES = \
+	xine_faad_decoder.c
+
+xineplug_decode_faad_la_LDFLAGS = $(xineplug_ldflags)
+xineplug_decode_faad_la_LIBADD = $(XINE_LIB) -lfaad -lm $(LTLIBINTL)
+
+noinst_HEADERS = \
 	bits.c \
 	cfft.c \
 	common.c \
@@ -50,12 +56,6 @@ xineplug_decode_faad_la_SOURCES = \
 	ssr_ipqf.c \
 	syntax.c \
 	tns.c \
-	xine_faad_decoder.c
-
-xineplug_decode_faad_la_LDFLAGS = $(xineplug_ldflags)
-xineplug_decode_faad_la_LIBADD = $(XINE_LIB) -lm $(LTLIBINTL)
-
-noinst_HEADERS = \
 	analysis.h \
 	bits.h \
 	cfft.h \
diff --git a/src/libfaad/xine_faad_decoder.c b/src/libfaad/xine_faad_decoder.c
--- a/src/libfaad/xine_faad_decoder.c
+++ b/src/libfaad/xine_faad_decoder.c
@@ -35,10 +35,7 @@
 #include "audio_out.h"
 #include "buffer.h"
 #include "xineutils.h"
-#include "common.h"
-#include "structs.h"
-#include "decoder.h"
-#include "syntax.h"
+#include <faad.h>
 
 #define FAAD_MIN_STREAMSIZE 768 /* 6144 bits/channel */