Index: libs/libmythtv/dvbchannel.h
===================================================================
--- libs/libmythtv/dvbchannel.h	(revision 7329)
+++ libs/libmythtv/dvbchannel.h	(working copy)
@@ -4,22 +4,15 @@
  *  Copyright notice is in dvbchannel.cpp of the MythTV project.
  */
 
-#ifndef DVBCHANNEL_H
-#define DVBCHANNEL_H
+#ifndef _LIBMYTHTV_DVBCHANNEL_H_
+#define _LIBMYTHTV_DVBCHANNEL_H_
 
-#include <qobject.h>
-#include <qstring.h>
-#include <qsqldatabase.h>
-
-#include "mythcontext.h"
-#include "mythdbcon.h"
 #include "channelbase.h"
-
 #include "dvbtypes.h"
-#include "dvbdiseqc.h"
 
-class TVRec;
 class DVBCam;
+class DVBDiSEqC;
+class PMTObject;
 
 class DVBChannel : public QObject, public ChannelBase
 {
@@ -110,4 +103,4 @@
     bool              first_tune;  ///< Used to force hardware reset
 };
 
-#endif
+#endif//_LIBMYTHTV_DVBCHANNEL_H_
Index: libs/libmythtv/dvbchannel.cpp
===================================================================
--- libs/libmythtv/dvbchannel.cpp	(revision 7329)
+++ libs/libmythtv/dvbchannel.cpp	(working copy)
@@ -31,34 +31,15 @@
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include <qsqldatabase.h>
+#include "dvbchannel.h"
 
-#include <iostream>
-#include <string>
-#include <vector>
-using namespace std;
-
-#include <pthread.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/poll.h>
-#include <sys/select.h>
-#include <sys/time.h>
-#include <sys/types.h>
-
-#include "RingBuffer.h"
-#include "recorderbase.h"
+#include "dvbcam.h"
+#include "dvbdev.h"
+#include "dvbdiseqc.h"
 #include "mythcontext.h"
-#include "mythdbcon.h"
-#include "tv_rec.h"
 #include "videosource.h"
 
-#include "dvbtypes.h"
-#include "dvbdev.h"
-#include "dvbchannel.h"
-#include "dvbrecorder.h"
-#include "dvbdiseqc.h"
-#include "dvbcam.h"
+#include <fcntl.h>
 
 static uint tuned_frequency(const DVBTuning&, fe_type_t, fe_sec_tone_mode_t *);
 static void drain_dvb_events(int fd);