Index: libs/libmyth/audiooutputbase.h
===================================================================
--- libs/libmyth/audiooutputbase.h  (revision 7314)
+++ libs/libmyth/audiooutputbase.h  (working copy)
@@ -1,30 +1,28 @@
-#ifndef AUDIOOUTPUTBASE
-#define AUDIOOUTPUTBASE
+#ifndef _LIBMYTH_AUDIOOUTPUTBASE_H_
+#define _LIBMYTH_AUDIOOUTPUTBASE_H_
 
-#include <iostream>
-#include <pthread.h>
-using namespace std;
-
-#include <qstring.h>
-#include <qmutex.h>
-
 #include "audiooutput.h"
 #include "samplerate.h"
-#include "SoundTouch.h"
 
+namespace soundtouch { class SoundTouch; }
+
 #define AUDBUFSIZE 768000
 
 class AudioOutputBase : public AudioOutput
 {
  public:
-    AudioOutputBase(QString audiodevice, int laudio_bits,
-                    int laudio_channels, int laudio_samplerate,
-                    AudioOutputSource source, bool set_initial_vol);
+    AudioOutputBase(QString audiodevice,
+                    int laudio_bits,
+                    int laudio_channels,
+                    int laudio_samplerate,
+                    AudioOutputSource source,
+                    bool set_initial_vol);
     virtual ~AudioOutputBase();
 
     // reconfigure sound out for new params
     virtual void Reconfigure(int audio_bits, 
-                             int audio_channels, int audio_samplerate);
+                             int audio_channels,
+                             int audio_samplerate);
     
     // do AddSamples calls block?
     virtual void SetBlocking(bool blocking);
@@ -159,8 +157,10 @@
     long current_seconds;
     long source_bitrate;    
     
-
+ private:
+    AudioOutputBase();                                     // Not implemented
+    AudioOutputBase(const AudioOutputBase&);               // Not implemented
+    AudioOutputBase& operator=(const AudioOutputBase&);    // Not implemented
 };
 
-#endif
-
+#endif//_LIBMYTH_AUDIOOUTPUTBASE_H_
Index: libs/libmyth/audiooutputbase.cpp
===================================================================
--- libs/libmyth/audiooutputbase.cpp    (revision 7314)
+++ libs/libmyth/audiooutputbase.cpp    (working copy)
@@ -1,21 +1,16 @@
-#include <qstring.h>
-#include <cstdio>
-#include <cstdlib>
-#include <cmath>
-#include <pthread.h>
-
-using namespace std;
 #include "audiooutputbase.h"
 
-#include <iostream>
-#include <qdatetime.h>
+#include "SoundTouch.h"
+
 #include <sys/time.h>
-#include <unistd.h>
+#include <cmath>
 
-
-AudioOutputBase::AudioOutputBase(QString audiodevice, int, 
-                                 int, int,
-                                 AudioOutputSource source, bool set_initial_vol)
+AudioOutputBase::AudioOutputBase(QString audiodevice,
+                                 int,
+                                 int,
+                                 int,
+                                 AudioOutputSource source,
+                                 bool set_initial_vol)
 {
     pthread_mutex_init(&audio_buflock, NULL);
     pthread_mutex_init(&avsync_lock, NULL);