8 files changed, 7 insertions, 16 deletions
diff --git a/src/decoder/AdPlugDecoderPlugin.cxx b/src/decoder/AdPlugDecoderPlugin.cxx
index b3b7f1d73..6d08fab56 100644
--- a/src/decoder/AdPlugDecoderPlugin.cxx
+++ b/src/decoder/AdPlugDecoderPlugin.cxx
@@ -20,9 +20,9 @@
 #include "config.h"
 #include "AdPlugDecoderPlugin.h"
 #include "tag_handler.h"
+#include "decoder_api.h"
 
 extern "C" {
-#include "decoder_api.h"
 #include "audio_check.h"
 }
 
diff --git a/src/decoder/FLACCommon.hxx b/src/decoder/FLACCommon.hxx
index e9b45976d..b80372bbf 100644
--- a/src/decoder/FLACCommon.hxx
+++ b/src/decoder/FLACCommon.hxx
@@ -25,9 +25,9 @@
 #define MPD_FLAC_COMMON_HXX
 
 #include "FLACInput.hxx"
+#include "decoder_api.h"
 
 extern "C" {
-#include "decoder_api.h"
 #include "pcm_buffer.h"
 }
 
diff --git a/src/decoder/FLACIOHandle.hxx b/src/decoder/FLACIOHandle.hxx
index 193a15ef5..0c2c24770 100644
--- a/src/decoder/FLACIOHandle.hxx
+++ b/src/decoder/FLACIOHandle.hxx
@@ -21,10 +21,7 @@
 #define MPD_FLAC_IO_HANDLE_HXX
 
 #include "gcc.h"
-
-extern "C" {
 #include "input_stream.h"
-}
 
 #include <FLAC/callback.h>
 
diff --git a/src/decoder/FLACInput.cxx b/src/decoder/FLACInput.cxx
index 0383ac4ff..99f321cdd 100644
--- a/src/decoder/FLACInput.cxx
+++ b/src/decoder/FLACInput.cxx
@@ -19,12 +19,9 @@
 
 #include "config.h"
 #include "FLACInput.hxx"
+#include "decoder_api.h"
 #include "gcc.h"
-
-extern "C" {
 #include "input_stream.h"
-#include "decoder_api.h"
-}
 
 FLAC__StreamDecoderReadStatus
 FLACInput::Read(FLAC__byte buffer[], size_t *bytes)
diff --git a/src/decoder/FLACMetaData.cxx b/src/decoder/FLACMetaData.cxx
index 561c1591f..8273a230b 100644
--- a/src/decoder/FLACMetaData.cxx
+++ b/src/decoder/FLACMetaData.cxx
@@ -22,12 +22,12 @@
 
 extern "C" {
 #include "XiphTags.h"
-#include "replay_gain_info.h"
-#include "tag.h"
 }
 
+#include "tag.h"
 #include "tag_handler.h"
 #include "tag_table.h"
+#include "replay_gain_info.h"
 
 #include <glib.h>
 
diff --git a/src/decoder/OggUtil.cxx b/src/decoder/OggUtil.cxx
index 99f73d48e..00dae2887 100644
--- a/src/decoder/OggUtil.cxx
+++ b/src/decoder/OggUtil.cxx
@@ -19,10 +19,7 @@
 
 #include "config.h"
 #include "OggUtil.hxx"
-
-extern "C" {
 #include "decoder_api.h"
-}
 
 bool
 OggFeed(ogg_sync_state &oy, struct decoder *decoder,
diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx
index 35e368ca9..c87e60a16 100644
--- a/src/decoder/OpusDecoderPlugin.cxx
+++ b/src/decoder/OpusDecoderPlugin.cxx
@@ -22,10 +22,10 @@
 #include "OpusHead.hxx"
 #include "OpusTags.hxx"
 #include "OggUtil.hxx"
+#include "decoder_api.h"
 
 extern "C" {
 #include "ogg_codec.h"
-#include "decoder_api.h"
 }
 
 #include "audio_check.h"
diff --git a/src/decoder/sidplay_decoder_plugin.cxx b/src/decoder/sidplay_decoder_plugin.cxx
index de2e599e9..175d2ee7c 100644
--- a/src/decoder/sidplay_decoder_plugin.cxx
+++ b/src/decoder/sidplay_decoder_plugin.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "config.h"
+#include "../decoder_api.h"
 
 extern "C" {
-#include "../decoder_api.h"
 #include "tag_handler.h"
 }