aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-31 09:19:53 +0100
committerMax Kellermann <max@duempel.org>2008-10-31 09:19:53 +0100
commitea515494cb23160c2eb05835411b8927a025026f (patch)
tree8b776099c50bc1b41b5a986eb9811e621e40e81c /src
parent5ef17ac1aa9839208513be67a64fbf78658cf21e (diff)
downloadmpd-ea515494cb23160c2eb05835411b8927a025026f.tar.gz
mpd-ea515494cb23160c2eb05835411b8927a025026f.tar.xz
mpd-ea515494cb23160c2eb05835411b8927a025026f.zip
added prefix to header macros
"LOG_H" is a macro which is also used by ffmpeg/log.h. This is ffmpeg's fault, because short macros should be reserved for applications, but since it's always a good idea to choose prefixed macro names, even for applications, we are going to do that in MPD.
Diffstat (limited to 'src')
-rw-r--r--src/ack.h4
-rw-r--r--src/audio.h4
-rw-r--r--src/audioOutput.h4
-rw-r--r--src/audio_format.h4
-rw-r--r--src/buffer2array.h4
-rw-r--r--src/client.h4
-rw-r--r--src/command.h4
-rw-r--r--src/compress.h4
-rw-r--r--src/condition.h4
-rw-r--r--src/conf.h4
-rw-r--r--src/crossfade.h4
-rw-r--r--src/database.h4
-rw-r--r--src/dbUtils.h4
-rw-r--r--src/decoder/_flac_common.h4
-rw-r--r--src/decoder/_ogg_common.h4
-rw-r--r--src/decoder_api.h4
-rw-r--r--src/decoder_control.h4
-rw-r--r--src/decoder_internal.h4
-rw-r--r--src/decoder_list.h4
-rw-r--r--src/decoder_thread.h4
-rw-r--r--src/directory.h4
-rw-r--r--src/directory_print.h4
-rw-r--r--src/directory_save.h4
-rw-r--r--src/dirvec.h4
-rw-r--r--src/dlist.h4
-rw-r--r--src/input_file.h4
-rw-r--r--src/input_stream.h4
-rw-r--r--src/ioops.h4
-rw-r--r--src/list.h4
-rw-r--r--src/listen.h4
-rw-r--r--src/locate.h4
-rw-r--r--src/log.h4
-rw-r--r--src/ls.h4
-rw-r--r--src/main_notify.h4
-rw-r--r--src/mapper.h4
-rw-r--r--src/normalize.h4
-rw-r--r--src/notify.h4
-rw-r--r--src/os_compat.h4
-rw-r--r--src/output/shout_plugin.h4
-rw-r--r--src/outputBuffer.h4
-rw-r--r--src/output_api.h4
-rw-r--r--src/output_control.h4
-rw-r--r--src/output_internal.h4
-rw-r--r--src/output_list.h4
-rw-r--r--src/output_thread.h4
-rw-r--r--src/path.h4
-rw-r--r--src/pcm_dither.h4
-rw-r--r--src/pcm_utils.h4
-rw-r--r--src/permission.h4
-rw-r--r--src/playerData.h4
-rw-r--r--src/player_control.h4
-rw-r--r--src/player_thread.h4
-rw-r--r--src/playlist.h4
-rw-r--r--src/playlist_save.h4
-rw-r--r--src/replayGain.h4
-rw-r--r--src/ringbuf.h4
-rw-r--r--src/sig_handlers.h4
-rw-r--r--src/signal_check.h4
-rw-r--r--src/song.h4
-rw-r--r--src/song_print.h4
-rw-r--r--src/song_save.h4
-rw-r--r--src/songvec.h4
-rw-r--r--src/state_file.h4
-rw-r--r--src/stats.h4
-rw-r--r--src/strset.h4
-rw-r--r--src/tag.h4
-rw-r--r--src/tag_internal.h4
-rw-r--r--src/tag_pool.h4
-rw-r--r--src/tag_print.h4
-rw-r--r--src/tag_save.h4
-rw-r--r--src/update.h4
-rw-r--r--src/utf8.h4
-rw-r--r--src/utils.h4
-rw-r--r--src/volume.h4
-rw-r--r--src/zeroconf.h4
75 files changed, 150 insertions, 150 deletions
diff --git a/src/ack.h b/src/ack.h
index 1bba007ca..01d90dab6 100644
--- a/src/ack.h
+++ b/src/ack.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef ACK_H
-#define ACK_H
+#ifndef MPD_ACK_H
+#define MPD_ACK_H
enum ack {
ACK_ERROR_NOT_LIST = 1,
diff --git a/src/audio.h b/src/audio.h
index c6f6cbde0..df2f5a9d3 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef AUDIO_H
-#define AUDIO_H
+#ifndef MPD_AUDIO_H
+#define MPD_AUDIO_H
#include <stdbool.h>
#include <stdio.h>
diff --git a/src/audioOutput.h b/src/audioOutput.h
index cb4c11733..1804d9316 100644
--- a/src/audioOutput.h
+++ b/src/audioOutput.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef AUDIO_OUTPUT_H
-#define AUDIO_OUTPUT_H
+#ifndef MPD_AUDIO_OUTPUT_H
+#define MPD_AUDIO_OUTPUT_H
#include <stdio.h>
diff --git a/src/audio_format.h b/src/audio_format.h
index bbebc51b1..d2f32b858 100644
--- a/src/audio_format.h
+++ b/src/audio_format.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef AUDIO_FORMAT_H
-#define AUDIO_FORMAT_H
+#ifndef MPD_AUDIO_FORMAT_H
+#define MPD_AUDIO_FORMAT_H
#include <stdint.h>
#include <stdbool.h>
diff --git a/src/buffer2array.h b/src/buffer2array.h
index b1b1e6a4a..157f0371a 100644
--- a/src/buffer2array.h
+++ b/src/buffer2array.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef BUFFER_2_ARRAY_H
-#define BUFFER_2_ARRAY_H
+#ifndef MPD_BUFFER_2_ARRAY_H
+#define MPD_BUFFER_2_ARRAY_H
/* tokenizes up to max elements in buffer (a null-terminated string) and
* stores the result in array (which must be capable of holding up to
diff --git a/src/client.h b/src/client.h
index 64ba33b14..bcbc7126c 100644
--- a/src/client.h
+++ b/src/client.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef INTERFACE_H
-#define INTERFACE_H
+#ifndef MPD_CLIENT_H
+#define MPD_CLIENT_H
#include "gcc.h"
diff --git a/src/command.h b/src/command.h
index bcefd0376..ac557b2fc 100644
--- a/src/command.h
+++ b/src/command.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef COMMAND_H
-#define COMMAND_H
+#ifndef MPD_COMMAND_H
+#define MPD_COMMAND_H
#include "gcc.h"
#include "ack.h"
diff --git a/src/compress.h b/src/compress.h
index c0cee7821..bb4035fb4 100644
--- a/src/compress.h
+++ b/src/compress.h
@@ -20,8 +20,8 @@
*
*/
-#ifndef COMPRESS_H
-#define COMPRESS_H
+#ifndef MPD_COMPRESS_H
+#define MPD_COMPRESS_H
/* These are copied from the AudioCompress config.h, mainly because CompressDo
* needs GAINSHIFT defined. The rest are here so they can be used as defaults
diff --git a/src/condition.h b/src/condition.h
index 2909f698d..48d8735ee 100644
--- a/src/condition.h
+++ b/src/condition.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef CONDITION_H
-#define CONDITION_H
+#ifndef MPD_CONDITION_H
+#define MPD_CONDITION_H
#include <pthread.h>
diff --git a/src/conf.h b/src/conf.h
index 5891eddf9..e5875d9b7 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef CONF_H
-#define CONF_H
+#ifndef MPD_CONF_H
+#define MPD_CONF_H
#define CONF_MUSIC_DIR "music_directory"
#define CONF_PLAYLIST_DIR "playlist_directory"
diff --git a/src/crossfade.h b/src/crossfade.h
index 918c6e97e..a8b6e85ad 100644
--- a/src/crossfade.h
+++ b/src/crossfade.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef CROSSFADE_H
-#define CROSSFADE_H
+#ifndef MPD_CROSSFADE_H
+#define MPD_CROSSFADE_H
#include "outputBuffer.h"
diff --git a/src/database.h b/src/database.h
index 134c21dc4..b6884b604 100644
--- a/src/database.h
+++ b/src/database.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DATABASE_H
-#define DATABASE_H
+#ifndef MPD_DATABASE_H
+#define MPD_DATABASE_H
#include <sys/time.h>
diff --git a/src/dbUtils.h b/src/dbUtils.h
index 2cc7b9f25..1ccd75793 100644
--- a/src/dbUtils.h
+++ b/src/dbUtils.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DB_UTILS_H
-#define DB_UTILS_H
+#ifndef MPD_DB_UTILS_H
+#define MPD_DB_UTILS_H
#include "locate.h"
diff --git a/src/decoder/_flac_common.h b/src/decoder/_flac_common.h
index 052074980..c1c648a62 100644
--- a/src/decoder/_flac_common.h
+++ b/src/decoder/_flac_common.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _FLAC_COMMON_H
-#define _FLAC_COMMON_H
+#ifndef MPD_FLAC_COMMON_H
+#define MPD_FLAC_COMMON_H
#include "../decoder_api.h"
diff --git a/src/decoder/_ogg_common.h b/src/decoder/_ogg_common.h
index d03bae301..efc71c56e 100644
--- a/src/decoder/_ogg_common.h
+++ b/src/decoder/_ogg_common.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef _OGG_COMMON_H
-#define _OGG_COMMON_H
+#ifndef MPD_OGG_COMMON_H
+#define MPD_OGG_COMMON_H
#include "../decoder_api.h"
diff --git a/src/decoder_api.h b/src/decoder_api.h
index 808eb979e..a48718846 100644
--- a/src/decoder_api.h
+++ b/src/decoder_api.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DECODER_API_H
-#define DECODER_API_H
+#ifndef MPD_DECODER_API_H
+#define MPD_DECODER_API_H
/*
* This is the public API which is used by decoder plugins to
diff --git a/src/decoder_control.h b/src/decoder_control.h
index d03d28a46..bfee8a259 100644
--- a/src/decoder_control.h
+++ b/src/decoder_control.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DECODE_H
-#define DECODE_H
+#ifndef MPD_DECODER_CONTROL_H
+#define MPD_DECODER_CONTROL_H
#include "decoder_api.h"
diff --git a/src/decoder_internal.h b/src/decoder_internal.h
index ee8f23b8b..45c104651 100644
--- a/src/decoder_internal.h
+++ b/src/decoder_internal.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DECODER_INTERNAL_H
-#define DECODER_INTERNAL_H
+#ifndef MPD_DECODER_INTERNAL_H
+#define MPD_DECODER_INTERNAL_H
#include "decoder_api.h"
#include "pcm_utils.h"
diff --git a/src/decoder_list.h b/src/decoder_list.h
index b17e5caab..ea3eb7f92 100644
--- a/src/decoder_list.h
+++ b/src/decoder_list.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef INPUT_PLUGIN_H
-#define INPUT_PLUGIN_H
+#ifndef MPD_DECODER_LIST_H
+#define MPD_DECODER_LIST_H
#include <stdio.h>
diff --git a/src/decoder_thread.h b/src/decoder_thread.h
index 27ca8a9b2..7dd4b4bfd 100644
--- a/src/decoder_thread.h
+++ b/src/decoder_thread.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DECODER_THREAD_H
-#define DECODER_THREAD_H
+#ifndef MPD_DECODER_THREAD_H
+#define MPD_DECODER_THREAD_H
void decoder_thread_start(void);
diff --git a/src/directory.h b/src/directory.h
index 8cb5ed5f8..72efa9c91 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DIRECTORY_H
-#define DIRECTORY_H
+#ifndef MPD_DIRECTORY_H
+#define MPD_DIRECTORY_H
#include "dirvec.h"
#include "songvec.h"
diff --git a/src/directory_print.h b/src/directory_print.h
index b5dcdd703..95837197a 100644
--- a/src/directory_print.h
+++ b/src/directory_print.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DIRECTORY_PRINT_H
-#define DIRECTORY_PRINT_H
+#ifndef MPD_DIRECTORY_PRINT_H
+#define MPD_DIRECTORY_PRINT_H
struct client;
struct directory;
diff --git a/src/directory_save.h b/src/directory_save.h
index c3c56d95d..54143915c 100644
--- a/src/directory_save.h
+++ b/src/directory_save.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef DIRECTORY_SAVE_H
-#define DIRECTORY_SAVE_H
+#ifndef MPD_DIRECTORY_SAVE_H
+#define MPD_DIRECTORY_SAVE_H
#include <stdio.h>
diff --git a/src/dirvec.h b/src/dirvec.h
index 746143aee..fe983e258 100644
--- a/src/dirvec.h
+++ b/src/dirvec.h
@@ -1,5 +1,5 @@
-#ifndef DIRVEC_H
-#define DIRVEC_H
+#ifndef MPD_DIRVEC_H
+#define MPD_DIRVEC_H
#include <stddef.h>
diff --git a/src/dlist.h b/src/dlist.h
index 8a1e5fede..b0af2ea07 100644
--- a/src/dlist.h
+++ b/src/dlist.h
@@ -21,8 +21,8 @@
*
*/
-#ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
+#ifndef MPD_DLIST_H
+#define MPD_DLIST_H
/*
* These are non-NULL pointers that will result in page faults
diff --git a/src/input_file.h b/src/input_file.h
index 4374f0988..7f3351d19 100644
--- a/src/input_file.h
+++ b/src/input_file.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef INPUT_STREAM_FILE_H
-#define INPUT_STREAM_FILE_H
+#ifndef MPD_INPUT_FILE_H
+#define MPD_INPUT_FILE_H
#include "input_stream.h"
diff --git a/src/input_stream.h b/src/input_stream.h
index 3787d9ce5..dc1739dde 100644
--- a/src/input_stream.h
+++ b/src/input_stream.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef INPUT_STREAM_H
-#define INPUT_STREAM_H
+#ifndef MPD_INPUT_STREAM_H
+#define MPD_INPUT_STREAM_H
#include <stddef.h>
#include <stdbool.h>
diff --git a/src/ioops.h b/src/ioops.h
index 1187ceb50..7a568e403 100644
--- a/src/ioops.h
+++ b/src/ioops.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef IOOPS_H
-#define IOOPS_H
+#ifndef MPD_IOOPS_H
+#define MPD_IOOPS_H
#include <sys/select.h>
diff --git a/src/list.h b/src/list.h
index de2bdc931..7f0288035 100644
--- a/src/list.h
+++ b/src/list.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef LIST_H
-#define LIST_H
+#ifndef MPD_LIST_H
+#define MPD_LIST_H
/* used to make a list where free() will be used to free data in list */
#define DEFAULT_FREE_DATA_FUNC free
diff --git a/src/listen.h b/src/listen.h
index 73f248bb3..caf839fcb 100644
--- a/src/listen.h
+++ b/src/listen.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef LISTEN_H
-#define LISTEN_H
+#ifndef MPD_LISTEN_H
+#define MPD_LISTEN_H
#include <sys/select.h>
diff --git a/src/locate.h b/src/locate.h
index 4fbc634b7..1e57686de 100644
--- a/src/locate.h
+++ b/src/locate.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef LOCATE_H
-#define LOCATE_H
+#ifndef MPD_LOCATE_H
+#define MPD_LOCATE_H
#include <stdint.h>
diff --git a/src/log.h b/src/log.h
index 734c4756c..2e76f0a73 100644
--- a/src/log.h
+++ b/src/log.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef LOG_H
-#define LOG_H
+#ifndef MPD_LOG_H
+#define MPD_LOG_H
#include "gcc.h"
diff --git a/src/ls.h b/src/ls.h
index ddfc3c319..da79bbbd2 100644
--- a/src/ls.h
+++ b/src/ls.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef LS_H
-#define LS_H
+#ifndef MPD_LS_H
+#define MPD_LS_H
#include "decoder_list.h"
diff --git a/src/main_notify.h b/src/main_notify.h
index aaa1f20b4..b6a252d13 100644
--- a/src/main_notify.h
+++ b/src/main_notify.h
@@ -18,8 +18,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef MAIN_NOTIFY_H
-#define MAIN_NOTIFY_H
+#ifndef MPD_MAIN_NOTIFY_H
+#define MPD_MAIN_NOTIFY_H
#include <pthread.h>
diff --git a/src/mapper.h b/src/mapper.h
index ff6603d1e..03835a6eb 100644
--- a/src/mapper.h
+++ b/src/mapper.h
@@ -20,8 +20,8 @@
* Maps directory and song objects to file system paths.
*/
-#ifndef MAPPER_H
-#define MAPPER_H
+#ifndef MPD_MAPPER_H
+#define MPD_MAPPER_H
struct directory;
struct song;
diff --git a/src/normalize.h b/src/normalize.h
index a67899c15..dd6b149ac 100644
--- a/src/normalize.h
+++ b/src/normalize.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef NORMALIZE_H
-#define NORMALIZE_H
+#ifndef MPD_NORMALIZE_H
+#define MPD_NORMALIZE_H
struct audio_format;
diff --git a/src/notify.h b/src/notify.h
index 0875eb3ce..13b7dbe2e 100644
--- a/src/notify.h
+++ b/src/notify.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef NOTIFY_H
-#define NOTIFY_H
+#ifndef MPD_NOTIFY_H
+#define MPD_NOTIFY_H
#include <stdbool.h>
#include <pthread.h>
diff --git a/src/os_compat.h b/src/os_compat.h
index 772ba4957..a034af10c 100644
--- a/src/os_compat.h
+++ b/src/os_compat.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OS_COMPAT_H
-#define OS_COMPAT_H
+#ifndef MPD_OS_COMPAT_H
+#define MPD_OS_COMPAT_H
#include "../config.h"
diff --git a/src/output/shout_plugin.h b/src/output/shout_plugin.h
index 2ddde22ae..aa084d988 100644
--- a/src/output/shout_plugin.h
+++ b/src/output/shout_plugin.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef AUDIO_OUTPUT_SHOUT_H
-#define AUDIO_OUTPUT_SHOUT_H
+#ifndef MPD_SHOUT_PLUGIN_H
+#define MPD_SHOUT_PLUGIN_H
#include "../output_api.h"
#include "../conf.h"
diff --git a/src/outputBuffer.h b/src/outputBuffer.h
index 53c3893c9..4769abc19 100644
--- a/src/outputBuffer.h
+++ b/src/outputBuffer.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_BUFFER_H
-#define OUTPUT_BUFFER_H
+#ifndef MPD_OUTPUT_BUFFER_H
+#define MPD_OUTPUT_BUFFER_H
#include "audio_format.h"
diff --git a/src/output_api.h b/src/output_api.h
index fb0844cd8..9d4df7f37 100644
--- a/src/output_api.h
+++ b/src/output_api.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_API_H
-#define OUTPUT_API_H
+#ifndef MPD_OUTPUT_API_H
+#define MPD_OUTPUT_API_H
#include "../config.h"
#include "audio_format.h"
diff --git a/src/output_control.h b/src/output_control.h
index 62e88eb0f..899c763ae 100644
--- a/src/output_control.h
+++ b/src/output_control.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_CONTROL_H
-#define OUTPUT_CONTROL_H
+#ifndef MPD_OUTPUT_CONTROL_H
+#define MPD_OUTPUT_CONTROL_H
#include "conf.h"
diff --git a/src/output_internal.h b/src/output_internal.h
index 97b242551..cea1455e3 100644
--- a/src/output_internal.h
+++ b/src/output_internal.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_INTERNAL_H
-#define OUTPUT_INTERNAL_H
+#ifndef MPD_OUTPUT_INTERNAL_H
+#define MPD_OUTPUT_INTERNAL_H
#include "pcm_utils.h"
#include "notify.h"
diff --git a/src/output_list.h b/src/output_list.h
index 1be0b8169..9836c83e6 100644
--- a/src/output_list.h
+++ b/src/output_list.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_LIST_H
-#define OUTPUT_LIST_H
+#ifndef MPD_OUTPUT_LIST_H
+#define MPD_OUTPUT_LIST_H
extern const struct audio_output_plugin *audio_output_plugins[];
diff --git a/src/output_thread.h b/src/output_thread.h
index 2b2f1fb3d..1b196123d 100644
--- a/src/output_thread.h
+++ b/src/output_thread.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef OUTPUT_THREAD_H
-#define OUTPUT_THREAD_H
+#ifndef MPD_OUTPUT_THREAD_H
+#define MPD_OUTPUT_THREAD_H
struct audio_output;
diff --git a/src/path.h b/src/path.h
index 6b288a26c..013da1373 100644
--- a/src/path.h
+++ b/src/path.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PATH_H
-#define PATH_H
+#ifndef MPD_PATH_H
+#define MPD_PATH_H
#include "os_compat.h"
diff --git a/src/pcm_dither.h b/src/pcm_dither.h
index 202521497..cda81e034 100644
--- a/src/pcm_dither.h
+++ b/src/pcm_dither.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PCM_DITHER_H
-#define PCM_DITHER_H
+#ifndef MPD_PCM_DITHER_H
+#define MPD_PCM_DITHER_H
#include <stdint.h>
diff --git a/src/pcm_utils.h b/src/pcm_utils.h
index 3599b7076..1668bbf0c 100644
--- a/src/pcm_utils.h
+++ b/src/pcm_utils.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PCM_UTILS_H
-#define PCM_UTILS_H
+#ifndef MPD_PCM_UTILS_H
+#define MPD_PCM_UTILS_H
#include "pcm_resample.h"
#include "pcm_dither.h"
diff --git a/src/permission.h b/src/permission.h
index 93f85cf7d..590611ff7 100644
--- a/src/permission.h
+++ b/src/permission.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PERMISSION_H
-#define PERMISSION_H
+#ifndef MPD_PERMISSION_H
+#define MPD_PERMISSION_H
#define PERMISSION_NONE 0
#define PERMISSION_READ 1
diff --git a/src/playerData.h b/src/playerData.h
index 48d0c09c0..45f523852 100644
--- a/src/playerData.h
+++ b/src/playerData.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PLAYER_DATA_H
-#define PLAYER_DATA_H
+#ifndef MPD_PLAYER_DATA_H
+#define MPD_PLAYER_DATA_H
extern unsigned int buffered_chunks;
extern unsigned int buffered_before_play;
diff --git a/src/player_control.h b/src/player_control.h
index bd557ce57..8d89bfb2a 100644
--- a/src/player_control.h
+++ b/src/player_control.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PLAYER_H
-#define PLAYER_H
+#ifndef MPD_PLAYER_H
+#define MPD_PLAYER_H
#include "notify.h"
#include "audio_format.h"
diff --git a/src/player_thread.h b/src/player_thread.h
index 4d154d6a1..f8b88f65d 100644
--- a/src/player_thread.h
+++ b/src/player_thread.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PLAYER_THREAD_H
-#define PLAYER_THREAD_H
+#ifndef MPD_PLAYER_THREAD_H
+#define MPD_PLAYER_THREAD_H
void player_create(void);
diff --git a/src/playlist.h b/src/playlist.h
index 4e9929854..419b169ca 100644
--- a/src/playlist.h
+++ b/src/playlist.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PLAYLIST_H
-#define PLAYLIST_H
+#ifndef MPD_PLAYLIST_H
+#define MPD_PLAYLIST_H
#include "locate.h"
diff --git a/src/playlist_save.h b/src/playlist_save.h
index f595d6561..b9e8169e6 100644
--- a/src/playlist_save.h
+++ b/src/playlist_save.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef PLAYLIST_SAVE_H
-#define PLAYLIST_SAVE_H
+#ifndef MPD_PLAYLIST_SAVE_H
+#define MPD_PLAYLIST_SAVE_H
#include <stdio.h>
diff --git a/src/replayGain.h b/src/replayGain.h
index 8b634cad6..f1c24e1c0 100644
--- a/src/replayGain.h
+++ b/src/replayGain.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef REPLAYGAIN_H
-#define REPLAYGAIN_H
+#ifndef MPD_REPLAYGAIN_H
+#define MPD_REPLAYGAIN_H
#define REPLAYGAIN_OFF 0
#define REPLAYGAIN_TRACK 1
diff --git a/src/ringbuf.h b/src/ringbuf.h
index ebcd2d8ef..f45ab2da9 100644
--- a/src/ringbuf.h
+++ b/src/ringbuf.h
@@ -19,8 +19,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef RINGBUF_H
-#define RINGBUF_H
+#ifndef MPD_RINGBUF_H
+#define MPD_RINGBUF_H
#include <stddef.h>
#include <sys/uio.h>
diff --git a/src/sig_handlers.h b/src/sig_handlers.h
index ee61e80e1..b34a941d9 100644
--- a/src/sig_handlers.h
+++ b/src/sig_handlers.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef SIG_HANDLERS_H
-#define SIG_HANDLERS_H
+#ifndef MPD_SIG_HANDLERS_H
+#define MPD_SIG_HANDLERS_H
int handlePendingSignals(void);
diff --git a/src/signal_check.h b/src/signal_check.h
index 224e9cb44..d241cb01f 100644
--- a/src/signal_check.h
+++ b/src/signal_check.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef SIGNAL_CHECK_H
-#define SIGNAL_CHECK_H
+#ifndef MPD_SIGNAL_CHECK_H
+#define MPD_SIGNAL_CHECK_H
void signal_handle(int sig);
void signal_unhandle(int sig);
diff --git a/src/song.h b/src/song.h
index e5413fb17..b8ee3aa99 100644
--- a/src/song.h
+++ b/src/song.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef SONG_H
-#define SONG_H
+#ifndef MPD_SONG_H
+#define MPD_SONG_H
#include <stddef.h>
#include <stdbool.h>
diff --git a/src/song_print.h b/src/song_print.h
index 85fbcf036..4ecdc1baa 100644
--- a/src/song_print.h
+++ b/src/song_print.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef SONG_PRINT_H
-#define SONG_PRINT_H
+#ifndef MPD_SONG_PRINT_H
+#define MPD_SONG_PRINT_H
struct client;
struct song;
diff --git a/src/song_save.h b/src/song_save.h
index 480e35ae4..a11e004c1 100644
--- a/src/song_save.h
+++ b/src/song_save.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef SONG_SAVE_H
-#define SONG_SAVE_H
+#ifndef MPD_SONG_SAVE_H
+#define MPD_SONG_SAVE_H
#include <stdio.h>
diff --git a/src/songvec.h b/src/songvec.h
index a59874e93..d78b50a6e 100644
--- a/src/songvec.h
+++ b/src/songvec.h
@@ -1,5 +1,5 @@
-#ifndef SONGVEC_H
-#define SONGVEC_H
+#ifndef MPD_SONGVEC_H
+#define MPD_SONGVEC_H
#include <stddef.h>
diff --git a/src/state_file.h b/src/state_file.h
index 29f071a97..d92392437 100644
--- a/src/state_file.h
+++ b/src/state_file.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef STATE_FILE_H
-#define STATE_FILE_H
+#ifndef MPD_STATE_FILE_H
+#define MPD_STATE_FILE_H
#include "gcc.h"
diff --git a/src/stats.h b/src/stats.h
index ac81f42f2..81724c71c 100644
--- a/src/stats.h
+++ b/src/stats.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef STATS_H
-#define STATS_H
+#ifndef MPD_STATS_H
+#define MPD_STATS_H
struct client;
diff --git a/src/strset.h b/src/strset.h
index 41ef0e1bd..32a145f2b 100644
--- a/src/strset.h
+++ b/src/strset.h
@@ -25,8 +25,8 @@
* values - it stores the exact pointers it was given in strset_add().
*/
-#ifndef STRSET_H
-#define STRSET_H
+#ifndef MPD_STRSET_H
+#define MPD_STRSET_H
#include "gcc.h"
diff --git a/src/tag.h b/src/tag.h
index 2a05d1f34..10801d9e5 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef TAG_H
-#define TAG_H
+#ifndef MPD_TAG_H
+#define MPD_TAG_H
#include "gcc.h"
diff --git a/src/tag_internal.h b/src/tag_internal.h
index 8cb0bfe11..1188bbcdf 100644
--- a/src/tag_internal.h
+++ b/src/tag_internal.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef TAG_INTERNAL_H
-#define TAG_INTERNAL_H
+#ifndef MPD_TAG_INTERNAL_H
+#define MPD_TAG_INTERNAL_H
#include <stdint.h>
diff --git a/src/tag_pool.h b/src/tag_pool.h
index 52765527e..bfcce2fbf 100644
--- a/src/tag_pool.h
+++ b/src/tag_pool.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef TAG_POOL_H
-#define TAG_POOL_H
+#ifndef MPD_TAG_POOL_H
+#define MPD_TAG_POOL_H
#include "tag.h"
diff --git a/src/tag_print.h b/src/tag_print.h
index 61c9114ac..45c8f683a 100644
--- a/src/tag_print.h
+++ b/src/tag_print.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef TAG_PRINT_H
-#define TAG_PRINT_H
+#ifndef MPD_TAG_PRINT_H
+#define MPD_TAG_PRINT_H
struct tag;
struct client;
diff --git a/src/tag_save.h b/src/tag_save.h
index 8b88bd16b..b894afa4f 100644
--- a/src/tag_save.h
+++ b/src/tag_save.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef TAG_SAVE_H
-#define TAG_SAVE_H
+#ifndef MPD_TAG_SAVE_H
+#define MPD_TAG_SAVE_H
#include <stdio.h>
diff --git a/src/update.h b/src/update.h
index 0b54ed8f2..4a91061b7 100644
--- a/src/update.h
+++ b/src/update.h
@@ -17,8 +17,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef UPDATE_H
-#define UPDATE_H
+#ifndef MPD_UPDATE_H
+#define MPD_UPDATE_H
unsigned
isUpdatingDB(void);
diff --git a/src/utf8.h b/src/utf8.h
index 7e0252a0a..a76ed767b 100644
--- a/src/utf8.h
+++ b/src/utf8.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef UTF_8_H
-#define UTF_8_H
+#ifndef MPD_UTF_8_H
+#define MPD_UTF_8_H
#include <stddef.h>
diff --git a/src/utils.h b/src/utils.h
index bcde45988..225332e2f 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef UTILS_H
-#define UTILS_H
+#ifndef MPD_UTILS_H
+#define MPD_UTILS_H
#include "gcc.h"
diff --git a/src/volume.h b/src/volume.h
index 37111b7ff..1a37e4bfd 100644
--- a/src/volume.h
+++ b/src/volume.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef VOLUME_H
-#define VOLUME_H
+#ifndef MPD_VOLUME_H
+#define MPD_VOLUME_H
#include <stdio.h>
diff --git a/src/zeroconf.h b/src/zeroconf.h
index 56141655f..a18c23f8c 100644
--- a/src/zeroconf.h
+++ b/src/zeroconf.h
@@ -16,8 +16,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#ifndef ZEROCONF_H
-#define ZEROCONF_H
+#ifndef MPD_ZEROCONF_H
+#define MPD_ZEROCONF_H
#include "../config.h"