diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d78450..5b36ac8 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,9 +83,11 @@ ADD_OPTION(USE_OPENCV        "Add OpenCV support"       OFF )
 ######################################################################################
 # Dependencies
 ######################################################################################
-IF(HAVE_OpenCV)
-  FIND_PACKAGE( OpenCV REQUIRED   )
-  #CMAKEDEFINE HAVE_MALLOC_H 1
+IF( USE_OPENCV )
+  FIND_PACKAGE( OpenCV QUIET )
+  IF( NOT OpenCV_FOUND)
+      SET(USE_OPENCV FALSE)
+  ENDIF()
 ENDIF()
 
 ######################################################################################
@@ -98,6 +100,10 @@ IF( USE_QT4 )
     ENDIF()
     INCLUDE( ${QT_USE_FILE} )
     ADD_DEFINITIONS( ${QT_DEFINITIONS} )
+    
+    QT4_WRAP_UI( FORMS_HEADERS_FILES ${FORMS_FILES} )
+    QT4_ADD_RESOURCES( RESOURCES_RCC_FILES ${RESOURCES_FILES} )
+    
     SET( CURR_QT_LINKER_LIBS ${QT_LIBRARIES} )
 ENDIF()
 
@@ -119,7 +125,6 @@ IF( NOT USE_QT4 )
     SET( CURR_QT_MODULES Core Gui Widgets )
 ENDIF()
 
-
 ######################################################################################
 # External Libs
 ######################################################################################
@@ -130,6 +135,12 @@ ADD_LIBRARY( Scode ${EXTERNAL_SRC}/scode/viewarea.cpp ${EXTERNAL_SRC}/scode/grid
 
 SET( LIST_EXTERNAL_LIBS Scode )
 
+######################################################################################
+# Create config.h
+######################################################################################
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+
+
 ######################################################################################
 # Target App
 ######################################################################################
diff --git a/source/ConfigureFormatDialog.cpp b/source/ConfigureFormatDialog.cpp
index fbd6307..9781458 100755
--- a/source/ConfigureFormatDialog.cpp
+++ b/source/ConfigureFormatDialog.cpp
@@ -21,8 +21,6 @@
  * \brief    Dialog box to set the sequence resolution
  */
 
-#include <QApplication>
-#include <QComboBox>
 #include "ConfigureFormatDialog.h"
 #include "InputStream.h"
 
diff --git a/source/ConfigureFormatDialog.h b/source/ConfigureFormatDialog.h
index 641c492..5b1b3ac 100755
--- a/source/ConfigureFormatDialog.h
+++ b/source/ConfigureFormatDialog.h
@@ -24,15 +24,17 @@
 #ifndef __CONFIGURERESOLUTIONDIALOG_H__
 #define __CONFIGURERESOLUTIONDIALOG_H__
 
+
+#include "config.h"
+
+#if( QT_VERSION_PLAYUVER == 5 )
+#include <QtWidgets>
+#elif( QT_VERSION_PLAYUVER == 4 )
+#include <QtGui>
+#endif
 #include <QtCore>
-#include <QWidget>
-#include <QDialog>
-#include <QDialogButtonBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QComboBox>
-#include <QSpinBox>
+
+
 #include "TypeDef.h"
 
 class QPixmap;
diff --git a/source/ImageInterface.cpp b/source/ImageInterface.cpp
index 7891c30..3427a4a 100644
--- a/source/ImageInterface.cpp
+++ b/source/ImageInterface.cpp
@@ -21,12 +21,6 @@
  * \brief    Sub windows handling
  */
 
-#include <QtWidgets>
-#include <QWidget>
-#include <QPixmap>
-#include <QBitmap>
-#include <QColor>
-
 #include "ConfigureFormatDialog.h"
 #include "ImageInterface.h"
 #include "viewarea.h"
diff --git a/source/ImageInterface.h b/source/ImageInterface.h
index 8566d7e..8ab247f 100644
--- a/source/ImageInterface.h
+++ b/source/ImageInterface.h
@@ -24,14 +24,14 @@
 #ifndef __IMAGEINTERFACE_H__
 #define __IMAGEINTERFACE_H__
 
-#include <QMdiSubWindow>
-#include <QScrollArea>
-#include <QLabel>
-#include <QMdiArea>
-#include <QWidget>
-//#include <QPixmap>
-//#include <QBitmap>
-//#include <QColor>
+
+#include "config.h"
+
+#if( QT_VERSION_PLAYUVER == 5 )
+#include <QtWidgets>
+#elif( QT_VERSION_PLAYUVER == 4 )
+#include <QtGui>
+#endif
 
 
 #include "TypeDef.h"
diff --git a/source/InputStream.cpp b/source/InputStream.cpp
index dcb92bc..42594c3 100755
--- a/source/InputStream.cpp
+++ b/source/InputStream.cpp
@@ -23,7 +23,6 @@
 
 #include <cstdio>
 
-#include <QtCore>
 #include <QtDebug>
 
 #include "InputStream.h"
diff --git a/source/InputStream.h b/source/InputStream.h
index a85ac10..8fe5e1f 100755
--- a/source/InputStream.h
+++ b/source/InputStream.h
@@ -24,6 +24,8 @@
 #ifndef __INPUTSTREAM_H__
 #define __INPUTSTREAM_H__
 
+#include "config.h"
+
 #include <iostream>
 #include <cstdio>
 
diff --git a/source/LibMemAlloc.h b/source/LibMemAlloc.h
index e131e3d..62512d0 100644
--- a/source/LibMemAlloc.h
+++ b/source/LibMemAlloc.h
@@ -24,6 +24,8 @@
 #ifndef __LIBMEMALLOC_H__
 #define __LIBMEMALLOC_H__
 
+#include "config.h"
+
 #include <cstdlib>
 #include <cstring>
 #include "TypeDef.h"
diff --git a/source/TypeDef.h b/source/TypeDef.h
index 05b046d..94959e6 100644
--- a/source/TypeDef.h
+++ b/source/TypeDef.h
@@ -24,6 +24,8 @@
 #ifndef __TYPEDEF_H__
 #define __TYPEDEF_H__
 
+#include "config.h"
+
 // ====================================================================================================================
 // Basic type redefinition
 // ====================================================================================================================
@@ -91,4 +93,14 @@ typedef UChar Pel;        ///< 8-bit pixel type
 #define xFree( ptr )                free     ( ptr )
 #endif
 
+
+// ====================================================================================================================
+// Qt functions
+// ====================================================================================================================
+
+#if( QT_VERSION_PLAYUVER == 4 )
+#define QStringLiteral QString::fromUtf8
+#endif
+
+
 #endif // __TYPEDEF_H__
diff --git a/source/plaYUVerApp.cpp b/source/plaYUVerApp.cpp
index 53cbb9b..3a8d35f 100644
--- a/source/plaYUVerApp.cpp
+++ b/source/plaYUVerApp.cpp
@@ -21,8 +21,11 @@
  * \brief    Main definition of the plaYUVerApp app
  */
 
+#if( QT_VERSION_PLAYUVER == 5 )
 #include <QtWidgets>
-#include <QMdiArea>
+#elif( QT_VERSION_PLAYUVER == 4 )
+#include <QtGui>
+#endif
 #include <QtDebug>
 
 #include "TypeDef.h"
diff --git a/source/plaYUVerApp.h b/source/plaYUVerApp.h
index 56caf93..944ef16 100644
--- a/source/plaYUVerApp.h
+++ b/source/plaYUVerApp.h
@@ -24,6 +24,8 @@
 #ifndef __PLAYUVERAPP_H__
 #define __PLAYUVERAPP_H__
 
+#include "config.h"
+
 #include <QMainWindow>
 #include "TypeDef.h"
 
diff --git a/source/plaYUVerSettings.cpp b/source/plaYUVerSettings.cpp
index aa923c3..a61c23c 100755
--- a/source/plaYUVerSettings.cpp
+++ b/source/plaYUVerSettings.cpp
@@ -21,8 +21,6 @@
  * \brief    plaYUVer app settings
  */
 
-#include <QDir>
-
 #include "plaYUVerSettings.h"
 
 namespace plaYUVer
diff --git a/source/plaYUVerSettings.h b/source/plaYUVerSettings.h
index ed9f091..c389864 100755
--- a/source/plaYUVerSettings.h
+++ b/source/plaYUVerSettings.h
@@ -24,14 +24,10 @@
 #ifndef __PLAYUVERSETTINGS_H__
 #define __PLAYUVERSETTINGS_H__
 
-#include <QSettings>
-#include <QString>
-#include <QSize>
-#include <QPoint>
-#include <QColor>
-#include <QString>
+#include "config.h"
+
+#include <QtCore>
 
-#include <QBitArray>
 #include "gridmanager.h"
 
 namespace plaYUVer