42 files changed, 8 insertions, 24 deletions
diff --git a/include/xine/Makefile.am b/include/xine/Makefile.am
index f143d83c4..2861460be 100644
--- a/include/xine/Makefile.am
+++ b/include/xine/Makefile.am
@@ -1,4 +1,11 @@
 EXTRA_DIST = version.h.in
 
 xineincludedir = $(includedir)/xine
-xineinclude_HEADERS = version.h
+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..ee5ca42f0 100644
--- a/src/demuxers/demux.h
+++ b/include/xine/demux.h
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 7b04c0a17..7b04c0a17 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/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..13b003992 100644
--- a/src/xine-engine/xine_internal.h
+++ b/include/xine/xine_internal.h
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 4ff87e87c..4ff87e87c 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/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/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/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-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