diff --git a/app/ConfigureFormatDialog.cpp b/app/ConfigureFormatDialog.cpp
index 9c53950..40f8f74 100644
--- a/app/ConfigureFormatDialog.cpp
+++ b/app/ConfigureFormatDialog.cpp
@@ -22,10 +22,19 @@
  * \brief    Dialog box to set the sequence resolution
  */
 
-#include "ConfigureFormatDialog.h"
+#include <QComboBox>
+#include <QDialogButtonBox>
+#include <QFileInfo>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QSpinBox>
+#include <QWidget>
+
 #include "lib/PlaYUVerFrame.h"
 #include "lib/PlaYUVerStream.h"
 
+#include "ConfigureFormatDialog.h"
 
 ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
         QDialog( parent )
@@ -225,7 +234,6 @@ ConfigureFormatDialog::ConfigureFormatDialog( QWidget *parent ) :
   framerateWidget->setContentsMargins( 0,0,0,0 );
   framerateWidget->setLayout( framerateFormatLayout );
 
-
   /*
    *  Confirmation buttons
    */
diff --git a/app/ConfigureFormatDialog.h b/app/ConfigureFormatDialog.h
index 89edce5..3eefb8d 100644
--- a/app/ConfigureFormatDialog.h
+++ b/app/ConfigureFormatDialog.h
@@ -25,18 +25,17 @@
 #ifndef __CONFIGUREFORMATDIALOG_H__
 #define __CONFIGUREFORMATDIALOG_H__
 
-#include "config.h"
+#include <QDialog>
+#include <QVector>
+#include <QString>
+
 #include "PlaYUVerAppDefs.h"
-#if( QT_VERSION_PLAYUVER == 5 )
-#include <QtWidgets>
-#elif( QT_VERSION_PLAYUVER == 4 )
-#include <QtGui>
-#endif
-#include <QtCore>
-
-class QPixmap;
-class QColor;
 
+class QComboBox;
+class QHBoxLayout;
+class QLabel;
+class QSpinBox;
+class QWidget;
 
 /**
  *
diff --git a/app/PlaYUVerSubWindowHandle.cpp b/app/PlaYUVerSubWindowHandle.cpp
index 799839e..4eb4768 100644
--- a/app/PlaYUVerSubWindowHandle.cpp
+++ b/app/PlaYUVerSubWindowHandle.cpp
@@ -22,7 +22,19 @@
  * \brief    Handle multiple sub-windows
  */
 
+#include <QAction>
+#include <QActionGroup>
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QHBoxLayout>
+#include <QMdiArea>
+#include <QMenu>
+#include <QPainter>
+#include <QSignalMapper>
+#include <QStyle>
+
 #include "PlaYUVerSubWindowHandle.h"
+
 #include "PlaYUVerApp.h"
 #include "PlaYUVerMdiSubWindow.h"
 #include "SubWindowAbstract.h"
diff --git a/app/PlaYUVerSubWindowHandle.h b/app/PlaYUVerSubWindowHandle.h
index 614995e..de36a61 100644
--- a/app/PlaYUVerSubWindowHandle.h
+++ b/app/PlaYUVerSubWindowHandle.h
@@ -25,14 +25,17 @@
 #ifndef __PLAYUVERSUBWINDOWHANDLE_H__
 #define __PLAYUVERSUBWINDOWHANDLE_H__
 
-#include "config.h"
-#include "PlaYUVerAppDefs.h"
-#if( QT_VERSION_PLAYUVER == 5 )
-#include <QtWidgets>
-#elif( QT_VERSION_PLAYUVER == 4 )
-#include <QtGui>
-#endif
+#include <QVector>
+#include <QWidget>
+#include <QString>
 
+#include "PlaYUVerAppDefs.h"
+
+class QAction;
+class QActionGroup;
+class QHBoxLayout;
+class QMenu;
+class QSignalMapper;
 
 class PlaYUVerApp;
 class SubWindowAbstract;
diff --git a/app/SubWindowAbstract.h b/app/SubWindowAbstract.h
index c8c90fb..c6d7515 100644
--- a/app/SubWindowAbstract.h
+++ b/app/SubWindowAbstract.h
@@ -63,14 +63,15 @@ private:
   PlaYUVerMdiSubWindow* m_cSubWindow;
 
 public:
-  enum SubWindowCategories
+  enum SubWindowCategory
   {
     SUBWINDOW = 0,
     VIDEO_SUBWINDOW = 1,
     VIDEO_STREAM_SUBWINDOW = 2,
     MODULE_SUBWINDOW = 4,
     PLOT_SUBWINDOW = 8,
-  };
+  }; Q_DECLARE_FLAGS( SubWindowCategories, SubWindowCategory )
+
 
   SubWindowAbstract( QWidget *, UInt );
   ~SubWindowAbstract();