4 files changed, 17 insertions, 9 deletions
diff --git a/src/combined/combined_wavpack.c b/src/combined/combined_wavpack.c
index f99070818..7a334b15c 100644
--- a/src/combined/combined_wavpack.c
+++ b/src/combined/combined_wavpack.c
@@ -19,13 +19,11 @@
  *
  * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
  *
- * $Id: combined_wavpack.c,v 1.2 2007/01/24 20:51:04 dgp85 Exp $
+ * $Id: combined_wavpack.c,v 1.3 2007/03/17 07:34:02 dgp85 Exp $
  */
 
 #include "xine_internal.h"
-
-extern void *demux_wv_init_plugin (xine_t *const xine, void *const data);
-extern void *decoder_wavpack_init_plugin (xine_t *xine, void *data);
+#include "combined_wavpack.h"
 
 static const demuxer_info_t demux_info_wv = {
   0			/* priority */
diff --git a/src/combined/combined_wavpack.h b/src/combined/combined_wavpack.h
index 68541e921..b7bf32acb 100644
--- a/src/combined/combined_wavpack.h
+++ b/src/combined/combined_wavpack.h
@@ -19,11 +19,10 @@
  *
  * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
  *
- * $Id: combined_wavpack.h,v 1.2 2007/01/24 20:51:04 dgp85 Exp $
+ * $Id: combined_wavpack.h,v 1.3 2007/03/17 07:34:02 dgp85 Exp $
  */
 
 #include "os_types.h"
-#include "bswap.h"
 
 typedef struct {
   uint32_t idcode;        /* This should always be the string "wvpk" */
@@ -45,3 +44,6 @@ static const uint32_t wvpk_signature = ('k' + ('p' << 8) + ('v' << 16) + ('w' <<
 #else
 static const uint32_t wvpk_signature = ('w' + ('v' << 8) + ('p' << 16) + ('k' << 24));
 #endif
+
+void *demux_wv_init_plugin (xine_t *const xine, void *const data);
+void *decoder_wavpack_init_plugin (xine_t *xine, void *data);
diff --git a/src/combined/decoder_wavpack.c b/src/combined/decoder_wavpack.c
index 6b0d035e4..1d51ecd1d 100644
--- a/src/combined/decoder_wavpack.c
+++ b/src/combined/decoder_wavpack.c
@@ -19,14 +19,19 @@
  *
  * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
  *
- * $Id: decoder_wavpack.c,v 1.12 2007/02/25 18:02:13 dgp85 Exp $
+ * $Id: decoder_wavpack.c,v 1.13 2007/03/17 07:34:02 dgp85 Exp $
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #define LOG_MODULE "decode_wavpack"
 #define LOG_VERBOSE
 
 #include "xine_internal.h"
 #include "attributes.h"
+#include "bswap.h"
 
 #include <wavpack/wavpack.h>
 #include "combined_wavpack.h"
diff --git a/src/combined/demux_wavpack.c b/src/combined/demux_wavpack.c
index d0dce82a2..6a0e33e19 100644
--- a/src/combined/demux_wavpack.c
+++ b/src/combined/demux_wavpack.c
@@ -19,9 +19,13 @@
  *
  * xine interface to libwavpack by Diego Pettenò <flameeyes@gmail.com>
  *
- * $Id: demux_wavpack.c,v 1.10 2007/02/25 18:02:13 dgp85 Exp $
+ * $Id: demux_wavpack.c,v 1.11 2007/03/17 07:34:02 dgp85 Exp $
  */
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #define LOG_MODULE "demux_wavpack"
 #define LOG_VERBOSE
 
@@ -32,7 +36,6 @@
 #include "attributes.h"
 
 #include <wavpack/wavpack.h>
-
 #include "combined_wavpack.h"
 
 typedef struct {