include config.h in all sources

Makefile.am

@@ -29,6 +29,7 @@ src_mpd_LDADD = $(MPD_LIBS) \
 	$(GLIB_LIBS)
 
 mpd_headers = \
+	src/check.h \
 	src/notify.h \
 	src/ack.h \
 	src/audio.h \

configure.ac

@@ -101,6 +101,9 @@ dnl libc features
 dnl
 
 AC_SYS_LARGEFILE
+if test x$enable_largefile != xno; then
+	AC_DEFINE([ENABLE_LARGEFILE], 1, [Define if large file support is enabled])
+fi
 
 AC_CHECK_FUNCS(daemon fork syslog)
 if test $ac_cv_func_syslog = no; then

scripts/check_config_h.rb

+#!/usr/bin/env ruby
+#
+# This script verifies that every source includes config.h first.
+# This is very important for consistent Large File Support.
+#
+
+def check_file(file)
+    first = true
+    file.each_line do |line|
+        if line =~ /^\#include\s+(\S+)/ then
+            if $1 == '"config.h"'
+                unless first
+                    puts "#{file.path}: config.h included too late"
+                end
+            else
+                if first
+                    puts "#{file.path}: config.h missing"
+                end
+            end
+            first = false
+        end
+    end
+end
+
+def check_path(path)
+    File.open(path) do |file|
+        check_file(file)
+    end
+end
+
+if ARGV.empty?
+    Dir["src/*.c"].each do |path|
+        check_path(path)
+    end
+
+    Dir["src/*/*.c"].each do |path|
+        check_path(path)
+    end
+
+    Dir["test/*.c"].each do |path|
+        check_path(path)
+    end
+else
+    ARGV.each do |path|
+        check_path(path)
+    end
+end

src/archive/bz2_plugin.c

@@ -21,9 +21,9 @@
   * single bz2 archive handling (requires libbz2)
   */
 
+#include "config.h"
 #include "archive_api.h"
 #include "input_plugin.h"
-#include "config.h"
 
 #include <stdint.h>
 #include <stddef.h>

src/archive/iso_plugin.c

@@ -21,6 +21,7 @@
   * iso archive handling (requires cdio, and iso9660)
   */
 
+#include "config.h"
 #include "archive_api.h"
 #include "input_plugin.h"
 

src/archive/zip_plugin.c

@@ -21,6 +21,7 @@
   * zip archive handling (requires zziplib)
   */
 
+#include "config.h"
 #include "archive_api.h"
 #include "archive_api.h"
 #include "input_plugin.h"

src/archive_list.c

@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "archive_list.h"
 #include "archive_api.h"
 #include "utils.h"
-#include "config.h"
 
 #include <string.h>
 #include <glib.h>

src/audio.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "audio.h"
 #include "audio_format.h"
 #include "audio_parser.h"

src/audio_parser.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include "config.h"
 #include "audio_parser.h"
 #include "audio_format.h"
 

src/buffer.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "buffer.h"
 #include "chunk.h"
 #include "poison.h"

src/check.h

+/*
+ * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef MPD_CHECK_H
+#define MPD_CHECK_H
+
+/*
+ * All sources must include config.h on the first line to ensure that
+ * Large File Support is configured properly.  This header checks
+ * whether this has happened.
+ *
+ * Usage: include this header before you use any of the above types.
+ * It will stop the compiler if something went wrong.
+ *
+ * This is Linux/glibc specific, and only enabled in the debug build,
+ * so bugs in this headers don't affect users with production builds.
+ *
+ */
+
+#ifndef PACKAGE_VERSION
+#error config.h missing
+#endif
+
+#if defined(__linux__) && !defined(NDEBUG) && defined(ENABLE_LARGEFILE) && \
+	defined(_FEATURES_H) && defined(__i386__) && \
+	!defined(__USE_FILE_OFFSET64)
+/* on i386, check if LFS is enabled */
+#error config.h was included too late
+#endif
+
+#endif

src/chunk.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "chunk.h"
 #include "audio_format.h"
 #include "tag.h"

src/client.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 
 bool client_is_expired(const struct client *client)

src/client_event.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 #include "main.h"
 

src/client_expire.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 
 static guint expire_source_id;

src/client_global.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 #include "conf.h"
 

src/client_idle.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 #include "idle.h"
 

src/client_list.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 
 #include <assert.h>

src/client_new.c

@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 #include "fifo_buffer.h"
 #include "socket_util.h"
 #include "permission.h"
-#include "config.h"
 
 #include <assert.h>
 #include <unistd.h>

src/client_process.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 
 #include <string.h>

src/client_read.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 #include "fifo_buffer.h"
 

src/client_write.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "client_internal.h"
 
 #include <assert.h>

src/cmdline.c

@@ -17,13 +17,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "cmdline.h"
 #include "path.h"
 #include "log.h"
 #include "conf.h"
 #include "decoder_list.h"
 #include "decoder_plugin.h"
-#include "config.h"
 #include "output_list.h"
 #include "ls.h"
 

src/command.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "command.h"
 #include "player_control.h"
 #include "playlist.h"
@@ -47,7 +48,6 @@
 #include "path.h"
 #include "replay_gain.h"
 #include "idle.h"
-#include "config.h"
 
 #ifdef ENABLE_SQLITE
 #include "sticker.h"

src/compress.c

@@ -21,6 +21,7 @@
  * Imported from AudioCompress by J. Shagam <fluffy@beesbuzz.biz>
  */
 
+#include "config.h"
 #include "compress.h"
 
 #include <glib.h>

src/conf.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "conf.h"
 #include "utils.h"
 #include "tokenizer.h"

src/crossfade.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "crossfade.h"
 #include "pcm_mix.h"
 #include "chunk.h"

src/cue/cue_tag.c

+#include "config.h"
 #include "cue_tag.h"
 
 static struct tag*

src/cue/cue_tag.h

 #ifndef MPD_CUE_TAG_H
 #define MPD_CUE_TAG_H
 
-#include "config.h"
+#include "check.h"
 
 #ifdef HAVE_CUE /* libcue */
 
+#include "tag.h"
+
 #include <libcue/libcue.h>
-#include "../tag.h"
 
 struct tag*
 cue_tag_file(	FILE*,

src/database.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "database.h"
 #include "directory.h"
 #include "directory_save.h"
@@ -26,7 +27,6 @@
 #include "text_file.h"
 #include "tag.h"
 #include "tag_internal.h"
-#include "config.h"
 
 #include <glib.h>
 

src/dbUtils.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "dbUtils.h"
 #include "locate.h"
 #include "directory.h"

src/decoder/.#flac_plugin.c

+max@woodpecker.roonstrasse.net.11431:1257744648
\ No newline at end of file

src/decoder/_flac_common.c

@@ -21,6 +21,7 @@
  * Common data structures and functions used by FLAC and OggFLAC
  */
 
+#include "config.h"
 #include "_flac_common.h"
 #include "flac_metadata.h"
 #include "flac_pcm.h"

src/decoder/_ogg_common.c

@@ -21,8 +21,8 @@
  * Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC)
  */
 
+#include "config.h"
 #include "_ogg_common.h"
-#include "../utils.h"
 
 ogg_stream_type ogg_stream_type_detect(struct input_stream *inStream)
 {

src/decoder/_ogg_common.h

@@ -24,7 +24,7 @@
 #ifndef MPD_OGG_COMMON_H
 #define MPD_OGG_COMMON_H
 
-#include "../decoder_api.h"
+#include "decoder_api.h"
 
 typedef enum _ogg_stream_type { VORBIS, FLAC } ogg_stream_type;
 

src/decoder/audiofile_plugin.c

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
+#include "config.h"
+#include "decoder_api.h"
 
 #include <audiofile.h>
 #include <af_vfs.h>

src/decoder/faad_plugin.c

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
-#include "decoder_buffer.h"
 #include "config.h"
+#include "decoder_api.h"
+#include "decoder_buffer.h"
 
 #define AAC_MAX_CHANNELS	6
 

src/decoder/ffmpeg_plugin.c

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
 #include "config.h"
+#include "decoder_api.h"
 
 #include <glib.h>
 

src/decoder/flac_metadata.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "flac_metadata.h"
 #include "replay_gain.h"
 #include "tag.h"

src/decoder/flac_pcm.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "flac_pcm.h"
 
 static void flac_convert_stereo16(int16_t *dest,

src/decoder/fluidsynth_plugin.c

@@ -26,9 +26,10 @@
  *
  */
 
-#include "../decoder_api.h"
-#include "../timer.h"
-#include "../conf.h"
+#include "config.h"
+#include "decoder_api.h"
+#include "timer.h"
+#include "conf.h"
 
 #include <glib.h>
 

src/decoder/mad_plugin.c

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
-#include "../conf.h"
 #include "config.h"
+#include "decoder_api.h"
+#include "conf.h"
 #include "tag_id3.h"
 
 #include <assert.h>

src/decoder/mikmod_plugin.c

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
+#include "config.h"
+#include "decoder_api.h"
 
 #include <glib.h>
 #include <mikmod.h>

src/decoder/modplug_plugin.c

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
+#include "config.h"
+#include "decoder_api.h"
 
 #include <glib.h>
 #include <modplug.h>

src/decoder/mp4ff_plugin.c

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
 #include "config.h"
+#include "decoder_api.h"
 
 #include <glib.h>
 

src/decoder/mpcdec_plugin.c

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
 #include "config.h"
+#include "decoder_api.h"
 
 #ifdef MPC_IS_OLD_API
 #include <mpcdec/mpcdec.h>

src/decoder/sidplay_plugin.cxx

@@ -17,6 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
+
 extern "C" {
 #include "../decoder_api.h"
 }

src/decoder/sndfile_decoder_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_api.h"
 
 #include <sndfile.h>

src/decoder/vorbis_plugin.c

@@ -17,11 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-/* TODO 'ogg' should probably be replaced with 'oggvorbis' in all instances */
-
-#include "config.h" /* must be first for large file support */
-#include "_ogg_common.h"
 #include "config.h"
+#include "_ogg_common.h"
 #include "uri.h"
 
 #ifndef HAVE_TREMOR

src/decoder/wavpack_plugin.c

@@ -17,9 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
-#include "../path.h"
-#include "../utils.h"
+#include "config.h"
+#include "decoder_api.h"
+#include "path.h"
+#include "utils.h"
 
 #include <wavpack/wavpack.h>
 #include <glib.h>

src/decoder/wildmidi_plugin.c

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../decoder_api.h"
+#include "config.h"
+#include "decoder_api.h"
 
 #include <glib.h>
 

src/decoder_api.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_api.h"
 #include "decoder_internal.h"
 #include "decoder_control.h"

src/decoder_api.h

@@ -27,6 +27,7 @@
 #ifndef MPD_DECODER_API_H
 #define MPD_DECODER_API_H
 
+#include "check.h"
 #include "decoder_command.h"
 #include "decoder_plugin.h"
 #include "input_stream.h"

src/decoder_buffer.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_buffer.h"
 #include "decoder_api.h"
 

src/decoder_control.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_control.h"
 #include "player_control.h"
 

src/decoder_internal.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_internal.h"
 #include "decoder_control.h"
 #include "player_control.h"

src/decoder_list.c

@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_list.h"
 #include "decoder_plugin.h"
 #include "utils.h"
-#include "config.h"
 #include "conf.h"
 
 #include <glib.h>

src/decoder_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_plugin.h"
 #include "utils.h"
 

src/decoder_print.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_print.h"
 #include "decoder_list.h"
 #include "decoder_plugin.h"

src/decoder_thread.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_thread.h"
 #include "decoder_control.h"
 #include "decoder_internal.h"

src/directory.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "directory.h"
 #include "song.h"
 #include "path.h"

src/directory.h

@@ -20,7 +20,7 @@
 #ifndef MPD_DIRECTORY_H
 #define MPD_DIRECTORY_H
 
-#include "config.h" /* must be first for large file support */
+#include "check.h"
 #include "dirvec.h"
 #include "songvec.h"
 

src/directory_print.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "directory_print.h"
 #include "directory.h"
 #include "client.h"

src/directory_save.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "directory_save.h"
 #include "directory.h"
 #include "song.h"

src/dirvec.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "dirvec.h"
 #include "directory.h"
 

src/encoder/lame_encoder.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "encoder_api.h"
 #include "encoder_plugin.h"
 #include "audio_format.h"

src/encoder/null_encoder.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "encoder_api.h"
 #include "encoder_plugin.h"
 

src/encoder/twolame_encoder.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "encoder_api.h"
 #include "encoder_plugin.h"
 #include "audio_format.h"

src/encoder/vorbis_encoder.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "encoder_api.h"
 #include "encoder_plugin.h"
 #include "tag.h"

src/encoder/wave_encoder.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "encoder_api.h"
 #include "encoder_plugin.h"
 

src/encoder_list.c

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "encoder_list.h"
 #include "encoder_plugin.h"
-#include "config.h"
 
 #include <string.h>
 

src/event_pipe.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "event_pipe.h"
 #include "fd_util.h"
 

src/exclude.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include "config.h"
 #include "exclude.h"
 #include "path.h"
 

src/fifo_buffer.c

@@ -28,6 +28,7 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "fifo_buffer.h"
 
 #include <glib.h>

src/filter/chain_filter_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "filter/chain_filter_plugin.h"
 #include "filter_plugin.h"
 #include "filter_internal.h"

src/filter/convert_filter_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "filter/convert_filter_plugin.h"
 #include "filter_plugin.h"
 #include "filter_internal.h"

src/filter/null_filter_plugin.c

@@ -24,6 +24,7 @@
  * plugins.
  */
 
+#include "config.h"
 #include "filter_plugin.h"
 #include "filter_internal.h"
 #include "filter_registry.h"

src/filter/volume_filter_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "filter/volume_filter_plugin.h"
 #include "filter_plugin.h"
 #include "filter_internal.h"

src/filter_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "filter_plugin.h"
 #include "filter_internal.h"
 #include "filter_registry.h"

src/filter_registry.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "filter_registry.h"
 #include "filter_plugin.h"
 

src/icy_metadata.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "icy_metadata.h"
 #include "tag.h"
 

src/icy_server.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "icy_server.h"
 
 #include <glib.h>

src/idle.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include "config.h"
 #include "idle.h"
 #include "event_pipe.h"
 

src/inotify_queue.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "inotify_queue.h"
 #include "update.h"
 

src/inotify_source.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "inotify_source.h"
 #include "fifo_buffer.h"
 #include "fd_util.h"

src/inotify_update.h

@@ -20,7 +20,7 @@
 #ifndef MPD_INOTIFY_UPDATE_H
 #define MPD_INOTIFY_UPDATE_H
 
-#include "config.h"
+#include "check.h"
 
 #ifdef HAVE_INOTIFY_INIT
 

src/input/archive_input_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "input/archive_input_plugin.h"
 #include "archive_api.h"
 #include "archive_list.h"

src/input/curl_input_plugin.c

@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "input/curl_input_plugin.h"
 #include "input_plugin.h"
 #include "conf.h"
-#include "config.h"
 #include "tag.h"
 #include "icy_metadata.h"
 #include "glib_compat.h"

src/input/mms_input_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "input/mms_input_plugin.h"
 #include "input_plugin.h"
 

src/input_stream.c

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "input_plugin.h"
 #include "config.h"
+#include "input_plugin.h"
 #include "conf.h"
 
 #include "input/file_input_plugin.h"

src/input_stream.h

@@ -20,6 +20,8 @@
 #ifndef MPD_INPUT_STREAM_H
 #define MPD_INPUT_STREAM_H
 
+#include "check.h"
+
 #include <glib.h>
 
 #include <stddef.h>

src/listen.c

@@ -17,13 +17,13 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "listen.h"
 #include "socket_util.h"
 #include "client.h"
 #include "conf.h"
 #include "fd_util.h"
 #include "glib_compat.h"
-#include "config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>

src/locate.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "locate.h"
 #include "path.h"
 #include "tag.h"

src/log.c

@@ -17,11 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "log.h"
 #include "conf.h"
 #include "utils.h"
 #include "fd_util.h"
-#include "config.h"
 
 #include <assert.h>
 #include <sys/types.h>

src/ls.c

@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "ls.h"
 #include "uri.h"
 #include "client.h"
-#include "config.h"
 
 #include <assert.h>
 #include <string.h>

src/main.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "main.h"
 #include "daemon.h"
 #include "client.h"
@@ -48,7 +49,6 @@
 #include "state_file.h"
 #include "tag.h"
 #include "dbUtils.h"
-#include "config.h"
 #include "normalize.h"
 #include "zeroconf.h"
 #include "event_pipe.h"

src/mapper.c

@@ -21,6 +21,7 @@
  * Maps directory and song objects to file system paths.
  */
 
+#include "config.h"
 #include "mapper.h"
 #include "directory.h"
 #include "song.h"

src/mixer/alsa_mixer_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mixer_api.h"
 #include "output_api.h"
 

src/mixer/oss_mixer_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mixer_api.h"
 #include "output_api.h"
 #include "fd_util.h"

src/mixer/pulse_mixer_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pulse_mixer_plugin.h"
 #include "mixer_api.h"
 #include "output/pulse_output_plugin.h"

src/mixer/software_mixer_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "software_mixer_plugin.h"
 #include "mixer_api.h"
 #include "filter_plugin.h"

src/mixer_all.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mixer_all.h"
 #include "mixer_control.h"
 #include "output_all.h"

src/mixer_api.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mixer_api.h"
 
 #undef G_LOG_DOMAIN

src/mixer_control.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mixer_control.h"
 #include "mixer_api.h"
 

src/mixer_type.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mixer_type.h"
 
 #include <assert.h>

src/normalize.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "normalize.h"
 #include "compress.h"
 #include "conf.h"

src/notify.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "notify.h"
 
 void notify_init(struct notify *notify)

src/output/alsa_plugin.c

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../output_api.h"
+#include "config.h"
+#include "output_api.h"
 #include "mixer_list.h"
 
 #include <glib.h>

src/output/ao_plugin.c

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../output_api.h"
+#include "config.h"
+#include "output_api.h"
 
 #include <ao/ao.h>
 #include <glib.h>

src/output/fifo_output_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_api.h"
 #include "utils.h"
 #include "timer.h"

src/output/httpd_client.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "httpd_client.h"
 #include "httpd_internal.h"
 #include "fifo_buffer.h"

src/output/httpd_output_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "httpd_internal.h"
 #include "httpd_client.h"
 #include "output_api.h"

src/output/jack_output_plugin.c

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "output_api.h"
 #include "config.h"
+#include "output_api.h"
 
 #include <assert.h>
 

src/output/mvp_plugin.c

@@ -22,6 +22,7 @@
  * http://mvpmc.sourceforge.net/
  */
 
+#include "config.h"
 #include "output_api.h"
 #include "fd_util.h"
 

src/output/null_plugin.c

@@ -17,8 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../output_api.h"
-#include "../timer.h"
+#include "config.h"
+#include "output_api.h"
+#include "timer.h"
 
 #include <glib.h>
 

src/output/openal_plugin.c

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../output_api.h"
-#include "../timer.h"
 #include "config.h"
+#include "output_api.h"
+#include "timer.h"
 
 #include <glib.h>
 

src/output/oss_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_api.h"
 #include "mixer_list.h"
 #include "fd_util.h"

src/output/osx_plugin.c

@@ -17,7 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "../output_api.h"
+#include "config.h"
+#include "output_api.h"
 
 #include <glib.h>
 #include <AudioUnit/AudioUnit.h>

src/output/pipe_output_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_api.h"
 
 #include <stdio.h>

src/output/pulse_output_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pulse_output_plugin.h"
 #include "output_api.h"
 #include "mixer_list.h"

src/output/recorder_output_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_api.h"
 #include "encoder_plugin.h"
 #include "encoder_list.h"

src/output/shout_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_api.h"
 #include "encoder_plugin.h"
 #include "encoder_list.h"

src/output/solaris_output_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_api.h"
 #include "fd_util.h"
 

src/output_all.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_all.h"
 #include "output_internal.h"
 #include "output_control.h"

src/output_command.c

@@ -24,6 +24,7 @@
  *
  */
 
+#include "config.h"
 #include "output_command.h"
 #include "output_all.h"
 #include "output_internal.h"

src/output_control.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_control.h"
 #include "output_api.h"
 #include "output_internal.h"

src/output_init.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_control.h"
 #include "output_api.h"
 #include "output_internal.h"

src/output_list.c

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_list.h"
 #include "output_api.h"
-#include "config.h"
 
 extern const struct audio_output_plugin shoutPlugin;
 extern const struct audio_output_plugin null_output_plugin;

src/output_print.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include "config.h"
 #include "output_print.h"
 #include "output_internal.h"
 #include "output_all.h"

src/output_state.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include "config.h"
 #include "output_state.h"
 #include "output_internal.h"
 #include "output_all.h"

src/output_thread.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_thread.h"
 #include "output_api.h"
 #include "output_internal.h"

src/page.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "page.h"
 
 #include <glib.h>

src/path.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "path.h"
 #include "conf.h"
 

src/pcm_byteswap.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pcm_byteswap.h"
 #include "pcm_buffer.h"
 

src/pcm_channels.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pcm_channels.h"
 #include "pcm_buffer.h"
 

src/pcm_convert.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pcm_convert.h"
 #include "pcm_channels.h"
 #include "pcm_format.h"

src/pcm_dither.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pcm_dither.h"
 #include "pcm_prng.h"
 

src/pcm_format.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pcm_format.h"
 #include "pcm_dither.h"
 #include "pcm_buffer.h"

src/pcm_mix.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pcm_mix.h"
 #include "pcm_volume.h"
 #include "pcm_utils.h"

src/pcm_resample.c

@@ -17,8 +17,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "pcm_resample_internal.h"
 #include "config.h"
+#include "pcm_resample_internal.h"
 
 #ifdef HAVE_LIBSAMPLERATE
 #include "conf.h"

src/pcm_resample.h

@@ -20,8 +20,8 @@
 #ifndef MPD_PCM_RESAMPLE_H
 #define MPD_PCM_RESAMPLE_H
 
+#include "check.h"
 #include "pcm_buffer.h"
-#include "config.h"
 
 #include <stdint.h>
 #include <stddef.h>

src/pcm_resample_fallback.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pcm_resample_internal.h"
 
 #include <assert.h>

src/pcm_resample_internal.h

@@ -27,8 +27,8 @@
 #ifndef MPD_PCM_RESAMPLE_INTERNAL_H
 #define MPD_PCM_RESAMPLE_INTERNAL_H
 
+#include "check.h"
 #include "pcm_resample.h"
-#include "config.h"
 
 #ifdef HAVE_LIBSAMPLERATE
 

src/pcm_resample_libsamplerate.c

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pcm_resample_internal.h"
 #include "conf.h"
-#include "config.h"
 
 #include <glib.h>
 

src/pcm_volume.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pcm_volume.h"
 #include "pcm_utils.h"
 #include "audio_format.h"

src/permission.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "permission.h"
 #include "conf.h"
 

src/pipe.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "pipe.h"
 #include "buffer.h"
 #include "chunk.h"

src/player_control.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "player_control.h"
 #include "decoder_control.h"
 #include "path.h"

src/player_thread.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "player_thread.h"
 #include "player_control.h"
 #include "decoder_control.h"

src/playlist.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist_internal.h"
 #include "playlist_save.h"
 #include "player_control.h"

src/playlist/asx_playlist_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist/asx_playlist_plugin.h"
 #include "playlist_plugin.h"
 #include "input_stream.h"

src/playlist/extm3u_playlist_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist/extm3u_playlist_plugin.h"
 #include "playlist_plugin.h"
 #include "text_input_stream.h"

src/playlist/lastfm_playlist_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist/lastfm_playlist_plugin.h"
 #include "playlist_plugin.h"
 #include "playlist_list.h"

src/playlist/m3u_playlist_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist/m3u_playlist_plugin.h"
 #include "playlist_plugin.h"
 #include "text_input_stream.h"

src/playlist/pls_playlist_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist/pls_playlist_plugin.h"
 #include "playlist_plugin.h"
 #include "input_stream.h"

src/playlist/xspf_playlist_plugin.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist/xspf_playlist_plugin.h"
 #include "playlist_plugin.h"
 #include "input_stream.h"

src/playlist_control.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include "config.h"
 #include "playlist_internal.h"
 #include "player_control.h"
 

src/playlist_edit.c

@@ -23,6 +23,7 @@
  *
  */
 
+#include "config.h"
 #include "playlist_internal.h"
 #include "player_control.h"
 #include "database.h"

src/playlist_global.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include "config.h"
 #include "playlist.h"
 #include "playlist_state.h"
 #include "event_pipe.h"

src/playlist_list.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist_list.h"
 #include "playlist_plugin.h"
 #include "playlist/extm3u_playlist_plugin.h"
@@ -29,7 +30,6 @@
 #include "uri.h"
 #include "utils.h"
 #include "conf.h"
-#include "config.h"
 
 #include <glib.h>
 

src/playlist_print.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist_print.h"
 #include "queue_print.h"
 #include "stored_playlist.h"

src/playlist_queue.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist_queue.h"
 #include "playlist_list.h"
 #include "playlist_plugin.h"

src/playlist_save.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "playlist_save.h"
 #include "stored_playlist.h"
 #include "song.h"

src/playlist_state.c

@@ -22,6 +22,7 @@
  *
  */
 
+#include "config.h"
 #include "playlist_state.h"
 #include "playlist.h"
 #include "player_control.h"

src/poison.h

@@ -20,8 +20,9 @@
 #ifndef MPD_POISON_H
 #define MPD_POISON_H
 
+#include "check.h"
+
 #ifndef NDEBUG
-#include "config.h"
 
 #ifdef HAVE_VALGRIND_MEMCHECK_H
 #include <valgrind/memcheck.h>

src/queue.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "queue.h"
 #include "song.h"
 

src/queue_print.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "queue_print.h"
 #include "queue.h"
 #include "song.h"

src/queue_save.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "queue_save.h"
 #include "queue.h"
 #include "song.h"

src/replay_gain.c

@@ -20,6 +20,7 @@
  * (c)2004 replayGain code by AliasMrJones
  */
 
+#include "config.h"
 #include "replay_gain.h"
 #include "conf.h"
 #include "audio_format.h"

src/sig_handlers.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "sig_handlers.h"
 
 #ifndef WIN32

src/socket_util.c

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "socket_util.h"
 #include "fd_util.h"
-#include "config.h"
 
 #include <errno.h>
 #include <unistd.h>

src/song.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "song.h"
 #include "uri.h"
 #include "directory.h"

src/song_print.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "song_print.h"
 #include "song.h"
 #include "songvec.h"

src/song_save.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "song_save.h"
 #include "song.h"
 #include "tag_save.h"

src/song_sticker.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "song_sticker.h"
 #include "song.h"
 #include "directory.h"

src/songvec.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "songvec.h"
 #include "song.h"
 #include "tag.h"

src/state_file.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "state_file.h"
 #include "output_state.h"
 #include "playlist.h"

src/stats.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "stats.h"
 #include "database.h"
 #include "tag.h"

src/sticker.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "sticker.h"
 #include "idle.h"
 

src/sticker_print.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "sticker_print.h"
 #include "sticker.h"
 #include "client.h"

src/stored_playlist.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "stored_playlist.h"
 #include "playlist_save.h"
 #include "song.h"

src/strset.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "strset.h"
 
 #include <assert.h>

src/tag.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "tag.h"
 #include "tag_internal.h"
 #include "tag_pool.h"

src/tag_ape.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "tag_ape.h"
 #include "tag.h"
 

src/tag_id3.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "tag_id3.h"
 #include "tag.h"
 #include "riff.h"

src/tag_id3.h

@@ -20,7 +20,7 @@
 #ifndef MPD_TAG_ID3_H
 #define MPD_TAG_ID3_H
 
-#include "config.h"
+#include "check.h"
 
 struct tag;
 

src/tag_pool.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "tag_pool.h"
 
 #include <assert.h>

src/tag_print.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "tag_print.h"
 #include "tag.h"
 #include "tag_internal.h"

src/tag_save.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "tag_save.h"
 #include "tag.h"
 #include "tag_internal.h"

src/text_file.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "text_file.h"
 
 #include <assert.h>

src/text_input_stream.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "text_input_stream.h"
 #include "input_stream.h"
 #include "fifo_buffer.h"

src/timer.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "timer.h"
 #include "audio_format.h"
 

src/tokenizer.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "tokenizer.h"
 
 #include <stdbool.h>

src/update.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "update_internal.h"
 #include "update.h"
 #include "database.h"
@@ -27,7 +28,6 @@
 #include "idle.h"
 #include "stats.h"
 #include "main.h"
-#include "config.h"
 
 #include <glib.h>
 

src/update_queue.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "update_internal.h"
 
 #include <glib.h>

src/uri.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "uri.h"
 
 #include <glib.h>

src/utils.c

@@ -17,9 +17,9 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "utils.h"
 #include "conf.h"
-#include "config.h"
 
 #include <glib.h>
 

src/volume.c

@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "volume.h"
 #include "conf.h"
 #include "player_control.h"
 #include "idle.h"
 #include "pcm_volume.h"
-#include "config.h"
 #include "output_all.h"
 #include "mixer_control.h"
 #include "mixer_all.h"

src/zeroconf-avahi.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "zeroconf-internal.h"
 #include "listen.h"
 

src/zeroconf-bonjour.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "zeroconf-internal.h"
 #include "listen.h"
 

src/zeroconf.c

@@ -17,10 +17,10 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "zeroconf.h"
 #include "zeroconf-internal.h"
 #include "conf.h"
-#include "config.h"
 
 #include <glib.h>
 

src/zeroconf.h

@@ -20,7 +20,7 @@
 #ifndef MPD_ZEROCONF_H
 #define MPD_ZEROCONF_H
 
-#include "config.h"
+#include "check.h"
 
 #ifdef HAVE_ZEROCONF
 

test/dump_playlist.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "input_stream.h"
 #include "tag_pool.h"
 #include "tag_save.h"

test/read_conf.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "conf.h"
 
 #include <glib.h>

test/read_mixer.c

@@ -17,12 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "mixer_control.h"
 #include "mixer_list.h"
 #include "filter_registry.h"
 #include "pcm_volume.h"
 #include "event_pipe.h"
-#include "config.h"
 
 #include <glib.h>
 

test/read_tags.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_list.h"
 #include "decoder_api.h"
 #include "input_stream.h"
@@ -24,7 +25,6 @@
 #include "pcm_volume.h"
 #include "tag_ape.h"
 #include "tag_id3.h"
-#include "config.h"
 #include "idle.h"
 
 #include <glib.h>

test/run_decoder.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "decoder_list.h"
 #include "decoder_api.h"
 #include "input_stream.h"

test/run_encoder.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "encoder_list.h"
 #include "encoder_plugin.h"
 #include "audio_format.h"

test/run_filter.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "conf.h"
 #include "audio_parser.h"
 #include "audio_format.h"

test/run_input.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "input_stream.h"
 #include "tag_pool.h"
 #include "tag_save.h"

test/run_output.c

@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include "config.h"
 #include "output_plugin.h"
 #include "output_internal.h"
 #include "output_control.h"

test/software_volume.c

@@ -23,6 +23,7 @@
  *
  */
 
+#include "config.h"
 #include "pcm_volume.h"
 #include "audio_parser.h"
 #include "audio_format.h"