Index: mythtv/programs/mythfrontend/playbackbox.cpp
===================================================================
--- mythtv/programs/mythfrontend/playbackbox.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/playbackbox.cpp	(working copy)
@@ -1,6 +1,4 @@
 
-using namespace std;
-
 #include <QDateTime>
 #include <QDir>
 #include <QApplication>
Index: mythtv/programs/mythfrontend/statusbox.h
===================================================================
--- mythtv/programs/mythfrontend/statusbox.h	(revision 21309)
+++ mythtv/programs/mythfrontend/statusbox.h	(working copy)
@@ -1,8 +1,7 @@
 #ifndef STATUSBOX_H_
 #define STATUSBOX_H_
 
-#include <vector>
-using namespace std;
+#include <vector> // For std::vector
 
 #include "mythscreentype.h"
 
@@ -59,7 +58,7 @@
     QMap<int, QString> contentData;
     recprof2bps_t      recordingProfilesBPS;
 
-    vector<ProgramInfo *> m_expList;
+    std::vector<ProgramInfo *> m_expList;
 
     MythScreenStack *m_popupStack;
 
Index: mythtv/programs/mythfrontend/guidegrid.cpp
===================================================================
--- mythtv/programs/mythfrontend/guidegrid.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/guidegrid.cpp	(working copy)
@@ -1,14 +1,8 @@
-// c/c++
-#include <math.h>
-#include <unistd.h>
-#include <iostream>
-#include <algorithm>
-using namespace std;
 
 //qt
 #include <QApplication>
-#include <QKeyEvent>
 #include <QDateTime>
+#include <QtGlobal>
 
 // myth
 #include "mythcontext.h"
@@ -278,9 +272,9 @@
 
     fillTimeInfos();
     fillChannelInfos();
-    int maxchannel = max((int)GetChannelCount() - 1, 0);
+    int maxchannel = qMax((int)GetChannelCount() - 1, 0);
     setStartChannel((int)(m_currentStartChannel) - (int)(m_channelCount / 2));
-    m_channelCount = min(m_channelCount, maxchannel + 1);
+    m_channelCount = qMin(m_channelCount, maxchannel + 1);
     updateChannels();
 
     m_recList.FromScheduler();
@@ -658,7 +652,7 @@
 
     uint si  = m_channelInfoIdx[idx];
 
-    vector<uint64_t> sel;
+    std::vector<uint64_t> sel;
     sel.push_back( MKKEY(idx, si) );
 
     const PixmapChannel *ch = GetChannelInfo(sel[0]>>32, sel[0]&0xffff);
@@ -734,7 +728,7 @@
     DBChanList channels = ChannelUtil::GetChannels(0, true, "", m_changrpid);
     ChannelUtil::SortChannels(channels, m_channelOrdering, false);
 
-    typedef vector<uint> uint_list_t;
+    typedef std::vector<uint> uint_list_t;
     QMap<QString,uint_list_t> channum_to_index_map;
     QMap<QString,uint_list_t> callsign_to_index_map;
 
@@ -988,7 +982,7 @@
 
     ProgramList::iterator program;
     program = proglist->begin();
-    vector<ProgramInfo*> unknownlist;
+    std::vector<ProgramInfo*> unknownlist;
     bool unknown = false;
     ProgramInfo *proginfo = NULL;
     for (int x = 0; x < m_timeCount; x++)
@@ -1036,7 +1030,7 @@
         ts = ts.addSecs(5 * 60);
     }
 
-    vector<ProgramInfo*>::iterator it = unknownlist.begin();
+    std::vector<ProgramInfo*>::iterator it = unknownlist.begin();
     for (; it != unknownlist.end(); ++it)
         proglist->append(*it);
 
@@ -1467,8 +1461,8 @@
 
     int maxchannel = 0;
     fillChannelInfos();
-    maxchannel = max((int)GetChannelCount() - 1, 0);
-    m_channelCount = min(m_guideGrid->getChannelCount(), maxchannel + 1);
+    maxchannel = qMax((int)GetChannelCount() - 1, 0);
+    m_channelCount = qMin(m_guideGrid->getChannelCount(), maxchannel + 1);
 
     m_recList.FromScheduler();
     fillProgramInfos();
Index: mythtv/programs/mythfrontend/channelrecpriority.cpp
===================================================================
--- mythtv/programs/mythfrontend/channelrecpriority.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/channelrecpriority.cpp	(working copy)
@@ -1,8 +1,6 @@
 
-#include <iostream>
-#include <algorithm>
-#include <vector>
-using namespace std;
+#include <QtAlgorithms>
+#include <QVector>
 
 #include "channelrecpriority.h"
 #include "tv.h"
@@ -361,9 +359,9 @@
     }
 
     int i, j;
-    vector<RecPriorityInfo> sortingList;
+    QVector<RecPriorityInfo> sortingList;
     QMap<QString, ChannelInfo>::iterator pit;
-    vector<RecPriorityInfo>::iterator sit;
+    QVector<RecPriorityInfo>::iterator sit;
     ChannelInfo *chanInfo;
     RecPriorityInfo *recPriorityInfo;
 
@@ -379,12 +377,12 @@
     switch(m_sortType)
     {
         case byRecPriority:
-            sort(sortingList.begin(), sortingList.end(),
+            qSort(sortingList.begin(), sortingList.end(),
             channelRecPrioritySort());
             break;
         case byChannel:
         default:
-            sort(sortingList.begin(), sortingList.end(),
+            qSort(sortingList.begin(), sortingList.end(),
             channelSort());
             break;
     }
Index: mythtv/programs/mythfrontend/custompriority.cpp
===================================================================
--- mythtv/programs/mythfrontend/custompriority.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/custompriority.cpp	(working copy)
@@ -1,6 +1,3 @@
-#include <unistd.h>
-#include <iostream>
-using namespace std;
 
 #include "custompriority.h"
 
Index: mythtv/programs/mythfrontend/progfind.h
===================================================================
--- mythtv/programs/mythfrontend/progfind.h	(revision 21309)
+++ mythtv/programs/mythfrontend/progfind.h	(working copy)
@@ -4,8 +4,6 @@
 // qt
 #include <QDateTime>
 #include <QEvent>
-#include <QKeyEvent>
-#include <QPaintEvent>
 
 // myth
 #include "mythscreentype.h"
Index: mythtv/programs/mythfrontend/manualschedule.cpp
===================================================================
--- mythtv/programs/mythfrontend/manualschedule.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/manualschedule.cpp	(working copy)
@@ -1,8 +1,4 @@
 
-#include <unistd.h>
-#include <iostream>
-using namespace std;
-
 #include <QDateTime>
 
 #include "manualschedule.h"
Index: mythtv/programs/mythfrontend/viewscheduled.cpp
===================================================================
--- mythtv/programs/mythfrontend/viewscheduled.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/viewscheduled.cpp	(working copy)
@@ -1,8 +1,4 @@
-#include <stdlib.h>
 
-#include <iostream>
-using namespace std;
-
 #include <QDateTime>
 #include <QRegExp>
 
Index: mythtv/programs/mythfrontend/statusbox.cpp
===================================================================
--- mythtv/programs/mythfrontend/statusbox.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/statusbox.cpp	(working copy)
@@ -1,12 +1,6 @@
 
 #include "statusbox.h"
 
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <iostream>
-using namespace std;
-
 #include <QRegExp>
 #include <QHostAddress>
 
@@ -1198,7 +1192,7 @@
     // get free disk space
     QString hostnames;
 
-    vector<FileSystemInfo> fsInfos = RemoteGetFreeSpace();
+    std::vector<FileSystemInfo> fsInfos = RemoteGetFreeSpace();
     for (uint i=0; i<fsInfos.size(); i++)
     {
         // For a single-directory installation just display the totals
@@ -1279,7 +1273,7 @@
     long long             deletedGroupSize(0);
     int                   deletedGroupCount(0);
 
-    vector<ProgramInfo *>::iterator it;
+    std::vector<ProgramInfo *>::iterator it;
     for (it = m_expList.begin(); it != m_expList.end(); it++)
         delete *it;
     m_expList.clear();
Index: mythtv/programs/mythfrontend/programrecpriority.cpp
===================================================================
--- mythtv/programs/mythfrontend/programrecpriority.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/programrecpriority.cpp	(working copy)
@@ -1,7 +1,5 @@
 
-#include <iostream>
 #include <vector>
-using namespace std;
 
 #include <QDateTime>
 #include <QRegExp>
@@ -1015,7 +1013,7 @@
 void ProgramRecPriority::FillList(void)
 {
     int cnt = 999, rtRecPriors[11];
-    vector<ProgramInfo *> recordinglist;
+    std::vector<ProgramInfo *> recordinglist;
 
     int autopriority = gContext->GetNumSetting("AutoRecPriority", 0);
 
@@ -1024,7 +1022,7 @@
 
     RemoteGetAllScheduledRecordings(recordinglist);
 
-    vector<ProgramInfo *>::reverse_iterator pgiter = recordinglist.rbegin();
+    std::vector<ProgramInfo *>::reverse_iterator pgiter = recordinglist.rbegin();
 
     for (; pgiter != recordinglist.rend(); pgiter++)
     {
@@ -1174,9 +1172,9 @@
         m_currentItem = qVariantValue<ProgramRecPriorityInfo*>(item->GetData());
 
     int i, j;
-    vector<RecPriorityInfo> sortingList;
+    std::vector<RecPriorityInfo> sortingList;
     QMap<QString, ProgramRecPriorityInfo>::Iterator pit;
-    vector<RecPriorityInfo>::iterator sit;
+    std::vector<RecPriorityInfo>::iterator sit;
     RecPriorityInfo *recPriorityInfo;
 
     // copy m_programData into sortingList and make a copy
Index: mythtv/programs/mythfrontend/mythcontrols.cpp
===================================================================
--- mythtv/programs/mythfrontend/mythcontrols.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/mythcontrols.cpp	(working copy)
@@ -29,7 +29,6 @@
 // Qt headers
 #include <QStringList>
 #include <QApplication>
-#include <QKeyEvent>
 
 // MythTV headers
 #include <mythcontext.h>
Index: mythtv/programs/mythfrontend/progfind.cpp
===================================================================
--- mythtv/programs/mythfrontend/progfind.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/progfind.cpp	(working copy)
@@ -1,8 +1,4 @@
-#include <unistd.h>
-#include <time.h>
-#include <cassert>
 
-
 // qt
 #include <QDateTime>
 #include <QApplication>
@@ -30,9 +26,6 @@
 
 #include "progfind.h"
 
-using namespace std;
-
-
 #define LOC      QString("ProgFinder: ")
 #define LOC_ERR  QString("ProgFinder, Error: ")
 #define LOC_WARN QString("ProgFinder, Warning: ")
Index: mythtv/programs/mythfrontend/guidegrid.h
===================================================================
--- mythtv/programs/mythfrontend/guidegrid.h	(revision 21309)
+++ mythtv/programs/mythfrontend/guidegrid.h	(working copy)
@@ -3,7 +3,7 @@
 #define GUIDEGRID_H_
 
 // c++
-#include <vector>
+#include <vector> // For std::vector
 
 // qt
 #include <QString>
@@ -17,8 +17,6 @@
 #include "channelgroup.h"
 #include "channelutil.h"
 
-using namespace std;
-
 class ProgramInfo;
 class TV;
 class QTimer;
@@ -28,8 +26,8 @@
 #define MAX_DISPLAY_CHANS 12
 #define MAX_DISPLAY_TIMES 36
 
-typedef vector<PixmapChannel>   pix_chan_list_t;
-typedef vector<pix_chan_list_t> pix_chan_list_list_t;
+typedef std::vector<PixmapChannel>   pix_chan_list_t;
+typedef std::vector<pix_chan_list_t> pix_chan_list_list_t;
 
 class JumpToChannel;
 class MPUBLIC JumpToChannelListener
Index: mythtv/programs/mythfrontend/exitprompt.cpp
===================================================================
--- mythtv/programs/mythfrontend/exitprompt.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/exitprompt.cpp	(working copy)
@@ -1,4 +1,3 @@
-#include <stdlib.h>  // for system()
 
 #include <QApplication>
 
Index: mythtv/programs/mythfrontend/action.cpp
===================================================================
--- mythtv/programs/mythfrontend/action.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/action.cpp	(working copy)
@@ -23,7 +23,7 @@
  */
 
 // Qt headers
-#include <qkeysequence.h>
+#include <QKeySequence>
 
 // MythControls headers
 #include "action.h"
Index: mythtv/programs/mythfrontend/mythosdmenueditor.cpp
===================================================================
--- mythtv/programs/mythfrontend/mythosdmenueditor.cpp	(revision 21309)
+++ mythtv/programs/mythfrontend/mythosdmenueditor.cpp	(working copy)
@@ -1,28 +1,16 @@
 #define MYTHOSDMENUEDITOR_CPP
 
 /* QT includes */
-#include <qnamespace.h>
-#include <qstringlist.h>
-#include <qapplication.h>
-#include <qdom.h>
-#include <qbuttongroup.h>
-#include <qimage.h>
-#include <qevent.h>
-#include <qdir.h>
-#include <qstring.h>
+#include <QString>
+#include <QListIterator>
 
 /* MythTV includes */
 #include "mythcontext.h"
-#include "mythdbcon.h"
-#include "mythmainwindow.h"
-#include "myththemebase.h"
 #include "mythuibuttonlist.h"
 #include "mythuibutton.h"
 #include "mythosdmenueditor.h"
 #include "tvosdmenuentry.h"
 
-using namespace std;
-
 /* Static data members */
 TVState MythOSDMenuEditor::WatchingLiveTV = kState_WatchingLiveTV;
 TVState MythOSDMenuEditor::WatchingPreRecorded = kState_WatchingPreRecorded;