6 files changed, 36 insertions, 4 deletions
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index cfb33d5ce..82629a78c 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -41,7 +41,7 @@ xineplug_nsf_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/nosefart/libnosefar
 xineplug_nsf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
 xineplug_nsf_la_CPPFLAGS = $(AM_CPPFLAGS) -DNSF_PLAYER -I$(top_srcdir)/contrib/nosefart -I$(top_srcdir)/src/demuxers
 
-xineplug_xiph_la_SOURCES = xine_ogg_demuxer.c
+xineplug_xiph_la_SOURCES = xine_ogg_demuxer.c ogg_combined.h
 xineplug_xiph_la_LIBADD = $(XINE_LIB) $(LTLIBINTL)
 xineplug_xiph_la_CFLAGS = $(AM_CFLAGS)
 xineplug_xiph_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers
diff --git a/src/combined/ogg_combined.h b/src/combined/ogg_combined.h
new file mode 100644
index 000000000..e7b439375
--- /dev/null
+++ b/src/combined/ogg_combined.h
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2013 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
+ *
+ */
+
+#include <xine/os_types.h>
+#include <xine/attributes.h>
+
+void *vorbis_init_plugin (xine_t *xine, void *data);
+void *speex_init_plugin (xine_t *xine, void *data);
+void *theora_init_plugin (xine_t *xine, void *data);
diff --git a/src/combined/xine_ogg_demuxer.c b/src/combined/xine_ogg_demuxer.c
index e254c6cb0..38e970a31 100644
--- a/src/combined/xine_ogg_demuxer.c
+++ b/src/combined/xine_ogg_demuxer.c
@@ -71,6 +71,8 @@
 #include "bswap.h"
 #include "flacutils.h"
 
+#include "ogg_combined.h"
+
 #define CHUNKSIZE                8500
 #define PACKET_TYPE_HEADER       0x01
 #define PACKET_TYPE_COMMENT      0x03
@@ -2237,11 +2239,8 @@ static const demuxer_info_t demux_info_ogg = {
 };
 
 extern const demuxer_info_t dec_info_vorbis;
-void *vorbis_init_plugin (xine_t *xine, void *data);
 extern const demuxer_info_t dec_info_speex;
-void *speex_init_plugin (xine_t *xine, void *data);
 extern const demuxer_info_t dec_info_theora;
-void *theora_init_plugin (xine_t *xine, void *data);
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */
diff --git a/src/combined/xine_speex_decoder.c b/src/combined/xine_speex_decoder.c
index 685d3c3b1..4998ec362 100644
--- a/src/combined/xine_speex_decoder.c
+++ b/src/combined/xine_speex_decoder.c
@@ -45,6 +45,8 @@
 #include <speex/speex_callbacks.h>
 #include <speex/speex_stereo.h>
 
+#include "ogg_combined.h"
+
 #define MAX_FRAME_SIZE 2000
 
 typedef struct {
diff --git a/src/combined/xine_theora_decoder.c b/src/combined/xine_theora_decoder.c
index 25e46a52e..303c24ec9 100644
--- a/src/combined/xine_theora_decoder.c
+++ b/src/combined/xine_theora_decoder.c
@@ -45,6 +45,8 @@
 #include <xine/metronom.h>
 #include <xine/xineutils.h>
 
+#include "ogg_combined.h"
+
 typedef struct theora_class_s {
   video_decoder_class_t   decoder_class;
 } theora_class_t;
diff --git a/src/combined/xine_vorbis_decoder.c b/src/combined/xine_vorbis_decoder.c
index 288202c44..9736fdcae 100644
--- a/src/combined/xine_vorbis_decoder.c
+++ b/src/combined/xine_vorbis_decoder.c
@@ -40,6 +40,8 @@
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
 
+#include "ogg_combined.h"
+
 #define MAX_NUM_SAMPLES 4096
 #define INIT_BUFSIZE    8192