diff -Naur xtdesktop-0.7b/desk.h xtdesktop-0.7b-magellan/desk.h
--- xtdesktop-0.7b/desk.h	2004-09-08 09:25:25.000000000 +0200
+++ xtdesktop-0.7b-magellan/desk.h	2008-06-04 15:08:35.000000000 +0200
@@ -110,7 +110,7 @@
   void LoadIcons (void);
   void setCheckMountProc (Icon * I);
   static void procIsMounted (Icon * I);
-  Boolean Desk::isMounted (char *mnt);
+  Boolean isMounted (char *mnt);
   static Boolean procExecJobs (XtPointer D);
   Boolean ExecJobs (void);
   inline Pixmap getUPixmap(void){return UnknownPixmap;};
@@ -128,7 +128,7 @@
   inline int getCaptionBorder(void) { return CaptionBorder; };
   inline int getsnapX (void) { return snapX; };
   inline int getsnapY (void) { return snapY; };
-  void Desk::LowerIcons(Icon *I);
+  void LowerIcons(Icon *I);
 };
 
 #endif
diff -Naur xtdesktop-0.7b/icon.h xtdesktop-0.7b-magellan/icon.h
--- xtdesktop-0.7b/icon.h	2004-06-12 07:28:58.000000000 +0200
+++ xtdesktop-0.7b-magellan/icon.h	2008-06-04 15:08:59.000000000 +0200
@@ -106,8 +106,8 @@
   void updateMount (Boolean state);
   inline char* getConfigFile(void) { return ConfigFile; };
   void checkAccess( char *path, int mode ); 
-  void Icon::raiseme (void);
-  void Icon::lowerme (void);
+  void raiseme (void);
+  void lowerme (void);
 };
 
 #endif
diff -Naur xtdesktop-0.7b/menu.h xtdesktop-0.7b-magellan/menu.h
--- xtdesktop-0.7b/menu.h	2004-06-07 15:13:16.000000000 +0200
+++ xtdesktop-0.7b-magellan/menu.h	2008-06-04 15:08:46.000000000 +0200
@@ -36,7 +36,7 @@
   };
   void AddCommand (char *item, char *command);
   void AddProps(char *item, Icon *I);
-  static void PopupMenu::procExec (Widget w, XtPointer client_data,
+  static void procExec (Widget w, XtPointer client_data,
 				   XtPointer call_data);
 };