Update all the code to the new headers layout.

14 files changed, 24 insertions, 24 deletions

diff --git a/src/libmpeg2/cpu_state.c b/src/libmpeg2/cpu_state.c
index 07b4c5b7e..12963644c 100644
--- a/src/libmpeg2/cpu_state.c
+++ b/src/libmpeg2/cpu_state.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 
 #include "mpeg2_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 void (* mpeg2_cpu_state_save) (cpu_state_t * state) = NULL;
 void (* mpeg2_cpu_state_restore) (cpu_state_t * state) = NULL;
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c
index 58f34ccbc..145d5f58b 100644
--- a/src/libmpeg2/decode.c
+++ b/src/libmpeg2/decode.c
@@ -37,11 +37,11 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "video_out.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
 #include "mpeg2.h"
 #include "mpeg2_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #include "libmpeg2_accel.h"
 
 /*
diff --git a/src/libmpeg2/header.c b/src/libmpeg2/header.c
index 7f1ef1fc8..12ba0ff8a 100644
--- a/src/libmpeg2/header.c
+++ b/src/libmpeg2/header.c
@@ -31,7 +31,7 @@
 #include <inttypes.h>
 
 #include "mpeg2_internal.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 
 /* default intra quant matrix, in zig-zag order */
 static const uint8_t default_intra_quantizer_matrix[64] ATTR_ALIGN(16) = {
diff --git a/src/libmpeg2/idct.c b/src/libmpeg2/idct.c
index 157beea31..9f216db58 100644
--- a/src/libmpeg2/idct.c
+++ b/src/libmpeg2/idct.c
@@ -46,7 +46,7 @@
 #include <inttypes.h>
 
 #include "mpeg2_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */
 #define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */
diff --git a/src/libmpeg2/idct_altivec.c b/src/libmpeg2/idct_altivec.c
index ed8b58cfd..de396560b 100644
--- a/src/libmpeg2/idct_altivec.c
+++ b/src/libmpeg2/idct_altivec.c
@@ -30,7 +30,7 @@
 #include <inttypes.h>
 
 #include "mpeg2_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #define vector_s16_t vector signed short
 #define vector_u16_t vector unsigned short
diff --git a/src/libmpeg2/idct_mmx.c b/src/libmpeg2/idct_mmx.c
index ce4bd064b..6bb4bfbf0 100644
--- a/src/libmpeg2/idct_mmx.c
+++ b/src/libmpeg2/idct_mmx.c
@@ -28,7 +28,7 @@
 #include <inttypes.h>
 
 #include "mpeg2_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #define ROW_SHIFT 11
 #define COL_SHIFT 6
diff --git a/src/libmpeg2/libmpeg2_accel.c b/src/libmpeg2/libmpeg2_accel.c
index 63c7b1b9b..92c0e280b 100644
--- a/src/libmpeg2/libmpeg2_accel.c
+++ b/src/libmpeg2/libmpeg2_accel.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "mpeg2.h"
 #include "mpeg2_internal.h"
 #include "xvmc_vld.h"
diff --git a/src/libmpeg2/motion_comp.c b/src/libmpeg2/motion_comp.c
index 8779c1296..9328dfb9f 100644
--- a/src/libmpeg2/motion_comp.c
+++ b/src/libmpeg2/motion_comp.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 
 #include "mpeg2_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 mpeg2_mc_t mpeg2_mc;
 
diff --git a/src/libmpeg2/motion_comp_mmx.c b/src/libmpeg2/motion_comp_mmx.c
index 80a53685a..f9b1f085d 100644
--- a/src/libmpeg2/motion_comp_mmx.c
+++ b/src/libmpeg2/motion_comp_mmx.c
@@ -28,7 +28,7 @@
 #include <inttypes.h>
 
 #include "mpeg2_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #define CPU_MMXEXT 0
 #define CPU_3DNOW 1
diff --git a/src/libmpeg2/mpeg2_internal.h b/src/libmpeg2/mpeg2_internal.h
index c2ffbf909..2e42aace6 100644
--- a/src/libmpeg2/mpeg2_internal.h
+++ b/src/libmpeg2/mpeg2_internal.h
@@ -24,7 +24,7 @@
 #ifndef MPEG2_INTERNAL_H
 #define MPEG2_INTERNAL_H
 
-#include "video_out.h"
+#include <xine/video_out.h>
 #include "accel_xvmc.h"
 
 #ifdef ENABLE_ALTIVEC
diff --git a/src/libmpeg2/slice.c b/src/libmpeg2/slice.c
index 91a4c47b1..8247a9a24 100644
--- a/src/libmpeg2/slice.c
+++ b/src/libmpeg2/slice.c
@@ -25,10 +25,10 @@
 
 #include <inttypes.h>
 
-#include "xine_internal.h"
-#include "video_out.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
 #include "mpeg2_internal.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 
 #include "vlc.h"
 
diff --git a/src/libmpeg2/slice_xvmc.c b/src/libmpeg2/slice_xvmc.c
index e21b1eb98..014ae7924 100644
--- a/src/libmpeg2/slice_xvmc.c
+++ b/src/libmpeg2/slice_xvmc.c
@@ -28,12 +28,12 @@
 #include <stdlib.h>
 #include <inttypes.h>
 
-#include "xine_internal.h"
-#include "video_out.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
 #include "mpeg2_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "accel_xvmc.h"
 #include "xvmc.h"
 
diff --git a/src/libmpeg2/slice_xvmc_vld.c b/src/libmpeg2/slice_xvmc_vld.c
index 7e370a519..3606cf66b 100644
--- a/src/libmpeg2/slice_xvmc_vld.c
+++ b/src/libmpeg2/slice_xvmc_vld.c
@@ -17,8 +17,8 @@
  *
  */
 
-#include "xine_internal.h"
-#include "video_out.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
 #include "mpeg2.h"
 #include "mpeg2_internal.h"
 #include "xvmc_vld.h"
diff --git a/src/libmpeg2/xine_mpeg2_decoder.c b/src/libmpeg2/xine_mpeg2_decoder.c
index ccce02186..3a3e28452 100644
--- a/src/libmpeg2/xine_mpeg2_decoder.c
+++ b/src/libmpeg2/xine_mpeg2_decoder.c
@@ -34,11 +34,11 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "video_out.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
 #include "mpeg2.h"
 #include "mpeg2_internal.h"
-#include "buffer.h"
+#include <xine/buffer.h>
 
 typedef struct {
   video_decoder_class_t   decoder_class;