# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1227635704 -32400
# Node ID 3134a0987162152af599d1ac6becfd8f859f1197
# Parent  57d499fc505614ad8bd3f2ddd4df9f774bba41e3
- changed include path from audacious to audlegacy.
- changed include path for libSAD.h.

diff -r 57d499fc5056 -r 3134a0987162 src/CoreAudio/configure.c
--- a/src/CoreAudio/configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/CoreAudio/configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -19,8 +19,8 @@
 
 #include "coreaudio.h"
 #include <CoreAudio/CoreAudio.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 static GtkWidget *configure_win = NULL;
 static GtkWidget *mixer_usemaster_check, *buffer_size_spin, *buffer_pre_spin;
diff -r 57d499fc5056 -r 3134a0987162 src/CoreAudio/coreaudio.c
--- a/src/CoreAudio/coreaudio.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/CoreAudio/coreaudio.c	Wed Nov 26 02:55:04 2008 +0900
@@ -19,8 +19,8 @@
 
 #include "coreaudio.h"
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 OutputPlugin osx_op =
 {
diff -r 57d499fc5056 -r 3134a0987162 src/CoreAudio/coreaudio.h
--- a/src/CoreAudio/coreaudio.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/CoreAudio/coreaudio.h	Wed Nov 26 02:55:04 2008 +0900
@@ -40,7 +40,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #ifdef WORDS_BIGENDIAN
 # define IS_BIG_ENDIAN TRUE
diff -r 57d499fc5056 -r 3134a0987162 src/CoreAudio/init.c
--- a/src/CoreAudio/init.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/CoreAudio/init.c	Wed Nov 26 02:55:04 2008 +0900
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include "coreaudio.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 OSXConfig osx_cfg;
 
diff -r 57d499fc5056 -r 3134a0987162 src/OSS/OSS.c
--- a/src/OSS/OSS.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/OSS/OSS.c	Wed Nov 26 02:55:04 2008 +0900
@@ -22,7 +22,7 @@
 #include "OSS.h"
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <stdlib.h>
 
 OSSConfig oss_cfg;
diff -r 57d499fc5056 -r 3134a0987162 src/OSS/OSS.h
--- a/src/OSS/OSS.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/OSS/OSS.h	Wed Nov 26 02:55:04 2008 +0900
@@ -32,7 +32,7 @@
 #include <soundcard.h>
 #endif
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #define IS_BIG_ENDIAN (G_BYTE_ORDER == G_BIG_ENDIAN)
 
diff -r 57d499fc5056 -r 3134a0987162 src/OSS/configure.c
--- a/src/OSS/configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/OSS/configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 
 static GtkWidget *configure_win = NULL;
diff -r 57d499fc5056 -r 3134a0987162 src/OSS4/OSS4.c
--- a/src/OSS4/OSS4.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/OSS4/OSS4.c	Wed Nov 26 02:55:04 2008 +0900
@@ -22,8 +22,8 @@
 #include "OSS4.h"
 
 #include <glib.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 #include <stdlib.h>
 
 OSSConfig oss_cfg;
diff -r 57d499fc5056 -r 3134a0987162 src/OSS4/OSS4.h
--- a/src/OSS4/OSS4.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/OSS4/OSS4.h	Wed Nov 26 02:55:04 2008 +0900
@@ -30,7 +30,7 @@
 #include <soundcard.h>
 #endif
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <glib.h>
 
 #define IS_BIG_ENDIAN (G_BYTE_ORDER == G_BIG_ENDIAN)
diff -r 57d499fc5056 -r 3134a0987162 src/OSS4/configure.c
--- a/src/OSS4/configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/OSS4/configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -25,8 +25,8 @@
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <string.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 
 static GtkWidget *configure_win = NULL;
diff -r 57d499fc5056 -r 3134a0987162 src/aac/libmp4.c
--- a/src/aac/libmp4.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/aac/libmp4.c	Wed Nov 26 02:55:04 2008 +0900
@@ -6,9 +6,9 @@
 #include "mp4ff.h"
 #include "tagging.h"
 
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 
 #define MP4_VERSION VERSION
 #define SBR_DEC
diff -r 57d499fc5056 -r 3134a0987162 src/aac/mp4_utils.c
--- a/src/aac/mp4_utils.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/aac/mp4_utils.c	Wed Nov 26 02:55:04 2008 +0900
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 const char *mp4AudioNames[]=
   {
diff -r 57d499fc5056 -r 3134a0987162 src/aac/xmms-id3.h
--- a/src/aac/xmms-id3.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/aac/xmms-id3.h	Wed Nov 26 02:55:04 2008 +0900
@@ -29,7 +29,7 @@
 #define ID3_H
 
 #include <glib.h>
-#include <audacious/vfs.h>
+#include <audlegacy/vfs.h>
 
 /*
  * Option flags to id3_open_*().
diff -r 57d499fc5056 -r 3134a0987162 src/adplug/core/binio_virtual.h
--- a/src/adplug/core/binio_virtual.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/adplug/core/binio_virtual.h	Wed Nov 26 02:55:04 2008 +0900
@@ -14,7 +14,7 @@
 #include <glib.h>
 
 extern "C" {
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 };
 
 class vfsistream : public binistream, virtual public binio {
diff -r 57d499fc5056 -r 3134a0987162 src/alac/plugin.c
--- a/src/alac/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/alac/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -43,10 +43,10 @@
 #include <string.h>
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
-#include <audacious/plugin.h>
-#include <audacious/output.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
 
 #include "demux.h"
 #include "decomp.h"
diff -r 57d499fc5056 -r 3134a0987162 src/alac/stream.c
--- a/src/alac/stream.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/alac/stream.c	Wed Nov 26 02:55:04 2008 +0900
@@ -44,7 +44,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include "stream.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/alac/stream.h
--- a/src/alac/stream.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/alac/stream.h	Wed Nov 26 02:55:04 2008 +0900
@@ -13,7 +13,7 @@
 # endif
 #endif
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 typedef struct stream_tTAG stream_t;
 
diff -r 57d499fc5056 -r 3134a0987162 src/alarm/alarm.c
--- a/src/alarm/alarm.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/alarm/alarm.c	Wed Nov 26 02:55:04 2008 +0900
@@ -38,8 +38,8 @@
 
 #include <string.h>
 #include <stdio.h>
-#include <audacious/plugin.h>
-#include <audacious/auddrct.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/auddrct.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 #include <pthread.h>
diff -r 57d499fc5056 -r 3134a0987162 src/alarm/interface.c
--- a/src/alarm/interface.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/alarm/interface.c	Wed Nov 26 02:55:04 2008 +0900
@@ -16,7 +16,7 @@
 #include "interface.h"
 #include "support.h"
 
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 GtkWidget*
 create_about_dialog (void)
diff -r 57d499fc5056 -r 3134a0987162 src/alsa/alsa.h
--- a/src/alsa/alsa.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/alsa/alsa.h	Wed Nov 26 02:55:04 2008 +0900
@@ -25,8 +25,8 @@
 
 #include "config.h"
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
diff -r 57d499fc5056 -r 3134a0987162 src/amidi-plug/amidi-plug.h
--- a/src/amidi-plug/amidi-plug.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/amidi-plug/amidi-plug.h	Wed Nov 26 02:55:04 2008 +0900
@@ -28,9 +28,9 @@
 #define AMIDIPLUG_ERR	4
 
 #include "i_common.h"
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/auddrct.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/auddrct.h>
 #include <pthread.h>
 #include "i_vfslayer.h"
 #include "i_backend.h"
diff -r 57d499fc5056 -r 3134a0987162 src/amidi-plug/i_common.h
--- a/src/amidi-plug/i_common.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/amidi-plug/i_common.h	Wed Nov 26 02:55:04 2008 +0900
@@ -28,7 +28,7 @@
 #include <strings.h>
 #include <glib.h>
 
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #define DEBUG 1
 
diff -r 57d499fc5056 -r 3134a0987162 src/amidi-plug/i_configure.c
--- a/src/amidi-plug/i_configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/amidi-plug/i_configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -28,9 +28,9 @@
 #include "i_configure-fluidsynth.h"
 #include "i_configure-dummy.h"
 #include "i_utils.h"
-#include <audacious/plugin.h>
-#include <audacious/auddrct.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/auddrct.h>
+#include <audlegacy/plugin.h>
 
 
 amidiplug_cfg_backend_t * amidiplug_cfg_backend;
diff -r 57d499fc5056 -r 3134a0987162 src/amidi-plug/i_vfslayer.h
--- a/src/amidi-plug/i_vfslayer.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/amidi-plug/i_vfslayer.h	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 #define _I_VFSLAYER_H 1
 
 #include "i_common.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 
 #define VFS_FOPEN( x , y )		aud_vfs_fopen( x , y )
diff -r 57d499fc5056 -r 3134a0987162 src/aosd/aosd.c
--- a/src/aosd/aosd.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/aosd/aosd.c	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 #include "aosd_osd.h"
 #include "aosd_cfg.h"
 #include "aosd_trigger.h"
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 
 GeneralPlugin *aosd_gplist[] = { &aosd_gp, NULL };
diff -r 57d499fc5056 -r 3134a0987162 src/aosd/aosd.h
--- a/src/aosd/aosd.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/aosd/aosd.h	Wed Nov 26 02:55:04 2008 +0900
@@ -26,7 +26,7 @@
 
 #include "aosd_common.h"
 #include <glib.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 void aosd_init ( void );
 void aosd_cleanup ( void );
diff -r 57d499fc5056 -r 3134a0987162 src/aosd/aosd_cfg.c
--- a/src/aosd/aosd_cfg.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/aosd/aosd_cfg.c	Wed Nov 26 02:55:04 2008 +0900
@@ -22,7 +22,7 @@
 #include "aosd_style.h"
 #include <glib.h>
 #include <stdlib.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 
 static gint
diff -r 57d499fc5056 -r 3134a0987162 src/aosd/aosd_style.c
--- a/src/aosd/aosd_style.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/aosd/aosd_style.c	Wed Nov 26 02:55:04 2008 +0900
@@ -22,7 +22,7 @@
 #include "aosd_style_private.h"
 #include "aosd_cfg.h"
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <X11/Xlib.h>
 #include <cairo/cairo.h>
 #include <pango/pangocairo.h>
diff -r 57d499fc5056 -r 3134a0987162 src/aosd/aosd_trigger.c
--- a/src/aosd/aosd_trigger.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/aosd/aosd_trigger.c	Wed Nov 26 02:55:04 2008 +0900
@@ -23,10 +23,10 @@
 #include "aosd_cfg.h"
 #include "aosd_osd.h"
 #include <glib.h>
-#include <audacious/i18n.h>
-#include <audacious/playlist.h>
-#include <audacious/hook.h>
-#include <audacious/auddrct.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/playlist.h>
+#include <audlegacy/hook.h>
+#include <audlegacy/auddrct.h>
 
 
 extern aosd_cfg_t * global_config;
diff -r 57d499fc5056 -r 3134a0987162 src/aosd/aosd_ui.c
--- a/src/aosd/aosd_ui.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/aosd/aosd_ui.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,7 +24,7 @@
 #include "aosd_cfg.h"
 #include "aosd_osd.h"
 #include "aosd_common.h"
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
diff -r 57d499fc5056 -r 3134a0987162 src/arts/arts.h
--- a/src/arts/arts.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/arts/arts.h	Wed Nov 26 02:55:04 2008 +0900
@@ -24,8 +24,8 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 # include "config.h"
 
 struct arts_config
diff -r 57d499fc5056 -r 3134a0987162 src/arts/convert.c
--- a/src/arts/convert.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/arts/convert.c	Wed Nov 26 02:55:04 2008 +0900
@@ -18,7 +18,7 @@
 
 #include "config.h"
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <glib.h>
 
 #ifdef WORDS_BIGENDIAN
diff -r 57d499fc5056 -r 3134a0987162 src/audiocompress/audacious-glue.c
--- a/src/audiocompress/audacious-glue.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/audiocompress/audacious-glue.c	Wed Nov 26 02:55:04 2008 +0900
@@ -8,8 +8,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/plugin.h>
 
 #include "audiocompress_config.h"
 #include "compress.h"
diff -r 57d499fc5056 -r 3134a0987162 src/bluetooth/bluetooth.c
--- a/src/bluetooth/bluetooth.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/bluetooth/bluetooth.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,7 +24,7 @@
 #include "gui.h"
 #include "scan_gui.h"
 #include "agent.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #define DEBUG 1
 GList * current_device = NULL;
 gint config = 0;
diff -r 57d499fc5056 -r 3134a0987162 src/bluetooth/bluetooth.h
--- a/src/bluetooth/bluetooth.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/bluetooth/bluetooth.h	Wed Nov 26 02:55:04 2008 +0900
@@ -19,18 +19,18 @@
 #include <config.h>
 #include <glib.h>
 #include <sys/types.h>
-#include <audacious/plugin.h>
-#include <audacious/ui_plugin_menu.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/ui_plugin_menu.h>
+#include <audlegacy/i18n.h>
 #include <gtk/gtk.h>
-#include <audacious/util.h>
+#include <audlegacy/util.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
 #include <glib-object.h>
 #include <stdio.h>
-#include <audacious/configdb.h>
-#include <audacious/i18n.h>
-#include <audacious/util.h>
+#include <audlegacy/configdb.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/util.h>
 #include "gui.h"
 typedef struct {
     guint class;
diff -r 57d499fc5056 -r 3134a0987162 src/bluetooth/scan_gui.h
--- a/src/bluetooth/scan_gui.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/bluetooth/scan_gui.h	Wed Nov 26 02:55:04 2008 +0900
@@ -20,8 +20,8 @@
 #include <glib.h>
 #include <alsa/asoundlib.h>
 #include <alsa/pcm_plugin.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 
 void show_scan(gint use);
diff -r 57d499fc5056 -r 3134a0987162 src/blur_scope/blur_scope.c
--- a/src/blur_scope/blur_scope.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/blur_scope/blur_scope.c	Wed Nov 26 02:55:04 2008 +0900
@@ -22,10 +22,10 @@
 #include "config.h"
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <gtk/gtk.h>
 #include <string.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "blur_scope.h"
 #include "bscope_logo.xpm"
 
diff -r 57d499fc5056 -r 3134a0987162 src/blur_scope/config.c
--- a/src/blur_scope/config.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/blur_scope/config.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,10 +1,10 @@
 #include "config.h"
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <gtk/gtk.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "blur_scope.h"
 
 
diff -r 57d499fc5056 -r 3134a0987162 src/cdaudio-ng/cdaudio-ng.c
--- a/src/cdaudio-ng/cdaudio-ng.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/cdaudio-ng/cdaudio-ng.c	Wed Nov 26 02:55:04 2008 +0900
@@ -45,10 +45,10 @@
 
 #include <glib.h>
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
-#include <audacious/output.h>
-#include <audacious/ui_plugin_menu.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/output.h>
+#include <audlegacy/ui_plugin_menu.h>
 
 #include "cdaudio-ng.h"
 #include "configure.h"
diff -r 57d499fc5056 -r 3134a0987162 src/cdaudio-ng/configure.c
--- a/src/cdaudio-ng/configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/cdaudio-ng/configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include "config.h"
 
 #include "configure.h"
diff -r 57d499fc5056 -r 3134a0987162 src/console/Audacious_Config.cxx
--- a/src/console/Audacious_Config.cxx	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/console/Audacious_Config.cxx	Wed Nov 26 02:55:04 2008 +0900
@@ -11,8 +11,8 @@
 #include "config.h"
 
 #include <glib.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/plugin.h>
 #include <gtk/gtk.h>
 #include "Audacious_Config.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/console/Audacious_Driver.cxx
--- a/src/console/Audacious_Driver.cxx	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/console/Audacious_Driver.cxx	Wed Nov 26 02:55:04 2008 +0900
@@ -9,11 +9,11 @@
 #include "config.h"
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <gtk/gtk.h>
 extern "C" {
-#include <audacious/plugin.h>
-#include <audacious/output.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
 }
 #include <string.h>
 #include <stdlib.h>
diff -r 57d499fc5056 -r 3134a0987162 src/console/Vfs_File.h
--- a/src/console/Vfs_File.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/console/Vfs_File.h	Wed Nov 26 02:55:04 2008 +0900
@@ -5,7 +5,7 @@
 
 #include "Data_Reader.h"
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 class Vfs_File_Reader : public File_Reader {
 public:
diff -r 57d499fc5056 -r 3134a0987162 src/crystalizer/crystalizer.c
--- a/src/crystalizer/crystalizer.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/crystalizer/crystalizer.c	Wed Nov 26 02:55:04 2008 +0900
@@ -20,8 +20,8 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/plugin.h>
 
 static void init(void);
 static void configure(void);
diff -r 57d499fc5056 -r 3134a0987162 src/cue/cuesheet.h
--- a/src/cue/cuesheet.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/cue/cuesheet.h	Wed Nov 26 02:55:04 2008 +0900
@@ -9,8 +9,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <audacious/plugin.h>
-#include <audacious/output.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
 
 #define MAX_CUE_LINE_LENGTH 1000
 #define MAX_CUE_TRACKS 1000
diff -r 57d499fc5056 -r 3134a0987162 src/daap/daap.c
--- a/src/daap/daap.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/daap/daap.c	Wed Nov 26 02:55:04 2008 +0900
@@ -20,8 +20,8 @@
 
 #include <glib.h>
 
-#include <audacious/plugin.h>
-#include <audacious/discovery.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/discovery.h>
 
 #include "xmms2-daap/daap_cmd.h"
 #include "xmms2-daap/daap_util.h"
diff -r 57d499fc5056 -r 3134a0987162 src/demac/ape.c
--- a/src/demac/ape.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/demac/ape.c	Wed Nov 26 02:55:04 2008 +0900
@@ -29,7 +29,7 @@
 #include <errno.h> 
 #include <string.h> 
 
-#include <audacious/plugin.h> 
+#include <audlegacy/plugin.h> 
 
 #include "ape.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/demac/apedec.c
--- a/src/demac/apedec.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/demac/apedec.c	Wed Nov 26 02:55:04 2008 +0900
@@ -28,7 +28,7 @@
 #include <string.h> 
 #include <assert.h> 
 
-#include <audacious/plugin.h> 
+#include <audlegacy/plugin.h> 
 
 #include "ape.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/demac/apev2.c
--- a/src/demac/apev2.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/demac/apev2.c	Wed Nov 26 02:55:04 2008 +0900
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 #include <mowgli.h>
-#include <audacious/plugin.h> 
+#include <audlegacy/plugin.h> 
 
 #include "ape.h"
 #include "apev2.h"
diff -r 57d499fc5056 -r 3134a0987162 src/demac/plugin.c
--- a/src/demac/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/demac/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -41,10 +41,10 @@
 #include <glib/gprintf.h>
 #include <mowgli.h>
 
-#include <audacious/i18n.h> 
+#include <audlegacy/i18n.h> 
 
-#include <audacious/plugin.h> 
-#include <audacious/output.h> 
+#include <audlegacy/plugin.h> 
+#include <audlegacy/output.h> 
 
 #include "ape.h"
 #include "apev2.h"
diff -r 57d499fc5056 -r 3134a0987162 src/dockalbumart/dockalbumart.c
--- a/src/dockalbumart/dockalbumart.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/dockalbumart/dockalbumart.c	Wed Nov 26 02:55:04 2008 +0900
@@ -23,11 +23,11 @@
  */
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include <Carbon/Carbon.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include "audacious_player.xpm"
 
diff -r 57d499fc5056 -r 3134a0987162 src/echo_plugin/echo.c
--- a/src/echo_plugin/echo.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/echo_plugin/echo.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,10 +1,10 @@
 #include "config.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <gtk/gtk.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include "echo.h"
 
 
diff -r 57d499fc5056 -r 3134a0987162 src/echo_plugin/gui.c
--- a/src/echo_plugin/gui.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/echo_plugin/gui.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,8 +1,8 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 #include "echo.h"
 
 static const char *echo_about_text =
diff -r 57d499fc5056 -r 3134a0987162 src/esd/about.c
--- a/src/esd/about.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/esd/about.c	Wed Nov 26 02:55:04 2008 +0900
@@ -17,7 +17,7 @@
 #include "esdout.h"
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <gtk/gtk.h>
 
 
diff -r 57d499fc5056 -r 3134a0987162 src/esd/configure.c
--- a/src/esd/configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/esd/configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -22,8 +22,8 @@
 #include "esdout.h"
 
 #include <glib.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/esd/esd.c
--- a/src/esd/esd.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/esd/esd.c	Wed Nov 26 02:55:04 2008 +0900
@@ -17,7 +17,7 @@
 #include "esdout.h"
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 
 OutputPlugin esd_op = {
diff -r 57d499fc5056 -r 3134a0987162 src/esd/esdout.h
--- a/src/esd/esdout.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/esd/esdout.h	Wed Nov 26 02:55:04 2008 +0900
@@ -26,7 +26,7 @@
 
 #include <glib.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 
 extern OutputPlugin op;
diff -r 57d499fc5056 -r 3134a0987162 src/esd/init.c
--- a/src/esd/init.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/esd/init.c	Wed Nov 26 02:55:04 2008 +0900
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <esd.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "esdout.h"
 
 
diff -r 57d499fc5056 -r 3134a0987162 src/esd/mixer.c
--- a/src/esd/mixer.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/esd/mixer.c	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <esd.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>
diff -r 57d499fc5056 -r 3134a0987162 src/evdev-plug/ed.c
--- a/src/evdev-plug/ed.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/evdev-plug/ed.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,8 +24,8 @@
 #include "ed_actions.h"
 #include "ed_ui.h"
 #include "ed_common.h"
-#include <audacious/i18n.h>
-#include <audacious/auddrct.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/auddrct.h>
 
 
 GeneralPlugin *evdevplug_gplist[] = { &ed_gp, NULL };
diff -r 57d499fc5056 -r 3134a0987162 src/evdev-plug/ed.h
--- a/src/evdev-plug/ed.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/evdev-plug/ed.h	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 
 #include "ed_common.h"
 #include <glib.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 void ed_init ( void );
 void ed_cleanup ( void );
diff -r 57d499fc5056 -r 3134a0987162 src/evdev-plug/ed_internals.c
--- a/src/evdev-plug/ed_internals.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/evdev-plug/ed_internals.c	Wed Nov 26 02:55:04 2008 +0900
@@ -35,8 +35,8 @@
 #include <regex.h>
 /* for variadic */
 #include <stdarg.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/evdev-plug/ed_ui.c
--- a/src/evdev-plug/ed_ui.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/evdev-plug/ed_ui.c	Wed Nov 26 02:55:04 2008 +0900
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <linux/input.h>
 
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <gtk/gtk.h>
 
 
diff -r 57d499fc5056 -r 3134a0987162 src/filewriter/filewriter.h
--- a/src/filewriter/filewriter.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/filewriter/filewriter.h	Wed Nov 26 02:55:04 2008 +0900
@@ -29,15 +29,15 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <audacious/main.h>
-#include <audacious/plugin.h>
-#include <audacious/playlist.h>
-#include <audacious/configdb.h>
-#include <audacious/i18n.h>
-#include <audacious/util.h>
-#include <audacious/vfs.h>
+#include <audlegacy/main.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/playlist.h>
+#include <audlegacy/configdb.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/util.h>
+#include <audlegacy/vfs.h>
 
-#include <libSAD/libSAD.h>
+#include <audlegacy/libSAD.h>
 
 struct format_info {
     AFormat format;
diff -r 57d499fc5056 -r 3134a0987162 src/flacng/flacng.h
--- a/src/flacng/flacng.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/flacng/flacng.h	Wed Nov 26 02:55:04 2008 +0900
@@ -21,8 +21,8 @@
 
 #include "config.h"
 #include <glib.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 #define OUTPUT_BLOCK_SIZE (1024u)
 #define MAX_SUPPORTED_CHANNELS (2u)
diff -r 57d499fc5056 -r 3134a0987162 src/flacng/plugin.c
--- a/src/flacng/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/flacng/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -19,8 +19,8 @@
 /* #define FLACNG_DEBUG */
 
 #include "flacng.h"
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 #include "tools.h"
 #include "plugin.h"
 #include "seekable_stream_callbacks.h"
diff -r 57d499fc5056 -r 3134a0987162 src/gnomeshortcuts/gnomeshortcuts.c
--- a/src/gnomeshortcuts/gnomeshortcuts.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/gnomeshortcuts/gnomeshortcuts.c	Wed Nov 26 02:55:04 2008 +0900
@@ -28,10 +28,10 @@
 #include <dbus/dbus-glib-bindings.h>
 #include <glib-object.h>
 
-#include <audacious/plugin.h>
-#include <audacious/auddrct.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/auddrct.h>
 
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 
 static void init (void);
diff -r 57d499fc5056 -r 3134a0987162 src/hotkey/gui.c
--- a/src/hotkey/gui.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/hotkey/gui.c	Wed Nov 26 02:55:04 2008 +0900
@@ -39,8 +39,8 @@
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms.h>
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 #include "plugin.h"
 #include "gui.h"
diff -r 57d499fc5056 -r 3134a0987162 src/hotkey/plugin.c
--- a/src/hotkey/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/hotkey/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -39,10 +39,10 @@
 #include <X11/XF86keysym.h>
 
 #include <gdk/gdkx.h>
-#include <audacious/plugin.h>
-#include <audacious/auddrct.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/auddrct.h>
 
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include "plugin.h"
 #include "gui.h"
diff -r 57d499fc5056 -r 3134a0987162 src/jack/configure.c
--- a/src/jack/configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/jack/configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,8 +24,8 @@
 
 #include "jack.h"
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 # include "config.h"
 
 #include <gtk/gtk.h>
diff -r 57d499fc5056 -r 3134a0987162 src/jack/jack.c
--- a/src/jack/jack.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/jack/jack.c	Wed Nov 26 02:55:04 2008 +0900
@@ -6,10 +6,10 @@
  *	This code maps xmms calls into the jack translation library
  */
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <dlfcn.h>
 #include <gtk/gtk.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <stdio.h>
 #include "config.h"
 #include "bio2jack.h" /* includes for the bio2jack library */
diff -r 57d499fc5056 -r 3134a0987162 src/ladspa/ladspa.c
--- a/src/ladspa/ladspa.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/ladspa/ladspa.c	Wed Nov 26 02:55:04 2008 +0900
@@ -29,8 +29,8 @@
 #include <sys/types.h>
 #include <gtk/gtk.h>
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 #include "ladspa.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/lastfm/lastfm.c
--- a/src/lastfm/lastfm.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/lastfm/lastfm.c	Wed Nov 26 02:55:04 2008 +0900
@@ -39,7 +39,7 @@
  *              * Ordinary mp3 streams seem to share this behavior. Didnt tested if others do.
  */
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <libmowgli/mowgli_global_storage.h>
 #include <curl/curl.h>
 #include <glib.h>
diff -r 57d499fc5056 -r 3134a0987162 src/lirc/about.c
--- a/src/lirc/about.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/lirc/about.c	Wed Nov 26 02:55:04 2008 +0900
@@ -26,7 +26,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <gtk/gtk.h>
 
 #include "lirc.h"
diff -r 57d499fc5056 -r 3134a0987162 src/lirc/interface.c
--- a/src/lirc/interface.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/lirc/interface.c	Wed Nov 26 02:55:04 2008 +0900
@@ -9,7 +9,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include "common.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/lirc/lirc.c
--- a/src/lirc/lirc.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/lirc/lirc.c	Wed Nov 26 02:55:04 2008 +0900
@@ -37,10 +37,10 @@
 #include <gtk/gtk.h>
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
-#include <audacious/plugin.h>
-#include <audacious/auddrct.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/auddrct.h>
 
 #include <lirc/lirc_client.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/lirc/lirc_cfg.c
--- a/src/lirc/lirc_cfg.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/lirc/lirc_cfg.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,9 +1,9 @@
 #include <config.h>
 
 #include <gtk/gtk.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
-#include <audacious/configdb.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/configdb.h>
 
 #include "common.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/m3u/m3u.c
--- a/src/m3u/m3u.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/m3u/m3u.c	Wed Nov 26 02:55:04 2008 +0900
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <sys/errno.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 static void
 parse_extm3u_info(const gchar * info, gchar ** title, gint * length)
diff -r 57d499fc5056 -r 3134a0987162 src/madplug/decoder.c
--- a/src/madplug/decoder.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/madplug/decoder.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,7 +24,7 @@
 #include <math.h>
 #include <assert.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "plugin.h"
 #include "input.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/madplug/plugin.h
--- a/src/madplug/plugin.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/madplug/plugin.h	Wed Nov 26 02:55:04 2008 +0900
@@ -36,9 +36,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
-#include <audacious/id3tag.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/id3tag.h>
 #include <mad.h>
 
 #include "xing.h"
diff -r 57d499fc5056 -r 3134a0987162 src/madplug/tuple.c
--- a/src/madplug/tuple.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/madplug/tuple.c	Wed Nov 26 02:55:04 2008 +0900
@@ -31,8 +31,8 @@
 #include <glib.h> 
 #include <glib/gprintf.h>
 
-#include <audacious/plugin.h>
-#include <audacious/id3tag.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/id3tag.h>
 
 #include <langinfo.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/madplug/tuple.h
--- a/src/madplug/tuple.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/madplug/tuple.h	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 #define TUPLE_H
 
 #include <glib.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 gboolean audmad_update_song_tuple(Tuple *tuple, VFSFile *fd);
 
diff -r 57d499fc5056 -r 3134a0987162 src/metronom/metronom.c
--- a/src/metronom/metronom.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/metronom/metronom.c	Wed Nov 26 02:55:04 2008 +0900
@@ -18,9 +18,9 @@
  */
 
 #include "config.h"
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 #include <glib.h>
 #include <string.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/mms/mms.c
--- a/src/mms/mms.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/mms/mms.c	Wed Nov 26 02:55:04 2008 +0900
@@ -18,7 +18,7 @@
 
 #include <glib.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <stdio.h>
 
 #include <unistd.h>
diff -r 57d499fc5056 -r 3134a0987162 src/modplug/archive/arch_raw.h
--- a/src/modplug/archive/arch_raw.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/modplug/archive/arch_raw.h	Wed Nov 26 02:55:04 2008 +0900
@@ -11,7 +11,7 @@
 #include <string>
 
 extern "C" {
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 };
 
 class arch_Raw: public Archive
diff -r 57d499fc5056 -r 3134a0987162 src/modplug/modplugbmp.cxx
--- a/src/modplug/modplugbmp.cxx	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/modplug/modplugbmp.cxx	Wed Nov 26 02:55:04 2008 +0900
@@ -15,7 +15,7 @@
 #include "stddefs.h"
 #include "archive/open.h"
 extern "C" {
-#include <audacious/output.h>
+#include <audlegacy/output.h>
 }
 
 static char* format_and_free_ti( Tuple* ti, int* length )
diff -r 57d499fc5056 -r 3134a0987162 src/modplug/modplugbmp.h
--- a/src/modplug/modplugbmp.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/modplug/modplugbmp.h	Wed Nov 26 02:55:04 2008 +0900
@@ -12,7 +12,7 @@
 #include "stddefs.h"
 
 extern "C" {
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 }
 
 /* Module files have their magic deep inside the file, at offset 1080; source: http://www.onicos.com/staff/iz/formats/mod.html and information by Michael Doering from UADE */
diff -r 57d499fc5056 -r 3134a0987162 src/modplug/plugin.cxx
--- a/src/modplug/plugin.cxx	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/modplug/plugin.cxx	Wed Nov 26 02:55:04 2008 +0900
@@ -8,7 +8,7 @@
 
 #include "gui/main.h"
 extern "C" {
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 }
 
 extern InputPlugin gModPlug;
diff -r 57d499fc5056 -r 3134a0987162 src/mtp_up/mtp.c
--- a/src/mtp_up/mtp.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/mtp_up/mtp.c	Wed Nov 26 02:55:04 2008 +0900
@@ -21,9 +21,9 @@
 #include <glib.h>
 #include <sys/types.h>
 #include <libmtp.h>
-#include <audacious/plugin.h>
-#include <audacious/ui_plugin_menu.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/ui_plugin_menu.h>
+#include <audlegacy/i18n.h>
 
 #include <gtk/gtk.h>
 #include "filetype.h"
diff -r 57d499fc5056 -r 3134a0987162 src/musepack/libmpc.h
--- a/src/musepack/libmpc.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/musepack/libmpc.h	Wed Nov 26 02:55:04 2008 +0900
@@ -6,9 +6,9 @@
 //xmms headers
 extern "C"
 {
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 }
 
 //stdlib headers
diff -r 57d499fc5056 -r 3134a0987162 src/neon/neon.c
--- a/src/neon/neon.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/neon/neon.c	Wed Nov 26 02:55:04 2008 +0900
@@ -19,7 +19,7 @@
 
 #include "neon.h"
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include <ne_socket.h>
 #include <ne_utils.h>
diff -r 57d499fc5056 -r 3134a0987162 src/neon/neon.h
--- a/src/neon/neon.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/neon/neon.h	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <audacious/vfs.h>
+#include <audlegacy/vfs.h>
 #include <ne_session.h>
 #include <ne_request.h>
 #include <ne_uri.h>
diff -r 57d499fc5056 -r 3134a0987162 src/null/null.c
--- a/src/null/null.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/null/null.c	Wed Nov 26 02:55:04 2008 +0900
@@ -22,8 +22,8 @@
 #include "config.h"
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 static GTimer *timer;
 static gulong offset_time, written;
diff -r 57d499fc5056 -r 3134a0987162 src/paranormal-ng/cfg.c
--- a/src/paranormal-ng/cfg.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/paranormal-ng/cfg.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include <math.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/paranormal-ng/libcalc/parser.h
--- a/src/paranormal-ng/libcalc/parser.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/paranormal-ng/libcalc/parser.h	Wed Nov 26 02:55:04 2008 +0900
@@ -24,8 +24,8 @@
 
 #include <glib.h>
 #include <stdio.h>
-#include <audacious/plugin.h>
-#include <audacious/vfs_buffer.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/vfs_buffer.h>
 
 #include "execute.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/paranormal-ng/plugin.c
--- a/src/paranormal-ng/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/paranormal-ng/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -34,10 +34,10 @@
 #include <unistd.h>
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include <gtk/gtk.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_thread.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/paranormal/cfg.c
--- a/src/paranormal/cfg.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/paranormal/cfg.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include <math.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/paranormal/libcalc/parser.h
--- a/src/paranormal/libcalc/parser.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/paranormal/libcalc/parser.h	Wed Nov 26 02:55:04 2008 +0900
@@ -24,8 +24,8 @@
 
 #include <glib.h>
 #include <stdio.h>
-#include <audacious/plugin.h>
-#include <audacious/vfs_buffer.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/vfs_buffer.h>
 
 #include "execute.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/paranormal/plugin.c
--- a/src/paranormal/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/paranormal/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -34,10 +34,10 @@
 #include <unistd.h>
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include <gtk/gtk.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <SDL.h>
 #include <SDL_thread.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/pls/pls.c
--- a/src/pls/pls.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/pls/pls.c	Wed Nov 26 02:55:04 2008 +0900
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <sys/errno.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 static void
 playlist_load_pls(const gchar * filename, gint pos)
diff -r 57d499fc5056 -r 3134a0987162 src/projectm-1.0/main.c
--- a/src/projectm-1.0/main.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/projectm-1.0/main.c	Wed Nov 26 02:55:04 2008 +0900
@@ -8,8 +8,8 @@
 
 #include "config.h"
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 #include "gtk_projectm_impl.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/projectm/main.c
--- a/src/projectm/main.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/projectm/main.c	Wed Nov 26 02:55:04 2008 +0900
@@ -31,7 +31,7 @@
 
 
 #include <stdio.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <string.h>
 #include <stdlib.h>
 #include <gtk/gtk.h>
@@ -39,7 +39,7 @@
 #include <SDL/SDL_thread.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
-#include <audacious/auddrct.h>
+#include <audlegacy/auddrct.h>
 #include <math.h>
 #include <sys/stat.h>
 #include <sys/types.h>
diff -r 57d499fc5056 -r 3134a0987162 src/psf2/eng_protos.h
--- a/src/psf2/eng_protos.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/psf2/eng_protos.h	Wed Nov 26 02:55:04 2008 +0900
@@ -5,7 +5,7 @@
 // (C) 2000-2007 Richard F. Bannister
 //
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 //
 // eng_protos.h
diff -r 57d499fc5056 -r 3134a0987162 src/psf2/plugin.c
--- a/src/psf2/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/psf2/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include "ao.h"
 #include "corlett.h"
diff -r 57d499fc5056 -r 3134a0987162 src/pulse_audio/pulse_audio.c
--- a/src/pulse_audio/pulse_audio.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/pulse_audio/pulse_audio.c	Wed Nov 26 02:55:04 2008 +0900
@@ -27,8 +27,8 @@
 #include <limits.h>
 
 #include <gtk/gtk.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 #include <pulse/pulseaudio.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/rocklight/rocklight.c
--- a/src/rocklight/rocklight.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/rocklight/rocklight.c	Wed Nov 26 02:55:04 2008 +0900
@@ -21,7 +21,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "rocklight.h"
 
 enum type {
diff -r 57d499fc5056 -r 3134a0987162 src/rootvis/config_backend.c
--- a/src/rootvis/config_backend.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/rootvis/config_backend.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,5 +1,5 @@
 #include <string.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "rootvis.h"
 #include "config.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/rootvis/rootvis.h
--- a/src/rootvis/rootvis.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/rootvis/rootvis.h	Wed Nov 26 02:55:04 2008 +0900
@@ -3,7 +3,7 @@
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 
 /* following values are used if there is no user configuration */
diff -r 57d499fc5056 -r 3134a0987162 src/scrobbler/configure.c
--- a/src/scrobbler/configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/scrobbler/configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -9,9 +9,9 @@
 #include <stdio.h>
 
 #include <glib.h>
-#include <audacious/plugin.h>
-#include <audacious/audutil.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/audutil.h>
+#include <audlegacy/i18n.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
diff -r 57d499fc5056 -r 3134a0987162 src/scrobbler/gerpok.c
--- a/src/scrobbler/gerpok.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/scrobbler/gerpok.c	Wed Nov 26 02:55:04 2008 +0900
@@ -11,8 +11,8 @@
 #include "scrobbler.h"
 #include "config.h"
 #include <glib.h>
-#include <audacious/plugin.h>
-#include <audacious/audutil.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/audutil.h>
 
 #define SCROBBLER_HS_URL "http://post.gerpok.com"
 #define SCROBBLER_CLI_ID "aud"
diff -r 57d499fc5056 -r 3134a0987162 src/scrobbler/gerpok.h
--- a/src/scrobbler/gerpok.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/scrobbler/gerpok.h	Wed Nov 26 02:55:04 2008 +0900
@@ -1,7 +1,7 @@
 #ifndef G_NET_H
 #define G_NET_H 1
 
-#include <audacious/tuple.h>
+#include <audlegacy/tuple.h>
 
 int gerpok_sc_idle(GMutex *);
 void gerpok_sc_init(char *, char *);
diff -r 57d499fc5056 -r 3134a0987162 src/scrobbler/gtkstuff.c
--- a/src/scrobbler/gtkstuff.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/scrobbler/gtkstuff.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,7 +1,7 @@
 
 #include <glib.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/plugin.h>
 
 #include <stdio.h>
 #include <string.h>
diff -r 57d499fc5056 -r 3134a0987162 src/scrobbler/plugin.c
--- a/src/scrobbler/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/scrobbler/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -2,14 +2,14 @@
 #include "config.h"
 
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <audacious/plugin.h>
-#include <audacious/ui_preferences.h>
-#include <audacious/hook.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/ui_preferences.h>
+#include <audlegacy/hook.h>
 
 #include <unistd.h>
 #include <stdio.h>
diff -r 57d499fc5056 -r 3134a0987162 src/scrobbler/scrobbler.c
--- a/src/scrobbler/scrobbler.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/scrobbler/scrobbler.c	Wed Nov 26 02:55:04 2008 +0900
@@ -11,8 +11,8 @@
 #include "settings.h"
 #include <glib.h>
 
-#include <audacious/plugin.h>
-#include <audacious/audutil.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/audutil.h>
 
 #define SCROBBLER_HS_URL "http://post.audioscrobbler.com"
 #define SCROBBLER_CLI_ID "aud"
diff -r 57d499fc5056 -r 3134a0987162 src/scrobbler/scrobbler.h
--- a/src/scrobbler/scrobbler.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/scrobbler/scrobbler.h	Wed Nov 26 02:55:04 2008 +0900
@@ -1,7 +1,7 @@
 #ifndef NET_H
 #define NET_H 1
 
-#include <audacious/tuple.h>
+#include <audlegacy/tuple.h>
 
 #define SC_CURL_TIMEOUT 5
 
diff -r 57d499fc5056 -r 3134a0987162 src/sexypsf/Misc.c
--- a/src/sexypsf/Misc.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sexypsf/Misc.c	Wed Nov 26 02:55:04 2008 +0900
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff -r 57d499fc5056 -r 3134a0987162 src/sexypsf/plugin.c
--- a/src/sexypsf/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sexypsf/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <audacious/plugin.h>
-#include <audacious/output.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 57d499fc5056 -r 3134a0987162 src/shnplug/shn.h
--- a/src/shnplug/shn.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/shnplug/shn.h	Wed Nov 26 02:55:04 2008 +0900
@@ -31,7 +31,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
diff -r 57d499fc5056 -r 3134a0987162 src/sid/xs_config.c
--- a/src/sid/xs_config.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sid/xs_config.c	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 #include "xs_config.h"
 
 #ifdef AUDACIOUS_PLUGIN
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #define XS_CONFIG_FILE      ConfigDb
 #define XS_CONFIG_OPEN      aud_cfg_db_open
 #define XS_CONFIG_FREE      aud_cfg_db_close
diff -r 57d499fc5056 -r 3134a0987162 src/sid/xs_length.h
--- a/src/sid/xs_length.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sid/xs_length.h	Wed Nov 26 02:55:04 2008 +0900
@@ -3,7 +3,7 @@
 
 #include "xmms-sid.h"
 #ifdef AUDACIOUS_PLUGIN
-#include <audacious/audutil.h>
+#include <audlegacy/audutil.h>
 #define XS_MD5HASH_LENGTH   AUD_MD5HASH_LENGTH
 #define XS_MD5HASH_LENGTH_CH   AUD_MD5HASH_LENGTH_CH
 #define xs_md5hash_t        aud_md5hash_t
diff -r 57d499fc5056 -r 3134a0987162 src/sid/xs_support.h
--- a/src/sid/xs_support.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sid/xs_support.h	Wed Nov 26 02:55:04 2008 +0900
@@ -13,8 +13,8 @@
 #include <stdio.h>
 
 #ifdef AUDACIOUS_PLUGIN
-#include <audacious/plugin.h>
-#include <audacious/output.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
 #else
 #include <xmms/plugin.h>
 #include <xmms/util.h>
diff -r 57d499fc5056 -r 3134a0987162 src/skins/plugin.c
--- a/src/skins/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -26,7 +26,7 @@
 #include "icons-stock.h"
 #include "ui_main_evlisteners.h"
 #include "ui_playlist_evlisteners.h"
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <libintl.h>
 
 gchar *skins_paths[SKINS_PATH_COUNT] = {};
diff -r 57d499fc5056 -r 3134a0987162 src/skins/plugin.h
--- a/src/skins/plugin.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/plugin.h	Wed Nov 26 02:55:04 2008 +0900
@@ -22,7 +22,7 @@
 #define PLUGIN_SKINS_H
 
 #include <glib.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "skins_cfg.h"
 #include "ui_main.h"
 #include "ui_equalizer.h"
diff -r 57d499fc5056 -r 3134a0987162 src/skins/skins_cfg.c
--- a/src/skins/skins_cfg.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/skins_cfg.c	Wed Nov 26 02:55:04 2008 +0900
@@ -33,7 +33,7 @@
 #include "util.h"
 #include <glib.h>
 #include <stdlib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 #include <libintl.h>
 
 skins_cfg_t config;
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_dock.c
--- a/src/skins/ui_dock.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_dock.c	Wed Nov 26 02:55:04 2008 +0900
@@ -27,7 +27,7 @@
 #include "skins_cfg.h"
 #include <gdk/gdk.h>
 #include <stdlib.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "ui_skinned_window.h"
 
 #include "platform/smartinclude.h"
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_equalizer.c
--- a/src/skins/ui_equalizer.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_equalizer.c	Wed Nov 26 02:55:04 2008 +0900
@@ -45,8 +45,8 @@
 #include "util.h"
 #include "ui_main.h"
 #include "ui_playlist.h"
-#include <audacious/plugin.h>
-#include <audacious/equalizer_preset.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/equalizer_preset.h>
 
 #include "images/audacious_eq.xpm"
 
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_main.c
--- a/src/skins/ui_main.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_main.c	Wed Nov 26 02:55:04 2008 +0900
@@ -68,7 +68,7 @@
 #include "ui_skinned_monostereo.h"
 #include "ui_skinned_playlist.h"
 #include "ui_main_evlisteners.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "skins_cfg.h"
 
 static GTimeVal cb_time; 
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_main_evlisteners.c
--- a/src/skins/ui_main_evlisteners.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_main_evlisteners.c	Wed Nov 26 02:55:04 2008 +0900
@@ -31,8 +31,8 @@
 #include "playlist_evmessages.h"
 #include "visualization.h"
 #endif
-#include <audacious/plugin.h>
-#include <audacious/input.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/input.h>
 #if 0
 #include "ui_credits.h"
 #endif
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_manager.c
--- a/src/skins/ui_manager.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_manager.c	Wed Nov 26 02:55:04 2008 +0900
@@ -40,7 +40,7 @@
 #include "sync-menu.h"
 #endif
 #include "plugin.h"
-#include <audacious/ui_plugin_menu.h>
+#include <audlegacy/ui_plugin_menu.h>
 
 static GtkUIManager *ui_manager = NULL;
 static gboolean menu_created = FALSE;
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_playlist.c
--- a/src/skins/ui_playlist.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_playlist.c	Wed Nov 26 02:55:04 2008 +0900
@@ -60,7 +60,7 @@
 #include "icons-stock.h"
 #include "images/audacious_playlist.xpm"
 
-#include <audacious/main.h>
+#include <audlegacy/main.h>
 
 GtkWidget *playlistwin;
 
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_playlist.h
--- a/src/skins/ui_playlist.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_playlist.h	Wed Nov 26 02:55:04 2008 +0900
@@ -26,7 +26,7 @@
 #include <glib.h>
 
 #include "ui_main.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "skins_cfg.h"
 
 #define PLAYLISTWIN_FRAME_TOP_HEIGHT    20
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_playlist_manager.c
--- a/src/skins/ui_playlist_manager.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_playlist_manager.c	Wed Nov 26 02:55:04 2008 +0900
@@ -19,7 +19,7 @@
 
 #include "ui_playlist_manager.h"
 #include "ui_playlist.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "ui_main.h"
 
 #include <glib.h>
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_skin.c
--- a/src/skins/ui_skin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_skin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -37,7 +37,7 @@
 #include <ctype.h>
 #include "plugin.h"
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "ui_skin.h"
 #include "util.h"
 #include "ui_main.h"
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_skinned_equalizer_graph.c
--- a/src/skins/ui_skinned_equalizer_graph.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_skinned_equalizer_graph.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,7 +24,7 @@
 #include "ui_skin.h"
 #include "ui_skinned_equalizer_graph.h"
 #include "skins_cfg.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #define UI_TYPE_SKINNED_EQUALIZER_GRAPH           (ui_skinned_equalizer_graph_get_type())
 
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_skinned_menurow.c
--- a/src/skins/ui_skinned_menurow.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_skinned_menurow.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,7 +24,7 @@
  * Audacious or using our public API to be a derived work.
  */
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "plugin.h"
 #include "ui_skinned_menurow.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_skinned_playlist.c
--- a/src/skins/ui_skinned_playlist.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_skinned_playlist.c	Wed Nov 26 02:55:04 2008 +0900
@@ -48,7 +48,7 @@
 #include "ui_skin.h"
 #include "util.h"
 #include "skins_cfg.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 static PangoFontDescription *playlist_list_font = NULL;
 static gint ascent, descent, width_delta_digit_one;
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_skinned_window.c
--- a/src/skins/ui_skinned_window.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_skinned_window.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,7 +24,7 @@
 #include <gtk/gtkmarshal.h>
 #include <gtk/gtkwindow.h>
 #include <string.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "platform/smartinclude.h"
 #include "ui_skin.h"
 #include "skins_cfg.h"
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_svis.c
--- a/src/skins/ui_svis.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_svis.c	Wed Nov 26 02:55:04 2008 +0900
@@ -29,7 +29,7 @@
 #include "ui_vis.h"
 #include "util.h"
 #include "skins_cfg.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <string.h>
 #include <ctype.h>
 #include <gtk/gtkmain.h>
diff -r 57d499fc5056 -r 3134a0987162 src/skins/ui_vis.c
--- a/src/skins/ui_vis.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/ui_vis.c	Wed Nov 26 02:55:04 2008 +0900
@@ -28,7 +28,7 @@
 #include "ui_vis.h"
 #include "util.h"
 #include "skins_cfg.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 static const gfloat vis_afalloff_speeds[] = { 0.34, 0.5, 1.0, 1.3, 1.6 };
 static const gfloat vis_pfalloff_speeds[] = { 1.2, 1.3, 1.4, 1.5, 1.6 };
diff -r 57d499fc5056 -r 3134a0987162 src/skins/util.c
--- a/src/skins/util.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/util.c	Wed Nov 26 02:55:04 2008 +0900
@@ -48,8 +48,8 @@
 #  include <fts.h>
 #endif
 
-#include <audacious/input.h>
-#include <audacious/playback.h>
+#include <audlegacy/input.h>
+#include <audlegacy/playback.h>
 
 #ifdef USE_CHARDET
 #  include "../libguess/libguess.h"
diff -r 57d499fc5056 -r 3134a0987162 src/skins/util.h
--- a/src/skins/util.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/skins/util.h	Wed Nov 26 02:55:04 2008 +0900
@@ -37,8 +37,8 @@
 
 G_BEGIN_DECLS
 
-#include "audacious/plugin.h"
-#include "libSAD/libSAD.h"
+#include "audlegacy/plugin.h"
+#include "audlegacy/libSAD.h"
 
 #define SWAP(a, b)      { a^=b; b^=a; a^=b; }
 
diff -r 57d499fc5056 -r 3134a0987162 src/smb/smb.c
--- a/src/smb/smb.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/smb/smb.c	Wed Nov 26 02:55:04 2008 +0900
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <stdio.h>
 
 #include <unistd.h>
diff -r 57d499fc5056 -r 3134a0987162 src/sndfile/plugin.c
--- a/src/sndfile/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sndfile/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -34,9 +34,9 @@
 #include <string.h>
 #include <math.h>
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
-#include <audacious/output.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/output.h>
 #include "plugin.h"
 
 #include <sndfile.h>
diff -r 57d499fc5056 -r 3134a0987162 src/sndstretch/sndstretch_xmms.c
--- a/src/sndstretch/sndstretch_xmms.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sndstretch/sndstretch_xmms.c	Wed Nov 26 02:55:04 2008 +0900
@@ -25,8 +25,8 @@
 #include "FB_logo.xpm"
 
 #include "config.h"
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 #include <gtk/gtk.h>
 #include <math.h>
 #include <stdlib.h>
diff -r 57d499fc5056 -r 3134a0987162 src/song_change/song_change.c
--- a/src/song_change/song_change.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/song_change/song_change.c	Wed Nov 26 02:55:04 2008 +0900
@@ -15,12 +15,12 @@
 
 #include <string.h>
 
-#include <audacious/plugin.h>
-#include <audacious/ui_preferences.h>
-#include <audacious/auddrct.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/ui_preferences.h>
+#include <audlegacy/auddrct.h>
 #include "formatter.h"
-#include <audacious/i18n.h>
-#include <audacious/hook.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/hook.h>
 
 static void init(void);
 static void cleanup(void);
diff -r 57d499fc5056 -r 3134a0987162 src/spectrum/spectrum.c
--- a/src/spectrum/spectrum.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/spectrum/spectrum.c	Wed Nov 26 02:55:04 2008 +0900
@@ -23,8 +23,8 @@
 
 #include <gtk/gtk.h>
 #include <math.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 #include "logo.xpm"
 
diff -r 57d499fc5056 -r 3134a0987162 src/statusicon/gtktrayicon-x11.c
--- a/src/statusicon/gtktrayicon-x11.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/statusicon/gtktrayicon-x11.c	Wed Nov 26 02:55:04 2008 +0900
@@ -27,7 +27,7 @@
 #include "si_common.h"
 #include <string.h>
 #include <glib.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include <gtk/gtkprivate.h>
 #include "gtktrayicon.h"
diff -r 57d499fc5056 -r 3134a0987162 src/statusicon/si.c
--- a/src/statusicon/si.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/statusicon/si.c	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 #include "si_audacious.h"
 #include "si_cfg.h"
 #include "si_common.h"
-#include <audacious/auddrct.h>
+#include <audlegacy/auddrct.h>
 
 
 GeneralPlugin *statusicon_gplist[] = { &si_gp, NULL };
diff -r 57d499fc5056 -r 3134a0987162 src/statusicon/si.h
--- a/src/statusicon/si.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/statusicon/si.h	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 
 #include "si_common.h"
 #include <glib.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 void si_init ( void );
 void si_cleanup ( void );
diff -r 57d499fc5056 -r 3134a0987162 src/statusicon/si_cfg.c
--- a/src/statusicon/si_cfg.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/statusicon/si_cfg.c	Wed Nov 26 02:55:04 2008 +0900
@@ -20,7 +20,7 @@
 
 #include "si_cfg.h"
 #include "si_common.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 si_cfg_t si_cfg;
 
diff -r 57d499fc5056 -r 3134a0987162 src/statusicon/si_ui.c
--- a/src/statusicon/si_ui.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/statusicon/si_ui.c	Wed Nov 26 02:55:04 2008 +0900
@@ -23,9 +23,9 @@
 #include "si_cfg.h"
 #include "si_common.h"
 #include "gtktrayicon.h"
-#include <audacious/ui_fileinfopopup.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/ui_fileinfopopup.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 #include <glib.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
diff -r 57d499fc5056 -r 3134a0987162 src/stdio/stdio.c
--- a/src/stdio/stdio.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/stdio/stdio.c	Wed Nov 26 02:55:04 2008 +0900
@@ -17,7 +17,7 @@
  */
 
 #include "config.h"
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <stdio.h>
 
 #include <unistd.h>
diff -r 57d499fc5056 -r 3134a0987162 src/stereo_plugin/stereo.c
--- a/src/stereo_plugin/stereo.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/stereo_plugin/stereo.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,7 +1,7 @@
 #include "config.h"
 #include <gtk/gtk.h>
-#include <audacious/i18n.h>
-#include <audacious/plugin.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/plugin.h>
 
 
 static void init(void);
diff -r 57d499fc5056 -r 3134a0987162 src/streambrowser/bookmarks.c
--- a/src/streambrowser/bookmarks.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/streambrowser/bookmarks.c	Wed Nov 26 02:55:04 2008 +0900
@@ -19,7 +19,7 @@
 
 #include <string.h>
 #include <glib.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include "streambrowser.h"
 #include "bookmarks.h"
diff -r 57d499fc5056 -r 3134a0987162 src/streambrowser/shoutcast.c
--- a/src/streambrowser/shoutcast.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/streambrowser/shoutcast.c	Wed Nov 26 02:55:04 2008 +0900
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include "streambrowser.h"
 #include "shoutcast.h"
diff -r 57d499fc5056 -r 3134a0987162 src/streambrowser/streambrowser.c
--- a/src/streambrowser/streambrowser.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/streambrowser/streambrowser.c	Wed Nov 26 02:55:04 2008 +0900
@@ -20,8 +20,8 @@
 #include <stdlib.h>
 #include <gtk/gtk.h>
 #include <glib.h>
-#include <audacious/plugin.h>
-#include <audacious/ui_plugin_menu.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/ui_plugin_menu.h>
 
 #include "streambrowser.h"
 #include "streamdir.h"
diff -r 57d499fc5056 -r 3134a0987162 src/streambrowser/streambrowser.h
--- a/src/streambrowser/streambrowser.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/streambrowser/streambrowser.h	Wed Nov 26 02:55:04 2008 +0900
@@ -31,7 +31,7 @@
 #include <glib.h>
 
 #include <config.h>
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 
 void				debug(const char *fmt, ...);
diff -r 57d499fc5056 -r 3134a0987162 src/streambrowser/xiph.c
--- a/src/streambrowser/xiph.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/streambrowser/xiph.c	Wed Nov 26 02:55:04 2008 +0900
@@ -21,7 +21,7 @@
 #include <glib.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include "streambrowser.h"
 #include "xiph.h"
diff -r 57d499fc5056 -r 3134a0987162 src/sun/about.c
--- a/src/sun/about.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sun/about.c	Wed Nov 26 02:55:04 2008 +0900
@@ -20,7 +20,7 @@
 #include <glib.h>
 
 #include "sun.h"
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 void sun_about(void)
 {
diff -r 57d499fc5056 -r 3134a0987162 src/sun/configure.c
--- a/src/sun/configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sun/configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -22,7 +22,7 @@
 #include <errno.h>
 
 #include "sun.h"
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include "mixer.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/sun/sun.c
--- a/src/sun/sun.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sun/sun.c	Wed Nov 26 02:55:04 2008 +0900
@@ -20,7 +20,7 @@
 #include <glib.h>
 
 #include "sun.h"
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include <errno.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/sun/sun.h
--- a/src/sun/sun.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/sun/sun.h	Wed Nov 26 02:55:04 2008 +0900
@@ -35,7 +35,7 @@
 
 #include "audioio.h"
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 /* Default path to audio device. */
 #ifndef SUN_DEV_AUDIO
diff -r 57d499fc5056 -r 3134a0987162 src/timidity/interface.c
--- a/src/timidity/interface.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/timidity/interface.c	Wed Nov 26 02:55:04 2008 +0900
@@ -13,7 +13,7 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <audacious/i18n.h>
+#include <audlegacy/i18n.h>
 
 #include "callbacks.h"
 #include "interface.h"
diff -r 57d499fc5056 -r 3134a0987162 src/timidity/libtimidity/timidity.h
--- a/src/timidity/libtimidity/timidity.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/timidity/libtimidity/timidity.h	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 #ifndef TIMIDITY_H
 #define TIMIDITY_H
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff -r 57d499fc5056 -r 3134a0987162 src/timidity/xmms-timidity.c
--- a/src/timidity/xmms-timidity.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/timidity/xmms-timidity.c	Wed Nov 26 02:55:04 2008 +0900
@@ -24,8 +24,8 @@
 #include <string.h>
 #include <timidity.h>
 #include <stdio.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 
 #include "xmms-timidity.h"
 #include "interface.h"
diff -r 57d499fc5056 -r 3134a0987162 src/timidity/xmms-timidity.h
--- a/src/timidity/xmms-timidity.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/timidity/xmms-timidity.h	Wed Nov 26 02:55:04 2008 +0900
@@ -20,7 +20,7 @@
 #ifndef XMMS_TIMIDITY_H
 #define XMMS_TIMIDITY_H
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 extern InputPlugin xmmstimid_ip;
 
diff -r 57d499fc5056 -r 3134a0987162 src/tonegen/tonegen.c
--- a/src/tonegen/tonegen.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/tonegen/tonegen.c	Wed Nov 26 02:55:04 2008 +0900
@@ -18,9 +18,9 @@
  */
 
 #include "config.h"
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 57d499fc5056 -r 3134a0987162 src/tta/libtta.c
--- a/src/tta/libtta.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/tta/libtta.c	Wed Nov 26 02:55:04 2008 +0900
@@ -41,10 +41,10 @@
 #include <glib.h>
 #include <string.h>
 
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
-#include <audacious/id3tag.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
+#include <audlegacy/id3tag.h>
 
 #define  PLUGIN_VERSION "1.4"
 #define  PROJECT_URL "<http://www.true-audio.com>"
diff -r 57d499fc5056 -r 3134a0987162 src/tta/ttalib.h
--- a/src/tta/ttalib.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/tta/ttalib.h	Wed Nov 26 02:55:04 2008 +0900
@@ -30,7 +30,7 @@
 #ifndef TTALIB_H_
 #define TTALIB_H_
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 // audacious support
 #define FILE	VFSFile
diff -r 57d499fc5056 -r 3134a0987162 src/voice_removal/voice_removal.c
--- a/src/voice_removal/voice_removal.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/voice_removal/voice_removal.c	Wed Nov 26 02:55:04 2008 +0900
@@ -23,7 +23,7 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 
 static int apply_effect (gpointer *d, gint length, AFormat afmt,
diff -r 57d499fc5056 -r 3134a0987162 src/vorbis/configure.c
--- a/src/vorbis/configure.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vorbis/configure.c	Wed Nov 26 02:55:04 2008 +0900
@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 extern GMutex *vf_mutex;
 
diff -r 57d499fc5056 -r 3134a0987162 src/vorbis/vcedit.h
--- a/src/vorbis/vcedit.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vorbis/vcedit.h	Wed Nov 26 02:55:04 2008 +0900
@@ -17,7 +17,7 @@
 #include <stdio.h>
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 typedef size_t (*vcedit_read_func)(void *, size_t, size_t, void *);
 typedef size_t (*vcedit_write_func)(const void *, size_t, size_t, void *);
diff -r 57d499fc5056 -r 3134a0987162 src/vorbis/vcupdate.c
--- a/src/vorbis/vcupdate.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vorbis/vcupdate.c	Wed Nov 26 02:55:04 2008 +0900
@@ -32,8 +32,8 @@
 
 #include <unistd.h>
 
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 
 #include <mowgli.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/vorbis/vorbis.c
--- a/src/vorbis/vorbis.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vorbis/vorbis.c	Wed Nov 26 02:55:04 2008 +0900
@@ -52,9 +52,9 @@
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 
 #include "vorbis.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/vorbis/vorbis.h
--- a/src/vorbis/vorbis.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vorbis/vorbis.h	Wed Nov 26 02:55:04 2008 +0900
@@ -3,7 +3,7 @@
 
 #include <vorbis/vorbisfile.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 typedef struct {
     VFSFile *fd;
diff -r 57d499fc5056 -r 3134a0987162 src/vtx/about.c
--- a/src/vtx/about.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vtx/about.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,6 +1,6 @@
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 
 #include <gtk/gtk.h>
 
diff -r 57d499fc5056 -r 3134a0987162 src/vtx/ayemu_vtxfile.h
--- a/src/vtx/ayemu_vtxfile.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vtx/ayemu_vtxfile.h	Wed Nov 26 02:55:04 2008 +0900
@@ -3,7 +3,7 @@
 
 #include <glib.h>
 #include <inttypes.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "ayemu_8912.h"
 
 /* The following constants and data structure comes from
diff -r 57d499fc5056 -r 3134a0987162 src/vtx/config.c
--- a/src/vtx/config.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vtx/config.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,7 +1,7 @@
 /*
  *    Plugin configure dialog.
  */
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 void vtx_config(void)
 {
diff -r 57d499fc5056 -r 3134a0987162 src/vtx/info.c
--- a/src/vtx/info.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vtx/info.c	Wed Nov 26 02:55:04 2008 +0900
@@ -1,7 +1,7 @@
 #include "ayemu.h"
 #include "vtx.h"
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 
 void vtx_file_info(gchar *filename)
 {
diff -r 57d499fc5056 -r 3134a0987162 src/vtx/vtx.c
--- a/src/vtx/vtx.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vtx/vtx.c	Wed Nov 26 02:55:04 2008 +0900
@@ -17,9 +17,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 
 #include "vtx.h"
 #include "ayemu.h"
diff -r 57d499fc5056 -r 3134a0987162 src/vtx/vtx.h
--- a/src/vtx/vtx.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vtx/vtx.h	Wed Nov 26 02:55:04 2008 +0900
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdio.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 void vtx_init(void);
 void vtx_about(void);
diff -r 57d499fc5056 -r 3134a0987162 src/vtx/vtxfile.c
--- a/src/vtx/vtxfile.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/vtx/vtxfile.c	Wed Nov 26 02:55:04 2008 +0900
@@ -5,7 +5,7 @@
 #include <ctype.h>
 #include <inttypes.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include "ayemu.h"
 
diff -r 57d499fc5056 -r 3134a0987162 src/wavpack/libwavpack.cxx
--- a/src/wavpack/libwavpack.cxx	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/wavpack/libwavpack.cxx	Wed Nov 26 02:55:04 2008 +0900
@@ -9,8 +9,8 @@
 #include <unistd.h>
 extern "C" {
 #include <wavpack/wavpack.h>
-#include <audacious/plugin.h>
-#include <audacious/output.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
 }
 #include <glib.h>
 #include <gtk/gtk.h>
diff -r 57d499fc5056 -r 3134a0987162 src/wavpack/tags.cxx
--- a/src/wavpack/tags.cxx	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/wavpack/tags.cxx	Wed Nov 26 02:55:04 2008 +0900
@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <wchar.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 #include "tags.h"
 
 static const char*  GenreList [] = {
diff -r 57d499fc5056 -r 3134a0987162 src/wavpack/ui.cxx
--- a/src/wavpack/ui.cxx	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/wavpack/ui.cxx	Wed Nov 26 02:55:04 2008 +0900
@@ -8,8 +8,8 @@
 #include <unistd.h>
 extern "C" {
 #include <wavpack/wavpack.h>
-#include <audacious/plugin.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/i18n.h>
 }
 #include <glib.h>
 #include <gtk/gtk.h>
diff -r 57d499fc5056 -r 3134a0987162 src/wma/libffwma/avio.h
--- a/src/wma/libffwma/avio.h	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/wma/libffwma/avio.h	Wed Nov 26 02:55:04 2008 +0900
@@ -1,7 +1,7 @@
 #ifndef AVIO_H
 #define AVIO_H
 
-#include <audacious/vfs.h>
+#include <audlegacy/vfs.h>
 
 /* output byte stream handling */
 
diff -r 57d499fc5056 -r 3134a0987162 src/wma/libffwma/file.c
--- a/src/wma/libffwma/file.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/wma/libffwma/file.c	Wed Nov 26 02:55:04 2008 +0900
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 /* standard file protocol */
 
diff -r 57d499fc5056 -r 3134a0987162 src/wma/wma.c
--- a/src/wma/wma.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/wma/wma.c	Wed Nov 26 02:55:04 2008 +0900
@@ -35,9 +35,9 @@
 #include <strings.h>
 #include <glib.h>
 
-#include <audacious/plugin.h>
-#include <audacious/output.h>
-#include <audacious/i18n.h>
+#include <audlegacy/plugin.h>
+#include <audlegacy/output.h>
+#include <audlegacy/i18n.h>
 
 #include "avcodec.h"
 #include "avformat.h"
diff -r 57d499fc5056 -r 3134a0987162 src/xsf/plugin.c
--- a/src/xsf/plugin.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/xsf/plugin.c	Wed Nov 26 02:55:04 2008 +0900
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include "ao.h"
 #include "corlett.h"
diff -r 57d499fc5056 -r 3134a0987162 src/xspf/xspf.c
--- a/src/xspf/xspf.c	Tue Nov 25 23:11:16 2008 +0900
+++ b/src/xspf/xspf.c	Wed Nov 26 02:55:04 2008 +0900
@@ -33,7 +33,7 @@
 #include <sys/stat.h>
 #include <sys/errno.h>
 
-#include <audacious/plugin.h>
+#include <audlegacy/plugin.h>
 
 #include <libxml/tree.h>
 #include <libxml/parser.h>