# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1191275638 -10800
# Node ID 98893c1e9f981a47f392ea909e8e0b5c3f73d4e7
# Parent  66fb09cd894e9ec8a6e2fd81f01227ccbb48942a# Parent  a98c54cb96aab4d47856ad1fab068d6b0ee64317
Branch merge.

diff -r 66fb09cd894e -r 98893c1e9f98 src/modplug/modplugbmp.cxx
--- a/src/modplug/modplugbmp.cxx	Tue Oct 02 00:50:48 2007 +0300
+++ b/src/modplug/modplugbmp.cxx	Tue Oct 02 00:53:58 2007 +0300
@@ -14,12 +14,9 @@
 #include "stddefs.h"
 #include "archive/open.h"
 extern "C" {
-#include "audacious/configdb.h"
-#include "audacious/output.h"
-#include "audacious/tuple.h"
-#include "audacious/tuple_formatter.h"
-#include "audacious/vfs.h"
-#include "audacious/strings.h"
+#include <audacious/configdb.h>
+#include <audacious/output.h>
+#include <audacious/strings.h>
 }
 
 static char* format_and_free_ti( Tuple* ti, int* length )
diff -r 66fb09cd894e -r 98893c1e9f98 src/modplug/modplugbmp.h
--- a/src/modplug/modplugbmp.h	Tue Oct 02 00:50:48 2007 +0300
+++ b/src/modplug/modplugbmp.h	Tue Oct 02 00:53:58 2007 +0300
@@ -15,9 +15,7 @@
 #endif
 
 extern "C" {
-#include "audacious/plugin.h"
-#include "audacious/tuple.h"
-#include "audacious/tuple_formatter.h"
+#include <audacious/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 66fb09cd894e -r 98893c1e9f98 src/modplug/plugin.cxx
--- a/src/modplug/plugin.cxx	Tue Oct 02 00:50:48 2007 +0300
+++ b/src/modplug/plugin.cxx	Tue Oct 02 00:53:58 2007 +0300
@@ -7,9 +7,7 @@
 #include "modplug.h"
 #include "gui/main.h"
 extern "C" {
-#include "audacious/plugin.h"
-#include "audacious/tuple.h"
-#include "audacious/tuple_formatter.h"
+#include <audacious/plugin.h>
 }
 
 extern InputPlugin gModPlug;