--- ./cone/myserver.H.orig	2004-06-22 19:55:22.000000000 -0500
+++ ./cone/myserver.H	2006-02-06 10:50:39.000000000 -0600
@@ -182,7 +182,7 @@
 
 	static std::string getConfigDir();
 	static std::string getHomeDir();
-	static std::string myServer::getConfigFilename();
+	static std::string getConfigFilename();
 
 	static void saveconfig(bool saveRemote=true,
 			       bool installRemote=false);
--- ./cone/cursesmessage.H.orig	2005-06-29 21:55:49.000000000 -0500
+++ ./cone/cursesmessage.H	2006-02-06 10:53:58.000000000 -0600
@@ -86,9 +86,9 @@
 	// Returns the "image" of line #lineNum, a list of
 	// attribute/text pairs.
 
-	void CursesMessage::drawLine(size_t lineNum,
-				     Curses *window,
-				     size_t windowLineNum);
+	void drawLine(size_t lineNum,
+		      Curses *window,
+		      size_t windowLineNum);
 
 	std::string shownMimeId; // Non "" if showing an attached message.
 private:
--- ./cone/spellcheckerAspell.H.orig	2003-06-21 22:59:52.000000000 -0500
+++ ./cone/spellcheckerAspell.H	2006-02-06 10:57:24.000000000 -0600
@@ -90,7 +90,7 @@
 	virtual void setDictionary(std::string);
 
 	SpellCheckerBase::Manager
-	*SpellChecker::getManager(std::string &errmsg);
+	*getManager(std::string &errmsg);
 };
 
 #endif
--- cone/cursesedit.H.orig	2004-11-19 20:37:20.000000000 -0600
+++ cone/cursesedit.H	2006-02-07 10:43:22.000000000 -0600
@@ -223,7 +223,7 @@
 		  bool saveFcc);
 
 private:
-	std::string CursesEdit::getFcc(SaveSink *sink);
+	std::string getFcc(SaveSink *sink);
 
 	std::string sender;		   // Initialized by save()
 	std::vector<std::string> recipients; // Initialized by save()