10 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 41b905be9..c07262d9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -723,7 +723,7 @@ OUTPUT_API_SRC = \
 	src/output_init.c
 
 OUTPUT_SRC = \
-	src/output/null_plugin.c
+	src/output/null_output_plugin.c
 
 MIXER_API_SRC = \
 	src/mixer_control.c \
@@ -735,12 +735,12 @@ MIXER_SRC = \
 	src/mixer/software_mixer_plugin.c
 
 if HAVE_ALSA
-OUTPUT_SRC += src/output/alsa_plugin.c
+OUTPUT_SRC += src/output/alsa_output_plugin.c
 MIXER_SRC += src/mixer/alsa_mixer_plugin.c
 endif
 
 if HAVE_ROAR
-OUTPUT_SRC += src/output/roar_plugin.c
+OUTPUT_SRC += src/output/roar_output_plugin.c
 MIXER_SRC += src/mixer/roar_mixer_plugin.c
 endif
 
@@ -749,7 +749,7 @@ OUTPUT_SRC += src/output/ffado_output_plugin.c
 endif
 
 if HAVE_AO
-OUTPUT_SRC += src/output/ao_plugin.c
+OUTPUT_SRC += src/output/ao_output_plugin.c
 endif
 
 if HAVE_FIFO
@@ -765,20 +765,20 @@ OUTPUT_SRC += src/output/jack_output_plugin.c
 endif
 
 if HAVE_MVP
-OUTPUT_SRC += src/output/mvp_plugin.c
+OUTPUT_SRC += src/output/mvp_output_plugin.c
 endif
 
 if HAVE_OSS
-OUTPUT_SRC += src/output/oss_plugin.c
+OUTPUT_SRC += src/output/oss_output_plugin.c
 MIXER_SRC += src/mixer/oss_mixer_plugin.c
 endif
 
 if HAVE_OPENAL
-OUTPUT_SRC += src/output/openal_plugin.c
+OUTPUT_SRC += src/output/openal_output_plugin.c
 endif
 
 if HAVE_OSX
-OUTPUT_SRC += src/output/osx_plugin.c
+OUTPUT_SRC += src/output/osx_output_plugin.c
 endif
 
 if ENABLE_RAOP_OUTPUT
@@ -796,7 +796,7 @@ MIXER_SRC += src/mixer/pulse_mixer_plugin.c
 endif
 
 if HAVE_SHOUT
-OUTPUT_SRC += src/output/shout_plugin.c
+OUTPUT_SRC += src/output/shout_output_plugin.c
 endif
 
 if ENABLE_RECORDER_OUTPUT
diff --git a/src/output/alsa_plugin.c b/src/output/alsa_output_plugin.c
index 0bbe231fd..0bbe231fd 100644
--- a/src/output/alsa_plugin.c
+++ b/src/output/alsa_output_plugin.c
diff --git a/src/output/ao_plugin.c b/src/output/ao_output_plugin.c
index 33366d3b8..33366d3b8 100644
--- a/src/output/ao_plugin.c
+++ b/src/output/ao_output_plugin.c
diff --git a/src/output/mvp_plugin.c b/src/output/mvp_output_plugin.c
index be4c8dbc0..be4c8dbc0 100644
--- a/src/output/mvp_plugin.c
+++ b/src/output/mvp_output_plugin.c
diff --git a/src/output/null_plugin.c b/src/output/null_output_plugin.c
index f572959a0..f572959a0 100644
--- a/src/output/null_plugin.c
+++ b/src/output/null_output_plugin.c
diff --git a/src/output/openal_plugin.c b/src/output/openal_output_plugin.c
index 23641c6c5..23641c6c5 100644
--- a/src/output/openal_plugin.c
+++ b/src/output/openal_output_plugin.c
diff --git a/src/output/oss_plugin.c b/src/output/oss_output_plugin.c
index d7df594d3..d7df594d3 100644
--- a/src/output/oss_plugin.c
+++ b/src/output/oss_output_plugin.c
diff --git a/src/output/osx_plugin.c b/src/output/osx_output_plugin.c
index 8091660ab..8091660ab 100644
--- a/src/output/osx_plugin.c
+++ b/src/output/osx_output_plugin.c
diff --git a/src/output/roar_plugin.c b/src/output/roar_output_plugin.c
index f9d44a3d8..f9d44a3d8 100644
--- a/src/output/roar_plugin.c
+++ b/src/output/roar_output_plugin.c
diff --git a/src/output/shout_plugin.c b/src/output/shout_output_plugin.c
index 80adf1638..80adf1638 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_output_plugin.c