# HG changeset patch
# User nenolod
# Date 1158568525 25200
# Node ID 088092a52fea12ae387e93c62df1e182c682c4c6
# Parent  4e0ad481325febb06f2b6697cb5efc7df47ea6d7
[svn] - move from (internal) libaudacious/ include path to audacious/ include path

diff -r 4e0ad481325f -r 088092a52fea ChangeLog
--- a/ChangeLog	Mon Sep 18 01:21:56 2006 -0700
+++ b/ChangeLog	Mon Sep 18 01:35:25 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-18 08:21:56 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [4]
+  - denote the split in the changelog
+  
+
+  Changes:        Modified:
+  +1 -0           trunk/ChangeLog  
+
+
 2006-09-18 08:20:55 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2]
   - updates here for new buildsystem
diff -r 4e0ad481325f -r 088092a52fea src/Container/m3u/m3u.c
--- a/src/Container/m3u/m3u.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Container/m3u/m3u.c	Mon Sep 18 01:35:25 2006 -0700
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <sys/errno.h>
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include "audacious/main.h"
 #include "audacious/util.h"
 #include "audacious/playlist.h"
diff -r 4e0ad481325f -r 088092a52fea src/Container/pls/pls.c
--- a/src/Container/pls/pls.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Container/pls/pls.c	Mon Sep 18 01:35:25 2006 -0700
@@ -36,7 +36,7 @@
 #include "audacious/playlist.h"
 #include "audacious/playlist_container.h"
 #include "audacious/plugin.h"
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 
 static void
 playlist_load_pls(const gchar * filename, gint pos)
diff -r 4e0ad481325f -r 088092a52fea src/Effect/audiocompress/audacious-glue.c
--- a/src/Effect/audiocompress/audacious-glue.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Effect/audiocompress/audacious-glue.c	Mon Sep 18 01:35:25 2006 -0700
@@ -8,8 +8,8 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include "audacious/plugin.h"
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
 
 #include "config.h"
 #include "compress.h"
diff -r 4e0ad481325f -r 088092a52fea src/Effect/stereo_plugin/stereo.c
--- a/src/Effect/stereo_plugin/stereo.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Effect/stereo_plugin/stereo.c	Mon Sep 18 01:35:25 2006 -0700
@@ -1,6 +1,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
-#include "libaudacious/util.h"
+#include "audacious/util.h"
 
 #include <audacious/plugin.h>
 #include <libaudacious/configdb.h>
diff -r 4e0ad481325f -r 088092a52fea src/General/lirc/lirc.c
--- a/src/General/lirc/lirc.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/General/lirc/lirc.c	Mon Sep 18 01:35:25 2006 -0700
@@ -42,7 +42,7 @@
 #include <glib/gi18n.h>
 
 #include "audacious/plugin.h"
-#include "libaudacious/beepctrl.h"
+#include "audacious/beepctrl.h"
 
 #include <lirc/lirc_client.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/General/notify/notify.c
--- a/src/General/notify/notify.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/General/notify/notify.c	Mon Sep 18 01:35:25 2006 -0700
@@ -13,7 +13,7 @@
 #include "audacious/plugin.h"
 #include "audacious/playlist.h"
 #include "audacious/input.h"
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 
 #include "config.h"
 
diff -r 4e0ad481325f -r 088092a52fea src/General/scrobbler/configure.c
--- a/src/General/scrobbler/configure.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/General/scrobbler/configure.c	Mon Sep 18 01:35:25 2006 -0700
@@ -2,8 +2,8 @@
 #  include <config.h>
 #endif
 
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff -r 4e0ad481325f -r 088092a52fea src/General/scrobbler/gtkstuff.c
--- a/src/General/scrobbler/gtkstuff.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/General/scrobbler/gtkstuff.c	Mon Sep 18 01:35:25 2006 -0700
@@ -1,5 +1,5 @@
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
 
 #include <glib.h>
 #include <glib/gi18n.h>
diff -r 4e0ad481325f -r 088092a52fea src/General/song_change/song_change.c
--- a/src/General/song_change/song_change.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/General/song_change/song_change.c	Mon Sep 18 01:35:25 2006 -0700
@@ -18,9 +18,9 @@
 
 #include "audacious/plugin.h"
 #include "audacious/prefswin.h"
-#include "libaudacious/configdb.h"
-#include "libaudacious/beepctrl.h"
-#include "libaudacious/formatter.h"
+#include "audacious/configdb.h"
+#include "audacious/beepctrl.h"
+#include "audacious/formatter.h"
 
 static void init(void);
 static void cleanup(void);
diff -r 4e0ad481325f -r 088092a52fea src/Input/aac/src/mp4_utils.c
--- a/src/Input/aac/src/mp4_utils.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/aac/src/mp4_utils.c	Mon Sep 18 01:35:25 2006 -0700
@@ -10,8 +10,8 @@
 #include <string.h>
 #include <stdlib.h>
 #include "audacious/plugin.h"
-#include "libaudacious/titlestring.h"
-#include "libaudacious/util.h"
+#include "audacious/titlestring.h"
+#include "audacious/util.h"
 
 const char *mp4AudioNames[]=
   {
diff -r 4e0ad481325f -r 088092a52fea src/Input/adplug/adplug-xmms.cc
--- a/src/Input/adplug/adplug-xmms.cc	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/adplug/adplug-xmms.cc	Mon Sep 18 01:35:25 2006 -0700
@@ -29,8 +29,8 @@
 #include "silentopl.h"
 #include "players.h"
 #include "audacious/plugin.h"
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
 extern "C" {
 #include "audacious/output.h"
 }
diff -r 4e0ad481325f -r 088092a52fea src/Input/amidi-plug/amidi-plug.h
--- a/src/Input/amidi-plug/amidi-plug.h	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/amidi-plug/amidi-plug.h	Mon Sep 18 01:35:25 2006 -0700
@@ -29,8 +29,8 @@
 #include "i_common.h"
 #include "audacious/plugin.h"
 #include "audacious/output.h"
-#include "libaudacious/beepctrl.h"
-#include "libaudacious/vfs.h"
+#include "audacious/beepctrl.h"
+#include "audacious/vfs.h"
 #include <pthread.h>
 #include "i_backend.h"
 #include "i_configure.h"
diff -r 4e0ad481325f -r 088092a52fea src/Input/amidi-plug/i_configure.c
--- a/src/Input/amidi-plug/i_configure.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/amidi-plug/i_configure.c	Mon Sep 18 01:35:25 2006 -0700
@@ -27,7 +27,7 @@
 #include "i_configure-fluidsynth.h"
 #include "i_configure-dummy.h"
 #include "i_utils.h"
-#include "libaudacious/beepctrl.h"
+#include "audacious/beepctrl.h"
 
 
 amidiplug_cfg_backend_t * amidiplug_cfg_backend;
diff -r 4e0ad481325f -r 088092a52fea src/Input/amidi-plug/i_midi.h
--- a/src/Input/amidi-plug/i_midi.h	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/amidi-plug/i_midi.h	Mon Sep 18 01:35:25 2006 -0700
@@ -23,7 +23,7 @@
 
 #include "i_common.h"
 #include "i_midievent.h"
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 
 #define MAKE_ID(c1, c2, c3, c4) ((c1) | ((c2) << 8) | ((c3) << 16) | ((c4) << 24))
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/console/Audacious_Config.cxx
--- a/src/Input/console/Audacious_Config.cxx	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/console/Audacious_Config.cxx	Mon Sep 18 01:35:25 2006 -0700
@@ -11,7 +11,7 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 #include "Audacious_Config.h"
 
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/console/Audacious_Driver.cxx
--- a/src/Input/console/Audacious_Driver.cxx	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/console/Audacious_Driver.cxx	Mon Sep 18 01:35:25 2006 -0700
@@ -9,8 +9,8 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include "libaudacious/util.h"
-#include "libaudacious/titlestring.h"
+#include "audacious/util.h"
+#include "audacious/titlestring.h"
 extern "C" {
 #include "audacious/output.h"
 #include "audacious/playlist.h"
diff -r 4e0ad481325f -r 088092a52fea src/Input/console/Vfs_File.cxx
--- a/src/Input/console/Vfs_File.cxx	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/console/Vfs_File.cxx	Mon Sep 18 01:35:25 2006 -0700
@@ -1,7 +1,7 @@
 
 #include "Vfs_File.h"
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 
 Vfs_File_Reader::Vfs_File_Reader() : file_( NULL ) { }
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/console/abstract_file.h
--- a/src/Input/console/abstract_file.h	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/console/abstract_file.h	Mon Sep 18 01:35:25 2006 -0700
@@ -5,7 +5,7 @@
 #define ABSTRACT_FILE_H
 
 #include <stdio.h>
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 
 // Supports reading and finding out how many bytes are remaining
 class Data_Reader {
diff -r 4e0ad481325f -r 088092a52fea src/Input/flac/plugin.c
--- a/src/Input/flac/plugin.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/flac/plugin.c	Mon Sep 18 01:35:25 2006 -0700
@@ -26,10 +26,10 @@
 
 #include "audacious/plugin.h"
 #include "audacious/output.h"
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
-#include "libaudacious/titlestring.h"
-#include "libaudacious/vfs.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
+#include "audacious/titlestring.h"
+#include "audacious/vfs.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff -r 4e0ad481325f -r 088092a52fea src/Input/modplug/gui/main.cxx
--- a/src/Input/modplug/gui/main.cxx	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/modplug/gui/main.cxx	Mon Sep 18 01:35:25 2006 -0700
@@ -9,7 +9,7 @@
 
 #include <gtk/gtk.h>
 #include <libintl.h>
-#include "libaudacious/util.c"
+#include "audacious/util.c"
 
 #include "interface.h"
 #include "support.h"
diff -r 4e0ad481325f -r 088092a52fea src/Input/modplug/modplugbmp.cxx
--- a/src/Input/modplug/modplugbmp.cxx	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/modplug/modplugbmp.cxx	Mon Sep 18 01:35:25 2006 -0700
@@ -13,8 +13,8 @@
 #include <libmodplug/sndfile.h>
 #include "stddefs.h"
 #include "archive/open.h"
-#include "libaudacious/configdb.h"
-#include "libaudacious/vfs.h"
+#include "audacious/configdb.h"
+#include "audacious/vfs.h"
 extern "C" {
 #include "audacious/output.h"
 }
diff -r 4e0ad481325f -r 088092a52fea src/Input/mpg123/fileinfo.c
--- a/src/Input/mpg123/fileinfo.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/mpg123/fileinfo.c	Mon Sep 18 01:35:25 2006 -0700
@@ -38,9 +38,9 @@
 #include <errno.h>
 
 #include "audacious/util.h"
-#include "libaudacious/util.h"
-#include "libaudacious/vfs.h"
-#include "libaudacious/xentry.h"
+#include "audacious/util.h"
+#include "audacious/vfs.h"
+#include "audacious/xentry.h"
 
 #include "mp3.xpm"
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/mpg123/mpg123.c
--- a/src/Input/mpg123/mpg123.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/mpg123/mpg123.c	Mon Sep 18 01:35:25 2006 -0700
@@ -18,10 +18,10 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
-#include "libaudacious/vfs.h"
-#include "libaudacious/titlestring.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
+#include "audacious/vfs.h"
+#include "audacious/titlestring.h"
 #include "audacious/util.h"
 #include <tag_c.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/musepack/libmpc.h
--- a/src/Input/musepack/libmpc.h	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/musepack/libmpc.h	Mon Sep 18 01:35:25 2006 -0700
@@ -6,10 +6,10 @@
 {
 #include "audacious/plugin.h"
 #include "audacious/output.h"
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
-#include "libaudacious/titlestring.h"
-#include "libaudacious/vfs.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
+#include "audacious/titlestring.h"
+#include "audacious/vfs.h"
 }
 
 //stdlib headers
diff -r 4e0ad481325f -r 088092a52fea src/Input/sexypsf/Misc.c
--- a/src/Input/sexypsf/Misc.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/sexypsf/Misc.c	Mon Sep 18 01:35:25 2006 -0700
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff -r 4e0ad481325f -r 088092a52fea src/Input/sexypsf/xmms.c
--- a/src/Input/sexypsf/xmms.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/sexypsf/xmms.c	Mon Sep 18 01:35:25 2006 -0700
@@ -18,9 +18,9 @@
 
 #include "audacious/output.h"
 #include "audacious/plugin.h"
-#include "libaudacious/titlestring.h"
-#include "libaudacious/util.h"
-#include "libaudacious/vfs.h"
+#include "audacious/titlestring.h"
+#include "audacious/util.h"
+#include "audacious/vfs.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff -r 4e0ad481325f -r 088092a52fea src/Input/sid/xs_config.c
--- a/src/Input/sid/xs_config.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/sid/xs_config.c	Mon Sep 18 01:35:25 2006 -0700
@@ -21,7 +21,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 #include "xs_config.h"
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 #include <stdio.h>
 #include "xs_glade.h"
 #include "xs_interface.h"
diff -r 4e0ad481325f -r 088092a52fea src/Input/sid/xs_title.c
--- a/src/Input/sid/xs_title.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/sid/xs_title.c	Mon Sep 18 01:35:25 2006 -0700
@@ -23,7 +23,7 @@
 #include "xs_title.h"
 #include "xs_support.h"
 #include "xs_config.h"
-#include "libaudacious/titlestring.h"
+#include "audacious/titlestring.h"
 
 
 /*
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/libtimidity/common.c
--- a/src/Input/timidity/libtimidity/common.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/libtimidity/common.c	Mon Sep 18 01:35:25 2006 -0700
@@ -25,7 +25,7 @@
 #  include <config.h>
 #endif
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include <stdlib.h>
 #include <string.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/libtimidity/instrum.c
--- a/src/Input/timidity/libtimidity/instrum.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/libtimidity/instrum.c	Mon Sep 18 01:35:25 2006 -0700
@@ -27,7 +27,7 @@
 #  include <config.h>
 #endif
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include <string.h>
 #include <stdlib.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/libtimidity/mix.c
--- a/src/Input/timidity/libtimidity/mix.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/libtimidity/mix.c	Mon Sep 18 01:35:25 2006 -0700
@@ -25,7 +25,7 @@
 #  include <config.h>
 #endif
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include <math.h>
 #include <stdlib.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/libtimidity/playmidi.c
--- a/src/Input/timidity/libtimidity/playmidi.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/libtimidity/playmidi.c	Mon Sep 18 01:35:25 2006 -0700
@@ -25,7 +25,7 @@
 #  include <config.h>
 #endif
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include <stdlib.h>
 #include <string.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/libtimidity/readmidi.c
--- a/src/Input/timidity/libtimidity/readmidi.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/libtimidity/readmidi.c	Mon Sep 18 01:35:25 2006 -0700
@@ -23,7 +23,7 @@
 #  include <config.h>
 #endif
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include <stdlib.h>
 #include <string.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/libtimidity/resample.c
--- a/src/Input/timidity/libtimidity/resample.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/libtimidity/resample.c	Mon Sep 18 01:35:25 2006 -0700
@@ -24,7 +24,7 @@
 #  include <config.h>
 #endif
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include <math.h>
 #include <stdlib.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/libtimidity/tables.c
--- a/src/Input/timidity/libtimidity/tables.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/libtimidity/tables.c	Mon Sep 18 01:35:25 2006 -0700
@@ -23,7 +23,7 @@
 #  include <config.h>
 #endif
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 
 #include "timidity.h"
 #include "tables.h"
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/libtimidity/timidity.c
--- a/src/Input/timidity/libtimidity/timidity.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/libtimidity/timidity.c	Mon Sep 18 01:35:25 2006 -0700
@@ -23,7 +23,7 @@
 #  include <config.h>
 #endif
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include <stdlib.h>
 #include <string.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/libtimidity/timidity.h
--- a/src/Input/timidity/libtimidity/timidity.h	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/libtimidity/timidity.h	Mon Sep 18 01:35:25 2006 -0700
@@ -23,7 +23,7 @@
 #ifndef TIMIDITY_H
 #define TIMIDITY_H
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include <stdlib.h>
 
 #ifdef __cplusplus
diff -r 4e0ad481325f -r 088092a52fea src/Input/timidity/src/xmms-timidity.c
--- a/src/Input/timidity/src/xmms-timidity.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/timidity/src/xmms-timidity.c	Mon Sep 18 01:35:25 2006 -0700
@@ -21,10 +21,10 @@
 #include <config.h>
 #endif
 
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
-#include "libaudacious/titlestring.h"
-#include "libaudacious/vfs.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
+#include "audacious/titlestring.h"
+#include "audacious/vfs.h"
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
diff -r 4e0ad481325f -r 088092a52fea src/Input/tonegen/tonegen.c
--- a/src/Input/tonegen/tonegen.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/tonegen/tonegen.c	Mon Sep 18 01:35:25 2006 -0700
@@ -19,7 +19,7 @@
 
 #include "audacious/plugin.h"
 #include "audacious/output.h"
-#include "libaudacious/util.h"
+#include "audacious/util.h"
 #include "config.h"
 #include <glib.h>
 #include <stdlib.h>
diff -r 4e0ad481325f -r 088092a52fea src/Input/vorbis/configure.c
--- a/src/Input/vorbis/configure.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/vorbis/configure.c	Mon Sep 18 01:35:25 2006 -0700
@@ -10,10 +10,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libaudacious/configdb.h"
-#include "libaudacious/dirbrowser.h"
-#include "libaudacious/titlestring.h"
-#include "libaudacious/util.h"
+#include "audacious/configdb.h"
+#include "audacious/dirbrowser.h"
+#include "audacious/titlestring.h"
+#include "audacious/util.h"
 #include "audacious/plugin.h"
 
 extern GMutex *vf_mutex;
diff -r 4e0ad481325f -r 088092a52fea src/Input/vorbis/http.c
--- a/src/Input/vorbis/http.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/vorbis/http.c	Mon Sep 18 01:35:25 2006 -0700
@@ -41,7 +41,7 @@
 
 #include "vorbis.h"
 #include "http.h"
-#include "libaudacious/util.h"
+#include "audacious/util.h"
 #include "audacious/plugin.h"
 
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/vorbis/vorbis.c
--- a/src/Input/vorbis/vorbis.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/vorbis/vorbis.c	Mon Sep 18 01:35:25 2006 -0700
@@ -50,9 +50,9 @@
 
 #include "audacious/plugin.h"
 #include "audacious/output.h"
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
-#include "libaudacious/titlestring.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
+#include "audacious/titlestring.h"
 
 #include "vorbis.h"
 #include "http.h"
diff -r 4e0ad481325f -r 088092a52fea src/Input/vorbis/vorbis.h
--- a/src/Input/vorbis/vorbis.h	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/vorbis/vorbis.h	Mon Sep 18 01:35:25 2006 -0700
@@ -3,7 +3,7 @@
 
 #include <vorbis/vorbisfile.h>
 
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 
 extern ov_callbacks vorbis_callbacks;
 
diff -r 4e0ad481325f -r 088092a52fea src/Input/wma/libffwma/file.c
--- a/src/Input/wma/libffwma/file.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/wma/libffwma/file.c	Mon Sep 18 01:35:25 2006 -0700
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
-#include "libaudacious/vfs.h"
+#include "audacious/vfs.h"
 #include "mms.h"
 
 /* standard file protocol */
diff -r 4e0ad481325f -r 088092a52fea src/Input/wma/wma.c
--- a/src/Input/wma/wma.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Input/wma/wma.c	Mon Sep 18 01:35:25 2006 -0700
@@ -35,9 +35,9 @@
 
 #include "audacious/plugin.h"
 #include "audacious/output.h"
-#include "libaudacious/util.h"
-#include "libaudacious/titlestring.h"
-#include "libaudacious/vfs.h"
+#include "audacious/util.h"
+#include "audacious/titlestring.h"
+#include "audacious/vfs.h"
 #include "audacious/util.h"
 
 #include "avcodec.h"
diff -r 4e0ad481325f -r 088092a52fea src/Output/CoreAudio/about.c
--- a/src/Output/CoreAudio/about.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/CoreAudio/about.c	Mon Sep 18 01:35:25 2006 -0700
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include "coreaudio.h"
-#include "libaudacious/util.h"
+#include "audacious/util.h"
 
 void osx_about(void)
 {
diff -r 4e0ad481325f -r 088092a52fea src/Output/CoreAudio/audio.c
--- a/src/Output/CoreAudio/audio.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/CoreAudio/audio.c	Mon Sep 18 01:35:25 2006 -0700
@@ -18,7 +18,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include "coreaudio.h"
-#include "libaudacious/util.h"
+#include "audacious/util.h"
 #include <errno.h>
 #include <CoreAudio/CoreAudio.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Output/CoreAudio/configure.c
--- a/src/Output/CoreAudio/configure.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/CoreAudio/configure.c	Mon Sep 18 01:35:25 2006 -0700
@@ -19,7 +19,7 @@
 
 //#include <glib/gi18n.h>
 #include "coreaudio.h"
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 #include <CoreAudio/CoreAudio.h>
 
 static GtkWidget *configure_win = NULL;
diff -r 4e0ad481325f -r 088092a52fea src/Output/CoreAudio/init.c
--- a/src/Output/CoreAudio/init.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/CoreAudio/init.c	Mon Sep 18 01:35:25 2006 -0700
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 #include "coreaudio.h"
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 
 OSXConfig osx_cfg;
 
diff -r 4e0ad481325f -r 088092a52fea src/Output/arts/arts.c
--- a/src/Output/arts/arts.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/arts/arts.c	Mon Sep 18 01:35:25 2006 -0700
@@ -10,7 +10,7 @@
  */
 
 #include "arts.h"
-#include "libaudacious/util.h"
+#include "audacious/util.h"
 
 static void about(void)
 {
diff -r 4e0ad481325f -r 088092a52fea src/Output/arts/arts.h
--- a/src/Output/arts/arts.h	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/arts/arts.h	Mon Sep 18 01:35:25 2006 -0700
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "audacious/plugin.h"
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 
 struct arts_config
 {
diff -r 4e0ad481325f -r 088092a52fea src/Output/disk_writer/disk_writer.c
--- a/src/Output/disk_writer/disk_writer.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/disk_writer/disk_writer.c	Mon Sep 18 01:35:25 2006 -0700
@@ -29,11 +29,11 @@
 #include <string.h>
 
 #include "audacious/plugin.h"
-#include "libaudacious/beepctrl.h"
-#include "libaudacious/dirbrowser.h"
-#include "libaudacious/configdb.h"
-#include "libaudacious/util.h"
-#include "libaudacious/vfs.h"
+#include "audacious/beepctrl.h"
+#include "audacious/dirbrowser.h"
+#include "audacious/configdb.h"
+#include "audacious/util.h"
+#include "audacious/vfs.h"
 
 struct wavhead
 {
diff -r 4e0ad481325f -r 088092a52fea src/Output/jack/configure.c
--- a/src/Output/jack/configure.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/jack/configure.c	Mon Sep 18 01:35:25 2006 -0700
@@ -24,7 +24,7 @@
 
 #include "jack.h"
 
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 
 #include <gtk/gtk.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Output/jack/jack.c
--- a/src/Output/jack/jack.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/jack/jack.c	Mon Sep 18 01:35:25 2006 -0700
@@ -6,8 +6,8 @@
  *	This code maps xmms calls into the jack translation library
  */
 
-#include "libaudacious/configdb.h"
-#include "libaudacious/util.h"
+#include "audacious/configdb.h"
+#include "audacious/util.h"
 #include <dlfcn.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff -r 4e0ad481325f -r 088092a52fea src/Output/pulse_audio/pulse_audio.c
--- a/src/Output/pulse_audio/pulse_audio.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/pulse_audio/pulse_audio.c	Mon Sep 18 01:35:25 2006 -0700
@@ -30,8 +30,8 @@
 
 #include <gtk/gtk.h>
 #include "audacious/plugin.h"
-#include "libaudacious/beepctrl.h"
-#include "libaudacious/util.h"
+#include "audacious/beepctrl.h"
+#include "audacious/util.h"
 
 #include <pulse/pulseaudio.h>
 
diff -r 4e0ad481325f -r 088092a52fea src/Output/sun/about.c
--- a/src/Output/sun/about.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/sun/about.c	Mon Sep 18 01:35:25 2006 -0700
@@ -18,7 +18,7 @@
  */
 
 #include "sun.h"
-#include "libaudacious/util.h"
+#include "audacious/util.h"
 
 #include <glib.h>
 #include <glib/gi18n.h>
diff -r 4e0ad481325f -r 088092a52fea src/Output/sun/audio.c
--- a/src/Output/sun/audio.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/sun/audio.c	Mon Sep 18 01:35:25 2006 -0700
@@ -20,7 +20,7 @@
 /* FIXME: g_error() is used several places, it will exit xmms */
 
 #include <errno.h>
-#include "libaudacious/util.h"
+#include "audacious/util.h"
 #include "sun.h"
 #include "resample.h"
 
diff -r 4e0ad481325f -r 088092a52fea src/Output/sun/configure.c
--- a/src/Output/sun/configure.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/sun/configure.c	Mon Sep 18 01:35:25 2006 -0700
@@ -19,8 +19,8 @@
 
 #include <errno.h>
 #include "sun.h"
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
 
 #include <glib.h>
 #include <glib/gi18n.h>
diff -r 4e0ad481325f -r 088092a52fea src/Output/sun/sun.c
--- a/src/Output/sun/sun.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/sun/sun.c	Mon Sep 18 01:35:25 2006 -0700
@@ -18,7 +18,7 @@
  */
 
 #include "sun.h"
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 
 #include <glib.h>
 #include <glib/gi18n.h>
diff -r 4e0ad481325f -r 088092a52fea src/Output/sun/sun.h
--- a/src/Output/sun/sun.h	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Output/sun/sun.h	Mon Sep 18 01:35:25 2006 -0700
@@ -36,7 +36,7 @@
 #include "audioio.h"
 
 #include "audacious/plugin.h"
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 
 /* Default path to audio device. */
 #ifndef SUN_DEV_AUDIO
diff -r 4e0ad481325f -r 088092a52fea src/Visualization/blur_scope/blur_scope.c
--- a/src/Visualization/blur_scope/blur_scope.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Visualization/blur_scope/blur_scope.c	Mon Sep 18 01:35:25 2006 -0700
@@ -29,8 +29,8 @@
 #include <gtk/gtk.h>
 #include <string.h>
 #include "audacious/plugin.h"
-#include "libaudacious/util.h"
-#include "libaudacious/configdb.h"
+#include "audacious/util.h"
+#include "audacious/configdb.h"
 #include "blur_scope.h"
 #include "bscope_logo.xpm"
 
diff -r 4e0ad481325f -r 088092a52fea src/Visualization/blur_scope/config.c
--- a/src/Visualization/blur_scope/config.c	Mon Sep 18 01:21:56 2006 -0700
+++ b/src/Visualization/blur_scope/config.c	Mon Sep 18 01:35:25 2006 -0700
@@ -6,7 +6,7 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "libaudacious/configdb.h"
+#include "audacious/configdb.h"
 #include "blur_scope.h"