diff -Nru music-0.9.3-testing.orig//data-mp3.h music-0.9.3-testing/data-mp3.h
--- music-0.9.3-testing.orig//data-mp3.h	2008-02-20 15:05:00.000000000 +0100
+++ music-0.9.3-testing/data-mp3.h	2011-03-15 09:07:17.000000000 +0100
@@ -75,7 +75,7 @@
 
 // ----------------------------------------------------------------
 
-class cImage : public cListObject {
+class cMyImage : public cListObject {
 public:
   int user;
 private:
@@ -85,10 +85,10 @@
   void Init(void);
   char *Convert2Unix(const char *name) const;
 public:
-  cImage(cFileObj *Obj);
-  cImage(cFileSource *Source, const char *Subdir, const char *Name);
-  cImage(cImage *Image);
-  ~cImage();
+  cMyImage(cFileObj *Obj);
+  cMyImage(cFileSource *Source, const char *Subdir, const char *Name);
+  cMyImage(cMyImage *Image);
+  ~cMyImage();
   virtual int Compare(const cListObject &ListObject) const;
   bool Parse(char *s, const char *reldir) const;
   bool Save(FILE *f, const char *reldir) const;
@@ -151,11 +151,11 @@
 
 // ----------------------------------------------------------------
 
-class cImagePlayList : public cScanDir, public cPlayList {
+class cMyImagePlayList : public cScanDir, public cPlayList {
 protected:
   virtual void DoItem(cFileSource *src, const char *subdir, const char *name);
 public:
-  cImagePlayList(cFileObj *Obj);
+  cMyImagePlayList(cFileObj *Obj);
   virtual bool Load(void);
 //  virtual bool Save(void) { return false; }
   };