4 files changed, 13 insertions, 12 deletions
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index 62de3774d..337428652 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS   = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav
 AM_LDFLAGS  = $(xineplug_ldflags)
 
-noinst_HEADERS = spu.h
+noinst_HEADERS = spudec.h
 
 xineplug_LTLIBRARIES = xineplug_decode_spu.la
 
@@ -16,6 +16,6 @@ external_dvdnav_libs =
 internal_dvdnav_sources = nav_read.c
 endif
 
-xineplug_decode_spu_la_SOURCES = $(internal_dvdnav_sources) spu.c xine_spu_decoder.c
+xineplug_decode_spu_la_SOURCES = $(internal_dvdnav_sources) spudec.c xine_spu_decoder.c
 xineplug_decode_spu_la_LIBADD  = $(XINE_LIB) $(external_dvdnav_libs) $(PTHREAD_LIBS)
 xineplug_decode_spu_la_CFLAGS  = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
diff --git a/src/libspudec/spu.c b/src/libspudec/spudec.c
index ce3497ef0..13136a53f 100644
--- a/src/libspudec/spu.c
+++ b/src/libspudec/spudec.c
@@ -47,10 +47,9 @@
 #include <sys/types.h>
 #include <fcntl.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "spu.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/buffer.h>
 #include "xine-engine/bswap.h"
 #ifdef HAVE_DVDNAV
 #  include <dvdnav/nav_read.h>
@@ -60,6 +59,7 @@
 #  include "nav_print.h"
 #endif
 
+#include "spudec.h"
 
 /*
 #define LOG_DEBUG 1
diff --git a/src/libspudec/spu.h b/src/libspudec/spudec.h
index 8d92146f0..1e7d80596 100644
--- a/src/libspudec/spu.h
+++ b/src/libspudec/spudec.h
@@ -30,8 +30,8 @@
 #endif
 
 #include <inttypes.h>
-#include "video_out.h"
-#include "video_overlay.h"
+#include <xine/video_out.h>
+#include <xine/video_overlay.h>
 #ifdef HAVE_DVDNAV
 #  include <dvdnav/nav_types.h>
 #else
diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c
index 93ea3c3a2..e36b39fc8 100644
--- a/src/libspudec/xine_spu_decoder.c
+++ b/src/libspudec/xine_spu_decoder.c
@@ -29,11 +29,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "xine_internal.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/buffer.h>
 #include "xine-engine/bswap.h"
-#include "xineutils.h"
-#include "spu.h"
+#include <xine/xineutils.h>
 #ifdef HAVE_DVDNAV
 #  include <dvdnav/nav_read.h>
 #  include <dvdnav/nav_types.h>
@@ -42,6 +41,8 @@
 #  include "nav_types.h"
 #endif
 
+#include "spudec.h"
+
 /*
 #define LOG_DEBUG 1
 #define LOG_BUTTON 1