6 files changed, 4 insertions, 10 deletions
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index 71ef4e5d1..acf5839b5 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS)
+AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS) -I../input/libdvdread
 
 LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
@@ -45,11 +45,8 @@ $(XINE_LIB):
 noinst_HEADERS = \
 	em8300.h \
 	alphablend.h \
-	bswap.h \
 	dxr3.h \
 	dxr3_scr.h \
-	nav_read.h \
-	nav_types.h \
 	video_out_dxr3.h
 
 debug:
diff --git a/src/dxr3/bswap.h b/src/dxr3/bswap.h
deleted file mode 100644
index eb45e68e6..000000000
--- a/src/dxr3/bswap.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libspudec/bswap.h"
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index 2f57be82a..0cb0df68c 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: dxr3_decode_spu.c,v 1.32 2003/03/07 17:07:15 mroi Exp $
+ * $Id: dxr3_decode_spu.c,v 1.33 2003/03/08 14:11:52 mroi Exp $
  */
  
 /* dxr3 spu decoder plugin.
@@ -301,7 +301,7 @@ static void dxr3_spudec_decode_data(spu_decoder_t *this_gen, buf_element_t *buf)
     if (p[3] == 0xbf && p[6] == 0x00) { /* Private stream 2 */
       pci_t pci;
       
-      nav_read_pci(&pci, p + 7);
+      navRead_PCI(&pci, p + 7);
 #if LOG_BTN
       printf("dxr3_decode_spu: PCI packet hli_ss is %d\n", pci.hli.hl_gi.hli_ss);
 #endif
diff --git a/src/dxr3/nav_read.c b/src/dxr3/nav_read.c
index 7b139ffd6..2c3b355f5 100644
--- a/src/dxr3/nav_read.c
+++ b/src/dxr3/nav_read.c
@@ -1 +1 @@
-#include "../libspudec/nav_read.c"
+#include "../input/libdvdread/nav_read.c"
diff --git a/src/dxr3/nav_read.h b/src/dxr3/nav_read.h
deleted file mode 100644
index daa7de215..000000000
--- a/src/dxr3/nav_read.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libspudec/nav_read.h"
diff --git a/src/dxr3/nav_types.h b/src/dxr3/nav_types.h
deleted file mode 100644
index cb760da9d..000000000
--- a/src/dxr3/nav_types.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../libspudec/nav_types.h"