5 files changed, 4 insertions, 4 deletions
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index 58ea35d06..4ed0f756d 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -19,7 +19,7 @@ xineplug_LTLIBRARIES = \
 	$(xineplug_flac) \
 	xineplug_nsf.la
 
-xineplug_wavpack_la_SOURCES = demux_wavpack.c decoder_wavpack.c combined_wavpack.c combined_wavpack.h
+xineplug_wavpack_la_SOURCES = wavpack_demuxer.c wavpack_decoder.c wavpack_combined.c wavpack_combined.h
 xineplug_wavpack_la_LIBADD = $(XINE_LIB) $(WAVPACK_LIBS)
 xineplug_wavpack_la_CFLAGS = $(AM_CFLAGS) $(WAVPACK_CFLAGS)
 xineplug_wavpack_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/demuxers
diff --git a/src/combined/combined_wavpack.c b/src/combined/wavpack_combined.c
index 7a334b15c..110de2b2e 100644
--- a/src/combined/combined_wavpack.c
+++ b/src/combined/wavpack_combined.c
@@ -23,7 +23,7 @@
  */
 
 #include "xine_internal.h"
-#include "combined_wavpack.h"
+#include "wavpack_combined.h"
 
 static const demuxer_info_t demux_info_wv = {
   0			/* priority */
diff --git a/src/combined/combined_wavpack.h b/src/combined/wavpack_combined.h
index 7688f91df..7688f91df 100644
--- a/src/combined/combined_wavpack.h
+++ b/src/combined/wavpack_combined.h
diff --git a/src/combined/decoder_wavpack.c b/src/combined/wavpack_decoder.c
index ec14dfbf5..405bf64f1 100644
--- a/src/combined/decoder_wavpack.c
+++ b/src/combined/wavpack_decoder.c
@@ -34,7 +34,7 @@
 #include "bswap.h"
 
 #include <wavpack/wavpack.h>
-#include "combined_wavpack.h"
+#include "wavpack_combined.h"
 
 typedef struct {
   audio_decoder_class_t   decoder_class;
diff --git a/src/combined/demux_wavpack.c b/src/combined/wavpack_demuxer.c
index 6a0e33e19..da69731b1 100644
--- a/src/combined/demux_wavpack.c
+++ b/src/combined/wavpack_demuxer.c
@@ -36,7 +36,7 @@
 #include "attributes.h"
 
 #include <wavpack/wavpack.h>
-#include "combined_wavpack.h"
+#include "wavpack_combined.h"
 
 typedef struct {
   demux_plugin_t demux_plugin;