# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1211160772 -10800
# Node ID 798da2a49d0907dfbb48e808d3ff66ce470c8910
# Parent  87b537f1e92ec31f26adb00a07903638658dc426# Parent  64f83a7bfb2a6299a23cc770f5e63c39dd822806
Automated merge with ssh://hg.atheme.org//hg/audacious

diff -r 87b537f1e92e -r 798da2a49d09 AUTHORS
--- a/AUTHORS	Mon May 19 02:04:09 2008 +0200
+++ b/AUTHORS	Mon May 19 04:32:52 2008 +0300
@@ -1,4 +1,4 @@
-Audacious (C) GPL 2005-2007
+Audacious (C) GPL 2005-2008
 
 Authors listed alphabetically, by last name:
 --------------------------------------------
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/actions-equalizer.h
--- a/src/audacious/actions-equalizer.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/actions-equalizer.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef ACTIONS_EQUALIZER_H
-#define ACTIONS_EQUALIZER_H
+#ifndef AUDACIOUS_ACTIONS_EQUALIZER_H
+#define AUDACIOUS_ACTIONS_EQUALIZER_H
 
 void action_equ_load_preset(void);
 void action_equ_load_auto_preset(void);
@@ -35,4 +35,4 @@
 void action_equ_delete_preset(void);
 void action_equ_delete_auto_preset(void);
 
-#endif
+#endif /* AUDACIOUS_ACTIONS_EQUALIZER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/actions-mainwin.h
--- a/src/audacious/actions-mainwin.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/actions-mainwin.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef ACTIONS_MAINWIN_H
-#define ACTIONS_MAINWIN_H
+#ifndef AUDACIOUS_ACTIONS_MAINWIN_H
+#define AUDACIOUS_ACTIONS_MAINWIN_H
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -73,4 +73,4 @@
 void action_preferences(void);
 void action_quit(void);
 void action_current_track_info(void);
-#endif
+#endif /* AUDACIOUS_ACTIONS_MAINWIN_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/actions-playlist.h
--- a/src/audacious/actions-playlist.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/actions-playlist.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef ACTIONS_PLAYLIST_H
-#define ACTIONS_PLAYLIST_H
+#ifndef AUDACIOUS_ACTIONS_PLAYLIST_H
+#define AUDACIOUS_ACTIONS_PLAYLIST_H
 
 void action_playlist_load_list(void);
 void action_playlist_save_list(void);
@@ -71,4 +71,4 @@
 void action_playlist_track_info(void);
 void action_queue_toggle(void);
 
-#endif
+#endif /* AUDACIOUS_ACTIONS_PLAYLIST_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/af_compat.h
--- a/src/audacious/af_compat.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/af_compat.h	Mon May 19 04:32:52 2008 +0300
@@ -2,8 +2,8 @@
  * MPlayer libaf compatibility stuff
  */
 
-#ifndef AF_COMPAT_H
-#define AF_COMPAT_H
+#ifndef AUDACIOUS_AF_COMPAT_H
+#define AUDACIOUS_AF_COMPAT_H
 
 #include <glib.h>
 #include "main.h"
@@ -110,4 +110,4 @@
 #define clamp(a,min,max) (((a)>(max))?(max):(((a)<(min))?(min):(a)))
 #endif
 
-#endif /* AF_COMPAT_H */
+#endif /* AUDACIOUS_AF_COMPAT_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/audconfig.h
--- a/src/audacious/audconfig.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/audconfig.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef AUDCONFIG_H
-#define AUDCONFIG_H
+#ifndef AUDACIOUS_AUDCONFIG_H
+#define AUDACIOUS_AUDCONFIG_H
 
 #include <glib.h>
 
@@ -142,4 +142,4 @@
 void aud_config_load(void);
 void aud_config_save(void);
 
-#endif
+#endif /* AUDACIOUS_AUDCONFIG_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/auddrct.h
--- a/src/audacious/auddrct.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/auddrct.h	Mon May 19 04:32:52 2008 +0300
@@ -21,8 +21,8 @@
 /* audacious_drct_* provides a handy interface for player
    plugins, originally intended for migration from xmms_remote_* calls */
 
-#ifndef AUDDRCT_H
-#define AUDDRCT_H
+#ifndef AUDACIOUS_AUDDRCT_H
+#define AUDACIOUS_AUDDRCT_H
 
 #include <glib.h>
 
@@ -124,4 +124,4 @@
 #define audacious_drct_get_playqueue_position audacious_drct_pq_get_position
 #define audacious_drct_get_playqueue_queue_position audaciuos_drct_pq_get_queue_position
 
-#endif
+#endif /* AUDACIOUS_AUDDRCT_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/build_stamp.h
--- a/src/audacious/build_stamp.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/build_stamp.h	Mon May 19 04:32:52 2008 +0300
@@ -1,8 +1,8 @@
-#ifndef BUILD_STAMP_H
-#define BUILD_STAMP_H
+#ifndef AUDACIOUS_BUILD_STAMP_H
+#define AUDACIOUS_BUILD_STAMP_H
 
 #include <glib.h>
 
 extern const gchar *svn_stamp;
 
-#endif
+#endif /* AUDACIOUS_BUILD_STAMP_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/configdb.h
--- a/src/audacious/configdb.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/configdb.h	Mon May 19 04:32:52 2008 +0300
@@ -1,5 +1,5 @@
-#ifndef CONFIGDB_H
-#define CONFIGDB_H
+#ifndef AUDACIOUS_CONFIGDB_H
+#define AUDACIOUS_CONFIGDB_H
 
 #include <glib.h>
 #include <libmcs/mcs.h>
@@ -187,5 +187,5 @@
 
 G_END_DECLS
 
-#endif /* CONFIGDB_H */
+#endif /* AUDACIOUS_CONFIGDB_H */
 
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/custom_uri.h
--- a/src/audacious/custom_uri.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/custom_uri.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
 
 #include <audacious/plugin.h>
 
-#ifndef __AUDACIOUS_CUSTOM_URI_H__
-#define __AUDACIOUS_CUSTOM_URI_H__
+#ifndef AUDACIOUS_CUSTOM_URI_H
+#define AUDACIOUS_CUSTOM_URI_H
 
 G_BEGIN_DECLS
 
@@ -33,4 +33,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* AUDACIOUS_CUSTOM_URI_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/dbus-service.h
--- a/src/audacious/dbus-service.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/dbus-service.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef _DBUS_SERVICE_H
-#define _DBUS_SERVICE_H
+#ifndef AUDACIOUS_DBUS_SERVICE_H
+#define AUDACIOUS_DBUS_SERVICE_H
 
 #include <glib.h>
 
@@ -214,4 +214,4 @@
 gboolean audacious_rc_set_eq_band(RemoteObject *obj, gint band, gdouble value, GError **error);
 gboolean audacious_rc_equalizer_activate(RemoteObject *obj, gboolean active, GError **error);
 
-#endif // !_DBUS_SERVICE_H
+#endif /* AUDACIOUS_DBUS_SERVICE_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/dbus.h
--- a/src/audacious/dbus.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/dbus.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef _AUDDBUS_H
-#define _AUDDBUS_H
+#ifndef AUDACIOUS_DBUS_H
+#define AUDACIOUS_DBUS_H
 
 #define AUDACIOUS_DBUS_SERVICE      "org.atheme.audacious"
 #define AUDACIOUS_DBUS_PATH         "/org/atheme/audacious"
@@ -41,4 +41,4 @@
 #define PROVIDES_TIMING       = 1 << 7
 
 
-#endif // !_AUDDBUS_H
+#endif /* AUDACIOUS_DBUS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/debug.h
--- a/src/audacious/debug.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/debug.h	Mon May 19 04:32:52 2008 +0300
@@ -1,5 +1,5 @@
-#ifndef DEBUG_H
-#define DEBUG_H
+#ifndef AUDACIOUS_DEBUG_H
+#define AUDACIOUS_DEBUG_H
 
 #include <glib.h>
 
@@ -41,4 +41,4 @@
 #endif                          /* NDEBUG */
 
 
-#endif
+#endif /* AUDACIOUS_DEBUG_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/discovery.h
--- a/src/audacious/discovery.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/discovery.h	Mon May 19 04:32:52 2008 +0300
@@ -20,8 +20,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef DISCOVERY_H
-#define DISCOVERY_H
+#ifndef AUDACIOUS_DISCOVERY_H
+#define AUDACIOUS_DISCOVERY_H
 
 #include <glib.h>
 
@@ -49,4 +49,4 @@
 
 extern DiscoveryPluginData dp_data;
 
-#endif
+#endif /* AUDACIOUS_DISCOVERY_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/dnd.h
--- a/src/audacious/dnd.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/dnd.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef DND_H
-#define DND_H
+#ifndef AUDACIOUS_DND_H
+#define AUDACIOUS_DND_H
 
 #include <gtk/gtk.h>
 
@@ -48,4 +48,4 @@
 
 void aud_drag_dest_set(GtkWidget*);
 
-#endif
+#endif /* AUDACIOUS_DND_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/effect.h
--- a/src/audacious/effect.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/effect.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef EFFECT_H
-#define EFFECT_H
+#ifndef AUDACIOUS_EFFECT_H
+#define AUDACIOUS_EFFECT_H
 
 #include <glib.h>
 
@@ -50,4 +50,4 @@
 
 extern EffectPluginData ep_data;
 
-#endif
+#endif /* AUDACIOUS_EFFECT_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/equalizer_flow.h
--- a/src/audacious/equalizer_flow.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/equalizer_flow.h	Mon May 19 04:32:52 2008 +0300
@@ -1,5 +1,5 @@
-#ifndef EQUALIZER_FLOW_H
-#define EQUALIZER_FLOW_H
+#ifndef AUDACIOUS_EQUALIZER_FLOW_H
+#define AUDACIOUS_EQUALIZER_FLOW_H
 
 #include "flow.h"
 
@@ -9,4 +9,4 @@
 void equalizer_flow_set_bands(gfloat pre, gfloat *bands);
 void equalizer_flow_free();
 
-#endif
+#endif /* AUDACIOUS_EQUALIZER_FLOW_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/eventqueue.h
--- a/src/audacious/eventqueue.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/eventqueue.h	Mon May 19 04:32:52 2008 +0300
@@ -22,8 +22,8 @@
 
 #include "audacious/hook.h"
 
-#ifndef __AUDACIOUS_EVENTQUEUE_H__
-#define __AUDACIOUS_EVENTQUEUE_H__
+#ifndef AUDACIOUS_EVENTQUEUE_H
+#define AUDACIOUS_EVENTQUEUE_H
 
 typedef struct {
     gchar *name;
@@ -33,4 +33,4 @@
 void event_queue(const gchar *name, gpointer user_data);
 void event_queue_timed(gint time, const gchar *name, gpointer user_data);
 
-#endif
+#endif /* AUDACIOUS_EVENTQUEUE_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/fft.h
--- a/src/audacious/fft.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/fft.h	Mon May 19 04:32:52 2008 +0300
@@ -21,8 +21,8 @@
 
 /* fft.h: header for iterative implementation of a FFT */
 
-#ifndef __AUDACIOUS_FFT_H__
-#define __AUDACIOUS_FFT_H__
+#ifndef AUDACIOUS_FFT_H
+#define AUDACIOUS_FFT_H
 
 #include <glib.h>
 
@@ -41,4 +41,4 @@
 
 G_END_DECLS
 
-#endif /* __AUDACIOUS_FFT_H__ */
+#endif /* AUDACIOUS_FFT_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/flow.h
--- a/src/audacious/flow.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/flow.h	Mon May 19 04:32:52 2008 +0300
@@ -25,8 +25,8 @@
 
 #include "output.h"
 
-#ifndef __AUDACIOUS_FLOW_H__
-#define __AUDACIOUS_FLOW_H__
+#ifndef AUDACIOUS_FLOW_H
+#define AUDACIOUS_FLOW_H
 
 typedef struct {
     gint time;
@@ -59,4 +59,4 @@
 
 #define flow_destroy(flow) mowgli_object_unref(flow)
 
-#endif
+#endif /* AUDACIOUS_FLOW_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/general.h
--- a/src/audacious/general.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/general.h	Mon May 19 04:32:52 2008 +0300
@@ -20,8 +20,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef GENERIC_H
-#define GENERIC_H
+#ifndef AUDACIOUS_GENERAL_H
+#define AUDACIOUS_GENERAL_H
 
 #include <glib.h>
 
@@ -40,4 +40,4 @@
 
 extern GeneralPluginData gp_data;
 
-#endif
+#endif /* AUDACIOUS_GENERAL_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/hook.h
--- a/src/audacious/hook.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/hook.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_HOOK_H__
-#define __AUDACIOUS_HOOK_H__
+#ifndef AUDACIOUS_HOOK_H
+#define AUDACIOUS_HOOK_H
 
 #include <glib.h>
 
@@ -39,4 +39,4 @@
 gint hook_dissociate(const gchar *name, HookFunction func);
 void hook_call(const gchar *name, gpointer hook_data);
 
-#endif
+#endif /* AUDACIOUS_HOOK_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/i18n.h
--- a/src/audacious/i18n.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/i18n.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_I18N_H__
-#define __AUDACIOUS_I18N_H__
+#ifndef AUDACIOUS_I18N_H
+#define AUDACIOUS_I18N_H
 
 #include <glib/gstrfuncs.h>
 #include <libintl.h>
@@ -31,4 +31,4 @@
 #define N_(String) (String)
 #endif
 
-#endif
+#endif /* AUDACIOUS_I18N_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/icons-stock.h
--- a/src/audacious/icons-stock.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/icons-stock.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef ICONSSTOCK_H
-#define ICONSSTOCK_H
+#ifndef AUDACIOUS_ICONS_STOCK_H
+#define AUDACIOUS_ICONS_STOCK_H
 
 void register_aud_stock_icons(void);
 
@@ -29,4 +29,4 @@
 #define AUD_STOCK_QUEUETOGGLE		"aud-queuetoggle"
 #define AUD_STOCK_RANDOMIZEPL		"aud-randomizepl"
 
-#endif
+#endif /* AUDACIOUS_ICONS_STOCK_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/input.h
--- a/src/audacious/input.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/input.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef _AUDACIOUS_INPUT_H
-#define _AUDACIOUS_INPUT_H
+#ifndef AUDACIOUS_INPUT_H
+#define AUDACIOUS_INPUT_H
 
 typedef struct _InputPluginData InputPluginData;
 
@@ -76,4 +76,4 @@
 extern InputPluginData ip_data;
 
 
-#endif
+#endif /* AUDACIOUS_INPUT_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/logger.h
--- a/src/audacious/logger.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/logger.h	Mon May 19 04:32:52 2008 +0300
@@ -20,8 +20,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_LOGGER_H__
-#define __AUDACIOUS_LOGGER_H__
+#ifndef AUDACIOUS_LOGGER_H
+#define AUDACIOUS_LOGGER_H
 
 #include <glib.h>
 
@@ -38,4 +38,4 @@
 
 G_END_DECLS
 
-#endif /* __AUDACIOUS_LOGGER_H__ */
+#endif /* AUDACIOUS_LOGGER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/main.h
--- a/src/audacious/main.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/main.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_MAIN_H__
-#define __AUDACIOUS_MAIN_H__
+#ifndef AUDACIOUS_MAIN_H
+#define AUDACIOUS_MAIN_H
 
 #ifdef _AUDACIOUS_CORE
 # include "ui_main.h"
@@ -86,4 +86,4 @@
 
 G_END_DECLS
 
-#endif /* __AUDACIOUS_MAIN_H__ */
+#endif /* AUDACIOUS_MAIN_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/mime.h
--- a/src/audacious/mime.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/mime.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
 
 #include <audacious/plugin.h>
 
-#ifndef __AUDACIOUS_MIME_H__
-#define __AUDACIOUS_MIME_H__
+#ifndef AUDACIOUS_MIME_H
+#define AUDACIOUS_MIME_H
 
 G_BEGIN_DECLS
 
@@ -33,4 +33,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* AUDACIOUS_MIME_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/output.h
--- a/src/audacious/output.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/output.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef OUTPUT_H
-#define OUTPUT_H
+#ifndef AUDACIOUS_OUTPUT_H
+#define AUDACIOUS_OUTPUT_H
 
 #include <glib.h>
 
@@ -71,4 +71,4 @@
 extern OutputPlugin psuedo_output_plugin;
 extern OutputPluginData op_data;
 
-#endif
+#endif /* AUDACIOUS_OUTPUT_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/playback.h
--- a/src/audacious/playback.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/playback.h	Mon May 19 04:32:52 2008 +0300
@@ -20,8 +20,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef PLAYBACK_H
-#define PLAYBACK_H
+#ifndef AUDACIOUS_PLAYBACK_H
+#define AUDACIOUS_PLAYBACK_H
 
 #include <glib.h>
 
@@ -54,4 +54,4 @@
 void playback_get_sample_params(gint *bitrate, gint *frequency, gint *n_channels);
 void playback_set_sample_params(gint bitrate, gint frequency, gint n_channels);
 
-#endif
+#endif /* AUDACIOUS_PLAYBACK_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/playback_evlisteners.h
--- a/src/audacious/playback_evlisteners.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/playback_evlisteners.h	Mon May 19 04:32:52 2008 +0300
@@ -18,9 +18,9 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_PLAYBACK_EVLISTENERS_H__
-#define __AUDACIOUS_PLAYBACK_EVLISTENERS_H__
+#ifndef AUDACIOUS_PLAYBACK_EVLISTENERS_H
+#define AUDACIOUS_PLAYBACK_EVLISTENERS_H
 
 void playback_evlistener_init(void);
 
-#endif
+#endif /* AUDACIOUS_PLAYBACK_EVLISTENERS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/playlist.h
--- a/src/audacious/playlist.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/playlist.h	Mon May 19 04:32:52 2008 +0300
@@ -22,8 +22,8 @@
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
  */
-#ifndef _AUDACIOUS_PLAYLIST_H
-#define _AUDACIOUS_PLAYLIST_H
+#ifndef AUDACIOUS_PLAYLIST_H
+#define AUDACIOUS_PLAYLIST_H
 
 /* XXX: Allow pre-0.2 libmowgli to build audacious. */
 #ifdef TRUE
@@ -246,4 +246,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* AUDACIOUS_PLAYLIST_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/playlist_container.h
--- a/src/audacious/playlist_container.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/playlist_container.h	Mon May 19 04:32:52 2008 +0300
@@ -19,8 +19,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef _PLAYLIST_CONTAINER_H_
-#define _PLAYLIST_CONTAINER_H_
+#ifndef AUDACIOUS_PLAYLIST_CONTAINER_H
+#define AUDACIOUS_PLAYLIST_CONTAINER_H
 
 G_BEGIN_DECLS
 
@@ -43,4 +43,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* AUDACIOUS_PLAYLIST_CONTAINER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/playlist_evmessages.h
--- a/src/audacious/playlist_evmessages.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/playlist_evmessages.h	Mon May 19 04:32:52 2008 +0300
@@ -20,8 +20,8 @@
 
 #include <glib.h>
 
-#ifndef __AUDACIOUS_PLAYLIST_EVMESSAGES_H__
-#define __AUDACIOUS_PLAYLIST_EVMESSAGES_H__
+#ifndef AUDACIOUS_PLAYLIST_EVMESSAGES_H
+#define AUDACIOUS_PLAYLIST_EVMESSAGES_H
 
 typedef struct {
     gint bitrate;
@@ -29,4 +29,4 @@
     gint channels;
 } PlaylistEventInfoChange;
 
-#endif
+#endif /* AUDACIOUS_PLAYLIST_EVMESSAGES_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/plugin.h
--- a/src/audacious/plugin.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/plugin.h	Mon May 19 04:32:52 2008 +0300
@@ -32,8 +32,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef __AUDACIOUS_PLUGIN_H__
-#define __AUDACIOUS_PLUGIN_H__
+#ifndef AUDACIOUS_PLUGIN_H
+#define AUDACIOUS_PLUGIN_H
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -1206,4 +1206,4 @@
 /* undefine the macro -- struct Plugin should be used instead. */
 #undef PLUGIN_COMMON_FIELDS
 
-#endif /* __AUDACIOUS_PLUGIN_H__ */
+#endif /* AUDACIOUS_PLUGIN_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/pluginenum.h
--- a/src/audacious/pluginenum.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/pluginenum.h	Mon May 19 04:32:52 2008 +0300
@@ -22,8 +22,8 @@
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
  */
-#ifndef PLUGINENUM_H
-#define PLUGINENUM_H
+#ifndef AUDACIOUS_PLUGINENUM_H
+#define AUDACIOUS_PLUGINENUM_H
 
 #include <glib.h>
 #include "config.h"
@@ -42,4 +42,4 @@
 
 void plugin_set_current(Plugin *plugin);
 
-#endif
+#endif /* AUDACIOUS_PLUGINENUM_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/rcfile.h
--- a/src/audacious/rcfile.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/rcfile.h	Mon May 19 04:32:52 2008 +0300
@@ -19,8 +19,8 @@
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
  */
-#ifndef __AUDACIOUS_RCFILE_H__
-#define __AUDACIOUS_RCFILE_H__
+#ifndef AUDACIOUS_RCFILE_H
+#define AUDACIOUS_RCFILE_H
 
 #include <glib.h>
 
@@ -94,4 +94,4 @@
 
 G_END_DECLS
 
-#endif /* __AUDACIOUS_RCFILE_H__ */
+#endif /* AUDACIOUS_RCFILE_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/signals.h
--- a/src/audacious/signals.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/signals.h	Mon May 19 04:32:52 2008 +0300
@@ -21,9 +21,9 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef SIGNALS_H
-#define SIGNALS_H
+#ifndef AUDACIOUS_SIGNALS_H
+#define AUDACIOUS_SIGNALS_H
 
 void signal_handlers_init(void);
 
-#endif
+#endif /* AUDACIOUS_SIGNALS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/src_flow.h
--- a/src/audacious/src_flow.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/src_flow.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef SRC_FLOW_H
-#define SRC_FLOW_H
+#ifndef AUDACIOUS_SRC_FLOW_H
+#define AUDACIOUS_SRC_FLOW_H
 
 #include <glib.h>
 #include "flow.h"
@@ -27,4 +27,4 @@
 gint src_flow_init(gint infreq, gint nch);
 void src_flow_free();
 
-#endif
+#endif /* AUDACIOUS_SRC_FLOW_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/strings.h
--- a/src/audacious/strings.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/strings.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_STRINGS_H__
-#define __AUDACIOUS_STRINGS_H__
+#ifndef AUDACIOUS_STRINGS_H
+#define AUDACIOUS_STRINGS_H
 
 #include <glib.h>
 
@@ -58,4 +58,4 @@
 
 G_END_DECLS
 
-#endif /* __AUDACIOUS_STRINGS_H__ */
+#endif /* AUDACIOUS_STRINGS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/tuple.h
--- a/src/audacious/tuple.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/tuple.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_TUPLE_H__
-#define __AUDACIOUS_TUPLE_H__
+#ifndef AUDACIOUS_TUPLE_H
+#define AUDACIOUS_TUPLE_H
 
 #include <glib.h>
 #include <mowgli.h>
@@ -103,4 +103,4 @@
 
 G_END_DECLS
 
-#endif /* __AUDACIOUS_TUPLE_H__ */
+#endif /* AUDACIOUS_TUPLE_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/tuple_compiler.h
--- a/src/audacious/tuple_compiler.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/tuple_compiler.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  * The Audacious team does not consider modular code linking to
  * Audacious or using our public API to be a derived work.
  */
-#ifndef __AUDACIOUS_TUPLE_COMPILER_H__
-#define __AUDACIOUS_TUPLE_COMPILER_H__
+#ifndef AUDACIOUS_TUPLE_COMPILER_H
+#define AUDACIOUS_TUPLE_COMPILER_H
 
 #include <glib.h>
 #include <mowgli.h>
@@ -108,4 +108,4 @@
 TupleEvalNode *tuple_formatter_compile(TupleEvalContext *ctx, gchar *expr);
 gchar *tuple_formatter_eval(TupleEvalContext *ctx, TupleEvalNode *expr, Tuple *tuple);
 
-#endif /* __AUDACIOUS_TUPLE_COMPILER_H__ */
+#endif /* AUDACIOUS_TUPLE_COMPILER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/tuple_formatter.h
--- a/src/audacious/tuple_formatter.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/tuple_formatter.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_TUPLE_FORMATTER_H__
-#define __AUDACIOUS_TUPLE_FORMATTER_H__
+#ifndef AUDACIOUS_TUPLE_FORMATTER_H
+#define AUDACIOUS_TUPLE_FORMATTER_H
 
 #include <glib.h>
 #include <mowgli.h>
@@ -38,4 +38,4 @@
     const gchar *argument);
 gchar *tuple_formatter_process_construct(Tuple *tuple, const gchar *string);
 
-#endif
+#endif /* AUDACIOUS_TUPLE_FORMATTER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_credits.h
--- a/src/audacious/ui_credits.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_credits.h	Mon May 19 04:32:52 2008 +0300
@@ -1,9 +1,9 @@
 
-#ifndef ABOUT_H
-#define ABOUT_H
+#ifndef AUDACIOUS_UI_CREDITS_H
+#define AUDACIOUS_UI_CREDITS_H
 
 void show_about_window(void);
 void hide_about_window(void);
 void show_credits_window(void);
 
-#endif
+#endif /* AUDACIOUS_UI_CREDITS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_dock.h
--- a/src/audacious/ui_dock.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_dock.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef DOCK_H
-#define DOCK_H
+#ifndef AUDACIOUS_UI_DOCK_H
+#define AUDACIOUS_UI_DOCK_H
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -47,4 +47,4 @@
 GList *get_dock_window_list();
 void set_dock_window_list(GList * list);
 
-#endif
+#endif /* AUDACIOUS_UI_DOCK_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_equalizer.h
--- a/src/audacious/ui_equalizer.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_equalizer.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef EQUALIZER_H
-#define EQUALIZER_H
+#ifndef AUDACIOUS_UI_EQUALIZER_H
+#define AUDACIOUS_UI_EQUALIZER_H
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -65,4 +65,4 @@
 
 void equalizer_activate(gboolean active);
 
-#endif
+#endif /* AUDACIOUS_UI_EQUALIZER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_fileinfo.h
--- a/src/audacious/ui_fileinfo.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_fileinfo.h	Mon May 19 04:32:52 2008 +0300
@@ -16,8 +16,8 @@
  * along with this program;  If not, see <http://www.gnu.org/licenses>.
  */
 
-#ifndef _UI_FILEINFO_H_
-#define _UI_FILEINFO_H_
+#ifndef AUDACIOUS_UI_FILEINFO_H
+#define AUDACIOUS_UI_FILEINFO_H
 
 #include "tuple.h"
 #include "plugin.h"
@@ -29,4 +29,4 @@
 void ui_fileinfo_show(Playlist *playlist, guint pos);
 void ui_fileinfo_show_current(Playlist *playlist);
 
-#endif
+#endif /* AUDACIOUS_UI_FILEINFO_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_fileinfopopup.h
--- a/src/audacious/ui_fileinfopopup.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_fileinfopopup.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#ifndef _UI_FILEINFOPOPUP_H_
-#define _UI_FILEINFOPOPUP_H_
+#ifndef AUDACIOUS_UI_FILEINFOPOPUP_H
+#define AUDACIOUS_UI_FILEINFOPOPUP_H
 
 #include "audacious/tuple.h"
 #include <gtk/gtk.h>
@@ -33,4 +33,4 @@
 void fileinfopopup_show_from_title(GtkWidget *fileinfopopup_win, gchar *title);
 void fileinfopopup_hide(GtkWidget *filepopup_win, gpointer unused);
 
-#endif
+#endif /* AUDACIOUS_UI_FILEINFOPOPUP_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_fileopener.h
--- a/src/audacious/ui_fileopener.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_fileopener.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef UI_FILEOPENER_H
-#define UI_FILEOPENER_H
+#ifndef AUDACIOUS_UI_FILEOPENER_H
+#define AUDACIOUS_UI_FILEOPENER_H
 
 #include <gtk/gtk.h>
 
@@ -28,4 +28,4 @@
 void run_filebrowser(gboolean clear_pl_on_ok);
 void hide_filebrowser(void);
 
-#endif
+#endif /* AUDACIOUS_UI_FILEOPENER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_hints.h
--- a/src/audacious/ui_hints.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_hints.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef HINTS_H
-#define HINTS_H
+#ifndef AUDACIOUS_UI_HINTS_H
+#define AUDACIOUS_UI_HINTS_H
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -32,4 +32,4 @@
 void hint_set_always(gboolean always);
 void hint_set_sticky(gboolean sticky);
 
-#endif
+#endif /* AUDACIOUS_UI_HINTS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_jumptotrack.h
--- a/src/audacious/ui_jumptotrack.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_jumptotrack.h	Mon May 19 04:32:52 2008 +0300
@@ -23,11 +23,11 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef UI_JUMPTOTRACK_H
-#define UI_JUMPTOTRACK_H
+#ifndef AUDACIOUS_UI_JUMPTOTRACK_H
+#define AUDACIOUS_UI_JUMPTOTRACK_H
 
 extern void ui_jump_to_track_update(GtkWidget * widget, gpointer user_data);
 extern void ui_jump_to_track(void);
 extern void ui_jump_to_track_hide(void);
 
-#endif
+#endif /* AUDACIOUS_UI_JUMPTOTRACK_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_jumptotrack_cache.h
--- a/src/audacious/ui_jumptotrack_cache.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_jumptotrack_cache.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef UI_JUMPTOTRACK_CACHE_H
-#define UI_JUMPTOTRACK_CACHE_H
+#ifndef AUDACIOUS_UI_JUMPTOTRACK_CACHE_H
+#define AUDACIOUS_UI_JUMPTOTRACK_CACHE_H
 
 #include <glib.h>
 
@@ -44,4 +44,4 @@
 extern const GArray* ui_jump_to_track_cache_search(JumpToTrackCache* cache, const Playlist* playlist, const gchar* keyword);
 extern void ui_jump_to_track_cache_free(JumpToTrackCache* cache);
 
-#endif
+#endif /* AUDACIOUS_UI_JUMPTOTRACK_CACHE_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_main.h
--- a/src/audacious/ui_main.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_main.h	Mon May 19 04:32:52 2008 +0300
@@ -20,8 +20,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef MAINWIN_H
-#define MAINWIN_H
+#ifndef AUDACIOUS_UI_MAIN_H
+#define AUDACIOUS_UI_MAIN_H
 
 #include <gtk/gtk.h>
 
@@ -191,4 +191,4 @@
 
 void util_menu_main_show( gint x , gint y , guint button , guint time );
 
-#endif
+#endif /* AUDACIOUS_UI_MAIN_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_main_evlisteners.h
--- a/src/audacious/ui_main_evlisteners.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_main_evlisteners.h	Mon May 19 04:32:52 2008 +0300
@@ -20,9 +20,9 @@
 
 #include <glib.h>
 
-#ifndef __AUDACIOUS_UI_MAIN_EVLISTENERS_H__
-#define __AUDACIOUS_UI_MAIN_EVLISTENERS_H__
+#ifndef AUDACIOUS_UI_MAIN_EVLISTENERS_H
+#define AUDACIOUS_UI_MAIN_EVLISTENERS_H
 
 void ui_main_evlistener_init(void);
 
-#endif
+#endif /* AUDACIOUS_UI_MAIN_EVLISTENERS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_manager.h
--- a/src/audacious/ui_manager.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_manager.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_UIMANAGER_H__
-#define __AUDACIOUS_UIMANAGER_H__
+#ifndef AUDACIOUS_UI_MANAGER_H
+#define AUDACIOUS_UI_MANAGER_H
 
 #include <glib.h>
 #include <glib/gi18n.h>
@@ -74,4 +74,4 @@
 
 G_END_DECLS
 
-#endif /* __AUDACIOUS_UIMANAGER_H__ */
+#endif /* AUDACIOUS_UI_MANAGER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_playlist.h
--- a/src/audacious/ui_playlist.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_playlist.h	Mon May 19 04:32:52 2008 +0300
@@ -20,8 +20,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef PLAYLISTWIN_H
-#define PLAYLISTWIN_H
+#ifndef AUDACIOUS_UI_PLAYLIST_H
+#define AUDACIOUS_UI_PLAYLIST_H
 
 #include <glib.h>
 
@@ -77,4 +77,4 @@
 
 extern gboolean playlistwin_focus;
 
-#endif
+#endif /* AUDACIOUS_UI_PLAYLIST_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_playlist_evlisteners.h
--- a/src/audacious/ui_playlist_evlisteners.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_playlist_evlisteners.h	Mon May 19 04:32:52 2008 +0300
@@ -18,9 +18,9 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_UI_PLAYLIST_EVLISTENERS_H__
-#define __AUDACIOUS_UI_PLAYLIST_EVLISTENERS_H__
+#ifndef AUDACIOUS_UI_PLAYLIST_EVLISTENERS_H
+#define AUDACIOUS_UI_PLAYLIST_EVLISTENERS_H
 
 void ui_playlist_evlistener_init(void);
 
-#endif 
+#endif /* AUDACIOUS_UI_PLAYLIST_EVLISTENERS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_playlist_manager.h
--- a/src/audacious/ui_playlist_manager.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_playlist_manager.h	Mon May 19 04:32:52 2008 +0300
@@ -17,10 +17,10 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef PLAYLISTMANAGER_H
-#define PLAYLISTMANAGER_H
+#ifndef AUDACIOUS_UI_PLAYLIST_MANAGER_H
+#define AUDACIOUS_UI_PLAYLIST_MANAGER_H
 
 void playlist_manager_update ( void );
 void playlist_manager_ui_show ( void );
 
-#endif
+#endif /* AUDACIOUS_UI_PLAYLIST_MANAGER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_plugin_menu.h
--- a/src/audacious/ui_plugin_menu.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_plugin_menu.h	Mon May 19 04:32:52 2008 +0300
@@ -19,8 +19,8 @@
 
 /* these functions are currently implemented in ui_manager.c */
 
-#ifndef __AUDACIOUS_UIPLUGINMENU_H__
-#define __AUDACIOUS_UIPLUGINMENU_H__
+#ifndef AUDACIOUS_UI_PLUGIN_MENU_H
+#define AUDACIOUS_UI_PLUGIN_MENU_H
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -40,4 +40,4 @@
 
 G_END_DECLS
 
-#endif /* __AUDACIOUS_UIPLUGINMENU_H__ */
+#endif /* AUDACIOUS_UI_PLUGIN_MENU_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_preferences.h
--- a/src/audacious/ui_preferences.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_preferences.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef PREFSWIN_H
-#define PREFSWIN_H
+#ifndef AUDACIOUS_UI_PREFERENCES_H
+#define AUDACIOUS_UI_PREFERENCES_H
 
 void create_prefs_window(void);
 void show_prefs_window(void);
@@ -32,4 +32,4 @@
                                 GtkSelectionData * selection_data,
                                 guint info, guint time,
                                 gpointer user_data);
-#endif
+#endif /* AUDACIOUS_UI_PREFERENCES_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skin.c
--- a/src/audacious/ui_skin.c	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skin.c	Mon May 19 04:32:52 2008 +0300
@@ -2037,8 +2037,10 @@
     g_return_if_fail(obj != NULL);
 
     if (scale) {
-        GdkPixbuf *image = gdk_pixbuf_scale_simple(obj, width * cfg.scale_factor, height* cfg.scale_factor, GDK_INTERP_NEAREST);
-        gdk_draw_pixbuf(widget->window, NULL, image, 0, 0, 0, 0, width * cfg.scale_factor , height * cfg.scale_factor, GDK_RGB_DITHER_NONE, 0, 0);
+        gint s_width = width * cfg.scale_factor,
+             s_height = height * cfg.scale_factor;
+        GdkPixbuf *image = gdk_pixbuf_scale_simple(obj, s_width, s_height, GDK_INTERP_NEAREST);
+        gdk_draw_pixbuf(widget->window, NULL, image, 0, 0, 0, 0, s_width, s_height, GDK_RGB_DITHER_NONE, 0, 0);
         g_object_unref(image);
     } else {
         gdk_draw_pixbuf(widget->window, NULL, obj, 0, 0, 0, 0, width, height, GDK_RGB_DITHER_NONE, 0, 0);
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skin.h
--- a/src/audacious/ui_skin.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skin.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef SKIN_H
-#define SKIN_H
+#ifndef AUDACIOUS_UI_SKIN_H
+#define AUDACIOUS_UI_SKIN_H
 
 #include <glib.h>
 #include <gdk/gdk.h>
@@ -244,4 +244,4 @@
 
 void ui_skinned_widget_draw(GtkWidget *widget, GdkPixbuf *obj, gint width, gint height, gboolean scale);
 
-#endif
+#endif /* AUDACIOUS_UI_SKIN_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_button.h
--- a/src/audacious/ui_skinned_button.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_button.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDBUTTON_H
-#define UISKINNEDBUTTON_H
+#ifndef AUDACIOUS_UI_SKINNED_BUTTON_H
+#define AUDACIOUS_UI_SKINNED_BUTTON_H
 
 #include <gtk/gtk.h>
 #include "ui_skin.h"
@@ -71,4 +71,4 @@
 void ui_skinned_button_set_skin_index2(GtkWidget *button, SkinPixmapId si);
 void ui_skinned_button_move_relative(GtkWidget *button, gint x, gint y);
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_BUTTON_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_equalizer_graph.h
--- a/src/audacious/ui_skinned_equalizer_graph.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_equalizer_graph.h	Mon May 19 04:32:52 2008 +0300
@@ -24,8 +24,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDEQUALIZERGRAPH_H
-#define UISKINNEDEQUALIZERGRAPH_H
+#ifndef AUDACIOUS_UI_SKINNED_EQUALIZER_GRAPH_H
+#define AUDACIOUS_UI_SKINNED_EQUALIZER_GRAPH_H
 
 #include <gtk/gtk.h>
 #include "ui_skin.h"
@@ -60,4 +60,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_EQUALIZER_GRAPH_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_equalizer_slider.h
--- a/src/audacious/ui_skinned_equalizer_slider.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_equalizer_slider.h	Mon May 19 04:32:52 2008 +0300
@@ -21,8 +21,8 @@
  * along with this program;  If not, see <http://www.gnu.org/licenses>.
  */
 
-#ifndef UISKINNEDEQUALIZER_SLIDER_H
-#define UISKINNEDEQUALIZER_SLIDER_H
+#ifndef AUDACIOUS_UI_SKINNED_EQUALIZER_SLIDER_H
+#define AUDACIOUS_UI_SKINNED_EQUALIZER_SLIDER_H
 
 #include <gtk/gtk.h>
 #include "ui_skin.h"
@@ -57,4 +57,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_EQUALIZER_SLIDER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_horizontal_slider.h
--- a/src/audacious/ui_skinned_horizontal_slider.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_horizontal_slider.h	Mon May 19 04:32:52 2008 +0300
@@ -24,8 +24,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDHORIZONTAL_SLIDER_H
-#define UISKINNEDHORIZONTAL_SLIDER_H
+#ifndef AUDACIOUS_UI_SKINNED_HORIZONTAL_SLIDER_H
+#define AUDACIOUS_UI_SKINNED_HORIZONTAL_SLIDER_H
 
 #include <gtk/gtk.h>
 #include "ui_skin.h"
@@ -66,4 +66,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_HORIZONTAL_SLIDER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_menurow.h
--- a/src/audacious/ui_skinned_menurow.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_menurow.h	Mon May 19 04:32:52 2008 +0300
@@ -24,8 +24,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDMENUROW_H
-#define UISKINNEDMENUROW_H
+#ifndef AUDACIOUS_UI_SKINNED_MENUROW_H
+#define AUDACIOUS_UI_SKINNED_MENUROW_H
 
 #include <gtk/gtk.h>
 #include "ui_skin.h"
@@ -74,4 +74,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_MENUROW_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_monostereo.h
--- a/src/audacious/ui_skinned_monostereo.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_monostereo.h	Mon May 19 04:32:52 2008 +0300
@@ -24,8 +24,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDMONOSTEREO_H
-#define UISKINNEDMONOSTEREO_H
+#ifndef AUDACIOUS_UI_SKINNED_MONOSTEREO_H
+#define AUDACIOUS_UI_SKINNED_MONOSTEREO_H
 
 #include <gtk/gtk.h>
 #include "ui_skin.h"
@@ -63,4 +63,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_MONOSTEREO_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_number.h
--- a/src/audacious/ui_skinned_number.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_number.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDNUMBER_H
-#define UISKINNEDNUMBER_H
+#ifndef AUDACIOUS_UI_SKINNED_NUMBER_H
+#define AUDACIOUS_UI_SKINNED_NUMBER_H
 
 #include <gtk/gtk.h>
 #include "ui_skin.h"
@@ -58,4 +58,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_NUMBER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_playlist.h
--- a/src/audacious/ui_skinned_playlist.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_playlist.h	Mon May 19 04:32:52 2008 +0300
@@ -24,8 +24,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDPLAYLIST_H
-#define UISKINNEDPLAYLIST_H
+#ifndef AUDACIOUS_UI_SKINNED_PLAYLIST_H
+#define AUDACIOUS_UI_SKINNED_PLAYLIST_H
 
 #include <gtk/gtk.h>
 
@@ -74,4 +74,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_PLAYLIST_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_playlist_slider.h
--- a/src/audacious/ui_skinned_playlist_slider.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_playlist_slider.h	Mon May 19 04:32:52 2008 +0300
@@ -24,8 +24,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDPLAYLIST_SLIDER_H
-#define UISKINNEDPLAYLIST_SLIDER_H
+#ifndef AUDACIOUS_UI_SKINNED_PLAYLIST_SLIDER_H
+#define AUDACIOUS_UI_SKINNED_PLAYLIST_SLIDER_H
 
 #include <gtk/gtk.h>
 
@@ -60,4 +60,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_PLAYLIST_SLIDER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_playstatus.h
--- a/src/audacious/ui_skinned_playstatus.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_playstatus.h	Mon May 19 04:32:52 2008 +0300
@@ -24,8 +24,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDPLAYSTATUS_H
-#define UISKINNEDPLAYSTATUS_H
+#ifndef AUDACIOUS_UI_SKINNED_PLAYSTATUS_H
+#define AUDACIOUS_UI_SKINNED_PLAYSTATUS_H
 
 #include <gtk/gtk.h>
 
@@ -68,4 +68,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_PLAYSTATUS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_textbox.h
--- a/src/audacious/ui_skinned_textbox.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_textbox.h	Mon May 19 04:32:52 2008 +0300
@@ -24,8 +24,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISKINNEDTEXTBOX_H
-#define UISKINNEDTEXTBOX_H
+#ifndef AUDACIOUS_UI_SKINNED_TEXTBOX_H
+#define AUDACIOUS_UI_SKINNED_TEXTBOX_H
 
 #include <gtk/gtk.h>
 #include "ui_skin.h"
@@ -68,4 +68,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_TEXTBOX_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinned_window.h
--- a/src/audacious/ui_skinned_window.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinned_window.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UI_SKINNED_WINDOW_H
-#define UI_SKINNED_WINDOW_H
+#ifndef AUDACIOUS_UI_SKINNED_WINDOW_H
+#define AUDACIOUS_UI_SKINNED_WINDOW_H
 
 #define SKINNED_WINDOW(obj)          GTK_CHECK_CAST (obj, ui_skinned_window_get_type (), SkinnedWindow)
 #define SKINNED_WINDOW_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, ui_skinned_window_get_type (), SkinnedWindowClass)
@@ -61,4 +61,4 @@
 extern GtkWidget *ui_skinned_window_new(const gchar *wmclass_name);
 extern void ui_skinned_window_draw_all(GtkWidget *widget);
 
-#endif
+#endif /* AUDACIOUS_UI_SKINNED_WINDOW_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_skinselector.h
--- a/src/audacious/ui_skinselector.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_skinselector.h	Mon May 19 04:32:52 2008 +0300
@@ -20,8 +20,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef SKINWIN_H
-#define SKINWIN_H
+#ifndef AUDACIOUS_UI_SKINSELECTOR_H
+#define AUDACIOUS_UI_SKINSELECTOR_H
 
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -42,4 +42,4 @@
 void skin_view_realize(GtkTreeView * treeview);
 void skin_view_update(GtkTreeView * treeview, GtkWidget * refresh_button);
 
-#endif
+#endif /* AUDACIOUS_UI_SKINSELECTOR_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_svis.h
--- a/src/audacious/ui_svis.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_svis.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UISVIS_H
-#define UISVIS_H
+#ifndef AUDACIOUS_UI_SVIS_H
+#define AUDACIOUS_UI_SVIS_H
 
 #include <gtk/gtk.h>
 
@@ -61,4 +61,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_SVIS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_urlopener.h
--- a/src/audacious/ui_urlopener.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_urlopener.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_UI_URLOPENER_H__
-#define __AUDACIOUS_UI_URLOPENER_H__
+#ifndef AUDACIOUS_UI_URLOPENER_H
+#define AUDACIOUS_UI_URLOPENER_H
 
 #ifdef _AUDACIOUS_CORE
 # ifdef HAVE_CONFIG_H
@@ -42,4 +42,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* AUDACIOUS_UI_URLOPENER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/ui_vis.h
--- a/src/audacious/ui_vis.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/ui_vis.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef UIVIS_H
-#define UIVIS_H
+#ifndef AUDACIOUS_UI_VIS_H
+#define AUDACIOUS_UI_VIS_H
 
 #include <gtk/gtk.h>
 
@@ -95,4 +95,4 @@
 }
 #endif
 
-#endif
+#endif /* AUDACIOUS_UI_VIS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/util.c
--- a/src/audacious/util.c	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/util.c	Mon May 19 04:32:52 2008 +0300
@@ -1036,10 +1036,8 @@
 gpointer
 smart_realloc(gpointer ptr, gsize *size)
 {
-    *size = (size_t)pow(2, ceil(log(*size) / log(2)) + 1);
-    if (ptr != NULL) free(ptr);
-    ptr = malloc(*size);
-    return ptr;
+    *size = (gsize)pow(2, ceil(log(*size) / log(2)) + 1);
+    return g_realloc(ptr, *size);
 }
 
 void
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/util.h
--- a/src/audacious/util.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/util.h	Mon May 19 04:32:52 2008 +0300
@@ -23,8 +23,8 @@
  *  Audacious or using our public API to be a derived work.
  */
 
-#ifndef UTIL_H
-#define UTIL_H
+#ifndef AUDACIOUS_UTIL_H
+#define AUDACIOUS_UTIL_H
 
 #ifdef _AUDACIOUS_CORE
 # ifdef HAVE_CONFIG_H
@@ -100,4 +100,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* AUDACIOUS_UTIL_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/vfs.h
--- a/src/audacious/vfs.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/vfs.h	Mon May 19 04:32:52 2008 +0300
@@ -18,8 +18,8 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#ifndef __AUDACIOUS_VFS_H__
-#define __AUDACIOUS_VFS_H__
+#ifndef AUDACIOUS_VFS_H
+#define AUDACIOUS_VFS_H
 
 #include <glib.h>
 #include <stdio.h>
@@ -146,4 +146,4 @@
 
 G_END_DECLS
 
-#endif /* __AUDACIOUS_VFS_H__ */
+#endif /* AUDACIOUS_VFS_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/vfs_buffer.h
--- a/src/audacious/vfs_buffer.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/vfs_buffer.h	Mon May 19 04:32:52 2008 +0300
@@ -68,4 +68,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* AUDACIOUS_VFS_BUFFER_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/vfs_buffered_file.h
--- a/src/audacious/vfs_buffered_file.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/vfs_buffered_file.h	Mon May 19 04:32:52 2008 +0300
@@ -58,4 +58,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* AUDACIOUS_VFS_BUFFERED_FILE_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/visualization.h
--- a/src/audacious/visualization.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/visualization.h	Mon May 19 04:32:52 2008 +0300
@@ -22,8 +22,8 @@
  *  The Audacious team does not consider modular code linking to
  *  Audacious or using our public API to be a derived work.
  */
-#ifndef VISUALIZATION_H
-#define VISUALIZATION_H
+#ifndef AUDACIOUS_VISUALIZATION_H
+#define AUDACIOUS_VISUALIZATION_H
 
 #include <glib.h>
 #include "flow.h"
@@ -50,4 +50,4 @@
 
 extern VisPluginData vp_data;
 
-#endif
+#endif /* AUDACIOUS_VISUALIZATION_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/audacious/volumecontrol.h
--- a/src/audacious/volumecontrol.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/audacious/volumecontrol.h	Mon May 19 04:32:52 2008 +0300
@@ -22,8 +22,8 @@
 
 #include "flow.h"
 
-#ifndef __VOLUMECONTROL_H__
-#define __VOLUMECONTROL_H__
+#ifndef AUDACIOUS_VOLUMECONTROL_H
+#define AUDACIOUS_VOLUMECONTROL_H
 
 void volumecontrol_pad_audio(gpointer data, gint length, AFormat fmt, 
     gint channels);
@@ -31,4 +31,4 @@
 void volumecontrol_set_volume_state(gint l, gint r);
 void volumecontrol_flow(FlowContext *context);
 
-#endif
+#endif /* AUDACIOUS_VOLUMECONTROL_H */
diff -r 87b537f1e92e -r 798da2a49d09 src/libaudclient/audctrl.h
--- a/src/libaudclient/audctrl.h	Mon May 19 02:04:09 2008 +0200
+++ b/src/libaudclient/audctrl.h	Mon May 19 04:32:52 2008 +0300
@@ -17,8 +17,8 @@
  * 02110-1301, USA.
  */
 
-#ifndef _AUDCTRL_H
-#define _AUDCTRL_H
+#ifndef AUDACIOUS_AUDCTRL_H
+#define AUDACIOUS_AUDCTRL_H
 
 #include <glib.h>
 #include <dbus/dbus-glib.h>
@@ -127,4 +127,4 @@
 
 G_END_DECLS
 
-#endif
+#endif /* AUDACIOUS_AUDCTRL_H */