Index: mythgallery/mythgallery/thumbgenerator.cpp
===================================================================
--- mythgallery/mythgallery/thumbgenerator.cpp	(revision 7330)
+++ mythgallery/mythgallery/thumbgenerator.cpp	(working copy)
@@ -19,19 +19,15 @@
  * 
  * ============================================================ */
 
-#include <qapplication.h>
-#include <qimage.h>
-#include <qobject.h>
-#include <qfileinfo.h>
-#include <qdir.h>
+#include "thumbgenerator.h"
 
 #include "mythtv/mythcontext.h"
-#include "mythtv/util.h"
-
-#include "thumbgenerator.h"
-#include "constants.h"
 #include "galleryutil.h"
 
+#include <qapplication.h>
+#include <qdir.h>
+#include <qfileinfo.h>
+
 ThumbGenerator::ThumbGenerator(QObject *parent, int w, int h)
 {
     m_parent = parent;
Index: mythgallery/mythgallery/thumbgenerator.h
===================================================================
--- mythgallery/mythgallery/thumbgenerator.h	(revision 7330)
+++ mythgallery/mythgallery/thumbgenerator.h	(working copy)
@@ -19,15 +19,15 @@
  * 
  * ============================================================ */
 
-#ifndef THUMBGENERATOR_H
-#define THUMBGENERATOR_H
+#ifndef _MYTHGALLERY_THUMBGENERATOR_H_
+#define _MYTHGALLERY_THUMBGENERATOR_H_
 
-#include <qthread.h>
+#include <qimage.h>
 #include <qstring.h>
 #include <qstringlist.h>
+#include <qthread.h>
 
-class QObject;
-class QImage;
+class QFileInfo;
 
 typedef struct {
     QImage  thumb;
@@ -62,13 +62,13 @@
     
     bool mkpath(const QString& inPath);
 
+private:
     QObject     *m_parent;
     QString      m_directory;
     bool         m_isGallery;
     QStringList  m_fileList;
     QMutex       m_mutex;
     int          m_width, m_height;
-
 };
 
-#endif /* THUMBGENERATOR_H */
+#endif//_MYTHGALLERY_THUMBGENERATOR_H_