7 files changed, 8 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 97747bcd2..22033787c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,8 +101,6 @@ mpd_headers = \
 	src/decoder/flac_compat.h \
 	src/decoder/flac_metadata.h \
 	src/decoder/flac_pcm.h \
-	src/decoder/_flac_common.h \
-	src/decoder/_ogg_common.h \
 	src/decoder/pcm_decoder_plugin.h \
 	src/input_init.h \
 	src/input_plugin.h \
@@ -589,14 +587,15 @@ libdecoder_plugins_a_SOURCES += src/decoder/mp4ff_decoder_plugin.c
 endif
 
 if HAVE_OGG_COMMON
-libdecoder_plugins_a_SOURCES += src/decoder/_ogg_common.c
+libdecoder_plugins_a_SOURCES += \
+	src/decoder/ogg_common.c src/decoder/ogg_common.h
 endif
 
 if HAVE_FLAC_COMMON
 libdecoder_plugins_a_SOURCES += \
 	src/decoder/flac_metadata.c \
 	src/decoder/flac_pcm.c \
-	src/decoder/_flac_common.c
+	src/decoder/flac_common.c src/decoder/flac_common.h
 endif
 
 if ENABLE_VORBIS_DECODER
diff --git a/src/decoder/_flac_common.c b/src/decoder/flac_common.c
index bab3995f0..510d16d59 100644
--- a/src/decoder/_flac_common.c
+++ b/src/decoder/flac_common.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "_flac_common.h"
+#include "flac_common.h"
 #include "flac_metadata.h"
 #include "flac_pcm.h"
 #include "audio_check.h"
diff --git a/src/decoder/_flac_common.h b/src/decoder/flac_common.h
index c898a47cf..c898a47cf 100644
--- a/src/decoder/_flac_common.h
+++ b/src/decoder/flac_common.h
diff --git a/src/decoder/flac_decoder_plugin.c b/src/decoder/flac_decoder_plugin.c
index fb0b3502d..818f75904 100644
--- a/src/decoder/flac_decoder_plugin.c
+++ b/src/decoder/flac_decoder_plugin.c
@@ -18,12 +18,12 @@
  */
 
 #include "config.h" /* must be first for large file support */
-#include "_flac_common.h"
+#include "flac_common.h"
 #include "flac_compat.h"
 #include "flac_metadata.h"
 
 #if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7
-#include "_ogg_common.h"
+#include "ogg_common.h"
 #endif
 
 #include <glib.h>
diff --git a/src/decoder/_ogg_common.c b/src/decoder/ogg_common.c
index 09d2712da..d57e247fa 100644
--- a/src/decoder/_ogg_common.c
+++ b/src/decoder/ogg_common.c
@@ -22,7 +22,7 @@
  */
 
 #include "config.h"
-#include "_ogg_common.h"
+#include "ogg_common.h"
 
 ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream)
 {
diff --git a/src/decoder/_ogg_common.h b/src/decoder/ogg_common.h
index 85e4ebba6..85e4ebba6 100644
--- a/src/decoder/_ogg_common.h
+++ b/src/decoder/ogg_common.h
diff --git a/src/decoder/vorbis_decoder_plugin.c b/src/decoder/vorbis_decoder_plugin.c
index 15cdc0ca9..40594faad 100644
--- a/src/decoder/vorbis_decoder_plugin.c
+++ b/src/decoder/vorbis_decoder_plugin.c
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "vorbis_comments.h"
-#include "_ogg_common.h"
+#include "ogg_common.h"
 #include "audio_check.h"
 #include "uri.h"
 #include "tag_handler.h"