18 files changed, 19 insertions, 11 deletions
diff --git a/src/archive/bz2_plugin.c b/src/archive/bz2_plugin.c
index 982b88182..b63a9ddfc 100644
--- a/src/archive/bz2_plugin.c
+++ b/src/archive/bz2_plugin.c
@@ -22,6 +22,7 @@
 
 #include "archive_api.h"
 #include "input_stream.h"
+#include "config.h"
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/archive_list.c b/src/archive_list.c
index 046c6dbe4..bd4d985fe 100644
--- a/src/archive_list.c
+++ b/src/archive_list.c
@@ -1,6 +1,3 @@
-
-
-
 /* the Music Player Daemon (MPD)
  * Copyright (C) 2008 Viliam Mateicka <viliam.mateicka@gmail.com>
  * This project's homepage is: http://www.musicpd.org
@@ -22,7 +19,7 @@
 #include "archive_list.h"
 #include "archive_api.h"
 #include "utils.h"
-#include "../config.h"
+#include "config.h"
 
 #include <string.h>
 #include <glib.h>
diff --git a/src/client.c b/src/client.c
index 852e838b6..1c5d8b9b2 100644
--- a/src/client.c
+++ b/src/client.c
@@ -24,8 +24,7 @@
 #include "event_pipe.h"
 #include "idle.h"
 #include "main.h"
-
-#include "../config.h"
+#include "config.h"
 
 #include <glib.h>
 #include <assert.h>
diff --git a/src/command.c b/src/command.c
index 8fb20a5d6..c9b3db1ca 100644
--- a/src/command.c
+++ b/src/command.c
@@ -38,6 +38,7 @@
 #include "tag_print.h"
 #include "path.h"
 #include "idle.h"
+#include "config.h"
 
 #include <assert.h>
 #include <time.h>
diff --git a/src/decoder/aac_plugin.c b/src/decoder/aac_plugin.c
index 19a7d7c9c..f2907129e 100644
--- a/src/decoder/aac_plugin.c
+++ b/src/decoder/aac_plugin.c
@@ -17,6 +17,7 @@
  */
 
 #include "../decoder_api.h"
+#include "config.h"
 
 #define AAC_MAX_CHANNELS	6
 
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index 0475f442e..a5e728a39 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -17,6 +17,7 @@
  */
 
 #include "../decoder_api.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/src/decoder/mp3_plugin.c b/src/decoder/mp3_plugin.c
index 6fedf3766..3444a7e94 100644
--- a/src/decoder/mp3_plugin.c
+++ b/src/decoder/mp3_plugin.c
@@ -18,6 +18,7 @@
 
 #include "../decoder_api.h"
 #include "../conf.h"
+#include "config.h"
 
 #include <assert.h>
 #include <unistd.h>
diff --git a/src/decoder/mp4_plugin.c b/src/decoder/mp4_plugin.c
index dd57a8e13..bc36acf8a 100644
--- a/src/decoder/mp4_plugin.c
+++ b/src/decoder/mp4_plugin.c
@@ -1,7 +1,7 @@
 /* the Music Player Daemon (MPD)
  * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com)
  * This project's homepage is: 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
@@ -17,6 +17,7 @@
  */
 
 #include "../decoder_api.h"
+#include "config.h"
 
 #include "mp4ff.h"
 
diff --git a/src/decoder/mpc_plugin.c b/src/decoder/mpc_plugin.c
index 19a0e2409..5ef2c5448 100644
--- a/src/decoder/mpc_plugin.c
+++ b/src/decoder/mpc_plugin.c
@@ -17,6 +17,7 @@
  */
 
 #include "../decoder_api.h"
+#include "config.h"
 
 #include <mpcdec/mpcdec.h>
 #include <glib.h>
diff --git a/src/decoder/oggvorbis_plugin.c b/src/decoder/oggvorbis_plugin.c
index ccfeb5719..285ad6d07 100644
--- a/src/decoder/oggvorbis_plugin.c
+++ b/src/decoder/oggvorbis_plugin.c
@@ -19,6 +19,7 @@
 /* TODO 'ogg' should probably be replaced with 'oggvorbis' in all instances */
 
 #include "_ogg_common.h"
+#include "config.h"
 
 #ifndef HAVE_TREMOR
 #include <vorbis/vorbisfile.h>
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 779b5c1af..13e3ec047 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -19,6 +19,7 @@
 #include "decoder_list.h"
 #include "decoder_api.h"
 #include "utils.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/src/main.c b/src/main.c
index 2e8700f02..7dfaf52da 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,7 +47,7 @@
 #include "state_file.h"
 #include "tag.h"
 #include "dbUtils.h"
-#include "../config.h"
+#include "config.h"
 #include "normalize.h"
 #include "zeroconf.h"
 #include "event_pipe.h"
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c
index 9edaf63af..06c229e0c 100644
--- a/src/output/shout_plugin.c
+++ b/src/output/shout_plugin.c
@@ -17,6 +17,7 @@
  */
 
 #include "shout_plugin.h"
+#include "config.h"
 
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/output_list.c b/src/output_list.c
index c1af80917..0f5540dd8 100644
--- a/src/output_list.c
+++ b/src/output_list.c
@@ -18,6 +18,7 @@
 
 #include "output_list.h"
 #include "output_api.h"
+#include "config.h"
 
 extern const struct audio_output_plugin shoutPlugin;
 extern const struct audio_output_plugin nullPlugin;
diff --git a/src/pcm_resample_libsamplerate.c b/src/pcm_resample_libsamplerate.c
index 2f672b5a2..5d2c31c1c 100644
--- a/src/pcm_resample_libsamplerate.c
+++ b/src/pcm_resample_libsamplerate.c
@@ -19,6 +19,7 @@
 
 #include "pcm_resample.h"
 #include "conf.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/src/tag_id3.h b/src/tag_id3.h
index 101c60b0f..2753f46ca 100644
--- a/src/tag_id3.h
+++ b/src/tag_id3.h
@@ -19,7 +19,7 @@
 #ifndef MPD_TAG_ID3_H
 #define MPD_TAG_ID3_H
 
-#include "../config.h"
+#include "config.h"
 
 struct tag;
 
diff --git a/src/utils.c b/src/utils.c
index 43ccb2fc2..ca0301e1d 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -18,8 +18,7 @@
 
 #include "utils.h"
 #include "conf.h"
-
-#include "../config.h"
+#include "config.h"
 
 #include <glib.h>
 
diff --git a/src/zeroconf.c b/src/zeroconf.c
index f84eb9602..dd9790ae3 100644
--- a/src/zeroconf.c
+++ b/src/zeroconf.c
@@ -19,6 +19,7 @@
 #include "zeroconf.h"
 #include "zeroconf-internal.h"
 #include "conf.h"
+#include "config.h"
 
 #include <glib.h>