--- /lib/graphic16.h	2005-01-19 19:30:52.000000000 +0100
+++ /lib/graphic16.h	2006-05-10 18:07:38.000000000 +0200
@@ -24,7 +24,7 @@
 
 class GraphicDevice16: public GraphicDevice {
 private:
-	long GraphicDevice16::allocColor(Color color);
+	long allocColor(Color color);
 
 public:
 	GraphicDevice16(FlashDisplay *fd);
--- /lib/graphic24.h	2005-01-19 19:30:52.000000000 +0100
+++ /lib/graphic24.h	2006-05-10 18:06:51.000000000 +0200
@@ -24,7 +24,7 @@
 
 class GraphicDevice24: public GraphicDevice {
 private:
-	long GraphicDevice24::allocColor(Color color);
+	long allocColor(Color color);
 
 public:
 	GraphicDevice24(FlashDisplay *fd);
--- /lib/graphic32.h	2005-01-19 19:30:52.000000000 +0100
+++ /lib/graphic32.h	2006-05-10 18:07:49.000000000 +0200
@@ -24,7 +24,7 @@
 
 class GraphicDevice32: public GraphicDevice {
 private:
-	long GraphicDevice32::allocColor(Color color);
+	long allocColor(Color color);
 
 public:
 	GraphicDevice32(FlashDisplay *fd);
--- /lib/matrix.h	2005-01-19 19:30:52.000000000 +0100
+++ /lib/matrix.h	2006-05-10 18:03:27.000000000 +0200
@@ -33,13 +33,13 @@
 #endif
 
 	inline
-	long Matrix::getX(long x, long y)
+	long getX(long x, long y)
 	{
 		return (long) (x*a+y*b+tx);
 	};
 
 	inline
-	long Matrix::getY(long x, long y)
+	long getY(long x, long y)
 	{
 		return (long) (x*c+y*d+ty);
 	};
--- /lib/sound.h	2005-01-19 19:30:52.000000000 +0100
+++ /lib/sound.h	2006-05-10 18:04:20.000000000 +0200
@@ -103,9 +103,9 @@
 	long		 playSounds();		// Actually play sounds of all instances
 	long		 fillSoundBuffer(SoundList *, char *buffer, long bufferSize); // Fill sound buffer
 private:
-	int SoundMixer::Mp3Scale(mad_fixed_t sample);
-	void SoundMixer::Mp3Decompress(SoundList *sl);
-	void SoundMixer::uninitMp3Sounds(SoundList *sl);
+	int Mp3Scale(mad_fixed_t sample);
+	void Mp3Decompress(SoundList *sl);
+	void uninitMp3Sounds(SoundList *sl);
 };
 
 #endif /* _SOUND_H_ */