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.

src/ack.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef ACK_H
+#ifndef MPD_ACK_H
-#define ACK_H
+#define MPD_ACK_H
 
 enum ack {
 	ACK_ERROR_NOT_LIST = 1,

src/audio.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef AUDIO_H
+#ifndef MPD_AUDIO_H
-#define AUDIO_H
+#define MPD_AUDIO_H
 
 #include <stdbool.h>
 #include <stdio.h>

src/audioOutput.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef AUDIO_OUTPUT_H
+#ifndef MPD_AUDIO_OUTPUT_H
-#define AUDIO_OUTPUT_H
+#define MPD_AUDIO_OUTPUT_H
 
 #include <stdio.h>
 

src/audio_format.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef AUDIO_FORMAT_H
+#ifndef MPD_AUDIO_FORMAT_H
-#define AUDIO_FORMAT_H
+#define MPD_AUDIO_FORMAT_H
 
 #include <stdint.h>
 #include <stdbool.h>

src/buffer2array.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef BUFFER_2_ARRAY_H
+#ifndef MPD_BUFFER_2_ARRAY_H
-#define 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

src/client.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef INTERFACE_H
+#ifndef MPD_CLIENT_H
-#define INTERFACE_H
+#define MPD_CLIENT_H
 
 #include "gcc.h"
 

src/command.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef COMMAND_H
+#ifndef MPD_COMMAND_H
-#define COMMAND_H
+#define MPD_COMMAND_H
 
 #include "gcc.h"
 #include "ack.h"

src/compress.h

@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef COMPRESS_H
+#ifndef MPD_COMPRESS_H
-#define 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

src/condition.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CONDITION_H
+#ifndef MPD_CONDITION_H
-#define CONDITION_H
+#define MPD_CONDITION_H
 
 #include <pthread.h>
 

src/conf.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CONF_H
+#ifndef MPD_CONF_H
-#define CONF_H
+#define MPD_CONF_H
 
 #define CONF_MUSIC_DIR                  "music_directory"
 #define CONF_PLAYLIST_DIR               "playlist_directory"

src/crossfade.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef CROSSFADE_H
+#ifndef MPD_CROSSFADE_H
-#define CROSSFADE_H
+#define MPD_CROSSFADE_H
 
 #include "outputBuffer.h"
 

src/database.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DATABASE_H
+#ifndef MPD_DATABASE_H
-#define DATABASE_H
+#define MPD_DATABASE_H
 
 #include <sys/time.h>
 

src/dbUtils.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DB_UTILS_H
+#ifndef MPD_DB_UTILS_H
-#define DB_UTILS_H
+#define MPD_DB_UTILS_H
 
 #include "locate.h"
 

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
+#ifndef MPD_FLAC_COMMON_H
-#define _FLAC_COMMON_H
+#define MPD_FLAC_COMMON_H
 
 #include "../decoder_api.h"
 

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
+#ifndef MPD_OGG_COMMON_H
-#define _OGG_COMMON_H
+#define MPD_OGG_COMMON_H
 
 #include "../decoder_api.h"
 

src/decoder_api.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DECODER_API_H
+#ifndef MPD_DECODER_API_H
-#define DECODER_API_H
+#define MPD_DECODER_API_H
 
 /*
  * This is the public API which is used by decoder plugins to

src/decoder_control.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DECODE_H
+#ifndef MPD_DECODER_CONTROL_H
-#define DECODE_H
+#define MPD_DECODER_CONTROL_H
 
 #include "decoder_api.h"
 

src/decoder_internal.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DECODER_INTERNAL_H
+#ifndef MPD_DECODER_INTERNAL_H
-#define DECODER_INTERNAL_H
+#define MPD_DECODER_INTERNAL_H
 
 #include "decoder_api.h"
 #include "pcm_utils.h"

src/decoder_list.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef INPUT_PLUGIN_H
+#ifndef MPD_DECODER_LIST_H
-#define INPUT_PLUGIN_H
+#define MPD_DECODER_LIST_H
 
 #include <stdio.h>
 

src/decoder_thread.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DECODER_THREAD_H
+#ifndef MPD_DECODER_THREAD_H
-#define DECODER_THREAD_H
+#define MPD_DECODER_THREAD_H
 
 void decoder_thread_start(void);
 

src/directory.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DIRECTORY_H
+#ifndef MPD_DIRECTORY_H
-#define DIRECTORY_H
+#define MPD_DIRECTORY_H
 
 #include "dirvec.h"
 #include "songvec.h"

src/directory_print.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DIRECTORY_PRINT_H
+#ifndef MPD_DIRECTORY_PRINT_H
-#define DIRECTORY_PRINT_H
+#define MPD_DIRECTORY_PRINT_H
 
 struct client;
 struct directory;

src/directory_save.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef DIRECTORY_SAVE_H
+#ifndef MPD_DIRECTORY_SAVE_H
-#define DIRECTORY_SAVE_H
+#define MPD_DIRECTORY_SAVE_H
 
 #include <stdio.h>
 

src/dirvec.h

@@ -1,5 +1,5 @@
-#ifndef DIRVEC_H
+#ifndef MPD_DIRVEC_H
-#define DIRVEC_H
+#define MPD_DIRVEC_H
 
 #include <stddef.h>
 

src/dlist.h

@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef _LINUX_LIST_H
+#ifndef MPD_DLIST_H
-#define _LINUX_LIST_H
+#define MPD_DLIST_H
 
 /*
  * These are non-NULL pointers that will result in page faults

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
+#ifndef MPD_INPUT_FILE_H
-#define INPUT_STREAM_FILE_H
+#define MPD_INPUT_FILE_H
 
 #include "input_stream.h"
 

src/input_stream.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef INPUT_STREAM_H
+#ifndef MPD_INPUT_STREAM_H
-#define INPUT_STREAM_H
+#define MPD_INPUT_STREAM_H
 
 #include <stddef.h>
 #include <stdbool.h>

src/ioops.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef IOOPS_H
+#ifndef MPD_IOOPS_H
-#define IOOPS_H
+#define MPD_IOOPS_H
 
 #include <sys/select.h>
 

src/list.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LIST_H
+#ifndef MPD_LIST_H
-#define 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

src/listen.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LISTEN_H
+#ifndef MPD_LISTEN_H
-#define LISTEN_H
+#define MPD_LISTEN_H
 
 #include <sys/select.h>
 

src/locate.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LOCATE_H
+#ifndef MPD_LOCATE_H
-#define LOCATE_H
+#define MPD_LOCATE_H
 
 #include <stdint.h>
 

src/log.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LOG_H
+#ifndef MPD_LOG_H
-#define LOG_H
+#define MPD_LOG_H
 
 #include "gcc.h"
 

src/ls.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef LS_H
+#ifndef MPD_LS_H
-#define LS_H
+#define MPD_LS_H
 
 #include "decoder_list.h"
 

src/main_notify.h

@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef MAIN_NOTIFY_H
+#ifndef MPD_MAIN_NOTIFY_H
-#define MAIN_NOTIFY_H
+#define MPD_MAIN_NOTIFY_H
 
 #include <pthread.h>
 

src/mapper.h

@@ -20,8 +20,8 @@
  * Maps directory and song objects to file system paths.
  */
 
-#ifndef MAPPER_H
+#ifndef MPD_MAPPER_H
-#define MAPPER_H
+#define MPD_MAPPER_H
 
 struct directory;
 struct song;

src/normalize.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NORMALIZE_H
+#ifndef MPD_NORMALIZE_H
-#define NORMALIZE_H
+#define MPD_NORMALIZE_H
 
 struct audio_format;
 

src/notify.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef NOTIFY_H
+#ifndef MPD_NOTIFY_H
-#define NOTIFY_H
+#define MPD_NOTIFY_H
 
 #include <stdbool.h>
 #include <pthread.h>

src/os_compat.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef OS_COMPAT_H
+#ifndef MPD_OS_COMPAT_H
-#define OS_COMPAT_H
+#define MPD_OS_COMPAT_H
 
 #include "../config.h"
 

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
+#ifndef MPD_SHOUT_PLUGIN_H
-#define AUDIO_OUTPUT_SHOUT_H
+#define MPD_SHOUT_PLUGIN_H
 
 #include "../output_api.h"
 #include "../conf.h"

src/outputBuffer.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef OUTPUT_BUFFER_H
+#ifndef MPD_OUTPUT_BUFFER_H
-#define OUTPUT_BUFFER_H
+#define MPD_OUTPUT_BUFFER_H
 
 #include "audio_format.h"
 

src/output_api.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef OUTPUT_API_H
+#ifndef MPD_OUTPUT_API_H
-#define OUTPUT_API_H
+#define MPD_OUTPUT_API_H
 
 #include "../config.h"
 #include "audio_format.h"

src/output_control.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef OUTPUT_CONTROL_H
+#ifndef MPD_OUTPUT_CONTROL_H
-#define OUTPUT_CONTROL_H
+#define MPD_OUTPUT_CONTROL_H
 
 #include "conf.h"
 

src/output_internal.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef OUTPUT_INTERNAL_H
+#ifndef MPD_OUTPUT_INTERNAL_H
-#define OUTPUT_INTERNAL_H
+#define MPD_OUTPUT_INTERNAL_H
 
 #include "pcm_utils.h"
 #include "notify.h"

src/output_list.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef OUTPUT_LIST_H
+#ifndef MPD_OUTPUT_LIST_H
-#define OUTPUT_LIST_H
+#define MPD_OUTPUT_LIST_H
 
 extern const struct audio_output_plugin *audio_output_plugins[];
 

src/output_thread.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef OUTPUT_THREAD_H
+#ifndef MPD_OUTPUT_THREAD_H
-#define OUTPUT_THREAD_H
+#define MPD_OUTPUT_THREAD_H
 
 struct audio_output;
 

src/path.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PATH_H
+#ifndef MPD_PATH_H
-#define PATH_H
+#define MPD_PATH_H
 
 #include "os_compat.h"
 

src/pcm_dither.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PCM_DITHER_H
+#ifndef MPD_PCM_DITHER_H
-#define PCM_DITHER_H
+#define MPD_PCM_DITHER_H
 
 #include <stdint.h>
 

src/pcm_utils.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PCM_UTILS_H
+#ifndef MPD_PCM_UTILS_H
-#define PCM_UTILS_H
+#define MPD_PCM_UTILS_H
 
 #include "pcm_resample.h"
 #include "pcm_dither.h"

src/permission.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PERMISSION_H
+#ifndef MPD_PERMISSION_H
-#define PERMISSION_H
+#define MPD_PERMISSION_H
 
 #define PERMISSION_NONE    0
 #define PERMISSION_READ    1

src/playerData.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PLAYER_DATA_H
+#ifndef MPD_PLAYER_DATA_H
-#define PLAYER_DATA_H
+#define MPD_PLAYER_DATA_H
 
 extern unsigned int buffered_chunks;
 extern unsigned int buffered_before_play;

src/player_control.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PLAYER_H
+#ifndef MPD_PLAYER_H
-#define PLAYER_H
+#define MPD_PLAYER_H
 
 #include "notify.h"
 #include "audio_format.h"

src/player_thread.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PLAYER_THREAD_H
+#ifndef MPD_PLAYER_THREAD_H
-#define PLAYER_THREAD_H
+#define MPD_PLAYER_THREAD_H
 
 void player_create(void);
 

src/playlist.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PLAYLIST_H
+#ifndef MPD_PLAYLIST_H
-#define PLAYLIST_H
+#define MPD_PLAYLIST_H
 
 #include "locate.h"
 

src/playlist_save.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef PLAYLIST_SAVE_H
+#ifndef MPD_PLAYLIST_SAVE_H
-#define PLAYLIST_SAVE_H
+#define MPD_PLAYLIST_SAVE_H
 
 #include <stdio.h>
 

src/replayGain.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef REPLAYGAIN_H
+#ifndef MPD_REPLAYGAIN_H
-#define REPLAYGAIN_H
+#define MPD_REPLAYGAIN_H
 
 #define REPLAYGAIN_OFF		0
 #define REPLAYGAIN_TRACK	1

src/ringbuf.h

@@ -19,8 +19,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-#ifndef RINGBUF_H
+#ifndef MPD_RINGBUF_H
-#define RINGBUF_H
+#define MPD_RINGBUF_H
 
 #include <stddef.h>
 #include <sys/uio.h>

src/sig_handlers.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef SIG_HANDLERS_H
+#ifndef MPD_SIG_HANDLERS_H
-#define SIG_HANDLERS_H
+#define MPD_SIG_HANDLERS_H
 
 int handlePendingSignals(void);
 

src/signal_check.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef SIGNAL_CHECK_H
+#ifndef MPD_SIGNAL_CHECK_H
-#define SIGNAL_CHECK_H
+#define MPD_SIGNAL_CHECK_H
 
 void signal_handle(int sig);
 void signal_unhandle(int sig);

src/song.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef SONG_H
+#ifndef MPD_SONG_H
-#define SONG_H
+#define MPD_SONG_H
 
 #include <stddef.h>
 #include <stdbool.h>

src/song_print.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef SONG_PRINT_H
+#ifndef MPD_SONG_PRINT_H
-#define SONG_PRINT_H
+#define MPD_SONG_PRINT_H
 
 struct client;
 struct song;

src/song_save.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef SONG_SAVE_H
+#ifndef MPD_SONG_SAVE_H
-#define SONG_SAVE_H
+#define MPD_SONG_SAVE_H
 
 #include <stdio.h>
 

src/songvec.h

@@ -1,5 +1,5 @@
-#ifndef SONGVEC_H
+#ifndef MPD_SONGVEC_H
-#define SONGVEC_H
+#define MPD_SONGVEC_H
 
 #include <stddef.h>
 

src/state_file.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef STATE_FILE_H
+#ifndef MPD_STATE_FILE_H
-#define STATE_FILE_H
+#define MPD_STATE_FILE_H
 
 #include "gcc.h"
 

src/stats.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef STATS_H
+#ifndef MPD_STATS_H
-#define STATS_H
+#define MPD_STATS_H
 
 struct client;
 

src/strset.h

@@ -25,8 +25,8 @@
  * values - it stores the exact pointers it was given in strset_add().
  */
 
-#ifndef STRSET_H
+#ifndef MPD_STRSET_H
-#define STRSET_H
+#define MPD_STRSET_H
 
 #include "gcc.h"
 

src/tag.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TAG_H
+#ifndef MPD_TAG_H
-#define TAG_H
+#define MPD_TAG_H
 
 #include "gcc.h"
 

src/tag_internal.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TAG_INTERNAL_H
+#ifndef MPD_TAG_INTERNAL_H
-#define TAG_INTERNAL_H
+#define MPD_TAG_INTERNAL_H
 
 #include <stdint.h>
 

src/tag_pool.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TAG_POOL_H
+#ifndef MPD_TAG_POOL_H
-#define TAG_POOL_H
+#define MPD_TAG_POOL_H
 
 #include "tag.h"
 

src/tag_print.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TAG_PRINT_H
+#ifndef MPD_TAG_PRINT_H
-#define TAG_PRINT_H
+#define MPD_TAG_PRINT_H
 
 struct tag;
 struct client;

src/tag_save.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TAG_SAVE_H
+#ifndef MPD_TAG_SAVE_H
-#define TAG_SAVE_H
+#define MPD_TAG_SAVE_H
 
 #include <stdio.h>
 

src/update.h

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef UPDATE_H
+#ifndef MPD_UPDATE_H
-#define UPDATE_H
+#define MPD_UPDATE_H
 
 unsigned
 isUpdatingDB(void);

src/utf8.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef UTF_8_H
+#ifndef MPD_UTF_8_H
-#define UTF_8_H
+#define MPD_UTF_8_H
 
 #include <stddef.h>
 

src/utils.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef UTILS_H
+#ifndef MPD_UTILS_H
-#define UTILS_H
+#define MPD_UTILS_H
 
 #include "gcc.h"
 

src/volume.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef VOLUME_H
+#ifndef MPD_VOLUME_H
-#define VOLUME_H
+#define MPD_VOLUME_H
 
 #include <stdio.h>
 

src/zeroconf.h

@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef ZEROCONF_H
+#ifndef MPD_ZEROCONF_H
-#define ZEROCONF_H
+#define MPD_ZEROCONF_H
 
 #include "../config.h"