5 files changed, 28 insertions, 4 deletions
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index c1e590fd7..47a42039f 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -28,7 +28,7 @@ xineplug_flac_la_SOURCES = flac_demuxer.c flac_decoder.c
 xineplug_flac_la_LIBADD = $(XINE_LIB) $(LIBFLAC_LIBS)
 xineplug_flac_la_CFLAGS = $(AM_CFLAGS) $(LIBFLAC_CFLAGS)
 
-xineplug_nsf_la_SOURCES = nsf_decoder.c nsf_demuxer.c nsf_combined.c
+xineplug_nsf_la_SOURCES = nsf_decoder.c nsf_demuxer.c nsf_combined.c nsf_combined.h
 xineplug_nsf_la_LIBADD = $(XINE_LIB) $(top_builddir)/contrib/nosefart/libnosefart.la -lm
 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
diff --git a/src/combined/nsf_combined.c b/src/combined/nsf_combined.c
index 855b8d2a5..474064213 100644
--- a/src/combined/nsf_combined.c
+++ b/src/combined/nsf_combined.c
@@ -21,9 +21,7 @@
  */
 
 #include "xine_internal.h"
-
-void *decoder_nsf_init_plugin (xine_t *xine, void *data);
-void *demux_nsf_init_plugin (xine_t *xine, void *data);
+#include "nsf_combined.h"
 
 static const demuxer_info_t demux_info_nsf = {
   10                       /* priority */
diff --git a/src/combined/nsf_combined.h b/src/combined/nsf_combined.h
new file mode 100644
index 000000000..36a0abe71
--- /dev/null
+++ b/src/combined/nsf_combined.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2000-2001 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ */
+
+void *decoder_nsf_init_plugin (xine_t *xine, void *data);
+void *demux_nsf_init_plugin (xine_t *xine, void *data);
diff --git a/src/combined/nsf_decoder.c b/src/combined/nsf_decoder.c
index e8b5dd96a..01884f267 100644
--- a/src/combined/nsf_decoder.c
+++ b/src/combined/nsf_decoder.c
@@ -39,6 +39,8 @@
 #include "types.h"
 #include "nsf.h"
 
+#include "nsf_combined.h"
+
 typedef struct {
   audio_decoder_class_t   decoder_class;
 } nsf_class_t;
diff --git a/src/combined/nsf_demuxer.c b/src/combined/nsf_demuxer.c
index b598b9e1c..3ebacc217 100644
--- a/src/combined/nsf_demuxer.c
+++ b/src/combined/nsf_demuxer.c
@@ -54,6 +54,8 @@
 #include "demux.h"
 #include "bswap.h"
 
+#include "nsf_combined.h"
+
 #define NSF_HEADER_SIZE 0x80
 #define NSF_SAMPLERATE 44100
 #define NSF_BITS 8