Merge -headers-reshuffle branch into main.

--HG--
rename : src/xine-engine/osd.h => include/xine/osd.h

358 files changed, 901 insertions, 939 deletions

diff --git a/.hgignore b/.hgignore
index fc33e55c8..38db51c92 100644
--- a/.hgignore
+++ b/.hgignore
@@ -65,7 +65,7 @@ doc/hackersguide/*.png
 doc/hackersguide/hackersguide.html
 doc/Doxyfile
 
-include/xine.h
+include/xine/version.h
 
 misc/SlackBuild
 misc/build_rpms.sh
diff --git a/configure.ac b/configure.ac
index 9c6c52302..5b067077f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1152,7 +1152,8 @@ contrib/nosefart/Makefile
 contrib/vidix/Makefile
 contrib/vidix/drivers/Makefile
 include/Makefile
-include/xine.h
+include/xine/Makefile
+include/xine/version.h
 lib/Makefile
 m4/Makefile
 m4/gettext/Makefile
diff --git a/contrib/a52dec/imdct.c b/contrib/a52dec/imdct.c
index 5835e70a1..aa1c85464 100644
--- a/contrib/a52dec/imdct.c
+++ b/contrib/a52dec/imdct.c
@@ -38,7 +38,7 @@
 
 #include "a52.h"
 #include "a52_internal.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 typedef struct complex_s {
     sample_t real;
diff --git a/contrib/a52dec/parse.c b/contrib/a52dec/parse.c
index 0bfd02fce..7aba1d809 100644
--- a/contrib/a52dec/parse.c
+++ b/contrib/a52dec/parse.c
@@ -31,7 +31,7 @@
 #include "a52_internal.h"
 #include "bitstream.h"
 #include "tables.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 typedef struct {
     sample_t q1[2];
diff --git a/contrib/gsm610/long_term.c b/contrib/gsm610/long_term.c
index 625662e1f..671d98cc1 100644
--- a/contrib/gsm610/long_term.c
+++ b/contrib/gsm610/long_term.c
@@ -7,7 +7,7 @@
 /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/long_term.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
 
 #include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #include "private.h"
 
diff --git a/contrib/gsm610/lpc.c b/contrib/gsm610/lpc.c
index 0f51fa55f..d85f56111 100644
--- a/contrib/gsm610/lpc.c
+++ b/contrib/gsm610/lpc.c
@@ -7,7 +7,7 @@
 /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/lpc.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
 
 #include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #include "private.h"
 
diff --git a/contrib/gsm610/rpe.c b/contrib/gsm610/rpe.c
index 67d94d30e..68d495b3b 100644
--- a/contrib/gsm610/rpe.c
+++ b/contrib/gsm610/rpe.c
@@ -7,7 +7,7 @@
 /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/rpe.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
 
 #include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #include "private.h"
 
 #include "gsm.h"
diff --git a/contrib/gsm610/short_term.c b/contrib/gsm610/short_term.c
index 8222b2caa..34a9e7734 100644
--- a/contrib/gsm610/short_term.c
+++ b/contrib/gsm610/short_term.c
@@ -7,7 +7,7 @@
 /* $Header: /nfshome/cvs/xine-lib/src/libxineadec/gsm610/short_term.c,v 1.3 2003/12/07 15:34:30 f1rmb Exp $ */
 
 #include <stdio.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #include "private.h"
 
 #include "gsm.h"
diff --git a/contrib/nosefart/log.h b/contrib/nosefart/log.h
index a12deff0a..da2548c80 100644
--- a/contrib/nosefart/log.h
+++ b/contrib/nosefart/log.h
@@ -27,7 +27,7 @@
 #define _LOG_H_
 
 #include <stdio.h>
-#include "attributes.h"
+#include <xine/attributes.h>
 
 extern int log_init(void);
 extern void log_shutdown(void);
diff --git a/include/Makefile.am b/include/Makefile.am
index 673f508fa..2b5a7eeb2 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,5 @@
-EXTRA_DIST = xine.h.in
+SUBDIRS = xine
+#EXTRA_DIST = xine.h.in
 
 if GENERATED_INTTYPES_H
 inttypes_h = inttypes.h
@@ -8,15 +9,7 @@ include_HEADERS = xine.h
 
 noinst_HEADERS = config.h configure.h
 
-CONFIG_CLEAN_FILES = xine.h $(inttypes_h)
-
-mostlyclean-generic:
-	-rm -f *~ \#* .*~ .\#* 
-
-maintainer-clean-generic:
-	-@echo "This command is intended for maintainers to use;"
-	-@echo "it deletes files that may require special tools to rebuild."
-	-rm -f Makefile.in configure.h.in
+CONFIG_CLEAN_FILES = $(inttypes_h)
 
 install-data-local: install-includeHEADERS
 	sed -e '/^\/\*_x_/d' xine.h > $(DESTDIR)$(includedir)/xine.h
diff --git a/include/xine.h.in b/include/xine.h
index 5a06eab65..da1d394a3 100644
--- a/include/xine.h.in
+++ b/include/xine.h
@@ -57,12 +57,13 @@ extern "C" {
 
 #ifdef XINE_COMPILE
 #include <inttypes.h>
-#include "attributes.h"
 #else
 #include <xine/os_types.h>
-#include <xine/attributes.h>
 #endif
 
+#include <xine/attributes.h>
+#include <xine/version.h>
+
 /* This enables some experimental features. These are not part of the
  * official libxine API, so use them only, if you absolutely need them.
  * Although we make efforts to keep even this part of the API as stable
@@ -103,12 +104,6 @@ void xine_get_version (int *major, int *minor, int *sub) XINE_PROTECTED;
    return 1 if compatible, 0 otherwise */
 int  xine_check_version (int major, int minor, int sub) XINE_PROTECTED;
 
-/* static info - which libxine release this header came from */
-#define XINE_MAJOR_VERSION @XINE_MAJOR@
-#define XINE_MINOR_VERSION @XINE_MINOR@
-#define XINE_SUB_VERSION   @XINE_SUB@
-#define XINE_VERSION       "@VERSION@"
-
 /*
  * pre-init the xine engine
  *
diff --git a/include/xine/Makefile.am b/include/xine/Makefile.am
new file mode 100644
index 000000000..2861460be
--- /dev/null
+++ b/include/xine/Makefile.am
@@ -0,0 +1,11 @@
+EXTRA_DIST = version.h.in
+
+xineincludedir = $(includedir)/xine
+xineinclude_HEADERS = version.h buffer.h metronom.h configfile.h vo_scale.h \
+	audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
+	video_overlay.h osd.h spu.h scratch.h xine_plugin.h xineintl.h \
+	plugin_catalog.h audio_decoder.h video_decoder.h post.h \
+	io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h \
+	demux.h input_plugin.h attributes.h compat.h xine_buffer.h \
+	xineutils.h xmllexer.h xmlparser.h list.h array.h sorted_array.h \
+	pool.h ring_buffer.h
diff --git a/src/xine-engine/alphablend.h b/include/xine/alphablend.h
index f8c9ad540..f8c9ad540 100644
--- a/src/xine-engine/alphablend.h
+++ b/include/xine/alphablend.h
diff --git a/src/xine-utils/array.h b/include/xine/array.h
index ae2093823..ae2093823 100644
--- a/src/xine-utils/array.h
+++ b/include/xine/array.h
diff --git a/src/xine-utils/attributes.h b/include/xine/attributes.h
index b25c76572..b25c76572 100644
--- a/src/xine-utils/attributes.h
+++ b/include/xine/attributes.h
diff --git a/src/xine-engine/audio_decoder.h b/include/xine/audio_decoder.h
index 307692b81..307692b81 100644
--- a/src/xine-engine/audio_decoder.h
+++ b/include/xine/audio_decoder.h
diff --git a/src/xine-engine/audio_out.h b/include/xine/audio_out.h
index bd1b910df..bd1b910df 100644
--- a/src/xine-engine/audio_out.h
+++ b/include/xine/audio_out.h
diff --git a/src/xine-engine/broadcaster.h b/include/xine/broadcaster.h
index 093fb4af0..093fb4af0 100644
--- a/src/xine-engine/broadcaster.h
+++ b/include/xine/broadcaster.h
diff --git a/src/xine-engine/buffer.h b/include/xine/buffer.h
index ce209c9da..ce209c9da 100644
--- a/src/xine-engine/buffer.h
+++ b/include/xine/buffer.h
diff --git a/src/xine-utils/compat.h b/include/xine/compat.h
index d4b95aeb3..d4b95aeb3 100644
--- a/src/xine-utils/compat.h
+++ b/include/xine/compat.h
diff --git a/src/xine-engine/configfile.h b/include/xine/configfile.h
index 22a544c00..22a544c00 100644
--- a/src/xine-engine/configfile.h
+++ b/include/xine/configfile.h
diff --git a/src/demuxers/demux.h b/include/xine/demux.h
index ee5ca42f0..476c80b8e 100644
--- a/src/demuxers/demux.h
+++ b/include/xine/demux.h
@@ -21,15 +21,9 @@
 #ifndef HAVE_DEMUX_H
 #define HAVE_DEMUX_H
 
-#ifdef XINE_COMPILE
-#  include "input/input_plugin.h"
-#  include "buffer.h"
-#  include "xine_internal.h"
-#else
-#  include <xine/input_plugin.h>
-#  include <xine/buffer.h>
-#  include <xine/xine_internal.h>
-#endif
+#include <xine/input_plugin.h>
+#include <xine/buffer.h>
+#include <xine/xine_internal.h>
 
 #define DEMUXER_PLUGIN_IFACE_VERSION    27
 
diff --git a/src/xine-engine/info_helper.h b/include/xine/info_helper.h
index d4123ba2b..d4123ba2b 100644
--- a/src/xine-engine/info_helper.h
+++ b/include/xine/info_helper.h
diff --git a/src/input/input_plugin.h b/include/xine/input_plugin.h
index 2917721c9..2917721c9 100644
--- a/src/input/input_plugin.h
+++ b/include/xine/input_plugin.h
diff --git a/src/xine-engine/io_helper.h b/include/xine/io_helper.h
index 0aac8fcfc..0aac8fcfc 100644
--- a/src/xine-engine/io_helper.h
+++ b/include/xine/io_helper.h
diff --git a/src/xine-utils/list.h b/include/xine/list.h
index e00e30d6c..e00e30d6c 100644
--- a/src/xine-utils/list.h
+++ b/include/xine/list.h
diff --git a/src/xine-engine/metronom.h b/include/xine/metronom.h
index 77919f16e..77919f16e 100644
--- a/src/xine-engine/metronom.h
+++ b/include/xine/metronom.h
diff --git a/src/xine-engine/osd.h b/include/xine/osd.h
index ed4e2434b..ed4e2434b 100644
--- a/src/xine-engine/osd.h
+++ b/include/xine/osd.h
diff --git a/src/xine-engine/plugin_catalog.h b/include/xine/plugin_catalog.h
index fd9afb959..fd9afb959 100644
--- a/src/xine-engine/plugin_catalog.h
+++ b/include/xine/plugin_catalog.h
diff --git a/src/xine-utils/pool.h b/include/xine/pool.h
index 918da82a2..918da82a2 100644
--- a/src/xine-utils/pool.h
+++ b/include/xine/pool.h
diff --git a/src/xine-engine/post.h b/include/xine/post.h
index 1995ca82f..1995ca82f 100644
--- a/src/xine-engine/post.h
+++ b/include/xine/post.h
diff --git a/src/xine-engine/refcounter.h b/include/xine/refcounter.h
index a662a974e..a662a974e 100644
--- a/src/xine-engine/refcounter.h
+++ b/include/xine/refcounter.h
diff --git a/src/xine-engine/resample.h b/include/xine/resample.h
index 40b4de486..40b4de486 100644
--- a/src/xine-engine/resample.h
+++ b/include/xine/resample.h
diff --git a/src/xine-utils/ring_buffer.h b/include/xine/ring_buffer.h
index efcffd3b7..efcffd3b7 100644
--- a/src/xine-utils/ring_buffer.h
+++ b/include/xine/ring_buffer.h
diff --git a/src/xine-engine/scratch.h b/include/xine/scratch.h
index c0e591d31..c0e591d31 100644
--- a/src/xine-engine/scratch.h
+++ b/include/xine/scratch.h
diff --git a/src/xine-utils/sorted_array.h b/include/xine/sorted_array.h
index a1894eca3..a1894eca3 100644
--- a/src/xine-utils/sorted_array.h
+++ b/include/xine/sorted_array.h
diff --git a/src/xine-engine/spu.h b/include/xine/spu.h
index daba7866b..daba7866b 100644
--- a/src/xine-engine/spu.h
+++ b/include/xine/spu.h
diff --git a/src/xine-engine/spu_decoder.h b/include/xine/spu_decoder.h
index dcf9107f7..dcf9107f7 100644
--- a/src/xine-engine/spu_decoder.h
+++ b/include/xine/spu_decoder.h
diff --git a/include/xine/version.h.in b/include/xine/version.h.in
new file mode 100644
index 000000000..75072708d
--- /dev/null
+++ b/include/xine/version.h.in
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2007 the xine project
+ *
+ * This file is part of xine, a free video player.
+ *
+ * xine is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * xine is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
+ */
+
+/* static info - which libxine release this header came from */
+#define XINE_MAJOR_VERSION @XINE_MAJOR@
+#define XINE_MINOR_VERSION @XINE_MINOR@
+#define XINE_SUB_VERSION   @XINE_SUB@
+#define XINE_VERSION       "@VERSION@"
diff --git a/src/xine-engine/video_decoder.h b/include/xine/video_decoder.h
index 705efa3da..705efa3da 100644
--- a/src/xine-engine/video_decoder.h
+++ b/include/xine/video_decoder.h
diff --git a/src/xine-engine/video_out.h b/include/xine/video_out.h
index 8efdae9f6..8efdae9f6 100644
--- a/src/xine-engine/video_out.h
+++ b/include/xine/video_out.h
diff --git a/src/xine-engine/video_overlay.h b/include/xine/video_overlay.h
index 6bb529204..6bb529204 100644
--- a/src/xine-engine/video_overlay.h
+++ b/include/xine/video_overlay.h
diff --git a/src/xine-engine/vo_scale.h b/include/xine/vo_scale.h
index e502b2f62..e502b2f62 100644
--- a/src/xine-engine/vo_scale.h
+++ b/include/xine/vo_scale.h
diff --git a/src/xine-utils/xine_buffer.h b/include/xine/xine_buffer.h
index 84511bd1b..84511bd1b 100644
--- a/src/xine-utils/xine_buffer.h
+++ b/include/xine/xine_buffer.h
diff --git a/src/xine-engine/xine_internal.h b/include/xine/xine_internal.h
index 13b003992..20bf6a9c8 100644
--- a/src/xine-engine/xine_internal.h
+++ b/include/xine/xine_internal.h
@@ -29,45 +29,24 @@ extern "C" {
  * include public part of xine header
  */
 
-#ifdef XINE_COMPILE
-#  include "xine.h"
-#  include "refcounter.h"
-#  include "input/input_plugin.h"
-#  include "demuxers/demux.h"
-#  include "video_out.h"
-#  include "audio_out.h"
-#  include "metronom.h"
-#  include "osd.h"
-#  include "xineintl.h"
-#  include "plugin_catalog.h"
-#  include "video_decoder.h"
-#  include "audio_decoder.h"
-#  include "spu_decoder.h"
-#  include "scratch.h"
-#  include "broadcaster.h"
-#  include "io_helper.h"
-#  include "info_helper.h"
-#  include "alphablend.h"
-#else
-#  include <xine.h>
-#  include <xine/refcounter.h>
-#  include <xine/input_plugin.h>
-#  include <xine/demux.h>
-#  include <xine/video_out.h>
-#  include <xine/audio_out.h>
-#  include <xine/metronom.h>
-#  include <xine/osd.h>
-#  include <xine/xineintl.h>
-#  include <xine/plugin_catalog.h>
-#  include <xine/video_decoder.h>
-#  include <xine/audio_decoder.h>
-#  include <xine/spu_decoder.h>
-#  include <xine/scratch.h>
-#  include <xine/broadcaster.h>
-#  include <xine/io_helper.h>
-#  include <xine/info_helper.h>
-#  include <xine/alphablend.h>
-#endif
+#include <xine.h>
+#include <xine/refcounter.h>
+#include <xine/input_plugin.h>
+#include <xine/demux.h>
+#include <xine/video_out.h>
+#include <xine/audio_out.h>
+#include <xine/metronom.h>
+#include <xine/osd.h>
+#include <xine/xineintl.h>
+#include <xine/plugin_catalog.h>
+#include <xine/video_decoder.h>
+#include <xine/audio_decoder.h>
+#include <xine/spu_decoder.h>
+#include <xine/scratch.h>
+#include <xine/broadcaster.h>
+#include <xine/io_helper.h>
+#include <xine/info_helper.h>
+#include <xine/alphablend.h>
 
 #define XINE_MAX_EVENT_LISTENERS         50
 #define XINE_MAX_EVENT_TYPES             100
diff --git a/src/xine-engine/xine_plugin.h b/include/xine/xine_plugin.h
index 74e7523e9..74e7523e9 100644
--- a/src/xine-engine/xine_plugin.h
+++ b/include/xine/xine_plugin.h
diff --git a/src/xine-engine/xineintl.h b/include/xine/xineintl.h
index 113a033fa..113a033fa 100644
--- a/src/xine-engine/xineintl.h
+++ b/include/xine/xineintl.h
diff --git a/src/xine-utils/xineutils.h b/include/xine/xineutils.h
index 89c62676b..89c62676b 100644
--- a/src/xine-utils/xineutils.h
+++ b/include/xine/xineutils.h
diff --git a/src/xine-utils/xmllexer.h b/include/xine/xmllexer.h
index 10bcc8676..10bcc8676 100644
--- a/src/xine-utils/xmllexer.h
+++ b/include/xine/xmllexer.h
diff --git a/src/xine-utils/xmlparser.h b/include/xine/xmlparser.h
index c89cb6dd3..c89cb6dd3 100644
--- a/src/xine-utils/xmlparser.h
+++ b/include/xine/xmlparser.h
diff --git a/lib/os_internal.h b/lib/os_internal.h
index f84bb1e62..873c4c3b7 100644
--- a/lib/os_internal.h
+++ b/lib/os_internal.h
@@ -81,7 +81,7 @@
 
 #include <inttypes.h>
 #include <pthread.h>
-#include "../src/xine-utils/attributes.h"
+#include <xine/attributes.h>
 
 
 #if defined(WIN32) || defined(__CYGWIN__)
diff --git a/src/audio_out/audio_alsa_out.c b/src/audio_out/audio_alsa_out.c
index 40dc7ffed..a6f81cb35 100644
--- a/src/audio_out/audio_alsa_out.c
+++ b/src/audio_out/audio_alsa_out.c
@@ -50,10 +50,10 @@
 #include <inttypes.h>
 #include <pthread.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/audio_out.h>
 
 /*
 #define ALSA_LOG
diff --git a/src/audio_out/audio_coreaudio_out.c b/src/audio_out/audio_coreaudio_out.c
index 551810e3e..001d873fa 100644
--- a/src/audio_out/audio_coreaudio_out.c
+++ b/src/audio_out/audio_coreaudio_out.c
@@ -41,9 +41,9 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/audio_out.h>
 
 #include <CoreAudio/CoreAudio.h>
 #include <CoreAudio/CoreAudioTypes.h>
diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c
index 9bcc52233..309edf961 100644
--- a/src/audio_out/audio_directx2_out.c
+++ b/src/audio_out/audio_directx2_out.c
@@ -58,8 +58,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
 
 
 #define AO_OUT_DIRECTX2_IFACE_VERSION 9
diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
index c7dea4e04..5d16698b2 100644
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -38,8 +38,8 @@ typedef unsigned char boolean;
 #define LOG
 */
 
-#include "audio_out.h"
-#include "xine_internal.h"
+#include <xine/audio_out.h>
+#include <xine/xine_internal.h>
 
 
 #define MAX_CHANNELS	          6
diff --git a/src/audio_out/audio_esd_out.c b/src/audio_out/audio_esd_out.c
index 9aec15c7a..81017f1ca 100644
--- a/src/audio_out/audio_esd_out.c
+++ b/src/audio_out/audio_esd_out.c
@@ -33,10 +33,10 @@
 #include <sys/uio.h>
 #include <inttypes.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "audio_out.h"
-#include "metronom.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/audio_out.h>
+#include <xine/metronom.h>
 
 #define AO_OUT_ESD_IFACE_VERSION 9
 
diff --git a/src/audio_out/audio_file_out.c b/src/audio_out/audio_file_out.c
index fda5ec7df..b75e6777b 100644
--- a/src/audio_out/audio_file_out.c
+++ b/src/audio_out/audio_file_out.c
@@ -31,9 +31,9 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/audio_out.h>
 #include "bswap.h"
 
 #define AO_OUT_FILE_IFACE_VERSION 9
diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c
index ceda0a293..a79d21213 100644
--- a/src/audio_out/audio_fusionsound_out.c
+++ b/src/audio_out/audio_fusionsound_out.c
@@ -34,9 +34,9 @@
 #define LOG_VERBOSE
 
 #include "xine.h"
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/xineutils.h>
 
 #include <directfb.h>
 
diff --git a/src/audio_out/audio_irixal_out.c b/src/audio_out/audio_irixal_out.c
index 1654cc1a7..e86b78e76 100644
--- a/src/audio_out/audio_irixal_out.c
+++ b/src/audio_out/audio_irixal_out.c
@@ -37,10 +37,10 @@
 
 #include <dmedia/audio.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/audio_out.h>
 
 //#ifndef AFMT_S16_NE
 //# if defined(sparc) || defined(__sparc__) || defined(PPC)
diff --git a/src/audio_out/audio_jack_out.c b/src/audio_out/audio_jack_out.c
index b3b2d4a19..7b8bb3eb3 100644
--- a/src/audio_out/audio_jack_out.c
+++ b/src/audio_out/audio_jack_out.c
@@ -8,9 +8,9 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/audio_out.h>
 
 #include <jack/jack.h>
 
diff --git a/src/audio_out/audio_none_out.c b/src/audio_out/audio_none_out.c
index 0e5cf1864..fa6547880 100644
--- a/src/audio_out/audio_none_out.c
+++ b/src/audio_out/audio_none_out.c
@@ -31,9 +31,9 @@
 #include <unistd.h>
 #include <inttypes.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/audio_out.h>
 
 #define AO_OUT_NONE_IFACE_VERSION 9
 
diff --git a/src/audio_out/audio_oss_out.c b/src/audio_out/audio_oss_out.c
index 5b4faada5..8e0e52fd7 100644
--- a/src/audio_out/audio_oss_out.c
+++ b/src/audio_out/audio_oss_out.c
@@ -64,10 +64,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/audio_out.h>
 
 #include <sys/time.h>
 
diff --git a/src/audio_out/audio_pulse_out.c b/src/audio_out/audio_pulse_out.c
index 6054e137e..b4ec0b156 100644
--- a/src/audio_out/audio_pulse_out.c
+++ b/src/audio_out/audio_pulse_out.c
@@ -41,9 +41,9 @@
 
 #include <pulse/pulseaudio.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/audio_out.h>
 #include "bswap.h"
 
 #define GAP_TOLERANCE        AO_MAX_GAP
diff --git a/src/audio_out/audio_sun_out.c b/src/audio_out/audio_sun_out.c
index c37397639..921e5fd15 100644
--- a/src/audio_out/audio_sun_out.c
+++ b/src/audio_out/audio_sun_out.c
@@ -45,9 +45,9 @@
 typedef unsigned uint_t;
 #endif
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/audio_out.h>
 
 #ifdef __svr4__
 #define	CS4231_WORKAROUND	1	/* enable workaround for audiocs play.samples bug */
diff --git a/src/combined/flac_decoder.c b/src/combined/flac_decoder.c
index 9ec024d71..40c5fa6a3 100644
--- a/src/combined/flac_decoder.c
+++ b/src/combined/flac_decoder.c
@@ -44,9 +44,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
 
 typedef struct {
   audio_decoder_class_t   decoder_class;
diff --git a/src/combined/flac_demuxer.c b/src/combined/flac_demuxer.c
index bee98d2a3..1f390a86f 100644
--- a/src/combined/flac_demuxer.c
+++ b/src/combined/flac_demuxer.c
@@ -51,8 +51,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "../demuxers/demux.h"
 
 #ifndef LEGACY_FLAC
diff --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c
index 085467937..18ab05863 100644
--- a/src/combined/nsf_combined.c
+++ b/src/combined/nsf_combined.c
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "nsf_combined.h"
 
 static const demuxer_info_t demux_info_nsf = {
diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c
index b2694e789..cb3b6e7b0 100644
--- a/src/combined/nsf_decoder.c
+++ b/src/combined/nsf_decoder.c
@@ -27,10 +27,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 /* Nosefart includes */
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index cce7c8983..451e6e938 100644
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -46,10 +46,10 @@
 /* #define LOG_VERBOSE */
 /* #define LOG */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 
 #include "nsf_combined.h"
diff --git a/src/combined/wavpack_combined.c b/src/combined/wavpack_combined.c
index 9c5dade03..edf4bec01 100644
--- a/src/combined/wavpack_combined.c
+++ b/src/combined/wavpack_combined.c
@@ -20,7 +20,7 @@
  * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
  */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "wavpack_combined.h"
 
 static const demuxer_info_t demux_info_wv = {
diff --git a/src/combined/wavpack_decoder.c b/src/combined/wavpack_decoder.c
index 8eb041664..80a14e678 100644
--- a/src/combined/wavpack_decoder.c
+++ b/src/combined/wavpack_decoder.c
@@ -27,8 +27,8 @@
 #define LOG_MODULE "decode_wavpack"
 #define LOG_VERBOSE
 
-#include "xine_internal.h"
-#include "attributes.h"
+#include <xine/xine_internal.h>
+#include <xine/attributes.h>
 #include "bswap.h"
 
 #include <wavpack/wavpack.h>
diff --git a/src/combined/wavpack_demuxer.c b/src/combined/wavpack_demuxer.c
index 310f4cecb..9c0831cfa 100644
--- a/src/combined/wavpack_demuxer.c
+++ b/src/combined/wavpack_demuxer.c
@@ -28,11 +28,11 @@
 #define LOG_VERBOSE
 #define LOG
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 #include "bswap.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 
 #include <wavpack/wavpack.h>
 #include "wavpack_combined.h"
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index 159f4b662..d6b5ea214 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -65,9 +65,9 @@
 #define DEBUG_PTS 0
 #define DEBUG_VIDEO_PACKETS 0
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "flacutils.h"
 
diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c
index e4fc44eec..a94ab0c0e 100644
--- a/src/combined/xine_speex_decoder.c
+++ b/src/combined/xine_speex_decoder.c
@@ -34,9 +34,9 @@
 */
 #define LOG_BUFFERS 0
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
 
 #include <ogg/ogg.h>
 
diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c
index 8d06a5510..262cb5414 100644
--- a/src/combined/xine_theora_decoder.c
+++ b/src/combined/xine_theora_decoder.c
@@ -39,11 +39,11 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
-#include "metronom.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
+#include <xine/metronom.h>
+#include <xine/xineutils.h>
 
 typedef struct theora_class_s {
   video_decoder_class_t   decoder_class;
diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c
index aa3546e2e..143c761c4 100644
--- a/src/combined/xine_vorbis_decoder.c
+++ b/src/combined/xine_vorbis_decoder.c
@@ -33,9 +33,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
 
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index ba3041d5d..276505521 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -8,8 +8,6 @@ AM_LDFLAGS = $(xineplug_ldflags)
 # ---------
 # All of xine demuxer plugins should be named like the scheme "xineplug_dmx_"
 
-xineinclude_HEADERS = demux.h
-
 noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h flacutils.h
 
 if ENABLE_ASF
diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c
index 23692574e..97537c337 100644
--- a/src/demuxers/asfheader.c
+++ b/src/demuxers/asfheader.c
@@ -17,7 +17,7 @@
 #define LOG

 */

 

-#include "xineutils.h"

+#include <xine/xineutils.h>

 #include "bswap.h"

 #include "asfheader.h"

 

diff --git a/src/demuxers/demux_4xm.c b/src/demuxers/demux_4xm.c
index 5ad5d5938..6256cb042 100644
--- a/src/demuxers/demux_4xm.c
+++ b/src/demuxers/demux_4xm.c
@@ -40,10 +40,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_aac.c b/src/demuxers/demux_aac.c
index 3edd0bca4..0b02f1d99 100644
--- a/src/demuxers/demux_aac.c
+++ b/src/demuxers/demux_aac.c
@@ -39,10 +39,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_ac3.c b/src/demuxers/demux_ac3.c
index e48416803..2ccd5217e 100644
--- a/src/demuxers/demux_ac3.c
+++ b/src/demuxers/demux_ac3.c
@@ -44,10 +44,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_aiff.c b/src/demuxers/demux_aiff.c
index f873f5d4f..d3b19701a 100644
--- a/src/demuxers/demux_aiff.c
+++ b/src/demuxers/demux_aiff.c
@@ -33,10 +33,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index f5091035b..156a78d6c 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -45,12 +45,12 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
-#include "demux.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/demux.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 #include "asfheader.h"
-#include "xmlparser.h"
+#include <xine/xmlparser.h>
 
 #define CODEC_TYPE_AUDIO          0
 #define CODEC_TYPE_VIDEO          1
diff --git a/src/demuxers/demux_aud.c b/src/demuxers/demux_aud.c
index 2aa83d162..c58500ab2 100644
--- a/src/demuxers/demux_aud.c
+++ b/src/demuxers/demux_aud.c
@@ -45,10 +45,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index d2e0c0412..ecc71b649 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -70,9 +70,9 @@
 #define DEBUG_ODML
 #define LOG
 */
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 #include "bswap.h"
 
 /*
diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
index d2a2b4db4..03dcc2605 100644
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -41,10 +41,10 @@
 /* #define LOG_VERBOSE */
 /* #define LOG */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_dts.c b/src/demuxers/demux_dts.c
index be552653f..9d3313a72 100644
--- a/src/demuxers/demux_dts.c
+++ b/src/demuxers/demux_dts.c
@@ -40,10 +40,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_eawve.c b/src/demuxers/demux_eawve.c
index b0d10dc1c..04cc714d7 100644
--- a/src/demuxers/demux_eawve.c
+++ b/src/demuxers/demux_eawve.c
@@ -39,10 +39,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
-#include "demux.h"
+#include <xine/demux.h>
 #include "group_games.h"
 
 #define FOURCC_TAG BE_FOURCC
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index a40d3053e..e653818c4 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -38,10 +38,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 
 #define NUM_PREVIEW_BUFFERS 50
 #define SCRATCH_SIZE 256
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index d09f8f4f1..cc9e90d66 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -47,10 +47,10 @@
  * demuxer is dispatching to the engine */
 #define DEBUG_FILM_DEMUX 0
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_flac.c b/src/demuxers/demux_flac.c
index 0380de846..b4c5427c5 100644
--- a/src/demuxers/demux_flac.c
+++ b/src/demuxers/demux_flac.c
@@ -40,10 +40,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c
index 2da3019b2..0dad5883a 100644
--- a/src/demuxers/demux_fli.c
+++ b/src/demuxers/demux_fli.c
@@ -35,10 +35,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 
 #define FLI_HEADER_SIZE 128
diff --git a/src/demuxers/demux_flv.c b/src/demuxers/demux_flv.c
index 131470a3e..e6a7e234a 100644
--- a/src/demuxers/demux_flv.c
+++ b/src/demuxers/demux_flv.c
@@ -42,10 +42,10 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_idcin.c b/src/demuxers/demux_idcin.c
index 39b38c81d..695470415 100644
--- a/src/demuxers/demux_idcin.c
+++ b/src/demuxers/demux_idcin.c
@@ -83,10 +83,10 @@
  * demuxer is dispatching to the engine */
 /* #define LOG */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_iff.c b/src/demuxers/demux_iff.c
index 9e91684d5..665d29cd2 100644
--- a/src/demuxers/demux_iff.c
+++ b/src/demuxers/demux_iff.c
@@ -47,10 +47,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 
 #include "iff.h"
diff --git a/src/demuxers/demux_image.c b/src/demuxers/demux_image.c
index 4731acfe4..cb6f8c8fe 100644
--- a/src/demuxers/demux_image.c
+++ b/src/demuxers/demux_image.c
@@ -38,10 +38,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
-#include "demux.h"
+#include <xine/demux.h>
 
 #define IMAGE_HEADER_LEN 4
 
diff --git a/src/demuxers/demux_ipmovie.c b/src/demuxers/demux_ipmovie.c
index cc71da6d4..4d08af6fa 100644
--- a/src/demuxers/demux_ipmovie.c
+++ b/src/demuxers/demux_ipmovie.c
@@ -40,10 +40,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
index 16cf87978..e976e7d63 100644
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -42,10 +42,10 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 
 #include "ebml.h"
diff --git a/src/demuxers/demux_mng.c b/src/demuxers/demux_mng.c
index f7af7ec42..18c4b1b57 100644
--- a/src/demuxers/demux_mng.c
+++ b/src/demuxers/demux_mng.c
@@ -46,9 +46,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 
 typedef struct {
   demux_plugin_t     demux_plugin;
diff --git a/src/demuxers/demux_mod.c b/src/demuxers/demux_mod.c
index 54dacdc8e..17e744b94 100644
--- a/src/demuxers/demux_mod.c
+++ b/src/demuxers/demux_mod.c
@@ -42,10 +42,10 @@
 /* #define LOG_VERBOSE */
 /* #define LOG */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "modplug.h"
 #include "bswap.h"
 
diff --git a/src/demuxers/demux_mpc.c b/src/demuxers/demux_mpc.c
index 60750b550..6a4cfb285 100644
--- a/src/demuxers/demux_mpc.c
+++ b/src/demuxers/demux_mpc.c
@@ -41,10 +41,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 0a97b27bc..8c339fd88 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -39,9 +39,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "demux.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/demux.h>
+#include <xine/xineutils.h>
 
 #define NUM_PREVIEW_BUFFERS 150
 #define SCRATCH_SIZE 256
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 91b69328c..b46008b94 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -37,9 +37,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 
 #define NUM_PREVIEW_BUFFERS   250
 #define DISC_TRESHOLD       90000
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index d47c1ed01..f5d554020 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -41,9 +41,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 
 #define NUM_PREVIEW_BUFFERS   250
 #define DISC_TRESHOLD       90000
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 1648be926..39d537a4c 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -38,10 +38,10 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "compat.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/compat.h>
 #include "bswap.h"
 #include "group_audio.h"
 #include "id3.h"
diff --git a/src/demuxers/demux_nsv.c b/src/demuxers/demux_nsv.c
index d5ffed5f8..74f98c7cd 100644
--- a/src/demuxers/demux_nsv.c
+++ b/src/demuxers/demux_nsv.c
@@ -40,12 +40,12 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
-#include "buffer.h"
+#include <xine/buffer.h>
 
 #define FOURCC_TAG BE_FOURCC
 #define NSVf_TAG       FOURCC_TAG('N', 'S', 'V', 'f')
diff --git a/src/demuxers/demux_playlist.c b/src/demuxers/demux_playlist.c
index c6df006fe..3dd689657 100644
--- a/src/demuxers/demux_playlist.c
+++ b/src/demuxers/demux_playlist.c
@@ -40,10 +40,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
-#include "demux.h"
+#include <xine/demux.h>
 
 typedef enum {
   XINE_PLT_NONE = 0,
diff --git a/src/demuxers/demux_pva.c b/src/demuxers/demux_pva.c
index 2f85387b2..9987da057 100644
--- a/src/demuxers/demux_pva.c
+++ b/src/demuxers/demux_pva.c
@@ -39,10 +39,10 @@
 /* #define LOG_VERBOSE */
 /* #define LOG */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 
 #define PVA_PREAMBLE_SIZE 8
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index 8fb554de2..a54bc4e73 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -43,10 +43,10 @@
 #include <ctype.h>
 #include <zlib.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 
 #include "qtpalette.h"
diff --git a/src/demuxers/demux_rawdv.c b/src/demuxers/demux_rawdv.c
index 0ae52b6bf..10b3170e6 100644
--- a/src/demuxers/demux_rawdv.c
+++ b/src/demuxers/demux_rawdv.c
@@ -32,10 +32,10 @@
 #include <unistd.h>
 #include <string.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 
 #define NTSC_FRAME_SIZE 120000
 #define NTSC_FRAME_RATE 29.97
diff --git a/src/demuxers/demux_real.c b/src/demuxers/demux_real.c
index 5f1d35d84..bd5bb4021 100644
--- a/src/demuxers/demux_real.c
+++ b/src/demuxers/demux_real.c
@@ -49,10 +49,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 
 #define FOURCC_TAG BE_FOURCC
diff --git a/src/demuxers/demux_realaudio.c b/src/demuxers/demux_realaudio.c
index 0ce399e11..732ddfcc4 100644
--- a/src/demuxers/demux_realaudio.c
+++ b/src/demuxers/demux_realaudio.c
@@ -34,10 +34,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_roq.c b/src/demuxers/demux_roq.c
index 95f81de9a..83e589be0 100644
--- a/src/demuxers/demux_roq.c
+++ b/src/demuxers/demux_roq.c
@@ -40,10 +40,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_shn.c b/src/demuxers/demux_shn.c
index 445661b8f..d5e46f873 100644
--- a/src/demuxers/demux_shn.c
+++ b/src/demuxers/demux_shn.c
@@ -35,10 +35,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
index fc42ae4c4..80a5ebbf8 100644
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -42,10 +42,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 
 #define SCRATCH_SIZE        1024
 #define CHECK_VPTS_INTERVAL 2*90000
diff --git a/src/demuxers/demux_smjpeg.c b/src/demuxers/demux_smjpeg.c
index d24459f5b..10cdf8120 100644
--- a/src/demuxers/demux_smjpeg.c
+++ b/src/demuxers/demux_smjpeg.c
@@ -39,10 +39,10 @@
 /* #define LOG_VERBOSE */
 /* #define LOG */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_snd.c b/src/demuxers/demux_snd.c
index 728caf170..d7bdd0839 100644
--- a/src/demuxers/demux_snd.c
+++ b/src/demuxers/demux_snd.c
@@ -33,10 +33,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_str.c b/src/demuxers/demux_str.c
index ccb653ad2..f125f09c5 100644
--- a/src/demuxers/demux_str.c
+++ b/src/demuxers/demux_str.c
@@ -123,10 +123,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 5b671f3c4..e80e8af70 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -147,9 +147,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 
 /*
   #define TS_LOG
diff --git a/src/demuxers/demux_tta.c b/src/demuxers/demux_tta.c
index 2a8af09bb..2d35a60e8 100644
--- a/src/demuxers/demux_tta.c
+++ b/src/demuxers/demux_tta.c
@@ -24,13 +24,13 @@
 #define LOG_MODULE "demux_tta"
 #define LOG_VERBOSE
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 
 typedef struct {
   demux_plugin_t       demux_plugin;
diff --git a/src/demuxers/demux_vmd.c b/src/demuxers/demux_vmd.c
index 41475f966..c2902eac1 100644
--- a/src/demuxers/demux_vmd.c
+++ b/src/demuxers/demux_vmd.c
@@ -45,10 +45,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_voc.c b/src/demuxers/demux_voc.c
index ffd904a6f..ce42d61d8 100644
--- a/src/demuxers/demux_voc.c
+++ b/src/demuxers/demux_voc.c
@@ -37,10 +37,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_vox.c b/src/demuxers/demux_vox.c
index 0e648263e..306f2414f 100644
--- a/src/demuxers/demux_vox.c
+++ b/src/demuxers/demux_vox.c
@@ -34,10 +34,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_vqa.c b/src/demuxers/demux_vqa.c
index 3cbbced9d..3acd56bc1 100644
--- a/src/demuxers/demux_vqa.c
+++ b/src/demuxers/demux_vqa.c
@@ -40,10 +40,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_wav.c b/src/demuxers/demux_wav.c
index 9cf2adefe..b8f0d0194 100644
--- a/src/demuxers/demux_wav.c
+++ b/src/demuxers/demux_wav.c
@@ -34,10 +34,10 @@
 #include <stdlib.h>
 #include <ctype.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
diff --git a/src/demuxers/demux_wc3movie.c b/src/demuxers/demux_wc3movie.c
index b3cf9dfb3..bb9a40306 100644
--- a/src/demuxers/demux_wc3movie.c
+++ b/src/demuxers/demux_wc3movie.c
@@ -42,10 +42,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 #include "group_games.h"
 
diff --git a/src/demuxers/demux_yuv4mpeg2.c b/src/demuxers/demux_yuv4mpeg2.c
index 54e8ebbaa..a0bf31bce 100644
--- a/src/demuxers/demux_yuv4mpeg2.c
+++ b/src/demuxers/demux_yuv4mpeg2.c
@@ -36,10 +36,10 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 #include "bswap.h"
 
 #define Y4M_SIGNATURE_SIZE 9
diff --git a/src/demuxers/demux_yuv_frames.c b/src/demuxers/demux_yuv_frames.c
index 301a5978e..0cef51f60 100644
--- a/src/demuxers/demux_yuv_frames.c
+++ b/src/demuxers/demux_yuv_frames.c
@@ -39,9 +39,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 
 #define WRAP_THRESHOLD       20000
 
diff --git a/src/demuxers/ebml.c b/src/demuxers/ebml.c
index d5f7bb9b5..772b848eb 100644
--- a/src/demuxers/ebml.c
+++ b/src/demuxers/ebml.c
@@ -31,8 +31,8 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 #include "ebml.h"
diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c
index d3832c36d..250eeefb4 100644
--- a/src/demuxers/group_audio.c
+++ b/src/demuxers/group_audio.c
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "xine_internal.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/demux.h>
 
 #include "group_audio.h"
 
diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h
index 11aac35d7..394cad2a3 100644
--- a/src/demuxers/group_audio.h
+++ b/src/demuxers/group_audio.h
@@ -21,7 +21,7 @@
 #ifndef HAVE_GROUP_AUDIO_H
 #define HAVE_GROUP_AUDIO_H
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 void *demux_aac_init_plugin (xine_t *xine, void *data);
 void *demux_ac3_init_plugin (xine_t *xine, void *data);
diff --git a/src/demuxers/group_games.c b/src/demuxers/group_games.c
index cfae26848..2d01b726e 100644
--- a/src/demuxers/group_games.c
+++ b/src/demuxers/group_games.c
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "xine_internal.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/demux.h>
 
 #include "group_games.h"
 
diff --git a/src/demuxers/group_games.h b/src/demuxers/group_games.h
index f93d4bb07..352ec5524 100644
--- a/src/demuxers/group_games.h
+++ b/src/demuxers/group_games.h
@@ -21,7 +21,7 @@
 #ifndef HAVE_GROUP_GAMES_H
 #define HAVE_GROUP_GAMES_H
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 void *demux_eawve_init_plugin(xine_t *xine, void *data);
 void *demux_idcin_init_plugin (xine_t *xine, void *data);
diff --git a/src/demuxers/id3.c b/src/demuxers/id3.c
index ceb66014f..b9bb75744 100644
--- a/src/demuxers/id3.c
+++ b/src/demuxers/id3.c
@@ -40,8 +40,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 #include "id3.h"
 
diff --git a/src/demuxers/id3.h b/src/demuxers/id3.h
index 29285bf7a..542a17bc4 100644
--- a/src/demuxers/id3.h
+++ b/src/demuxers/id3.h
@@ -25,8 +25,8 @@
 #ifndef ID3_H
 #define ID3_H
 
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 /* id3v2 */
diff --git a/src/demuxers/matroska.h b/src/demuxers/matroska.h
index 6806c207d..215c63dd0 100644
--- a/src/demuxers/matroska.h
+++ b/src/demuxers/matroska.h
@@ -20,9 +20,9 @@
 #ifndef MATROSKA_H
 #define MATROSKA_H
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 
 #include "ebml.h"
 
diff --git a/src/dxr3/dxr3.h b/src/dxr3/dxr3.h
index f08ddcd04..0b0961ca0 100644
--- a/src/dxr3/dxr3.h
+++ b/src/dxr3/dxr3.h
@@ -23,7 +23,7 @@
 
 #include "em8300.h"
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 /* data for the device name config entry */
 #define CONF_KEY  "dxr3.device_number"
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index 7c501e9d8..8280d4714 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -42,9 +42,9 @@
 #define LOG_SPU 0
 #define LOG_BTN 0
 
-#include "xine_internal.h"
-#include "xineutils.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_types.h>
diff --git a/src/dxr3/dxr3_decode_video.c b/src/dxr3/dxr3_decode_video.c
index e26e303a1..39da80249 100644
--- a/src/dxr3/dxr3_decode_video.c
+++ b/src/dxr3/dxr3_decode_video.c
@@ -40,8 +40,8 @@
 #define LOG_VID 0
 #define LOG_PTS 0
 
-#include "xine_internal.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/buffer.h>
 #include "video_out_dxr3.h"
 #include "dxr3.h"
 
diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c
index 0c59b0b93..19ff8b81d 100644
--- a/src/dxr3/dxr3_mpeg_encoders.c
+++ b/src/dxr3/dxr3_mpeg_encoders.c
@@ -48,7 +48,7 @@
 /* #define LOG_VERBOSE */
 /* #define LOG */
 
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #include "video_out_dxr3.h"
 
 /* buffer size for encoded mpeg1 stream; will hold one intra frame 
diff --git a/src/dxr3/dxr3_scr.h b/src/dxr3/dxr3_scr.h
index d0e155c27..b9f35d643 100644
--- a/src/dxr3/dxr3_scr.h
+++ b/src/dxr3/dxr3_scr.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 
 /* plugin structure */
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index b073e6f63..a2153dacc 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -60,9 +60,9 @@
 #define LOG_VID 0
 #define LOG_OVR 0
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "video_out.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/video_out.h>
 #include "dxr3.h"
 #include "video_out_dxr3.h"
 
diff --git a/src/dxr3/video_out_dxr3.h b/src/dxr3/video_out_dxr3.h
index 0297204dd..b3c607109 100644
--- a/src/dxr3/video_out_dxr3.h
+++ b/src/dxr3/video_out_dxr3.h
@@ -26,8 +26,8 @@
 #  include <X11/Xlib.h>
 #endif
 
-#include "xine_internal.h"
-#include "vo_scale.h"
+#include <xine/xine_internal.h>
+#include <xine/vo_scale.h>
 #include "dxr3_scr.h"
 #include "dxr3.h"
 
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index ed32ad7c5..8330b6d43 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -19,7 +19,6 @@ SUBDIRS += libdvdnav
 endif
 
 
-xineinclude_HEADERS = input_plugin.h
 noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h http_helper.h
 
 
diff --git a/src/input/http_helper.c b/src/input/http_helper.c
index 279d3ff05..83562c9dc 100644
--- a/src/input/http_helper.c
+++ b/src/input/http_helper.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "http_helper.h"
 
 int _x_parse_url (char *url, char **proto, char** host, int *port,
diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index ed6f2b4f9..c08e1ca0b 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -66,9 +66,9 @@
 
 #include "sha1.h"
 #include "base64.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 #include "media_helper.h"
 
 #if defined(__sun)
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 5ba3f9d93..146185845 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -113,9 +113,9 @@
 #define LOG_READS
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 #include "net_buf_ctrl.h"
 
 #define BUFSIZE 16384
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index e3b9ed091..60f58d361 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -85,9 +85,9 @@
 #endif
 
 /* Xine includes */
-#include "xineutils.h"
-#include "buffer.h"
-#include "xine_internal.h"
+#include <xine/xineutils.h>
+#include <xine/buffer.h>
+#include <xine/xine_internal.h>
 #include "media_helper.h"
 
 /* Print debug messages? */
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 1556afb09..2fe3925ea 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.c
@@ -44,10 +44,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/input_plugin.h>
 
 #define MAXFILES      65535
 
diff --git a/src/input/input_gnome_vfs.c b/src/input/input_gnome_vfs.c
index ad756e7e7..968945023 100644
--- a/src/input/input_gnome_vfs.c
+++ b/src/input/input_gnome_vfs.c
@@ -24,9 +24,9 @@
 #include "config.h"
 #endif
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 #include "net_buf_ctrl.h"
 
 #include <libgnomevfs/gnome-vfs.h>
diff --git a/src/input/input_http.c b/src/input/input_http.c
index ef2606413..c2836affe 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -46,9 +46,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 #include "net_buf_ctrl.h"
 #include "http_helper.h"
 
diff --git a/src/input/input_mms.c b/src/input/input_mms.c
index 0b9e6c7f2..0287e0060 100644
--- a/src/input/input_mms.c
+++ b/src/input/input_mms.c
@@ -41,9 +41,9 @@
 */
 
 #include "bswap.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 
 #include "mms.h"
 #include "mmsh.h"
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 7a52f670d..1d7288f41 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -66,9 +66,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 #include "net_buf_ctrl.h"
 
 #define NET_BS_LEN 2324
diff --git a/src/input/input_pnm.c b/src/input/input_pnm.c
index 3bc026b69..3271a04c9 100644
--- a/src/input/input_pnm.c
+++ b/src/input/input_pnm.c
@@ -41,9 +41,9 @@
 */
 
 #include "bswap.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 
 #include "pnm.h"
 #include "net_buf_ctrl.h"
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 40bb9dc79..d68b3fe34 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -108,10 +108,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/input_plugin.h>
 
 #define PVR_DEVICE        "/dev/video0"
 
diff --git a/src/input/input_rtp.c b/src/input/input_rtp.c
index c3abf4bf5..33183e555 100644
--- a/src/input/input_rtp.c
+++ b/src/input/input_rtp.c
@@ -91,9 +91,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 #include "net_buf_ctrl.h"
 
 #ifdef __GNUC__
diff --git a/src/input/input_rtsp.c b/src/input/input_rtsp.c
index 690507d88..bee192c0d 100644
--- a/src/input/input_rtsp.c
+++ b/src/input/input_rtsp.c
@@ -41,9 +41,9 @@
 */
 
 #include "bswap.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 
 #include "librtsp/rtsp_session.h"
 #include "net_buf_ctrl.h"
diff --git a/src/input/input_smb.c b/src/input/input_smb.c
index 8bbbfdfe5..44fa96bfd 100644
--- a/src/input/input_smb.c
+++ b/src/input/input_smb.c
@@ -23,10 +23,10 @@
 #include "config.h"
 #endif
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/input_plugin.h>
 
 #include <libsmbclient.h>
 #include <sys/types.h>
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index e28a8d0c3..d67954ea8 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.c
@@ -36,9 +36,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 #include "net_buf_ctrl.h"
 
 #define BUFSIZE                 1024
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 7af8788ff..162e2f7ab 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -88,9 +88,9 @@ static char *log_line_prefix()
 }
 #endif
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 
 #define NUM_FRAMES  15
 
diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c
index 14a924a2a..4b624a9e7 100644
--- a/src/input/input_vcd.c
+++ b/src/input/input_vcd.c
@@ -45,9 +45,9 @@
 #error "you need to add cdrom / VCD support for your platform to input_vcd and configure.in"
 #endif
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 #include "media_helper.h"
 
 #if defined(__sun)
diff --git a/src/input/libdvdnav/dvd_reader.c b/src/input/libdvdnav/dvd_reader.c
index 200a1dbec..c15a5c3f5 100644
--- a/src/input/libdvdnav/dvd_reader.c
+++ b/src/input/libdvdnav/dvd_reader.c
@@ -70,7 +70,7 @@ static inline int _private_gettimeofday( struct timeval *tv, void *tz )
 #include <mntent.h>
 #endif
 
-#include "compat.h"
+#include <xine/compat.h>
 #include "dvd_udf.h"
 #include "dvd_input.h"
 #include "dvd_reader.h"
diff --git a/src/input/libreal/asmrp.c b/src/input/libreal/asmrp.c
index f7206b583..9fc7a3867 100644
--- a/src/input/libreal/asmrp.c
+++ b/src/input/libreal/asmrp.c
@@ -43,7 +43,7 @@
 */
 
 #include "asmrp.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #define ASMRP_SYM_NONE         0
 #define ASMRP_SYM_EOF          1
diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c
index df604eb10..078b12757 100644
--- a/src/input/libreal/real.c
+++ b/src/input/libreal/real.c
@@ -33,8 +33,8 @@
 #include "real.h"
 #include "asmrp.h"
 #include "sdpplin.h"
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 #define XOR_TABLE_LEN 37
diff --git a/src/input/libreal/rmff.c b/src/input/libreal/rmff.c
index 00f749d43..c12fff1d6 100644
--- a/src/input/libreal/rmff.c
+++ b/src/input/libreal/rmff.c
@@ -27,7 +27,7 @@
 #define LOG
 */
 
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #include "bswap.h"
 #include "rmff.h"
 
diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c
index 054783119..d58a3d1fe 100644
--- a/src/input/libreal/sdpplin.c
+++ b/src/input/libreal/sdpplin.c
@@ -29,7 +29,7 @@
 #include "rmff.h"
 #include "rtsp.h"
 #include "sdpplin.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 /*
  * Decodes base64 strings (based upon b64 package)
diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c
index d0f09d563..7607f2221 100644
--- a/src/input/librtsp/rtsp.c
+++ b/src/input/librtsp/rtsp.c
@@ -45,8 +45,8 @@
 */ 
 
 #include "rtsp.h"
-#include "io_helper.h"
-#include "xineutils.h"
+#include <xine/io_helper.h>
+#include <xine/xineutils.h>
 
 #define BUF_SIZE 4096
 #define HEADER_SIZE 1024
diff --git a/src/input/librtsp/rtsp.h b/src/input/librtsp/rtsp.h
index 7f7a3ddba..3c829e2e8 100644
--- a/src/input/librtsp/rtsp.h
+++ b/src/input/librtsp/rtsp.h
@@ -25,7 +25,7 @@
 #define HAVE_RTSP_H
 
 /*#include <inttypes.h> */
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 #ifdef __CYGWIN__
 #define uint32_t unsigned int
diff --git a/src/input/librtsp/rtsp_session.c b/src/input/librtsp/rtsp_session.c
index 84552503b..e9ce5bc5c 100644
--- a/src/input/librtsp/rtsp_session.c
+++ b/src/input/librtsp/rtsp_session.c
@@ -41,7 +41,7 @@
 #include "real.h"
 #include "rmff.h"
 #include "asmrp.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #define BUF_SIZE 4096
 #define HEADER_SIZE 4096
diff --git a/src/input/media_helper.h b/src/input/media_helper.h
index 7e6303dfd..a8e376fdc 100644
--- a/src/input/media_helper.h
+++ b/src/input/media_helper.h
@@ -22,7 +22,7 @@
 #ifndef HAVE_MEDIA_HELPER_H
 #define HAVE_MEDIA_HELPER_H
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 int media_eject_media (xine_t *xine, const char *device);
 
diff --git a/src/input/mms.c b/src/input/mms.c
index 7b8e18bab..37e7ff395 100644
--- a/src/input/mms.c
+++ b/src/input/mms.c
@@ -56,8 +56,8 @@
 /*
 #define LOG 
 */
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 
 #include "bswap.h"
 #include "http_helper.h"
diff --git a/src/input/mms.h b/src/input/mms.h
index a483fa0c6..67ea5ba0b 100644
--- a/src/input/mms.h
+++ b/src/input/mms.h
@@ -24,7 +24,7 @@
 #define HAVE_MMS_H
 
 #include <inttypes.h>
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 typedef struct mms_s mms_t;
 
diff --git a/src/input/mmsh.c b/src/input/mmsh.c
index 13b51d21e..3a33e8d7f 100644
--- a/src/input/mmsh.c
+++ b/src/input/mmsh.c
@@ -51,8 +51,8 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 
 #include "bswap.h"
 #include "http_helper.h"
diff --git a/src/input/mmsh.h b/src/input/mmsh.h
index 633d3b5f6..eeceb030b 100644
--- a/src/input/mmsh.h
+++ b/src/input/mmsh.h
@@ -24,7 +24,7 @@
 #define HAVE_MMSH_H
 
 #include <inttypes.h>
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 typedef struct mmsh_s mmsh_t;
 
diff --git a/src/input/net_buf_ctrl.h b/src/input/net_buf_ctrl.h
index 79f698008..c35187179 100644
--- a/src/input/net_buf_ctrl.h
+++ b/src/input/net_buf_ctrl.h
@@ -23,7 +23,7 @@
 #ifndef HAVE_NET_BUF_CTRL_H
 #define HAVE_NET_BUF_CTRL_H
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 typedef struct nbc_s nbc_t;
 
diff --git a/src/input/pnm.c b/src/input/pnm.c
index 942e52957..3cb36ac3f 100644
--- a/src/input/pnm.c
+++ b/src/input/pnm.c
@@ -45,9 +45,9 @@
 #include "pnm.h"
 #include "libreal/rmff.h"
 #include "bswap.h"
-#include "io_helper.h"
-#include "xineutils.h"
-#include "xine_internal.h"
+#include <xine/io_helper.h>
+#include <xine/xineutils.h>
+#include <xine/xine_internal.h>
 
 #define BUF_SIZE 4096
 #define HEADER_SIZE 4096
diff --git a/src/input/pnm.h b/src/input/pnm.h
index 838fbadcc..bf3514bae 100644
--- a/src/input/pnm.h
+++ b/src/input/pnm.h
@@ -26,7 +26,7 @@
 #ifndef __CYGWIN__
 #include <inttypes.h>
 #endif
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 typedef struct pnm_s pnm_t;
 
diff --git a/src/input/vcd/xine-extra.h b/src/input/vcd/xine-extra.h
index 0650f863d..59f562cbd 100644
--- a/src/input/vcd/xine-extra.h
+++ b/src/input/vcd/xine-extra.h
@@ -36,9 +36,9 @@
 #endif
 
 /* Xine includes */
-#include "xine_internal.h"
-#include "input_plugin.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/input_plugin.h>
+#include <xine/xineutils.h>
 
 /*!
   This routine is like xine_log, except it takes a va_list instead of
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index b794331f1..27b1cfbbf 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -52,8 +52,8 @@
 #define xine_config_entry_t xine_cfg_entry_t
 
 /* Xine includes */
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 
 #include "xine-extra.h"
 
diff --git a/src/libffmpeg/ff_audio_decoder.c b/src/libffmpeg/ff_audio_decoder.c
index 6dd9205ea..dd03cd2a3 100644
--- a/src/libffmpeg/ff_audio_decoder.c
+++ b/src/libffmpeg/ff_audio_decoder.c
@@ -40,9 +40,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 #include "ffmpeg_decoder.h"
 
diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c
index 482ae396e..aced7f5bb 100644
--- a/src/libffmpeg/ff_dvaudio_decoder.c
+++ b/src/libffmpeg/ff_dvaudio_decoder.c
@@ -36,9 +36,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 
 #ifdef _MSC_VER
 /* ffmpeg has own definitions of those types */
diff --git a/src/libffmpeg/ff_mpeg_parser.h b/src/libffmpeg/ff_mpeg_parser.h
index ea43a6ce4..504e746f9 100644
--- a/src/libffmpeg/ff_mpeg_parser.h
+++ b/src/libffmpeg/ff_mpeg_parser.h
@@ -23,7 +23,7 @@
 #ifndef HAVE_MPEG_PARSER_H
 #define HAVE_MPEG_PARSER_H
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "ffmpeg_decoder.h"
 
 #define BUFFER_SIZE (1194 * 1024) /* libmpeg2's buffer size */
diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c
index 0b8728f06..4e5e1ebdf 100644
--- a/src/libffmpeg/ff_video_decoder.c
+++ b/src/libffmpeg/ff_video_decoder.c
@@ -40,10 +40,10 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "bswap.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "ffmpeg_decoder.h"
 #include "ff_mpeg_parser.h"
 
diff --git a/src/libffmpeg/ffmpeg_decoder.c b/src/libffmpeg/ffmpeg_decoder.c
index 45080590d..8a8a79270 100644
--- a/src/libffmpeg/ffmpeg_decoder.c
+++ b/src/libffmpeg/ffmpeg_decoder.c
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 #include "ffmpeg_decoder.h"
 
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;
diff --git a/src/libmpeg2new/libmpeg2/idct_alpha.c b/src/libmpeg2new/libmpeg2/idct_alpha.c
index 8f9beaf22..1d8fd08ee 100644
--- a/src/libmpeg2new/libmpeg2/idct_alpha.c
+++ b/src/libmpeg2new/libmpeg2/idct_alpha.c
@@ -30,7 +30,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 #include "alpha_asm.h"
 
diff --git a/src/libmpeg2new/libmpeg2/idct_altivec.c b/src/libmpeg2new/libmpeg2/idct_altivec.c
index 6b1b8586c..f15bca165 100644
--- a/src/libmpeg2new/libmpeg2/idct_altivec.c
+++ b/src/libmpeg2new/libmpeg2/idct_altivec.c
@@ -31,7 +31,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 
 typedef vector signed char vector_s8_t;
diff --git a/src/libmpeg2new/libmpeg2/motion_comp_alpha.c b/src/libmpeg2new/libmpeg2/motion_comp_alpha.c
index 05cd55084..1b3712a1a 100644
--- a/src/libmpeg2new/libmpeg2/motion_comp_alpha.c
+++ b/src/libmpeg2new/libmpeg2/motion_comp_alpha.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 #include "alpha_asm.h"
 
diff --git a/src/libmpeg2new/libmpeg2/motion_comp_altivec.c b/src/libmpeg2new/libmpeg2/motion_comp_altivec.c
index 4356aa6e7..ee740e14e 100644
--- a/src/libmpeg2new/libmpeg2/motion_comp_altivec.c
+++ b/src/libmpeg2new/libmpeg2/motion_comp_altivec.c
@@ -31,7 +31,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 
 typedef vector signed char vector_s8_t;
diff --git a/src/libmpeg2new/libmpeg2/motion_comp_vis.c b/src/libmpeg2new/libmpeg2/motion_comp_vis.c
index 54c0f7e75..e724d28a2 100644
--- a/src/libmpeg2new/libmpeg2/motion_comp_vis.c
+++ b/src/libmpeg2new/libmpeg2/motion_comp_vis.c
@@ -27,7 +27,7 @@
 #include <inttypes.h>
 
 #include "mpeg2.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mpeg2_internal.h"
 #include "vis.h"
 
diff --git a/src/libmpeg2new/libmpeg2/rgb.c b/src/libmpeg2new/libmpeg2/rgb.c
index 8863b0b9f..e4abcacc2 100644
--- a/src/libmpeg2new/libmpeg2/rgb.c
+++ b/src/libmpeg2new/libmpeg2/rgb.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 
 #include <inttypes.h>
 
diff --git a/src/libmpeg2new/libmpeg2/rgb_mmx.c b/src/libmpeg2new/libmpeg2/rgb_mmx.c
index 912291c6a..6ca7e65a8 100644
--- a/src/libmpeg2new/libmpeg2/rgb_mmx.c
+++ b/src/libmpeg2new/libmpeg2/rgb_mmx.c
@@ -34,7 +34,7 @@
 #include "mpeg2.h"
 #include "mpeg2convert.h"
 #include "convert_internal.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "mmx.h"
 
 #define CPU_MMXEXT 0
diff --git a/src/libmpeg2new/libmpeg2/rgb_vis.c b/src/libmpeg2new/libmpeg2/rgb_vis.c
index 49d8d1d7c..cbd7c7072 100644
--- a/src/libmpeg2new/libmpeg2/rgb_vis.c
+++ b/src/libmpeg2new/libmpeg2/rgb_vis.c
@@ -30,7 +30,7 @@
 #include "mpeg2.h"
 #include "mpeg2convert.h"
 #include "convert_internal.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 #include "vis.h"
 
 /* Based partially upon the MMX yuv2rgb code, see there for credits.
diff --git a/src/libmpeg2new/xine_mpeg2new_decoder.c b/src/libmpeg2new/xine_mpeg2new_decoder.c
index 386b0049d..eeafee9c1 100644
--- a/src/libmpeg2new/xine_mpeg2new_decoder.c
+++ b/src/libmpeg2new/xine_mpeg2new_decoder.c
@@ -31,9 +31,9 @@
 #include <assert.h>
 
 #include "./include/mpeg2.h"
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
 
 
 
diff --git a/src/libreal/real_common.h b/src/libreal/real_common.h
index 1e3d8c264..74dc5e6e2 100644
--- a/src/libreal/real_common.h
+++ b/src/libreal/real_common.h
@@ -23,7 +23,7 @@
 #ifndef __REAL_COMMON_H__
 #define __REAL_COMMON_H__
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 /*
  * some fake functions to make real codecs happy 
diff --git a/src/libreal/xine_real_audio_decoder.c b/src/libreal/xine_real_audio_decoder.c
index 5c43f8480..bc928975d 100644
--- a/src/libreal/xine_real_audio_decoder.c
+++ b/src/libreal/xine_real_audio_decoder.c
@@ -38,10 +38,10 @@
 */
 
 #include "bswap.h"
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 
 #include "real_common.h"
 
diff --git a/src/libreal/xine_real_video_decoder.c b/src/libreal/xine_real_video_decoder.c
index 617c9f6b5..a32b3d3ef 100644
--- a/src/libreal/xine_real_video_decoder.c
+++ b/src/libreal/xine_real_video_decoder.c
@@ -37,10 +37,10 @@
 #define LOG
 */
 #include "bswap.h"
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 
 #include "real_common.h"
 
diff --git a/src/libspucc/cc_decoder.c b/src/libspucc/cc_decoder.c
index 8d666e847..e8fc09895 100644
--- a/src/libspucc/cc_decoder.c
+++ b/src/libspucc/cc_decoder.c
@@ -35,12 +35,12 @@
 
 #include <inttypes.h>
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "xineutils.h"
-#include "osd.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/xineutils.h>
+#include <xine/osd.h>
 #include "cc_decoder.h"
-#include "osd.h"
+#include <xine/osd.h>
 
 /*
 #define LOG_DEBUG 3
diff --git a/src/libspucc/xine_cc_decoder.c b/src/libspucc/xine_cc_decoder.c
index 1e31b6d4a..e8a02a996 100644
--- a/src/libspucc/xine_cc_decoder.c
+++ b/src/libspucc/xine_cc_decoder.c
@@ -24,9 +24,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "buffer.h"
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/buffer.h>
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include "cc_decoder.h"
 
 /*
diff --git a/src/libspucmml/xine_cmml_decoder.c b/src/libspucmml/xine_cmml_decoder.c
index 6c045ee04..6ce6d3f90 100644
--- a/src/libspucmml/xine_cmml_decoder.c
+++ b/src/libspucmml/xine_cmml_decoder.c
@@ -30,7 +30,7 @@
 #define SUB_BUFSIZE 1024
 #define SUB_MAX_TEXT  5
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 typedef enum {
   SUBTITLE_SIZE_SMALL = 0,
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
diff --git a/src/libspudvb/xine_spudvb_decoder.c b/src/libspudvb/xine_spudvb_decoder.c
index 59790227c..9008260f7 100644
--- a/src/libspudvb/xine_spudvb_decoder.c
+++ b/src/libspudvb/xine_spudvb_decoder.c
@@ -27,9 +27,9 @@
 
 #include "pthread.h"
 #include <errno.h>
-#include "xine_internal.h"
-#include "spu.h"
-#include "osd.h"
+#include <xine/xine_internal.h>
+#include <xine/spu.h>
+#include <xine/osd.h>
 #define MAX_REGIONS 7
 
 /*#define LOG 1*/
diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c
index 811bdcbd6..270894f50 100644
--- a/src/libsputext/demux_sputext.c
+++ b/src/libsputext/demux_sputext.c
@@ -47,9 +47,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "../demuxers/demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
 
 #define ERR           (void *)-1
 #define SUB_MAX_TEXT  5
diff --git a/src/libsputext/xine_sputext_decoder.c b/src/libsputext/xine_sputext_decoder.c
index d28e67829..12d1986bb 100644
--- a/src/libsputext/xine_sputext_decoder.c
+++ b/src/libsputext/xine_sputext_decoder.c
@@ -33,10 +33,10 @@
 #define LOG
 */
 
-#include "buffer.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "osd.h"
+#include <xine/buffer.h>
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/osd.h>
 
 #define SUB_MAX_TEXT  5      /* lines */
 #define SUB_BUFSIZE   256    /* chars per line */
diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c
index ca358bb9b..64e30d637 100644
--- a/src/libw32dll/qt_decoder.c
+++ b/src/libw32dll/qt_decoder.c
@@ -38,9 +38,9 @@
 */
 
 #include "bswap.h"
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
 
 #include "qtx/qtxsdk/components.h"
 #include "wine/win32.h"
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 3b66dfb23..bcb5db53c 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -50,11 +50,11 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "audio_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 
 #include "common.c"
 
diff --git a/src/libw32dll/wine/debugtools.h b/src/libw32dll/wine/debugtools.h
index 3b342e10c..c6fac518d 100644
--- a/src/libw32dll/wine/debugtools.h
+++ b/src/libw32dll/wine/debugtools.h
@@ -8,7 +8,7 @@
 #include "config.h"
 #include "windef.h"
 
-#include "compat.h"
+#include <xine/compat.h>
 
 struct _GUID;
 
diff --git a/src/libw32dll/wine/ext.h b/src/libw32dll/wine/ext.h
index f0f505c4d..ad22edc5e 100644
--- a/src/libw32dll/wine/ext.h
+++ b/src/libw32dll/wine/ext.h
@@ -2,7 +2,7 @@
 #define loader_ext_h
 
 #include "windef.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 
 extern LPVOID FILE_dommap( int unix_handle, LPVOID start,
 			   DWORD size_high, DWORD size_low,
diff --git a/src/libw32dll/wine/registry.c b/src/libw32dll/wine/registry.c
index c8e3c4dd0..20c21888d 100644
--- a/src/libw32dll/wine/registry.c
+++ b/src/libw32dll/wine/registry.c
@@ -18,7 +18,7 @@
 #include "debugtools.h"
 
 #ifdef XINE_MAJOR
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #include <basedir.h>
 #endif
 
diff --git a/src/libw32dll/wine/win32.c b/src/libw32dll/wine/win32.c
index 3b0941391..ce8132d3f 100644
--- a/src/libw32dll/wine/win32.c
+++ b/src/libw32dll/wine/win32.c
@@ -12,7 +12,7 @@ for DLL to know too much about its environment.
 ************************************************************/
 
 #include "config.h"
-#include "attributes.h"
+#include <xine/attributes.h>
 
 #define QTX
 
diff --git a/src/libxineadec/fooaudio.c b/src/libxineadec/fooaudio.c
index 42427611f..b0ef63454 100644
--- a/src/libxineadec/fooaudio.c
+++ b/src/libxineadec/fooaudio.c
@@ -28,10 +28,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 /* math.h required for fooaudio sine wave generation */
diff --git a/src/libxineadec/gsm610.c b/src/libxineadec/gsm610.c
index 4ca3827d7..8192aa7d8 100644
--- a/src/libxineadec/gsm610.c
+++ b/src/libxineadec/gsm610.c
@@ -52,10 +52,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 #include "private.h"
diff --git a/src/libxineadec/xine_a52_decoder.c b/src/libxineadec/xine_a52_decoder.c
index 2d901d00a..e34504553 100644
--- a/src/libxineadec/xine_a52_decoder.c
+++ b/src/libxineadec/xine_a52_decoder.c
@@ -44,8 +44,8 @@
 #define LOG_PTS
 */
 
-#include "xine_internal.h"
-#include "audio_out.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
 
 #ifdef HAVE_A52DEC_A52_H
 # include <a52dec/a52.h>
@@ -59,8 +59,8 @@
 # include "a52_internal.h"
 #endif
 
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 
 #include "../../contrib/a52dec/crc.c"
 
diff --git a/src/libxineadec/xine_dts_decoder.c b/src/libxineadec/xine_dts_decoder.c
index 369c354fd..9d2fc5e93 100644
--- a/src/libxineadec/xine_dts_decoder.c
+++ b/src/libxineadec/xine_dts_decoder.c
@@ -47,10 +47,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "audio_out.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
 
 #include "bswap.h"
 
diff --git a/src/libxineadec/xine_faad_decoder.c b/src/libxineadec/xine_faad_decoder.c
index c12e7816d..6b242005a 100644
--- a/src/libxineadec/xine_faad_decoder.c
+++ b/src/libxineadec/xine_faad_decoder.c
@@ -31,10 +31,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #ifdef HAVE_NEAACDEC_H
 #include <neaacdec.h>
 #else
diff --git a/src/libxineadec/xine_lpcm_decoder.c b/src/libxineadec/xine_lpcm_decoder.c
index 96c02906d..51d2e3137 100644
--- a/src/libxineadec/xine_lpcm_decoder.c
+++ b/src/libxineadec/xine_lpcm_decoder.c
@@ -39,9 +39,9 @@
 #include <fcntl.h>
 #include <netinet/in.h> /* ntohs */
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
 
 #ifdef WIN32
 #include <winsock.h>
diff --git a/src/libxineadec/xine_mad_decoder.c b/src/libxineadec/xine_mad_decoder.c
index 906db048a..21e5bf46b 100644
--- a/src/libxineadec/xine_mad_decoder.c
+++ b/src/libxineadec/xine_mad_decoder.c
@@ -34,10 +34,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 
 #ifdef HAVE_MAD_H
 # include <mad.h>
diff --git a/src/libxineadec/xine_musepack_decoder.c b/src/libxineadec/xine_musepack_decoder.c
index d23d1546c..268846a1a 100644
--- a/src/libxineadec/xine_musepack_decoder.c
+++ b/src/libxineadec/xine_musepack_decoder.c
@@ -39,10 +39,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 
 #include <mpcdec/mpcdec.h>
 
diff --git a/src/libxinevdec/bitplane.c b/src/libxinevdec/bitplane.c
index c8400f464..327e14aee 100644
--- a/src/libxinevdec/bitplane.c
+++ b/src/libxinevdec/bitplane.c
@@ -35,10 +35,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 #include "demuxers/iff.h"
diff --git a/src/libxinevdec/foovideo.c b/src/libxinevdec/foovideo.c
index b33705a3f..49c63422c 100644
--- a/src/libxinevdec/foovideo.c
+++ b/src/libxinevdec/foovideo.c
@@ -30,10 +30,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 #define VIDEOBUFSIZE 128*1024
diff --git a/src/libxinevdec/gdkpixbuf.c b/src/libxinevdec/gdkpixbuf.c
index 7fd4a6a0e..28c9c77c7 100644
--- a/src/libxinevdec/gdkpixbuf.c
+++ b/src/libxinevdec/gdkpixbuf.c
@@ -35,10 +35,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/src/libxinevdec/image.c b/src/libxinevdec/image.c
index 7a97972c7..e84312624 100644
--- a/src/libxinevdec/image.c
+++ b/src/libxinevdec/image.c
@@ -44,10 +44,10 @@
 #undef PACKAGE_VERSION
 #endif
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 typedef struct {
diff --git a/src/libxinevdec/rgb.c b/src/libxinevdec/rgb.c
index 5360fd8b2..9c8409e5f 100644
--- a/src/libxinevdec/rgb.c
+++ b/src/libxinevdec/rgb.c
@@ -42,10 +42,10 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 typedef struct {
diff --git a/src/libxinevdec/yuv.c b/src/libxinevdec/yuv.c
index 352f59e9a..c1e5825c5 100644
--- a/src/libxinevdec/yuv.c
+++ b/src/libxinevdec/yuv.c
@@ -28,10 +28,10 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 #include "bswap.h"
 
 #define VIDEOBUFSIZE 128*1024
diff --git a/src/post/audio/audio_filters.c b/src/post/audio/audio_filters.c
index 8200db51b..b7f53499a 100644
--- a/src/post/audio/audio_filters.c
+++ b/src/post/audio/audio_filters.c
@@ -21,9 +21,9 @@
  */
 
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 
 #include "audio_filters.h"
 
diff --git a/src/post/audio/audio_filters.h b/src/post/audio/audio_filters.h
index 6c064945a..8a0202751 100644
--- a/src/post/audio/audio_filters.h
+++ b/src/post/audio/audio_filters.h
@@ -20,7 +20,7 @@
  * catalog for audio filter plugins
  */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 
 void *upmix_init_plugin(xine_t *xine, void *data);
diff --git a/src/post/audio/stretch.c b/src/post/audio/stretch.c
index f02b1b899..bc079fd8d 100644
--- a/src/post/audio/stretch.c
+++ b/src/post/audio/stretch.c
@@ -22,11 +22,11 @@
 
 #include <stdio.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 #include "dsp.h"
-#include "resample.h"
+#include <xine/resample.h>
 
 #include "audio_filters.h"
 
diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c
index 4d0e2c2a2..30fbb452b 100644
--- a/src/post/audio/upmix.c
+++ b/src/post/audio/upmix.c
@@ -26,9 +26,9 @@
 
 #include <stdio.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 #include "dsp.h"
 
 #include "audio_filters.h"
diff --git a/src/post/audio/upmix_mono.c b/src/post/audio/upmix_mono.c
index b28b1f3f5..53fd23109 100644
--- a/src/post/audio/upmix_mono.c
+++ b/src/post/audio/upmix_mono.c
@@ -31,8 +31,8 @@
 #define LOG
 */
 
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xineutils.h>
+#include <xine/post.h>
 
 #include "audio_filters.h"
 
diff --git a/src/post/audio/volnorm.c b/src/post/audio/volnorm.c
index 7533ba94a..4fb2a0411 100644
--- a/src/post/audio/volnorm.c
+++ b/src/post/audio/volnorm.c
@@ -25,9 +25,9 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 #include "dsp.h"
 
 #include "audio_filters.h"
diff --git a/src/post/deinterlace/deinterlace.c b/src/post/deinterlace/deinterlace.c
index 8e4a3bb00..5c0356c55 100644
--- a/src/post/deinterlace/deinterlace.c
+++ b/src/post/deinterlace/deinterlace.c
@@ -31,7 +31,7 @@
 */
 
 #include "deinterlace.h"
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 typedef struct methodlist_item_s methodlist_item_t;
 
diff --git a/src/post/deinterlace/plugins/greedy.c b/src/post/deinterlace/plugins/greedy.c
index b5fcad3e5..fc8013a6d 100644
--- a/src/post/deinterlace/plugins/greedy.c
+++ b/src/post/deinterlace/plugins/greedy.c
@@ -32,8 +32,8 @@
 #include <stdint.h>
 #endif
 
-#include "attributes.h"
-#include "xineutils.h"
+#include <xine/attributes.h>
+#include <xine/xineutils.h>
 #include "deinterlace.h"
 #include "speedtools.h"
 #include "speedy.h"
diff --git a/src/post/deinterlace/plugins/greedy2frame.c b/src/post/deinterlace/plugins/greedy2frame.c
index 57e3228ac..af27d76ee 100644
--- a/src/post/deinterlace/plugins/greedy2frame.c
+++ b/src/post/deinterlace/plugins/greedy2frame.c
@@ -31,8 +31,8 @@
 #include <stdint.h>
 #endif
 
-#include "attributes.h"
-#include "xineutils.h"
+#include <xine/attributes.h>
+#include <xine/xineutils.h>
 #include "deinterlace.h"
 #include "speedtools.h"
 #include "speedy.h"
diff --git a/src/post/deinterlace/plugins/kdetv_greedyh.c b/src/post/deinterlace/plugins/kdetv_greedyh.c
index 5ec48e4a2..2207772ca 100644
--- a/src/post/deinterlace/plugins/kdetv_greedyh.c
+++ b/src/post/deinterlace/plugins/kdetv_greedyh.c
@@ -31,8 +31,8 @@
 #include <stdint.h>
 #endif
 
-#include "attributes.h"
-#include "xineutils.h"
+#include <xine/attributes.h>
+#include <xine/xineutils.h>
 #include "deinterlace.h"
 #include "speedtools.h"
 #include "speedy.h"
diff --git a/src/post/deinterlace/plugins/kdetv_tomsmocomp.c b/src/post/deinterlace/plugins/kdetv_tomsmocomp.c
index ae0fa0363..0f87b913f 100644
--- a/src/post/deinterlace/plugins/kdetv_tomsmocomp.c
+++ b/src/post/deinterlace/plugins/kdetv_tomsmocomp.c
@@ -31,8 +31,8 @@
 #include <stdint.h>
 #endif
 
-#include "attributes.h"
-#include "xineutils.h"
+#include <xine/attributes.h>
+#include <xine/xineutils.h>
 #include "deinterlace.h"
 #include "speedtools.h"
 #include "speedy.h"
diff --git a/src/post/deinterlace/plugins/linearblend.c b/src/post/deinterlace/plugins/linearblend.c
index 96e56063f..4664a4969 100644
--- a/src/post/deinterlace/plugins/linearblend.c
+++ b/src/post/deinterlace/plugins/linearblend.c
@@ -31,8 +31,8 @@
 #include <stdint.h>
 #endif
 
-#include "attributes.h"
-#include "xineutils.h"
+#include <xine/attributes.h>
+#include <xine/xineutils.h>
 #include "speedtools.h"
 #include "speedy.h"
 #include "deinterlace.h"
diff --git a/src/post/deinterlace/plugins/vfir.c b/src/post/deinterlace/plugins/vfir.c
index e66d7c789..d66c92952 100644
--- a/src/post/deinterlace/plugins/vfir.c
+++ b/src/post/deinterlace/plugins/vfir.c
@@ -34,8 +34,8 @@
 #include <stdint.h>
 #endif
 
-#include "attributes.h"
-#include "xineutils.h"
+#include <xine/attributes.h>
+#include <xine/xineutils.h>
 #include "speedy.h"
 #include "deinterlace.h"
 #include "plugins.h"
diff --git a/src/post/deinterlace/speedy.c b/src/post/deinterlace/speedy.c
index a980780d7..d93b56c7b 100644
--- a/src/post/deinterlace/speedy.c
+++ b/src/post/deinterlace/speedy.c
@@ -62,8 +62,8 @@
 #include <stdint.h>
 #endif
 
-#include "attributes.h"
-#include "xineutils.h"
+#include <xine/attributes.h>
+#include <xine/xineutils.h>
 #include "speedtools.h"
 #include "speedy.h"
 
diff --git a/src/post/deinterlace/xine_plugin.c b/src/post/deinterlace/xine_plugin.c
index 6ae2bd96d..4a7028b20 100644
--- a/src/post/deinterlace/xine_plugin.c
+++ b/src/post/deinterlace/xine_plugin.c
@@ -27,10 +27,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
-#include "xine_buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
+#include <xine/xine_buffer.h>
 #include <pthread.h>
 
 #include "tvtime.h"
diff --git a/src/post/goom/goom_core.c b/src/post/goom/goom_core.c
index b24f2f496..274059da4 100644
--- a/src/post/goom/goom_core.c
+++ b/src/post/goom/goom_core.c
@@ -26,7 +26,7 @@
 #include "goom_fx.h"
 #include "goomsl.h"
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 /* #define VERBOSE */
 
diff --git a/src/post/goom/mmx.h b/src/post/goom/mmx.h
index 88789e86f..6861b7cfe 100644
--- a/src/post/goom/mmx.h
+++ b/src/post/goom/mmx.h
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include "attributes.h"
+#include <xine/attributes.h>
 
 #include "goom_graphic.h"
 
diff --git a/src/post/goom/xine_goom.c b/src/post/goom/xine_goom.c
index 0b540694d..50e72472b 100644
--- a/src/post/goom/xine_goom.c
+++ b/src/post/goom/xine_goom.c
@@ -35,9 +35,9 @@
 */
 
 #include "config.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 
 #include "goom.h"
 
diff --git a/src/post/mosaico/mosaico.c b/src/post/mosaico/mosaico.c
index 5683002f6..a3e846026 100644
--- a/src/post/mosaico/mosaico.c
+++ b/src/post/mosaico/mosaico.c
@@ -28,8 +28,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 /* FIXME: This plugin needs to handle overlays as well. */
 
diff --git a/src/post/mosaico/switch.c b/src/post/mosaico/switch.c
index 23469e566..de963c7b3 100644
--- a/src/post/mosaico/switch.c
+++ b/src/post/mosaico/switch.c
@@ -28,8 +28,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 /* FIXME: This plugin needs to handle overlays as well. */
 
diff --git a/src/post/planar/boxblur.c b/src/post/planar/boxblur.c
index 225e75954..988729af0 100644
--- a/src/post/planar/boxblur.c
+++ b/src/post/planar/boxblur.c
@@ -21,9 +21,9 @@
  * Copyright (C) 2002 Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <pthread.h>
 
 /* plugin class initialization function */
diff --git a/src/post/planar/denoise3d.c b/src/post/planar/denoise3d.c
index fb7021ece..bec59b35f 100644
--- a/src/post/planar/denoise3d.c
+++ b/src/post/planar/denoise3d.c
@@ -21,9 +21,9 @@
  * Copyright (C) 2003 Daniel Moreno <comac@comac.darktech.org>
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <math.h>
 #include <pthread.h>
 
diff --git a/src/post/planar/eq.c b/src/post/planar/eq.c
index 03f647d68..e62a808c1 100644
--- a/src/post/planar/eq.c
+++ b/src/post/planar/eq.c
@@ -21,9 +21,9 @@
  * Copyright (C) Richard Felker
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <pthread.h>
 
 
diff --git a/src/post/planar/eq2.c b/src/post/planar/eq2.c
index ceb9f9024..42f4580d9 100644
--- a/src/post/planar/eq2.c
+++ b/src/post/planar/eq2.c
@@ -25,9 +25,9 @@
  * Richard Felker (original MMX contrast/brightness code (vf_eq.c))
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <math.h>
 #include <pthread.h>
 
diff --git a/src/post/planar/expand.c b/src/post/planar/expand.c
index db62a5512..90547163f 100644
--- a/src/post/planar/expand.c
+++ b/src/post/planar/expand.c
@@ -27,8 +27,8 @@
  *
  */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 /* The expand trick explained:
  *
diff --git a/src/post/planar/fill.c b/src/post/planar/fill.c
index 62fdc1381..6dd5ce23b 100644
--- a/src/post/planar/fill.c
+++ b/src/post/planar/fill.c
@@ -22,8 +22,8 @@
  * based on invert.c
  */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 /* plugin class initialization function */
 void *fill_init_plugin(xine_t *xine, void *);
diff --git a/src/post/planar/invert.c b/src/post/planar/invert.c
index b5ee1e3f2..8c1b6103a 100644
--- a/src/post/planar/invert.c
+++ b/src/post/planar/invert.c
@@ -22,8 +22,8 @@
  * simple video inverter plugin
  */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 
 /* plugin class initialization function */
diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c
index 4ca3d62dc..efc3e49f8 100644
--- a/src/post/planar/noise.c
+++ b/src/post/planar/noise.c
@@ -21,9 +21,9 @@
  * is copyright 2002 Michael Niedermayer <michaelni@gmx.at>
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <math.h>
 #include <pthread.h>
 
diff --git a/src/post/planar/planar.c b/src/post/planar/planar.c
index 5907d58e5..220fce68e 100644
--- a/src/post/planar/planar.c
+++ b/src/post/planar/planar.c
@@ -20,9 +20,9 @@
  * catalog for planar post plugins
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 
 extern void *invert_init_plugin(xine_t *xine, void *);
 static const post_info_t invert_special_info = { XINE_POST_TYPE_VIDEO_FILTER };
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index 1213c82df..f8c571dcb 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -22,9 +22,9 @@
 
 #include <config.h>
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include "postprocess.h"
 #include <pthread.h>
 
diff --git a/src/post/planar/unsharp.c b/src/post/planar/unsharp.c
index ff86f21bc..591f32a7b 100644
--- a/src/post/planar/unsharp.c
+++ b/src/post/planar/unsharp.c
@@ -21,9 +21,9 @@
  * Copyright (C) 2002 Rémi Guyomarch <rguyom@pobox.com>
  */
 
-#include "xine_internal.h"
-#include "post.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
+#include <xine/xineutils.h>
 #include <pthread.h>
 
 #ifndef MIN
diff --git a/src/post/visualizations/fftgraph.c b/src/post/visualizations/fftgraph.c
index 7e7f52fbf..c31c529f2 100644
--- a/src/post/visualizations/fftgraph.c
+++ b/src/post/visualizations/fftgraph.c
@@ -26,9 +26,9 @@
 
 #include <assert.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 #include "bswap.h"
 #include "visualizations.h"
 #include "fft.h"
diff --git a/src/post/visualizations/fftscope.c b/src/post/visualizations/fftscope.c
index 917af508d..dd474bd6f 100644
--- a/src/post/visualizations/fftscope.c
+++ b/src/post/visualizations/fftscope.c
@@ -26,9 +26,9 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 #include "bswap.h"
 #include "visualizations.h"
 #include "fft.h"
diff --git a/src/post/visualizations/fooviz.c b/src/post/visualizations/fooviz.c
index 78803f8d2..54cd65db4 100644
--- a/src/post/visualizations/fooviz.c
+++ b/src/post/visualizations/fooviz.c
@@ -26,9 +26,9 @@
 
 #include <stdio.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 
 #define FPS 20
 
diff --git a/src/post/visualizations/oscope.c b/src/post/visualizations/oscope.c
index 86b8b2750..1d498980a 100644
--- a/src/post/visualizations/oscope.c
+++ b/src/post/visualizations/oscope.c
@@ -23,9 +23,9 @@
 
 #include <stdio.h>
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/post.h>
 #include "visualizations.h"
 
 #define FPS 20
diff --git a/src/post/visualizations/visualizations.c b/src/post/visualizations/visualizations.c
index a26f0bd5b..db111bdd8 100644
--- a/src/post/visualizations/visualizations.c
+++ b/src/post/visualizations/visualizations.c
@@ -24,8 +24,8 @@
 #include "config.h"
 #endif
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 
 #include "visualizations.h"
 
diff --git a/src/post/visualizations/visualizations.h b/src/post/visualizations/visualizations.h
index 39d02e1cb..c72a1ad77 100644
--- a/src/post/visualizations/visualizations.h
+++ b/src/post/visualizations/visualizations.h
@@ -20,7 +20,7 @@
  * This file contains plugin entries for several visualization post plugins.
  */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 void *oscope_init_plugin(xine_t *xine, void *data);
 void *fftscope_init_plugin(xine_t *xine, void *data);
diff --git a/src/vdr/Makefile.am b/src/vdr/Makefile.am
index fcdf6cae4..e4912176a 100644
--- a/src/vdr/Makefile.am
+++ b/src/vdr/Makefile.am
@@ -3,8 +3,6 @@ include $(top_srcdir)/misc/Makefile.common
 AM_CFLAGS  = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
 AM_LDFLAGS = $(xineplug_ldflags)
 
-xineinclude_HEADERS = input_vdr.h
-
 if ENABLE_DVB
 xineplug_LTLIBRARIES = xineplug_inp_vdr.la
 xinepost_LTLIBRARIES = xineplug_post_vdr.la
diff --git a/src/vdr/input_vdr.c b/src/vdr/input_vdr.c
index 946e963a3..545e3fcc2 100644
--- a/src/vdr/input_vdr.c
+++ b/src/vdr/input_vdr.c
@@ -41,9 +41,9 @@
 /*
 #define LOG
 */
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "input_plugin.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/input_plugin.h>
 
 #include "input_vdr.h"
 #include "post_vdr.h"
diff --git a/src/vdr/post_vdr.c b/src/vdr/post_vdr.c
index a9b7cbc37..77b8b56fc 100644
--- a/src/vdr/post_vdr.c
+++ b/src/vdr/post_vdr.c
@@ -22,8 +22,8 @@
  * plugins for VDR
  */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 #include "post_vdr.h"
 
 
diff --git a/src/vdr/post_vdr_audio.c b/src/vdr/post_vdr_audio.c
index 96fa84fb5..79015ec21 100644
--- a/src/vdr/post_vdr_audio.c
+++ b/src/vdr/post_vdr_audio.c
@@ -28,8 +28,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 #include "post_vdr.h"
 
 
diff --git a/src/vdr/post_vdr_video.c b/src/vdr/post_vdr_video.c
index ed0eafc35..8e66c8eb5 100644
--- a/src/vdr/post_vdr_video.c
+++ b/src/vdr/post_vdr_video.c
@@ -28,8 +28,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/post.h>
 #include "post_vdr.h"
 
 
diff --git a/src/video_out/macosx/XineOpenGLView.m b/src/video_out/macosx/XineOpenGLView.m
index a9ffee00f..5ed515704 100644
--- a/src/video_out/macosx/XineOpenGLView.m
+++ b/src/video_out/macosx/XineOpenGLView.m
@@ -30,11 +30,7 @@
 
 #import "XineOpenGLView.h"
 
-#ifdef XINE_COMPILE
-#  include "xineutils.h"
-#else
-#  include <xine/xineutils.h>
-#endif
+#include <xine/xineutils.h>
 
 NSString *XineViewDidResizeNotification EXPORTED = @"XineViewDidResizeNotification";
 
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index bcbe2477e..ff9abd320 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -38,9 +38,9 @@
 #include <aalib.h>
 
 #include "xine.h"
-#include "video_out.h"
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 
 /*
  * global variables
diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c
index 231befcdb..6b9f3756e 100644
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -38,10 +38,10 @@
 #include <caca.h>
 
 #include "xine.h"
-#include "video_out.h"
-#include "xine_internal.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
 #include "yuv2rgb.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 /*
  * structures
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c
index 3445be127..39a7917ba 100644
--- a/src/video_out/video_out_directfb.c
+++ b/src/video_out/video_out_directfb.c
@@ -39,10 +39,10 @@
 #define LOG_VERBOSE
 
 #include "xine.h"
-#include "xine_internal.h"
-#include "video_out.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 
 #ifdef DIRECTFB_X11
 # include "x11osd.h"
diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
index b70709856..c2b3aa101 100644
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -35,10 +35,10 @@ typedef unsigned char boolean;
 */
 
 #include "xine.h"
-#include "video_out.h"
-#include "xine_internal.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "yuv2rgb.h"
 
 #define NEW_YUV 1
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 859959455..4914548a1 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -55,7 +55,7 @@
 #include <fcntl.h> 
              
 #include "xine.h"
-#include "video_out.h"
+#include <xine/video_out.h>
 
 #include <errno.h>
 
@@ -78,10 +78,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "yuv2rgb.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 
 typedef struct fb_frame_s
 {
diff --git a/src/video_out/video_out_none.c b/src/video_out/video_out_none.c
index c28b0334e..c23c828a6 100644
--- a/src/video_out/video_out_none.c
+++ b/src/video_out/video_out_none.c
@@ -33,10 +33,10 @@
 
 #include "xine.h"
 
-#include "video_out.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 
 typedef struct {
   vo_frame_t           vo_frame;
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 04413eb80..466aeda27 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -88,11 +88,11 @@
 #endif
 
 #include "xine.h"
-#include "video_out.h"
+#include <xine/video_out.h>
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "yuv2rgb.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #include "x11osd.h"
 
 
diff --git a/src/video_out/video_out_pgx32.c b/src/video_out/video_out_pgx32.c
index 505a257ce..884f9939f 100644
--- a/src/video_out/video_out_pgx32.c
+++ b/src/video_out/video_out_pgx32.c
@@ -41,10 +41,10 @@
 #include <X11/Xatom.h>
 #include <dga/dga.h>
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "bswap.h"
-#include "vo_scale.h"
-#include "xineutils.h"
+#include <xine/vo_scale.h>
+#include <xine/xineutils.h>
 
 /* gfxp register defines */
 
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index 21dcdfb09..d0e74b1e3 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -43,10 +43,10 @@
 #include <X11/Xatom.h>
 #include <dga/dga.h>
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "bswap.h"
-#include "vo_scale.h"
-#include "xineutils.h"
+#include <xine/vo_scale.h>
+#include <xine/xineutils.h>
 
 /*
  * The maximum number of frames that can be used in multi-buffering
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index 6ee6b19bd..5866f822f 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -59,10 +59,10 @@
 */
 
 #include "xine.h"
-#include "xine_internal.h"
-#include "video_out.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 
 #ifdef HAVE_X11
 #include <X11/Xlib.h>
diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c
index 45e9900fd..ba4687b08 100644
--- a/src/video_out/video_out_stk.c
+++ b/src/video_out/video_out_stk.c
@@ -59,10 +59,10 @@
 */
 
 #include "xine.h"
-#include "xine_internal.h"
-#include "video_out.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 
 /* Extend the video frame class with stk private data */
 typedef struct stk_frame_s {
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 013695c46..e6c3ffdf6 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -52,10 +52,10 @@
 #include "video_out_syncfb.h"
 
 #include "xine.h"
-#include "video_out.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 
 /*#define DEBUG_OUTPUT*/
 
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index 3228bbdbb..251dac87e 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -57,10 +57,10 @@
 #define LOG
 */
 
-#include "video_out.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 
 #ifdef HAVE_X11
 #include "x11osd.h"
diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
index c6ad9e2f1..9e9df7a71 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -37,7 +37,7 @@
 #include <math.h>
 
 #include "xine.h"
-#include "video_out.h"
+#include <xine/video_out.h>
 
 #include <errno.h>
 
@@ -56,10 +56,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "yuv2rgb.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 #include "xcbosd.h"
 
 typedef struct {
diff --git a/src/video_out/video_out_xcbxv.c b/src/video_out/video_out_xcbxv.c
index 1b59f5691..dff973317 100644
--- a/src/video_out/video_out_xcbxv.c
+++ b/src/video_out/video_out_xcbxv.c
@@ -58,11 +58,11 @@
 */
 
 #include "xine.h"
-#include "video_out.h"
-#include "xine_internal.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
 /* #include "overlay.h" */
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 #include "xcbosd.h"
 
 typedef struct xv_driver_s xv_driver_t;
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index ddcdb677c..52468781a 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -35,7 +35,7 @@
 #include <math.h>
 
 #include "xine.h"
-#include "video_out.h"
+#include <xine/video_out.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -57,10 +57,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "yuv2rgb.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 #include "x11osd.h"
 
 #define LOCK_DISPLAY(this) {if(this->lock_display) this->lock_display(this->user_data); \
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index ab5410ac3..10e13ab3c 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -63,11 +63,11 @@
 */
 
 #include "xine.h"
-#include "video_out.h"
-#include "xine_internal.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
 /* #include "overlay.h" */
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 #include "x11osd.h"
 
 #define LOCK_DISPLAY(this) {if(this->lock_display) this->lock_display(this->user_data); \
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 2c913dc0e..91db684da 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -66,12 +66,12 @@
 */
 
 #include "xine.h"
-#include "video_out.h"
-#include "xine_internal.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
 #include "accel_xvmc.h"
 
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 
 /* #define LOG1 */
 /* #define DLOG */
diff --git a/src/video_out/x11osd.c b/src/video_out/x11osd.c
index e0cb6f1f6..450812f90 100644
--- a/src/video_out/x11osd.c
+++ b/src/video_out/x11osd.c
@@ -51,7 +51,7 @@
 #define LOG
 */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "x11osd.h"
 
 struct x11osd
diff --git a/src/video_out/x11osd.h b/src/video_out/x11osd.h
index fe0bf6208..0ffd6fba6 100644
--- a/src/video_out/x11osd.h
+++ b/src/video_out/x11osd.h
@@ -28,7 +28,7 @@
 #ifndef X11OSD_H
 #define X11OSD_H
 
-#include "vo_scale.h"
+#include <xine/vo_scale.h>
 
 typedef struct x11osd x11osd;
 enum x11osd_mode {X11OSD_SHAPED, X11OSD_COLORKEY};
diff --git a/src/video_out/xcbosd.c b/src/video_out/xcbosd.c
index 4bb2b60af..8bb96be1e 100644
--- a/src/video_out/xcbosd.c
+++ b/src/video_out/xcbosd.c
@@ -49,7 +49,7 @@
 #define LOG
 */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "xcbosd.h"
 
 struct xcbosd
diff --git a/src/video_out/xcbosd.h b/src/video_out/xcbosd.h
index 32af4965e..1d4fd1c3a 100644
--- a/src/video_out/xcbosd.h
+++ b/src/video_out/xcbosd.h
@@ -29,7 +29,7 @@
 #ifndef XCBOSD_H
 #define XCBOSD_H
 
-#include "vo_scale.h"
+#include <xine/vo_scale.h>
 
 typedef struct xcbosd xcbosd;
 enum xcbosd_mode {XCBOSD_SHAPED, XCBOSD_COLORKEY};
diff --git a/src/video_out/xxmc.h b/src/video_out/xxmc.h
index 84964af17..9aea10854 100644
--- a/src/video_out/xxmc.h
+++ b/src/video_out/xxmc.h
@@ -83,10 +83,10 @@
 */
 
 #include "xine.h"
-#include "video_out.h"
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/video_out.h>
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 #include "x11osd.h"
 #include "accel_xvmc.h"
 
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index 0ca6537a7..f1ad4dba8 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -39,7 +39,7 @@
 #define LOG
 */
 
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 static int prof_scale_line = -1;
 
diff --git a/src/video_out/yuv2rgb_mlib.c b/src/video_out/yuv2rgb_mlib.c
index 8635526ed..794ce437e 100644
--- a/src/video_out/yuv2rgb_mlib.c
+++ b/src/video_out/yuv2rgb_mlib.c
@@ -34,8 +34,8 @@
 #include <mlib_algebra.h>
 #include <mlib_video.h>
 
-#include "attributes.h"
-#include "xineutils.h"
+#include <xine/attributes.h>
+#include <xine/xineutils.h>
 #include "yuv2rgb.h"
 
 #define	MIN(a, b) (((a) < (b)) ? (a) : (b))
diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c
index 20a9b5a00..1835efe68 100644
--- a/src/video_out/yuv2rgb_mmx.c
+++ b/src/video_out/yuv2rgb_mmx.c
@@ -32,7 +32,7 @@
 #include <inttypes.h>
 
 #include "yuv2rgb.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #define CPU_MMXEXT 0
 #define CPU_MMX 1
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index b90bd0ee9..c509b62af 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -16,12 +16,6 @@ endif
 
 noinst_HEADERS = bswap.h ffmpeg_bswap.h
 
-xineinclude_HEADERS  = buffer.h metronom.h configfile.h vo_scale.h \
-	audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
-	video_overlay.h osd.h spu.h scratch.h xine_plugin.h xineintl.h \
-	plugin_catalog.h audio_decoder.h video_decoder.h post.h \
-	io_helper.h broadcaster.h info_helper.h refcounter.h alphablend.h
-
 lib_LTLIBRARIES = libxine.la
 
 libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
diff --git a/src/xine-engine/alphablend.c b/src/xine-engine/alphablend.c
index 4dffa09ad..c47257273 100644
--- a/src/xine-engine/alphablend.c
+++ b/src/xine-engine/alphablend.c
@@ -32,9 +32,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "alphablend.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/alphablend.h>
 #include "bswap.h"
 
 
diff --git a/src/xine-engine/audio_decoder.c b/src/xine-engine/audio_decoder.c
index 5476262d9..6a0688f0d 100644
--- a/src/xine-engine/audio_decoder.c
+++ b/src/xine-engine/audio_decoder.c
@@ -39,8 +39,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 
 static void *audio_decoder_loop (void *stream_gen) {
 
diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index aac1739aa..39e3cd1a4 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -89,11 +89,11 @@
 
 #define LOG_RESAMPLE_SYNC 0
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "audio_out.h"
-#include "resample.h"
-#include "metronom.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/audio_out.h>
+#include <xine/resample.h>
+#include <xine/metronom.h>
 
 
 #define NUM_AUDIO_BUFFERS       32
diff --git a/src/xine-engine/broadcaster.c b/src/xine-engine/broadcaster.c
index ce7494c1d..71d466c3a 100644
--- a/src/xine-engine/broadcaster.c
+++ b/src/xine-engine/broadcaster.c
@@ -57,9 +57,9 @@
 #include <dlfcn.h>
 #include <pthread.h>
 
-#include "xine_internal.h"
-#include "buffer.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
 
 #define QLEN 5    /* maximum connection queue length */
 #define _BUFSIZ 512
diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c
index 93ad75ba0..8b8a8334a 100644
--- a/src/xine-engine/buffer.c
+++ b/src/xine-engine/buffer.c
@@ -43,9 +43,9 @@
 #define LOG
 */
 
-#include "buffer.h"
-#include "xineutils.h"
-#include "xine_internal.h"
+#include <xine/buffer.h>
+#include <xine/xineutils.h>
+#include <xine/xine_internal.h>
 
 /*
  * put a previously allocated buffer element back into the buffer pool
diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c
index eece2df90..08ff194fa 100644
--- a/src/xine-engine/buffer_types.c
+++ b/src/xine-engine/buffer_types.c
@@ -32,7 +32,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <inttypes.h>
-#include "buffer.h"
+#include <xine/buffer.h>
 #include "bswap.h"
 
 typedef struct video_db_s {
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 69f9ed6f9..8f3f9c684 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "configfile.h"
+#include <xine/configfile.h>
 
 #define LOG_MODULE "configfile"
 #define LOG_VERBOSE
@@ -39,8 +39,8 @@
 #define LOG
 */
 
-#include "xineutils.h"
-#include "xine_internal.h"
+#include <xine/xineutils.h>
+#include <xine/xine_internal.h>
 
 static const xine_config_entry_translation_t *config_entry_translation_user = NULL;
 static const xine_config_entry_translation_t config_entry_translation[] = {
diff --git a/src/xine-engine/demux.c b/src/xine-engine/demux.c
index 5010c60eb..232e0342e 100644
--- a/src/xine-engine/demux.c
+++ b/src/xine-engine/demux.c
@@ -39,9 +39,9 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "demuxers/demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 
 #ifdef WIN32
 #include <winsock.h>
diff --git a/src/xine-engine/events.c b/src/xine-engine/events.c
index f79187682..bf0d88fae 100644
--- a/src/xine-engine/events.c
+++ b/src/xine-engine/events.c
@@ -26,7 +26,7 @@
 
 #define XINE_ENGINE_INTERNAL
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 xine_event_t *xine_event_get  (xine_event_queue_t *queue) {
 
diff --git a/src/xine-engine/info_helper.c b/src/xine-engine/info_helper.c
index 1ac4ed982..bc66ba24e 100644
--- a/src/xine-engine/info_helper.c
+++ b/src/xine-engine/info_helper.c
@@ -35,7 +35,7 @@
 
 #define XINE_ENGINE_INTERNAL
 
-#include "info_helper.h"
+#include <xine/info_helper.h>
 
 /* *******************  Stream Info  *************************** */
 
diff --git a/src/xine-engine/input_cache.c b/src/xine-engine/input_cache.c
index 0535bc8f7..2989d8718 100644
--- a/src/xine-engine/input_cache.c
+++ b/src/xine-engine/input_cache.c
@@ -33,7 +33,7 @@
 #define LOG
 */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include <assert.h>
 
 #define DEFAULT_BUFFER_SIZE 1024
diff --git a/src/xine-engine/input_rip.c b/src/xine-engine/input_rip.c
index a8268552a..e7ef356b3 100644
--- a/src/xine-engine/input_rip.c
+++ b/src/xine-engine/input_rip.c
@@ -64,7 +64,7 @@
 #  define CLR_RST "\e[0;39m"
 #endif
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 #ifndef HAVE_FSEEKO
 #  define fseeko fseek
diff --git a/src/xine-engine/io_helper.c b/src/xine-engine/io_helper.c
index b51442402..d51feb4c6 100644
--- a/src/xine-engine/io_helper.c
+++ b/src/xine-engine/io_helper.c
@@ -38,7 +38,7 @@
 
 #define XINE_ENGINE_INTERNAL
 
-#include "io_helper.h"
+#include <xine/io_helper.h>
 
 /* private constants */
 #define XIO_FILE_READ             0
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index a03ea6d17..7a6237b79 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.c
@@ -51,17 +51,17 @@
 
 #define XINE_ENABLE_EXPERIMENTAL_FEATURES 1
 #define XINE_ENGINE_INTERNAL
-#include "xine_internal.h"
-#include "xine_plugin.h"
-#include "plugin_catalog.h"
-#include "demuxers/demux.h"
-#include "input/input_plugin.h"
-#include "video_out.h"
-#include "post.h"
-#include "metronom.h"
-#include "configfile.h"
-#include "xineutils.h"
-#include "compat.h"
+#include <xine/xine_internal.h>
+#include <xine/xine_plugin.h>
+#include <xine/plugin_catalog.h>
+#include <xine/demux.h>
+#include <xine/input_plugin.h>
+#include <xine/video_out.h>
+#include <xine/post.h>
+#include <xine/metronom.h>
+#include <xine/configfile.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
 
 #if 0
 
diff --git a/src/xine-engine/lrb.c b/src/xine-engine/lrb.c
index 6da846a7c..a2fc5d1da 100644
--- a/src/xine-engine/lrb.c
+++ b/src/xine-engine/lrb.c
@@ -23,7 +23,7 @@
 #endif
 
 #include "lrb.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 lrb_t *lrb_new (int max_num_entries,
 		fifo_buffer_t *fifo) {
diff --git a/src/xine-engine/lrb.h b/src/xine-engine/lrb.h
index 491ae8843..0f524b7eb 100644
--- a/src/xine-engine/lrb.h
+++ b/src/xine-engine/lrb.h
@@ -24,11 +24,7 @@
 #ifndef HAVE_LRB_H
 #define HAVE_LRB_H
 
-#ifdef XINE_COMPILE
-#  include "buffer.h"
-#else
-#  include <xine/buffer.h>
-#endif
+#include <xine/buffer.h>
 
 typedef struct {
 
diff --git a/src/xine-engine/metronom.c b/src/xine-engine/metronom.c
index e9bd86836..42aed4e76 100644
--- a/src/xine-engine/metronom.c
+++ b/src/xine-engine/metronom.c
@@ -40,9 +40,9 @@
 #define METRONOM_INTERNAL
 #define METRONOM_CLOCK_INTERNAL
 
-#include "xine_internal.h"
-#include "metronom.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/metronom.h>
+#include <xine/xineutils.h>
 
 #define MAX_AUDIO_DELTA        1600
 #define AUDIO_SAMPLE_NUM      32768
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 23c1cb35e..907b20c8e 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -48,12 +48,11 @@
 
 #define XINE_ENGINE_INTERNAL
 
-#include "alphablend.h"
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #include "xine-engine/bswap.h"
-#include "xineutils.h"
-#include "video_out.h"
-#include "osd.h"
+#include <xine/xineutils.h>
+#include <xine/video_out.h>
+#include <xine/osd.h>
 
 #ifdef HAVE_FT2
 #include <ft2build.h>
diff --git a/src/xine-engine/post.c b/src/xine-engine/post.c
index e54d2234f..e057ff99f 100644
--- a/src/xine-engine/post.c
+++ b/src/xine-engine/post.c
@@ -25,7 +25,7 @@
 #define POST_INTERNAL
 #define XINE_ENGINE_INTERNAL
 
-#include "post.h"
+#include <xine/post.h>
 #include <stdarg.h>
 
 
diff --git a/src/xine-engine/refcounter.c b/src/xine-engine/refcounter.c
index 539abf3ed..4bb6a0351 100644
--- a/src/xine-engine/refcounter.c
+++ b/src/xine-engine/refcounter.c
@@ -23,8 +23,8 @@
 #define LOG
 */
  
-#include "xine_internal.h"
-#include "refcounter.h"
+#include <xine/xine_internal.h>
+#include <xine/refcounter.h>
 
 refcounter_t* _x_new_refcounter(void *object, void (*destructor)(void *))
 {
diff --git a/src/xine-engine/resample.c b/src/xine-engine/resample.c
index 43911c401..f907c965e 100644
--- a/src/xine-engine/resample.c
+++ b/src/xine-engine/resample.c
@@ -24,8 +24,8 @@
 
 #include <string.h>
 #include <inttypes.h>
-#include "attributes.h"
-#include "resample.h"
+#include <xine/attributes.h>
+#include <xine/resample.h>
 
 /* contributed by paul flinders */
 
diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c
index 8f9021aa1..7376a3f9e 100644
--- a/src/xine-engine/scratch.c
+++ b/src/xine-engine/scratch.c
@@ -33,8 +33,8 @@
 #define LOG
 */
 
-#include "xineutils.h"
-#include "scratch.h"
+#include <xine/xineutils.h>
+#include <xine/scratch.h>
 
 static void __attribute__((__format__(__printf__, 2, 0)))
   scratch_printf (scratch_buffer_t *this, const char *format, va_list argp)
diff --git a/src/xine-engine/spu.c b/src/xine-engine/spu.c
index 813300fb0..c610a43c9 100644
--- a/src/xine-engine/spu.c
+++ b/src/xine-engine/spu.c
@@ -19,8 +19,8 @@
  *
  */
 
-#include "xine_internal.h"
-#include "spu.h"
+#include <xine/xine_internal.h>
+#include <xine/spu.h>
 
 #define BLACK_OPACITY   67
 #define COLOUR_OPACITY 100
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index c88e01714..ca6e7aa23 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_decoder.c
@@ -35,8 +35,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
 #include <sched.h>
 
 #define SPU_SLEEP_INTERVAL (90000/2)
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 8c9810da1..0bab612ce 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -44,10 +44,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "video_out.h"
-#include "metronom.h"
-#include "xineutils.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/metronom.h>
+#include <xine/xineutils.h>
 
 #define NUM_FRAME_BUFFERS          15
 #define MAX_USEC_TO_SLEEP       20000
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c
index c189fa56b..44080c469 100644
--- a/src/xine-engine/video_overlay.c
+++ b/src/xine-engine/video_overlay.c
@@ -25,11 +25,11 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "buffer.h"
-#include "xine_internal.h"
+#include <xine/buffer.h>
+#include <xine/xine_internal.h>
 #include "bswap.h"
-#include "xineutils.h"
-#include "video_overlay.h"
+#include <xine/xineutils.h>
+#include <xine/video_overlay.h>
 
 /*
 #define LOG_DEBUG
diff --git a/src/xine-engine/vo_scale.c b/src/xine-engine/vo_scale.c
index ff30c47a6..5da5ab26e 100644
--- a/src/xine-engine/vo_scale.c
+++ b/src/xine-engine/vo_scale.c
@@ -32,8 +32,8 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "vo_scale.h"
+#include <xine/xine_internal.h>
+#include <xine/vo_scale.h>
 
 /*
  * convert delivered height/width to ideal width/height
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 6d6e05b19..ec2dc9170 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.c
@@ -58,21 +58,21 @@
 #define XINE_ENGINE_INTERNAL
 #define METRONOM_CLOCK_INTERNAL
 
-#include "xine_internal.h"
-#include "plugin_catalog.h"
-#include "audio_out.h"
-#include "video_out.h"
-#include "demuxers/demux.h"
-#include "buffer.h"
-#include "spu_decoder.h"
-#include "input/input_plugin.h"
-#include "metronom.h"
-#include "configfile.h"
-#include "osd.h"
-#include "spu.h"
-
-#include "xineutils.h"
-#include "compat.h"
+#include <xine/xine_internal.h>
+#include <xine/plugin_catalog.h>
+#include <xine/audio_out.h>
+#include <xine/video_out.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
+#include <xine/spu_decoder.h>
+#include <xine/input_plugin.h>
+#include <xine/metronom.h>
+#include <xine/configfile.h>
+#include <xine/osd.h>
+#include <xine/spu.h>
+
+#include <xine/xineutils.h>
+#include <xine/compat.h>
 
 #ifdef WIN32
 #   include <fcntl.h>
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 7913a18d6..32b8663a6 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -40,11 +40,11 @@
 
 #define XINE_ENGINE_INTERNAL
 
-#include "xine_internal.h"
-#include "audio_out.h"
-#include "video_out.h"
-#include "demuxers/demux.h"
-#include "post.h"
+#include <xine/xine_internal.h>
+#include <xine/audio_out.h>
+#include <xine/video_out.h>
+#include <xine/demux.h>
+#include <xine/post.h>
 
 /* 
  * version information / checking
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index bacb2720f..30040e318 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -7,19 +7,6 @@ EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl
 
 noinst_HEADERS = ppcasm_string.h xine_check.h
 
-xineinclude_HEADERS = \
-	attributes.h \
-	compat.h \
-	xine_buffer.h \
-	xineutils.h \
-	xmllexer.h \
-	xmlparser.h \
-	list.h \
-	array.h \
-	sorted_array.h \
-	pool.h \
-	ring_buffer.h
-
 noinst_LTLIBRARIES = libxineutils.la
 
 if ARCH_PPC
diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c
index f6989fbb6..0db45be0c 100644
--- a/src/xine-utils/array.c
+++ b/src/xine-utils/array.c
@@ -23,8 +23,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "attributes.h"
-#include "array.h"
+#include <xine/attributes.h>
+#include <xine/array.h>
 
 #define MIN_CHUNK_SIZE    32
 
diff --git a/src/xine-utils/color.c b/src/xine-utils/color.c
index 0b9cf0188..dc2c7e5e5 100644
--- a/src/xine-utils/color.c
+++ b/src/xine-utils/color.c
@@ -62,7 +62,7 @@
  * instructions.
  */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 /*
  * In search of the perfect colorspace conversion formulae...
diff --git a/src/xine-utils/copy.c b/src/xine-utils/copy.c
index ed42b3a88..500b6db73 100644
--- a/src/xine-utils/copy.c
+++ b/src/xine-utils/copy.c
@@ -25,7 +25,7 @@
 #include "config.h"
 #endif
 
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 void yv12_to_yv12
   (const unsigned char *y_src, int y_src_pitch, unsigned char *y_dst, int y_dst_pitch,
diff --git a/src/xine-utils/cpu_accel.c b/src/xine-utils/cpu_accel.c
index 8bad23db9..07978b55f 100644
--- a/src/xine-utils/cpu_accel.c
+++ b/src/xine-utils/cpu_accel.c
@@ -39,7 +39,7 @@
 #define LOG
 */
 
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #if defined(__i386__) || defined(__x86_64__)
 
diff --git a/src/xine-utils/crc.c b/src/xine-utils/crc.c
index ba0e3010b..4f720e9cc 100644
--- a/src/xine-utils/crc.c
+++ b/src/xine-utils/crc.c
@@ -20,7 +20,7 @@
  * Common CRC calculation code.
  */
 
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 static const uint32_t crc32_table[256] = {
   0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c
index 65bdaec26..7a2b521bd 100644
--- a/src/xine-utils/list.c
+++ b/src/xine-utils/list.c
@@ -23,8 +23,8 @@
 #endif
 
 #include <stdlib.h>
-#include "attributes.h"
-#include "list.h"
+#include <xine/attributes.h>
+#include <xine/list.h>
 
 #define MIN_CHUNK_SIZE    32
 #define MAX_CHUNK_SIZE 65536
diff --git a/src/xine-utils/memcpy.c b/src/xine-utils/memcpy.c
index da4b83b09..15b0b228b 100644
--- a/src/xine-utils/memcpy.c
+++ b/src/xine-utils/memcpy.c
@@ -50,7 +50,7 @@
 #define LOG
 */
 
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 
 void *(* xine_fast_memcpy)(void *to, const void *from, size_t len);
 
diff --git a/src/xine-utils/monitor.c b/src/xine-utils/monitor.c
index 3c7c3e10a..8cbfdaa72 100644
--- a/src/xine-utils/monitor.c
+++ b/src/xine-utils/monitor.c
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <sys/time.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #define MAX_ID 10
 
diff --git a/src/xine-utils/pool.c b/src/xine-utils/pool.c
index a1fddadd9..60330ef53 100644
--- a/src/xine-utils/pool.c
+++ b/src/xine-utils/pool.c
@@ -22,9 +22,9 @@
 #endif
 
 #include <assert.h>
-#include "attributes.h"
-#include "pool.h"
-#include "array.h"
+#include <xine/attributes.h>
+#include <xine/pool.h>
+#include <xine/array.h>
 
 #define MIN_CHUNK_SIZE    32
 #define MAX_CHUNK_SIZE 65536
diff --git a/src/xine-utils/ring_buffer.c b/src/xine-utils/ring_buffer.c
index 031fda4fc..7042eaa68 100644
--- a/src/xine-utils/ring_buffer.c
+++ b/src/xine-utils/ring_buffer.c
@@ -27,10 +27,10 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
-#include "attributes.h"
-#include "pool.h"
-#include "list.h"
-#include "ring_buffer.h"
+#include <xine/attributes.h>
+#include <xine/pool.h>
+#include <xine/list.h>
+#include <xine/ring_buffer.h>
 
 #define RING_BUFFER_EXTRA_BUFFER_SIZE (1024 * 8)
 
diff --git a/src/xine-utils/sorted_array.c b/src/xine-utils/sorted_array.c
index 363325f0b..9dbe1fd0e 100644
--- a/src/xine-utils/sorted_array.c
+++ b/src/xine-utils/sorted_array.c
@@ -23,8 +23,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "attributes.h"
-#include "sorted_array.h"
+#include <xine/attributes.h>
+#include <xine/sorted_array.h>
 
 /* Array internal struct */
 struct xine_sarray_s {
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c
index e6e997341..63d7d343b 100644
--- a/src/xine-utils/utils.c
+++ b/src/xine-utils/utils.c
@@ -27,10 +27,10 @@
 #include "config.h"
 #endif
 
-#include "xineutils.h"
-#include "xineintl.h"
+#include <xine/xineutils.h>
+#include <xine/xineintl.h>
 #ifdef _MSC_VER
-#include "xine_internal.h"
+#include <xine/xine_internal.h>
 #endif
 
 #include <errno.h>
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c
index 190ab5197..3891aec11 100644
--- a/src/xine-utils/xine_buffer.c
+++ b/src/xine-utils/xine_buffer.c
@@ -58,7 +58,7 @@
 #define LOG
 */
 
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #define CHECKS
 
diff --git a/src/xine-utils/xine_check.c b/src/xine-utils/xine_check.c
index f00a23832..e850f9f48 100644
--- a/src/xine-utils/xine_check.c
+++ b/src/xine-utils/xine_check.c
@@ -45,7 +45,7 @@
 #include <unistd.h>
 
 #include "xine_check.h"
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 #if defined(__linux__)
 
diff --git a/src/xine-utils/xine_check.h b/src/xine-utils/xine_check.h
index 4b21bf74e..75eda102d 100644
--- a/src/xine-utils/xine_check.h
+++ b/src/xine-utils/xine_check.h
@@ -2,11 +2,7 @@
 #define XINE_CHECK_H
 #include <stdio.h>
 
-#ifdef XINE_COMPILE
-#  include "xine.h"
-#else
-#  include <xine.h>
-#endif
+#include <xine.h>
 
 /*
  * Start checking xine setup here
diff --git a/src/xine-utils/xine_mutex.c b/src/xine-utils/xine_mutex.c
index c94f32be0..52d17d8e5 100644
--- a/src/xine-utils/xine_mutex.c
+++ b/src/xine-utils/xine_mutex.c
@@ -24,7 +24,7 @@
 
 #include <stdio.h>
 #include <pthread.h>
-#include "xineutils.h"
+#include <xine/xineutils.h>
 
 /*
 #define DBG_MUTEX
diff --git a/src/xine-utils/xmllexer.c b/src/xine-utils/xmllexer.c
index bb03e5a79..e276beef0 100644
--- a/src/xine-utils/xmllexer.c
+++ b/src/xine-utils/xmllexer.c
@@ -26,12 +26,12 @@
 */
 
 #ifdef XINE_COMPILE
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #else
 #define lprintf(...)
 #define xine_xmalloc malloc
 #endif
-#include "xmllexer.h"
+#include <xine/xmllexer.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/src/xine-utils/xmlparser.c b/src/xine-utils/xmlparser.c
index a7bc146a9..1213072f3 100644
--- a/src/xine-utils/xmlparser.c
+++ b/src/xine-utils/xmlparser.c
@@ -37,13 +37,13 @@
 */
 
 #ifdef XINE_COMPILE
-#include "xineutils.h"
+#include <xine/xineutils.h>
 #else
 #define lprintf(...)
 #define xine_xmalloc malloc
 #endif
-#include "xmllexer.h"
-#include "xmlparser.h"
+#include <xine/xmllexer.h>
+#include <xine/xmlparser.h>
 
 
 #define TOKEN_SIZE  4 * 1024