diff -Naupr speex-xmms.orig/fileinfo.c speex-xmms/fileinfo.c
--- speex-xmms.orig/fileinfo.c	2003-05-23 14:03:39.000000000 +0200
+++ speex-xmms/fileinfo.c	2007-02-19 11:01:33.000000000 +0100
@@ -10,8 +10,8 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include <glib.h>
-#include <speex.h>
-#include <speex_header.h>
+#include <speex/speex.h>
+#include <speex/speex_header.h>
 #include <ogg/ogg.h>
 #include <sys/stat.h>
 
diff -Naupr speex-xmms.orig/http.c speex-xmms/http.c
--- speex-xmms.orig/http.c	2003-05-23 00:36:05.000000000 +0200
+++ speex-xmms/http.c	2007-02-19 11:02:08.000000000 +0100
@@ -37,7 +37,7 @@
 #include "xmms/util.h"
 #include "xmms/plugin.h"
 
-#include <speex.h>
+#include <speex/speex.h>
 #include "libspeex.h"
 
 
diff -Naupr speex-xmms.orig/libspeex.c speex-xmms/libspeex.c
--- speex-xmms.orig/libspeex.c	2003-08-03 17:33:11.000000000 +0200
+++ speex-xmms/libspeex.c	2007-02-19 11:02:35.000000000 +0100
@@ -22,10 +22,10 @@
 #include <strings.h>
 #include <string.h>
 
-#include <speex.h>
-#include <speex_header.h>
-#include <speex_callbacks.h>
-#include <speex_stereo.h>
+#include <speex/speex.h>
+#include <speex/speex_header.h>
+#include <speex/speex_callbacks.h>
+#include <speex/speex_stereo.h>
 
 #include <pthread.h>
 
diff -Naupr speex-xmms.orig/libspeex.h speex-xmms/libspeex.h
--- speex-xmms.orig/libspeex.h	2003-05-21 20:32:26.000000000 +0200
+++ speex-xmms/libspeex.h	2007-02-19 11:02:47.000000000 +0100
@@ -5,7 +5,7 @@
 #ifndef __LIBSPEEX_H__
 #define __LIBSPEEX_H__
 
-#include <speex.h>
+#include <speex/speex.h>
 #include <xmms/plugin.h>
 #include "speexutil.h"
 
diff -Naupr speex-xmms.orig/speexutil.c speex-xmms/speexutil.c
--- speex-xmms.orig/speexutil.c	2003-08-03 18:18:34.000000000 +0200
+++ speex-xmms/speexutil.c	2007-02-19 11:03:03.000000000 +0100
@@ -9,8 +9,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <ogg/ogg.h>
-#include <speex.h>
-#include <speex_header.h>
+#include <speex/speex.h>
+#include <speex/speex_header.h>
 #include "speexutil.h"
 
 int speex_seek(FILE* spxfile, int time, char direction, int freq) {
diff -Naupr speex-xmms.orig/speexutil.h speex-xmms/speexutil.h
--- speex-xmms.orig/speexutil.h	2003-04-27 22:02:37.000000000 +0200
+++ speex-xmms/speexutil.h	2007-02-19 11:03:11.000000000 +0100
@@ -5,7 +5,7 @@
 #ifndef __SPEEXUTIL_H__
 #define __SPEEXUTIL_H__
 
-#include <speex_header.h>
+#include <speex/speex_header.h>
 
 typedef struct
 {