Index: libs/libmyth/audiooutputbase.h
===================================================================
--- libs/libmyth/audiooutputbase.h	(revision 7311)
+++ libs/libmyth/audiooutputbase.h	(working copy)
@@ -1,30 +1,25 @@
-#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,
+                    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 +154,10 @@
     long current_seconds;
     long source_bitrate;    
     
-
+ private:
+    AudioOutputBase();
+    AudioOutputBase(const AudioOutputBase&);
+    AudioOutputBase& operator=(const AudioOutputBase&);
 };
 
-#endif
-
+#endif//_LIBMYTH_AUDIOOUTPUTBASE_H_
Index: libs/libmyth/util.h
===================================================================
--- libs/libmyth/util.h	(revision 7311)
+++ libs/libmyth/util.h	(working copy)
@@ -1,20 +1,19 @@
-#ifndef UTIL_H_
-#define UTIL_H_
+#ifndef _LIBMYTH_UTIL_H_
+#define _LIBMYTH_UTIL_H_
 
-#include <qsocket.h>
-#include <qstringlist.h>
-#include <qdatetime.h>
 #include <qcolor.h>
+#include <qdatetime.h>
+#include <qstringlist.h>
 
-#include <time.h>
-
 #define MYTH_SYSTEM_DONT_BLOCK_LIRC          0x1 //< myth_system() flag to avoid blocking
 #define MYTH_SYSTEM_DONT_BLOCK_JOYSTICK_MENU 0x2 //< myth_system() flag to avoid blocking
 
-class QPixmap;
+class QFont;
 class QImage;
 class QPainter;
-class QFont;
+class QPixmap;
+class QSocket;
+class QSocketDevice;
 
 class MythTimer
 {
@@ -75,4 +74,4 @@
 bool getUptime(time_t &uptime);
 bool getMemStats(int &totalMB, int &freeMB, int &totalVM, int &freeVM);
 
-#endif // UTIL_H_
+#endif//_LIBMYTH_UTIL_H_
Index: libs/libmyth/audiooutputalsa.cpp
===================================================================
--- libs/libmyth/audiooutputalsa.cpp	(revision 7311)
+++ libs/libmyth/audiooutputalsa.cpp	(working copy)
@@ -13,8 +13,7 @@
 AudioOutputALSA::AudioOutputALSA(QString audiodevice, int laudio_bits, 
                                  int laudio_channels, int laudio_samplerate,
                                  AudioOutputSource source, bool set_initial_vol)
-              : AudioOutputBase(audiodevice, laudio_bits,
-                              laudio_channels, laudio_samplerate, source, set_initial_vol)
+              : AudioOutputBase(audiodevice, source, set_initial_vol)
 {
     // our initalisation
     pcm_handle = NULL;
Index: libs/libmyth/audiooutputca.cpp
===================================================================
--- libs/libmyth/audiooutputca.cpp	(revision 7311)
+++ libs/libmyth/audiooutputca.cpp	(working copy)
@@ -39,9 +39,7 @@
 AudioOutputCA::AudioOutputCA(QString audiodevice, int laudio_bits, 
                              int laudio_channels, int laudio_samplerate,
                              AudioOutputSource source, bool set_initial_vol)
-             : AudioOutputBase(audiodevice, laudio_bits,
-                               laudio_channels, laudio_samplerate,
-                               source, set_initial_vol)
+             : AudioOutputBase(audiodevice, source, set_initial_vol)
 {
     // Create private data
     coreaudio_data = new CoreAudioData();
Index: libs/libmyth/themedmenu.h
===================================================================
--- libs/libmyth/themedmenu.h	(revision 7311)
+++ libs/libmyth/themedmenu.h	(working copy)
@@ -1,16 +1,8 @@
-#ifndef THEMEDMENU_H_
-#define THEMEDMENU_H_
+#ifndef _LIBMYTH_THEMEDMENU_H_
+#define _LIBMYTH_THEMEDMENU_H_
 
-#include <qvaluelist.h>
-#include <qdom.h>
-#include <qmap.h>
-
 #include "mythdialogs.h"
 
-#include <vector>
-
-using namespace std;
-
 class ThemedMenuPrivate;
 
 class ThemedMenu : public MythDialog
@@ -43,4 +35,4 @@
     ThemedMenuPrivate *d;
 };
 
-#endif
+#endif//_LIBMYTH_THEMEDMENU_H_
Index: libs/libmyth/volumebase.cpp
===================================================================
--- libs/libmyth/volumebase.cpp	(revision 7311)
+++ libs/libmyth/volumebase.cpp	(working copy)
@@ -1,10 +1,9 @@
-#include <qstring.h>
-#include <cstdio>
-#include <cstdlib>
-
-using namespace std;
 #include "volumebase.h"
 
+#include "mythcontext.h"
+
+#include <qstring.h>
+
 VolumeBase::VolumeBase() 
 {
     volume = 80;
Index: libs/libmyth/audiooutputjack.cpp
===================================================================
--- libs/libmyth/audiooutputjack.cpp	(revision 7311)
+++ libs/libmyth/audiooutputjack.cpp	(working copy)
@@ -24,8 +24,7 @@
 AudioOutputJACK::AudioOutputJACK(QString audiodevice, int laudio_bits, 
                                  int laudio_channels, int laudio_samplerate,
                                  AudioOutputSource source, bool set_initial_vol)
-               : AudioOutputBase(audiodevice, laudio_bits, laudio_channels,
-                                 laudio_samplerate, source, set_initial_vol)
+               : AudioOutputBase(audiodevice, source, set_initial_vol)
 {
     // Initialise the Jack output layer
     JACK_Init();
Index: libs/libmyth/audiooutputbase.cpp
===================================================================
--- libs/libmyth/audiooutputbase.cpp	(revision 7311)
+++ libs/libmyth/audiooutputbase.cpp	(working copy)
@@ -1,21 +1,13 @@
-#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,
+                                 AudioOutputSource source,
+                                 bool set_initial_vol)
 {
     pthread_mutex_init(&audio_buflock, NULL);
     pthread_mutex_init(&avsync_lock, NULL);
Index: libs/libmyth/util.cpp
===================================================================
--- libs/libmyth/util.cpp	(revision 7311)
+++ libs/libmyth/util.cpp	(working copy)
@@ -1,3 +1,5 @@
+#include "util.h"
+
 // C++ headers
 #include <iostream>
 using namespace std;
@@ -28,11 +30,11 @@
 #include <qpainter.h>
 #include <qpixmap.h>
 #include <qfont.h>
+#include <qsocket.h>
 
 // Myth headers
 #include "mythconfig.h"
 #include "exitcodes.h"
-#include "util.h"
 #include "mythcontext.h"
 
 #ifdef CONFIG_DARWIN
Index: libs/libmyth/themedmenu.cpp
===================================================================
--- libs/libmyth/themedmenu.cpp	(revision 7311)
+++ libs/libmyth/themedmenu.cpp	(working copy)
@@ -1,30 +1,14 @@
-#include <qlayout.h>
-#include <qpushbutton.h>
-#include <qbuttongroup.h>
-#include <qlabel.h>
-#include <qcursor.h>
-#include <qapplication.h>
-#include <qpixmap.h>
-#include <qbitmap.h>
-#include <qpainter.h>
-#include <qimage.h>
-#include <qdir.h>
-#include <qdom.h>
+#include "themedmenu.h"
 
-#include <iostream>
-#include <cmath>
-using namespace std;
-
+#include "dialogbox.h"
 #include "exitcodes.h"
-#include "themedmenu.h"
+#include "lcddevice.h"
 #include "mythcontext.h"
-#include "util.h"
 #include "mythplugin.h"
-#include "dialogbox.h"
-#include "lcddevice.h"
 
+#include <cmath>
+#include <qbitmap.h>
 
-
 extern QMap<QString, fontProp> globalFontMap;
 
 struct TextAttributes
Index: libs/libmyth/xmlparse.h
===================================================================
--- libs/libmyth/xmlparse.h	(revision 7311)
+++ libs/libmyth/xmlparse.h	(working copy)
@@ -1,12 +1,7 @@
-#ifndef XMLPARSE_H_
-#define XMLPARSE_H_
+#ifndef _LIBMYTH_XMLPARSE_H_
+#define _LIBMYTH_XMLPARSE_H_
 
 #include "uitypes.h"
-#include "mythcontext.h"
-#include <qimage.h>
-#include <qrect.h>
-#include <qlabel.h>
-#include <qdom.h>
 
 class XMLParse
 {
@@ -65,4 +60,4 @@
     QString fontSizeType;
 };
 
-#endif
+#endif//_LIBMYTH_XMLPARSE_H_
Index: libs/libmyth/audiooutputoss.cpp
===================================================================
--- libs/libmyth/audiooutputoss.cpp	(revision 7311)
+++ libs/libmyth/audiooutputoss.cpp	(working copy)
@@ -28,8 +28,7 @@
 AudioOutputOSS::AudioOutputOSS(QString audiodevice, int laudio_bits, 
                                int laudio_channels, int laudio_samplerate,
                                AudioOutputSource source, bool set_initial_vol)
-              : AudioOutputBase(audiodevice, laudio_bits,
-                              laudio_channels, laudio_samplerate, source, set_initial_vol)
+              : AudioOutputBase(audiodevice, source, set_initial_vol)
 {
     // our initalisation
     audiofd = -1;
Index: libs/libmyth/volumebase.h
===================================================================
--- libs/libmyth/volumebase.h	(revision 7311)
+++ libs/libmyth/volumebase.h	(working copy)
@@ -1,12 +1,6 @@
-#ifndef VOLUMEBASE
-#define VOLUMEBASE
+#ifndef _LIBMYTH_VOLUMEBASE_H_
+#define _LIBMYTH_VOLUMEBASE_H_
 
-#include <iostream>
-using namespace std;
-
-#include <qstring.h>
-#include "mythcontext.h"
-
 typedef enum {
     MUTE_OFF = 0,
     MUTE_LEFT,
@@ -45,5 +39,4 @@
 
 };
 
-#endif
-
+#endif//_LIBMYTH_VOLUMEBASE_H_
Index: libs/libmyth/dialogbox.cpp
===================================================================
--- libs/libmyth/dialogbox.cpp	(revision 7311)
+++ libs/libmyth/dialogbox.cpp	(working copy)
@@ -1,3 +1,5 @@
+#include "dialogbox.h"
+
 #include <iostream>
 using namespace std;
 
@@ -8,7 +10,6 @@
 #include <qcursor.h>
 #include <qapplication.h>
 
-#include "dialogbox.h"
 #include "mythcontext.h"
 #include "mythwidgets.h"
 
@@ -56,6 +57,11 @@
     box->addWidget(button, 0);
 }
 
+bool DialogBox::getCheckBoxState(void)
+{
+    return checkbox ? checkbox->isChecked() : false;
+}
+
 void DialogBox::buttonPressed(int which)
 {
     if (buttongroup->find(which) != checkbox)
Index: libs/libmyth/audiooutputarts.cpp
===================================================================
--- libs/libmyth/audiooutputarts.cpp	(revision 7311)
+++ libs/libmyth/audiooutputarts.cpp	(working copy)
@@ -10,8 +10,7 @@
 AudioOutputARTS::AudioOutputARTS(QString audiodevice, int audio_bits, 
                                  int audio_channels, int audio_samplerate,
                                  AudioOutputSource source, bool set_initial_vol)
-              : AudioOutputBase(audiodevice, audio_bits, audio_channels,
-                                audio_samplerate, source, set_initial_vol)
+              : AudioOutputBase(audiodevice, source, set_initial_vol)
 {
     // our initalisation
     pcm_handle = NULL;
Index: libs/libmyth/xmlparse.cpp
===================================================================
--- libs/libmyth/xmlparse.cpp	(revision 7311)
+++ libs/libmyth/xmlparse.cpp	(working copy)
@@ -1,13 +1,11 @@
-#include <iostream>
-using namespace std;
+#include "xmlparse.h"
 
-#include <cmath>
+#include "mythcontext.h"
+#include "uilistbtntype.h"
 
+#include <cmath>
 #include <qapplication.h>
 
-#include "uilistbtntype.h"
-#include "xmlparse.h"
-
 QMap<QString, fontProp> globalFontMap;
 
 XMLParse::XMLParse(void)
Index: libs/libmyth/dialogbox.h
===================================================================
--- libs/libmyth/dialogbox.h	(revision 7311)
+++ libs/libmyth/dialogbox.h	(working copy)
@@ -1,13 +1,12 @@
-#ifndef DIALOGBOX_H_
-#define DIALOGBOX_H_
+#ifndef _LIBMYTH_DIALOGBOX_H_
+#define _LIBMYTH_DIALOGBOX_H_
 
-#include <qcheckbox.h>
-
 #include "mythdialogs.h"
 
-class QVBoxLayout;
 class QButtonGroup;
+class QCheckBox;
 class QString;
+class QVBoxLayout;
 
 class DialogBox : public MythDialog
 {
@@ -18,16 +17,15 @@
 
     void AddButton(const QString &title);
 
-    bool getCheckBoxState(void) {  if (checkbox) return checkbox->isChecked();
-                                   return false; }
+    bool getCheckBoxState(void);
+
   protected slots:
     void buttonPressed(int which);
 
   private:
     QVBoxLayout *box;
     QButtonGroup *buttongroup;
-
     QCheckBox *checkbox;
 };
 
-#endif
+#endif//_LIBMYTH_DIALOGBOX_H_
Index: libs/libmyth/audiooutputnull.cpp
===================================================================
--- libs/libmyth/audiooutputnull.cpp	(revision 7311)
+++ libs/libmyth/audiooutputnull.cpp	(working copy)
@@ -19,8 +19,7 @@
 AudioOutputNULL::AudioOutputNULL(QString audiodevice, int laudio_bits, 
                                  int laudio_channels, int laudio_samplerate,
                                  AudioOutputSource source, bool set_initial_vol)
-               : AudioOutputBase(audiodevice, laudio_bits, laudio_channels,
-                                 laudio_samplerate, source, set_initial_vol)
+               : AudioOutputBase(audiodevice, source, set_initial_vol)
 {
     locked_audio_channels = laudio_channels;
     locked_audio_bits = laudio_bits;
Index: libs/libmyth/mythcontext.cpp
===================================================================
--- libs/libmyth/mythcontext.cpp	(revision 7311)
+++ libs/libmyth/mythcontext.cpp	(working copy)
@@ -1,3 +1,5 @@
+#include "mythcontext.h"
+
 #include <qapplication.h>
 #include <qsqldatabase.h>
 #include <qimage.h>
@@ -10,6 +12,7 @@
 #include <qnetwork.h>
 #include <qwaitcondition.h>
 
+#include <qsocket.h>
 #include <qsocketdevice.h>
 #include <qhostaddress.h>
 
@@ -18,7 +21,6 @@
 #include <queue>
 
 #include "config.h"
-#include "mythcontext.h"
 #include "oldsettings.h"
 #include "themedmenu.h"
 #include "util.h"
Index: programs/mythbackend/filetransfer.cpp
===================================================================
--- programs/mythbackend/filetransfer.cpp	(revision 7311)
+++ programs/mythbackend/filetransfer.cpp	(working copy)
@@ -1,5 +1,6 @@
 #include <qapplication.h>
 #include <qdatetime.h>
+#include <qsocket.h>
 
 #include <unistd.h>
 #include <iostream>