From 01c71acc68c90e7f4220291459ee8dfec9062ce0 Mon Sep 17 00:00:00 2001
From: Anthony GEAY <anthony.geay@edf.fr>
Date: Mon, 21 Sep 2020 22:00:05 +0200
Subject: [PATCH] u20.04 porting

---
 src/CAF/CAF_Tools.h                                  |  2 +-
 src/CAM/CAM_Application.cxx                          |  2 +-
 src/CAM/CAM_Module.h                                 |  4 ++--
 src/Event/SALOME_Event.cxx                           |  2 +-
 src/Event/SALOME_EventFilter.cxx                     |  2 +-
 src/GLViewer/GLViewer_AspectLine.h                   |  2 +-
 src/GLViewer/GLViewer_BaseObjects.h                  |  2 +-
 src/GLViewer/GLViewer_Compass.h                      |  2 +-
 src/GLViewer/GLViewer_Drawer.cxx                     |  6 +++---
 src/GLViewer/GLViewer_Drawer.h                       |  4 ++--
 src/GLViewer/GLViewer_Text.cxx                       |  4 ++--
 src/GLViewer/GLViewer_Text.h                         |  4 ++--
 src/GLViewer/GLViewer_ToolTip.cxx                    |  6 +++---
 src/GLViewer/GLViewer_ViewFrame.cxx                  |  8 ++++----
 src/GLViewer/GLViewer_ViewPort.cxx                   |  6 +++---
 src/GLViewer/GLViewer_ViewPort.h                     |  2 +-
 src/GLViewer/GLViewer_ViewPort2d.cxx                 |  6 +++---
 src/GLViewer/GLViewer_ViewPort2d.h                   |  2 +-
 src/GLViewer/GLViewer_Viewer.cxx                     |  6 +++---
 src/GLViewer/GLViewer_Viewer.h                       |  2 +-
 src/GLViewer/GLViewer_Viewer2d.cxx                   |  2 +-
 src/GLViewer/GLViewer_Widget.cxx                     |  6 +++---
 src/GraphicsView/GraphicsView_ViewFrame.cxx          |  6 +++---
 src/GraphicsView/GraphicsView_ViewPort.cxx           |  4 ++--
 src/GraphicsView/GraphicsView_ViewTransformer.h      |  2 +-
 src/GraphicsView/GraphicsView_Viewer.cxx             |  4 ++--
 src/GraphicsView/GraphicsView_Viewer.h               |  2 +-
 src/GuiHelpers/StandardApp_Module.cxx                |  2 +-
 src/HelpBrowser/qtsingleapplication.h                |  2 +-
 .../ImageComposer_ColorMaskOperator.cxx              |  6 +++---
 src/ImageComposer/ImageComposer_ColorMaskOperator.h  |  2 +-
 src/ImageComposer/ImageComposer_CropOperator.cxx     |  4 ++--
 src/ImageComposer/ImageComposer_CropOperator.h       |  4 ++--
 src/ImageComposer/ImageComposer_CutOperator.cxx      |  4 ++--
 src/ImageComposer/ImageComposer_CutOperator.h        |  2 +-
 src/ImageComposer/ImageComposer_FuseOperator.cxx     |  4 ++--
 src/ImageComposer/ImageComposer_FuseOperator.h       |  2 +-
 src/ImageComposer/ImageComposer_Image.cxx            |  2 +-
 src/ImageComposer/ImageComposer_Image.h              |  2 +-
 src/ImageComposer/ImageComposer_MetaTypes.h          |  2 +-
 src/ImageComposer/ImageComposer_Operator.cxx         |  4 ++--
 src/ImageComposer/ImageComposer_Operator.h           |  2 +-
 src/LightApp/LightApp_AboutDlg.cxx                   |  4 ++--
 src/LightApp/LightApp_Application.cxx                |  8 ++++----
 src/LightApp/LightApp_Dialog.h                       |  2 +-
 src/LightApp/LightApp_EventFilter.cxx                |  2 +-
 src/LightApp/LightApp_ModuleAction.cxx               |  2 +-
 src/LightApp/LightApp_ModuleDlg.h                    |  4 ++--
 src/LightApp/LightApp_NameDlg.h                      |  2 +-
 src/LightApp/LightApp_SwitchOp.cxx                   |  2 +-
 src/LogWindow/LogWindow.cxx                          |  2 +-
 src/OCCViewer/OCCViewer.h                            |  2 +-
 src/OCCViewer/OCCViewer_AxialScaleDlg.h              |  2 +-
 src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx      |  4 ++--
 src/OCCViewer/OCCViewer_ClippingDlg.cxx              |  2 +-
 src/OCCViewer/OCCViewer_ClippingDlg.h                |  2 +-
 src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx     |  2 +-
 src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h       |  2 +-
 src/OCCViewer/OCCViewer_EnvTextureDlg.h              |  2 +-
 src/OCCViewer/OCCViewer_LightSourceDlg.h             |  2 +-
 src/OCCViewer/OCCViewer_RayTracingDlg.h              |  2 +-
 src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx      |  2 +-
 src/OCCViewer/OCCViewer_SetRotationPointDlg.h        |  2 +-
 src/OCCViewer/OCCViewer_ToolTip.h                    |  2 +-
 src/OCCViewer/OCCViewer_Utilities.cxx                |  4 ++--
 src/OCCViewer/OCCViewer_ViewFrame.cxx                |  2 +-
 src/OCCViewer/OCCViewer_ViewModel.cxx                | 10 +++++-----
 src/OCCViewer/OCCViewer_ViewModel.h                  |  2 +-
 src/OCCViewer/OCCViewer_ViewPort.cxx                 |  4 ++--
 src/OCCViewer/OCCViewer_ViewPort3d.cxx               |  6 +++---
 src/OCCViewer/OCCViewer_ViewSketcher.cxx             |  8 ++++----
 src/OCCViewer/OCCViewer_ViewSketcher.h               |  2 +-
 src/OCCViewer/OCCViewer_ViewWindow.cxx               | 10 +++++-----
 src/OCCViewer/OCCViewer_ViewportInputFilter.cxx      |  4 ++--
 src/ObjBrowser/OB_Browser.cxx                        |  2 +-
 src/PVViewer/PVViewer_Core.cxx                       |  2 +-
 src/Plot2d/Plot2d.cxx                                |  2 +-
 src/Plot2d/Plot2d.h                                  |  4 ++--
 src/Plot2d/Plot2d_AnalyticalCurveDlg.h               |  2 +-
 src/Plot2d/Plot2d_FitDataDlg.cxx                     |  2 +-
 src/Plot2d/Plot2d_FitDataDlg.h                       |  2 +-
 src/Plot2d/Plot2d_PlotItems.cxx                      |  6 +++---
 src/Plot2d/Plot2d_SetupCurveDlg.cxx                  |  2 +-
 src/Plot2d/Plot2d_SetupCurveDlg.h                    |  2 +-
 src/Plot2d/Plot2d_SetupCurveScaleDlg.h               |  2 +-
 src/Plot2d/Plot2d_SetupViewDlg.h                     |  2 +-
 src/Plot2d/Plot2d_ToolTip.cxx                        |  4 ++--
 src/Plot2d/Plot2d_ViewFrame.cxx                      | 10 +++++-----
 src/Plot2d/Plot2d_ViewFrame.h                        |  2 +-
 src/Plot2d/Plot2d_ViewWindow.cxx                     |  8 ++++----
 src/PyViewer/PyViewer_ViewWindow.cxx                 |  2 +-
 src/QDS/QDS_ComboBox.h                               |  2 +-
 src/QDS/QDS_Datum.cxx                                |  2 +-
 src/QDS/QDS_LineEdit.cxx                             |  2 +-
 src/QDS/QDS_Validator.h                              |  2 +-
 src/Qtx/QtxActionSet.cxx                             |  2 +-
 src/Qtx/QtxActionToolMgr.cxx                         |  4 ++--
 src/Qtx/QtxBiColorTool.cxx                           |  2 +-
 src/Qtx/QtxBiColorTool.h                             |  2 +-
 src/Qtx/QtxColorButton.cxx                           |  6 +++---
 src/Qtx/QtxColorButton.h                             |  4 ++--
 src/Qtx/QtxColorScale.cxx                            |  6 +++---
 src/Qtx/QtxComboBox.cxx                              |  4 ++--
 src/Qtx/QtxDialog.cxx                                |  4 ++--
 src/Qtx/QtxDialog.h                                  |  2 +-
 src/Qtx/QtxDockWidget.cxx                            |  4 ++--
 src/Qtx/QtxDoubleSpinBox.cxx                         |  2 +-
 src/Qtx/QtxDoubleSpinBox.h                           |  2 +-
 src/Qtx/QtxFontEdit.cxx                              |  2 +-
 src/Qtx/QtxGroupBox.cxx                              |  2 +-
 src/Qtx/QtxListAction.cxx                            |  4 ++--
 src/Qtx/QtxLogoMgr.cxx                               |  8 ++++----
 src/Qtx/QtxLogoMgr.h                                 |  2 +-
 src/Qtx/QtxMRUAction.cxx                             |  2 +-
 src/Qtx/QtxMainWindow.cxx                            |  4 ++--
 src/Qtx/QtxMenu.cxx                                  | 10 +++++-----
 src/Qtx/QtxMultiAction.cxx                           |  6 +++---
 src/Qtx/QtxNotify.cxx                                |  8 ++++----
 src/Qtx/QtxPagePrefMgr.cxx                           |  2 +-
 src/Qtx/QtxPagePrefMgr.h                             |  2 +-
 src/Qtx/QtxPathDialog.cxx                            |  2 +-
 src/Qtx/QtxPathEdit.cxx                              |  6 +++---
 src/Qtx/QtxPathListEdit.cxx                          |  4 ++--
 src/Qtx/QtxPreferenceMgr.cxx                         |  2 +-
 src/Qtx/QtxPreferenceMgr.h                           |  6 +++---
 src/Qtx/QtxResourceMgr.cxx                           |  2 +-
 src/Qtx/QtxResourceMgr.h                             | 12 ++++++------
 src/Qtx/QtxRubberBand.cxx                            | 12 ++++++------
 src/Qtx/QtxSearchTool.cxx                            |  4 ++--
 src/Qtx/QtxShortcutEdit.cxx                          |  4 ++--
 src/Qtx/QtxSplash.cxx                                |  4 ++--
 src/Qtx/QtxSplash.h                                  |  4 ++--
 src/Qtx/QtxToolBar.cxx                               |  2 +-
 src/Qtx/QtxToolButton.cxx                            |  4 ++--
 src/Qtx/QtxToolTip.cxx                               | 12 ++++++------
 src/Qtx/QtxTreeView.cxx                              |  2 +-
 src/Qtx/QtxValidator.h                               |  2 +-
 src/Qtx/QtxWebBrowser.cxx                            |  2 +-
 src/Qtx/QtxWebBrowser.h                              |  2 +-
 src/Qtx/QtxWorkstack.cxx                             |  8 ++++----
 src/Qtx/QtxWorkstackAction.cxx                       |  6 +++---
 src/Qtx/QtxWorkstackAction.h                         |  2 +-
 .../SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h   |  2 +-
 .../SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx    |  2 +-
 .../SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h      |  2 +-
 src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx            |  4 ++--
 src/SALOME_PYQT/SalomePyQt/SalomePyQt.h              |  2 +-
 src/SPlot2d/SPlot2d_ViewModel.cxx                    |  4 ++--
 src/STD/STD_Application.cxx                          |  2 +-
 src/SUIT/SUIT_Accel.cxx                              |  2 +-
 src/SUIT/SUIT_ActionOperation.h                      |  2 +-
 src/SUIT/SUIT_Application.cxx                        |  2 +-
 src/SUIT/SUIT_DataObject.h                           |  4 ++--
 src/SUIT/SUIT_Desktop.cxx                            |  2 +-
 src/SUIT/SUIT_ExceptionHandler.cxx                   |  2 +-
 src/SUIT/SUIT_FileDlg.cxx                            |  2 +-
 src/SUIT/SUIT_LicenseDlg.cxx                         |  6 +++---
 src/SUIT/SUIT_LicenseDlg.h                           |  2 +-
 src/SUIT/SUIT_MessageBox.cxx                         |  2 +-
 src/SUIT/SUIT_OverrideCursor.cxx                     |  2 +-
 src/SUIT/SUIT_OverrideCursor.h                       |  2 +-
 src/SUIT/SUIT_ResourceMgr.cxx                        |  2 +-
 src/SUIT/SUIT_Session.cxx                            |  2 +-
 src/SUIT/SUIT_ShortcutMgr.cxx                        |  2 +-
 src/SUIT/SUIT_Tools.h                                |  2 +-
 src/SUIT/SUIT_TreeModel.cxx                          |  2 +-
 src/SUIT/SUIT_ViewManager.cxx                        |  2 +-
 src/SUIT/SUIT_ViewManager.h                          |  2 +-
 src/SUIT/SUIT_ViewWindow.cxx                         |  4 ++--
 src/SUITApp/SUITApp_Application.h                    |  2 +-
 src/SVTK/SVTK_InteractorStyle.cxx                    |  2 +-
 src/SVTK/SVTK_InteractorStyle.h                      |  2 +-
 src/SVTK/SVTK_PsOptionsDlg.h                         |  2 +-
 src/SVTK/SVTK_Recorder.cxx                           |  2 +-
 src/SVTK/SVTK_RecorderDlg.cxx                        |  2 +-
 src/SVTK/SVTK_RecorderDlg.h                          |  2 +-
 src/SVTK/SVTK_RenderWindowInteractor.cxx             |  2 +-
 src/SVTK/SVTK_SetRotationPointDlg.cxx                |  2 +-
 src/SVTK/SVTK_ViewModel.h                            |  2 +-
 src/SVTK/SVTK_ViewParameterDlg.cxx                   |  2 +-
 src/SVTK/SVTK_ViewWindow.h                           |  2 +-
 src/SalomeApp/SalomeApp_Application.cxx              |  2 +-
 src/SalomeApp/SalomeApp_DoubleSpinBox.cxx            |  2 +-
 src/SalomeApp/SalomeApp_DoubleSpinBox.h              |  2 +-
 src/SalomeApp/SalomeApp_Engine_i.cxx                 |  2 +-
 src/SalomeApp/SalomeApp_ExitDlg.h                    |  2 +-
 src/SalomeApp/SalomeApp_IntSpinBox.cxx               |  2 +-
 src/SalomeApp/SalomeApp_IntSpinBox.h                 |  2 +-
 src/SalomeApp/SalomeApp_ListView.cxx                 |  6 +++---
 src/SalomeApp/SalomeApp_LoadStudiesDlg.h             |  2 +-
 src/SalomeApp/SalomeApp_NoteBook.cxx                 |  4 ++--
 src/SalomeApp/SalomeApp_StudyPropertiesDlg.h         |  2 +-
 src/SalomeApp/SalomeApp_VisualState.cxx              |  2 +-
 src/Session/SALOME_Session_Server.cxx                |  2 +-
 src/Session/Session_ServerCheck.cxx                  |  2 +-
 src/Style/Style_Model.cxx                            |  6 +++---
 src/Style/Style_Model.h                              |  4 ++--
 src/Style/Style_PrefDlg.cxx                          |  4 ++--
 src/Style/Style_Salome.cxx                           |  4 ++--
 src/Style/Style_Salome.h                             |  2 +-
 src/Style/Style_Tools.cxx                            |  2 +-
 src/Style/Style_Tools.h                              |  4 ++--
 src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h          |  2 +-
 src/TOOLSGUI/ToolsGUI_RegWidget.cxx                  |  2 +-
 src/TreeData/Test/guitester.cxx                      |  2 +-
 src/VTKViewer/VTKViewer_InteractorStyle.cxx          |  2 +-
 src/VTKViewer/VTKViewer_InteractorStyle.h            |  2 +-
 src/VTKViewer/VTKViewer_MarkerDlg.cxx                |  2 +-
 src/VTKViewer/VTKViewer_MarkerUtils.cxx              |  2 +-
 src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx   |  4 ++--
 src/VTKViewer/VTKViewer_ViewModel.cxx                |  2 +-
 src/VTKViewer/VTKViewer_ViewModel.h                  |  2 +-
 src/VTKViewer/VTKViewer_ViewWindow.cxx               |  2 +-
 src/ViewerTools/ViewerTools_DialogBase.h             |  2 +-
 tools/CurvePlot/src/cpp/test/test_curveplot.cxx      |  2 +-
 tools/PyConsole/src/PyConsole_Console.cxx            |  2 +-
 tools/PyConsole/src/PyConsole_Editor.cxx             |  6 +++---
 tools/PyEditor/src/PyEditor.cxx                      |  2 +-
 tools/PyEditor/src/PyEditor_Completer.cxx            |  4 ++--
 tools/PyEditor/src/PyEditor_Editor.cxx               |  2 +-
 tools/PyEditor/src/PyEditor_FindTool.cxx             |  2 +-
 tools/PyEditor/src/PyEditor_FindTool.h               |  2 +-
 tools/PyEditor/src/PyEditor_Keywords.h               |  2 +-
 tools/PyEditor/src/PyEditor_Settings.h               |  2 +-
 tools/PyEditor/src/PyEditor_SettingsDlg.h            |  2 +-
 tools/PyEditor/src/PyEditor_Window.cxx               |  2 +-
 tools/dlgfactory/GenericDialog.h                     |  2 +-
 tools/dlgfactory/__QDIALOG__.h                       |  2 +-
 tools/dlgfactory/gtester.cxx                         |  2 +-
 tools/dlgfactory/qtester.cxx                         |  2 +-
 230 files changed, 365 insertions(+), 365 deletions(-)

diff --git a/src/CAF/CAF_Tools.h b/src/CAF/CAF_Tools.h
index fe2f33bd2..6e3f20d9c 100644
--- a/src/CAF/CAF_Tools.h
+++ b/src/CAF/CAF_Tools.h
@@ -30,7 +30,7 @@
 
 #include <SUIT_Tools.h>
 
-#include <QColor>
+#include <QtGui/QColor>
 
 #include <Quantity_Color.hxx>
 
diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 61d979ea5..164dfd9f7 100644
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -34,7 +34,7 @@
 #include <KERNEL_version.h>
 #include <GUI_version.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QRegExp>
 
 #ifdef WIN32
diff --git a/src/CAM/CAM_Module.h b/src/CAM/CAM_Module.h
index 75a08dfb8..fc14cc665 100644
--- a/src/CAM/CAM_Module.h
+++ b/src/CAM/CAM_Module.h
@@ -26,11 +26,11 @@
 #include "CAM.h"
 
 #include <QObject>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QString>
 #include <QMap>
 #include <QPair>
-#include <QKeySequence>
+#include <QtGui/QKeySequence>
 
 class QAction;
 class QMenu;
diff --git a/src/Event/SALOME_Event.cxx b/src/Event/SALOME_Event.cxx
index 6aef67936..417900e6b 100644
--- a/src/Event/SALOME_Event.cxx
+++ b/src/Event/SALOME_Event.cxx
@@ -27,7 +27,7 @@
 #include "SALOME_Event.h"
 
 #include <QSemaphore>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 // asv 21.02.05 : introducing multi-platform approach of thread comparison
 // - on Unix using pthread_t type for storing ThreadId
diff --git a/src/Event/SALOME_EventFilter.cxx b/src/Event/SALOME_EventFilter.cxx
index 5a963dd46..ea328879a 100644
--- a/src/Event/SALOME_EventFilter.cxx
+++ b/src/Event/SALOME_EventFilter.cxx
@@ -20,7 +20,7 @@
 #include "SALOME_EventFilter.h"
 #include "SALOME_Event.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 SALOME_EventFilter* SALOME_EventFilter::myFilter = NULL;
 
diff --git a/src/GLViewer/GLViewer_AspectLine.h b/src/GLViewer/GLViewer_AspectLine.h
index 3e44960f8..2972b75ec 100644
--- a/src/GLViewer/GLViewer_AspectLine.h
+++ b/src/GLViewer/GLViewer_AspectLine.h
@@ -29,7 +29,7 @@
 
 #include "GLViewer.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/GLViewer/GLViewer_BaseObjects.h b/src/GLViewer/GLViewer_BaseObjects.h
index 2f108f0b0..d2c8d891b 100644
--- a/src/GLViewer/GLViewer_BaseObjects.h
+++ b/src/GLViewer/GLViewer_BaseObjects.h
@@ -30,7 +30,7 @@
 #include "GLViewer.h"
 #include "GLViewer_Object.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 #include <TColStd_SequenceOfInteger.hxx>
 
diff --git a/src/GLViewer/GLViewer_Compass.h b/src/GLViewer/GLViewer_Compass.h
index b1e92572e..db2365eb0 100644
--- a/src/GLViewer/GLViewer_Compass.h
+++ b/src/GLViewer/GLViewer_Compass.h
@@ -29,7 +29,7 @@
 
 #include "GLViewer.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 class QFont;
 
diff --git a/src/GLViewer/GLViewer_Drawer.cxx b/src/GLViewer/GLViewer_Drawer.cxx
index 235157558..f1b48c685 100644
--- a/src/GLViewer/GLViewer_Drawer.cxx
+++ b/src/GLViewer/GLViewer_Drawer.cxx
@@ -31,9 +31,9 @@
 #include "GLViewer_ViewFrame.h"
 #include "GLViewer_ViewPort2d.h"
 
-#include <QApplication>
-#include <QImage>
-#include <QPainter>
+#include <QtWidgets/QApplication>
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
 #include <QFile>
 
 #if defined(__APPLE__)
diff --git a/src/GLViewer/GLViewer_Drawer.h b/src/GLViewer/GLViewer_Drawer.h
index 0a1bcf3d9..edb26f063 100644
--- a/src/GLViewer/GLViewer_Drawer.h
+++ b/src/GLViewer/GLViewer_Drawer.h
@@ -31,8 +31,8 @@
 #include "windows.h"
 #endif
 
-#include <QColor>
-#include <QFont>
+#include <QtGui/QColor>
+#include <QtGui/QFont>
 
 class QFile;
 
diff --git a/src/GLViewer/GLViewer_Text.cxx b/src/GLViewer/GLViewer_Text.cxx
index e98e25dbb..79401ed7a 100644
--- a/src/GLViewer/GLViewer_Text.cxx
+++ b/src/GLViewer/GLViewer_Text.cxx
@@ -25,8 +25,8 @@
 //
 #include "GLViewer_Text.h"
 
-#include <QApplication>
-#include <QFontMetrics>
+#include <QtWidgets/QApplication>
+#include <QtGui/QFontMetrics>
 
 /*!
   Constructor
diff --git a/src/GLViewer/GLViewer_Text.h b/src/GLViewer/GLViewer_Text.h
index 8c825e333..297f34d72 100644
--- a/src/GLViewer/GLViewer_Text.h
+++ b/src/GLViewer/GLViewer_Text.h
@@ -40,9 +40,9 @@
 #include <GL/gl.h>
 #endif
 
-#include <QFont>
+#include <QtGui/QFont>
 #include <QString>
-#include <QColor>
+#include <QtGui/QColor>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/GLViewer/GLViewer_ToolTip.cxx b/src/GLViewer/GLViewer_ToolTip.cxx
index 06158778b..ace7f3377 100644
--- a/src/GLViewer/GLViewer_ToolTip.cxx
+++ b/src/GLViewer/GLViewer_ToolTip.cxx
@@ -33,10 +33,10 @@
 
 #include <QLabel>
 #include <QTimer>
-#include <QBitmap>
-#include <QApplication>
+#include <QtGui/QBitmap>
+#include <QtWidgets/QApplication>
 #include <QToolTip>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 /*!
   constructor
diff --git a/src/GLViewer/GLViewer_ViewFrame.cxx b/src/GLViewer/GLViewer_ViewFrame.cxx
index 630bf523f..8cb1231d9 100644
--- a/src/GLViewer/GLViewer_ViewFrame.cxx
+++ b/src/GLViewer/GLViewer_ViewFrame.cxx
@@ -35,13 +35,13 @@
 
 #include <QColor>
 #include <QFileDialog>
-#include <QImage>
+#include <QtGui/QImage>
 #include <QHBoxLayout>
 #include <QString>
 #include <QFrame>
-#include <QMouseEvent>
-#include <QKeyEvent>
-#include <QWheelEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QWheelEvent>
 
 #ifdef WIN32
 #include <Standard_Integer.hxx>
diff --git a/src/GLViewer/GLViewer_ViewPort.cxx b/src/GLViewer/GLViewer_ViewPort.cxx
index 4f1ca1fdc..5ca69b5f8 100644
--- a/src/GLViewer/GLViewer_ViewPort.cxx
+++ b/src/GLViewer/GLViewer_ViewPort.cxx
@@ -31,13 +31,13 @@
 #include "SUIT_Session.h"
 
 #include <QRect>
-#include <QCursor>
-#include <QPainter>
+#include <QtGui/QCursor>
+#include <QtGui/QPainter>
 #include <QMultiHash>
 //#include <QMenu>
 #include <QColorDialog>
 #include <QColormap>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QCoreApplication>
 
 #include <stdlib.h>
diff --git a/src/GLViewer/GLViewer_ViewPort.h b/src/GLViewer/GLViewer_ViewPort.h
index bd7ab30fd..1e3dcf99a 100644
--- a/src/GLViewer/GLViewer_ViewPort.h
+++ b/src/GLViewer/GLViewer_ViewPort.h
@@ -30,7 +30,7 @@
 #include "GLViewer.h"
 
 //#include <QList>
-#include <QColor>
+#include <QtGui/QColor>
 //#include <QAction>
 #include <QWidget>
 
diff --git a/src/GLViewer/GLViewer_ViewPort2d.cxx b/src/GLViewer/GLViewer_ViewPort2d.cxx
index 2acfb57fb..f6e418e22 100644
--- a/src/GLViewer/GLViewer_ViewPort2d.cxx
+++ b/src/GLViewer/GLViewer_ViewPort2d.cxx
@@ -40,13 +40,13 @@
 //#include <QtxToolTip.h>
 
 #include <QHBoxLayout>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QRect>
 //#include <QMenu>
 //#include <QToolTip>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QClipboard>
-#include <QBitmap>
+#include <QtGui/QBitmap>
 #include <QLabel>
 #include <QWidget>
 #include <QRubberBand>
diff --git a/src/GLViewer/GLViewer_ViewPort2d.h b/src/GLViewer/GLViewer_ViewPort2d.h
index 22fb6e164..91cc0876a 100644
--- a/src/GLViewer/GLViewer_ViewPort2d.h
+++ b/src/GLViewer/GLViewer_ViewPort2d.h
@@ -44,7 +44,7 @@
 #include "GLViewer_Geom.h"
 
 #include <QtOpenGL/QtOpenGL>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QPaintDevice>
 
 #ifdef WIN32
diff --git a/src/GLViewer/GLViewer_Viewer.cxx b/src/GLViewer/GLViewer_Viewer.cxx
index dab34eb0e..7075ce5d8 100644
--- a/src/GLViewer/GLViewer_Viewer.cxx
+++ b/src/GLViewer/GLViewer_Viewer.cxx
@@ -34,11 +34,11 @@
 #include "SUIT_ViewWindow.h"
 #include "SUIT_ViewManager.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMenu>
 #include <QColorDialog>
-#include <QMouseEvent>
-#include <QWheelEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QWheelEvent>
 #include <QRect>
 #include <QRubberBand>
 
diff --git a/src/GLViewer/GLViewer_Viewer.h b/src/GLViewer/GLViewer_Viewer.h
index 731c089e5..38dba96c5 100644
--- a/src/GLViewer/GLViewer_Viewer.h
+++ b/src/GLViewer/GLViewer_Viewer.h
@@ -31,7 +31,7 @@
 #include "GLViewer_Defs.h"
 #include <SUIT_ViewModel.h>
 
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QObject>
 
 class QMouseEvent;
diff --git a/src/GLViewer/GLViewer_Viewer2d.cxx b/src/GLViewer/GLViewer_Viewer2d.cxx
index 9438c066c..a387272e1 100644
--- a/src/GLViewer/GLViewer_Viewer2d.cxx
+++ b/src/GLViewer/GLViewer_Viewer2d.cxx
@@ -43,7 +43,7 @@
 #include <QRect>
 #include <QFile>
 #include <QPolygon>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QColorDialog>
 
 /*!
diff --git a/src/GLViewer/GLViewer_Widget.cxx b/src/GLViewer/GLViewer_Widget.cxx
index 8fabfd1dd..d065c5e91 100644
--- a/src/GLViewer/GLViewer_Widget.cxx
+++ b/src/GLViewer/GLViewer_Widget.cxx
@@ -30,11 +30,11 @@
 #include <cmath>
 
 #include <QEvent>
-#include <QPaintEvent>
+#include <QtGui/QPaintEvent>
 #include <QRect>
 #include <QFile>
-#include <QImage>
-#include <QApplication>
+#include <QtGui/QImage>
+#include <QtWidgets/QApplication>
 #include <QToolTip>
 
 /*!
diff --git a/src/GraphicsView/GraphicsView_ViewFrame.cxx b/src/GraphicsView/GraphicsView_ViewFrame.cxx
index ee55ab2de..fa4b82a32 100644
--- a/src/GraphicsView/GraphicsView_ViewFrame.cxx
+++ b/src/GraphicsView/GraphicsView_ViewFrame.cxx
@@ -38,10 +38,10 @@
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsSceneWheelEvent>
 #include <QHBoxLayout>
-#include <QImage>
-#include <QMouseEvent>
+#include <QtGui/QImage>
+#include <QtGui/QMouseEvent>
 #include <QString>
-#include <QWheelEvent>
+#include <QtGui/QWheelEvent>
 
 //=======================================================================
 // Name    : GraphicsView_ViewFrame
diff --git a/src/GraphicsView/GraphicsView_ViewPort.cxx b/src/GraphicsView/GraphicsView_ViewPort.cxx
index 1cf1c05f1..0cf633700 100644
--- a/src/GraphicsView/GraphicsView_ViewPort.cxx
+++ b/src/GraphicsView/GraphicsView_ViewPort.cxx
@@ -26,7 +26,7 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QGraphicsSceneMouseEvent>
 #include <QGridLayout>
 #include <QLabel>
@@ -35,7 +35,7 @@
 #include <QRubberBand>
 #include <QScrollBar>
 #include <QtPrintSupport/QPrinter>
-#include <QPainter>
+#include <QtGui/QPainter>
 
 #include <math.h>
 
diff --git a/src/GraphicsView/GraphicsView_ViewTransformer.h b/src/GraphicsView/GraphicsView_ViewTransformer.h
index e2ddb596c..5eac02127 100644
--- a/src/GraphicsView/GraphicsView_ViewTransformer.h
+++ b/src/GraphicsView/GraphicsView_ViewTransformer.h
@@ -22,7 +22,7 @@
 
 #include "GraphicsView.h"
 
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QObject>
 
 class QRectF;
diff --git a/src/GraphicsView/GraphicsView_Viewer.cxx b/src/GraphicsView/GraphicsView_Viewer.cxx
index ea9bd6b92..147c2c824 100644
--- a/src/GraphicsView/GraphicsView_Viewer.cxx
+++ b/src/GraphicsView/GraphicsView_Viewer.cxx
@@ -30,11 +30,11 @@
 
 #include <ImageComposer_Image.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QColorDialog>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsSceneWheelEvent>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QMenu>
 
 #include <math.h>
diff --git a/src/GraphicsView/GraphicsView_Viewer.h b/src/GraphicsView/GraphicsView_Viewer.h
index d6b98b362..92a1457a4 100644
--- a/src/GraphicsView/GraphicsView_Viewer.h
+++ b/src/GraphicsView/GraphicsView_Viewer.h
@@ -26,7 +26,7 @@
 
 #include <SUIT_ViewModel.h>
 
-#include <QPainterPath>
+#include <QtGui/QPainterPath>
 
 class QGraphicsSceneMouseEvent;
 class QGraphicsSceneWheelEvent;
diff --git a/src/GuiHelpers/StandardApp_Module.cxx b/src/GuiHelpers/StandardApp_Module.cxx
index d1e2bf9f5..cc881c514 100644
--- a/src/GuiHelpers/StandardApp_Module.cxx
+++ b/src/GuiHelpers/StandardApp_Module.cxx
@@ -32,7 +32,7 @@
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
 // QT Includes
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QAction>
 
 #include <Basics_Utils.hxx>
diff --git a/src/HelpBrowser/qtsingleapplication.h b/src/HelpBrowser/qtsingleapplication.h
index cb2bfaf73..0309574ee 100644
--- a/src/HelpBrowser/qtsingleapplication.h
+++ b/src/HelpBrowser/qtsingleapplication.h
@@ -41,7 +41,7 @@
 #ifndef QTSINGLEAPPLICATION_H
 #define QTSINGLEAPPLICATION_H
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 class QtLocalPeer;
 
diff --git a/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx b/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
index 89024b2d3..552a8324b 100644
--- a/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
+++ b/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
@@ -20,9 +20,9 @@
 #include "ImageComposer_ColorMaskOperator.h"
 #include "ImageComposer_MetaTypes.h"
 #include <QRectF>
-#include <QRgb>
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QRgb>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor
diff --git a/src/ImageComposer/ImageComposer_ColorMaskOperator.h b/src/ImageComposer/ImageComposer_ColorMaskOperator.h
index f0baf08c9..8074e0165 100644
--- a/src/ImageComposer/ImageComposer_ColorMaskOperator.h
+++ b/src/ImageComposer/ImageComposer_ColorMaskOperator.h
@@ -21,7 +21,7 @@
 #define IMAGE_COMPOSER_COLOR_MASK_OPERATOR_HEADER
 
 #include "ImageComposer_Operator.h"
-#include <QColor>
+#include <QtGui/QColor>
 
 /**
   \class ImageComposer_ColorMaskOperator
diff --git a/src/ImageComposer/ImageComposer_CropOperator.cxx b/src/ImageComposer/ImageComposer_CropOperator.cxx
index 6ba14f825..5b07e9556 100644
--- a/src/ImageComposer/ImageComposer_CropOperator.cxx
+++ b/src/ImageComposer/ImageComposer_CropOperator.cxx
@@ -21,8 +21,8 @@
 #include "ImageComposer_Image.h"
 #include "ImageComposer_MetaTypes.h"
 
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor
diff --git a/src/ImageComposer/ImageComposer_CropOperator.h b/src/ImageComposer/ImageComposer_CropOperator.h
index 61ac04039..25a1c0827 100644
--- a/src/ImageComposer/ImageComposer_CropOperator.h
+++ b/src/ImageComposer/ImageComposer_CropOperator.h
@@ -21,8 +21,8 @@
 #define IMAGE_COMPOSER_CROP_OPERATOR_HEADER
 
 #include "ImageComposer_Operator.h"
-#include <QColor>
-#include <QPainterPath>
+#include <QtGui/QColor>
+#include <QtGui/QPainterPath>
 
 /**
   \class ImageComposer_CropOperator
diff --git a/src/ImageComposer/ImageComposer_CutOperator.cxx b/src/ImageComposer/ImageComposer_CutOperator.cxx
index 53b347548..bf2f2aa11 100644
--- a/src/ImageComposer/ImageComposer_CutOperator.cxx
+++ b/src/ImageComposer/ImageComposer_CutOperator.cxx
@@ -20,8 +20,8 @@
 #include "ImageComposer_CutOperator.h"
 #include "ImageComposer_MetaTypes.h"
 #include <QString>
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor
diff --git a/src/ImageComposer/ImageComposer_CutOperator.h b/src/ImageComposer/ImageComposer_CutOperator.h
index 0f32e2157..d6000b2df 100644
--- a/src/ImageComposer/ImageComposer_CutOperator.h
+++ b/src/ImageComposer/ImageComposer_CutOperator.h
@@ -21,7 +21,7 @@
 #define IMAGE_COMPOSER_CUT_OPERATOR_HEADER
 
 #include "ImageComposer_Operator.h"
-#include <QColor>
+#include <QtGui/QColor>
 
 /**
   \class ImageComposer_CutOperator
diff --git a/src/ImageComposer/ImageComposer_FuseOperator.cxx b/src/ImageComposer/ImageComposer_FuseOperator.cxx
index 615e8f70e..abcf875aa 100644
--- a/src/ImageComposer/ImageComposer_FuseOperator.cxx
+++ b/src/ImageComposer/ImageComposer_FuseOperator.cxx
@@ -20,8 +20,8 @@
 #include "ImageComposer_FuseOperator.h"
 #include "ImageComposer_MetaTypes.h"
 #include <QString>
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor
diff --git a/src/ImageComposer/ImageComposer_FuseOperator.h b/src/ImageComposer/ImageComposer_FuseOperator.h
index ba03dbe8c..fd784e7fb 100644
--- a/src/ImageComposer/ImageComposer_FuseOperator.h
+++ b/src/ImageComposer/ImageComposer_FuseOperator.h
@@ -21,7 +21,7 @@
 #define IMAGE_COMPOSER_FUSE_OPERATOR_HEADER
 
 #include "ImageComposer_Operator.h"
-#include <QColor>
+#include <QtGui/QColor>
 
 /**
   \class ImageComposer_FuseOperator
diff --git a/src/ImageComposer/ImageComposer_Image.cxx b/src/ImageComposer/ImageComposer_Image.cxx
index 738703cef..8c61bcc95 100644
--- a/src/ImageComposer/ImageComposer_Image.cxx
+++ b/src/ImageComposer/ImageComposer_Image.cxx
@@ -23,7 +23,7 @@
 #include "ImageComposer_FuseOperator.h"
 #include "ImageComposer_MetaTypes.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 QColor ImageComposer_Image::myDefaultBackground = TRANSPARENT;
 
diff --git a/src/ImageComposer/ImageComposer_Image.h b/src/ImageComposer/ImageComposer_Image.h
index db94e1426..645181e87 100644
--- a/src/ImageComposer/ImageComposer_Image.h
+++ b/src/ImageComposer/ImageComposer_Image.h
@@ -22,7 +22,7 @@
 
 #include "ImageComposer.h"
 
-#include <QImage>
+#include <QtGui/QImage>
 
 class QVariant;
 class ImageComposer_Operator;
diff --git a/src/ImageComposer/ImageComposer_MetaTypes.h b/src/ImageComposer/ImageComposer_MetaTypes.h
index 4a7bd7540..07e91b704 100644
--- a/src/ImageComposer/ImageComposer_MetaTypes.h
+++ b/src/ImageComposer/ImageComposer_MetaTypes.h
@@ -20,7 +20,7 @@
 #include "ImageComposer_Image.h"
 
 #include <QVariant>
-#include <QPainterPath>
+#include <QtGui/QPainterPath>
 
 // Here we declare the meta types for classes which used by
 // ImageComposer operators so that it could be wrapped to QVariant
diff --git a/src/ImageComposer/ImageComposer_Operator.cxx b/src/ImageComposer/ImageComposer_Operator.cxx
index 3505a52a0..8685ae6ac 100644
--- a/src/ImageComposer/ImageComposer_Operator.cxx
+++ b/src/ImageComposer/ImageComposer_Operator.cxx
@@ -19,8 +19,8 @@
 
 #include "ImageComposer_Operator.h"
 #include "ImageComposer_MetaTypes.h"
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 
 /**
   Constructor
diff --git a/src/ImageComposer/ImageComposer_Operator.h b/src/ImageComposer/ImageComposer_Operator.h
index a8fa49a19..f5fceb6fb 100644
--- a/src/ImageComposer/ImageComposer_Operator.h
+++ b/src/ImageComposer/ImageComposer_Operator.h
@@ -22,7 +22,7 @@
 
 #include "ImageComposer.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 class QString;
 class QRectF;
diff --git a/src/LightApp/LightApp_AboutDlg.cxx b/src/LightApp/LightApp_AboutDlg.cxx
index 0f682efc9..630ee72d1 100644
--- a/src/LightApp/LightApp_AboutDlg.cxx
+++ b/src/LightApp/LightApp_AboutDlg.cxx
@@ -34,8 +34,8 @@
 
 #include <QLabel>
 #include <QVBoxLayout>
-#include <QPixmap>
-#include <QIcon>
+#include <QtGui/QPixmap>
+#include <QtGui/QIcon>
 #include <QGroupBox>
 #include <QTabWidget>
 #include <QPushButton>
diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index ba73f8d24..e384539d7 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -169,20 +169,20 @@
 #define VISIBILITY_COLUMN_WIDTH 25
 
 #include <QDir>
-#include <QImage>
+#include <QtGui/QImage>
 #include <QString>
 #include <QWidget>
 #include <QStringList>
 #include <QFile>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMap>
 #include <QStatusBar>
 #include <QThread>
 #include <QObjectList>
 #include <QComboBox>
 #include <QInputDialog>
-#include <QFontDatabase>
-#include <QIcon>
+#include <QtGui/QFontDatabase>
+#include <QtGui/QIcon>
 #include <QByteArray>
 #include <QMenu>
 #include <QProcess>
diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h
index 75efbf368..c60a92d3c 100644
--- a/src/LightApp/LightApp_Dialog.h
+++ b/src/LightApp/LightApp_Dialog.h
@@ -31,7 +31,7 @@
 
 #include <QList>
 #include <QMap>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 class QLineEdit;
 class QAbstractButton;
diff --git a/src/LightApp/LightApp_EventFilter.cxx b/src/LightApp/LightApp_EventFilter.cxx
index 736a2a803..764979d4c 100644
--- a/src/LightApp/LightApp_EventFilter.cxx
+++ b/src/LightApp/LightApp_EventFilter.cxx
@@ -24,7 +24,7 @@
 
 #include <SUIT_Desktop.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 #include <SALOME_Event.h>
 
diff --git a/src/LightApp/LightApp_ModuleAction.cxx b/src/LightApp/LightApp_ModuleAction.cxx
index b8104c5c7..21d84025e 100644
--- a/src/LightApp/LightApp_ModuleAction.cxx
+++ b/src/LightApp/LightApp_ModuleAction.cxx
@@ -25,7 +25,7 @@
 #include <QtxComboBox.h>
 #include <QtxActionSet.h>
 #include <QVBoxLayout>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QEvent>
 
 /*!
diff --git a/src/LightApp/LightApp_ModuleDlg.h b/src/LightApp/LightApp_ModuleDlg.h
index 8147ebf2c..3167e40e7 100644
--- a/src/LightApp/LightApp_ModuleDlg.h
+++ b/src/LightApp/LightApp_ModuleDlg.h
@@ -28,8 +28,8 @@
 
 #include "LightApp.h"
 
-#include <QDialog> 
-#include <QPixmap>
+#include <QtWidgets/QDialog> 
+#include <QtGui/QPixmap>
 #include <QMap>
 
 class QPushButton;
diff --git a/src/LightApp/LightApp_NameDlg.h b/src/LightApp/LightApp_NameDlg.h
index 325400957..7f6d76c1a 100644
--- a/src/LightApp/LightApp_NameDlg.h
+++ b/src/LightApp/LightApp_NameDlg.h
@@ -27,7 +27,7 @@
 #define LIGHTAPP_NAMEDLG_H
 
 #include "LightApp.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QLineEdit;
 class QPushButton;
diff --git a/src/LightApp/LightApp_SwitchOp.cxx b/src/LightApp/LightApp_SwitchOp.cxx
index 4a9c923fa..70a74d5e8 100644
--- a/src/LightApp/LightApp_SwitchOp.cxx
+++ b/src/LightApp/LightApp_SwitchOp.cxx
@@ -31,7 +31,7 @@
 #include <QEvent>
 #include <QWidget>
 #include <QList>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
  * \brief Constructor
diff --git a/src/LogWindow/LogWindow.cxx b/src/LogWindow/LogWindow.cxx
index f74164f07..86a79155d 100644
--- a/src/LogWindow/LogWindow.cxx
+++ b/src/LogWindow/LogWindow.cxx
@@ -27,7 +27,7 @@
 #include "LogWindow.h"
 
 #include <QAction>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDate>
 #include <QFile>
 #include <QMenu>
diff --git a/src/OCCViewer/OCCViewer.h b/src/OCCViewer/OCCViewer.h
index fdccb5c1a..f70b712b5 100644
--- a/src/OCCViewer/OCCViewer.h
+++ b/src/OCCViewer/OCCViewer.h
@@ -39,7 +39,7 @@
 
 #include <Quantity_Color.hxx>
 
-#include <QColor>
+#include <QtGui/QColor>
 
 namespace OCCViewer
 {
diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.h b/src/OCCViewer/OCCViewer_AxialScaleDlg.h
index 81013ea06..001edbc16 100644
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.h
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.h
@@ -22,7 +22,7 @@
 
 #include "OCCViewer.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class OCCViewer_ViewWindow;
 class QtxDoubleSpinBox;
diff --git a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
index 4184b23bd..95f86a3d3 100644
--- a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
+++ b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.cxx
@@ -32,8 +32,8 @@
 #include <GeomAPI_IntCS.hxx>
 #include <gce_MakeDir.hxx>
 
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   \brief Constructor.
diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index 2847a50dc..adf023d3c 100644
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
@@ -52,7 +52,7 @@
 #include <math.h>
 
 // QT Includes
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.h b/src/OCCViewer/OCCViewer_ClippingDlg.h
index 9b5871660..610788dd3 100644
--- a/src/OCCViewer/OCCViewer_ClippingDlg.h
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.h
@@ -26,7 +26,7 @@
 #include "OCCViewer.h"
 #include "OCCViewer_ClipPlane.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include <AIS_Plane.hxx>
 #include <V3d_Plane.hxx>
diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
index 6014ffb11..76b3f3080 100644
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
@@ -28,7 +28,7 @@
 #include <QHBoxLayout>
 #include <QListWidgetItem>
 #include <QEvent>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   Constructor
diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
index e55d85396..606f17b15 100644
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
@@ -30,7 +30,7 @@
 #include <QtxDialog.h>
 #include <SUIT_Application.h>
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QListWidget>
 
 class OCCViewer_ViewPort3d;
diff --git a/src/OCCViewer/OCCViewer_EnvTextureDlg.h b/src/OCCViewer/OCCViewer_EnvTextureDlg.h
index 4bf4a6cb4..4689a9a2c 100644
--- a/src/OCCViewer/OCCViewer_EnvTextureDlg.h
+++ b/src/OCCViewer/OCCViewer_EnvTextureDlg.h
@@ -21,7 +21,7 @@
 #define OCCVIEWER_ENVTEXTUREDLG_H
 
 #include "OCCViewer.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <V3d_View.hxx>
 
 class OCCViewer_ViewWindow;
diff --git a/src/OCCViewer/OCCViewer_LightSourceDlg.h b/src/OCCViewer/OCCViewer_LightSourceDlg.h
index 94496cd98..817f4d912 100644
--- a/src/OCCViewer/OCCViewer_LightSourceDlg.h
+++ b/src/OCCViewer/OCCViewer_LightSourceDlg.h
@@ -21,7 +21,7 @@
 #define OCCVIEWER_LIGHTSOURCEDLG_H
 
 #include "OCCViewer.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <V3d_DirectionalLight.hxx>
 #include <V3d_PositionalLight.hxx>
 #include <V3d_TypeOfLight.hxx>
diff --git a/src/OCCViewer/OCCViewer_RayTracingDlg.h b/src/OCCViewer/OCCViewer_RayTracingDlg.h
index 6dbfaa603..3ab963ff9 100644
--- a/src/OCCViewer/OCCViewer_RayTracingDlg.h
+++ b/src/OCCViewer/OCCViewer_RayTracingDlg.h
@@ -21,7 +21,7 @@
 #define OCCVIEWER_RAYTRACINGDLG_H
 
 #include "OCCViewer.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <V3d_View.hxx>
 
 class OCCViewer_ViewWindow;
diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
index 9b246012a..0b644dfae 100644
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
@@ -32,7 +32,7 @@
 #include <QPushButton>
 #include <QMenu>
 #include <QGridLayout>
-#include <QDoubleValidator>
+#include <QtGui/QDoubleValidator>
 #include <QCheckBox>
 #include <QHBoxLayout>
 
diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
index 247809067..38ba331cf 100644
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
@@ -25,7 +25,7 @@
 
 #include "OCCViewer.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QMap>
 
 #include <TopAbs_ShapeEnum.hxx>
diff --git a/src/OCCViewer/OCCViewer_ToolTip.h b/src/OCCViewer/OCCViewer_ToolTip.h
index ab9267cd3..5faafaa60 100644
--- a/src/OCCViewer/OCCViewer_ToolTip.h
+++ b/src/OCCViewer/OCCViewer_ToolTip.h
@@ -22,7 +22,7 @@
 
 #include "OCCViewer.h"
 #include <QtxToolTip.h>
-#include <QFont>
+#include <QtGui/QFont>
 
 #include <SelectMgr_EntityOwner.hxx>
 #include <AIS_InteractiveObject.hxx>
diff --git a/src/OCCViewer/OCCViewer_Utilities.cxx b/src/OCCViewer/OCCViewer_Utilities.cxx
index ee5a55667..02b26d13d 100644
--- a/src/OCCViewer/OCCViewer_Utilities.cxx
+++ b/src/OCCViewer/OCCViewer_Utilities.cxx
@@ -32,9 +32,9 @@
 #include <Graphic3d_MapIteratorOfMapOfStructure.hxx>
 
 // QT includes
-#include <QImage>
+#include <QtGui/QImage>
 #include <QAction>
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 Handle(Image_PixMap) OCCViewer_Utilities::imageToPixmap( const QImage& anImage )
 {
diff --git a/src/OCCViewer/OCCViewer_ViewFrame.cxx b/src/OCCViewer/OCCViewer_ViewFrame.cxx
index 91e39769e..d96a82872 100644
--- a/src/OCCViewer/OCCViewer_ViewFrame.cxx
+++ b/src/OCCViewer/OCCViewer_ViewFrame.cxx
@@ -34,7 +34,7 @@
 
 #include <QFrame>
 #include <QLayout>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 OCCViewer_ViewFrame::OCCViewer_ViewFrame(SUIT_Desktop* theDesktop, OCCViewer_Viewer* theModel)
   : OCCViewer_ViewWindow( theDesktop, theModel ), myPopupRequestedView(0), mySplitMode(-1)
diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx
index 0acca6fc5..3502278c3 100644
--- a/src/OCCViewer/OCCViewer_ViewModel.cxx
+++ b/src/OCCViewer/OCCViewer_ViewModel.cxx
@@ -40,14 +40,14 @@
 #include "QtxActionToolMgr.h"
 #include "QtxBackgroundTool.h"
 
-#include <QPainter>
-#include <QApplication>
+#include <QtGui/QPainter>
+#include <QtWidgets/QApplication>
 #include <QColorDialog>
 #include <QFileDialog>
-#include <QPalette>
-#include <QKeyEvent>
+#include <QtGui/QPalette>
+#include <QtGui/QKeyEvent>
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QToolBar>
 #include <QDesktopWidget>
 
diff --git a/src/OCCViewer/OCCViewer_ViewModel.h b/src/OCCViewer/OCCViewer_ViewModel.h
index dddf9d11a..00aa607b6 100644
--- a/src/OCCViewer/OCCViewer_ViewModel.h
+++ b/src/OCCViewer/OCCViewer_ViewModel.h
@@ -23,7 +23,7 @@
 #ifndef OCCVIEWER_VIEWMODEL_H
 #define OCCVIEWER_VIEWMODEL_H
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QPoint>
 #include <QVector>
 
diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx
index 1e5584566..34f9a4070 100644
--- a/src/OCCViewer/OCCViewer_ViewPort.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort.cxx
@@ -30,8 +30,8 @@
 
 #include <QColor>
 #include <QRect>
-#include <QPixmap>
-#include <QPainter>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
 #include <QMultiHash>
 #include <QMenu>
 #include <QColorDialog>
diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index b1de81976..9f1b973fb 100644
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -35,9 +35,9 @@
 #include <QFileInfo>
 #include <QString>
 #include <QRect>
-#include <QPaintEvent>
-#include <QResizeEvent>
-#include <QApplication>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QResizeEvent>
+#include <QtWidgets/QApplication>
 #include <QTimer>
 
 #include <V3d_View.hxx>
diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.cxx b/src/OCCViewer/OCCViewer_ViewSketcher.cxx
index 676a13e7e..88eaf1e1d 100644
--- a/src/OCCViewer/OCCViewer_ViewSketcher.cxx
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.cxx
@@ -23,11 +23,11 @@
 
 #include "QtxRubberBand.h"
 
-#include <QApplication>
-#include <QPainter>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPainter>
 #include <QPolygon>
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 
 /****************************************************************
 **  Class: OCCViewer_ViewSketcher
diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.h b/src/OCCViewer/OCCViewer_ViewSketcher.h
index 48d79cac9..80c73300c 100644
--- a/src/OCCViewer/OCCViewer_ViewSketcher.h
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.h
@@ -23,7 +23,7 @@
 #include "OCCViewer.h"
 
 #include <QObject>
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QSize>
 
 class OCCViewer_ViewWindow;
diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index a5826fd38..225865d55 100644
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -52,12 +52,12 @@
 #include <QtxMultiAction.h>
 #include <QtxRubberBand.h>
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QTime>
-#include <QImage>
-#include <QKeyEvent>
-#include <QMouseEvent>
-#include <QApplication>
+#include <QtGui/QImage>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
 #include <QActionGroup>
 #include <QMenu>
 
diff --git a/src/OCCViewer/OCCViewer_ViewportInputFilter.cxx b/src/OCCViewer/OCCViewer_ViewportInputFilter.cxx
index d953f4493..3c97d3864 100644
--- a/src/OCCViewer/OCCViewer_ViewportInputFilter.cxx
+++ b/src/OCCViewer/OCCViewer_ViewportInputFilter.cxx
@@ -26,8 +26,8 @@
 #include "OCCViewer_ViewWindow.h"
 #include "OCCViewer_ViewPort3d.h"
 
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   \brief Constructor.
diff --git a/src/ObjBrowser/OB_Browser.cxx b/src/ObjBrowser/OB_Browser.cxx
index 51aaa85ee..994c53c52 100644
--- a/src/ObjBrowser/OB_Browser.cxx
+++ b/src/ObjBrowser/OB_Browser.cxx
@@ -36,7 +36,7 @@
 #include <QAction>
 #include <QMenu>
 #include <QItemSelection>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QVBoxLayout>
 #include <QAbstractItemModel>
 #include <QAbstractItemDelegate>
diff --git a/src/PVViewer/PVViewer_Core.cxx b/src/PVViewer/PVViewer_Core.cxx
index e59820f0d..df9ab54c4 100644
--- a/src/PVViewer/PVViewer_Core.cxx
+++ b/src/PVViewer/PVViewer_Core.cxx
@@ -27,7 +27,7 @@
 
 #include <Qtx.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QStringList>
 #include <QDir>
 #include <QMainWindow>
diff --git a/src/Plot2d/Plot2d.cxx b/src/Plot2d/Plot2d.cxx
index 0f7826eb3..56cf0eebf 100644
--- a/src/Plot2d/Plot2d.cxx
+++ b/src/Plot2d/Plot2d.cxx
@@ -22,7 +22,7 @@
 //
 #include "Plot2d.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 
 #include <qwt_plot.h>
 #include <qwt_plot_curve.h>
diff --git a/src/Plot2d/Plot2d.h b/src/Plot2d/Plot2d.h
index 8aafe39df..8014f5248 100644
--- a/src/Plot2d/Plot2d.h
+++ b/src/Plot2d/Plot2d.h
@@ -38,8 +38,8 @@
 
 #include <qwt_symbol.h>
 #include <QString>
-#include <QColor>
-#include <QPixmap>
+#include <QtGui/QColor>
+#include <QtGui/QPixmap>
 
 class QPainter;
 class QwtPlot;
diff --git a/src/Plot2d/Plot2d_AnalyticalCurveDlg.h b/src/Plot2d/Plot2d_AnalyticalCurveDlg.h
index 8a28881aa..ab382f878 100644
--- a/src/Plot2d/Plot2d_AnalyticalCurveDlg.h
+++ b/src/Plot2d/Plot2d_AnalyticalCurveDlg.h
@@ -29,7 +29,7 @@
 #include "Plot2d.h"
 #include "Plot2d_AnalyticalCurve.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QMap>
 
 class QListWidget;
diff --git a/src/Plot2d/Plot2d_FitDataDlg.cxx b/src/Plot2d/Plot2d_FitDataDlg.cxx
index 0c6d6ee2f..3be7b9aa6 100644
--- a/src/Plot2d/Plot2d_FitDataDlg.cxx
+++ b/src/Plot2d/Plot2d_FitDataDlg.cxx
@@ -26,7 +26,7 @@
 #include "Plot2d_FitDataDlg.h"
 #include <QLabel>
 #include <QLayout>
-#include <QValidator>
+#include <QtGui/QValidator>
 #include <QPushButton>
 #include <QRadioButton>
 #include <QGroupBox>
diff --git a/src/Plot2d/Plot2d_FitDataDlg.h b/src/Plot2d/Plot2d_FitDataDlg.h
index f24839fc7..3661cc4f1 100644
--- a/src/Plot2d/Plot2d_FitDataDlg.h
+++ b/src/Plot2d/Plot2d_FitDataDlg.h
@@ -24,7 +24,7 @@
 #define PLOT2D_FITDATADLG_H
 
 #include "Plot2d.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QGroupBox;
 class QRadioButton;
diff --git a/src/Plot2d/Plot2d_PlotItems.cxx b/src/Plot2d/Plot2d_PlotItems.cxx
index c1b523c53..f1cafdb9d 100644
--- a/src/Plot2d/Plot2d_PlotItems.cxx
+++ b/src/Plot2d/Plot2d_PlotItems.cxx
@@ -26,13 +26,13 @@
 #include "Plot2d_Object.h"
 #include "Plot2d_ViewFrame.h"
 
-#include <QPainter>
-#include <QPalette>
+#include <QtGui/QPainter>
+#include <QtGui/QPalette>
 #include <QLayout>
 #include <QLine>
 #include <QVariant>
 #include <QStyleOption>
-#include <QPaintEvent>
+#include <QtGui/QPaintEvent>
 #include <QTileRules>
 
 #include <qwt_plot.h>
diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.cxx b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
index c90459156..91ae71bd0 100644
--- a/src/Plot2d/Plot2d_SetupCurveDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
@@ -36,7 +36,7 @@
 #include <QPushButton>
 #include <QComboBox>
 #include <QSpinBox>
-#include <QPainter>
+#include <QtGui/QPainter>
 
 const int MARGIN_SIZE     = 11;
 const int SPACING_SIZE    = 6;
diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.h b/src/Plot2d/Plot2d_SetupCurveDlg.h
index 6fdee0036..cdb4729c0 100644
--- a/src/Plot2d/Plot2d_SetupCurveDlg.h
+++ b/src/Plot2d/Plot2d_SetupCurveDlg.h
@@ -28,7 +28,7 @@
 
 #include "Plot2d.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QPushButton;
 class QComboBox;
diff --git a/src/Plot2d/Plot2d_SetupCurveScaleDlg.h b/src/Plot2d/Plot2d_SetupCurveScaleDlg.h
index 4468fdb27..6afc3f4c1 100644
--- a/src/Plot2d/Plot2d_SetupCurveScaleDlg.h
+++ b/src/Plot2d/Plot2d_SetupCurveScaleDlg.h
@@ -27,7 +27,7 @@
 
 #include "Plot2d.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QPushButton;
 class QLabel;
diff --git a/src/Plot2d/Plot2d_SetupViewDlg.h b/src/Plot2d/Plot2d_SetupViewDlg.h
index 3a4c610d1..b4ccf81cb 100644
--- a/src/Plot2d/Plot2d_SetupViewDlg.h
+++ b/src/Plot2d/Plot2d_SetupViewDlg.h
@@ -28,7 +28,7 @@
 
 #include "Plot2d.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QSpinBox;
 class QCheckBox;
diff --git a/src/Plot2d/Plot2d_ToolTip.cxx b/src/Plot2d/Plot2d_ToolTip.cxx
index 82a3cb3fc..d2375da72 100644
--- a/src/Plot2d/Plot2d_ToolTip.cxx
+++ b/src/Plot2d/Plot2d_ToolTip.cxx
@@ -26,9 +26,9 @@
 #include "Plot2d_ViewFrame.h"
 #include "Plot2d_Curve.h"
 
-#include <QFontMetrics>
+#include <QtGui/QFontMetrics>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 #include <qwt_plot.h>
 #include <qwt_plot_canvas.h>
diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index 1e38ed829..4ad64ff4b 100644
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -46,20 +46,20 @@
 #include <QMessageBox>
 #endif
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QToolBar>
 #include <QToolButton>
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QColorDialog>
 #include <QLayout>
 #include <QMap>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPaintDevice>
 #include <QEvent>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QContextMenuEvent>
 #include <QtPrintSupport/QPrinter>
-#include <QPalette>
+#include <QtGui/QPalette>
 #include <QLocale>
 #include <QXmlStreamWriter>
 #include <QXmlStreamReader>
diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h
index 00fe34c85..599200f18 100644
--- a/src/Plot2d/Plot2d_ViewFrame.h
+++ b/src/Plot2d/Plot2d_ViewFrame.h
@@ -34,7 +34,7 @@
 #include <QMultiHash>
 #include <QMap>
 #include <QList>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <qwt_symbol.h>
 #include <qwt_scale_draw.h>
 #include <qwt_plot_marker.h>
diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx
index 654a89712..2e2a5d476 100644
--- a/src/Plot2d/Plot2d_ViewWindow.cxx
+++ b/src/Plot2d/Plot2d_ViewWindow.cxx
@@ -39,13 +39,13 @@
 
 #include <QStatusBar>
 #include <QLayout>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMenu>
-#include <QImage>
+#include <QtGui/QImage>
 #include <QToolBar>
-#include <QPaintEvent>
+#include <QtGui/QPaintEvent>
 #include <QActionGroup>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QtPrintSupport/QPrinter>
 #include <QtPrintSupport/QPrintDialog>
 
diff --git a/src/PyViewer/PyViewer_ViewWindow.cxx b/src/PyViewer/PyViewer_ViewWindow.cxx
index e6c778ac5..ecbbc562b 100644
--- a/src/PyViewer/PyViewer_ViewWindow.cxx
+++ b/src/PyViewer/PyViewer_ViewWindow.cxx
@@ -31,7 +31,7 @@
 #include "QtxAction.h"
 #include "QtxActionToolMgr.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QMessageBox>
diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index 5e9063626..e7ee681c1 100644
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.h
@@ -26,7 +26,7 @@
 #include "QDS_Datum.h"
 
 #include <QMap>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QStringList>
 
 #include <Qtx.h>
diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index 5eb2929cc..efa5e081e 100644
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.cxx
@@ -27,7 +27,7 @@
 #include <QTimer>
 #include <QEvent>
 #include <QMessageBox>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 #include "QDS_Validator.h"
 #include <DDS_Dictionary.h>
diff --git a/src/QDS/QDS_LineEdit.cxx b/src/QDS/QDS_LineEdit.cxx
index c57509ce9..fd20cc4f3 100644
--- a/src/QDS/QDS_LineEdit.cxx
+++ b/src/QDS/QDS_LineEdit.cxx
@@ -23,7 +23,7 @@
 #include "QDS_LineEdit.h"
 
 #include <QLineEdit>
-#include <QValidator>
+#include <QtGui/QValidator>
 
 /*!
   \class QDS_LineEdit::Editor
diff --git a/src/QDS/QDS_Validator.h b/src/QDS/QDS_Validator.h
index eafd7ea42..d0dcb861a 100644
--- a/src/QDS/QDS_Validator.h
+++ b/src/QDS/QDS_Validator.h
@@ -25,7 +25,7 @@
 
 #include "QDS.h"
 
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class QDS_EXPORT QDS_IntegerValidator : public QIntValidator
 {
diff --git a/src/Qtx/QtxActionSet.cxx b/src/Qtx/QtxActionSet.cxx
index c12eaab75..37c0aaa99 100644
--- a/src/Qtx/QtxActionSet.cxx
+++ b/src/Qtx/QtxActionSet.cxx
@@ -22,7 +22,7 @@
 //
 #include "QtxActionSet.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxActionSet
diff --git a/src/Qtx/QtxActionToolMgr.cxx b/src/Qtx/QtxActionToolMgr.cxx
index 672f5b568..76dceead0 100644
--- a/src/Qtx/QtxActionToolMgr.cxx
+++ b/src/Qtx/QtxActionToolMgr.cxx
@@ -28,8 +28,8 @@
 #include "QtxAction.h"
 #include "QtxToolBar.h"
 
-#include <QApplication>
-#include <QHideEvent>
+#include <QtWidgets/QApplication>
+#include <QtGui/QHideEvent>
 #include <QMainWindow>
 
 /*!
diff --git a/src/Qtx/QtxBiColorTool.cxx b/src/Qtx/QtxBiColorTool.cxx
index 4ba74ad63..76fcb8650 100644
--- a/src/Qtx/QtxBiColorTool.cxx
+++ b/src/Qtx/QtxBiColorTool.cxx
@@ -25,7 +25,7 @@
 
 #include <QHBoxLayout>
 #include <QLabel>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QSlider>
 #include <QStyle>
 #include <QStylePainter>
diff --git a/src/Qtx/QtxBiColorTool.h b/src/Qtx/QtxBiColorTool.h
index bf4c9b697..6f442c177 100644
--- a/src/Qtx/QtxBiColorTool.h
+++ b/src/Qtx/QtxBiColorTool.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QWidget>
 
 class QLabel;
diff --git a/src/Qtx/QtxColorButton.cxx b/src/Qtx/QtxColorButton.cxx
index e62902060..4b69f709f 100644
--- a/src/Qtx/QtxColorButton.cxx
+++ b/src/Qtx/QtxColorButton.cxx
@@ -25,9 +25,9 @@
 #include <QMenu>
 #include <QStyle>
 #include <QLayout>
-#include <QBitmap>
-#include <QPainter>
-#include <QPaintEvent>
+#include <QtGui/QBitmap>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
 #include <QColorDialog>
 #include <QStyleOptionToolButton>
 
diff --git a/src/Qtx/QtxColorButton.h b/src/Qtx/QtxColorButton.h
index 13239b628..f1bba122e 100644
--- a/src/Qtx/QtxColorButton.h
+++ b/src/Qtx/QtxColorButton.h
@@ -26,8 +26,8 @@
 #include "Qtx.h"
 
 #include <QMap>
-#include <QColor>
-#include <QPixmap>
+#include <QtGui/QColor>
+#include <QtGui/QPixmap>
 #include <QToolButton>
 
 class QPaintDevice;
diff --git a/src/Qtx/QtxColorScale.cxx b/src/Qtx/QtxColorScale.cxx
index d90c92c75..b2a6e64f8 100644
--- a/src/Qtx/QtxColorScale.cxx
+++ b/src/Qtx/QtxColorScale.cxx
@@ -28,9 +28,9 @@
 #include <QMap>
 #include <QRegExp>
 #include <QStringList>
-#include <QPixmap>
-#include <QPainter>
-#include <QTextDocument>
+#include <QtGui/QPixmap>
+#include <QtGui/QPainter>
+#include <QtGui/QTextDocument>
 
 #include <math.h>
 
diff --git a/src/Qtx/QtxComboBox.cxx b/src/Qtx/QtxComboBox.cxx
index 6ba82ef0b..9fcb6cfd6 100644
--- a/src/Qtx/QtxComboBox.cxx
+++ b/src/Qtx/QtxComboBox.cxx
@@ -24,10 +24,10 @@
 
 #include "QtxComboBox.h"
 
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 #include <QLineEdit>
 #include <QEvent>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxComboBox::Model
diff --git a/src/Qtx/QtxDialog.cxx b/src/Qtx/QtxDialog.cxx
index dae191431..f36d498bf 100644
--- a/src/Qtx/QtxDialog.cxx
+++ b/src/Qtx/QtxDialog.cxx
@@ -27,11 +27,11 @@
 
 #include <QLabel>
 #include <QLayout>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QFrame>
 #include <QTabWidget>
 #include <QPushButton>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxDialog::Area
diff --git a/src/Qtx/QtxDialog.h b/src/Qtx/QtxDialog.h
index 6346e88cd..273dfd02f 100644
--- a/src/Qtx/QtxDialog.h
+++ b/src/Qtx/QtxDialog.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QMap>
 
 class QFrame;
diff --git a/src/Qtx/QtxDockWidget.cxx b/src/Qtx/QtxDockWidget.cxx
index d46bed62a..9aa4a25a7 100644
--- a/src/Qtx/QtxDockWidget.cxx
+++ b/src/Qtx/QtxDockWidget.cxx
@@ -28,8 +28,8 @@
 #include <QAction>
 #include <QLayout>
 #include <QMainWindow>
-#include <QResizeEvent>
-#include <QApplication>
+#include <QtGui/QResizeEvent>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxDockWidget::Watcher
diff --git a/src/Qtx/QtxDoubleSpinBox.cxx b/src/Qtx/QtxDoubleSpinBox.cxx
index 8bd521fb5..9d2380bce 100644
--- a/src/Qtx/QtxDoubleSpinBox.cxx
+++ b/src/Qtx/QtxDoubleSpinBox.cxx
@@ -23,7 +23,7 @@
 #include "QtxDoubleSpinBox.h"
 
 #include <QLineEdit>
-#include <QDoubleValidator>
+#include <QtGui/QDoubleValidator>
 #include <QVariant>
 
 #include <limits>
diff --git a/src/Qtx/QtxDoubleSpinBox.h b/src/Qtx/QtxDoubleSpinBox.h
index d960c3d90..00e822a84 100644
--- a/src/Qtx/QtxDoubleSpinBox.h
+++ b/src/Qtx/QtxDoubleSpinBox.h
@@ -26,7 +26,7 @@
 #include "Qtx.h"
 
 #include <QDoubleSpinBox>
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class QTX_EXPORT QtxDoubleSpinBox : public QDoubleSpinBox
 {
diff --git a/src/Qtx/QtxFontEdit.cxx b/src/Qtx/QtxFontEdit.cxx
index 5537138cd..c1abb3cbe 100644
--- a/src/Qtx/QtxFontEdit.cxx
+++ b/src/Qtx/QtxFontEdit.cxx
@@ -27,7 +27,7 @@
 #include <QLayout>
 #include <QToolButton>
 #include <QFontDialog>
-#include <QFontDatabase>
+#include <QtGui/QFontDatabase>
 #include <QFontComboBox>
 
 /*!
diff --git a/src/Qtx/QtxGroupBox.cxx b/src/Qtx/QtxGroupBox.cxx
index 80f03a2ce..b005a9e82 100644
--- a/src/Qtx/QtxGroupBox.cxx
+++ b/src/Qtx/QtxGroupBox.cxx
@@ -29,7 +29,7 @@
 #include <QHBoxLayout>
 #include <QEvent>
 #include <QObjectList>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxGroupBox
diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index 8b18e214c..fd8337123 100644
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.cxx
@@ -28,10 +28,10 @@
 #include <QMenu>
 #include <QLabel>
 #include <QVBoxLayout>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QListWidget>
 #include <QToolButton>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxListAction::ScrollEvent
diff --git a/src/Qtx/QtxLogoMgr.cxx b/src/Qtx/QtxLogoMgr.cxx
index 5eb786f16..09fd5de4c 100644
--- a/src/Qtx/QtxLogoMgr.cxx
+++ b/src/Qtx/QtxLogoMgr.cxx
@@ -26,13 +26,13 @@
 #include "QtxLogoMgr.h"
 
 #include <QLabel>
-#include <QImage>
-#include <QBitmap>
+#include <QtGui/QImage>
+#include <QtGui/QBitmap>
 #include <QHBoxLayout>
 #include <QMenuBar>
 #include <QPointer>
-#include <QApplication>
-#include <QMovie>
+#include <QtWidgets/QApplication>
+#include <QtGui/QMovie>
 
 /*!
   \class QtxLogoMgr::LogoBox
diff --git a/src/Qtx/QtxLogoMgr.h b/src/Qtx/QtxLogoMgr.h
index 83c960e45..4b806b03e 100644
--- a/src/Qtx/QtxLogoMgr.h
+++ b/src/Qtx/QtxLogoMgr.h
@@ -30,7 +30,7 @@
 
 #include <QObject>
 #include <QList>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 
 class QMenuBar;
 class QMovie;
diff --git a/src/Qtx/QtxMRUAction.cxx b/src/Qtx/QtxMRUAction.cxx
index c405713c1..6eadfe92c 100644
--- a/src/Qtx/QtxMRUAction.cxx
+++ b/src/Qtx/QtxMRUAction.cxx
@@ -28,7 +28,7 @@
 #include "QtxResourceMgr.h"
 
 #include <QMenu>
-#include <QIcon>
+#include <QtGui/QIcon>
 
 /*!
   \class QtxMRUAction
diff --git a/src/Qtx/QtxMainWindow.cxx b/src/Qtx/QtxMainWindow.cxx
index 64353bfa7..7d1655338 100644
--- a/src/Qtx/QtxMainWindow.cxx
+++ b/src/Qtx/QtxMainWindow.cxx
@@ -33,8 +33,8 @@
 #include <QMenuBar>
 #include <QStatusBar>
 #include <QRubberBand>
-#include <QMouseEvent>
-#include <QApplication>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
 #include <cstdio>
 /*!
diff --git a/src/Qtx/QtxMenu.cxx b/src/Qtx/QtxMenu.cxx
index 1fa4acad6..36514c6c9 100644
--- a/src/Qtx/QtxMenu.cxx
+++ b/src/Qtx/QtxMenu.cxx
@@ -24,12 +24,12 @@
 
 #include <QLabel>
 #include <QLayout>
-#include <QPainter>
-#include <QPaintEvent>
-#include <QTextDocument>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QTextDocument>
 #include <QWidgetAction>
-#include <QLinearGradient>
-#include <QAbstractTextDocumentLayout>
+#include <QtGui/QLinearGradient>
+#include <QtGui/QAbstractTextDocumentLayout>
 
 /*!
   \class QtxMenu::Title
diff --git a/src/Qtx/QtxMultiAction.cxx b/src/Qtx/QtxMultiAction.cxx
index 134afcf6b..13d75f959 100644
--- a/src/Qtx/QtxMultiAction.cxx
+++ b/src/Qtx/QtxMultiAction.cxx
@@ -25,10 +25,10 @@
 #include <QMenu>
 #include <QLayout>
 #include <QToolBar>
-#include <QPainter>
-#include <QHelpEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QHelpEvent>
 #include <QToolButton>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QStyleOptionButton>
 
 /*!
diff --git a/src/Qtx/QtxNotify.cxx b/src/Qtx/QtxNotify.cxx
index 87f79a09f..a953d8513 100644
--- a/src/Qtx/QtxNotify.cxx
+++ b/src/Qtx/QtxNotify.cxx
@@ -23,10 +23,10 @@
 #include "QtxNotify.h"
 
 #include <QTimer>
-#include <QPainter>
-#include <QMouseEvent>
-#include <QApplication>
-#include <QTextDocument>
+#include <QtGui/QPainter>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
+#include <QtGui/QTextDocument>
 #include <QDesktopWidget>
 #include <QSharedPointer>
 #include <QPropertyAnimation>
diff --git a/src/Qtx/QtxPagePrefMgr.cxx b/src/Qtx/QtxPagePrefMgr.cxx
index e7694954c..f1427c225 100644
--- a/src/Qtx/QtxPagePrefMgr.cxx
+++ b/src/Qtx/QtxPagePrefMgr.cxx
@@ -43,7 +43,7 @@
 #include <QSplitter>
 #include <QTabWidget>
 #include <QListWidget>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDateTimeEdit>
 #include <QStackedWidget>
 #include <QSlider>
diff --git a/src/Qtx/QtxPagePrefMgr.h b/src/Qtx/QtxPagePrefMgr.h
index bf9960338..952ea12e3 100644
--- a/src/Qtx/QtxPagePrefMgr.h
+++ b/src/Qtx/QtxPagePrefMgr.h
@@ -31,7 +31,7 @@
 #include <QFrame>
 #include <QLabel>
 #include <QPointer>
-#include <QIcon>
+#include <QtGui/QIcon>
 
 class QtxGridBox;
 class QtxFontEdit;
diff --git a/src/Qtx/QtxPathDialog.cxx b/src/Qtx/QtxPathDialog.cxx
index 3f7733af0..9e48f4571 100644
--- a/src/Qtx/QtxPathDialog.cxx
+++ b/src/Qtx/QtxPathDialog.cxx
@@ -30,7 +30,7 @@
 
 #include <QDir>
 #include <QLabel>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QLayout>
 #include <QLineEdit>
 #include <QObjectList>
diff --git a/src/Qtx/QtxPathEdit.cxx b/src/Qtx/QtxPathEdit.cxx
index 00e19967a..10d50ffea 100644
--- a/src/Qtx/QtxPathEdit.cxx
+++ b/src/Qtx/QtxPathEdit.cxx
@@ -22,15 +22,15 @@
 //
 #include "QtxPathEdit.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QLayout>
 #include <QDirModel>
 #include <QLineEdit>
 #include <QCompleter>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QToolButton>
 #include <QFileDialog>
-#include <QRegExpValidator>
+#include <QtGui/QRegExpValidator>
 
 static const char* browse_icon[] = {
 "16 16 5 1",
diff --git a/src/Qtx/QtxPathListEdit.cxx b/src/Qtx/QtxPathListEdit.cxx
index 414afcd7c..08b7c4662 100644
--- a/src/Qtx/QtxPathListEdit.cxx
+++ b/src/Qtx/QtxPathListEdit.cxx
@@ -25,10 +25,10 @@
 #include "QtxPathEdit.h"
 
 #include <QLayout>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QListView>
 #include <QLineEdit>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QDirModel>
 #include <QCompleter>
 #include <QToolButton>
diff --git a/src/Qtx/QtxPreferenceMgr.cxx b/src/Qtx/QtxPreferenceMgr.cxx
index e63c43e7a..db6807c08 100644
--- a/src/Qtx/QtxPreferenceMgr.cxx
+++ b/src/Qtx/QtxPreferenceMgr.cxx
@@ -25,7 +25,7 @@
 #include "QtxResourceMgr.h"
 
 #include <QEvent>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxPreferenceItem::Updater
diff --git a/src/Qtx/QtxPreferenceMgr.h b/src/Qtx/QtxPreferenceMgr.h
index d81dc05cf..7e4314020 100644
--- a/src/Qtx/QtxPreferenceMgr.h
+++ b/src/Qtx/QtxPreferenceMgr.h
@@ -29,9 +29,9 @@
 
 #include "Qtx.h"
 
-#include <QFont>
-#include <QIcon>
-#include <QColor>
+#include <QtGui/QFont>
+#include <QtGui/QIcon>
+#include <QtGui/QColor>
 #include <QVariant>
 
 class QtxResourceMgr;
diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index 711893b92..3abd8cea9 100644
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -32,7 +32,7 @@
 #include <QFileInfo>
 #include <QRegExp>
 #include <QTextStream>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QLibraryInfo>
 #include <QtDebug>
 #ifndef QT_NO_DOM
diff --git a/src/Qtx/QtxResourceMgr.h b/src/Qtx/QtxResourceMgr.h
index 5f9c1a2d0..48389b013 100644
--- a/src/Qtx/QtxResourceMgr.h
+++ b/src/Qtx/QtxResourceMgr.h
@@ -34,14 +34,14 @@
 
 #include <QMap>
 #include <QList>
-#include <QFont>
-#include <QColor>
-#include <QPixmap>
+#include <QtGui/QFont>
+#include <QtGui/QColor>
+#include <QtGui/QPixmap>
 #include <QByteArray>
 #include <QStringList>
-#include <QLinearGradient>
-#include <QRadialGradient>
-#include <QConicalGradient>
+#include <QtGui/QLinearGradient>
+#include <QtGui/QRadialGradient>
+#include <QtGui/QConicalGradient>
 
 class QTranslator;
 
diff --git a/src/Qtx/QtxRubberBand.cxx b/src/Qtx/QtxRubberBand.cxx
index fe4bbd6a7..260b5c239 100644
--- a/src/Qtx/QtxRubberBand.cxx
+++ b/src/Qtx/QtxRubberBand.cxx
@@ -22,12 +22,12 @@
 //
 #include "QtxRubberBand.h"
 
-#include <QBitmap>
-#include <QImage>
-#include <QPaintEvent>
-#include <QPainter>
-#include <QPalette>
-#include <QShowEvent>
+#include <QtGui/QBitmap>
+#include <QtGui/QImage>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QPainter>
+#include <QtGui/QPalette>
+#include <QtGui/QShowEvent>
 #include <QVectorIterator>
 
 #include <math.h>
diff --git a/src/Qtx/QtxSearchTool.cxx b/src/Qtx/QtxSearchTool.cxx
index 91869f27d..c8421528e 100644
--- a/src/Qtx/QtxSearchTool.cxx
+++ b/src/Qtx/QtxSearchTool.cxx
@@ -22,11 +22,11 @@
 //
 #include "QtxSearchTool.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QCheckBox>
 #include <QEvent>
 #include <QHBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLineEdit>
 #include <QPersistentModelIndex>
 #include <QShortcut>
diff --git a/src/Qtx/QtxShortcutEdit.cxx b/src/Qtx/QtxShortcutEdit.cxx
index 5f430ee40..e23119d96 100644
--- a/src/Qtx/QtxShortcutEdit.cxx
+++ b/src/Qtx/QtxShortcutEdit.cxx
@@ -28,8 +28,8 @@
 #include <QTableWidgetItem>
 #include <QMessageBox>
 
-#include <QKeyEvent>
-#include <QKeySequence>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QKeySequence>
 
 #define COLUMN_SIZE  500
 
diff --git a/src/Qtx/QtxSplash.cxx b/src/Qtx/QtxSplash.cxx
index e3c68a583..19cbb5319 100644
--- a/src/Qtx/QtxSplash.cxx
+++ b/src/Qtx/QtxSplash.cxx
@@ -27,8 +27,8 @@
 #include "QtxResourceMgr.h"
 #include <cstdio>
 
-#include <QApplication>
-#include <QPainter>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPainter>
 #include <QMessageBox>
 #include <QDesktopWidget>
 
diff --git a/src/Qtx/QtxSplash.h b/src/Qtx/QtxSplash.h
index 4a33f2e26..8bcc2c208 100644
--- a/src/Qtx/QtxSplash.h
+++ b/src/Qtx/QtxSplash.h
@@ -29,8 +29,8 @@
 #include "Qtx.h"
 
 #include <QWidget>
-#include <QPixmap>
-#include <QGradient>
+#include <QtGui/QPixmap>
+#include <QtGui/QGradient>
 #include <QMap>
 
 #ifdef WIN32
diff --git a/src/Qtx/QtxToolBar.cxx b/src/Qtx/QtxToolBar.cxx
index 89e7c7e12..0e5d382b4 100644
--- a/src/Qtx/QtxToolBar.cxx
+++ b/src/Qtx/QtxToolBar.cxx
@@ -27,7 +27,7 @@
 
 #include <QAction>
 #include <QMainWindow>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!
   \class QtxToolBar::Watcher
diff --git a/src/Qtx/QtxToolButton.cxx b/src/Qtx/QtxToolButton.cxx
index 35565f831..826a47001 100644
--- a/src/Qtx/QtxToolButton.cxx
+++ b/src/Qtx/QtxToolButton.cxx
@@ -20,8 +20,8 @@
 #include "QtxToolButton.h"
 #include "QtxMenu.h"
 
-#include <QKeyEvent>
-#include <QWheelEvent>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QWheelEvent>
 
 namespace
 {
diff --git a/src/Qtx/QtxToolTip.cxx b/src/Qtx/QtxToolTip.cxx
index a50bb3b28..c45eec420 100644
--- a/src/Qtx/QtxToolTip.cxx
+++ b/src/Qtx/QtxToolTip.cxx
@@ -25,13 +25,13 @@
 //
 #include "QtxToolTip.h"
 
-#include <QFont>
+#include <QtGui/QFont>
 #include <QTimer>
-#include <QCursor>
-#include <QFontMetrics>
-#include <QApplication>
-#include <QPalette>
-#include <QMouseEvent>
+#include <QtGui/QCursor>
+#include <QtGui/QFontMetrics>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPalette>
+#include <QtGui/QMouseEvent>
 
 #define TOOLTIP_SHOW_DELAY 0500
 #define TOOLTIP_HIDE_DELAY 7000
diff --git a/src/Qtx/QtxTreeView.cxx b/src/Qtx/QtxTreeView.cxx
index 1147f4349..5206cc00e 100644
--- a/src/Qtx/QtxTreeView.cxx
+++ b/src/Qtx/QtxTreeView.cxx
@@ -24,7 +24,7 @@
 
 #include <QHeaderView>
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 /*!
   \class QtxTreeView::Header
diff --git a/src/Qtx/QtxValidator.h b/src/Qtx/QtxValidator.h
index b93a6b59f..8904032b3 100644
--- a/src/Qtx/QtxValidator.h
+++ b/src/Qtx/QtxValidator.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class QTX_EXPORT QtxIntValidator : public QIntValidator
 {
diff --git a/src/Qtx/QtxWebBrowser.cxx b/src/Qtx/QtxWebBrowser.cxx
index 5c1d70a1e..14ef0fd3e 100644
--- a/src/Qtx/QtxWebBrowser.cxx
+++ b/src/Qtx/QtxWebBrowser.cxx
@@ -27,7 +27,7 @@
 #include "QtxResourceMgr.h"
 #include "QtxSearchTool.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QFileDialog>
diff --git a/src/Qtx/QtxWebBrowser.h b/src/Qtx/QtxWebBrowser.h
index bd3e695bf..041609591 100644
--- a/src/Qtx/QtxWebBrowser.h
+++ b/src/Qtx/QtxWebBrowser.h
@@ -30,7 +30,7 @@
 #include "Qtx.h"
 
 #include <QtGlobal>
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include <QMainWindow>
 #include <QUrl>
 
diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx
index 41eb47fc4..fde056f4c 100644
--- a/src/Qtx/QtxWorkstack.cxx
+++ b/src/Qtx/QtxWorkstack.cxx
@@ -31,12 +31,12 @@
 #include <QStyle>
 #include <QRegExp>
 #include <QLayout>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QDataStream>
-#include <QFocusEvent>
-#include <QMouseEvent>
+#include <QtGui/QFocusEvent>
+#include <QtGui/QMouseEvent>
 #include <QRubberBand>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QStyleOption>
 #include <QInputDialog>
 #include <QStackedWidget>
diff --git a/src/Qtx/QtxWorkstackAction.cxx b/src/Qtx/QtxWorkstackAction.cxx
index dadbd0788..913862541 100644
--- a/src/Qtx/QtxWorkstackAction.cxx
+++ b/src/Qtx/QtxWorkstackAction.cxx
@@ -28,7 +28,7 @@
 #include "QtxWorkstack.h"
 
 #include <QMenu>
-#include <QWidgetList>
+#include <QtGui/QWidgetList>
 #include <QGroupBox>
 #include <QVBoxLayout>
 #include <QHBoxLayout>
@@ -37,8 +37,8 @@
 #include <QListWidget>
 #include <QStackedLayout>
 #include <QToolButton>
-#include <QIcon>
-#include <QPixmap>
+#include <QtGui/QIcon>
+#include <QtGui/QPixmap>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QLabel>
diff --git a/src/Qtx/QtxWorkstackAction.h b/src/Qtx/QtxWorkstackAction.h
index 03525db83..17103a1ad 100644
--- a/src/Qtx/QtxWorkstackAction.h
+++ b/src/Qtx/QtxWorkstackAction.h
@@ -27,7 +27,7 @@
 #define QTXWORKSTACKACTION_H
 
 #include "QtxActionSet.h"
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QtxWorkstack;
 class QRadioButton;
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
index 2b4b64e01..9c41399cb 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
@@ -28,7 +28,7 @@
 #include "PyInterp_Interp.h" // !!! WARNING !!! THIS INCLUDE MUST BE THE VERY FIRST !!!
 #include "LightApp_Module.h"
 
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QMap>
 #include <QStringList>
 
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
index a811775e1..039b7d2be 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
@@ -40,7 +40,7 @@
 #include "SUIT_ViewModel.h"
 #include "SUIT_ViewWindow.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomElement>
 #include <QtXml/QDomNode>
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
index 095b88507..cea72baf1 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
@@ -28,7 +28,7 @@
 
 #include "PyInterp_Interp.h" // !!! WARNING !!! THIS INCLUDE MUST BE THE VERY FIRST !!!
 
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QList>
 #include <QMap>
 #include <QObject>
diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
index 825bcc9c0..2b6a58604 100644
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
@@ -67,8 +67,8 @@
 #include "PyConsole_Console.h"
 
 #include <QAction>
-#include <QApplication>
-#include <QPaintEvent>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPaintEvent>
 #include <QCoreApplication>
 #include <QVBoxLayout>
 
diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 90b52419f..187dd7bd7 100644
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@ -30,7 +30,7 @@
 
 #include <QObject>
 #include <QString>
-#include <QColor>
+#include <QtGui/QColor>
 
 #include <LightApp_Application.h>
 #ifndef GUI_DISABLE_CORBA
diff --git a/src/SPlot2d/SPlot2d_ViewModel.cxx b/src/SPlot2d/SPlot2d_ViewModel.cxx
index 2a53ff69d..0a8074fd7 100644
--- a/src/SPlot2d/SPlot2d_ViewModel.cxx
+++ b/src/SPlot2d/SPlot2d_ViewModel.cxx
@@ -36,10 +36,10 @@
 
 #include "SALOME_ListIO.hxx"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QToolBar>
 #include <QToolButton>
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QColorDialog>
 
 //#include <qwt_math>
diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index 523d571df..58845aff9 100644
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -41,7 +41,7 @@
 #include <QStatusBar>
 #include <QCloseEvent>
 #include <QFileDialog>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!Create and return new instance of STD_Application*/
 extern "C" STD_EXPORT SUIT_Application* createApplication()
diff --git a/src/SUIT/SUIT_Accel.cxx b/src/SUIT/SUIT_Accel.cxx
index a367df284..fe64fb319 100644
--- a/src/SUIT/SUIT_Accel.cxx
+++ b/src/SUIT/SUIT_Accel.cxx
@@ -30,7 +30,7 @@
 
 #include <QCoreApplication>
 #include <QEvent>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   \class SUIT_Accel
diff --git a/src/SUIT/SUIT_ActionOperation.h b/src/SUIT/SUIT_ActionOperation.h
index 0ccdf9df7..19f9e80c7 100644
--- a/src/SUIT/SUIT_ActionOperation.h
+++ b/src/SUIT/SUIT_ActionOperation.h
@@ -25,7 +25,7 @@
 
 #include "SUIT_Operation.h"
 
-#include <QKeySequence>
+#include <QtGui/QKeySequence>
 
 class QIcon;
 class QString;
diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx
index cdd063ff0..fd157553b 100644
--- a/src/SUIT/SUIT_Application.cxx
+++ b/src/SUIT/SUIT_Application.cxx
@@ -31,7 +31,7 @@
 #include <QTimer>
 #include <QLabel>
 #include <QStatusBar>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QSize>
 
 #include <QtxAction.h>
diff --git a/src/SUIT/SUIT_DataObject.h b/src/SUIT/SUIT_DataObject.h
index 35e4239af..09f6185f1 100644
--- a/src/SUIT/SUIT_DataObject.h
+++ b/src/SUIT/SUIT_DataObject.h
@@ -33,8 +33,8 @@
 #include <QList>
 #include <QObject>
 #include <QString>
-#include <QPixmap>
-#include <QFont>
+#include <QtGui/QPixmap>
+#include <QtGui/QFont>
 
 class SUIT_DataObject;
 class SUIT_DataObjectKey;
diff --git a/src/SUIT/SUIT_Desktop.cxx b/src/SUIT/SUIT_Desktop.cxx
index 71d888c31..c34781c1b 100644
--- a/src/SUIT/SUIT_Desktop.cxx
+++ b/src/SUIT/SUIT_Desktop.cxx
@@ -30,7 +30,7 @@
 
 #include <QPointer>
 #include <QCloseEvent>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!\class SUIT_Desktop
  * Provide desktop management:\n
diff --git a/src/SUIT/SUIT_ExceptionHandler.cxx b/src/SUIT/SUIT_ExceptionHandler.cxx
index 14a02e876..15a393746 100644
--- a/src/SUIT/SUIT_ExceptionHandler.cxx
+++ b/src/SUIT/SUIT_ExceptionHandler.cxx
@@ -24,7 +24,7 @@
 
 #include "SUIT_MessageBox.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!\class SUIT_ExceptionHandler
  * Show exception message on error handler.
diff --git a/src/SUIT/SUIT_FileDlg.cxx b/src/SUIT/SUIT_FileDlg.cxx
index 3da672826..462ba0cdb 100644
--- a/src/SUIT/SUIT_FileDlg.cxx
+++ b/src/SUIT/SUIT_FileDlg.cxx
@@ -89,7 +89,7 @@
 #include <QComboBox>
 #include <QPushButton>
 #include <QGridLayout>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QListView>
 #include <QLineEdit>
 #include <QUrl>
diff --git a/src/SUIT/SUIT_LicenseDlg.cxx b/src/SUIT/SUIT_LicenseDlg.cxx
index 2282389dd..a674d3816 100644
--- a/src/SUIT/SUIT_LicenseDlg.cxx
+++ b/src/SUIT/SUIT_LicenseDlg.cxx
@@ -19,7 +19,7 @@
 
 #include "SUIT_LicenseDlg.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QTextEdit>
 #include <QLayout> 
 #include <QPushButton>
@@ -27,8 +27,8 @@
 #include <QFile>
 #include <QtPrintSupport/QPrinter>
 //#include <QSimpleRichText>
-#include <QTextDocument>
-#include <QPainter>
+#include <QtGui/QTextDocument>
+#include <QtGui/QPainter>
 
 #include <math.h>
 
diff --git a/src/SUIT/SUIT_LicenseDlg.h b/src/SUIT/SUIT_LicenseDlg.h
index f4f005ac8..cb8dbb49b 100644
--- a/src/SUIT/SUIT_LicenseDlg.h
+++ b/src/SUIT/SUIT_LicenseDlg.h
@@ -22,7 +22,7 @@
 
 #include "SUIT.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 class QTextEdit;
 
 #ifdef WIN32
diff --git a/src/SUIT/SUIT_MessageBox.cxx b/src/SUIT/SUIT_MessageBox.cxx
index 7f07debc6..67225980f 100644
--- a/src/SUIT/SUIT_MessageBox.cxx
+++ b/src/SUIT/SUIT_MessageBox.cxx
@@ -26,7 +26,7 @@
 
 #include <QMessageBox>
 #include <QPushButton>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QString>
 
 #include <stdarg.h>
diff --git a/src/SUIT/SUIT_OverrideCursor.cxx b/src/SUIT/SUIT_OverrideCursor.cxx
index 6fadf1578..c70467004 100644
--- a/src/SUIT/SUIT_OverrideCursor.cxx
+++ b/src/SUIT/SUIT_OverrideCursor.cxx
@@ -22,7 +22,7 @@
 
 #include "SUIT_OverrideCursor.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 /*!Constructor. Initialize wait cursor.*/
 SUIT_OverrideCursor::SUIT_OverrideCursor()
diff --git a/src/SUIT/SUIT_OverrideCursor.h b/src/SUIT/SUIT_OverrideCursor.h
index b420b82dd..f19ca5188 100644
--- a/src/SUIT/SUIT_OverrideCursor.h
+++ b/src/SUIT/SUIT_OverrideCursor.h
@@ -26,7 +26,7 @@
 #include "SUIT.h"
 
 #include <QList>
-#include <QCursor>
+#include <QtGui/QCursor>
 
 /*! \brief Class used for management cursors.*/
 class SUIT_EXPORT SUIT_OverrideCursor
diff --git a/src/SUIT/SUIT_ResourceMgr.cxx b/src/SUIT/SUIT_ResourceMgr.cxx
index 6da123a54..256245f69 100644
--- a/src/SUIT/SUIT_ResourceMgr.cxx
+++ b/src/SUIT/SUIT_ResourceMgr.cxx
@@ -25,7 +25,7 @@
 
 #include <QDir>
 #include <QFileInfo>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QRegExp>
 
 #ifndef WIN32
diff --git a/src/SUIT/SUIT_Session.cxx b/src/SUIT/SUIT_Session.cxx
index 630d97387..54cee5f9e 100644
--- a/src/SUIT/SUIT_Session.cxx
+++ b/src/SUIT/SUIT_Session.cxx
@@ -28,7 +28,7 @@
 #include "SUIT_ExceptionHandler.h"
 #include "SUIT_ResourceMgr.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/SUIT/SUIT_ShortcutMgr.cxx b/src/SUIT/SUIT_ShortcutMgr.cxx
index e7ba1d1bf..b469bbdd2 100644
--- a/src/SUIT/SUIT_ShortcutMgr.cxx
+++ b/src/SUIT/SUIT_ShortcutMgr.cxx
@@ -27,7 +27,7 @@
 
 #include <QtxAction.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QActionEvent>
 
 SUIT_ShortcutMgr* SUIT_ShortcutMgr::myShortcutMgr = NULL;
diff --git a/src/SUIT/SUIT_Tools.h b/src/SUIT/SUIT_Tools.h
index a2a54645a..8357d0d66 100644
--- a/src/SUIT/SUIT_Tools.h
+++ b/src/SUIT/SUIT_Tools.h
@@ -29,7 +29,7 @@
 
 #include <QRect>
 #include <QString>
-#include <QFont>
+#include <QtGui/QFont>
 
 /*!
   \class SUIT_Tools
diff --git a/src/SUIT/SUIT_TreeModel.cxx b/src/SUIT/SUIT_TreeModel.cxx
index 8feae8ad9..466bec821 100644
--- a/src/SUIT/SUIT_TreeModel.cxx
+++ b/src/SUIT/SUIT_TreeModel.cxx
@@ -26,7 +26,7 @@
 #include "SUIT_DataObject.h"
 #include "SUIT_ResourceMgr.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QHash>
 #include <QMimeData>
 
diff --git a/src/SUIT/SUIT_ViewManager.cxx b/src/SUIT/SUIT_ViewManager.cxx
index c730d92e3..5ad57f413 100644
--- a/src/SUIT/SUIT_ViewManager.cxx
+++ b/src/SUIT/SUIT_ViewManager.cxx
@@ -30,7 +30,7 @@
 
 #include <QMap>
 #include <QRegExp>
-#include <QIcon>
+#include <QtGui/QIcon>
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/SUIT/SUIT_ViewManager.h b/src/SUIT/SUIT_ViewManager.h
index a77302cf2..45e72e8a7 100644
--- a/src/SUIT/SUIT_ViewManager.h
+++ b/src/SUIT/SUIT_ViewManager.h
@@ -28,7 +28,7 @@
 #include "SUIT_PopupClient.h"
 
 #include <QObject>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QVector>
 #include <QPointer>
 
diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx
index 78b60849b..bf4772ead 100644
--- a/src/SUIT/SUIT_ViewWindow.cxx
+++ b/src/SUIT/SUIT_ViewWindow.cxx
@@ -37,9 +37,9 @@
 #include "QtxMultiAction.h"
 
 #include <QEvent>
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QMenu>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QContextMenuEvent>
 
 /*!\class SUIT_ViewWindow
diff --git a/src/SUITApp/SUITApp_Application.h b/src/SUITApp/SUITApp_Application.h
index c6d9b31c0..8952eaaee 100644
--- a/src/SUITApp/SUITApp_Application.h
+++ b/src/SUITApp/SUITApp_Application.h
@@ -23,7 +23,7 @@
 #ifndef SUITAPP_APPLICATION_H
 #define SUITAPP_APPLICATION_H
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 
 class SUIT_ExceptionHandler;
 
diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index 1a90f7239..65f946ffd 100644
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.cxx
@@ -59,7 +59,7 @@
 
 #include <QtxRubberBand.h>
 
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QWidget>
 #include <QPolygon>
 
diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h
index ae757ad08..354f6731d 100644
--- a/src/SVTK/SVTK_InteractorStyle.h
+++ b/src/SVTK/SVTK_InteractorStyle.h
@@ -36,7 +36,7 @@
 #include <vtkInteractorStyle.h>
 #include <vtkSmartPointer.h>
 
-#include <QCursor>
+#include <QtGui/QCursor>
 #include <QtxRubberBand.h>
 
 #include <map>
diff --git a/src/SVTK/SVTK_PsOptionsDlg.h b/src/SVTK/SVTK_PsOptionsDlg.h
index 39aee11ae..0573c9c19 100644
--- a/src/SVTK/SVTK_PsOptionsDlg.h
+++ b/src/SVTK/SVTK_PsOptionsDlg.h
@@ -20,7 +20,7 @@
 #ifndef SVTK_PSOPTIONSDLG_H
 #define SVTK_PSOPTIONSDLG_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QtxDoubleSpinBox;
 class QCheckBox;
diff --git a/src/SVTK/SVTK_Recorder.cxx b/src/SVTK/SVTK_Recorder.cxx
index 0326124d0..77a08d2cb 100644
--- a/src/SVTK/SVTK_Recorder.cxx
+++ b/src/SVTK/SVTK_Recorder.cxx
@@ -39,7 +39,7 @@
 #include <unistd.h>
 #endif
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QFileInfo>
 #include <QDir>
 
diff --git a/src/SVTK/SVTK_RecorderDlg.cxx b/src/SVTK/SVTK_RecorderDlg.cxx
index b8816ad77..af32c7f67 100644
--- a/src/SVTK/SVTK_RecorderDlg.cxx
+++ b/src/SVTK/SVTK_RecorderDlg.cxx
@@ -33,7 +33,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QGroupBox>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLabel>
 #include <QLayout>
 #include <QLineEdit>
diff --git a/src/SVTK/SVTK_RecorderDlg.h b/src/SVTK/SVTK_RecorderDlg.h
index d0bb078ad..d03028da5 100644
--- a/src/SVTK/SVTK_RecorderDlg.h
+++ b/src/SVTK/SVTK_RecorderDlg.h
@@ -20,7 +20,7 @@
 #ifndef SVTK_RECORDERDLG_H
 #define SVTK_RECORDERDLG_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QCheckBox;
 class QComboBox;
diff --git a/src/SVTK/SVTK_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx
index e7026ded2..617975fed 100644
--- a/src/SVTK/SVTK_RenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_RenderWindowInteractor.cxx
@@ -38,7 +38,7 @@
 #include <xcb/xcb.h>
 #include <QX11Info>
 #endif
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 
 #include "SVTK_SpaceMouse.h" 
 #include "SVTK_Event.h" 
diff --git a/src/SVTK/SVTK_SetRotationPointDlg.cxx b/src/SVTK/SVTK_SetRotationPointDlg.cxx
index b53ff0e3b..f2d1fb95a 100644
--- a/src/SVTK/SVTK_SetRotationPointDlg.cxx
+++ b/src/SVTK/SVTK_SetRotationPointDlg.cxx
@@ -40,7 +40,7 @@
 #include <QPushButton>
 #include <QMenu>
 #include <QGridLayout>
-#include <QDoubleValidator>
+#include <QtGui/QDoubleValidator>
 #include <QCheckBox>
 
 #include <vtkCallbackCommand.h>
diff --git a/src/SVTK/SVTK_ViewModel.h b/src/SVTK/SVTK_ViewModel.h
index 3b6e56dbb..98387e5fa 100644
--- a/src/SVTK/SVTK_ViewModel.h
+++ b/src/SVTK/SVTK_ViewModel.h
@@ -33,7 +33,7 @@
 #include <SALOME_InteractiveObject.hxx>
 #include <SALOME_ListIO.hxx>
 
-#include <QColor>
+#include <QtGui/QColor>
 #include <QMap>
 
 class QMouseEvent;
diff --git a/src/SVTK/SVTK_ViewParameterDlg.cxx b/src/SVTK/SVTK_ViewParameterDlg.cxx
index a555c4794..538c0647d 100644
--- a/src/SVTK/SVTK_ViewParameterDlg.cxx
+++ b/src/SVTK/SVTK_ViewParameterDlg.cxx
@@ -36,7 +36,7 @@
 #include <QLabel>
 #include <QPushButton>
 #include <QGridLayout>
-#include <QDoubleValidator>
+#include <QtGui/QDoubleValidator>
 #include <QCheckBox>
 #include <QRadioButton>
 #include <QButtonGroup>
diff --git a/src/SVTK/SVTK_ViewWindow.h b/src/SVTK/SVTK_ViewWindow.h
index db129ddf2..cc9ef4cf2 100644
--- a/src/SVTK/SVTK_ViewWindow.h
+++ b/src/SVTK/SVTK_ViewWindow.h
@@ -35,7 +35,7 @@
 #include "SALOME_InteractiveObject.hxx"
 #include "SALOME_ListIO.hxx"
 
-#include <QImage>
+#include <QtGui/QImage>
 #include <vtkSmartPointer.h>
 
 class SUIT_Desktop;
diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index db4f12447..7df168366 100644
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -84,7 +84,7 @@
 #include <Utils_SINGLETON.hxx>
 #include <SALOME_LifeCycleCORBA.hxx>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QWidget>
 #include <QAction>
 #include <QRegExp>
diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
index 5e0c82bf4..a5dc98354 100644
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
@@ -34,7 +34,7 @@
 #include "SALOMEDSClient_ClientFactory.hxx" 
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLineEdit>
 #include <QToolTip>
 #include <QRegExp>
diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.h b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
index c7d7819f3..0edcb884a 100644
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.h
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
@@ -27,7 +27,7 @@
 
 #include <QtxDoubleSpinBox.h>
 
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class SALOMEAPP_EXPORT SalomeApp_DoubleSpinBox : public QtxDoubleSpinBox
 {
diff --git a/src/SalomeApp/SalomeApp_Engine_i.cxx b/src/SalomeApp/SalomeApp_Engine_i.cxx
index ffa142935..861d912ea 100644
--- a/src/SalomeApp/SalomeApp_Engine_i.cxx
+++ b/src/SalomeApp/SalomeApp_Engine_i.cxx
@@ -38,7 +38,7 @@
 #include <Utils_SALOME_Exception.hxx>
 #include <utilities.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDir>
 #include <QFile>
 
diff --git a/src/SalomeApp/SalomeApp_ExitDlg.h b/src/SalomeApp/SalomeApp_ExitDlg.h
index ed5134669..ddc1b1e0e 100644
--- a/src/SalomeApp/SalomeApp_ExitDlg.h
+++ b/src/SalomeApp/SalomeApp_ExitDlg.h
@@ -23,7 +23,7 @@
 #ifndef SALOMEAPP_EXITDLG_H
 #define SALOMEAPP_EXITDLG_H
 
-#include <QDialog> 
+#include <QtWidgets/QDialog> 
 
 class QCheckBox;
 
diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
index 0a93a06a1..da6657d03 100644
--- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
@@ -34,7 +34,7 @@
 #include "SALOMEDSClient_ClientFactory.hxx" 
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLineEdit>
 #include <QToolTip>
 #include <QRegExp>
diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.h b/src/SalomeApp/SalomeApp_IntSpinBox.h
index 192124706..aff04f2ab 100644
--- a/src/SalomeApp/SalomeApp_IntSpinBox.h
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.h
@@ -27,7 +27,7 @@
 
 #include <QtxIntSpinBox.h>
 
-#include <QValidator>
+#include <QtGui/QValidator>
 
 class SALOMEAPP_EXPORT SalomeApp_IntSpinBox : public QtxIntSpinBox
 {
diff --git a/src/SalomeApp/SalomeApp_ListView.cxx b/src/SalomeApp/SalomeApp_ListView.cxx
index 62b52d73a..f65d11c2d 100644
--- a/src/SalomeApp/SalomeApp_ListView.cxx
+++ b/src/SalomeApp/SalomeApp_ListView.cxx
@@ -31,11 +31,11 @@
 
 #include "utilities.h"
 
-#include <QValidator>
+#include <QtGui/QValidator>
 #include <QToolButton>
-#include <QPixmap>
+#include <QtGui/QPixmap>
 #include <QHeaderView>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 #include <TColStd_ListOfInteger.hxx>
 #include <TColStd_ListOfReal.hxx>
diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
index aa1f2f0b4..b84b97d70 100644
--- a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
+++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
@@ -22,7 +22,7 @@
 
 #include "SalomeApp.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QListWidget;
 class QPushButton;
diff --git a/src/SalomeApp/SalomeApp_NoteBook.cxx b/src/SalomeApp/SalomeApp_NoteBook.cxx
index b848e16cd..f55f5f2c9 100644
--- a/src/SalomeApp/SalomeApp_NoteBook.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBook.cxx
@@ -43,10 +43,10 @@
 #include <QTableWidget>
 #include <QTableWidgetItem>
 #include <QPushButton>
-#include <QFont>
+#include <QtGui/QFont>
 #include <QGroupBox>
 #include <QList>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDir>
 
 #include <string>
diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
index 9997bfb67..1e64bacb9 100644
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
@@ -29,7 +29,7 @@
 
 #include "SalomeApp.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx
index 37d5c2bfc..a6db48879 100644
--- a/src/SalomeApp/SalomeApp_VisualState.cxx
+++ b/src/SalomeApp/SalomeApp_VisualState.cxx
@@ -35,7 +35,7 @@
 #include <STD_TabDesktop.h>
 
 #include <QList>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMultiHash>
 
 #include <SALOMEDSClient_ClientFactory.hxx>//?
diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index a73426a5d..e6cb5d2d3 100644
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -65,7 +65,7 @@
 #endif
 #include <time.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDir>
 #include <QFile>
 #include <QMutex>
diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx
index 502458918..4ebd1d4ef 100644
--- a/src/Session/Session_ServerCheck.cxx
+++ b/src/Session/Session_ServerCheck.cxx
@@ -39,7 +39,7 @@
 #include "utilities.h"
 #include "Qtx.h"
 
-#include <QApplication> 
+#include <QtWidgets/QApplication> 
 #include <QWaitCondition>
 #include <QMutexLocker>
 #include <QStringList>
diff --git a/src/Style/Style_Model.cxx b/src/Style/Style_Model.cxx
index 19a6da330..c43bd0283 100644
--- a/src/Style/Style_Model.cxx
+++ b/src/Style/Style_Model.cxx
@@ -25,10 +25,10 @@
 
 #include <QtxResourceMgr.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QColor>
-#include <QFont>
-#include <QPalette>
+#include <QtGui/QFont>
+#include <QtGui/QPalette>
 
 /*!
   \brief Mix two colors to get color with averaged red, green, blue and alpha-channel values
diff --git a/src/Style/Style_Model.h b/src/Style/Style_Model.h
index b05b3f6cd..034c57f59 100644
--- a/src/Style/Style_Model.h
+++ b/src/Style/Style_Model.h
@@ -27,8 +27,8 @@
 
 #include <QMap>
 #include <QString>
-#include <QPalette>
-#include <QFont>
+#include <QtGui/QPalette>
+#include <QtGui/QFont>
 
 class QStyle;
 class QtxResourceMgr;
diff --git a/src/Style/Style_PrefDlg.cxx b/src/Style/Style_PrefDlg.cxx
index f95977daf..b8bb76e4b 100644
--- a/src/Style/Style_PrefDlg.cxx
+++ b/src/Style/Style_PrefDlg.cxx
@@ -29,7 +29,7 @@
 #include <QtxDoubleSpinBox.h>
 #include <QtxFontEdit.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QColorDialog>
@@ -37,7 +37,7 @@
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QHBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QLabel>
 #include <QListWidget>
 #include <QMap>
diff --git a/src/Style/Style_Salome.cxx b/src/Style/Style_Salome.cxx
index 2e3012529..163893d0c 100644
--- a/src/Style/Style_Salome.cxx
+++ b/src/Style/Style_Salome.cxx
@@ -24,8 +24,8 @@
 #include "Style_Tools.h"
 #include "Style_Model.h"
 
-#include <QApplication>
-#include <QPainter>
+#include <QtWidgets/QApplication>
+#include <QtGui/QPainter>
 #include <QMap>
 #include <QPainterPath>
 #include <QWidget>
diff --git a/src/Style/Style_Salome.h b/src/Style/Style_Salome.h
index 066d01ca9..a14d9d310 100644
--- a/src/Style/Style_Salome.h
+++ b/src/Style/Style_Salome.h
@@ -25,7 +25,7 @@
 
 #include <QtGlobal>
 #include "Style.h"
-#include <QCommonStyle>
+#include <QtWidgets/QCommonStyle>
 #define BaseStyle QCommonStyle
 
 class Style_Model;
diff --git a/src/Style/Style_Tools.cxx b/src/Style/Style_Tools.cxx
index 8c0fb4720..056425a8e 100644
--- a/src/Style/Style_Tools.cxx
+++ b/src/Style/Style_Tools.cxx
@@ -22,7 +22,7 @@
 //
 #include "Style_Tools.h"
 
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QPainterPath>
 #include <QRect>
 #include <QColor>
diff --git a/src/Style/Style_Tools.h b/src/Style/Style_Tools.h
index 1b49891e5..16bdbb8d5 100644
--- a/src/Style/Style_Tools.h
+++ b/src/Style/Style_Tools.h
@@ -25,9 +25,9 @@
 
 #include "Style.h"
 
-#include <QPainterPath>
+#include <QtGui/QPainterPath>
 #include <QRect>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QStyle>
 
 //
diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
index 7c43397e3..7b5163bfc 100644
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
@@ -29,7 +29,7 @@
 
 #include "ToolsGUI.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QLineEdit;
 class QPushButton;
diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
index af90eb631..c1cea7c5b 100644
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
@@ -22,7 +22,7 @@
 
 # include "ToolsGUI_RegWidget.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QInputDialog>
 #include <QMenuBar>
 #include <QStatusBar>
diff --git a/src/TreeData/Test/guitester.cxx b/src/TreeData/Test/guitester.cxx
index ac85a5194..bbabf18f7 100644
--- a/src/TreeData/Test/guitester.cxx
+++ b/src/TreeData/Test/guitester.cxx
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QMainWindow>
 #include <QDockWidget>
 #include <QTreeView>
diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.cxx b/src/VTKViewer/VTKViewer_InteractorStyle.cxx
index c2b429db1..d6e4b916b 100644
--- a/src/VTKViewer/VTKViewer_InteractorStyle.cxx
+++ b/src/VTKViewer/VTKViewer_InteractorStyle.cxx
@@ -47,7 +47,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkProperty.h>
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QRubberBand>
 
 #include <algorithm>
diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.h b/src/VTKViewer/VTKViewer_InteractorStyle.h
index d061e327e..fa5e1f248 100644
--- a/src/VTKViewer/VTKViewer_InteractorStyle.h
+++ b/src/VTKViewer/VTKViewer_InteractorStyle.h
@@ -35,7 +35,7 @@ class vtkRenderWindowInteractor;
 class vtkTDxInteractorStyle;
 
 #include <QObject>
-#include <QCursor>
+#include <QtGui/QCursor>
 
 class QRubberBand;
 
diff --git a/src/VTKViewer/VTKViewer_MarkerDlg.cxx b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
index cec04d818..281c5560e 100644
--- a/src/VTKViewer/VTKViewer_MarkerDlg.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
@@ -29,7 +29,7 @@
 
 #include <QFrame>
 #include <QVBoxLayout>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 
 /*!
   \class VTKViewer_MarkerDlg
diff --git a/src/VTKViewer/VTKViewer_MarkerUtils.cxx b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
index baf4c1116..6b8ffe4b0 100644
--- a/src/VTKViewer/VTKViewer_MarkerUtils.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
@@ -24,7 +24,7 @@
 
 // QT Includes
 #include <QFile>
-#include <QImage>
+#include <QtGui/QImage>
 #include <QString>
 #include <QTextStream>
 
diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
index 841bd409d..a8f036b3c 100644
--- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
@@ -50,8 +50,8 @@
 
 // QT Includes
 #include <QTimer>
-#include <QMouseEvent>
-#include <QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QKeyEvent>
 #include <QContextMenuEvent>
 
 /*! Create new instance of VTKViewer_RenderWindowInteractor*/
diff --git a/src/VTKViewer/VTKViewer_ViewModel.cxx b/src/VTKViewer/VTKViewer_ViewModel.cxx
index f4625b122..e0d47ff0f 100644
--- a/src/VTKViewer/VTKViewer_ViewModel.cxx
+++ b/src/VTKViewer/VTKViewer_ViewModel.cxx
@@ -32,7 +32,7 @@
 
 #include <QColorDialog>
 #include <QMenu>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QToolBar>
 
 // VSR: Uncomment below line to allow texture background support in VTK viewer
diff --git a/src/VTKViewer/VTKViewer_ViewModel.h b/src/VTKViewer/VTKViewer_ViewModel.h
index 92aae9057..3bae45976 100644
--- a/src/VTKViewer/VTKViewer_ViewModel.h
+++ b/src/VTKViewer/VTKViewer_ViewModel.h
@@ -27,7 +27,7 @@
 #include "Qtx.h"
 #include "SUIT_ViewModel.h"
 
-#include <QColor>
+#include <QtGui/QColor>
 
 class QMouseEvent;
 
diff --git a/src/VTKViewer/VTKViewer_ViewWindow.cxx b/src/VTKViewer/VTKViewer_ViewWindow.cxx
index 1bd3fd5aa..affd6c6d3 100644
--- a/src/VTKViewer/VTKViewer_ViewWindow.cxx
+++ b/src/VTKViewer/VTKViewer_ViewWindow.cxx
@@ -37,7 +37,7 @@
 #include <SUIT_ResourceMgr.h>
 
 #include <QFileInfo>
-#include <QImage>
+#include <QtGui/QImage>
 
 #include <vtkCamera.h>
 #include <vtkJPEGReader.h>
diff --git a/src/ViewerTools/ViewerTools_DialogBase.h b/src/ViewerTools/ViewerTools_DialogBase.h
index 635c47c58..bd5dd0a2e 100644
--- a/src/ViewerTools/ViewerTools_DialogBase.h
+++ b/src/ViewerTools/ViewerTools_DialogBase.h
@@ -25,7 +25,7 @@
 
 #include "ViewerTools.h"
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 class QtxAction;
 
diff --git a/tools/CurvePlot/src/cpp/test/test_curveplot.cxx b/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
index 26b2d2ee8..1ae7fc369 100644
--- a/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
+++ b/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
@@ -29,7 +29,7 @@
 
 #include <PyInterp_Interp.h>  // GUI
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QDesktopWidget>
 #include <QMainWindow>
 #include <QList>
diff --git a/tools/PyConsole/src/PyConsole_Console.cxx b/tools/PyConsole/src/PyConsole_Console.cxx
index 3e2057c86..78b1b952e 100644
--- a/tools/PyConsole/src/PyConsole_Console.cxx
+++ b/tools/PyConsole/src/PyConsole_Console.cxx
@@ -27,7 +27,7 @@
 #include "PyConsole_Editor.h"
 
 #include <QAction>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QClipboard>
 #include <QContextMenuEvent>
 #include <QMenu>
diff --git a/tools/PyConsole/src/PyConsole_Editor.cxx b/tools/PyConsole/src/PyConsole_Editor.cxx
index 11b940e16..585ab5aeb 100644
--- a/tools/PyConsole/src/PyConsole_Editor.cxx
+++ b/tools/PyConsole/src/PyConsole_Editor.cxx
@@ -94,13 +94,13 @@
 #include "PyInterp_Dispatcher.h"
 #include "PyConsole_Request.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QClipboard>
 #include <QDropEvent>
 #include <QEvent>
-#include <QKeyEvent>
+#include <QtGui/QKeyEvent>
 #include <QMimeData>
-#include <QMouseEvent>
+#include <QtGui/QMouseEvent>
 #include <QScrollBar>
 #include <QTextBlock>
 #include <QTextCursor>
diff --git a/tools/PyEditor/src/PyEditor.cxx b/tools/PyEditor/src/PyEditor.cxx
index a9ec8dc8c..39bbb2f3a 100644
--- a/tools/PyEditor/src/PyEditor.cxx
+++ b/tools/PyEditor/src/PyEditor.cxx
@@ -24,7 +24,7 @@
 #include "PyEditor_Window.h"
 #include "PyEditor_StdSettings.h"
 
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QCommandLineParser>
 #include <QDir>
 #include <QLibraryInfo>
diff --git a/tools/PyEditor/src/PyEditor_Completer.cxx b/tools/PyEditor/src/PyEditor_Completer.cxx
index 7850dc187..27a688ec2 100644
--- a/tools/PyEditor/src/PyEditor_Completer.cxx
+++ b/tools/PyEditor/src/PyEditor_Completer.cxx
@@ -29,9 +29,9 @@
 #include <QTimer>
 #include <QTextBlock>
 #include <QTextCursor>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QAbstractItemView>
-#include <QStandardItemModel>
+#include <QtGui/QStandardItemModel>
 
 /*!
   \brief Constructor.
diff --git a/tools/PyEditor/src/PyEditor_Editor.cxx b/tools/PyEditor/src/PyEditor_Editor.cxx
index 0c8c29e1d..de11e4cac 100644
--- a/tools/PyEditor/src/PyEditor_Editor.cxx
+++ b/tools/PyEditor/src/PyEditor_Editor.cxx
@@ -28,7 +28,7 @@
 #include "PyEditor_Keywords.h"
 
 #include <QMenu>
-#include <QPainter>
+#include <QtGui/QPainter>
 #include <QTextBlock>
 #include <QScrollBar>
 
diff --git a/tools/PyEditor/src/PyEditor_FindTool.cxx b/tools/PyEditor/src/PyEditor_FindTool.cxx
index fc6386325..7555e6368 100644
--- a/tools/PyEditor/src/PyEditor_FindTool.cxx
+++ b/tools/PyEditor/src/PyEditor_FindTool.cxx
@@ -27,7 +27,7 @@
 #include <QCompleter>
 #include <QEvent>
 #include <QGridLayout>
-#include <QIcon>
+#include <QtGui/QIcon>
 #include <QLabel>
 #include <QLineEdit>
 #include <QMenu>
diff --git a/tools/PyEditor/src/PyEditor_FindTool.h b/tools/PyEditor/src/PyEditor_FindTool.h
index 7eda9c3c2..e1a3b84a4 100644
--- a/tools/PyEditor/src/PyEditor_FindTool.h
+++ b/tools/PyEditor/src/PyEditor_FindTool.h
@@ -25,7 +25,7 @@
 
 #include "PyEditor.h"
 
-#include <QTextDocument>
+#include <QtGui/QTextDocument>
 #include <QStringListModel>
 #include <QWidget>
 
diff --git a/tools/PyEditor/src/PyEditor_Keywords.h b/tools/PyEditor/src/PyEditor_Keywords.h
index d8ad39500..eb6166378 100644
--- a/tools/PyEditor/src/PyEditor_Keywords.h
+++ b/tools/PyEditor/src/PyEditor_Keywords.h
@@ -24,7 +24,7 @@
 #define PYEDITOR_KEYWORDS_H
 
 #include <QObject>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QList>
 #include <QMap>
 
diff --git a/tools/PyEditor/src/PyEditor_Settings.h b/tools/PyEditor/src/PyEditor_Settings.h
index acde1c099..c60a3b7ca 100644
--- a/tools/PyEditor/src/PyEditor_Settings.h
+++ b/tools/PyEditor/src/PyEditor_Settings.h
@@ -25,7 +25,7 @@
 
 #include "PyEditor.h"
 
-#include <QFont>
+#include <QtGui/QFont>
 
 class PYEDITOR_EXPORT PyEditor_Settings
 {
diff --git a/tools/PyEditor/src/PyEditor_SettingsDlg.h b/tools/PyEditor/src/PyEditor_SettingsDlg.h
index bb6e0291f..ef2b4a5b4 100644
--- a/tools/PyEditor/src/PyEditor_SettingsDlg.h
+++ b/tools/PyEditor/src/PyEditor_SettingsDlg.h
@@ -23,7 +23,7 @@
 #ifndef PYEDITOR_SETTINGSDLG_H
 #define PYEDITOR_SETTINGSDLG_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 #include "PyEditor.h"
 
 class PyEditor_Editor;
diff --git a/tools/PyEditor/src/PyEditor_Window.cxx b/tools/PyEditor/src/PyEditor_Window.cxx
index 2df1d0c75..552749a2f 100644
--- a/tools/PyEditor/src/PyEditor_Window.cxx
+++ b/tools/PyEditor/src/PyEditor_Window.cxx
@@ -26,7 +26,7 @@
 #include "PyEditor_SettingsDlg.h"
 
 #include <QAction>
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include <QCloseEvent>
 #include <QFileDialog>
 #include <QMenuBar>
diff --git a/tools/dlgfactory/GenericDialog.h b/tools/dlgfactory/GenericDialog.h
index 2821fd88a..53c6c71bb 100644
--- a/tools/dlgfactory/GenericDialog.h
+++ b/tools/dlgfactory/GenericDialog.h
@@ -20,7 +20,7 @@
 #ifndef _GenericDialog_HXX
 #define _GenericDialog_HXX
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include "ui_GenericDialog.h"
 
diff --git a/tools/dlgfactory/__QDIALOG__.h b/tools/dlgfactory/__QDIALOG__.h
index 37ca44375..1d2db1fc8 100644
--- a/tools/dlgfactory/__QDIALOG__.h
+++ b/tools/dlgfactory/__QDIALOG__.h
@@ -1,7 +1,7 @@
 #ifndef ___CLASSNAME___HXX
 #define ___CLASSNAME___HXX
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 #include "ui___CLASSNAME__.h"
 
diff --git a/tools/dlgfactory/gtester.cxx b/tools/dlgfactory/gtester.cxx
index ce278494c..cd6c9b08d 100644
--- a/tools/dlgfactory/gtester.cxx
+++ b/tools/dlgfactory/gtester.cxx
@@ -22,7 +22,7 @@
 // use the dialog class as illustrated in the functions TEST_*.
 // (gboulant - 12/10/2010)
 //
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include "GDialogTest.h"
 
 void TEST_show() {
diff --git a/tools/dlgfactory/qtester.cxx b/tools/dlgfactory/qtester.cxx
index 6104d0a02..278611c63 100644
--- a/tools/dlgfactory/qtester.cxx
+++ b/tools/dlgfactory/qtester.cxx
@@ -22,7 +22,7 @@
 // use the dialog class as illustrated in the functions TEST_*.
 // (gboulant - 12/10/2010)
 //
-#include <QApplication>
+#include <QtWidgets/QApplication>
 #include "QDialogTest.h"
 
 void TEST_show() {
-- 
2.39.2