Index: libs/libmyth/audiooutputdx.h
===================================================================
--- libs/libmyth/audiooutputdx.h	(revision 15918)
+++ libs/libmyth/audiooutputdx.h	(working copy)
@@ -38,8 +38,7 @@
     virtual void Reconfigure(int audio_bits, 
                              int audio_channels, 
                              int audio_samplerate,
-                             bool audio_passthru,
-                             AudioCodecMode aom = AUDIOCODECMODE_NORMAL);
+                             bool audio_passthru);
     virtual void SetBlocking(bool blocking);
 
     virtual bool AddSamples(char *buffer, int samples, long long timecode);
Index: libs/libmyth/audiooutputdx.cpp
===================================================================
--- libs/libmyth/audiooutputdx.cpp	(revision 15918)
+++ libs/libmyth/audiooutputdx.cpp	(working copy)
@@ -133,8 +133,7 @@
 void AudioOutputDX::Reconfigure(int audio_bits, 
                                 int audio_channels, 
                                 int audio_samplerate,
-                                int audio_passthru,
-                                AudioCodecMode laom)
+                                int audio_passthru)
 {
     if (dsbuffer)
         DestroyDSBuffer();
Index: libs/libmyth/audiooutputbase.cpp
===================================================================
--- libs/libmyth/audiooutputbase.cpp	(revision 15918)
+++ libs/libmyth/audiooutputbase.cpp	(working copy)
@@ -14,11 +14,11 @@
 #include <qdeepcopy.h>
 
 // MythTV headers
+#include "compat.h"
 #include "audiooutputbase.h"
 #include "audiooutputdigitalencoder.h"
 #include "SoundTouch.h"
 #include "freesurround.h"
-#include "compat.h"
 
 #define LOC QString("AO: ")
 #define LOC_ERR QString("AO, ERROR: ")
Index: libs/libmyth/audiooutputdigitalencoder.cpp
===================================================================
--- libs/libmyth/audiooutputdigitalencoder.cpp	(revision 15918)
+++ libs/libmyth/audiooutputdigitalencoder.cpp	(working copy)
@@ -1,6 +1,7 @@
 // Std C headers
 #include <cstdio>
 #include <unistd.h>
+#include <string.h>
 
 #include "config.h"
 
@@ -303,7 +304,7 @@
 
     //uint32_t x = *(uint32_t*)(data+8);
     // in place swab
-    swab(data + 8, data + 8, enc_len);
+    swab((const unsigned char*)(data + 8), data + 8, enc_len);
     //VERBOSE(VB_AUDIO|VB_TIMESTAMP, 
     //        QString("DigitalEncoder::Encode swab test %1 %2")
     //        .arg(x,0,16).arg(*(uint32_t*)(data+8),0,16));
Index: libs/libmythfreesurround/freesurround.cpp
===================================================================
--- libs/libmythfreesurround/freesurround.cpp	(revision 15918)
+++ libs/libmythfreesurround/freesurround.cpp	(working copy)
@@ -21,7 +21,7 @@
 #include <cerrno>
 #include <iostream>
 #include <sstream>
-//#include "compat.h"
+#include "compat.h"
 #include "freesurround.h"
 #include "el_processor.h"
 #include <vector>
Index: libs/libmythfreesurround/libmythfreesurround.pro
===================================================================
--- libs/libmythfreesurround/libmythfreesurround.pro	(revision 15918)
+++ libs/libmythfreesurround/libmythfreesurround.pro	(working copy)
@@ -5,7 +5,7 @@
 TARGET = mythfreesurround-$$LIBVERSION
 CONFIG += thread staticlib warn_off
 
-INCLUDEPATH += ../../libs/libavcodec ../..
+INCLUDEPATH += ../../libs/libavcodec ../.. ../libmyth
 
 #build position independent code since the library is linked into a shared library
 QMAKE_CXXFLAGS += -fPIC -DPIC