diff -U 3 -H -d -r -N -- 1/Source/QtDialog/AddCacheEntry.cxx 2/Source/QtDialog/AddCacheEntry.cxx
--- 1/Source/QtDialog/AddCacheEntry.cxx	2013-03-11 03:05:13.048935058 +0600
+++ 2/Source/QtDialog/AddCacheEntry.cxx	2013-03-20 16:23:06.549002107 +0600
@@ -11,8 +11,8 @@
 ============================================================================*/
 
 #include "AddCacheEntry.h"
-#include <QMetaProperty>
-#include <QCompleter>
+#include <QtCore/QMetaProperty>
+#include <QtWidgets/QCompleter>
 
 static const int NumTypes = 4;
 static const QByteArray TypeStrings[NumTypes] =
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/AddCacheEntry.h 2/Source/QtDialog/AddCacheEntry.h
--- 1/Source/QtDialog/AddCacheEntry.h	2013-03-20 16:10:13.140235303 +0600
+++ 2/Source/QtDialog/AddCacheEntry.h	2013-03-20 16:20:53.795265134 +0600
@@ -13,9 +13,9 @@
 #ifndef AddCacheEntry_h
 #define AddCacheEntry_h
 
-#include <QWidget>
-#include <QCheckBox>
-#include <QStringList>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QCheckBox>
+#include <QtCore/QStringList>
 
 #include "QCMake.h"
 #include "ui_AddCacheEntry.h"
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/CMakeSetup.cxx 2/Source/QtDialog/CMakeSetup.cxx
--- 1/Source/QtDialog/CMakeSetup.cxx	2013-03-20 16:15:24.325831569 +0600
+++ 2/Source/QtDialog/CMakeSetup.cxx	2013-03-20 16:16:14.092995959 +0600
@@ -10,10 +10,10 @@
   See the License for more information.
 ============================================================================*/
 #include "QCMake.h"  // include to disable MS warnings
-#include <QApplication>
-#include <QDir>
-#include <QTranslator>
-#include <QLocale>
+#include <QtWidgets/QApplication>
+#include <QtCore/QDir>
+#include <QtCore/QTranslator>
+#include <QtCore/QLocale>
 #include "QMacInstallDialog.h"
 #include "CMakeSetupDialog.h"
 #include "cmDocumentation.h"
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/CMakeSetupDialog.cxx 2/Source/QtDialog/CMakeSetupDialog.cxx
--- 1/Source/QtDialog/CMakeSetupDialog.cxx	2013-03-11 03:05:13.062934848 +0600
+++ 2/Source/QtDialog/CMakeSetupDialog.cxx	2013-03-20 16:26:08.230634859 +0600
@@ -11,22 +11,22 @@
 ============================================================================*/
 
 #include "CMakeSetupDialog.h"
-#include <QFileDialog>
-#include <QProgressBar>
-#include <QMessageBox>
-#include <QStatusBar>
-#include <QToolButton>
-#include <QDialogButtonBox>
-#include <QCloseEvent>
-#include <QCoreApplication>
-#include <QSettings>
-#include <QMenu>
-#include <QMenuBar>
-#include <QDragEnterEvent>
-#include <QMimeData>
-#include <QUrl>
-#include <QShortcut>
-#include <QKeySequence>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtGui/QCloseEvent>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QSettings>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtGui/QDragEnterEvent>
+#include <QtCore/QMimeData>
+#include <QtCore/QUrl>
+#include <QtWidgets/QShortcut>
+#include <QtGui/QKeySequence>
 #include <QMacInstallDialog.h>
 
 #include "QCMake.h"
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/CMakeSetupDialog.h 2/Source/QtDialog/CMakeSetupDialog.h
--- 1/Source/QtDialog/CMakeSetupDialog.h	2013-03-11 03:05:13.047935073 +0600
+++ 2/Source/QtDialog/CMakeSetupDialog.h	2013-03-20 16:04:59.812280156 +0600
@@ -14,9 +14,9 @@
 #define CMakeSetupDialog_h
 
 #include "QCMake.h"
-#include <QMainWindow>
-#include <QThread>
-#include <QEventLoop>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QThread>
+#include <QtCore/QEventLoop>
 #include "ui_CMakeSetupDialog.h"
 
 class QCMakeThread;
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/Compilers.h 2/Source/QtDialog/Compilers.h
--- 1/Source/QtDialog/Compilers.h	2013-03-11 03:05:13.047935073 +0600
+++ 2/Source/QtDialog/Compilers.h	2013-03-20 16:18:23.343816702 +0600
@@ -3,7 +3,7 @@
 #ifndef COMPILERS_HPP
 #define COMPILERS_HPP
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <ui_Compilers.h>
 
 class Compilers : public QWidget, public Ui::Compilers
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/FirstConfigure.cxx 2/Source/QtDialog/FirstConfigure.cxx
--- 1/Source/QtDialog/FirstConfigure.cxx	2013-03-11 03:05:13.048935058 +0600
+++ 2/Source/QtDialog/FirstConfigure.cxx	2013-03-20 16:28:22.847501318 +0600
@@ -2,10 +2,10 @@
 #include "FirstConfigure.h"
 #include "Compilers.h"
 
-#include <QSettings>
-#include <QRadioButton>
-#include <QComboBox>
-#include <QVBoxLayout>
+#include <QtCore/QSettings>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QVBoxLayout>
 
 
 StartCompilerSetup::StartCompilerSetup(QWidget* p)
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/FirstConfigure.h 2/Source/QtDialog/FirstConfigure.h
--- 1/Source/QtDialog/FirstConfigure.h	2013-03-11 03:05:13.048935058 +0600
+++ 2/Source/QtDialog/FirstConfigure.h	2013-03-20 16:03:13.601770728 +0600
@@ -2,8 +2,8 @@
 #ifndef FirstConfigure_h
 #define FirstConfigure_h
 
-#include <QWizard>
-#include <QWizardPage>
+#include <QtWidgets/QWizard>
+#include <QtWidgets/QWizardPage>
 #include "ui_Compilers.h"
 #include "ui_CrossCompiler.h"
 
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/QCMakeCacheView.cxx 2/Source/QtDialog/QCMakeCacheView.cxx
--- 1/Source/QtDialog/QCMakeCacheView.cxx	2013-03-11 03:05:13.047935073 +0600
+++ 2/Source/QtDialog/QCMakeCacheView.cxx	2013-03-20 16:31:13.274564107 +0600
@@ -12,14 +12,14 @@
 
 #include "QCMakeCacheView.h"
 
-#include <QHBoxLayout>
-#include <QHeaderView>
-#include <QEvent>
-#include <QStyle>
-#include <QKeyEvent>
-#include <QSortFilterProxyModel>
-#include <QMetaProperty>
-#include <QApplication>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QHeaderView>
+#include <QtCore/QEvent>
+#include <QtWidgets/QStyle>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QMetaProperty>
+#include <QtWidgets/QApplication>
 
 #include "QCMakeWidgets.h"
 
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/QCMakeCacheView.h 2/Source/QtDialog/QCMakeCacheView.h
--- 1/Source/QtDialog/QCMakeCacheView.h	2013-03-11 03:05:13.047935073 +0600
+++ 2/Source/QtDialog/QCMakeCacheView.h	2013-03-20 16:17:58.591235013 +0600
@@ -14,10 +14,10 @@
 #define QCMakeCacheView_h
 
 #include "QCMake.h"
-#include <QTreeView>
-#include <QSet>
-#include <QStandardItemModel>
-#include <QItemDelegate>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QSet>
+#include <QtGui/QStandardItemModel>
+#include <QtWidgets/QItemDelegate>
 
 class QSortFilterProxyModel;
 class QCMakeCacheModel;
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/QCMake.cxx 2/Source/QtDialog/QCMake.cxx
--- 1/Source/QtDialog/QCMake.cxx	2013-03-11 03:05:13.063934833 +0600
+++ 2/Source/QtDialog/QCMake.cxx	2013-03-20 16:29:22.066750609 +0600
@@ -12,8 +12,8 @@
 
 #include "QCMake.h"
 
-#include <QDir>
-#include <QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QCoreApplication>
 
 #include "cmake.h"
 #include "cmCacheManager.h"
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/QCMake.h 2/Source/QtDialog/QCMake.h
--- 1/Source/QtDialog/QCMake.h	2013-03-20 16:11:32.051885258 +0600
+++ 2/Source/QtDialog/QCMake.h	2013-03-20 16:11:33.854917616 +0600
@@ -17,13 +17,13 @@
 #pragma warning ( disable : 4512 )
 #endif
 
-#include <QObject>
-#include <QString>
-#include <QVariant>
-#include <QList>
-#include <QStringList>
-#include <QMetaType>
-#include <QAtomicInt>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVariant>
+#include <QtCore/QList>
+#include <QtCore/QStringList>
+#include <QtCore/QMetaType>
+#include <QtCore/QAtomicInt>
 
 class cmake;
 
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/QCMakeWidgets.cxx 2/Source/QtDialog/QCMakeWidgets.cxx
--- 1/Source/QtDialog/QCMakeWidgets.cxx	2013-03-11 03:05:13.062934848 +0600
+++ 2/Source/QtDialog/QCMakeWidgets.cxx	2013-03-20 16:32:27.708499409 +0600
@@ -12,11 +12,11 @@
 
 #include "QCMakeWidgets.h"
 
-#include <QDirModel>
-#include <QFileInfo>
-#include <QFileDialog>
-#include <QToolButton>
-#include <QResizeEvent>
+#include <QtWidgets/QDirModel>
+#include <QtCore/QFileInfo>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QToolButton>
+#include <QtGui/QResizeEvent>
 
 QCMakeFileEditor::QCMakeFileEditor(QWidget* p, const QString& var)
   : QLineEdit(p), Variable(var)
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/QCMakeWidgets.h 2/Source/QtDialog/QCMakeWidgets.h
--- 1/Source/QtDialog/QCMakeWidgets.h	2013-03-11 03:05:13.047935073 +0600
+++ 2/Source/QtDialog/QCMakeWidgets.h	2013-03-20 16:05:48.379335623 +0600
@@ -13,9 +13,9 @@
 #ifndef QCMakeWidgets_h
 #define QCMakeWidgets_h
 
-#include <QLineEdit>
-#include <QComboBox>
-#include <QCompleter>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QCompleter>
 class QToolButton;
 
 // common widgets for Qt based CMake
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/QMacInstallDialog.cxx 2/Source/QtDialog/QMacInstallDialog.cxx
--- 1/Source/QtDialog/QMacInstallDialog.cxx	2013-03-11 03:05:13.062934848 +0600
+++ 2/Source/QtDialog/QMacInstallDialog.cxx	2013-03-20 16:32:57.367690882 +0600
@@ -1,8 +1,8 @@
 #include "QMacInstallDialog.h"
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include "cmSystemTools.h"
 #include <iostream>
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 #include "ui_MacInstallDialog.h"
 
 class QMacInstallDialog::QMacInstallDialogInternals : public Ui::Dialog
diff -U 3 -H -d -r -N -- 1/Source/QtDialog/QMacInstallDialog.h 2/Source/QtDialog/QMacInstallDialog.h
--- 1/Source/QtDialog/QMacInstallDialog.h	2013-03-11 03:05:13.047935073 +0600
+++ 2/Source/QtDialog/QMacInstallDialog.h	2013-03-20 16:22:17.036847308 +0600
@@ -1,6 +1,6 @@
 #ifndef QMacInstallDialog_h
 #define QMacInstallDialog_h
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QMacInstallDialog : public QDialog
 {