diff -ru guituner_0.05beta1.orig/src/conferror.h guituner_0.05beta1/src/conferror.h
--- guituner_0.05beta1.orig/src/conferror.h	2001-08-27 10:06:15.000000000 +0200
+++ guituner_0.05beta1/src/conferror.h	2003-01-07 18:14:38.000000000 +0100
@@ -25,10 +25,12 @@
 	class ConfError: public Error {
 		public:
 			ConfError(string, string) throw();
+			~ConfError() throw();
 	};
 
 	inline ConfError::ConfError(string s1, string s2) throw():
 		Error(s1, s2) { }
+	inline ConfError::~ConfError() throw() { }
 }
 
 #endif
diff -ru guituner_0.05beta1.orig/src/conffile.C guituner_0.05beta1/src/conffile.C
--- guituner_0.05beta1.orig/src/conffile.C	2001-08-27 10:06:15.000000000 +0200
+++ guituner_0.05beta1/src/conffile.C	2003-01-07 18:14:38.000000000 +0100
@@ -77,7 +77,7 @@
 	if(!out)
 		throw Error::ConfError("ConfFile::save", _("Configuration file cannot be saved"));
 
-	for(vector<std::string>::iterator i = line.begin(); i != line.end(); ++i)
+	for(std::vector<std::string>::iterator i = line.begin(); i != line.end(); ++i)
 		std::fprintf(out, "%s\n", (*i).c_str());
 
 	std::fclose(out);
@@ -86,7 +86,7 @@
 bool
 Config::ConfFile::getValue(const char *key, std::string &val) throw()
 {
-	map<std::string, Value>::iterator m = table.find(std::string(key));
+	std::map<std::string, Value>::iterator m = table.find(std::string(key));
 	if(m != table.end())
 		return val = m->second.content, true;
 	else
@@ -96,7 +96,7 @@
 bool
 Config::ConfFile::setValue(const char *key, const std::string &val) throw()
 {
-	map<std::string, Value>::iterator m = table.find(std::string(key));
+	std::map<std::string, Value>::iterator m = table.find(std::string(key));
 	if(m != table.end()) {
 		m->second.content = val;
 		line[m->second.linNum] = std::string(key) + '=' + val;
diff -ru guituner_0.05beta1.orig/src/error.h guituner_0.05beta1/src/error.h
--- guituner_0.05beta1.orig/src/error.h	2001-08-27 10:06:15.000000000 +0200
+++ guituner_0.05beta1/src/error.h	2003-01-07 18:14:38.000000000 +0100
@@ -33,9 +33,10 @@
 	class Error: public exception {
 		public:
 				Error(string = "", string = "Error");
+				~Error() throw();
 
 		string	getFullMsg() const;
-		const char *what() const;
+		const char *what() const throw();
 
 		protected:
 		void		setLocation(string);
@@ -48,11 +49,12 @@
 
 	inline Error::Error(string l, string m): location(l),
 		message(m) { }
+	inline Error::~Error() throw() { }
 	inline string Error::getFullMsg() const { return location + " " + message; }
 	inline void Error::setLocation(string l) { location = l; }
 	inline void Error::setMessage(string m) { message = m; }
 
-	inline const char *Error::what() const { return getFullMsg().c_str(); }
+	inline const char *Error::what() const throw() { return getFullMsg().c_str(); }
 }
 
 #endif
diff -ru guituner_0.05beta1.orig/src/fftcalc.h guituner_0.05beta1/src/fftcalc.h
--- guituner_0.05beta1.orig/src/fftcalc.h	2001-08-27 10:06:15.000000000 +0200
+++ guituner_0.05beta1/src/fftcalc.h	2003-01-07 18:14:38.000000000 +0100
@@ -103,7 +103,7 @@
 		double *fftOut;
 		int outSize;
 
-		vector<FftPeak> peakBuf;
+		std::vector<FftPeak> peakBuf;
 	};
 
 	inline FftCalc::FftPeak::FftPeak() throw() { reset(); }
diff -ru guituner_0.05beta1.orig/src/genconf.C guituner_0.05beta1/src/genconf.C
--- guituner_0.05beta1.orig/src/genconf.C	2001-08-27 10:06:15.000000000 +0200
+++ guituner_0.05beta1/src/genconf.C	2003-01-07 18:14:38.000000000 +0100
@@ -187,21 +187,21 @@
 	while((ch = getopt(argc, argv, argList)) != -1) {
 		switch(ch) {
 			case 'c':
-				if(std::strcasecmp(optarg, "en") ||
-					std::strcasecmp(optarg, "english"))
+				if(strcasecmp(optarg, "en") ||
+					strcasecmp(optarg, "english"))
 					note.conv = Tuner::ENGLISH;
-				if(std::strcasecmp(optarg, "it") ||
-					std::strcasecmp(optarg, "italian"))
+				if(strcasecmp(optarg, "it") ||
+					strcasecmp(optarg, "italian"))
 					note.conv = Tuner::ITALIAN;
 				break;
 			case 'd':
-				if(std::strcasecmp(optarg, "oss"))
+				if(strcasecmp(optarg, "oss"))
 					audr = Tuner::OSS_DRIVER;
-				if(std::strcasecmp(optarg, "esd"))
+				if(strcasecmp(optarg, "esd"))
 					audr = Tuner::ESD_DRIVER;
 				break;
 			case 'm':
-				if(std::strcasecmp(optarg, "fft"))
+				if(strcasecmp(optarg, "fft"))
 					dm = Tuner::FFTCALC;
 				break;
 			case 'p':
diff -ru guituner_0.05beta1.orig/src/guituner.C guituner_0.05beta1/src/guituner.C
--- guituner_0.05beta1.orig/src/guituner.C	2001-08-27 10:06:15.000000000 +0200
+++ guituner_0.05beta1/src/guituner.C	2003-01-07 18:14:38.000000000 +0100
@@ -147,6 +147,6 @@
 void
 GuiTuner::reportMsg(const std::string &msg) throw()
 {
-	std::cerr << msg << endl;
+	std::cerr << msg << std::endl;
 }
 
diff -ru guituner_0.05beta1.orig/src/note.C guituner_0.05beta1/src/note.C
--- guituner_0.05beta1.orig/src/note.C	2001-08-27 10:06:15.000000000 +0200
+++ guituner_0.05beta1/src/note.C	2003-01-07 18:14:38.000000000 +0100
@@ -57,8 +57,8 @@
 	}
 
 	double d = f / e;
-	double v = 12 * std::log(d) / std::log(2);
-	nameIndex = static_cast<int>(std::rint(v));
+	double v = 12 * std::log(d) / std::log((double)2);
+	nameIndex = static_cast<int>(rint(v));
 	nameIndex %= 13;
 
 	cents = static_cast<int>((v - nameIndex) * 100);
diff -ru guituner_0.05beta1.orig/src/playerthread.C guituner_0.05beta1/src/playerthread.C
--- guituner_0.05beta1.orig/src/playerthread.C	2001-08-27 10:06:15.000000000 +0200
+++ guituner_0.05beta1/src/playerthread.C	2003-01-07 18:14:38.000000000 +0100
@@ -68,7 +68,7 @@
 	presets.resize(DEF_PRESETS);
 
 	for(int i = 0; i < DEF_PRESETS; ++i) {
-		vector<MidiNote> v(6);
+		std::vector<MidiNote> v(6);
 		for(int k = 0; k < 6; ++k)
 			v[k] = MidiNote(stdPreset[i].val[k]);
 		presets[i] = Preset(stdPreset[i].name, v);