From: Anthony GEAY <anthony.geay@edf.fr>
Date: Mon, 21 Sep 2020 20:45:22 +0000 (+0200)
Subject: u20.04 end
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e0e837678a144dce73d75d02b865e22dbeb59d89;p=modules%2Fgui.git

u20.04 end
---

diff --git a/patchQtInc.py b/patchQtInc.py
new file mode 100644
index 000000000..b893ee62a
--- /dev/null
+++ b/patchQtInc.py
@@ -0,0 +1,52 @@
+import os,re,shutil
+
+#lines2 = [elt.replace("#include <QColor>","#include <QtGui/QColor>") for elt in lines]
+#lines2 = [elt.replace("#include <QHideEvent>","#include <QtGui/QHideEvent>") for elt in lines]
+#something = "QPainterPath"
+#"QHideEvent","QPixmap","QRgb" QtWidgets
+
+pat = re.compile("#include <(Q[A-Z][^\>]+)")
+
+def isQtHeader(f):
+    for r,dirs,fis in os.walk("/usr/include/x86_64-linux-gnu/qt5"):
+        if f in fis:
+            return os.path.join(os.path.basename(r),f)
+    return None
+
+def dealWith(fn):
+    fn2 = "{}.new".format(fn)
+    for something in ["QMainWindow"]:
+        with open(fn) as f:
+            lines = f.readlines()
+            lines2 = []
+            for line in lines:
+                m = pat.match(line)
+                if m:
+                    p = m.group(1)
+                    if "/" in p:
+                        lines2.append(line)
+                    else:
+                        s = isQtHeader(p)
+                        if s:
+                            print(p,s)
+                            lines2.append(line.replace(p,s))
+                        else:
+                            lines2.append(line)
+                else:
+                    lines2.append(line)
+                pass
+            pass
+        #lines2 = [elt.replace("#include <{}>".format(something),"#include <QtWidgets/{}>".format(something)) for elt in lines]
+        if lines2 != lines:
+            with open(fn2,"w") as f:
+                f.writelines(lines2)
+            shutil.move(fn2,fn)
+
+for r,dirs,fis in os.walk(os.getcwd()):
+    for fi in fis:
+        if os.path.splitext(fi)[1] in [".h",".cxx"]:
+            dealWith(os.path.join(r,fi))
+
+
+
+#QPainterPath
diff --git a/src/CAF/CAF_Application.cxx b/src/CAF/CAF_Application.cxx
index 4a6a9d0de..a1402519e 100644
--- a/src/CAF/CAF_Application.cxx
+++ b/src/CAF/CAF_Application.cxx
@@ -32,8 +32,8 @@
 #include <QtxAction.h>
 #include <QtxListAction.h>
 
-#include <QMap>
-#include <QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 #include <Resource_Manager.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
diff --git a/src/CAF/CAF_Study.cxx b/src/CAF/CAF_Study.cxx
index a1f25a99f..165013aa2 100644
--- a/src/CAF/CAF_Study.cxx
+++ b/src/CAF/CAF_Study.cxx
@@ -29,7 +29,7 @@
 #include <SUIT_MessageBox.h>
 #include <SUIT_Application.h>
 
-#include <QDir>
+#include <QtCore/QDir>
 
 #include <TDF_Delta.hxx>
 #include <TDF_ListIteratorOfDeltaList.hxx>
diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 164dfd9f7..d9042561a 100644
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -35,7 +35,7 @@
 #include <GUI_version.h>
 
 #include <QtWidgets/QApplication>
-#include <QRegExp>
+#include <QtCore/QRegExp>
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index 2fbc4b4b6..409858836 100644
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.h
@@ -26,7 +26,7 @@
 #include "CAM.h"
 
 #include <STD_Application.h>
-#include <QList>
+#include <QtCore/QList>
 
 class QMenu;
 class CAM_Module;
diff --git a/src/CAM/CAM_DataModel.h b/src/CAM/CAM_DataModel.h
index 760aa46cc..8202213d2 100644
--- a/src/CAM/CAM_DataModel.h
+++ b/src/CAM/CAM_DataModel.h
@@ -25,8 +25,8 @@
 
 #include "CAM.h"
 
-#include <QObject>
-#include <QStringList>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 
 class CAM_Module;
 class CAM_DataObject;
diff --git a/src/CAM/CAM_Module.cxx b/src/CAM/CAM_Module.cxx
index d48741ec7..6332af837 100644
--- a/src/CAM/CAM_Module.cxx
+++ b/src/CAM/CAM_Module.cxx
@@ -35,7 +35,7 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 /*!
   \class CAM_Module
diff --git a/src/CAM/CAM_Module.h b/src/CAM/CAM_Module.h
index fc14cc665..100e6f0bf 100644
--- a/src/CAM/CAM_Module.h
+++ b/src/CAM/CAM_Module.h
@@ -25,11 +25,11 @@
 
 #include "CAM.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGui/QPixmap>
-#include <QString>
-#include <QMap>
-#include <QPair>
+#include <QtCore/QString>
+#include <QtCore/QMap>
+#include <QtCore/QPair>
 #include <QtGui/QKeySequence>
 
 class QAction;
diff --git a/src/CAM/CAM_Study.h b/src/CAM/CAM_Study.h
index 1b6b36fe4..fc2768742 100644
--- a/src/CAM/CAM_Study.h
+++ b/src/CAM/CAM_Study.h
@@ -26,7 +26,7 @@
 #include "CAM.h"
 
 #include <SUIT_Study.h>
-#include <QList>
+#include <QtCore/QList>
 
 class CAM_DataModel;
 
diff --git a/src/Event/SALOME_Event.cxx b/src/Event/SALOME_Event.cxx
index 417900e6b..1307f4e1c 100644
--- a/src/Event/SALOME_Event.cxx
+++ b/src/Event/SALOME_Event.cxx
@@ -26,7 +26,7 @@
 //
 #include "SALOME_Event.h"
 
-#include <QSemaphore>
+#include <QtCore/QSemaphore>
 #include <QtWidgets/QApplication>
 
 // asv 21.02.05 : introducing multi-platform approach of thread comparison
diff --git a/src/Event/SALOME_Event.h b/src/Event/SALOME_Event.h
index 238106630..428db25a1 100644
--- a/src/Event/SALOME_Event.h
+++ b/src/Event/SALOME_Event.h
@@ -26,7 +26,7 @@
 
 #include "Event.h"
 
-#include <QEvent>
+#include <QtCore/QEvent>
 
 //! SALOME custom event type
 #define SALOME_EVENT QEvent::Type( QEvent::User + 10000 )
diff --git a/src/Event/SALOME_EventFilter.h b/src/Event/SALOME_EventFilter.h
index 3b42567a2..3f42eb38a 100644
--- a/src/Event/SALOME_EventFilter.h
+++ b/src/Event/SALOME_EventFilter.h
@@ -21,7 +21,7 @@
 #define SALOME_EVENTFILTER_H
 
 #include "Event.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 #if defined WIN32
 #pragma warning( disable: 4251 )
diff --git a/src/GLViewer/GLViewer_BaseDrawers.cxx b/src/GLViewer/GLViewer_BaseDrawers.cxx
index 549184361..5ff6a0abc 100644
--- a/src/GLViewer/GLViewer_BaseDrawers.cxx
+++ b/src/GLViewer/GLViewer_BaseDrawers.cxx
@@ -32,7 +32,7 @@
 #include "GLViewer_BaseObjects.h"
 
 // Qt includes
-#include <QColor>
+#include <QtGui/QColor>
 
 #if !defined(WIN32) && !defined(__APPLE__)
 #include <GL/glx.h>
diff --git a/src/GLViewer/GLViewer_BaseObjects.cxx b/src/GLViewer/GLViewer_BaseObjects.cxx
index 2decf66ce..e8b21d37f 100644
--- a/src/GLViewer/GLViewer_BaseObjects.cxx
+++ b/src/GLViewer/GLViewer_BaseObjects.cxx
@@ -28,7 +28,7 @@
 #include "GLViewer_Group.h"
 #include "GLViewer_Drawer.h"
 
-#include <QFile>
+#include <QtCore/QFile>
 
 /*!
   Constructor
diff --git a/src/GLViewer/GLViewer_Context.cxx b/src/GLViewer/GLViewer_Context.cxx
index 3df09c6f6..52275755a 100644
--- a/src/GLViewer/GLViewer_Context.cxx
+++ b/src/GLViewer/GLViewer_Context.cxx
@@ -38,7 +38,7 @@
 #include "GLViewer_ViewFrame.h"
 
 //QT includes
-#include <QRect>
+#include <QtCore/QRect>
 
 #include <TColStd_SequenceOfInteger.hxx>
 
diff --git a/src/GLViewer/GLViewer_Defs.h b/src/GLViewer/GLViewer_Defs.h
index 28e47a9a2..ed99a7852 100644
--- a/src/GLViewer/GLViewer_Defs.h
+++ b/src/GLViewer/GLViewer_Defs.h
@@ -27,8 +27,8 @@
 #ifndef GLVIEWER_DEFS_H
 #define GLVIEWER_DEFS_H
 
-#include <QMap>
-#include <QList>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 class GLViewer_Object;
 //Selection staus 
diff --git a/src/GLViewer/GLViewer_Drawer.cxx b/src/GLViewer/GLViewer_Drawer.cxx
index f1b48c685..6052e8b7c 100644
--- a/src/GLViewer/GLViewer_Drawer.cxx
+++ b/src/GLViewer/GLViewer_Drawer.cxx
@@ -34,7 +34,7 @@
 #include <QtWidgets/QApplication>
 #include <QtGui/QImage>
 #include <QtGui/QPainter>
-#include <QFile>
+#include <QtCore/QFile>
 
 #if defined(__APPLE__)
 #include <OpenGL/CGLCurrent.h>
diff --git a/src/GLViewer/GLViewer_Geom.h b/src/GLViewer/GLViewer_Geom.h
index 49ac0f194..33ae47595 100644
--- a/src/GLViewer/GLViewer_Geom.h
+++ b/src/GLViewer/GLViewer_Geom.h
@@ -29,7 +29,7 @@
 
 #include "GLViewer.h"
 
-#include <QRect>
+#include <QtCore/QRect>
 #include <QtOpenGL/QtOpenGL>
 #include <math.h>
 
diff --git a/src/GLViewer/GLViewer_MimeData.h b/src/GLViewer/GLViewer_MimeData.h
index e1959dc97..828a70345 100644
--- a/src/GLViewer/GLViewer_MimeData.h
+++ b/src/GLViewer/GLViewer_MimeData.h
@@ -30,7 +30,7 @@
 
 #include "GLViewer.h"
 
-#include <QMimeData>
+#include <QtCore/QMimeData>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/GLViewer/GLViewer_Object.h b/src/GLViewer/GLViewer_Object.h
index 917696f5d..b40d8f3af 100644
--- a/src/GLViewer/GLViewer_Object.h
+++ b/src/GLViewer/GLViewer_Object.h
@@ -40,7 +40,7 @@
 #include <GL/gl.h>
 #endif
 
-#include <QString>
+#include <QtCore/QString>
 
 class QFile;
 
diff --git a/src/GLViewer/GLViewer_Selector.h b/src/GLViewer/GLViewer_Selector.h
index 451e2654c..3895606af 100644
--- a/src/GLViewer/GLViewer_Selector.h
+++ b/src/GLViewer/GLViewer_Selector.h
@@ -30,8 +30,8 @@
 #include "GLViewer.h"
 #include "GLViewer_Defs.h"
 
-#include <QSize>
-#include <QObject>
+#include <QtCore/QSize>
+#include <QtCore/QObject>
 
 class QRect;
 
diff --git a/src/GLViewer/GLViewer_Text.h b/src/GLViewer/GLViewer_Text.h
index 297f34d72..636459714 100644
--- a/src/GLViewer/GLViewer_Text.h
+++ b/src/GLViewer/GLViewer_Text.h
@@ -41,7 +41,7 @@
 #endif
 
 #include <QtGui/QFont>
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QColor>
 
 #ifdef WIN32
diff --git a/src/GLViewer/GLViewer_ToolTip.cxx b/src/GLViewer/GLViewer_ToolTip.cxx
index ace7f3377..bee118d00 100644
--- a/src/GLViewer/GLViewer_ToolTip.cxx
+++ b/src/GLViewer/GLViewer_ToolTip.cxx
@@ -31,11 +31,11 @@
 #include "GLViewer_ViewPort2d.h"
 #include "GLViewer_ViewFrame.h"
 
-#include <QLabel>
-#include <QTimer>
+#include <QtWidgets/QLabel>
+#include <QtCore/QTimer>
 #include <QtGui/QBitmap>
 #include <QtWidgets/QApplication>
-#include <QToolTip>
+#include <QtWidgets/QToolTip>
 #include <QtGui/QMouseEvent>
 
 /*!
diff --git a/src/GLViewer/GLViewer_ToolTip.h b/src/GLViewer/GLViewer_ToolTip.h
index 8dca0d533..0fd161046 100644
--- a/src/GLViewer/GLViewer_ToolTip.h
+++ b/src/GLViewer/GLViewer_ToolTip.h
@@ -31,8 +31,8 @@
 
 //#include <qtooltip.h>
 //#include <QtxToolTip.h>
-#include <QObject>
-#include <QPoint>
+#include <QtCore/QObject>
+#include <QtCore/QPoint>
 
 #define TIP_TIME            1000
 
diff --git a/src/GLViewer/GLViewer_ViewFrame.cxx b/src/GLViewer/GLViewer_ViewFrame.cxx
index 8cb1231d9..3b7557762 100644
--- a/src/GLViewer/GLViewer_ViewFrame.cxx
+++ b/src/GLViewer/GLViewer_ViewFrame.cxx
@@ -33,12 +33,12 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_MessageBox.h>
 
-#include <QColor>
-#include <QFileDialog>
+#include <QtGui/QColor>
+#include <QtWidgets/QFileDialog>
 #include <QtGui/QImage>
-#include <QHBoxLayout>
-#include <QString>
-#include <QFrame>
+#include <QtWidgets/QHBoxLayout>
+#include <QtCore/QString>
+#include <QtWidgets/QFrame>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QWheelEvent>
diff --git a/src/GLViewer/GLViewer_ViewPort.cxx b/src/GLViewer/GLViewer_ViewPort.cxx
index 5ca69b5f8..4cdc0dce7 100644
--- a/src/GLViewer/GLViewer_ViewPort.cxx
+++ b/src/GLViewer/GLViewer_ViewPort.cxx
@@ -30,20 +30,20 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 
-#include <QRect>
+#include <QtCore/QRect>
 #include <QtGui/QCursor>
 #include <QtGui/QPainter>
-#include <QMultiHash>
-//#include <QMenu>
-#include <QColorDialog>
-#include <QColormap>
+#include <QtCore/QMultiHash>
+//#include <QtWidgets/QMenu>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QColormap>
 #include <QtGui/QMouseEvent>
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 #include <stdlib.h>
 
 #if !defined WIN32 && !defined __APPLE__
-#include <QX11Info>
+#include <QtX11Extras/QX11Info>
 #include <GL/glx.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/GLViewer/GLViewer_ViewPort.h b/src/GLViewer/GLViewer_ViewPort.h
index 1e3dcf99a..3364e8117 100644
--- a/src/GLViewer/GLViewer_ViewPort.h
+++ b/src/GLViewer/GLViewer_ViewPort.h
@@ -31,8 +31,8 @@
 
 //#include <QList>
 #include <QtGui/QColor>
-//#include <QAction>
-#include <QWidget>
+//#include <QtWidgets/QAction>
+#include <QtWidgets/QWidget>
 
 //#include <Aspect_Window.hxx>
 
diff --git a/src/GLViewer/GLViewer_ViewPort2d.cxx b/src/GLViewer/GLViewer_ViewPort2d.cxx
index f6e418e22..b05e208a5 100644
--- a/src/GLViewer/GLViewer_ViewPort2d.cxx
+++ b/src/GLViewer/GLViewer_ViewPort2d.cxx
@@ -39,17 +39,17 @@
 // TODO: Porting to Qt4
 //#include <QtxToolTip.h>
 
-#include <QHBoxLayout>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QMouseEvent>
-#include <QRect>
-//#include <QMenu>
+#include <QtCore/QRect>
+//#include <QtWidgets/QMenu>
 //#include <QToolTip>
 #include <QtWidgets/QApplication>
-#include <QClipboard>
+#include <QtGui/QClipboard>
 #include <QtGui/QBitmap>
-#include <QLabel>
-#include <QWidget>
-#include <QRubberBand>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QRubberBand>
 
 #define WIDTH       640
 #define HEIGHT      480
diff --git a/src/GLViewer/GLViewer_ViewPort2d.h b/src/GLViewer/GLViewer_ViewPort2d.h
index 91cc0876a..e36049c13 100644
--- a/src/GLViewer/GLViewer_ViewPort2d.h
+++ b/src/GLViewer/GLViewer_ViewPort2d.h
@@ -45,7 +45,7 @@
 
 #include <QtOpenGL/QtOpenGL>
 #include <QtGui/QColor>
-#include <QPaintDevice>
+#include <QtGui/QPaintDevice>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/GLViewer/GLViewer_Viewer.cxx b/src/GLViewer/GLViewer_Viewer.cxx
index 7075ce5d8..aa6b80a44 100644
--- a/src/GLViewer/GLViewer_Viewer.cxx
+++ b/src/GLViewer/GLViewer_Viewer.cxx
@@ -35,12 +35,12 @@
 #include "SUIT_ViewManager.h"
 
 #include <QtWidgets/QApplication>
-#include <QMenu>
-#include <QColorDialog>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QColorDialog>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QWheelEvent>
-#include <QRect>
-#include <QRubberBand>
+#include <QtCore/QRect>
+#include <QtWidgets/QRubberBand>
 
 /* used for sketching */
 static QEvent* l_mbPressEvent = 0;
diff --git a/src/GLViewer/GLViewer_Viewer.h b/src/GLViewer/GLViewer_Viewer.h
index 38dba96c5..65ebe4e4d 100644
--- a/src/GLViewer/GLViewer_Viewer.h
+++ b/src/GLViewer/GLViewer_Viewer.h
@@ -32,7 +32,7 @@
 #include <SUIT_ViewModel.h>
 
 #include <QtGui/QCursor>
-#include <QObject>
+#include <QtCore/QObject>
 
 class QMouseEvent;
 class QKeyEvent;
diff --git a/src/GLViewer/GLViewer_Viewer2d.cxx b/src/GLViewer/GLViewer_Viewer2d.cxx
index a387272e1..87d587d0d 100644
--- a/src/GLViewer/GLViewer_Viewer2d.cxx
+++ b/src/GLViewer/GLViewer_Viewer2d.cxx
@@ -39,12 +39,12 @@
 #include "SUIT_ViewWindow.h"
 #include "SUIT_ViewManager.h"
 
-#include <QMenu>
-#include <QRect>
-#include <QFile>
-#include <QPolygon>
+#include <QtWidgets/QMenu>
+#include <QtCore/QRect>
+#include <QtCore/QFile>
+#include <QtGui/QPolygon>
 #include <QtGui/QMouseEvent>
-#include <QColorDialog>
+#include <QtWidgets/QColorDialog>
 
 /*!
   Constructor
diff --git a/src/GLViewer/GLViewer_Widget.cxx b/src/GLViewer/GLViewer_Widget.cxx
index d065c5e91..f1b856bf9 100644
--- a/src/GLViewer/GLViewer_Widget.cxx
+++ b/src/GLViewer/GLViewer_Widget.cxx
@@ -29,13 +29,13 @@
 
 #include <cmath>
 
-#include <QEvent>
+#include <QtCore/QEvent>
 #include <QtGui/QPaintEvent>
-#include <QRect>
-#include <QFile>
+#include <QtCore/QRect>
+#include <QtCore/QFile>
 #include <QtGui/QImage>
 #include <QtWidgets/QApplication>
-#include <QToolTip>
+#include <QtWidgets/QToolTip>
 
 /*!
   A constructor
diff --git a/src/GraphicsView/GraphicsView_Defs.h b/src/GraphicsView/GraphicsView_Defs.h
index fd283b1bf..ed416ed28 100644
--- a/src/GraphicsView/GraphicsView_Defs.h
+++ b/src/GraphicsView/GraphicsView_Defs.h
@@ -20,7 +20,7 @@
 #ifndef GRAPHICSVIEW_DEFS_H
 #define GRAPHICSVIEW_DEFS_H
 
-#include <QList>
+#include <QtCore/QList>
 
 class GraphicsView_Object;
 typedef QList<GraphicsView_Object*> GraphicsView_ObjectList;
diff --git a/src/GraphicsView/GraphicsView_Object.h b/src/GraphicsView/GraphicsView_Object.h
index 1a1d9aeec..785caa324 100644
--- a/src/GraphicsView/GraphicsView_Object.h
+++ b/src/GraphicsView/GraphicsView_Object.h
@@ -24,7 +24,7 @@
 
 #include "GraphicsView_Defs.h"
 
-#include <QGraphicsItemGroup>
+#include <QtWidgets/QGraphicsItemGroup>
 
 class GraphicsView_ViewPort;
 
diff --git a/src/GraphicsView/GraphicsView_Scene.cxx b/src/GraphicsView/GraphicsView_Scene.cxx
index df927674c..34c8f9097 100644
--- a/src/GraphicsView/GraphicsView_Scene.cxx
+++ b/src/GraphicsView/GraphicsView_Scene.cxx
@@ -19,9 +19,9 @@
 
 #include "GraphicsView_Scene.h"
 
-#include <QGraphicsLineItem>
-#include <QGraphicsRectItem>
-#include <QGraphicsSceneWheelEvent>
+#include <QtWidgets/QGraphicsLineItem>
+#include <QtWidgets/QGraphicsRectItem>
+#include <QtWidgets/QGraphicsSceneWheelEvent>
 
 //#define VIEWER_DEBUG
 
diff --git a/src/GraphicsView/GraphicsView_Scene.h b/src/GraphicsView/GraphicsView_Scene.h
index 021d7ac51..7d779c664 100644
--- a/src/GraphicsView/GraphicsView_Scene.h
+++ b/src/GraphicsView/GraphicsView_Scene.h
@@ -22,7 +22,7 @@
 
 #include "GraphicsView.h"
 
-#include <QGraphicsScene>
+#include <QtWidgets/QGraphicsScene>
 
 class QGraphicsRectItem;
 
diff --git a/src/GraphicsView/GraphicsView_Selector.h b/src/GraphicsView/GraphicsView_Selector.h
index 60811cf13..dfad65ace 100644
--- a/src/GraphicsView/GraphicsView_Selector.h
+++ b/src/GraphicsView/GraphicsView_Selector.h
@@ -24,8 +24,8 @@
 
 #include "GraphicsView_Defs.h"
 
-#include <QObject>
-#include <QRectF>
+#include <QtCore/QObject>
+#include <QtCore/QRectF>
 
 class GraphicsView_Viewer;
 
diff --git a/src/GraphicsView/GraphicsView_ViewFrame.cxx b/src/GraphicsView/GraphicsView_ViewFrame.cxx
index fa4b82a32..76616d961 100644
--- a/src/GraphicsView/GraphicsView_ViewFrame.cxx
+++ b/src/GraphicsView/GraphicsView_ViewFrame.cxx
@@ -32,15 +32,15 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QColor>
-#include <QFrame>
-#include <QFileDialog>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
-#include <QHBoxLayout>
+#include <QtGui/QColor>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtWidgets/QGraphicsSceneWheelEvent>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QImage>
 #include <QtGui/QMouseEvent>
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QWheelEvent>
 
 //=======================================================================
diff --git a/src/GraphicsView/GraphicsView_ViewPort.cxx b/src/GraphicsView/GraphicsView_ViewPort.cxx
index 0cf633700..f020e8207 100644
--- a/src/GraphicsView/GraphicsView_ViewPort.cxx
+++ b/src/GraphicsView/GraphicsView_ViewPort.cxx
@@ -27,13 +27,13 @@
 #include "SUIT_Session.h"
 
 #include <QtGui/QCursor>
-#include <QGraphicsSceneMouseEvent>
-#include <QGridLayout>
-#include <QLabel>
-#include <QMoveEvent>
-#include <QRectF>
-#include <QRubberBand>
-#include <QScrollBar>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QLabel>
+#include <QtGui/QMoveEvent>
+#include <QtCore/QRectF>
+#include <QtWidgets/QRubberBand>
+#include <QtWidgets/QScrollBar>
 #include <QtPrintSupport/QPrinter>
 #include <QtGui/QPainter>
 
diff --git a/src/GraphicsView/GraphicsView_ViewPort.h b/src/GraphicsView/GraphicsView_ViewPort.h
index c5df1fb64..67638e1d1 100644
--- a/src/GraphicsView/GraphicsView_ViewPort.h
+++ b/src/GraphicsView/GraphicsView_ViewPort.h
@@ -24,7 +24,7 @@
 
 #include "GraphicsView_Defs.h"
 
-#include <QGraphicsView>
+#include <QtWidgets/QGraphicsView>
 
 class QGridLayout;
 class QRubberBand;
diff --git a/src/GraphicsView/GraphicsView_ViewTransformer.cxx b/src/GraphicsView/GraphicsView_ViewTransformer.cxx
index 5a3a2d0c0..26bdc55ba 100644
--- a/src/GraphicsView/GraphicsView_ViewTransformer.cxx
+++ b/src/GraphicsView/GraphicsView_ViewTransformer.cxx
@@ -23,9 +23,9 @@
 #include "GraphicsView_ViewPort.h"
 #include "GraphicsView_Viewer.h"
 
-#include <QGraphicsSceneMouseEvent>
-#include <QRectF>
-#include <QRubberBand>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtCore/QRectF>
+#include <QtWidgets/QRubberBand>
 
 int GraphicsView_ViewTransformer::panBtn = Qt::MidButton;
 int GraphicsView_ViewTransformer::zoomBtn = Qt::LeftButton;
diff --git a/src/GraphicsView/GraphicsView_ViewTransformer.h b/src/GraphicsView/GraphicsView_ViewTransformer.h
index 5eac02127..ba879d5c9 100644
--- a/src/GraphicsView/GraphicsView_ViewTransformer.h
+++ b/src/GraphicsView/GraphicsView_ViewTransformer.h
@@ -23,7 +23,7 @@
 #include "GraphicsView.h"
 
 #include <QtGui/QCursor>
-#include <QObject>
+#include <QtCore/QObject>
 
 class QRectF;
 class QRubberBand;
diff --git a/src/GraphicsView/GraphicsView_Viewer.cxx b/src/GraphicsView/GraphicsView_Viewer.cxx
index 147c2c824..3197ce689 100644
--- a/src/GraphicsView/GraphicsView_Viewer.cxx
+++ b/src/GraphicsView/GraphicsView_Viewer.cxx
@@ -31,11 +31,11 @@
 #include <ImageComposer_Image.h>
 
 #include <QtWidgets/QApplication>
-#include <QColorDialog>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsSceneWheelEvent>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QGraphicsSceneMouseEvent>
+#include <QtWidgets/QGraphicsSceneWheelEvent>
 #include <QtGui/QKeyEvent>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 #include <math.h>
 
@@ -43,7 +43,7 @@
 /*
 #include "GraphicsView_PrsImage.h"
 #include "GraphicsView_PrsPropDlg.h"
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 */
 
 //=======================================================================
diff --git a/src/GuiHelpers/StandardApp_Module.cxx b/src/GuiHelpers/StandardApp_Module.cxx
index cc881c514..e0c2e3f46 100644
--- a/src/GuiHelpers/StandardApp_Module.cxx
+++ b/src/GuiHelpers/StandardApp_Module.cxx
@@ -33,7 +33,7 @@
 
 // QT Includes
 #include <QtGui/QIcon>
-#include <QAction>
+#include <QtWidgets/QAction>
 
 #include <Basics_Utils.hxx>
 #include "QtHelper.hxx"
diff --git a/src/HelpBrowser/HelpBrowser.cxx b/src/HelpBrowser/HelpBrowser.cxx
index 052e0d969..eba076ddc 100644
--- a/src/HelpBrowser/HelpBrowser.cxx
+++ b/src/HelpBrowser/HelpBrowser.cxx
@@ -26,14 +26,14 @@
 
 #include "HelpBrowser_Application.h"
 
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QFileSystemWatcher>
-#include <QLibraryInfo>
-#include <QMessageBox>
-#include <QTextStream>
-#include <QTimer>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QFileSystemWatcher>
+#include <QtCore/QLibraryInfo>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QTextStream>
+#include <QtCore/QTimer>
 #include <QtxResourceMgr.h>
 #include <QtxTranslator.h>
 #include <QtxWebBrowser.h>
diff --git a/src/HelpBrowser/HelpBrowser_Application.cxx b/src/HelpBrowser/HelpBrowser_Application.cxx
index f39e43b83..c000c7a81 100644
--- a/src/HelpBrowser/HelpBrowser_Application.cxx
+++ b/src/HelpBrowser/HelpBrowser_Application.cxx
@@ -25,10 +25,10 @@
 
 #include "HelpBrowser_Application.h"
 
-#include <QFile>
-#include <QFileSystemWatcher>
-#include <QTextStream>
-#include <QWidget>
+#include <QtCore/QFile>
+#include <QtCore/QFileSystemWatcher>
+#include <QtCore/QTextStream>
+#include <QtWidgets/QWidget>
 
 /*!
   \brief Constructor
diff --git a/src/HelpBrowser/qtlocalpeer.h b/src/HelpBrowser/qtlocalpeer.h
index 1b533b1ab..c495257ff 100644
--- a/src/HelpBrowser/qtlocalpeer.h
+++ b/src/HelpBrowser/qtlocalpeer.h
@@ -41,9 +41,9 @@
 #ifndef QTLOCALPEER_H
 #define QTLOCALPEER_H
 
-#include <QLocalServer>
-#include <QLocalSocket>
-#include <QDir>
+#include <QtNetwork/QLocalServer>
+#include <QtNetwork/QLocalSocket>
+#include <QtCore/QDir>
 
 #include "qtlockedfile.h"
 
diff --git a/src/HelpBrowser/qtlockedfile.h b/src/HelpBrowser/qtlockedfile.h
index 84c18e5c9..e0f5d3f01 100644
--- a/src/HelpBrowser/qtlockedfile.h
+++ b/src/HelpBrowser/qtlockedfile.h
@@ -41,9 +41,9 @@
 #ifndef QTLOCKEDFILE_H
 #define QTLOCKEDFILE_H
 
-#include <QFile>
+#include <QtCore/QFile>
 #ifdef Q_OS_WIN
-#include <QVector>
+#include <QtCore/QVector>
 #endif
 
 #if defined(Q_OS_WIN)
diff --git a/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx b/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
index 552a8324b..220852183 100644
--- a/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
+++ b/src/ImageComposer/ImageComposer_ColorMaskOperator.cxx
@@ -19,7 +19,7 @@
 
 #include "ImageComposer_ColorMaskOperator.h"
 #include "ImageComposer_MetaTypes.h"
-#include <QRectF>
+#include <QtCore/QRectF>
 #include <QtGui/QRgb>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
diff --git a/src/ImageComposer/ImageComposer_CutOperator.cxx b/src/ImageComposer/ImageComposer_CutOperator.cxx
index bf2f2aa11..b665be6bd 100644
--- a/src/ImageComposer/ImageComposer_CutOperator.cxx
+++ b/src/ImageComposer/ImageComposer_CutOperator.cxx
@@ -19,7 +19,7 @@
 
 #include "ImageComposer_CutOperator.h"
 #include "ImageComposer_MetaTypes.h"
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
 
diff --git a/src/ImageComposer/ImageComposer_FuseOperator.cxx b/src/ImageComposer/ImageComposer_FuseOperator.cxx
index abcf875aa..cedd59d33 100644
--- a/src/ImageComposer/ImageComposer_FuseOperator.cxx
+++ b/src/ImageComposer/ImageComposer_FuseOperator.cxx
@@ -19,7 +19,7 @@
 
 #include "ImageComposer_FuseOperator.h"
 #include "ImageComposer_MetaTypes.h"
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
 
diff --git a/src/ImageComposer/ImageComposer_MetaTypes.h b/src/ImageComposer/ImageComposer_MetaTypes.h
index 07e91b704..271511871 100644
--- a/src/ImageComposer/ImageComposer_MetaTypes.h
+++ b/src/ImageComposer/ImageComposer_MetaTypes.h
@@ -19,7 +19,7 @@
 
 #include "ImageComposer_Image.h"
 
-#include <QVariant>
+#include <QtCore/QVariant>
 #include <QtGui/QPainterPath>
 
 // Here we declare the meta types for classes which used by
diff --git a/src/LightApp/LightApp_AboutDlg.cxx b/src/LightApp/LightApp_AboutDlg.cxx
index 630ee72d1..f73cd43b6 100644
--- a/src/LightApp/LightApp_AboutDlg.cxx
+++ b/src/LightApp/LightApp_AboutDlg.cxx
@@ -32,13 +32,13 @@
 
 #include <QtxGridBox.h>
 
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
 #include <QtGui/QPixmap>
 #include <QtGui/QIcon>
-#include <QGroupBox>
-#include <QTabWidget>
-#include <QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QPushButton>
 
 /*!Constructor.*/
 LightApp_AboutDlg::LightApp_AboutDlg( const QString& defName, const QString& defVer, QWidget* parent )
diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index e384539d7..ba1855bdb 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -168,30 +168,30 @@
 
 #define VISIBILITY_COLUMN_WIDTH 25
 
-#include <QDir>
+#include <QtCore/QDir>
 #include <QtGui/QImage>
-#include <QString>
-#include <QWidget>
-#include <QStringList>
-#include <QFile>
+#include <QtCore/QString>
+#include <QtWidgets/QWidget>
+#include <QtCore/QStringList>
+#include <QtCore/QFile>
 #include <QtWidgets/QApplication>
-#include <QMap>
-#include <QStatusBar>
-#include <QThread>
-#include <QObjectList>
-#include <QComboBox>
-#include <QInputDialog>
+#include <QtCore/QMap>
+#include <QtWidgets/QStatusBar>
+#include <QtCore/QThread>
+#include <QtCore/QObjectList>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QInputDialog>
 #include <QtGui/QFontDatabase>
 #include <QtGui/QIcon>
-#include <QByteArray>
-#include <QMenu>
-#include <QProcess>
-#include <QTimer>
-#include <QHeaderView>
-#include <QTreeView>
-#include <QMimeData>
-#include <QShortcut>
-#include <QRegExp>
+#include <QtCore/QByteArray>
+#include <QtWidgets/QMenu>
+#include <QtCore/QProcess>
+#include <QtCore/QTimer>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTreeView>
+#include <QtCore/QMimeData>
+#include <QtWidgets/QShortcut>
+#include <QtCore/QRegExp>
 
 #include <utilities.h>
 
diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 6236e23b1..10d395609 100644
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -36,8 +36,8 @@
 #include <SUIT_DataObject.h>
 #include <CAM_Application.h>
 
-#include <QPointer>
-#include <QStringList>
+#include <QtCore/QPointer>
+#include <QtCore/QStringList>
 
 class LogWindow;
 #ifndef DISABLE_PYCONSOLE
diff --git a/src/LightApp/LightApp_DataObject.cxx b/src/LightApp/LightApp_DataObject.cxx
index 19dd612f4..04222bfbe 100644
--- a/src/LightApp/LightApp_DataObject.cxx
+++ b/src/LightApp/LightApp_DataObject.cxx
@@ -32,7 +32,7 @@
 #include <CAM_Module.h>
 #include <SUIT_DataObjectKey.h>
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 #include <iostream>
 
diff --git a/src/LightApp/LightApp_Dialog.cxx b/src/LightApp/LightApp_Dialog.cxx
index aac06726b..c745d4ccf 100644
--- a/src/LightApp/LightApp_Dialog.cxx
+++ b/src/LightApp/LightApp_Dialog.cxx
@@ -27,10 +27,10 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QAbstractButton>
-#include <QToolButton>
-#include <QLineEdit>
-#include <QLabel>
+#include <QtWidgets/QAbstractButton>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QLabel>
 
 /*!
   Constructor
diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h
index c60a92d3c..a1eb20604 100644
--- a/src/LightApp/LightApp_Dialog.h
+++ b/src/LightApp/LightApp_Dialog.h
@@ -29,8 +29,8 @@
 #include "LightApp.h"
 #include <QtxDialog.h>
 
-#include <QList>
-#include <QMap>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 #include <QtGui/QPixmap>
 
 class QLineEdit;
diff --git a/src/LightApp/LightApp_Displayer.cxx b/src/LightApp/LightApp_Displayer.cxx
index 92c6257c4..4ebe7b9b1 100644
--- a/src/LightApp/LightApp_Displayer.cxx
+++ b/src/LightApp/LightApp_Displayer.cxx
@@ -33,8 +33,8 @@
 #include <SUIT_ViewModel.h>
 #include <SUIT_ViewWindow.h>
 
-#include <QStringList>
-#include <QString>
+#include <QtCore/QStringList>
+#include <QtCore/QString>
 #ifndef DISABLE_SALOMEOBJECT
   #include "SALOME_InteractiveObject.hxx"
 #endif
diff --git a/src/LightApp/LightApp_Driver.cxx b/src/LightApp/LightApp_Driver.cxx
index 7a92a830c..93883cea9 100644
--- a/src/LightApp/LightApp_Driver.cxx
+++ b/src/LightApp/LightApp_Driver.cxx
@@ -30,8 +30,8 @@
 #include <OSD_Protection.hxx>
 #include <OSD_FileIterator.hxx>
 
-#include <QFileInfo>
-#include <QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
 
 #include <Qtx.h>
 
diff --git a/src/LightApp/LightApp_EventFilter.h b/src/LightApp/LightApp_EventFilter.h
index 0704a003f..55c932dfa 100644
--- a/src/LightApp/LightApp_EventFilter.h
+++ b/src/LightApp/LightApp_EventFilter.h
@@ -25,7 +25,7 @@
 
 #include "LightApp.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #if defined WIN32
 #pragma warning( disable: 4251 )
diff --git a/src/LightApp/LightApp_FileValidator.cxx b/src/LightApp/LightApp_FileValidator.cxx
index ca002eee4..5e89b6a0c 100644
--- a/src/LightApp/LightApp_FileValidator.cxx
+++ b/src/LightApp/LightApp_FileValidator.cxx
@@ -23,7 +23,7 @@
 #include "LightApp_FileValidator.h"
 #include "SUIT_MessageBox.h"
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 /*!
   \class LightApp_PyFileValidator
diff --git a/src/LightApp/LightApp_FullScreenHelper.cxx b/src/LightApp/LightApp_FullScreenHelper.cxx
index a146560b8..bc8cf51dd 100644
--- a/src/LightApp/LightApp_FullScreenHelper.cxx
+++ b/src/LightApp/LightApp_FullScreenHelper.cxx
@@ -24,10 +24,10 @@
 // Created:   04/10/2011 18:44:25 PM
 // Author:    OCC team
 //
-#include <QAction>
-#include <QMenuBar>
-#include <QStatusBar>
-#include <QToolBar>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QToolBar>
 
 #include <QtxWorkstack.h>
 
diff --git a/src/LightApp/LightApp_FullScreenHelper.h b/src/LightApp/LightApp_FullScreenHelper.h
index 02ab29b47..b7187d3eb 100644
--- a/src/LightApp/LightApp_FullScreenHelper.h
+++ b/src/LightApp/LightApp_FullScreenHelper.h
@@ -29,9 +29,9 @@
 
 #include "LightApp.h"
 
-#include <QMap>
-#include <QDockWidget>
-#include <QToolBar>
+#include <QtCore/QMap>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QToolBar>
 
 
 class LIGHTAPP_EXPORT LightApp_FullScreenHelper {
diff --git a/src/LightApp/LightApp_GLSelector.h b/src/LightApp/LightApp_GLSelector.h
index 30a3e276c..67d06f797 100644
--- a/src/LightApp/LightApp_GLSelector.h
+++ b/src/LightApp/LightApp_GLSelector.h
@@ -29,7 +29,7 @@
 
 #include <GLViewer_Viewer2d.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class LightApp_DataObject;
 
diff --git a/src/LightApp/LightApp_GVSelector.h b/src/LightApp/LightApp_GVSelector.h
index 6c4446c43..f2cb47c99 100644
--- a/src/LightApp/LightApp_GVSelector.h
+++ b/src/LightApp/LightApp_GVSelector.h
@@ -22,7 +22,7 @@
 
 #include "LightApp.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <SUIT_Selector.h>
 #include <SUIT_DataOwner.h>
 #include <GraphicsView_Defs.h>
diff --git a/src/LightApp/LightApp_Module.cxx b/src/LightApp/LightApp_Module.cxx
index 0a1e2cb15..0ed3c1c46 100644
--- a/src/LightApp/LightApp_Module.cxx
+++ b/src/LightApp/LightApp_Module.cxx
@@ -93,10 +93,10 @@
 
 #include <QtxPopupMgr.h>
 
-#include <QVariant>
-#include <QString>
-#include <QStringList>
-#include <QAction>
+#include <QtCore/QVariant>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtWidgets/QAction>
 
 #include <iostream>
 
diff --git a/src/LightApp/LightApp_ModuleAction.cxx b/src/LightApp/LightApp_ModuleAction.cxx
index 21d84025e..997b089bf 100644
--- a/src/LightApp/LightApp_ModuleAction.cxx
+++ b/src/LightApp/LightApp_ModuleAction.cxx
@@ -24,9 +24,9 @@
 
 #include <QtxComboBox.h>
 #include <QtxActionSet.h>
-#include <QVBoxLayout>
+#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QApplication>
-#include <QEvent>
+#include <QtCore/QEvent>
 
 /*!
   \class LightApp_ModuleAction::ActionSet
diff --git a/src/LightApp/LightApp_ModuleDlg.cxx b/src/LightApp/LightApp_ModuleDlg.cxx
index fa765fca3..7ed57f6c0 100644
--- a/src/LightApp/LightApp_ModuleDlg.cxx
+++ b/src/LightApp/LightApp_ModuleDlg.cxx
@@ -25,10 +25,10 @@
 //
 #include "LightApp_ModuleDlg.h"
 
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
-#include <QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
 
 /*!
   \brief Pixmap used as default icon for the module.
diff --git a/src/LightApp/LightApp_ModuleDlg.h b/src/LightApp/LightApp_ModuleDlg.h
index 3167e40e7..51709eaa4 100644
--- a/src/LightApp/LightApp_ModuleDlg.h
+++ b/src/LightApp/LightApp_ModuleDlg.h
@@ -30,7 +30,7 @@
 
 #include <QtWidgets/QDialog> 
 #include <QtGui/QPixmap>
-#include <QMap>
+#include <QtCore/QMap>
 
 class QPushButton;
 class QHBoxLayout;
diff --git a/src/LightApp/LightApp_NameDlg.cxx b/src/LightApp/LightApp_NameDlg.cxx
index 930f54347..8391ea2ea 100644
--- a/src/LightApp/LightApp_NameDlg.cxx
+++ b/src/LightApp/LightApp_NameDlg.cxx
@@ -26,12 +26,12 @@
 #include "LightApp_NameDlg.h"
 #include <SUIT_Tools.h>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   Constructor
diff --git a/src/LightApp/LightApp_OBSelector.cxx b/src/LightApp/LightApp_OBSelector.cxx
index b2e84dfde..d0875e724 100644
--- a/src/LightApp/LightApp_OBSelector.cxx
+++ b/src/LightApp/LightApp_OBSelector.cxx
@@ -31,7 +31,7 @@
 #include <SUIT_DataBrowser.h>
 #include <SUIT_Session.h>
 #include <SUIT_DataObjectIterator.h>
-#include <QTime>
+#include <QtCore/QTime>
 #include <time.h>
 
 /*!
diff --git a/src/LightApp/LightApp_OBSelector.h b/src/LightApp/LightApp_OBSelector.h
index 4a8f330a0..769db463c 100644
--- a/src/LightApp/LightApp_OBSelector.h
+++ b/src/LightApp/LightApp_OBSelector.h
@@ -31,7 +31,7 @@
 #include <SUIT_Selector.h>
 #include <SUIT_DataOwner.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class SUIT_DataBrowser;
 class LightApp_DataObject;
diff --git a/src/LightApp/LightApp_OCCSelector.h b/src/LightApp/LightApp_OCCSelector.h
index 725613840..a2bbafb9f 100644
--- a/src/LightApp/LightApp_OCCSelector.h
+++ b/src/LightApp/LightApp_OCCSelector.h
@@ -28,7 +28,7 @@
 #include <SUIT_Selector.h>
 #include <SUIT_DataOwner.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 #ifndef DISABLE_OCCVIEWER
 #include <OCCViewer_ViewModel.h>
diff --git a/src/LightApp/LightApp_Preferences.h b/src/LightApp/LightApp_Preferences.h
index accbe9b4a..7c5234b3b 100644
--- a/src/LightApp/LightApp_Preferences.h
+++ b/src/LightApp/LightApp_Preferences.h
@@ -29,8 +29,8 @@
 #include "LightApp.h"
 #include <SUIT_PreferenceMgr.h>
 
-#include <QMap>
-#include <QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 class QtxResourceMgr;
 
diff --git a/src/LightApp/LightApp_PreferencesDlg.cxx b/src/LightApp/LightApp_PreferencesDlg.cxx
index 26e0d83c5..4fed68e39 100644
--- a/src/LightApp/LightApp_PreferencesDlg.cxx
+++ b/src/LightApp/LightApp_PreferencesDlg.cxx
@@ -33,9 +33,9 @@
 #include <SUIT_MessageBox.h>
 #include <SUIT_FileDlg.h>
 
-#include <QAbstractButton>
-#include <QVBoxLayout>
-#include <QFileDialog>
+#include <QtWidgets/QAbstractButton>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QFileDialog>
 
 /*!
   Constructor.
diff --git a/src/LightApp/LightApp_SelectionMgr.h b/src/LightApp/LightApp_SelectionMgr.h
index cd242e078..85d909d59 100644
--- a/src/LightApp/LightApp_SelectionMgr.h
+++ b/src/LightApp/LightApp_SelectionMgr.h
@@ -40,7 +40,7 @@
   class SALOME_ListIO;
   class TCollection_AsciiString;
 #else
-#include <QStringList>
+#include <QtCore/QStringList>
 #endif
 
 class LightApp_Application;
diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h
index ea06fc49e..ff7e53320 100644
--- a/src/LightApp/LightApp_Study.h
+++ b/src/LightApp/LightApp_Study.h
@@ -32,8 +32,8 @@
 #include "vector"
 #include <Qtx.h>
 
-#include <QMap>
-#include <QVariant>
+#include <QtCore/QMap>
+#include <QtCore/QVariant>
 
 class SUIT_Study;
 class SUIT_Application;
diff --git a/src/LightApp/LightApp_SwitchOp.cxx b/src/LightApp/LightApp_SwitchOp.cxx
index 70a74d5e8..fc4fbecf7 100644
--- a/src/LightApp/LightApp_SwitchOp.cxx
+++ b/src/LightApp/LightApp_SwitchOp.cxx
@@ -28,9 +28,9 @@
 #include <SUIT_Operation.h>
 #include <SUIT_Study.h>
 
-#include <QEvent>
-#include <QWidget>
-#include <QList>
+#include <QtCore/QEvent>
+#include <QtWidgets/QWidget>
+#include <QtCore/QList>
 #include <QtWidgets/QApplication>
 
 /*!
diff --git a/src/LightApp/LightApp_SwitchOp.h b/src/LightApp/LightApp_SwitchOp.h
index 313b3ef24..63c4e9924 100644
--- a/src/LightApp/LightApp_SwitchOp.h
+++ b/src/LightApp/LightApp_SwitchOp.h
@@ -24,7 +24,7 @@
 #define LightApp_SwitchOp_H
 
 #include "LightApp.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 class LightApp_Module;
 class LightApp_Operation;
diff --git a/src/LightApp/LightApp_VTKSelector.h b/src/LightApp/LightApp_VTKSelector.h
index 2e7a728c1..a7771d1c1 100644
--- a/src/LightApp/LightApp_VTKSelector.h
+++ b/src/LightApp/LightApp_VTKSelector.h
@@ -27,7 +27,7 @@
 #include "LightApp.h"
 #include "LightApp_DataOwner.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class SUIT_Desktop;
 
diff --git a/src/LogWindow/LogWindow.cxx b/src/LogWindow/LogWindow.cxx
index 86a79155d..8e2edb4b4 100644
--- a/src/LogWindow/LogWindow.cxx
+++ b/src/LogWindow/LogWindow.cxx
@@ -26,16 +26,16 @@
 //
 #include "LogWindow.h"
 
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
-#include <QDate>
-#include <QFile>
-#include <QMenu>
-#include <QTextBlock>
-#include <QTextEdit>
-#include <QTextStream>
-#include <QTime>
-#include <QVBoxLayout>
+#include <QtCore/QDate>
+#include <QtCore/QFile>
+#include <QtWidgets/QMenu>
+#include <QtGui/QTextBlock>
+#include <QtWidgets/QTextEdit>
+#include <QtCore/QTextStream>
+#include <QtCore/QTime>
+#include <QtWidgets/QVBoxLayout>
 
 #include <SUIT_MessageBox.h>
 #include <SUIT_ResourceMgr.h>
diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h
index d387b2de6..c4b7eafe5 100644
--- a/src/LogWindow/LogWindow.h
+++ b/src/LogWindow/LogWindow.h
@@ -40,9 +40,9 @@
 #include "QtxMsgHandler.h"
 #include "SUIT_PopupClient.h"
 
-#include <QWidget>
-#include <QMap>
-#include <QStringList>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/OCCViewer/OCCViewer_AISSelector.h b/src/OCCViewer/OCCViewer_AISSelector.h
index de5076d14..2c69c90d0 100644
--- a/src/OCCViewer/OCCViewer_AISSelector.h
+++ b/src/OCCViewer/OCCViewer_AISSelector.h
@@ -24,7 +24,7 @@
 #define OCCVIEWER_AISSELECTOR_H
 
 #include "OCCViewer.h"
-#include <QObject>
+#include <QtCore/QObject>
 
 #include <Quantity_NameOfColor.hxx>
 #include <AIS_InteractiveContext.hxx>
diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
index b753bdf8a..e8ce4a876 100644
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
@@ -24,11 +24,11 @@
 
 #include <QtxDoubleSpinBox.h>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
 
 /*!
   \class OCCViewer_AxialScaleDlg
diff --git a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
index 8c921d378..a97aea1d9 100644
--- a/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
+++ b/src/OCCViewer/OCCViewer_ClipPlaneInteractor.h
@@ -30,7 +30,7 @@
 #include <gp_Pln.hxx>
 #include <gp_Ax3.hxx>
 
-#include <QPoint>
+#include <QtCore/QPoint>
 
 #include <vector>
 
diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index adf023d3c..2b1d5aee9 100644
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
@@ -53,17 +53,17 @@
 
 // QT Includes
 #include <QtWidgets/QApplication>
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QStackedLayout>
-#include <QSlider>
-#include <QMenu>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QStackedLayout>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QMenu>
 
 /**********************************************************************************
  ************************        Internal functions        ************************
diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
index 76b3f3080..3fe05c5c8 100644
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
@@ -23,11 +23,11 @@
 #include "OCCViewer_CreateRestoreViewDlg.h"
 #include "OCCViewer_ViewPort3d.h"
 
-#include <QPushButton>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QListWidgetItem>
-#include <QEvent>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QListWidgetItem>
+#include <QtCore/QEvent>
 #include <QtGui/QKeyEvent>
 
 /*!
diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
index 606f17b15..11b08cfd2 100644
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
@@ -31,7 +31,7 @@
 #include <SUIT_Application.h>
 
 #include <QtWidgets/QDialog>
-#include <QListWidget>
+#include <QtWidgets/QListWidget>
 
 class OCCViewer_ViewPort3d;
 
diff --git a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
index 18af95773..e788410fa 100644
--- a/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CubeAxesDlg.cxx
@@ -31,9 +31,9 @@
 
 #include <Graphic3d_GraduatedTrihedron.hxx>
 
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLineEdit>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLineEdit>
 
 /*!
   \class OCCViewer_CubeAxesDlg::AxisWidget
diff --git a/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx b/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx
index 8365dacb7..c319c8d54 100644
--- a/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx
+++ b/src/OCCViewer/OCCViewer_EnvTextureDlg.cxx
@@ -30,12 +30,12 @@
 #include <Graphic3d_TextureEnv.hxx>
 
 // QT Includes
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QComboBox>
-#include <QFileDialog>
-#include <QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QLineEdit>
 
 /*!
   \class OCCViewer_EnvTextureDlg
diff --git a/src/OCCViewer/OCCViewer_FontWidget.cxx b/src/OCCViewer/OCCViewer_FontWidget.cxx
index f3661901e..90cf13bd6 100644
--- a/src/OCCViewer/OCCViewer_FontWidget.cxx
+++ b/src/OCCViewer/OCCViewer_FontWidget.cxx
@@ -22,7 +22,7 @@
 
 #include "OCCViewer_FontWidget.h"
 
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 //#include <vtkTextProperty.h>
 
diff --git a/src/OCCViewer/OCCViewer_LightSourceDlg.cxx b/src/OCCViewer/OCCViewer_LightSourceDlg.cxx
index 91bf4ea5b..e6f515768 100644
--- a/src/OCCViewer/OCCViewer_LightSourceDlg.cxx
+++ b/src/OCCViewer/OCCViewer_LightSourceDlg.cxx
@@ -29,14 +29,14 @@
 #include <QtxColorButton.h>
 
 // Qt includes
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QCheckBox>
-#include <QStackedLayout>
-#include <QRadioButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QStackedLayout>
+#include <QtWidgets/QRadioButton>
 
 /*!
   \class OCCViewer_LightSourceDlg
diff --git a/src/OCCViewer/OCCViewer_RayTracingDlg.cxx b/src/OCCViewer/OCCViewer_RayTracingDlg.cxx
index 457ee3053..764bbba72 100644
--- a/src/OCCViewer/OCCViewer_RayTracingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_RayTracingDlg.cxx
@@ -28,11 +28,11 @@
 #include <QtxIntSpinBox.h>
 
 // QT Includes
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QCheckBox>
 
 /*!
   \class OCCViewer_RayTracingDlg
diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
index 0b644dfae..8f7c128c6 100644
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
@@ -26,15 +26,15 @@
 
 #include "OCCViewer_ViewWindow.h"
 
-#include <QLineEdit>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QMenu>
-#include <QGridLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QGridLayout>
 #include <QtGui/QDoubleValidator>
-#include <QCheckBox>
-#include <QHBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QHBoxLayout>
 
 /*!
   Constructor
diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
index 38ba331cf..b81e9fe9c 100644
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
@@ -26,7 +26,7 @@
 #include "OCCViewer.h"
 
 #include <QtWidgets/QDialog>
-#include <QMap>
+#include <QtCore/QMap>
 
 #include <TopAbs_ShapeEnum.hxx>
 
diff --git a/src/OCCViewer/OCCViewer_Utilities.cxx b/src/OCCViewer/OCCViewer_Utilities.cxx
index 02b26d13d..133f26b52 100644
--- a/src/OCCViewer/OCCViewer_Utilities.cxx
+++ b/src/OCCViewer/OCCViewer_Utilities.cxx
@@ -33,7 +33,7 @@
 
 // QT includes
 #include <QtGui/QImage>
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QDialog>
 
 Handle(Image_PixMap) OCCViewer_Utilities::imageToPixmap( const QImage& anImage )
diff --git a/src/OCCViewer/OCCViewer_VService.h b/src/OCCViewer/OCCViewer_VService.h
index 838ce87e2..ac237c9c3 100644
--- a/src/OCCViewer/OCCViewer_VService.h
+++ b/src/OCCViewer/OCCViewer_VService.h
@@ -32,7 +32,7 @@
 #include <Quantity_Length.hxx>
 #include <V3d_TypeOfOrientation.hxx>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class Standard_EXPORT OCCViewer_VService
 {
diff --git a/src/OCCViewer/OCCViewer_ViewFrame.cxx b/src/OCCViewer/OCCViewer_ViewFrame.cxx
index d96a82872..f8cf05368 100644
--- a/src/OCCViewer/OCCViewer_ViewFrame.cxx
+++ b/src/OCCViewer/OCCViewer_ViewFrame.cxx
@@ -32,8 +32,8 @@
 #include <QtxResourceMgr.h>
 #include <QtxWorkstackAction.h>
 
-#include <QFrame>
-#include <QLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QLayout>
 #include <QtWidgets/QApplication>
 
 OCCViewer_ViewFrame::OCCViewer_ViewFrame(SUIT_Desktop* theDesktop, OCCViewer_Viewer* theModel)
diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx
index 3502278c3..dd618d74a 100644
--- a/src/OCCViewer/OCCViewer_ViewModel.cxx
+++ b/src/OCCViewer/OCCViewer_ViewModel.cxx
@@ -42,14 +42,14 @@
 
 #include <QtGui/QPainter>
 #include <QtWidgets/QApplication>
-#include <QColorDialog>
-#include <QFileDialog>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QFileDialog>
 #include <QtGui/QPalette>
 #include <QtGui/QKeyEvent>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
-#include <QToolBar>
-#include <QDesktopWidget>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QDesktopWidget>
 
 #include <AIS_Axis.hxx>
 #include <Prs3d_Drawer.hxx>
diff --git a/src/OCCViewer/OCCViewer_ViewModel.h b/src/OCCViewer/OCCViewer_ViewModel.h
index 00aa607b6..dbdc25a80 100644
--- a/src/OCCViewer/OCCViewer_ViewModel.h
+++ b/src/OCCViewer/OCCViewer_ViewModel.h
@@ -24,8 +24,8 @@
 #define OCCVIEWER_VIEWMODEL_H
 
 #include <QtGui/QColor>
-#include <QPoint>
-#include <QVector>
+#include <QtCore/QPoint>
+#include <QtCore/QVector>
 
 #include "OCCViewer.h"
 #include "OCCViewer_ClipPlane.h"
diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx
index 34f9a4070..60019ae16 100644
--- a/src/OCCViewer/OCCViewer_ViewPort.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort.cxx
@@ -28,20 +28,20 @@
 
 #include "SUIT_Session.h"
 
-#include <QColor>
-#include <QRect>
+#include <QtGui/QColor>
+#include <QtCore/QRect>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
-#include <QMultiHash>
-#include <QMenu>
-#include <QColorDialog>
-#include <QColormap>
-#include <QCoreApplication>
+#include <QtCore/QMultiHash>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QColormap>
+#include <QtCore/QCoreApplication>
 
 #include <stdlib.h>
 
 #if !defined WIN32 && !defined __APPLE__
-#include <QX11Info>
+#include <QtX11Extras/QX11Info>
 #include <GL/glx.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/src/OCCViewer/OCCViewer_ViewPort.h b/src/OCCViewer/OCCViewer_ViewPort.h
index f7776ca5d..d53dd4689 100644
--- a/src/OCCViewer/OCCViewer_ViewPort.h
+++ b/src/OCCViewer/OCCViewer_ViewPort.h
@@ -27,8 +27,8 @@
 
 #include "QtxAction.h"
 
-#include <QList>
-#include <QWidget>
+#include <QtCore/QList>
+#include <QtWidgets/QWidget>
 
 #include <Aspect_Window.hxx>
 
diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index 9f1b973fb..82e9ce00d 100644
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
@@ -31,14 +31,14 @@
 #include <SUIT_Session.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QColor>
-#include <QFileInfo>
-#include <QString>
-#include <QRect>
+#include <QtGui/QColor>
+#include <QtCore/QFileInfo>
+#include <QtCore/QString>
+#include <QtCore/QRect>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QResizeEvent>
 #include <QtWidgets/QApplication>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #include <V3d_View.hxx>
 #include <Quantity_Ratio.hxx>
diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.cxx b/src/OCCViewer/OCCViewer_ViewSketcher.cxx
index 88eaf1e1d..eedd858ab 100644
--- a/src/OCCViewer/OCCViewer_ViewSketcher.cxx
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.cxx
@@ -25,7 +25,7 @@
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QPainter>
-#include <QPolygon>
+#include <QtGui/QPolygon>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QKeyEvent>
 
diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.h b/src/OCCViewer/OCCViewer_ViewSketcher.h
index 80c73300c..9a8a8b36e 100644
--- a/src/OCCViewer/OCCViewer_ViewSketcher.h
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.h
@@ -22,9 +22,9 @@
 
 #include "OCCViewer.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGui/QCursor>
-#include <QSize>
+#include <QtCore/QSize>
 
 class OCCViewer_ViewWindow;
 class QKeyEvent;
diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index 225865d55..4a22ef0a0 100644
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx
@@ -53,13 +53,13 @@
 #include <QtxRubberBand.h>
 
 #include <QtGui/QPainter>
-#include <QTime>
+#include <QtCore/QTime>
 #include <QtGui/QImage>
 #include <QtGui/QKeyEvent>
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QApplication>
-#include <QActionGroup>
-#include <QMenu>
+#include <QtWidgets/QActionGroup>
+#include <QtWidgets/QMenu>
 
 #include <AIS_ListOfInteractive.hxx>
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
diff --git a/src/OCCViewer/OCCViewer_ViewportInputFilter.h b/src/OCCViewer/OCCViewer_ViewportInputFilter.h
index 532444a00..5e94abd0f 100644
--- a/src/OCCViewer/OCCViewer_ViewportInputFilter.h
+++ b/src/OCCViewer/OCCViewer_ViewportInputFilter.h
@@ -23,7 +23,7 @@
 #ifndef OCCVIEWER_VIEWPORTINPUTFILTER_H
 #define OCCVIEWER_VIEWPORTINPUTFILTER_H
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class OCCViewer_ViewManager;
 class OCCViewer_ViewPort3d;
diff --git a/src/ObjBrowser/OB_Browser.cxx b/src/ObjBrowser/OB_Browser.cxx
index 994c53c52..106cecd6f 100644
--- a/src/ObjBrowser/OB_Browser.cxx
+++ b/src/ObjBrowser/OB_Browser.cxx
@@ -33,14 +33,14 @@
 #include <QtxSearchTool.h>
 //#include <SUIT_DataObjectIterator.h>
 
-#include <QAction>
-#include <QMenu>
-#include <QItemSelection>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMenu>
+#include <QtCore/QItemSelection>
 #include <QtGui/QKeyEvent>
-#include <QVBoxLayout>
-#include <QAbstractItemModel>
-#include <QAbstractItemDelegate>
-#include <QHeaderView>
+#include <QtWidgets/QVBoxLayout>
+#include <QtCore/QAbstractItemModel>
+#include <QtWidgets/QAbstractItemDelegate>
+#include <QtWidgets/QHeaderView>
 
 #include <time.h>
 
diff --git a/src/ObjBrowser/OB_Browser.h b/src/ObjBrowser/OB_Browser.h
index cf9ae146c..9876bab7c 100644
--- a/src/ObjBrowser/OB_Browser.h
+++ b/src/ObjBrowser/OB_Browser.h
@@ -28,10 +28,10 @@
 
 #include "OB.h"
 
-#include <QWidget>
-#include <QMap>
-#include <QModelIndex>
-#include <QItemSelection>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QModelIndex>
+#include <QtCore/QItemSelection>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/PVViewer/PVViewer_Behaviors.cxx b/src/PVViewer/PVViewer_Behaviors.cxx
index 425456be2..6aa141294 100644
--- a/src/PVViewer/PVViewer_Behaviors.cxx
+++ b/src/PVViewer/PVViewer_Behaviors.cxx
@@ -20,7 +20,7 @@
 
 #include "PVViewer_Behaviors.h"
 
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 #include <pqInterfaceTracker.h>
 #include <pqApplicationCore.h>
diff --git a/src/PVViewer/PVViewer_Behaviors.h b/src/PVViewer/PVViewer_Behaviors.h
index 6d8ef87bf..5796aae5e 100644
--- a/src/PVViewer/PVViewer_Behaviors.h
+++ b/src/PVViewer/PVViewer_Behaviors.h
@@ -24,7 +24,7 @@
 
 #include "PVViewer.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class QMainWindow;
 class pqPropertiesPanel;
diff --git a/src/PVViewer/PVViewer_Core.cxx b/src/PVViewer/PVViewer_Core.cxx
index df9ab54c4..e665b4e77 100644
--- a/src/PVViewer/PVViewer_Core.cxx
+++ b/src/PVViewer/PVViewer_Core.cxx
@@ -28,10 +28,10 @@
 #include <Qtx.h>
 
 #include <QtWidgets/QApplication>
-#include <QStringList>
-#include <QDir>
-#include <QMainWindow>
-#include <QStandardPaths>
+#include <QtCore/QStringList>
+#include <QtCore/QDir>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QStandardPaths>
 
 #include <string>
 
diff --git a/src/PVViewer/PVViewer_Core.h b/src/PVViewer/PVViewer_Core.h
index a5ac14738..a31f84b10 100644
--- a/src/PVViewer/PVViewer_Core.h
+++ b/src/PVViewer/PVViewer_Core.h
@@ -23,7 +23,7 @@
 
 #include "PVViewer.h"
 
-#include <QString>
+#include <QtCore/QString>
 
 class PVServer_ServiceWrapper;
 class PVViewer_Behaviors;
diff --git a/src/PVViewer/PVViewer_GUIElements.cxx b/src/PVViewer/PVViewer_GUIElements.cxx
index 24ca57cce..c31ce8675 100644
--- a/src/PVViewer/PVViewer_GUIElements.cxx
+++ b/src/PVViewer/PVViewer_GUIElements.cxx
@@ -51,13 +51,13 @@
 
 #include <vtkPVConfig.h>
 
-#include <QAction>
-#include <QCoreApplication>
-#include <QLayout>
-#include <QList>
-#include <QMainWindow>
-#include <QMenu>
-#include <QToolBar>
+#include <QtWidgets/QAction>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QLayout>
+#include <QtCore/QList>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
 
 PVViewer_GUIElements * PVViewer_GUIElements::theInstance = 0;
 
diff --git a/src/PVViewer/PVViewer_GUIElements.h b/src/PVViewer/PVViewer_GUIElements.h
index 1cb181fea..5452066be 100644
--- a/src/PVViewer/PVViewer_GUIElements.h
+++ b/src/PVViewer/PVViewer_GUIElements.h
@@ -23,8 +23,8 @@
 
 #include "PVViewer.h"
 
-#include <QObject>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QList>
 
 class QAction;
 class QMainWindow;
diff --git a/src/PVViewer/PVViewer_OutputWindow.h b/src/PVViewer/PVViewer_OutputWindow.h
index a825df6fa..4aa6099f4 100644
--- a/src/PVViewer/PVViewer_OutputWindow.h
+++ b/src/PVViewer/PVViewer_OutputWindow.h
@@ -22,7 +22,7 @@
 
 #include "PVViewer.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <vtkOutputWindow.h>
 
 /**
diff --git a/src/PVViewer/PVViewer_ViewWindow.h b/src/PVViewer/PVViewer_ViewWindow.h
index 9ac856898..64d0b6e6f 100644
--- a/src/PVViewer/PVViewer_ViewWindow.h
+++ b/src/PVViewer/PVViewer_ViewWindow.h
@@ -24,7 +24,7 @@
 #include "PVViewer.h"
 
 #include "SUIT_ViewWindow.h"
-#include <QMap>
+#include <QtCore/QMap>
 
 class SUIT_Desktop;
 class PVViewer_Viewer;
diff --git a/src/Plot2d/Plot2d.h b/src/Plot2d/Plot2d.h
index 8014f5248..818ee83ed 100644
--- a/src/Plot2d/Plot2d.h
+++ b/src/Plot2d/Plot2d.h
@@ -37,7 +37,7 @@
 #endif
 
 #include <qwt_symbol.h>
-#include <QString>
+#include <QtCore/QString>
 #include <QtGui/QColor>
 #include <QtGui/QPixmap>
 
diff --git a/src/Plot2d/Plot2d_Algorithm.h b/src/Plot2d/Plot2d_Algorithm.h
index f8cf3eef0..20a2109a2 100644
--- a/src/Plot2d/Plot2d_Algorithm.h
+++ b/src/Plot2d/Plot2d_Algorithm.h
@@ -26,9 +26,9 @@
 
 #include "Plot2d.h"
 
-#include <QPair>
-#include <QList>
-#include <QMap>
+#include <QtCore/QPair>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 
 class Plot2d_Object;
 
diff --git a/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx b/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx
index ac9df16c2..c8bca194d 100644
--- a/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx
+++ b/src/Plot2d/Plot2d_AnalyticalCurveDlg.cxx
@@ -43,15 +43,15 @@
 #include <SUIT_Application.h>
 
 //Qt includes
-#include <QListWidget>
-#include <QGroupBox>
-#include <QFrame>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QPushButton>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QPushButton>
 
 //qwt includes
 #include <qwt_plot.h>
diff --git a/src/Plot2d/Plot2d_AnalyticalCurveDlg.h b/src/Plot2d/Plot2d_AnalyticalCurveDlg.h
index ab382f878..a4e888126 100644
--- a/src/Plot2d/Plot2d_AnalyticalCurveDlg.h
+++ b/src/Plot2d/Plot2d_AnalyticalCurveDlg.h
@@ -30,7 +30,7 @@
 #include "Plot2d_AnalyticalCurve.h"
 
 #include <QtWidgets/QDialog>
-#include <QMap>
+#include <QtCore/QMap>
 
 class QListWidget;
 class QListWidgetItem;
diff --git a/src/Plot2d/Plot2d_FitDataDlg.cxx b/src/Plot2d/Plot2d_FitDataDlg.cxx
index 3be7b9aa6..59bc1ca33 100644
--- a/src/Plot2d/Plot2d_FitDataDlg.cxx
+++ b/src/Plot2d/Plot2d_FitDataDlg.cxx
@@ -24,13 +24,13 @@
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
 #include "Plot2d_FitDataDlg.h"
-#include <QLabel>
-#include <QLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
 #include <QtGui/QValidator>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QGroupBox>
-#include <QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLineEdit>
 
 #define SPACING_SIZE      6
 #define MARGIN_SIZE       11
diff --git a/src/Plot2d/Plot2d_NormalizeAlgorithm.cxx b/src/Plot2d/Plot2d_NormalizeAlgorithm.cxx
index 03ff3301e..bb367e2d6 100644
--- a/src/Plot2d/Plot2d_NormalizeAlgorithm.cxx
+++ b/src/Plot2d/Plot2d_NormalizeAlgorithm.cxx
@@ -22,7 +22,7 @@
 //  File   : Plot2d_NormalizeAlgorithm.cxx
 
 #include "Plot2d_NormalizeAlgorithm.h"
-#include <QMap>
+#include <QtCore/QMap>
 #include <algorithm>
 #include "Plot2d_Object.h"
 
diff --git a/src/Plot2d/Plot2d_NormalizeAlgorithm.h b/src/Plot2d/Plot2d_NormalizeAlgorithm.h
index c5f3b3913..a4e7e2517 100644
--- a/src/Plot2d/Plot2d_NormalizeAlgorithm.h
+++ b/src/Plot2d/Plot2d_NormalizeAlgorithm.h
@@ -26,7 +26,7 @@
 
 #include "Plot2d.h"
 #include "Plot2d_Algorithm.h"
-#include <QList>
+#include <QtCore/QList>
 
 class Plot2d_Object;
 
diff --git a/src/Plot2d/Plot2d_Object.h b/src/Plot2d/Plot2d_Object.h
index 3789a9bc8..e69efdeb8 100644
--- a/src/Plot2d/Plot2d_Object.h
+++ b/src/Plot2d/Plot2d_Object.h
@@ -28,7 +28,7 @@
 
 #include "Plot2d.h"
 
-#include <QList>
+#include <QtCore/QList>
 #include <qwt_plot.h>
 
 
diff --git a/src/Plot2d/Plot2d_PlotItems.cxx b/src/Plot2d/Plot2d_PlotItems.cxx
index f1cafdb9d..aca6471b2 100644
--- a/src/Plot2d/Plot2d_PlotItems.cxx
+++ b/src/Plot2d/Plot2d_PlotItems.cxx
@@ -28,12 +28,12 @@
 
 #include <QtGui/QPainter>
 #include <QtGui/QPalette>
-#include <QLayout>
-#include <QLine>
-#include <QVariant>
-#include <QStyleOption>
+#include <QtWidgets/QLayout>
+#include <QtCore/QLine>
+#include <QtCore/QVariant>
+#include <QtWidgets/QStyleOption>
 #include <QtGui/QPaintEvent>
-#include <QTileRules>
+#include <QtWidgets/QTileRules>
 
 #include <qwt_plot.h>
 #include <qwt_painter.h>
diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.cxx b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
index 91ae71bd0..da3b9e831 100644
--- a/src/Plot2d/Plot2d_SetupCurveDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
@@ -30,12 +30,12 @@
 #include <SUIT_Tools.h>
 #endif
 
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QComboBox>
-#include <QSpinBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
 #include <QtGui/QPainter>
 
 const int MARGIN_SIZE     = 11;
diff --git a/src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx b/src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx
index 4e009dc2a..7418bc52c 100644
--- a/src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupCurveScaleDlg.cxx
@@ -26,11 +26,11 @@
 
 #include <SUIT_Tools.h>
 
-#include <QGroupBox>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QLabel>
-#include <QPushButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
 
 #include <QtxDoubleSpinBox.h>
 
diff --git a/src/Plot2d/Plot2d_SetupViewDlg.cxx b/src/Plot2d/Plot2d_SetupViewDlg.cxx
index 785221bbd..55f0e0acb 100644
--- a/src/Plot2d/Plot2d_SetupViewDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupViewDlg.cxx
@@ -32,16 +32,16 @@
 #include <QtxColorButton.h>
 #include <QtxFontEdit.h>
 
-#include <QCheckBox>
-#include <QLineEdit>
-#include <QComboBox>
-#include <QSpinBox>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QTabWidget>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTabWidget>
 
 const int MARGIN_SIZE     = 11;
 const int SPACING_SIZE    = 6;
diff --git a/src/Plot2d/Plot2d_ToolTip.cxx b/src/Plot2d/Plot2d_ToolTip.cxx
index d2375da72..140f4b5dd 100644
--- a/src/Plot2d/Plot2d_ToolTip.cxx
+++ b/src/Plot2d/Plot2d_ToolTip.cxx
@@ -27,7 +27,7 @@
 #include "Plot2d_Curve.h"
 
 #include <QtGui/QFontMetrics>
-#include <QEvent>
+#include <QtCore/QEvent>
 #include <QtGui/QMouseEvent>
 
 #include <qwt_plot.h>
diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index 4ad64ff4b..ec1da3870 100644
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.cxx
@@ -43,26 +43,26 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Application.h"
 #else
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #endif
 
 #include <QtWidgets/QApplication>
-#include <QToolBar>
-#include <QToolButton>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QToolButton>
 #include <QtGui/QCursor>
-#include <QColorDialog>
-#include <QLayout>
-#include <QMap>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QLayout>
+#include <QtCore/QMap>
 #include <QtGui/QPainter>
-#include <QPaintDevice>
-#include <QEvent>
+#include <QtGui/QPaintDevice>
+#include <QtCore/QEvent>
 #include <QtGui/QMouseEvent>
-#include <QContextMenuEvent>
+#include <QtGui/QContextMenuEvent>
 #include <QtPrintSupport/QPrinter>
 #include <QtGui/QPalette>
-#include <QLocale>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
+#include <QtCore/QLocale>
+#include <QtCore/QXmlStreamWriter>
+#include <QtCore/QXmlStreamReader>
 
 #include <qwt_math.h>
 #include <qwt_plot_layout.h>
diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h
index 599200f18..3b3740bd6 100644
--- a/src/Plot2d/Plot2d_ViewFrame.h
+++ b/src/Plot2d/Plot2d_ViewFrame.h
@@ -30,10 +30,10 @@
 #endif
 #include "Plot2d_NormalizeAlgorithm.h"
 
-#include <QWidget>
-#include <QMultiHash>
-#include <QMap>
-#include <QList>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMultiHash>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 #include <QtGui/QPainter>
 #include <qwt_symbol.h>
 #include <qwt_scale_draw.h>
diff --git a/src/Plot2d/Plot2d_ViewModel.cxx b/src/Plot2d/Plot2d_ViewModel.cxx
index 5fc92bfa0..4879a6915 100644
--- a/src/Plot2d/Plot2d_ViewModel.cxx
+++ b/src/Plot2d/Plot2d_ViewModel.cxx
@@ -28,9 +28,9 @@
 #include "Plot2d_ViewFrame.h"
 #include "Plot2d_Prs.h"
 
-#include <QMenu>
-#include <QToolBar>
-#include <QVector>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
+#include <QtCore/QVector>
 
 /*!
   Constructor
diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx
index 2e2a5d476..b7dac8998 100644
--- a/src/Plot2d/Plot2d_ViewWindow.cxx
+++ b/src/Plot2d/Plot2d_ViewWindow.cxx
@@ -37,14 +37,14 @@
 #include <QtxMultiAction.h>
 #include <QtxActionToolMgr.h>
 
-#include <QStatusBar>
-#include <QLayout>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QLayout>
 #include <QtWidgets/QApplication>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtGui/QImage>
-#include <QToolBar>
+#include <QtWidgets/QToolBar>
 #include <QtGui/QPaintEvent>
-#include <QActionGroup>
+#include <QtWidgets/QActionGroup>
 #include <QtGui/QPainter>
 #include <QtPrintSupport/QPrinter>
 #include <QtPrintSupport/QPrintDialog>
diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h
index 6c7f3f175..925f125c5 100644
--- a/src/Plot2d/Plot2d_ViewWindow.h
+++ b/src/Plot2d/Plot2d_ViewWindow.h
@@ -28,7 +28,7 @@
 
 #include "Plot2d.h"
 #include <SUIT_ViewWindow.h>
-#include <QMap>
+#include <QtCore/QMap>
 
 
 #ifdef WIN32
diff --git a/src/PyViewer/PyViewer_ViewWindow.cxx b/src/PyViewer/PyViewer_ViewWindow.cxx
index ecbbc562b..e34c4a5c5 100644
--- a/src/PyViewer/PyViewer_ViewWindow.cxx
+++ b/src/PyViewer/PyViewer_ViewWindow.cxx
@@ -32,11 +32,11 @@
 #include "QtxActionToolMgr.h"
 
 #include <QtWidgets/QApplication>
-#include <QCloseEvent>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QTextStream>
-#include <QVBoxLayout>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
+#include <QtCore/QTextStream>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   \class PyViewer_ViewWindow
diff --git a/src/QDS/QDS.cxx b/src/QDS/QDS.cxx
index 7f8888f40..1dd7c8774 100644
--- a/src/QDS/QDS.cxx
+++ b/src/QDS/QDS.cxx
@@ -24,7 +24,7 @@
 
 #include "QDS_Datum.h"
 
-#include <QTextCodec>
+#include <QtCore/QTextCodec>
 
 #include <DDS_DicItem.h>
 #include <DDS_Dictionary.h>
diff --git a/src/QDS/QDS.h b/src/QDS/QDS.h
index c4f7fe7a6..b2b4bc14b 100644
--- a/src/QDS/QDS.h
+++ b/src/QDS/QDS.h
@@ -38,8 +38,8 @@
 #pragma warning ( disable:4786 )
 #endif
 
-#include <QString>
-#include <QList>
+#include <QtCore/QString>
+#include <QtCore/QList>
 
 #include <TCollection_HExtendedString.hxx>
 #include <TCollection_HAsciiString.hxx>
diff --git a/src/QDS/QDS_CheckBox.cxx b/src/QDS/QDS_CheckBox.cxx
index f28180bff..86693b7b8 100644
--- a/src/QDS/QDS_CheckBox.cxx
+++ b/src/QDS/QDS_CheckBox.cxx
@@ -22,7 +22,7 @@
 
 #include "QDS_CheckBox.h"
 
-#include <QCheckBox>
+#include <QtWidgets/QCheckBox>
 
 /*
   \class QDS_CheckBox
diff --git a/src/QDS/QDS_ComboBox.cxx b/src/QDS/QDS_ComboBox.cxx
index e1bc4c2f8..de2c32ca5 100644
--- a/src/QDS/QDS_ComboBox.cxx
+++ b/src/QDS/QDS_ComboBox.cxx
@@ -27,7 +27,7 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfExtendedString.hxx>
 
-#include <QLineEdit>
+#include <QtWidgets/QLineEdit>
 
 /*
   \class QDS_ComboBox
diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index e7ee681c1..2be1d721f 100644
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.h
@@ -25,9 +25,9 @@
 
 #include "QDS_Datum.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <QtGui/QPixmap>
-#include <QStringList>
+#include <QtCore/QStringList>
 
 #include <Qtx.h>
 
diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index efa5e081e..acee99bd5 100644
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.cxx
@@ -22,11 +22,11 @@
 
 #include "QDS_Datum.h"
 
-#include <QLayout>
-#include <QVariant>
-#include <QTimer>
-#include <QEvent>
-#include <QMessageBox>
+#include <QtWidgets/QLayout>
+#include <QtCore/QVariant>
+#include <QtCore/QTimer>
+#include <QtCore/QEvent>
+#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QApplication>
 
 #include "QDS_Validator.h"
diff --git a/src/QDS/QDS_Datum.h b/src/QDS/QDS_Datum.h
index b44745090..cb3815dfa 100644
--- a/src/QDS/QDS_Datum.h
+++ b/src/QDS/QDS_Datum.h
@@ -24,9 +24,9 @@
 #define QDS_DATUM_H
 
 #include "QDS.h"
-#include <QPointer>
-#include <QMap>
-#include <QLabel>
+#include <QtCore/QPointer>
+#include <QtCore/QMap>
+#include <QtWidgets/QLabel>
 
 class QHBoxLayout;
 class QVBoxLayout;
diff --git a/src/QDS/QDS_LineEdit.cxx b/src/QDS/QDS_LineEdit.cxx
index fd20cc4f3..05cada628 100644
--- a/src/QDS/QDS_LineEdit.cxx
+++ b/src/QDS/QDS_LineEdit.cxx
@@ -22,7 +22,7 @@
 
 #include "QDS_LineEdit.h"
 
-#include <QLineEdit>
+#include <QtWidgets/QLineEdit>
 #include <QtGui/QValidator>
 
 /*!
diff --git a/src/QDS/QDS_RadioBox.cxx b/src/QDS/QDS_RadioBox.cxx
index 8bdcb0e5d..64188c46b 100644
--- a/src/QDS/QDS_RadioBox.cxx
+++ b/src/QDS/QDS_RadioBox.cxx
@@ -25,10 +25,10 @@
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TColStd_HArray1OfExtendedString.hxx>
 
-#include <QButtonGroup>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QRadioButton>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QRadioButton>
 
 /*
   \class QDS_RadioBox
diff --git a/src/QDS/QDS_RadioBox.h b/src/QDS/QDS_RadioBox.h
index ef52b461d..07b7b452d 100644
--- a/src/QDS/QDS_RadioBox.h
+++ b/src/QDS/QDS_RadioBox.h
@@ -27,8 +27,8 @@
 
 #include <Qtx.h>
 
-#include <QMap>
-#include <QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/QDS/QDS_Table.h b/src/QDS/QDS_Table.h
index b4c1d0b5f..fcc2eaf4d 100644
--- a/src/QDS/QDS_Table.h
+++ b/src/QDS/QDS_Table.h
@@ -27,8 +27,8 @@
 
 #include <QtxTable.h>
 
-#include <QMap>
-#include <QVector>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
 
 class QDS_EXPORT QDS_Table : public QtxTable
 {
diff --git a/src/QDS/QDS_TextEdit.cxx b/src/QDS/QDS_TextEdit.cxx
index 632591eff..32a56dab3 100644
--- a/src/QDS/QDS_TextEdit.cxx
+++ b/src/QDS/QDS_TextEdit.cxx
@@ -22,7 +22,7 @@
 
 #include "QDS_TextEdit.h"
 
-#include <QTextEdit>
+#include <QtWidgets/QTextEdit>
 
 /*
   \class QDS_TextEdit
diff --git a/src/Qtx/CMakeLists.txt b/src/Qtx/CMakeLists.txt
index 6a55257aa..df65f5752 100644
--- a/src/Qtx/CMakeLists.txt
+++ b/src/Qtx/CMakeLists.txt
@@ -29,7 +29,7 @@ INCLUDE_DIRECTORIES("/usr/include/x86_64-linux-gnu/qt5/QtWidgets")
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 #/usr/lib/x86_64-linux-gnu/libQt5Widgets.so
 # libraries to link to
-SET(_link_LIBRARIES ${QT_LIBRARIES} /usr/lib/x86_64-linux-gnu/libQt5Xml.so ${OPENGL_LIBRARIES})
+SET(_link_LIBRARIES ${QT_LIBRARIES} /usr/lib/x86_64-linux-gnu/libQt5Widgets.so /usr/lib/x86_64-linux-gnu/libQt5Xml.so ${OPENGL_LIBRARIES})
 
 # --- headers ---
 
diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index 283196d29..395d4c762 100644
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -25,15 +25,15 @@
 //
 #include "Qtx.h"
 
-#include <QDir>
+#include <QtCore/QDir>
 #include <QtWidgets/QMenu>
-#include <QRegExp>
+#include <QtCore/QRegExp>
 #include <QtGui/QBitmap>
 #include <QtWidgets/QWidget>
 #include <QtWidgets/QLayout>
 #include <QtGui/QPainter>
 #include <QtWidgets/QDirModel>
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 #include <QtWidgets/QCompleter>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QDesktopWidget>
diff --git a/src/Qtx/Qtx.h b/src/Qtx/Qtx.h
index 9105d8658..599f7790e 100644
--- a/src/Qtx/Qtx.h
+++ b/src/Qtx/Qtx.h
@@ -42,8 +42,8 @@
 #define true  1
 #endif
 
-#include <QString>
-#include <QList>
+#include <QtCore/QString>
+#include <QtCore/QList>
 #include <QtGui/QFont>
 #include <QtGui/QColor>
 #include <QtGui/QImage>
diff --git a/src/Qtx/QtxAction.cxx b/src/Qtx/QtxAction.cxx
index 08ba3d261..48d7f4b40 100644
--- a/src/Qtx/QtxAction.cxx
+++ b/src/Qtx/QtxAction.cxx
@@ -25,8 +25,8 @@
 //
 #include "QtxAction.h"
 
-#include <QEvent>
-#include <QPointer>
+#include <QtCore/QEvent>
+#include <QtCore/QPointer>
 #include <QtGui/QActionEvent>
 #include <QtWidgets/QApplication>
 
diff --git a/src/Qtx/QtxActionMenuMgr.cxx b/src/Qtx/QtxActionMenuMgr.cxx
index 999cb81c9..bfec2c58d 100644
--- a/src/Qtx/QtxActionMenuMgr.cxx
+++ b/src/Qtx/QtxActionMenuMgr.cxx
@@ -27,10 +27,10 @@
 
 #include "QtxAction.h"
 
-#include <QMenu>
-#include <QMenuBar>
-#include <QWidget>
-#include <QMainWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QMainWindow>
 
 /*!
   \class QtxActionMenuMgr::MenuNode
diff --git a/src/Qtx/QtxActionMenuMgr.h b/src/Qtx/QtxActionMenuMgr.h
index 0f9de3a8e..c0e119013 100644
--- a/src/Qtx/QtxActionMenuMgr.h
+++ b/src/Qtx/QtxActionMenuMgr.h
@@ -29,7 +29,7 @@
 #include "Qtx.h"
 #include "QtxActionMgr.h"
 
-#include <QList>
+#include <QtCore/QList>
 
 class QMenu;
 class QMainWindow;
diff --git a/src/Qtx/QtxActionMgr.cxx b/src/Qtx/QtxActionMgr.cxx
index c82e54c29..cbbc22b8d 100644
--- a/src/Qtx/QtxActionMgr.cxx
+++ b/src/Qtx/QtxActionMgr.cxx
@@ -26,8 +26,8 @@
 #include "Qtx.h"
 #include "QtxActionMgr.h"
 #include "QtxAction.h"
-#include <QFile>
-#include <QTimer>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
 #ifndef QT_NO_DOM
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomNode>
diff --git a/src/Qtx/QtxActionMgr.h b/src/Qtx/QtxActionMgr.h
index 8f14d5951..ca14d7faf 100644
--- a/src/Qtx/QtxActionMgr.h
+++ b/src/Qtx/QtxActionMgr.h
@@ -28,9 +28,9 @@
 
 #include "Qtx.h"
 
-#include <QMap>
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 class QTimer;
 class QAction;
diff --git a/src/Qtx/QtxActionSet.h b/src/Qtx/QtxActionSet.h
index 59d6f22ba..b7fbecc36 100644
--- a/src/Qtx/QtxActionSet.h
+++ b/src/Qtx/QtxActionSet.h
@@ -25,7 +25,7 @@
 
 #include "QtxAction.h"
 
-#include <QList>
+#include <QtCore/QList>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/Qtx/QtxActionToolMgr.cxx b/src/Qtx/QtxActionToolMgr.cxx
index 76dceead0..876a81c27 100644
--- a/src/Qtx/QtxActionToolMgr.cxx
+++ b/src/Qtx/QtxActionToolMgr.cxx
@@ -30,7 +30,7 @@
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QHideEvent>
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 /*!
   \class QtxActionToolMgr::ToolNode
diff --git a/src/Qtx/QtxActionToolMgr.h b/src/Qtx/QtxActionToolMgr.h
index f3fd45999..85b71bf98 100644
--- a/src/Qtx/QtxActionToolMgr.h
+++ b/src/Qtx/QtxActionToolMgr.h
@@ -29,8 +29,8 @@
 #include "Qtx.h"
 #include "QtxActionMgr.h"
 
-#include <QMap>
-#include <QList>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 class QToolBar;
 class QMainWindow;
diff --git a/src/Qtx/QtxBackgroundTool.cxx b/src/Qtx/QtxBackgroundTool.cxx
index 89bc046d7..f5827cacb 100644
--- a/src/Qtx/QtxBackgroundTool.cxx
+++ b/src/Qtx/QtxBackgroundTool.cxx
@@ -23,15 +23,15 @@
 #include "QtxBackgroundTool.h"
 #include "QtxColorButton.h"
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QFileDialog>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QStackedWidget>
-#include <QVBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QVBoxLayout>
 
 
 /*!
diff --git a/src/Qtx/QtxBackgroundTool.h b/src/Qtx/QtxBackgroundTool.h
index c9c1b9451..a86f8f462 100644
--- a/src/Qtx/QtxBackgroundTool.h
+++ b/src/Qtx/QtxBackgroundTool.h
@@ -26,8 +26,8 @@
 #include "Qtx.h"
 #include "QtxDialog.h"
 
-#include <QWidget>
-#include <QMap>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
 
 class QCheckBox;
 class QComboBox;
diff --git a/src/Qtx/QtxBiColorTool.cxx b/src/Qtx/QtxBiColorTool.cxx
index 76fcb8650..0560386f7 100644
--- a/src/Qtx/QtxBiColorTool.cxx
+++ b/src/Qtx/QtxBiColorTool.cxx
@@ -23,13 +23,13 @@
 #include "QtxBiColorTool.h"
 #include "QtxColorButton.h"
 
-#include <QHBoxLayout>
-#include <QLabel>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
 #include <QtGui/QPainter>
-#include <QSlider>
-#include <QStyle>
-#include <QStylePainter>
-#include <QStyleOptionButton>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStylePainter>
+#include <QtWidgets/QStyleOptionButton>
 
 const int BICOLOR_MAX_DELTA = 100;
 
diff --git a/src/Qtx/QtxBiColorTool.h b/src/Qtx/QtxBiColorTool.h
index 6f442c177..679ce3933 100644
--- a/src/Qtx/QtxBiColorTool.h
+++ b/src/Qtx/QtxBiColorTool.h
@@ -26,7 +26,7 @@
 #include "Qtx.h"
 
 #include <QtGui/QColor>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QLabel;
 class QSlider;
diff --git a/src/Qtx/QtxColorButton.cxx b/src/Qtx/QtxColorButton.cxx
index 4b69f709f..d2f8ee4ae 100644
--- a/src/Qtx/QtxColorButton.cxx
+++ b/src/Qtx/QtxColorButton.cxx
@@ -22,14 +22,14 @@
 //
 #include "QtxColorButton.h"
 
-#include <QMenu>
-#include <QStyle>
-#include <QLayout>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QLayout>
 #include <QtGui/QBitmap>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
-#include <QColorDialog>
-#include <QStyleOptionToolButton>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QStyleOptionToolButton>
 
 /*!
   \class QtxColorButton
diff --git a/src/Qtx/QtxColorButton.h b/src/Qtx/QtxColorButton.h
index f1bba122e..142eab179 100644
--- a/src/Qtx/QtxColorButton.h
+++ b/src/Qtx/QtxColorButton.h
@@ -25,10 +25,10 @@
 
 #include "Qtx.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <QtGui/QColor>
 #include <QtGui/QPixmap>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 
 class QPaintDevice;
 
diff --git a/src/Qtx/QtxColorScale.cxx b/src/Qtx/QtxColorScale.cxx
index b2a6e64f8..308116856 100644
--- a/src/Qtx/QtxColorScale.cxx
+++ b/src/Qtx/QtxColorScale.cxx
@@ -25,9 +25,9 @@
 //
 #include "QtxColorScale.h"
 
-#include <QMap>
-#include <QRegExp>
-#include <QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QRegExp>
+#include <QtCore/QStringList>
 #include <QtGui/QPixmap>
 #include <QtGui/QPainter>
 #include <QtGui/QTextDocument>
diff --git a/src/Qtx/QtxColorScale.h b/src/Qtx/QtxColorScale.h
index 67e438356..549622926 100644
--- a/src/Qtx/QtxColorScale.h
+++ b/src/Qtx/QtxColorScale.h
@@ -28,8 +28,8 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
-#include <QList>
+#include <QtWidgets/QFrame>
+#include <QtCore/QList>
 
 class QTextDocument;
 
diff --git a/src/Qtx/QtxComboBox.cxx b/src/Qtx/QtxComboBox.cxx
index 9fcb6cfd6..0a8e63c94 100644
--- a/src/Qtx/QtxComboBox.cxx
+++ b/src/Qtx/QtxComboBox.cxx
@@ -25,8 +25,8 @@
 #include "QtxComboBox.h"
 
 #include <QtGui/QStandardItemModel>
-#include <QLineEdit>
-#include <QEvent>
+#include <QtWidgets/QLineEdit>
+#include <QtCore/QEvent>
 #include <QtWidgets/QApplication>
 
 /*!
diff --git a/src/Qtx/QtxComboBox.h b/src/Qtx/QtxComboBox.h
index e9fb2c18c..9d53239cc 100644
--- a/src/Qtx/QtxComboBox.h
+++ b/src/Qtx/QtxComboBox.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 #include <QtWidgets/QComboBox>
 
 #ifdef WIN32
diff --git a/src/Qtx/QtxDialog.cxx b/src/Qtx/QtxDialog.cxx
index f36d498bf..712c0ca4b 100644
--- a/src/Qtx/QtxDialog.cxx
+++ b/src/Qtx/QtxDialog.cxx
@@ -25,12 +25,12 @@
 //
 #include "QtxDialog.h"
 
-#include <QLabel>
-#include <QLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
 #include <QtGui/QKeyEvent>
-#include <QFrame>
-#include <QTabWidget>
-#include <QPushButton>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QPushButton>
 #include <QtWidgets/QApplication>
 
 /*!
diff --git a/src/Qtx/QtxDialog.h b/src/Qtx/QtxDialog.h
index 273dfd02f..213088c69 100644
--- a/src/Qtx/QtxDialog.h
+++ b/src/Qtx/QtxDialog.h
@@ -29,7 +29,7 @@
 #include "Qtx.h"
 
 #include <QtWidgets/QDialog>
-#include <QMap>
+#include <QtCore/QMap>
 
 class QFrame;
 class QLabel;
diff --git a/src/Qtx/QtxDockAction.cxx b/src/Qtx/QtxDockAction.cxx
index 068285148..6dc792b32 100644
--- a/src/Qtx/QtxDockAction.cxx
+++ b/src/Qtx/QtxDockAction.cxx
@@ -25,10 +25,10 @@
 //
 #include "QtxDockAction.h"
 
-#include <QMenu>
-#include <QToolBar>
-#include <QDockWidget>
-#include <QMainWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QMainWindow>
 
 /*!
   \class QtxDockAction
diff --git a/src/Qtx/QtxDockAction.h b/src/Qtx/QtxDockAction.h
index 87fe61771..3567db16f 100644
--- a/src/Qtx/QtxDockAction.h
+++ b/src/Qtx/QtxDockAction.h
@@ -28,7 +28,7 @@
 
 #include "QtxAction.h"
 
-#include <QList>
+#include <QtCore/QList>
 
 class QIcon;
 class QString;
diff --git a/src/Qtx/QtxDockWidget.cxx b/src/Qtx/QtxDockWidget.cxx
index 9aa4a25a7..cda787596 100644
--- a/src/Qtx/QtxDockWidget.cxx
+++ b/src/Qtx/QtxDockWidget.cxx
@@ -25,9 +25,9 @@
 //
 #include "QtxDockWidget.h"
 
-#include <QAction>
-#include <QLayout>
-#include <QMainWindow>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QMainWindow>
 #include <QtGui/QResizeEvent>
 #include <QtWidgets/QApplication>
 
diff --git a/src/Qtx/QtxDockWidget.h b/src/Qtx/QtxDockWidget.h
index 0a3cade38..3259d42dd 100644
--- a/src/Qtx/QtxDockWidget.h
+++ b/src/Qtx/QtxDockWidget.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QDockWidget>
+#include <QtWidgets/QDockWidget>
 
 class QTX_EXPORT QtxDockWidget : public QDockWidget
 {
diff --git a/src/Qtx/QtxDoubleSpinBox.cxx b/src/Qtx/QtxDoubleSpinBox.cxx
index 9d2380bce..acbc614f1 100644
--- a/src/Qtx/QtxDoubleSpinBox.cxx
+++ b/src/Qtx/QtxDoubleSpinBox.cxx
@@ -22,9 +22,9 @@
 //
 #include "QtxDoubleSpinBox.h"
 
-#include <QLineEdit>
+#include <QtWidgets/QLineEdit>
 #include <QtGui/QDoubleValidator>
-#include <QVariant>
+#include <QtCore/QVariant>
 
 #include <limits>
 
diff --git a/src/Qtx/QtxDoubleSpinBox.h b/src/Qtx/QtxDoubleSpinBox.h
index 00e822a84..0b0324256 100644
--- a/src/Qtx/QtxDoubleSpinBox.h
+++ b/src/Qtx/QtxDoubleSpinBox.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QDoubleSpinBox>
+#include <QtWidgets/QDoubleSpinBox>
 #include <QtGui/QValidator>
 
 class QTX_EXPORT QtxDoubleSpinBox : public QDoubleSpinBox
diff --git a/src/Qtx/QtxEvalExpr.cxx b/src/Qtx/QtxEvalExpr.cxx
index f802c9455..d56dc09c4 100644
--- a/src/Qtx/QtxEvalExpr.cxx
+++ b/src/Qtx/QtxEvalExpr.cxx
@@ -22,7 +22,7 @@
 //
 #include "QtxEvalExpr.h"
 
-#include <QStack>
+#include <QtCore/QStack>
 
 #include <math.h>
 
diff --git a/src/Qtx/QtxEvalExpr.h b/src/Qtx/QtxEvalExpr.h
index bcd107f1d..7e0cd0779 100644
--- a/src/Qtx/QtxEvalExpr.h
+++ b/src/Qtx/QtxEvalExpr.h
@@ -25,8 +25,8 @@
 
 #include "Qtx.h"
 
-#include <QList>
-#include <QVariant>
+#include <QtCore/QList>
+#include <QtCore/QVariant>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/Qtx/QtxFontEdit.cxx b/src/Qtx/QtxFontEdit.cxx
index c1abb3cbe..093bc1f0c 100644
--- a/src/Qtx/QtxFontEdit.cxx
+++ b/src/Qtx/QtxFontEdit.cxx
@@ -24,11 +24,11 @@
 
 #include "QtxComboBox.h"
 
-#include <QLayout>
-#include <QToolButton>
-#include <QFontDialog>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QFontDialog>
 #include <QtGui/QFontDatabase>
-#include <QFontComboBox>
+#include <QtWidgets/QFontComboBox>
 
 /*!
   \class QtxFontEdit
diff --git a/src/Qtx/QtxFontEdit.h b/src/Qtx/QtxFontEdit.h
index 55a201e67..9bf47a831 100644
--- a/src/Qtx/QtxFontEdit.h
+++ b/src/Qtx/QtxFontEdit.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
+#include <QtWidgets/QFrame>
 
 class QtxComboBox;
 class QComboBox;
diff --git a/src/Qtx/QtxGridBox.cxx b/src/Qtx/QtxGridBox.cxx
index c82aba951..7da2dd9a9 100644
--- a/src/Qtx/QtxGridBox.cxx
+++ b/src/Qtx/QtxGridBox.cxx
@@ -22,8 +22,8 @@
 //
 #include "QtxGridBox.h"
 
-#include <QGridLayout>
-#include <QChildEvent>
+#include <QtWidgets/QGridLayout>
+#include <QtCore/QChildEvent>
 
 /*!
   \class QtxGridBox::Space
diff --git a/src/Qtx/QtxGridBox.h b/src/Qtx/QtxGridBox.h
index f054a1707..57c3877c8 100644
--- a/src/Qtx/QtxGridBox.h
+++ b/src/Qtx/QtxGridBox.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QGridLayout;
 
diff --git a/src/Qtx/QtxGroupBox.cxx b/src/Qtx/QtxGroupBox.cxx
index b005a9e82..82486291e 100644
--- a/src/Qtx/QtxGroupBox.cxx
+++ b/src/Qtx/QtxGroupBox.cxx
@@ -25,10 +25,10 @@
 //
 #include "QtxGroupBox.h"
 
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QEvent>
-#include <QObjectList>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtCore/QEvent>
+#include <QtCore/QObjectList>
 #include <QtWidgets/QApplication>
 
 /*!
diff --git a/src/Qtx/QtxGroupBox.h b/src/Qtx/QtxGroupBox.h
index 11ebf51e9..9705d0250 100644
--- a/src/Qtx/QtxGroupBox.h
+++ b/src/Qtx/QtxGroupBox.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QGroupBox>
+#include <QtWidgets/QGroupBox>
 
 class QTX_EXPORT QtxGroupBox : public QGroupBox
 {
diff --git a/src/Qtx/QtxIntSpinBox.cxx b/src/Qtx/QtxIntSpinBox.cxx
index 69a72c469..b562284f0 100644
--- a/src/Qtx/QtxIntSpinBox.cxx
+++ b/src/Qtx/QtxIntSpinBox.cxx
@@ -25,7 +25,7 @@
 //
 #include "QtxIntSpinBox.h"
 
-#include <QLineEdit>
+#include <QtWidgets/QLineEdit>
 /*!
   \class QtxIntSpinBox
   \brief Enhanced version of the Qt's spin box.
diff --git a/src/Qtx/QtxIntSpinBox.h b/src/Qtx/QtxIntSpinBox.h
index 25c66c78e..c7ef2b221 100644
--- a/src/Qtx/QtxIntSpinBox.h
+++ b/src/Qtx/QtxIntSpinBox.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QSpinBox>
+#include <QtWidgets/QSpinBox>
 
 class QTX_EXPORT QtxIntSpinBox : public QSpinBox
 {
diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index fd8337123..97b5eeb01 100644
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.cxx
@@ -25,12 +25,12 @@
 //
 #include "QtxListAction.h"
 
-#include <QMenu>
-#include <QLabel>
-#include <QVBoxLayout>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
 #include <QtGui/QMouseEvent>
-#include <QListWidget>
-#include <QToolButton>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QToolButton>
 #include <QtWidgets/QApplication>
 
 /*!
diff --git a/src/Qtx/QtxListAction.h b/src/Qtx/QtxListAction.h
index 9d87b9ecd..72c146d45 100644
--- a/src/Qtx/QtxListAction.h
+++ b/src/Qtx/QtxListAction.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 #include "QtxAction.h"
-#include <QStringList>
+#include <QtCore/QStringList>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/Qtx/QtxListBox.h b/src/Qtx/QtxListBox.h
index 2960bbeb7..078a3db05 100644
--- a/src/Qtx/QtxListBox.h
+++ b/src/Qtx/QtxListBox.h
@@ -30,8 +30,8 @@
 
 // This file isn't yet ported to Qt4 => there are some corrections for OCCViewer porting  -->
 //#include <qlistbox.h>
-#include <QListWidget>
-#include <QListWidgetItem>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QListWidgetItem>
 // <--
 
 #ifdef WIN32
diff --git a/src/Qtx/QtxLogoMgr.cxx b/src/Qtx/QtxLogoMgr.cxx
index 09fd5de4c..f65319dea 100644
--- a/src/Qtx/QtxLogoMgr.cxx
+++ b/src/Qtx/QtxLogoMgr.cxx
@@ -25,12 +25,12 @@
 //
 #include "QtxLogoMgr.h"
 
-#include <QLabel>
+#include <QtWidgets/QLabel>
 #include <QtGui/QImage>
 #include <QtGui/QBitmap>
-#include <QHBoxLayout>
-#include <QMenuBar>
-#include <QPointer>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QMenuBar>
+#include <QtCore/QPointer>
 #include <QtWidgets/QApplication>
 #include <QtGui/QMovie>
 
diff --git a/src/Qtx/QtxLogoMgr.h b/src/Qtx/QtxLogoMgr.h
index 4b806b03e..c1f44d169 100644
--- a/src/Qtx/QtxLogoMgr.h
+++ b/src/Qtx/QtxLogoMgr.h
@@ -28,8 +28,8 @@
 
 #include "Qtx.h"
 
-#include <QObject>
-#include <QList>
+#include <QtCore/QObject>
+#include <QtCore/QList>
 #include <QtGui/QPixmap>
 
 class QMenuBar;
diff --git a/src/Qtx/QtxMRUAction.cxx b/src/Qtx/QtxMRUAction.cxx
index 6eadfe92c..9a6fd979a 100644
--- a/src/Qtx/QtxMRUAction.cxx
+++ b/src/Qtx/QtxMRUAction.cxx
@@ -27,7 +27,7 @@
 
 #include "QtxResourceMgr.h"
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtGui/QIcon>
 
 /*!
diff --git a/src/Qtx/QtxMRUAction.h b/src/Qtx/QtxMRUAction.h
index 54c7bb06a..5cfb4379f 100644
--- a/src/Qtx/QtxMRUAction.h
+++ b/src/Qtx/QtxMRUAction.h
@@ -28,7 +28,7 @@
 
 #include "QtxAction.h"
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 class QtxResourceMgr;
 
diff --git a/src/Qtx/QtxMainWindow.cxx b/src/Qtx/QtxMainWindow.cxx
index 7d1655338..63569a282 100644
--- a/src/Qtx/QtxMainWindow.cxx
+++ b/src/Qtx/QtxMainWindow.cxx
@@ -26,16 +26,16 @@
 
 #include "QtxToolBar.h"
 
-#include <QEvent>
-#include <QPoint>
-#include <QTimer>
-#include <QLayout>
-#include <QMenuBar>
-#include <QStatusBar>
-#include <QRubberBand>
+#include <QtCore/QEvent>
+#include <QtCore/QPoint>
+#include <QtCore/QTimer>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QRubberBand>
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QApplication>
-#include <QDesktopWidget>
+#include <QtWidgets/QDesktopWidget>
 #include <cstdio>
 /*!
   \class QtxMainWindow::Filter
diff --git a/src/Qtx/QtxMainWindow.h b/src/Qtx/QtxMainWindow.h
index 68df5bbfa..53ddf3284 100644
--- a/src/Qtx/QtxMainWindow.h
+++ b/src/Qtx/QtxMainWindow.h
@@ -27,7 +27,7 @@
 
 #include "Qtx.h"
 
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 class QtxResourceMgr;
 
diff --git a/src/Qtx/QtxMenu.cxx b/src/Qtx/QtxMenu.cxx
index 36514c6c9..b784215b4 100644
--- a/src/Qtx/QtxMenu.cxx
+++ b/src/Qtx/QtxMenu.cxx
@@ -22,12 +22,12 @@
 //
 #include "QtxMenu.h"
 
-#include <QLabel>
-#include <QLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEvent>
 #include <QtGui/QTextDocument>
-#include <QWidgetAction>
+#include <QtWidgets/QWidgetAction>
 #include <QtGui/QLinearGradient>
 #include <QtGui/QAbstractTextDocumentLayout>
 
diff --git a/src/Qtx/QtxMenu.h b/src/Qtx/QtxMenu.h
index ddbe04495..d3b33d106 100644
--- a/src/Qtx/QtxMenu.h
+++ b/src/Qtx/QtxMenu.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 
 class QWidgetAction;
 
diff --git a/src/Qtx/QtxMsgHandler.h b/src/Qtx/QtxMsgHandler.h
index daa589654..98d5eae1e 100644
--- a/src/Qtx/QtxMsgHandler.h
+++ b/src/Qtx/QtxMsgHandler.h
@@ -24,7 +24,7 @@
 #define QTXMSGHANDLER_H
 
 #include "Qtx.h"
-#include <QList>
+#include <QtCore/QList>
 
 void QTX_EXPORT QtxMsgHandler(QtMsgType, const QMessageLogContext&, const QString&);
 
diff --git a/src/Qtx/QtxMultiAction.cxx b/src/Qtx/QtxMultiAction.cxx
index 13d75f959..1b7baa135 100644
--- a/src/Qtx/QtxMultiAction.cxx
+++ b/src/Qtx/QtxMultiAction.cxx
@@ -22,14 +22,14 @@
 //
 #include "QtxMultiAction.h"
 
-#include <QMenu>
-#include <QLayout>
-#include <QToolBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QToolBar>
 #include <QtGui/QPainter>
 #include <QtGui/QHelpEvent>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 #include <QtWidgets/QApplication>
-#include <QStyleOptionButton>
+#include <QtWidgets/QStyleOptionButton>
 
 /*!
   \class QtxMultiAction::Filter
diff --git a/src/Qtx/QtxNotify.cxx b/src/Qtx/QtxNotify.cxx
index a953d8513..9e9173e3f 100644
--- a/src/Qtx/QtxNotify.cxx
+++ b/src/Qtx/QtxNotify.cxx
@@ -22,15 +22,15 @@
 
 #include "QtxNotify.h"
 
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtGui/QPainter>
 #include <QtGui/QMouseEvent>
 #include <QtWidgets/QApplication>
 #include <QtGui/QTextDocument>
-#include <QDesktopWidget>
-#include <QSharedPointer>
-#include <QPropertyAnimation>
-#include <QParallelAnimationGroup>
+#include <QtWidgets/QDesktopWidget>
+#include <QtCore/QSharedPointer>
+#include <QtCore/QPropertyAnimation>
+#include <QtCore/QParallelAnimationGroup>
 
 /*!
     \brief QtxNotify::NotifyWidget
diff --git a/src/Qtx/QtxNotify.h b/src/Qtx/QtxNotify.h
index 212adf3c1..2c06bf140 100644
--- a/src/Qtx/QtxNotify.h
+++ b/src/Qtx/QtxNotify.h
@@ -25,10 +25,10 @@
 
 #include "Qtx.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
-#include <QList>
-#include <QAbstractAnimation>
+#include <QtCore/QList>
+#include <QtCore/QAbstractAnimation>
 
 class QTimer;
 
diff --git a/src/Qtx/QtxPagePrefMgr.cxx b/src/Qtx/QtxPagePrefMgr.cxx
index f1427c225..fe3e94107 100644
--- a/src/Qtx/QtxPagePrefMgr.cxx
+++ b/src/Qtx/QtxPagePrefMgr.cxx
@@ -34,20 +34,20 @@
 #include "QtxBackgroundTool.h"
 #include "QtxResourceMgr.h"
 
-#include <QEvent>
-#include <QLayout>
-#include <QToolBox>
-#include <QLineEdit>
-#include <QTextEdit>
-#include <QCheckBox>
-#include <QSplitter>
-#include <QTabWidget>
-#include <QListWidget>
+#include <QtCore/QEvent>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QToolBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QListWidget>
 #include <QtWidgets/QApplication>
-#include <QDateTimeEdit>
-#include <QStackedWidget>
-#include <QSlider>
-#include <QScrollArea>
+#include <QtWidgets/QDateTimeEdit>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QScrollArea>
 
 #include <stdio.h>
 
diff --git a/src/Qtx/QtxPagePrefMgr.h b/src/Qtx/QtxPagePrefMgr.h
index 952ea12e3..5b99f008c 100644
--- a/src/Qtx/QtxPagePrefMgr.h
+++ b/src/Qtx/QtxPagePrefMgr.h
@@ -28,9 +28,9 @@
 #include "QtxPathEdit.h"
 #include "QtxPathListEdit.h"
 
-#include <QFrame>
-#include <QLabel>
-#include <QPointer>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QLabel>
+#include <QtCore/QPointer>
 #include <QtGui/QIcon>
 
 class QtxGridBox;
diff --git a/src/Qtx/QtxPathDialog.cxx b/src/Qtx/QtxPathDialog.cxx
index 9e48f4571..8b685501a 100644
--- a/src/Qtx/QtxPathDialog.cxx
+++ b/src/Qtx/QtxPathDialog.cxx
@@ -28,16 +28,16 @@
 #include "QtxGridBox.h"
 #include "QtxGroupBox.h"
 
-#include <QDir>
-#include <QLabel>
+#include <QtCore/QDir>
+#include <QtWidgets/QLabel>
 #include <QtGui/QPixmap>
-#include <QLayout>
-#include <QLineEdit>
-#include <QObjectList>
-#include <QStringList>
-#include <QFileDialog>
-#include <QMessageBox>
-#include <QPushButton>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtCore/QObjectList>
+#include <QtCore/QStringList>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
 
 static const char* open_icon[] = {
 "16 16 5 1",
diff --git a/src/Qtx/QtxPathDialog.h b/src/Qtx/QtxPathDialog.h
index 8ddb2234a..599212f84 100644
--- a/src/Qtx/QtxPathDialog.h
+++ b/src/Qtx/QtxPathDialog.h
@@ -28,7 +28,7 @@
 
 #include "QtxDialog.h"
 
-#include <QMap>
+#include <QtCore/QMap>
 
 class QFrame;
 class QLineEdit;
diff --git a/src/Qtx/QtxPathEdit.cxx b/src/Qtx/QtxPathEdit.cxx
index 10d50ffea..512ccce6e 100644
--- a/src/Qtx/QtxPathEdit.cxx
+++ b/src/Qtx/QtxPathEdit.cxx
@@ -23,13 +23,13 @@
 #include "QtxPathEdit.h"
 
 #include <QtWidgets/QApplication>
-#include <QLayout>
-#include <QDirModel>
-#include <QLineEdit>
-#include <QCompleter>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QDirModel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QCompleter>
 #include <QtGui/QKeyEvent>
-#include <QToolButton>
-#include <QFileDialog>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QFileDialog>
 #include <QtGui/QRegExpValidator>
 
 static const char* browse_icon[] = {
diff --git a/src/Qtx/QtxPathEdit.h b/src/Qtx/QtxPathEdit.h
index 1d587bdad..db807cb8d 100644
--- a/src/Qtx/QtxPathEdit.h
+++ b/src/Qtx/QtxPathEdit.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
+#include <QtWidgets/QFrame>
 
 class QLineEdit;
 
diff --git a/src/Qtx/QtxPathListEdit.cxx b/src/Qtx/QtxPathListEdit.cxx
index 08b7c4662..510bd3da0 100644
--- a/src/Qtx/QtxPathListEdit.cxx
+++ b/src/Qtx/QtxPathListEdit.cxx
@@ -24,18 +24,18 @@
 
 #include "QtxPathEdit.h"
 
-#include <QLayout>
+#include <QtWidgets/QLayout>
 #include <QtGui/QPainter>
-#include <QListView>
-#include <QLineEdit>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QLineEdit>
 #include <QtGui/QKeyEvent>
-#include <QDirModel>
-#include <QCompleter>
-#include <QToolButton>
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QItemDelegate>
-#include <QStringListModel>
+#include <QtWidgets/QDirModel>
+#include <QtWidgets/QCompleter>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QItemDelegate>
+#include <QtCore/QStringListModel>
 
 static const char* delete_icon[] = {
 "16 16 3 1",
diff --git a/src/Qtx/QtxPathListEdit.h b/src/Qtx/QtxPathListEdit.h
index 15c897031..6954f799b 100644
--- a/src/Qtx/QtxPathListEdit.h
+++ b/src/Qtx/QtxPathListEdit.h
@@ -25,8 +25,8 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
-#include <QPointer>
+#include <QtWidgets/QFrame>
+#include <QtCore/QPointer>
 
 class QLineEdit;
 class QListView;
diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx
index eae7e4aac..ab5d6e583 100644
--- a/src/Qtx/QtxPopupMgr.cxx
+++ b/src/Qtx/QtxPopupMgr.cxx
@@ -26,9 +26,9 @@
 #include "QtxPopupMgr.h"
 #include "QtxAction.h"
 #include "QtxEvalExpr.h"
-#include <QList>
-#include <QMenu>
-#include <QVariant>
+#include <QtCore/QList>
+#include <QtWidgets/QMenu>
+#include <QtCore/QVariant>
 
 bool operator<( const QList<QVariant>& v1, const QList<QVariant>& v2 )
 {
diff --git a/src/Qtx/QtxPopupMgr.h b/src/Qtx/QtxPopupMgr.h
index a0dc2f6a0..1aab2cf1d 100644
--- a/src/Qtx/QtxPopupMgr.h
+++ b/src/Qtx/QtxPopupMgr.h
@@ -28,8 +28,8 @@
 
 #include "QtxActionMenuMgr.h"
 
-#include <QMap>
-#include <QVariant>
+#include <QtCore/QMap>
+#include <QtCore/QVariant>
 
 class QtxEvalExpr;
 class QtxEvalParser;
diff --git a/src/Qtx/QtxPreferenceMgr.cxx b/src/Qtx/QtxPreferenceMgr.cxx
index db6807c08..a7239e916 100644
--- a/src/Qtx/QtxPreferenceMgr.cxx
+++ b/src/Qtx/QtxPreferenceMgr.cxx
@@ -24,7 +24,7 @@
 
 #include "QtxResourceMgr.h"
 
-#include <QEvent>
+#include <QtCore/QEvent>
 #include <QtWidgets/QApplication>
 
 /*!
diff --git a/src/Qtx/QtxPreferenceMgr.h b/src/Qtx/QtxPreferenceMgr.h
index 7e4314020..3491bcc48 100644
--- a/src/Qtx/QtxPreferenceMgr.h
+++ b/src/Qtx/QtxPreferenceMgr.h
@@ -32,7 +32,7 @@
 #include <QtGui/QFont>
 #include <QtGui/QIcon>
 #include <QtGui/QColor>
-#include <QVariant>
+#include <QtCore/QVariant>
 
 class QtxResourceMgr;
 class QtxPreferenceMgr;
diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index 3abd8cea9..2fb40fd81 100644
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.cxx
@@ -26,14 +26,14 @@
 #include "QtxResourceMgr.h"
 #include "QtxTranslator.h"
 
-#include <QSet>
-#include <QDir>
-#include <QFile>
-#include <QFileInfo>
-#include <QRegExp>
-#include <QTextStream>
+#include <QtCore/QSet>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QRegExp>
+#include <QtCore/QTextStream>
 #include <QtWidgets/QApplication>
-#include <QLibraryInfo>
+#include <QtCore/QLibraryInfo>
 #include <QtDebug>
 #ifndef QT_NO_DOM
 #include <QtXml/QDomDocument>
diff --git a/src/Qtx/QtxResourceMgr.h b/src/Qtx/QtxResourceMgr.h
index 48389b013..fc6fcd582 100644
--- a/src/Qtx/QtxResourceMgr.h
+++ b/src/Qtx/QtxResourceMgr.h
@@ -32,13 +32,13 @@
 #include "QtxMap.h"
 #endif
 
-#include <QMap>
-#include <QList>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 #include <QtGui/QFont>
 #include <QtGui/QColor>
 #include <QtGui/QPixmap>
-#include <QByteArray>
-#include <QStringList>
+#include <QtCore/QByteArray>
+#include <QtCore/QStringList>
 #include <QtGui/QLinearGradient>
 #include <QtGui/QRadialGradient>
 #include <QtGui/QConicalGradient>
diff --git a/src/Qtx/QtxRubberBand.cxx b/src/Qtx/QtxRubberBand.cxx
index 260b5c239..e5dbf1d57 100644
--- a/src/Qtx/QtxRubberBand.cxx
+++ b/src/Qtx/QtxRubberBand.cxx
@@ -28,7 +28,7 @@
 #include <QtGui/QPainter>
 #include <QtGui/QPalette>
 #include <QtGui/QShowEvent>
-#include <QVectorIterator>
+#include <QtCore/QVectorIterator>
 
 #include <math.h>
 
diff --git a/src/Qtx/QtxRubberBand.h b/src/Qtx/QtxRubberBand.h
index 4e8b1d939..9e94fb59c 100644
--- a/src/Qtx/QtxRubberBand.h
+++ b/src/Qtx/QtxRubberBand.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QTX_EXPORT QtxAbstractRubberBand : public QWidget
 {
diff --git a/src/Qtx/QtxSearchTool.cxx b/src/Qtx/QtxSearchTool.cxx
index c8421528e..497c60f88 100644
--- a/src/Qtx/QtxSearchTool.cxx
+++ b/src/Qtx/QtxSearchTool.cxx
@@ -23,16 +23,16 @@
 #include "QtxSearchTool.h"
 
 #include <QtWidgets/QApplication>
-#include <QCheckBox>
-#include <QEvent>
-#include <QHBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtCore/QEvent>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QKeyEvent>
-#include <QLineEdit>
-#include <QPersistentModelIndex>
-#include <QShortcut>
-#include <QTimer>
-#include <QToolButton>
-#include <QTreeView>
+#include <QtWidgets/QLineEdit>
+#include <QtCore/QPersistentModelIndex>
+#include <QtWidgets/QShortcut>
+#include <QtCore/QTimer>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QTreeView>
 
 const char* const first_xpm[] = {
 "16 16 14 1",
diff --git a/src/Qtx/QtxSearchTool.h b/src/Qtx/QtxSearchTool.h
index b5b4d984c..f984e2e21 100644
--- a/src/Qtx/QtxSearchTool.h
+++ b/src/Qtx/QtxSearchTool.h
@@ -24,11 +24,11 @@
 #define QTXSEARCHTOOL_H
 
 #include "Qtx.h"
-#include <QFrame>
-#include <QList>
-#include <QMap>
-#include <QPersistentModelIndex>
-#include <QPointer>
+#include <QtWidgets/QFrame>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QPersistentModelIndex>
+#include <QtCore/QPointer>
 
 class QCheckBox;
 class QLineEdit;
diff --git a/src/Qtx/QtxShortcutEdit.cxx b/src/Qtx/QtxShortcutEdit.cxx
index e23119d96..38f40f1ad 100644
--- a/src/Qtx/QtxShortcutEdit.cxx
+++ b/src/Qtx/QtxShortcutEdit.cxx
@@ -19,14 +19,14 @@
 
 #include "QtxShortcutEdit.h"
 
-#include <QWidget>
-#include <QLayout>
-#include <QList>
-
-#include <QToolButton>
-#include <QLineEdit>
-#include <QTableWidgetItem>
-#include <QMessageBox>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QLayout>
+#include <QtCore/QList>
+
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QTableWidgetItem>
+#include <QtWidgets/QMessageBox>
 
 #include <QtGui/QKeyEvent>
 #include <QtGui/QKeySequence>
diff --git a/src/Qtx/QtxShortcutEdit.h b/src/Qtx/QtxShortcutEdit.h
index d29e2c285..8e811fba8 100644
--- a/src/Qtx/QtxShortcutEdit.h
+++ b/src/Qtx/QtxShortcutEdit.h
@@ -22,8 +22,8 @@
 
 #include "Qtx.h"
 
-#include <QFrame>
-#include <QTreeWidget>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QTreeWidget>
 
 class QLineEdit;
 class QPushButton;
diff --git a/src/Qtx/QtxSlider.h b/src/Qtx/QtxSlider.h
index 9406ad72b..d3a03c445 100644
--- a/src/Qtx/QtxSlider.h
+++ b/src/Qtx/QtxSlider.h
@@ -26,9 +26,9 @@
 #ifndef QTXSLIDER_H
 #define	QTXSLIDER_H
 
-#include <QWidget>
-#include <QHBoxLayout>
-#include <QSlider>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QSlider>
 
 #include "Qtx.h"
 
diff --git a/src/Qtx/QtxSplash.cxx b/src/Qtx/QtxSplash.cxx
index 19cbb5319..4dfcea337 100644
--- a/src/Qtx/QtxSplash.cxx
+++ b/src/Qtx/QtxSplash.cxx
@@ -29,8 +29,8 @@
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QPainter>
-#include <QMessageBox>
-#include <QDesktopWidget>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QDesktopWidget>
 
 /*!
   \class ProgressEvent
diff --git a/src/Qtx/QtxSplash.h b/src/Qtx/QtxSplash.h
index 8bcc2c208..68914bd4e 100644
--- a/src/Qtx/QtxSplash.h
+++ b/src/Qtx/QtxSplash.h
@@ -28,10 +28,10 @@
 
 #include "Qtx.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 #include <QtGui/QPixmap>
 #include <QtGui/QGradient>
-#include <QMap>
+#include <QtCore/QMap>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/Qtx/QtxToolBar.cxx b/src/Qtx/QtxToolBar.cxx
index 0e5d382b4..9b31be66b 100644
--- a/src/Qtx/QtxToolBar.cxx
+++ b/src/Qtx/QtxToolBar.cxx
@@ -25,8 +25,8 @@
 //
 #include "QtxToolBar.h"
 
-#include <QAction>
-#include <QMainWindow>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMainWindow>
 #include <QtWidgets/QApplication>
 
 /*!
diff --git a/src/Qtx/QtxToolBar.h b/src/Qtx/QtxToolBar.h
index 31ee99629..7d7864c25 100644
--- a/src/Qtx/QtxToolBar.h
+++ b/src/Qtx/QtxToolBar.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QToolBar>
+#include <QtWidgets/QToolBar>
 
 class QTX_EXPORT QtxToolBar : public QToolBar
 {
diff --git a/src/Qtx/QtxToolButton.h b/src/Qtx/QtxToolButton.h
index f80754c4e..b72996a19 100644
--- a/src/Qtx/QtxToolButton.h
+++ b/src/Qtx/QtxToolButton.h
@@ -22,9 +22,9 @@
 
 #include "Qtx.h"
 
-#include <QStringList>
-#include <QToolButton>
-#include <QVariant>
+#include <QtCore/QStringList>
+#include <QtWidgets/QToolButton>
+#include <QtCore/QVariant>
 
 class QTX_EXPORT QtxToolButton : public QToolButton
 {
diff --git a/src/Qtx/QtxToolTip.cxx b/src/Qtx/QtxToolTip.cxx
index c45eec420..63f915bf5 100644
--- a/src/Qtx/QtxToolTip.cxx
+++ b/src/Qtx/QtxToolTip.cxx
@@ -26,7 +26,7 @@
 #include "QtxToolTip.h"
 
 #include <QtGui/QFont>
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtGui/QCursor>
 #include <QtGui/QFontMetrics>
 #include <QtWidgets/QApplication>
diff --git a/src/Qtx/QtxToolTip.h b/src/Qtx/QtxToolTip.h
index a23e20060..4a0151755 100644
--- a/src/Qtx/QtxToolTip.h
+++ b/src/Qtx/QtxToolTip.h
@@ -28,7 +28,7 @@
 
 #include "Qtx.h"
 
-#include <QLabel>
+#include <QtWidgets/QLabel>
 
 class QTimer;
 
diff --git a/src/Qtx/QtxTranslator.h b/src/Qtx/QtxTranslator.h
index 1ecdff538..e62c7ef9f 100644
--- a/src/Qtx/QtxTranslator.h
+++ b/src/Qtx/QtxTranslator.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QTranslator>
+#include <QtCore/QTranslator>
 
 class QTX_EXPORT QtxTranslator : public QTranslator
 {
diff --git a/src/Qtx/QtxTreeView.cxx b/src/Qtx/QtxTreeView.cxx
index 5206cc00e..726ab9445 100644
--- a/src/Qtx/QtxTreeView.cxx
+++ b/src/Qtx/QtxTreeView.cxx
@@ -22,8 +22,8 @@
 //
 #include "QtxTreeView.h"
 
-#include <QHeaderView>
-#include <QMenu>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
 
 /*!
diff --git a/src/Qtx/QtxTreeView.h b/src/Qtx/QtxTreeView.h
index 9b029fe91..9d9780f54 100644
--- a/src/Qtx/QtxTreeView.h
+++ b/src/Qtx/QtxTreeView.h
@@ -29,7 +29,7 @@
 #pragma warning( disable:4251 )
 #endif
 
-#include <QTreeView>
+#include <QtWidgets/QTreeView>
 
 class QTX_EXPORT QtxTreeView : public QTreeView
 {
diff --git a/src/Qtx/QtxWebBrowser.cxx b/src/Qtx/QtxWebBrowser.cxx
index 14ef0fd3e..13168a006 100644
--- a/src/Qtx/QtxWebBrowser.cxx
+++ b/src/Qtx/QtxWebBrowser.cxx
@@ -28,27 +28,27 @@
 #include "QtxSearchTool.h"
 
 #include <QtWidgets/QApplication>
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QMenu>
-#include <QMenuBar>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QStatusBar>
-#include <QToolBar>
-#include <QVBoxLayout>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QFileDialog>
+#include <QtCore/QFileInfo>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QVBoxLayout>
 #if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
   #include <QWebView>
 #else
   #include <QWebEngineView>
 #endif
-#include <QProcess>
+#include <QtCore/QProcess>
 
 // RNV:
 // Since from Qt 5.6.0 version QtWebKit tool was removed,
diff --git a/src/Qtx/QtxWebBrowser.h b/src/Qtx/QtxWebBrowser.h
index 041609591..08e55f8d1 100644
--- a/src/Qtx/QtxWebBrowser.h
+++ b/src/Qtx/QtxWebBrowser.h
@@ -31,8 +31,8 @@
 
 #include <QtGlobal>
 #include <QtWidgets/QDialog>
-#include <QMainWindow>
-#include <QUrl>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QUrl>
 
 #if QT_VERSION < QT_VERSION_CHECK(5, 6, 0)
 // Web Kit
diff --git a/src/Qtx/QtxWorkspace.cxx b/src/Qtx/QtxWorkspace.cxx
index 6fe250197..5e1d05994 100644
--- a/src/Qtx/QtxWorkspace.cxx
+++ b/src/Qtx/QtxWorkspace.cxx
@@ -22,7 +22,7 @@
 //
 #include "QtxWorkspace.h"
 
-#include <QMdiSubWindow>
+#include <QtWidgets/QMdiSubWindow>
 
 /*!
   \class QtxWorkspace
diff --git a/src/Qtx/QtxWorkspace.h b/src/Qtx/QtxWorkspace.h
index cfe123fcf..83df4d228 100644
--- a/src/Qtx/QtxWorkspace.h
+++ b/src/Qtx/QtxWorkspace.h
@@ -25,7 +25,7 @@
 
 #include "Qtx.h"
 
-#include <QMdiArea>
+#include <QtWidgets/QMdiArea>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/Qtx/QtxWorkspaceAction.cxx b/src/Qtx/QtxWorkspaceAction.cxx
index a56193e3a..f55b77041 100644
--- a/src/Qtx/QtxWorkspaceAction.cxx
+++ b/src/Qtx/QtxWorkspaceAction.cxx
@@ -27,8 +27,8 @@
 
 #include "QtxWorkspace.h"
 
-#include <QMenu>
-#include <QMdiSubWindow>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMdiSubWindow>
 
 /*!
   \class QtxWorkspaceAction
diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx
index fde056f4c..4957dea9e 100644
--- a/src/Qtx/QtxWorkstack.cxx
+++ b/src/Qtx/QtxWorkstack.cxx
@@ -27,20 +27,20 @@
 
 #include "QtxAction.h"
 
-#include <QMenu>
-#include <QStyle>
-#include <QRegExp>
-#include <QLayout>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStyle>
+#include <QtCore/QRegExp>
+#include <QtWidgets/QLayout>
 #include <QtGui/QPainter>
-#include <QDataStream>
+#include <QtCore/QDataStream>
 #include <QtGui/QFocusEvent>
 #include <QtGui/QMouseEvent>
-#include <QRubberBand>
+#include <QtWidgets/QRubberBand>
 #include <QtWidgets/QApplication>
-#include <QStyleOption>
-#include <QInputDialog>
-#include <QStackedWidget>
-#include <QAbstractButton>
+#include <QtWidgets/QStyleOption>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QAbstractButton>
 
 /*!
   \class QtxWorkstackArea::WidgetEvent
diff --git a/src/Qtx/QtxWorkstack.h b/src/Qtx/QtxWorkstack.h
index 12e1f7257..e3c2a4e14 100644
--- a/src/Qtx/QtxWorkstack.h
+++ b/src/Qtx/QtxWorkstack.h
@@ -28,14 +28,14 @@
 
 #include "Qtx.h"
 
-#include <QMap>
-#include <QFrame>
-#include <QEvent>
-#include <QWidget>
-#include <QTabBar>
-#include <QPointer>
-#include <QSplitter>
-#include <QByteArray>
+#include <QtCore/QMap>
+#include <QtWidgets/QFrame>
+#include <QtCore/QEvent>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QTabBar>
+#include <QtCore/QPointer>
+#include <QtWidgets/QSplitter>
+#include <QtCore/QByteArray>
 
 class QAction;
 class QDataStream;
diff --git a/src/Qtx/QtxWorkstackAction.cxx b/src/Qtx/QtxWorkstackAction.cxx
index 913862541..dffcb4503 100644
--- a/src/Qtx/QtxWorkstackAction.cxx
+++ b/src/Qtx/QtxWorkstackAction.cxx
@@ -27,22 +27,22 @@
 
 #include "QtxWorkstack.h"
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtGui/QWidgetList>
-#include <QGroupBox>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QRadioButton>
-#include <QPushButton>
-#include <QListWidget>
-#include <QStackedLayout>
-#include <QToolButton>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QStackedLayout>
+#include <QtWidgets/QToolButton>
 #include <QtGui/QIcon>
 #include <QtGui/QPixmap>
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QLabel>
-#include <QComboBox>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QComboBox>
 
 const char* const prev_xpm[] = {
 "16 16 12 1",
diff --git a/src/QxScene/QxScene_ViewModel.cxx b/src/QxScene/QxScene_ViewModel.cxx
index 64e7e8484..e59e02787 100644
--- a/src/QxScene/QxScene_ViewModel.cxx
+++ b/src/QxScene/QxScene_ViewModel.cxx
@@ -27,8 +27,8 @@
 #include "SUIT_Session.h"
 
 #include <qcolordialog.h>
-#include <QMenu>
-#include <QToolBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
 
 //#define _DEVDEBUG_
 #include "DebTrace.hxx"
diff --git a/src/QxScene/QxScene_ViewWindow.cxx b/src/QxScene/QxScene_ViewWindow.cxx
index 289a89df9..df78a7b66 100644
--- a/src/QxScene/QxScene_ViewWindow.cxx
+++ b/src/QxScene/QxScene_ViewWindow.cxx
@@ -31,8 +31,8 @@
 #include <QtxActionToolMgr.h>
 
 //QT Include
-#include <QToolBar>
-#include <QGraphicsRectItem>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QGraphicsRectItem>
 
 //#define _DEVDEBUG_
 #include "DebTrace.hxx"
diff --git a/src/QxScene/QxScene_ViewWindow.h b/src/QxScene/QxScene_ViewWindow.h
index 56ca7d398..fee7cdb29 100644
--- a/src/QxScene/QxScene_ViewWindow.h
+++ b/src/QxScene/QxScene_ViewWindow.h
@@ -31,8 +31,8 @@
 
 #include <qaction.h>
 
-#include <QGraphicsScene>
-#include <QGraphicsView>
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsView>
 
 #ifdef WIN32
 #pragma warning ( disable:4251 )
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index ade29ba4f..270fb5564 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@ -29,7 +29,7 @@
 #include <SALOME_LifeCycleCORBA.hxx>
 #include <Container_init_python.hxx>
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 //
 // NB: Python requests.
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
index 92fda689f..9387e3869 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
@@ -37,7 +37,7 @@
 #include <Container_init_python.hxx>
 #endif
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 #include <utilities.h>
 
 // Py_ssize_t for old Pythons
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 9c41399cb..825b2cbb1 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
@@ -29,8 +29,8 @@
 #include "LightApp_Module.h"
 
 #include <QtGui/QIcon>
-#include <QMap>
-#include <QStringList>
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
 
 class QMenu;
 class PyModuleHelper;
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 039b7d2be..d23a7968a 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.cxx
@@ -44,9 +44,9 @@
 #include <QtXml/QDomDocument>
 #include <QtXml/QDomElement>
 #include <QtXml/QDomNode>
-#include <QFile>
-#include <QMenu>
-#include <QMutex>
+#include <QtCore/QFile>
+#include <QtWidgets/QMenu>
+#include <QtCore/QMutex>
 
 #include <utilities.h>
 
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 cea72baf1..d984cf86b 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyModule.h
@@ -29,10 +29,10 @@
 #include "PyInterp_Interp.h" // !!! WARNING !!! THIS INCLUDE MUST BE THE VERY FIRST !!!
 
 #include <QtGui/QIcon>
-#include <QList>
-#include <QMap>
-#include <QObject>
-#include <QStringList>
+#include <QtCore/QList>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QStringList>
 
 class CAM_Application;
 class LightApp_DataObject;
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.cxx
index 249c1d113..0c0296940 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.cxx
@@ -32,7 +32,7 @@
 #include "SALOME_PYQT_BorrowedDataObjectLight.h"
 #include <SUIT_Session.h>
 #include <SUIT_DataObjectIterator.h>
-#include <QTime>
+#include <QtCore/QTime>
 #include <time.h>
 
 #include <utilities.h>
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.h
index bbc058e30..c5f6be869 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_Selector.h
@@ -34,7 +34,7 @@
 #include <SUIT_Selector.h>
 #include <SUIT_DataOwner.h>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class SALOME_PYQT_ModuleLight;
 class LightApp_DataObject;
diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
index 2b6a58604..6ddedc857 100644
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
@@ -66,11 +66,11 @@
 #include "SUIT_ViewWindow.h"
 #include "PyConsole_Console.h"
 
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
 #include <QtGui/QPaintEvent>
-#include <QCoreApplication>
-#include <QVBoxLayout>
+#include <QtCore/QCoreApplication>
+#include <QtWidgets/QVBoxLayout>
 
 #include <utilities.h>
 
diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 187dd7bd7..1ad7824b6 100644
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@ -28,8 +28,8 @@
 
 #include <Python.h>
 
-#include <QObject>
-#include <QString>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <QtGui/QColor>
 
 #include <LightApp_Application.h>
diff --git a/src/SPlot2d/SPlot2d_Curve.h b/src/SPlot2d/SPlot2d_Curve.h
index cb1d0a92a..7cc738a4e 100644
--- a/src/SPlot2d/SPlot2d_Curve.h
+++ b/src/SPlot2d/SPlot2d_Curve.h
@@ -29,7 +29,7 @@
 #include "Plot2d_Curve.h"
 #include "SALOME_InteractiveObject.hxx"
 
-#include <QSet>
+#include <QtCore/QSet>
 
 typedef QSet<QString> OwnerSet;
 
diff --git a/src/SPlot2d/SPlot2d_ViewModel.cxx b/src/SPlot2d/SPlot2d_ViewModel.cxx
index 0a8074fd7..cd129a29a 100644
--- a/src/SPlot2d/SPlot2d_ViewModel.cxx
+++ b/src/SPlot2d/SPlot2d_ViewModel.cxx
@@ -37,10 +37,10 @@
 #include "SALOME_ListIO.hxx"
 
 #include <QtWidgets/QApplication>
-#include <QToolBar>
-#include <QToolButton>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QToolButton>
 #include <QtGui/QCursor>
-#include <QColorDialog>
+#include <QtWidgets/QColorDialog>
 
 //#include <qwt_math>
 #include <qwt_plot_canvas.h>
diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index 58845aff9..cae2feb1b 100644
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.cxx
@@ -37,10 +37,10 @@
 #include <QtxActionMenuMgr.h>
 #include <QtxActionToolMgr.h>
 
-#include <QMenu>
-#include <QStatusBar>
-#include <QCloseEvent>
-#include <QFileDialog>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStatusBar>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QFileDialog>
 #include <QtWidgets/QApplication>
 
 /*!Create and return new instance of STD_Application*/
diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 6e7286f76..8ab4a0e9a 100644
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.h
@@ -29,8 +29,8 @@
 
 #include <QtxNotify.h>
 
-#include <QList>
-#include <QPointer>
+#include <QtCore/QList>
+#include <QtCore/QPointer>
 
 class QMenu;
 class QCloseEvent;
diff --git a/src/STD/STD_MDIDesktop.cxx b/src/STD/STD_MDIDesktop.cxx
index 82c6dcd45..4f6612869 100644
--- a/src/STD/STD_MDIDesktop.cxx
+++ b/src/STD/STD_MDIDesktop.cxx
@@ -30,9 +30,9 @@
 #include <QtxActionMenuMgr.h>
 #include <QtxWorkspaceAction.h>
 
-#include <QFrame>
-#include <QVBoxLayout>
-#include <QMdiSubWindow>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QMdiSubWindow>
 
 #include <stdarg.h>
 
diff --git a/src/STD/STD_SDIDesktop.cxx b/src/STD/STD_SDIDesktop.cxx
index b9bf591fa..e8ee52a80 100644
--- a/src/STD/STD_SDIDesktop.cxx
+++ b/src/STD/STD_SDIDesktop.cxx
@@ -24,8 +24,8 @@
 
 #include <SUIT_ViewWindow.h>
 
-#include <QFrame>
-#include <QVBoxLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QVBoxLayout>
 
 /*!Constructor. Create instance of QVBox*/
 STD_SDIDesktop::STD_SDIDesktop()
diff --git a/src/STD/STD_TabDesktop.cxx b/src/STD/STD_TabDesktop.cxx
index c71bfdacd..2a680550f 100644
--- a/src/STD/STD_TabDesktop.cxx
+++ b/src/STD/STD_TabDesktop.cxx
@@ -30,8 +30,8 @@
 #include <QtxActionMenuMgr.h>
 #include <QtxWorkstackAction.h>
 
-#include <QFrame>
-#include <QVBoxLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QVBoxLayout>
 
 #include <stdarg.h>
 
diff --git a/src/SUIT/SUIT_Accel.cxx b/src/SUIT/SUIT_Accel.cxx
index fe64fb319..ba50e52af 100644
--- a/src/SUIT/SUIT_Accel.cxx
+++ b/src/SUIT/SUIT_Accel.cxx
@@ -28,8 +28,8 @@
 #include "SUIT_ViewManager.h"
 #include "SUIT_ViewModel.h"
 
-#include <QCoreApplication>
-#include <QEvent>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QEvent>
 #include <QtGui/QKeyEvent>
 
 /*!
diff --git a/src/SUIT/SUIT_Accel.h b/src/SUIT/SUIT_Accel.h
index 1bf594b58..52d6ddc73 100644
--- a/src/SUIT/SUIT_Accel.h
+++ b/src/SUIT/SUIT_Accel.h
@@ -27,9 +27,9 @@
 
 #include "SUIT.h"
 
-#include <QMap>
-#include <QObject>
-#include <QString>
+#include <QtCore/QMap>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 
 class SUIT_EXPORT SUIT_Accel: public QObject
 {
diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx
index fd157553b..0dc538733 100644
--- a/src/SUIT/SUIT_Application.cxx
+++ b/src/SUIT/SUIT_Application.cxx
@@ -28,11 +28,11 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_ShortcutMgr.h"
 
-#include <QTimer>
-#include <QLabel>
-#include <QStatusBar>
+#include <QtCore/QTimer>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QStatusBar>
 #include <QtWidgets/QApplication>
-#include <QSize>
+#include <QtCore/QSize>
 
 #include <QtxAction.h>
 #include <QtxActionMenuMgr.h>
diff --git a/src/SUIT/SUIT_Application.h b/src/SUIT/SUIT_Application.h
index 9dd2379f2..9662204f1 100644
--- a/src/SUIT/SUIT_Application.h
+++ b/src/SUIT/SUIT_Application.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 class QIcon;
 class QLabel;
diff --git a/src/SUIT/SUIT_DataBrowser.cxx b/src/SUIT/SUIT_DataBrowser.cxx
index f499333ad..28ceb2f22 100644
--- a/src/SUIT/SUIT_DataBrowser.cxx
+++ b/src/SUIT/SUIT_DataBrowser.cxx
@@ -24,7 +24,7 @@
 #include "SUIT_TreeModel.h"
 #include <QtxTreeView.h>
 
-#include <QShortcut>
+#include <QtWidgets/QShortcut>
 
 /*!
   \class SUIT_DataBrowser
diff --git a/src/SUIT/SUIT_DataObject.cxx b/src/SUIT/SUIT_DataObject.cxx
index dd8df4966..1761efd0d 100644
--- a/src/SUIT/SUIT_DataObject.cxx
+++ b/src/SUIT/SUIT_DataObject.cxx
@@ -23,7 +23,7 @@
 // File   : SUIT_DataObject.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 
-#include <QVariant>
+#include <QtCore/QVariant>
 
 #include "SUIT_DataObject.h"
 #include "SUIT_DataObjectKey.h"
diff --git a/src/SUIT/SUIT_DataObject.h b/src/SUIT/SUIT_DataObject.h
index 09f6185f1..aa1c64f48 100644
--- a/src/SUIT/SUIT_DataObject.h
+++ b/src/SUIT/SUIT_DataObject.h
@@ -30,9 +30,9 @@
 
 #include <Qtx.h>
 
-#include <QList>
-#include <QObject>
-#include <QString>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QString>
 #include <QtGui/QPixmap>
 #include <QtGui/QFont>
 
diff --git a/src/SUIT/SUIT_DataOwner.h b/src/SUIT/SUIT_DataOwner.h
index 58bd4f4eb..d2235d078 100644
--- a/src/SUIT/SUIT_DataOwner.h
+++ b/src/SUIT/SUIT_DataOwner.h
@@ -25,9 +25,9 @@
 
 #include "SUIT_SmartPtr.h"
 
-#include <QMap>
-#include <QList>
-#include <QString>
+#include <QtCore/QMap>
+#include <QtCore/QList>
+#include <QtCore/QString>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/SUIT/SUIT_Desktop.cxx b/src/SUIT/SUIT_Desktop.cxx
index c34781c1b..334a6cf66 100644
--- a/src/SUIT/SUIT_Desktop.cxx
+++ b/src/SUIT/SUIT_Desktop.cxx
@@ -28,8 +28,8 @@
 #include <QtxActionMenuMgr.h>
 #include <QtxActionToolMgr.h>
 
-#include <QPointer>
-#include <QCloseEvent>
+#include <QtCore/QPointer>
+#include <QtGui/QCloseEvent>
 #include <QtWidgets/QApplication>
 
 /*!\class SUIT_Desktop
diff --git a/src/SUIT/SUIT_Desktop.h b/src/SUIT/SUIT_Desktop.h
index f191d902b..295e480de 100644
--- a/src/SUIT/SUIT_Desktop.h
+++ b/src/SUIT/SUIT_Desktop.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QList>
-#include <QEvent>
+#include <QtCore/QList>
+#include <QtCore/QEvent>
 
 #include <QtxMainWindow.h>
 
diff --git a/src/SUIT/SUIT_ExceptionHandler.h b/src/SUIT/SUIT_ExceptionHandler.h
index e2a4ced49..472659f0a 100644
--- a/src/SUIT/SUIT_ExceptionHandler.h
+++ b/src/SUIT/SUIT_ExceptionHandler.h
@@ -24,7 +24,7 @@
 #define SUIT_EXCEPTIONHANDLER_H
 
 #include "SUIT.h"
-#include <QList>
+#include <QtCore/QList>
 
 class QEvent;
 class QObject;
diff --git a/src/SUIT/SUIT_FileDlg.cxx b/src/SUIT/SUIT_FileDlg.cxx
index 462ba0cdb..d44dcf6e9 100644
--- a/src/SUIT/SUIT_FileDlg.cxx
+++ b/src/SUIT/SUIT_FileDlg.cxx
@@ -82,18 +82,18 @@
 #include "SUIT_FileValidator.h"
 #include "Qtx.h"
 
-#include <QDir>
-#include <QEvent>
-#include <QRegExp>
-#include <QLabel>
-#include <QComboBox>
-#include <QPushButton>
-#include <QGridLayout>
+#include <QtCore/QDir>
+#include <QtCore/QEvent>
+#include <QtCore/QRegExp>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
 #include <QtWidgets/QApplication>
-#include <QListView>
-#include <QLineEdit>
-#include <QUrl>
-#include <QStandardPaths>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QLineEdit>
+#include <QtCore/QUrl>
+#include <QtCore/QStandardPaths>
 
 /*!
   \brief Defines extension behavior.
diff --git a/src/SUIT/SUIT_FileDlg.h b/src/SUIT/SUIT_FileDlg.h
index 159342fc4..044dcfdea 100644
--- a/src/SUIT/SUIT_FileDlg.h
+++ b/src/SUIT/SUIT_FileDlg.h
@@ -28,7 +28,7 @@
 
 #include "SUIT.h"
 
-#include <QFileDialog>
+#include <QtWidgets/QFileDialog>
 
 class QLabel;
 class QLineEdit;
diff --git a/src/SUIT/SUIT_FileValidator.cxx b/src/SUIT/SUIT_FileValidator.cxx
index 4b3d2a92f..ab2f6cd35 100644
--- a/src/SUIT/SUIT_FileValidator.cxx
+++ b/src/SUIT/SUIT_FileValidator.cxx
@@ -26,7 +26,7 @@
 #include "SUIT_FileValidator.h"
 #include "SUIT_MessageBox.h"
 #include "SUIT_Tools.h"   
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 
 /*!
   \class SUIT_FileValidator
diff --git a/src/SUIT/SUIT_LicenseDlg.cxx b/src/SUIT/SUIT_LicenseDlg.cxx
index a674d3816..9dd0c85f7 100644
--- a/src/SUIT/SUIT_LicenseDlg.cxx
+++ b/src/SUIT/SUIT_LicenseDlg.cxx
@@ -20,11 +20,11 @@
 #include "SUIT_LicenseDlg.h"
 
 #include <QtWidgets/QApplication>
-#include <QTextEdit>
-#include <QLayout> 
-#include <QPushButton>
-#include <QTextStream> 
-#include <QFile>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QLayout> 
+#include <QtWidgets/QPushButton>
+#include <QtCore/QTextStream> 
+#include <QtCore/QFile>
 #include <QtPrintSupport/QPrinter>
 //#include <QSimpleRichText>
 #include <QtGui/QTextDocument>
diff --git a/src/SUIT/SUIT_MessageBox.cxx b/src/SUIT/SUIT_MessageBox.cxx
index 67225980f..875845616 100644
--- a/src/SUIT/SUIT_MessageBox.cxx
+++ b/src/SUIT/SUIT_MessageBox.cxx
@@ -24,10 +24,10 @@
 
 #include "SUIT_OverrideCursor.h"
 
-#include <QMessageBox>
-#include <QPushButton>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
 #include <QtWidgets/QApplication>
-#include <QString>
+#include <QtCore/QString>
 
 #include <stdarg.h>
 
diff --git a/src/SUIT/SUIT_MessageBox.h b/src/SUIT/SUIT_MessageBox.h
index 38309a602..e160babcc 100644
--- a/src/SUIT/SUIT_MessageBox.h
+++ b/src/SUIT/SUIT_MessageBox.h
@@ -25,9 +25,9 @@
 
 #include "SUIT.h"
 
-#include <QMap>
-#include <QList>
-#include <QMessageBox>
+#include <QtCore/QMap>
+#include <QtCore/QList>
+#include <QtWidgets/QMessageBox>
 
 class SUIT_EXPORT SUIT_MessageBox : public QMessageBox
 {
diff --git a/src/SUIT/SUIT_Operation.h b/src/SUIT/SUIT_Operation.h
index 22a8a289e..162841117 100644
--- a/src/SUIT/SUIT_Operation.h
+++ b/src/SUIT/SUIT_Operation.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QObject>
-#include <QPointer>
+#include <QtCore/QObject>
+#include <QtCore/QPointer>
 
 class SUIT_Study;
 class SUIT_Application;
diff --git a/src/SUIT/SUIT_OverrideCursor.h b/src/SUIT/SUIT_OverrideCursor.h
index f19ca5188..5160e36aa 100644
--- a/src/SUIT/SUIT_OverrideCursor.h
+++ b/src/SUIT/SUIT_OverrideCursor.h
@@ -25,7 +25,7 @@
 
 #include "SUIT.h"
 
-#include <QList>
+#include <QtCore/QList>
 #include <QtGui/QCursor>
 
 /*! \brief Class used for management cursors.*/
diff --git a/src/SUIT/SUIT_PopupClient.h b/src/SUIT/SUIT_PopupClient.h
index 0a97e0a52..e609670ea 100644
--- a/src/SUIT/SUIT_PopupClient.h
+++ b/src/SUIT/SUIT_PopupClient.h
@@ -25,7 +25,7 @@
 
 #include "SUIT.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class QMenu;
 class QContextMenuEvent;
diff --git a/src/SUIT/SUIT_ResourceMgr.cxx b/src/SUIT/SUIT_ResourceMgr.cxx
index 256245f69..0f67ca870 100644
--- a/src/SUIT/SUIT_ResourceMgr.cxx
+++ b/src/SUIT/SUIT_ResourceMgr.cxx
@@ -23,10 +23,10 @@
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
 
-#include <QDir>
-#include <QFileInfo>
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
 #include <QtWidgets/QApplication>
-#include <QRegExp>
+#include <QtCore/QRegExp>
 
 #ifndef WIN32
 #include <unistd.h>
diff --git a/src/SUIT/SUIT_SelectionMgr.h b/src/SUIT/SUIT_SelectionMgr.h
index d7ffba7de..10f3cfa69 100644
--- a/src/SUIT/SUIT_SelectionMgr.h
+++ b/src/SUIT/SUIT_SelectionMgr.h
@@ -25,8 +25,8 @@
 
 #include "SUIT_DataOwner.h"
 
-#include <QList>
-#include <QObject>
+#include <QtCore/QList>
+#include <QtCore/QObject>
 
 class SUIT_Selector;
 class SUIT_SelectionFilter;
diff --git a/src/SUIT/SUIT_Selector.cxx b/src/SUIT/SUIT_Selector.cxx
index 9641030fd..b4ce7104a 100644
--- a/src/SUIT/SUIT_Selector.cxx
+++ b/src/SUIT/SUIT_Selector.cxx
@@ -24,7 +24,7 @@
 
 #include "SUIT_SelectionMgr.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 /*!\class SUIT_Selector::Destroyer
   Class provide the watching for qobject parent class of the selector.
diff --git a/src/SUIT/SUIT_Selector.h b/src/SUIT/SUIT_Selector.h
index 2e81cc8db..74ab0c8c5 100644
--- a/src/SUIT/SUIT_Selector.h
+++ b/src/SUIT/SUIT_Selector.h
@@ -25,7 +25,7 @@
 
 #include "SUIT.h"
 
-#include <QList>
+#include <QtCore/QList>
 
 class QObject;
 
diff --git a/src/SUIT/SUIT_Session.h b/src/SUIT/SUIT_Session.h
index 8e244acfb..296379458 100644
--- a/src/SUIT/SUIT_Session.h
+++ b/src/SUIT/SUIT_Session.h
@@ -26,10 +26,10 @@
 #include "SUIT.h"
 #include "SUIT_Application.h"
 
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <QStringList>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/SUIT/SUIT_ShortcutMgr.cxx b/src/SUIT/SUIT_ShortcutMgr.cxx
index b469bbdd2..718ce5bd6 100644
--- a/src/SUIT/SUIT_ShortcutMgr.cxx
+++ b/src/SUIT/SUIT_ShortcutMgr.cxx
@@ -28,7 +28,7 @@
 #include <QtxAction.h>
 
 #include <QtWidgets/QApplication>
-#include <QActionEvent>
+#include <QtGui/QActionEvent>
 
 SUIT_ShortcutMgr* SUIT_ShortcutMgr::myShortcutMgr = NULL;
 
diff --git a/src/SUIT/SUIT_ShortcutMgr.h b/src/SUIT/SUIT_ShortcutMgr.h
index 0eb16827c..9ca1e0ca2 100644
--- a/src/SUIT/SUIT_ShortcutMgr.h
+++ b/src/SUIT/SUIT_ShortcutMgr.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QObject>
-#include <QMultiMap>
+#include <QtCore/QObject>
+#include <QtCore/QMultiMap>
 
 class QtxAction;
 
diff --git a/src/SUIT/SUIT_Study.h b/src/SUIT/SUIT_Study.h
index c6639282e..5673ea9ad 100644
--- a/src/SUIT/SUIT_Study.h
+++ b/src/SUIT/SUIT_Study.h
@@ -25,9 +25,9 @@
 
 #include "SUIT.h"
 
-#include <QList>
-#include <QObject>
-#include <QListIterator>
+#include <QtCore/QList>
+#include <QtCore/QObject>
+#include <QtCore/QListIterator>
 
 class SUIT_DataObject;
 class SUIT_Application;
diff --git a/src/SUIT/SUIT_Tools.cxx b/src/SUIT/SUIT_Tools.cxx
index 08e6f4120..65304634f 100644
--- a/src/SUIT/SUIT_Tools.cxx
+++ b/src/SUIT/SUIT_Tools.cxx
@@ -22,7 +22,7 @@
 
 #include "SUIT_Tools.h"
 
-#include <QDir>
+#include <QtCore/QDir>
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/src/SUIT/SUIT_Tools.h b/src/SUIT/SUIT_Tools.h
index 8357d0d66..8e351867a 100644
--- a/src/SUIT/SUIT_Tools.h
+++ b/src/SUIT/SUIT_Tools.h
@@ -27,8 +27,8 @@
 
 #include <Qtx.h>
 
-#include <QRect>
-#include <QString>
+#include <QtCore/QRect>
+#include <QtCore/QString>
 #include <QtGui/QFont>
 
 /*!
diff --git a/src/SUIT/SUIT_TreeModel.cxx b/src/SUIT/SUIT_TreeModel.cxx
index 466bec821..a114ea065 100644
--- a/src/SUIT/SUIT_TreeModel.cxx
+++ b/src/SUIT/SUIT_TreeModel.cxx
@@ -27,8 +27,8 @@
 #include "SUIT_ResourceMgr.h"
 
 #include <QtWidgets/QApplication>
-#include <QHash>
-#include <QMimeData>
+#include <QtCore/QHash>
+#include <QtCore/QMimeData>
 
 SUIT_AbstractModel::SUIT_AbstractModel() : mySearcher( 0 )
 {
diff --git a/src/SUIT/SUIT_TreeModel.h b/src/SUIT/SUIT_TreeModel.h
index 9e899e86e..0101ef94d 100644
--- a/src/SUIT/SUIT_TreeModel.h
+++ b/src/SUIT/SUIT_TreeModel.h
@@ -27,12 +27,12 @@
 
 #include <Qtx.h>
 
-#include <QAbstractItemModel>
-#include <QSortFilterProxyModel>
-#include <QModelIndex>
-#include <QItemDelegate>
-#include <QVariant>
-#include <QMap>
+#include <QtCore/QAbstractItemModel>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QItemDelegate>
+#include <QtCore/QVariant>
+#include <QtCore/QMap>
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/SUIT/SUIT_TreeSync.h b/src/SUIT/SUIT_TreeSync.h
index a52b07ee5..9c64b1420 100644
--- a/src/SUIT/SUIT_TreeSync.h
+++ b/src/SUIT/SUIT_TreeSync.h
@@ -26,7 +26,7 @@
 #ifndef SUIT_TREESYNC_H
 #define SUIT_TREESYNC_H
 
-#include <QList>
+#include <QtCore/QList>
 
 /*!
   \brief The structure representing difference between source and destination items.
diff --git a/src/SUIT/SUIT_ViewManager.cxx b/src/SUIT/SUIT_ViewManager.cxx
index 5ad57f413..e32de01c2 100644
--- a/src/SUIT/SUIT_ViewManager.cxx
+++ b/src/SUIT/SUIT_ViewManager.cxx
@@ -28,8 +28,8 @@
 #include "SUIT_Study.h"
 #include "SUIT_Session.h"
 
-#include <QMap>
-#include <QRegExp>
+#include <QtCore/QMap>
+#include <QtCore/QRegExp>
 #include <QtGui/QIcon>
 
 #ifdef WIN32
diff --git a/src/SUIT/SUIT_ViewManager.h b/src/SUIT/SUIT_ViewManager.h
index 45e72e8a7..bed0ebf4b 100644
--- a/src/SUIT/SUIT_ViewManager.h
+++ b/src/SUIT/SUIT_ViewManager.h
@@ -27,10 +27,10 @@
 
 #include "SUIT_PopupClient.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGui/QPixmap>
-#include <QVector>
-#include <QPointer>
+#include <QtCore/QVector>
+#include <QtCore/QPointer>
 
 class QMenu;
 class QMouseEvent;
diff --git a/src/SUIT/SUIT_ViewModel.h b/src/SUIT/SUIT_ViewModel.h
index f0d8269c8..f95f1fac2 100644
--- a/src/SUIT/SUIT_ViewModel.h
+++ b/src/SUIT/SUIT_ViewModel.h
@@ -25,8 +25,8 @@
 
 #include "SUIT.h"
 
-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>
 
 class QMenu;
 
diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx
index bf4772ead..db1796467 100644
--- a/src/SUIT/SUIT_ViewWindow.cxx
+++ b/src/SUIT/SUIT_ViewWindow.cxx
@@ -36,11 +36,11 @@
 #include "QtxActionToolMgr.h"
 #include "QtxMultiAction.h"
 
-#include <QEvent>
+#include <QtCore/QEvent>
 #include <QtGui/QIcon>
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtWidgets/QApplication>
-#include <QContextMenuEvent>
+#include <QtGui/QContextMenuEvent>
 
 /*!\class SUIT_ViewWindow
  * Class provide view window.
diff --git a/src/SUIT/SUIT_ViewWindow.h b/src/SUIT/SUIT_ViewWindow.h
index ac2f60e3e..9a34650d7 100644
--- a/src/SUIT/SUIT_ViewWindow.h
+++ b/src/SUIT/SUIT_ViewWindow.h
@@ -28,9 +28,9 @@
 #include "SUIT.h"
 #include "SUIT_CameraProperties.h"
 
-#include <QMainWindow>
-#include <QList>
-#include <QMap>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 
 class SUIT_Desktop;
 class SUIT_ViewManager;
diff --git a/src/SUITApp/SUITApp.cxx b/src/SUITApp/SUITApp.cxx
index a2bdfb411..2782eeb4c 100644
--- a/src/SUITApp/SUITApp.cxx
+++ b/src/SUITApp/SUITApp.cxx
@@ -35,12 +35,12 @@
 #endif // USE_SALOME_STYLE
 #include "QtxSplash.h"
 
-#include <QDir>
-#include <QFile>
-#include <QLocale>
-#include <QRegExp>
-#include <QString>
-#include <QStringList>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QLocale>
+#include <QtCore/QRegExp>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 #include <stdlib.h>
 
diff --git a/src/SUITApp/SUITApp_Application.cxx b/src/SUITApp/SUITApp_Application.cxx
index 2816250ea..deca8c2ef 100644
--- a/src/SUITApp/SUITApp_Application.cxx
+++ b/src/SUITApp/SUITApp_Application.cxx
@@ -27,7 +27,7 @@
 
 #include <Qtx.h>
 
-#include <QDir>
+#include <QtCore/QDir>
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/SUITApp/SUITApp_init_python.cxx b/src/SUITApp/SUITApp_init_python.cxx
index 54075a41d..35083509f 100644
--- a/src/SUITApp/SUITApp_init_python.cxx
+++ b/src/SUITApp/SUITApp_init_python.cxx
@@ -21,7 +21,7 @@
 //  Date   : 22/06/2007
 //
 #include "SUITApp_init_python.hxx"
-#include <QString>
+#include <QtCore/QString>
 
 #if PY_VERSION_HEX < 0x03050000
 static char*
diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index c2d169dd7..f4ca53ad7 100644
--- a/src/SVTK/SALOME_Actor.cxx
+++ b/src/SVTK/SALOME_Actor.cxx
@@ -69,8 +69,8 @@
 #include <TColStd_IndexedMapOfInteger.hxx>
 
 #include <math.h>
-#include <QPoint>
-#include <QVector>
+#include <QtCore/QPoint>
+#include <QtCore/QVector>
 
 #if defined __GNUC__
   #if __GNUC__ == 2
diff --git a/src/SVTK/SVTK_AreaPicker.h b/src/SVTK/SVTK_AreaPicker.h
index 344c8fca0..1c0d2cc79 100644
--- a/src/SVTK/SVTK_AreaPicker.h
+++ b/src/SVTK/SVTK_AreaPicker.h
@@ -36,8 +36,8 @@
 
 #include <vtkAbstractPropPicker.h>
 #include <vtkDataSet.h>
-#include <QVector>
-#include <QPoint>
+#include <QtCore/QVector>
+#include <QtCore/QPoint>
 
 class vtkRenderer;
 
diff --git a/src/SVTK/SVTK_ComboAction.cxx b/src/SVTK/SVTK_ComboAction.cxx
index 1dfed062b..750c8820b 100644
--- a/src/SVTK/SVTK_ComboAction.cxx
+++ b/src/SVTK/SVTK_ComboAction.cxx
@@ -23,8 +23,8 @@
 
 #include "SVTK_ComboAction.h"
 
-#include <QComboBox>
-#include <QHBoxLayout>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QHBoxLayout>
 
 SVTK_ComboAction::SVTK_ComboAction( QObject* parent )
   : QWidgetAction( parent )
diff --git a/src/SVTK/SVTK_ComboAction.h b/src/SVTK/SVTK_ComboAction.h
index ae2f778d4..162731ab1 100644
--- a/src/SVTK/SVTK_ComboAction.h
+++ b/src/SVTK/SVTK_ComboAction.h
@@ -26,7 +26,7 @@
 
 #include "SVTK.h"
 
-#include <QWidgetAction>
+#include <QtWidgets/QWidgetAction>
 
 class QComboBox;
 class SVTK_EXPORT SVTK_ComboAction : public QWidgetAction
diff --git a/src/SVTK/SVTK_CubeAxesDlg.cxx b/src/SVTK/SVTK_CubeAxesDlg.cxx
index 9adc8b4e8..0b4fff3af 100644
--- a/src/SVTK/SVTK_CubeAxesDlg.cxx
+++ b/src/SVTK/SVTK_CubeAxesDlg.cxx
@@ -35,9 +35,9 @@
 #include "QtxAction.h"
 #include "QtxIntSpinBox.h"
 
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLineEdit>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLineEdit>
 
 #include <vtkAxisActor2D.h>
 #include <vtkTextProperty.h>
diff --git a/src/SVTK/SVTK_FontWidget.cxx b/src/SVTK/SVTK_FontWidget.cxx
index d218f1324..83ebbec07 100644
--- a/src/SVTK/SVTK_FontWidget.cxx
+++ b/src/SVTK/SVTK_FontWidget.cxx
@@ -27,7 +27,7 @@
 //
 #include "SVTK_FontWidget.h"
 
-#include <QComboBox>
+#include <QtWidgets/QComboBox>
 
 #include <vtkTextProperty.h>
 
diff --git a/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx b/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx
index c7485dc0f..31b4ab416 100644
--- a/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx
@@ -30,7 +30,7 @@
 #include <vtkObjectFactory.h>
 #include <vtkCommand.h>
 
-#include <QTimer>
+#include <QtCore/QTimer>
 
 vtkStandardNewMacro(QVTK_GenericRenderWindowInteractor);
 
diff --git a/src/SVTK/SVTK_GenericRenderWindowInteractor.h b/src/SVTK/SVTK_GenericRenderWindowInteractor.h
index 22ac36fe2..1d17fae8a 100644
--- a/src/SVTK/SVTK_GenericRenderWindowInteractor.h
+++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.h
@@ -29,7 +29,7 @@
 
 #include "SVTK.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <vtkGenericRenderWindowInteractor.h>
 #include <vtkSmartPointer.h>
 
diff --git a/src/SVTK/SVTK_ImageWriter.cxx b/src/SVTK/SVTK_ImageWriter.cxx
index 890086490..cfc940a2d 100644
--- a/src/SVTK/SVTK_ImageWriter.cxx
+++ b/src/SVTK/SVTK_ImageWriter.cxx
@@ -19,7 +19,7 @@
 
 #include "SVTK_ImageWriter.h"
 
-#include <QSemaphore>
+#include <QtCore/QSemaphore>
 
 #include <vtkAlgorithm.h>
 #include <vtkImageData.h>
diff --git a/src/SVTK/SVTK_ImageWriter.h b/src/SVTK/SVTK_ImageWriter.h
index 673fa3208..08b0620af 100644
--- a/src/SVTK/SVTK_ImageWriter.h
+++ b/src/SVTK/SVTK_ImageWriter.h
@@ -20,7 +20,7 @@
 #ifndef SVTK_IMAGEWRITER_H
 #define SVTK_IMAGEWRITER_H
 
-#include <QThread>
+#include <QtCore/QThread>
 #include <string>
 
 class vtkAlgorithm;
diff --git a/src/SVTK/SVTK_ImageWriterMgr.cxx b/src/SVTK/SVTK_ImageWriterMgr.cxx
index 0712222c5..f650a333c 100644
--- a/src/SVTK/SVTK_ImageWriterMgr.cxx
+++ b/src/SVTK/SVTK_ImageWriterMgr.cxx
@@ -23,7 +23,7 @@
 #include <vtkAlgorithm.h>
 #include <vtkImageData.h>
 
-#include <QSemaphore>
+#include <QtCore/QSemaphore>
 
 #include <limits>
 
diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index 65f946ffd..336157ca2 100644
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.cxx
@@ -60,8 +60,8 @@
 #include <QtxRubberBand.h>
 
 #include <QtGui/QPixmap>
-#include <QWidget>
-#include <QPolygon>
+#include <QtWidgets/QWidget>
+#include <QtGui/QPolygon>
 
 #include <algorithm>
 #include <iostream>
diff --git a/src/SVTK/SVTK_NonIsometricDlg.cxx b/src/SVTK/SVTK_NonIsometricDlg.cxx
index 68dd0b006..b7508f31e 100644
--- a/src/SVTK/SVTK_NonIsometricDlg.cxx
+++ b/src/SVTK/SVTK_NonIsometricDlg.cxx
@@ -31,10 +31,10 @@
 #include "QtxDoubleSpinBox.h"
 #include "QtxAction.h"
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
 
 /*!
   Constructor
diff --git a/src/SVTK/SVTK_PsOptionsDlg.cxx b/src/SVTK/SVTK_PsOptionsDlg.cxx
index f350fe82e..d7b3fad3a 100644
--- a/src/SVTK/SVTK_PsOptionsDlg.cxx
+++ b/src/SVTK/SVTK_PsOptionsDlg.cxx
@@ -21,13 +21,13 @@
 
 #include <QtxDoubleSpinBox.h>
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLayout>
-#include <QSlider>
-#include <QPushButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QPushButton>
 
 /*!
  * Constructor
diff --git a/src/SVTK/SVTK_Recorder.cxx b/src/SVTK/SVTK_Recorder.cxx
index 77a08d2cb..f2fd43153 100644
--- a/src/SVTK/SVTK_Recorder.cxx
+++ b/src/SVTK/SVTK_Recorder.cxx
@@ -40,8 +40,8 @@
 #endif
 
 #include <QtWidgets/QApplication>
-#include <QFileInfo>
-#include <QDir>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
 
 //#include "utilities.h"
 
diff --git a/src/SVTK/SVTK_RecorderDlg.cxx b/src/SVTK/SVTK_RecorderDlg.cxx
index af32c7f67..d3388c4b8 100644
--- a/src/SVTK/SVTK_RecorderDlg.cxx
+++ b/src/SVTK/SVTK_RecorderDlg.cxx
@@ -30,14 +30,14 @@
 #include <QtxDoubleSpinBox.h>
 #include <QtxIntSpinBox.h>
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGroupBox>
 #include <QtGui/QKeyEvent>
-#include <QLabel>
-#include <QLayout>
-#include <QLineEdit>
-#include <QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
 
 /*!
  * Constructor
diff --git a/src/SVTK/SVTK_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx
index 617975fed..75e4e5cf9 100644
--- a/src/SVTK/SVTK_RenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_RenderWindowInteractor.cxx
@@ -36,7 +36,7 @@
 // (see SVTK_SpaceMouse.h) to avoid the compilation error.
 #if !defined(WIN32) && !defined(__APPLE__)
 #include <xcb/xcb.h>
-#include <QX11Info>
+#include <QtX11Extras/QX11Info>
 #endif
 #include <QtGui/QMouseEvent>
 
diff --git a/src/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h
index feb30df6a..cfc0ad656 100644
--- a/src/SVTK/SVTK_RenderWindowInteractor.h
+++ b/src/SVTK/SVTK_RenderWindowInteractor.h
@@ -31,7 +31,7 @@
 #include "SVTK_Selection.h"
 
 #include <vtkSmartPointer.h>
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 // undefining min and max because CASCADE's defines them and
 // it clashes with std::min(), std::max()
diff --git a/src/SVTK/SVTK_SelectionEvent.h b/src/SVTK/SVTK_SelectionEvent.h
index 2f4cafbf6..f982ad7e4 100644
--- a/src/SVTK/SVTK_SelectionEvent.h
+++ b/src/SVTK/SVTK_SelectionEvent.h
@@ -28,8 +28,8 @@
 #define SVTK_SELECTIONEVENT_H
 
 #include "SVTK_Selection.h"
-#include <QPoint>
-#include <QVector>
+#include <QtCore/QPoint>
+#include <QtCore/QVector>
 
 //! The structure is used for passing all infromation necessary for claculation of the selection.
 /*!
diff --git a/src/SVTK/SVTK_SetRotationPointDlg.cxx b/src/SVTK/SVTK_SetRotationPointDlg.cxx
index f2d1fb95a..91905b9d6 100644
--- a/src/SVTK/SVTK_SetRotationPointDlg.cxx
+++ b/src/SVTK/SVTK_SetRotationPointDlg.cxx
@@ -34,14 +34,14 @@
 
 #include "QtxAction.h"
 
-#include <QLineEdit>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QMenu>
-#include <QGridLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QGridLayout>
 #include <QtGui/QDoubleValidator>
-#include <QCheckBox>
+#include <QtWidgets/QCheckBox>
 
 #include <vtkCallbackCommand.h>
 #include <vtkInteractorStyle.h>
diff --git a/src/SVTK/SVTK_SetRotationPointDlg.h b/src/SVTK/SVTK_SetRotationPointDlg.h
index d371d8b7f..90d17695b 100644
--- a/src/SVTK/SVTK_SetRotationPointDlg.h
+++ b/src/SVTK/SVTK_SetRotationPointDlg.h
@@ -34,8 +34,8 @@
 
 #include <vtkSmartPointer.h>
 
-#include <QMap>
-#include <QList>
+#include <QtCore/QMap>
+#include <QtCore/QList>
 
 class SVTK_ViewWindow;
 class SVTK_RenderWindowInteractor;
diff --git a/src/SVTK/SVTK_UpdateRateDlg.cxx b/src/SVTK/SVTK_UpdateRateDlg.cxx
index 3b4066492..926f0fb6a 100644
--- a/src/SVTK/SVTK_UpdateRateDlg.cxx
+++ b/src/SVTK/SVTK_UpdateRateDlg.cxx
@@ -36,11 +36,11 @@
 
 #include <sstream>
 
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
-#include <QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QLineEdit>
 
 #include <vtkGenericRenderWindowInteractor.h>
 #include <vtkCallbackCommand.h>
diff --git a/src/SVTK/SVTK_View.h b/src/SVTK/SVTK_View.h
index 0820fe872..7b47436e4 100644
--- a/src/SVTK/SVTK_View.h
+++ b/src/SVTK/SVTK_View.h
@@ -32,7 +32,7 @@
 #include <SALOME_InteractiveObject.hxx>
 #include <SALOME_ListIO.hxx>
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class vtkActorCollection;
 class vtkRenderer;
diff --git a/src/SVTK/SVTK_ViewModel.cxx b/src/SVTK/SVTK_ViewModel.cxx
index 600bb3ba9..7b7e2056a 100644
--- a/src/SVTK/SVTK_ViewModel.cxx
+++ b/src/SVTK/SVTK_ViewModel.cxx
@@ -20,9 +20,9 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QMenu>
-#include <QColorDialog>
-#include <QToolBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QToolBar>
 
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
diff --git a/src/SVTK/SVTK_ViewModel.h b/src/SVTK/SVTK_ViewModel.h
index 98387e5fa..08750e1e2 100644
--- a/src/SVTK/SVTK_ViewModel.h
+++ b/src/SVTK/SVTK_ViewModel.h
@@ -34,7 +34,7 @@
 #include <SALOME_ListIO.hxx>
 
 #include <QtGui/QColor>
-#include <QMap>
+#include <QtCore/QMap>
 
 class QMouseEvent;
 
diff --git a/src/SVTK/SVTK_ViewParameterDlg.cxx b/src/SVTK/SVTK_ViewParameterDlg.cxx
index 538c0647d..62193dd44 100644
--- a/src/SVTK/SVTK_ViewParameterDlg.cxx
+++ b/src/SVTK/SVTK_ViewParameterDlg.cxx
@@ -31,15 +31,15 @@
 
 #include "QtxAction.h"
 
-#include <QLineEdit>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
 #include <QtGui/QDoubleValidator>
-#include <QCheckBox>
-#include <QRadioButton>
-#include <QButtonGroup>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QButtonGroup>
 
 #include <vtkCallbackCommand.h>
 #include <vtkRenderer.h>
diff --git a/src/SVTK/SVTK_ViewWindow.cxx b/src/SVTK/SVTK_ViewWindow.cxx
index 68166affa..aae913629 100644
--- a/src/SVTK/SVTK_ViewWindow.cxx
+++ b/src/SVTK/SVTK_ViewWindow.cxx
@@ -32,14 +32,14 @@
 
 #include "SALOME_Actor.h"
 
-#include <QMenu>
-#include <QToolBar>
-#include <QEvent>
-#include <QFileInfo>
-#include <QSignalMapper>
-#include <QXmlStreamWriter>
-#include <QXmlStreamReader>
-#include <QXmlStreamAttributes>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QToolBar>
+#include <QtCore/QEvent>
+#include <QtCore/QFileInfo>
+#include <QtCore/QSignalMapper>
+#include <QtCore/QXmlStreamWriter>
+#include <QtCore/QXmlStreamReader>
+#include <QtCore/QXmlStreamAttributes>
 
 #include <vtkTextProperty.h>
 #include <vtkActorCollection.h>
diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 7df168366..c48db0d6b 100644
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -85,15 +85,15 @@
 #include <SALOME_LifeCycleCORBA.hxx>
 
 #include <QtWidgets/QApplication>
-#include <QWidget>
-#include <QAction>
-#include <QRegExp>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QLabel>
-#include <QListWidget>
-#include <QGridLayout>
-#include <QMenu>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QAction>
+#include <QtCore/QRegExp>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QMenu>
 #include <QtDebug>
 
 #include <SALOMEDSClient_ClientFactory.hxx>
diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index e0bde79b7..4bebcf99c 100644
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -42,7 +42,7 @@
 
 #include "SALOMEDSClient.hxx"
 
-#include <QPointer>
+#include <QtCore/QPointer>
 
 class LightApp_Preferences;
 class SalomeApp_Study;
diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.cxx b/src/SalomeApp/SalomeApp_CheckFileDlg.cxx
index aa275969f..065ec046e 100644
--- a/src/SalomeApp/SalomeApp_CheckFileDlg.cxx
+++ b/src/SalomeApp/SalomeApp_CheckFileDlg.cxx
@@ -22,10 +22,10 @@
 
 #include "SalomeApp_CheckFileDlg.h"
 
-#include <QCheckBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QGridLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
 
 /*!
 Constructor
diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index b8e9a7045..1a5cb85ea 100644
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.cxx
@@ -35,8 +35,8 @@
 #include <SALOME_LifeCycleCORBA.hxx>
 #include <Basics_Utils.hxx>
 
-#include <QObject>
-#include <QVariant>
+#include <QtCore/QObject>
+#include <QtCore/QVariant>
 
 //VSR: uncomment below macro to support unicode text properly in SALOME
 //     current commented out due to regressions
diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
index a5dc98354..79cb192f3 100644
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
@@ -35,9 +35,9 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QtGui/QKeyEvent>
-#include <QLineEdit>
-#include <QToolTip>
-#include <QRegExp>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QToolTip>
+#include <QtCore/QRegExp>
 
 #include <string>
 
diff --git a/src/SalomeApp/SalomeApp_Engine_i.cxx b/src/SalomeApp/SalomeApp_Engine_i.cxx
index 861d912ea..ca2ad5bb6 100644
--- a/src/SalomeApp/SalomeApp_Engine_i.cxx
+++ b/src/SalomeApp/SalomeApp_Engine_i.cxx
@@ -39,8 +39,8 @@
 #include <utilities.h>
 
 #include <QtWidgets/QApplication>
-#include <QDir>
-#include <QFile>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
 
 #include <iostream>
 
diff --git a/src/SalomeApp/SalomeApp_Engine_i.h b/src/SalomeApp/SalomeApp_Engine_i.h
index 78f228563..4704bb1c4 100644
--- a/src/SalomeApp/SalomeApp_Engine_i.h
+++ b/src/SalomeApp/SalomeApp_Engine_i.h
@@ -31,7 +31,7 @@
 
 #include "SALOME_Component_i.hxx"
 
-#include <QString>
+#include <QtCore/QString>
 #include <vector> 
 #include <map> 
 
diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
index f27c739eb..33ce3d009 100644
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
@@ -28,7 +28,7 @@
 #include <stdexcept>
 #include <exception>
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
diff --git a/src/SalomeApp/SalomeApp_ExitDlg.cxx b/src/SalomeApp/SalomeApp_ExitDlg.cxx
index 079a5a0e5..ea58a4f83 100644
--- a/src/SalomeApp/SalomeApp_ExitDlg.cxx
+++ b/src/SalomeApp/SalomeApp_ExitDlg.cxx
@@ -22,13 +22,13 @@
 //
 #include "SalomeApp_ExitDlg.h"
 
-#include <QLabel> 
-#include <QVBoxLayout> 
-#include <QHBoxLayout> 
-#include <QGridLayout> 
-#include <QPushButton>
-#include <QMessageBox>
-#include <QCheckBox>
+#include <QtWidgets/QLabel> 
+#include <QtWidgets/QVBoxLayout> 
+#include <QtWidgets/QHBoxLayout> 
+#include <QtWidgets/QGridLayout> 
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QCheckBox>
 
 /*!
  * \brief creates a Exit dialog box
diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
index da6657d03..cb1ed469b 100644
--- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
@@ -35,9 +35,9 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QtGui/QKeyEvent>
-#include <QLineEdit>
-#include <QToolTip>
-#include <QRegExp>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QToolTip>
+#include <QtCore/QRegExp>
 
 #include <string>
 
diff --git a/src/SalomeApp/SalomeApp_ListView.cxx b/src/SalomeApp/SalomeApp_ListView.cxx
index f65d11c2d..87c454901 100644
--- a/src/SalomeApp/SalomeApp_ListView.cxx
+++ b/src/SalomeApp/SalomeApp_ListView.cxx
@@ -32,9 +32,9 @@
 #include "utilities.h"
 
 #include <QtGui/QValidator>
-#include <QToolButton>
+#include <QtWidgets/QToolButton>
 #include <QtGui/QPixmap>
-#include <QHeaderView>
+#include <QtWidgets/QHeaderView>
 #include <QtGui/QKeyEvent>
 
 #include <TColStd_ListOfInteger.hxx>
diff --git a/src/SalomeApp/SalomeApp_ListView.h b/src/SalomeApp/SalomeApp_ListView.h
index ad5364869..efc774288 100644
--- a/src/SalomeApp/SalomeApp_ListView.h
+++ b/src/SalomeApp/SalomeApp_ListView.h
@@ -30,11 +30,11 @@
 
 #include <SUIT_PopupClient.h>
 
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QString>
-#include <QLineEdit>
-#include <QComboBox>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QTreeWidgetItem>
+#include <QtCore/QString>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QComboBox>
 
 #include <TColStd_ListOfInteger.hxx>
 #include <TColStd_ListOfReal.hxx>
diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx b/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx
index e29dc496a..78aaef95e 100644
--- a/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx
+++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx
@@ -19,12 +19,12 @@
 
 #include "SalomeApp_LoadStudiesDlg.h"
 
-#include <QLabel>
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QListWidget>
-#include <QPushButton>
-#include <QStringList>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QListWidget>
+#include <QtWidgets/QPushButton>
+#include <QtCore/QStringList>
 
 #define SPACING_SIZE             6
 #define MARGIN_SIZE             11
diff --git a/src/SalomeApp/SalomeApp_Module.cxx b/src/SalomeApp/SalomeApp_Module.cxx
index 92d0a4c69..6ed004463 100644
--- a/src/SalomeApp/SalomeApp_Module.cxx
+++ b/src/SalomeApp/SalomeApp_Module.cxx
@@ -48,7 +48,7 @@
 #include <SUIT_MessageBox.h>
 #include <SUIT_Desktop.h>
 
-#include <QString>
+#include <QtCore/QString>
 
 /*!Constructor.*/
 SalomeApp_Module::SalomeApp_Module( const QString& name )
diff --git a/src/SalomeApp/SalomeApp_NoteBook.cxx b/src/SalomeApp/SalomeApp_NoteBook.cxx
index f55f5f2c9..bfe078347 100644
--- a/src/SalomeApp/SalomeApp_NoteBook.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBook.cxx
@@ -38,16 +38,16 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 
-#include <QWidget>
-#include <QGridLayout>
-#include <QTableWidget>
-#include <QTableWidgetItem>
-#include <QPushButton>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QTableWidget>
+#include <QtWidgets/QTableWidgetItem>
+#include <QtWidgets/QPushButton>
 #include <QtGui/QFont>
-#include <QGroupBox>
-#include <QList>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QList>
 #include <QtWidgets/QApplication>
-#include <QDir>
+#include <QtCore/QDir>
 
 #include <string>
 #include <vector>
diff --git a/src/SalomeApp/SalomeApp_NoteBook.h b/src/SalomeApp/SalomeApp_NoteBook.h
index acc1ff487..995602ac6 100644
--- a/src/SalomeApp/SalomeApp_NoteBook.h
+++ b/src/SalomeApp/SalomeApp_NoteBook.h
@@ -29,9 +29,9 @@
 #include "SALOMEDSClient_ClientFactory.hxx" 
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <QWidget>
-#include <QTableWidget>
-#include <QList>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QTableWidget>
+#include <QtCore/QList>
 
 class QWidget;
 class QPushButton;
diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index e3ffd5930..c42f0e3f3 100644
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -36,9 +36,9 @@
 // temporary commented
 //#include <OB_Browser.h>
 
-#include <QCoreApplication>
-#include <QEvent>
-#include <QFileInfo>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QEvent>
+#include <QtCore/QFileInfo>
 #include "SALOME_Event.h"
 #include "Basics_Utils.hxx"
 
diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
index a2db7c0ba..b6cf583f2 100644
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
@@ -37,17 +37,17 @@
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
 // QT Includes
-#include <QPushButton>
-#include <QGridLayout>
-#include <QHBoxLayout>
-#include <QFrame>
-#include <QLineEdit>
-#include <QLabel>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QTextEdit>
-#include <QTreeWidget>
-#include <QPushButton>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QPushButton>
 
 #include <iostream>
  
diff --git a/src/SalomeApp/SalomeApp_Tools.cxx b/src/SalomeApp/SalomeApp_Tools.cxx
index 1f04c1265..ce6a9a1c9 100644
--- a/src/SalomeApp/SalomeApp_Tools.cxx
+++ b/src/SalomeApp/SalomeApp_Tools.cxx
@@ -28,8 +28,8 @@
 
 #include <utilities.h>
 
-#include <QColor>
-#include <QString>
+#include <QtGui/QColor>
+#include <QtCore/QString>
 
 #include <Quantity_Color.hxx>
 
diff --git a/src/SalomeApp/SalomeApp_TypeFilter.h b/src/SalomeApp/SalomeApp_TypeFilter.h
index a8cb5cf01..c47c1f8c4 100644
--- a/src/SalomeApp/SalomeApp_TypeFilter.h
+++ b/src/SalomeApp/SalomeApp_TypeFilter.h
@@ -23,7 +23,7 @@
 #ifndef SALOMEAPP_TYPEFILTER_H
 #define SALOMEAPP_TYPEFILTER_H
 
-#include <QString>
+#include <QtCore/QString>
 
 #include "SalomeApp_Filter.h"
 
diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx
index a6db48879..bed1314e2 100644
--- a/src/SalomeApp/SalomeApp_VisualState.cxx
+++ b/src/SalomeApp/SalomeApp_VisualState.cxx
@@ -34,9 +34,9 @@
 
 #include <STD_TabDesktop.h>
 
-#include <QList>
+#include <QtCore/QList>
 #include <QtWidgets/QApplication>
-#include <QMultiHash>
+#include <QtCore/QMultiHash>
 
 #include <SALOMEDSClient_ClientFactory.hxx>//?
 #include <SALOMEDSClient_IParameters.hxx>//?
diff --git a/src/SalomeApp/SalomeApp_VisualState.h b/src/SalomeApp/SalomeApp_VisualState.h
index 3eb93b6fb..47af2533a 100644
--- a/src/SalomeApp/SalomeApp_VisualState.h
+++ b/src/SalomeApp/SalomeApp_VisualState.h
@@ -29,7 +29,7 @@
 
 #include "SalomeApp.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class SalomeApp_Application;
 
diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index e6cb5d2d3..849c42da9 100644
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -66,12 +66,12 @@
 #include <time.h>
 
 #include <QtWidgets/QApplication>
-#include <QDir>
-#include <QFile>
-#include <QMutex>
-#include <QRegExp>
-#include <QTextStream>
-#include <QWaitCondition>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
+#include <QtCore/QMutex>
+#include <QtCore/QRegExp>
+#include <QtCore/QTextStream>
+#include <QtCore/QWaitCondition>
 
 //! CORBA server for SALOME GUI session
 /*!
diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx
index 4ebd1d4ef..6139aaa74 100644
--- a/src/Session/Session_ServerCheck.cxx
+++ b/src/Session/Session_ServerCheck.cxx
@@ -40,9 +40,9 @@
 #include "Qtx.h"
 
 #include <QtWidgets/QApplication> 
-#include <QWaitCondition>
-#include <QMutexLocker>
-#include <QStringList>
+#include <QtCore/QWaitCondition>
+#include <QtCore/QMutexLocker>
+#include <QtCore/QStringList>
 
 //
 // Default settings
diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx
index 8da162cfe..895775add 100644
--- a/src/Session/Session_ServerLauncher.cxx
+++ b/src/Session/Session_ServerLauncher.cxx
@@ -30,8 +30,8 @@
 #include "Utils_SALOME_Exception.hxx"
 #include "utilities.h"
 
-#include <QMutex>
-#include <QWaitCondition>
+#include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
 
 /*! 
    default constructor not for use
diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx
index cdb0402a8..bf9d572c6 100644
--- a/src/Session/Session_ServerThread.cxx
+++ b/src/Session/Session_ServerThread.cxx
@@ -45,8 +45,8 @@
 #include <cstdlib>
 #include <ctime>
 
-#include <QMutex>
-#include <QWaitCondition>
+#include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
 
 const int Session_ServerThread::NB_SRV_TYP = 6;
 const char* Session_ServerThread::_serverTypes[NB_SRV_TYP] = {"Container",
diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx
index 05a6e34b4..d6f2bd9e7 100644
--- a/src/Session/Session_Session_i.cxx
+++ b/src/Session/Session_Session_i.cxx
@@ -39,8 +39,8 @@
 
 #include "Basics_Utils.hxx"
 
-#include <QMutex>
-#include <QWaitCondition>
+#include <QtCore/QMutex>
+#include <QtCore/QWaitCondition>
 
 // Open CASCADE Includes
 #include <OSD_SharedLibrary.hxx>
diff --git a/src/Style/Style_Model.cxx b/src/Style/Style_Model.cxx
index c43bd0283..91f97e540 100644
--- a/src/Style/Style_Model.cxx
+++ b/src/Style/Style_Model.cxx
@@ -26,7 +26,7 @@
 #include <QtxResourceMgr.h>
 
 #include <QtWidgets/QApplication>
-#include <QColor>
+#include <QtGui/QColor>
 #include <QtGui/QFont>
 #include <QtGui/QPalette>
 
diff --git a/src/Style/Style_Model.h b/src/Style/Style_Model.h
index 034c57f59..89aad75f1 100644
--- a/src/Style/Style_Model.h
+++ b/src/Style/Style_Model.h
@@ -25,8 +25,8 @@
 
 #include "Style.h"
 
-#include <QMap>
-#include <QString>
+#include <QtCore/QMap>
+#include <QtCore/QString>
 #include <QtGui/QPalette>
 #include <QtGui/QFont>
 
diff --git a/src/Style/Style_PrefDlg.cxx b/src/Style/Style_PrefDlg.cxx
index b8bb76e4b..36d0d305b 100644
--- a/src/Style/Style_PrefDlg.cxx
+++ b/src/Style/Style_PrefDlg.cxx
@@ -30,25 +30,25 @@
 #include <QtxFontEdit.h>
 
 #include <QtWidgets/QApplication>
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QColorDialog>
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QHBoxLayout>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QHBoxLayout>
 #include <QtGui/QKeyEvent>
-#include <QLabel>
-#include <QListWidget>
-#include <QMap>
-#include <QMessageBox>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QSlider>
-#include <QSpinBox>
-#include <QStackedWidget>
-#include <QTabWidget>
-#include <QVBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QListWidget>
+#include <QtCore/QMap>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QVBoxLayout>
 
 static const int MARGIN  = 9;
 static const int SPACING = 6;
diff --git a/src/Style/Style_PrefDlg.h b/src/Style/Style_PrefDlg.h
index d594da820..6c60897c8 100644
--- a/src/Style/Style_PrefDlg.h
+++ b/src/Style/Style_PrefDlg.h
@@ -26,8 +26,8 @@
 #include "Style.h"
 
 #include <QtxDialog.h>
-#include <QFrame>
-#include <QMap>
+#include <QtWidgets/QFrame>
+#include <QtCore/QMap>
 
 class QCheckBox;
 class QComboBox;
diff --git a/src/Style/Style_Salome.cxx b/src/Style/Style_Salome.cxx
index 163893d0c..80628749b 100644
--- a/src/Style/Style_Salome.cxx
+++ b/src/Style/Style_Salome.cxx
@@ -26,40 +26,40 @@
 
 #include <QtWidgets/QApplication>
 #include <QtGui/QPainter>
-#include <QMap>
-#include <QPainterPath>
-#include <QWidget>
-#include <QComboBox>
-#include <QStyleOptionFrame>
-#include <QStyleOptionComplex>
-#include <QStyleOptionSpinBox>
-#include <QStyleOptionButton>
-#include <QStyleOptionTab>
-#include <QStyleOptionToolButton>
-#include <QStyleOptionFocusRect>
-#include <QStyleOption>
-#include <QSize>
-#include <QToolBar>
-#include <QMenuBar>
-#include <QToolButton>
-#include <QTabWidget>
-#include <QTabBar>
-#include <QToolTip>
-#include <QDockWidget>
-#include <QTextEdit>
-#include <QTreeView>
-#include <QListView>
-#include <QHeaderView>
-#include <QRadioButton>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QAbstractSpinBox>
-#include <QLineEdit>
-#include <QScrollBar>
-#include <QSlider>
-#include <QMainWindow>
-#include <QPixmapCache>
-#include <QTileRules>
+#include <QtCore/QMap>
+#include <QtGui/QPainterPath>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QStyleOptionFrame>
+#include <QtWidgets/QStyleOptionComplex>
+#include <QtWidgets/QStyleOptionSpinBox>
+#include <QtWidgets/QStyleOptionButton>
+#include <QtWidgets/QStyleOptionTab>
+#include <QtWidgets/QStyleOptionToolButton>
+#include <QtWidgets/QStyleOptionFocusRect>
+#include <QtWidgets/QStyleOption>
+#include <QtCore/QSize>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QTabBar>
+#include <QtWidgets/QToolTip>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QAbstractSpinBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QSlider>
+#include <QtWidgets/QMainWindow>
+#include <QtGui/QPixmapCache>
+#include <QtWidgets/QTileRules>
 
 #define SHADOW          1
 #define LINE_GR_MARGIN  10
diff --git a/src/Style/Style_Tools.cxx b/src/Style/Style_Tools.cxx
index 056425a8e..0b1c294a3 100644
--- a/src/Style/Style_Tools.cxx
+++ b/src/Style/Style_Tools.cxx
@@ -23,11 +23,11 @@
 #include "Style_Tools.h"
 
 #include <QtGui/QPainter>
-#include <QPainterPath>
-#include <QRect>
-#include <QColor>
-#include <QSize>
-#include <QTabWidget>
+#include <QtGui/QPainterPath>
+#include <QtCore/QRect>
+#include <QtGui/QColor>
+#include <QtCore/QSize>
+#include <QtWidgets/QTabWidget>
 
 /*!
   \class Style_Tools
diff --git a/src/Style/Style_Tools.h b/src/Style/Style_Tools.h
index 16bdbb8d5..ec0bf7bdc 100644
--- a/src/Style/Style_Tools.h
+++ b/src/Style/Style_Tools.h
@@ -26,9 +26,9 @@
 #include "Style.h"
 
 #include <QtGui/QPainterPath>
-#include <QRect>
+#include <QtCore/QRect>
 #include <QtGui/QColor>
-#include <QStyle>
+#include <QtWidgets/QStyle>
 
 //
 // This class is private for Style package.
diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
index 4040ab5f7..82dffa0b8 100644
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
@@ -33,15 +33,15 @@
 
 #include <stdlib.h>
 
-#include <QLabel>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QStringList>
-#include <QRegExp>
-#include <QIntValidator>
-#include <QFile>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtCore/QStringList>
+#include <QtCore/QRegExp>
+#include <QtGui/QIntValidator>
+#include <QtCore/QFile>
 
 #include <Qtx.h>
 
diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
index c1cea7c5b..9ef08575c 100644
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
@@ -23,15 +23,15 @@
 # include "ToolsGUI_RegWidget.h"
 
 #include <QtWidgets/QApplication>
-#include <QInputDialog>
-#include <QMenuBar>
-#include <QStatusBar>
-#include <QTabWidget>
-#include <QTextEdit>
-#include <QTimer>
-#include <QToolBar>
-#include <QTreeWidget>
-#include <QVBoxLayout>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QTextEdit>
+#include <QtCore/QTimer>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QVBoxLayout>
 
 #include <Qtx.h>
 
diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.h b/src/TOOLSGUI/ToolsGUI_RegWidget.h
index f1d799dda..9a7a39474 100644
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.h
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.h
@@ -25,8 +25,8 @@
 
 #include "ToolsGUI.h"
 
-#include <QMainWindow>
-#include <QMap>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QMap>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Registry)
diff --git a/src/TreeData/DockWidgets.cxx b/src/TreeData/DockWidgets.cxx
index 67a09cf9e..3473d4085 100644
--- a/src/TreeData/DockWidgets.cxx
+++ b/src/TreeData/DockWidgets.cxx
@@ -22,7 +22,7 @@
 #include "DockWidgets.hxx"
 
 // Qt includes
-#include <QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 // SALOME includes
 #include <SUIT_Desktop.h>
diff --git a/src/TreeData/Test/guitester.cxx b/src/TreeData/Test/guitester.cxx
index bbabf18f7..6d07014a4 100644
--- a/src/TreeData/Test/guitester.cxx
+++ b/src/TreeData/Test/guitester.cxx
@@ -18,9 +18,9 @@
 //
 
 #include <QtWidgets/QApplication>
-#include <QMainWindow>
-#include <QDockWidget>
-#include <QTreeView>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QTreeView>
 
 #include <Basics_Utils.hxx>
 
diff --git a/src/TreeData/Test/mainwindow.cxx b/src/TreeData/Test/mainwindow.cxx
index b7fa5721e..ccf0bfc54 100644
--- a/src/TreeData/Test/mainwindow.cxx
+++ b/src/TreeData/Test/mainwindow.cxx
@@ -17,8 +17,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include <QInputDialog>
-#include <QContextMenuEvent>
+#include <QtWidgets/QInputDialog>
+#include <QtGui/QContextMenuEvent>
 
 #include "mainwindow.hxx"
 #include "TreeModel.hxx"
diff --git a/src/TreeData/Test/testhelper.cxx b/src/TreeData/Test/testhelper.cxx
index 1f9704813..754e95563 100644
--- a/src/TreeData/Test/testhelper.cxx
+++ b/src/TreeData/Test/testhelper.cxx
@@ -19,8 +19,8 @@
 
 #include "testhelper.hxx"
 
-#include <QFile>
-#include <QString>
+#include <QtCore/QFile>
+#include <QtCore/QString>
 
 #include "QtHelper.hxx"
 #include "MyDataModel.hxx"
diff --git a/src/TreeData/TreeGuiManager.cxx b/src/TreeData/TreeGuiManager.cxx
index 6b8d73eb4..a7c92f578 100644
--- a/src/TreeData/TreeGuiManager.cxx
+++ b/src/TreeData/TreeGuiManager.cxx
@@ -22,7 +22,7 @@
 #include "TreeGuiManager.hxx"
 
 // SALOME includes
-#include <QStringList>
+#include <QtCore/QStringList>
 
 // XCAD includes
 #include "TreeView.hxx"
diff --git a/src/TreeData/TreeItem.cxx b/src/TreeData/TreeItem.cxx
index c46aa44e0..f3e1ac4eb 100644
--- a/src/TreeData/TreeItem.cxx
+++ b/src/TreeData/TreeItem.cxx
@@ -20,7 +20,7 @@
 // Author: Guillaume Boulant (EDF/R&D)
 
 
-#include <QStringList>
+#include <QtCore/QStringList>
 #include "TreeItem.hxx"
 
 TreeItem::TreeItem(const QString &nameId,
diff --git a/src/TreeData/TreeView.cxx b/src/TreeData/TreeView.cxx
index 87bb26b62..aacca1004 100644
--- a/src/TreeData/TreeView.cxx
+++ b/src/TreeData/TreeView.cxx
@@ -21,10 +21,10 @@
 
 
 // include Qt
-#include <QString>
-#include <QMenu>
-#include <QModelIndex>
-#include <QAbstractItemView>
+#include <QtCore/QString>
+#include <QtWidgets/QMenu>
+#include <QtCore/QModelIndex>
+#include <QtWidgets/QAbstractItemView>
 
 // include Xcad
 #include "TreeView.hxx"
diff --git a/src/VTKViewer/VTKViewer_FramedTextActor.cxx b/src/VTKViewer/VTKViewer_FramedTextActor.cxx
index 7d6ff0609..1adcfc2b0 100644
--- a/src/VTKViewer/VTKViewer_FramedTextActor.cxx
+++ b/src/VTKViewer/VTKViewer_FramedTextActor.cxx
@@ -33,7 +33,7 @@
 #include <vtkViewport.h>
 #include <vtkWindow.h>
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 #define TEXT_MARGIN    4
 #define OFFSET_SPACING 2
diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.cxx b/src/VTKViewer/VTKViewer_InteractorStyle.cxx
index d6e4b916b..46601b323 100644
--- a/src/VTKViewer/VTKViewer_InteractorStyle.cxx
+++ b/src/VTKViewer/VTKViewer_InteractorStyle.cxx
@@ -48,7 +48,7 @@
 #include <vtkProperty.h>
 
 #include <QtWidgets/QApplication>
-#include <QRubberBand>
+#include <QtWidgets/QRubberBand>
 
 #include <algorithm>
 
diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.h b/src/VTKViewer/VTKViewer_InteractorStyle.h
index fa5e1f248..1a4d1f1fd 100644
--- a/src/VTKViewer/VTKViewer_InteractorStyle.h
+++ b/src/VTKViewer/VTKViewer_InteractorStyle.h
@@ -34,7 +34,7 @@ class vtkCell;
 class vtkRenderWindowInteractor;
 class vtkTDxInteractorStyle;
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGui/QCursor>
 
 class QRubberBand;
diff --git a/src/VTKViewer/VTKViewer_MarkerDlg.cxx b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
index 281c5560e..602ee1930 100644
--- a/src/VTKViewer/VTKViewer_MarkerDlg.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
@@ -27,8 +27,8 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 
-#include <QFrame>
-#include <QVBoxLayout>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QVBoxLayout>
 #include <QtGui/QKeyEvent>
 
 /*!
diff --git a/src/VTKViewer/VTKViewer_MarkerUtils.cxx b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
index 6b8ffe4b0..6f299f4a7 100644
--- a/src/VTKViewer/VTKViewer_MarkerUtils.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
@@ -23,10 +23,10 @@
 #include <vtkImageData.h>
 
 // QT Includes
-#include <QFile>
+#include <QtCore/QFile>
 #include <QtGui/QImage>
-#include <QString>
-#include <QTextStream>
+#include <QtCore/QString>
+#include <QtCore/QTextStream>
 
 namespace VTK
 {
diff --git a/src/VTKViewer/VTKViewer_MarkerWidget.cxx b/src/VTKViewer/VTKViewer_MarkerWidget.cxx
index 3e7b09575..d4a37f184 100644
--- a/src/VTKViewer/VTKViewer_MarkerWidget.cxx
+++ b/src/VTKViewer/VTKViewer_MarkerWidget.cxx
@@ -25,10 +25,10 @@
 
 #include <vtkImageData.h>
 
-#include <QComboBox>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QSpinBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QSpinBox>
 
 const int SPACING = 6;
 enum { TypeRole = Qt::UserRole, IdRole };
diff --git a/src/VTKViewer/VTKViewer_MarkerWidget.h b/src/VTKViewer/VTKViewer_MarkerWidget.h
index 23beda143..668218c8a 100644
--- a/src/VTKViewer/VTKViewer_MarkerWidget.h
+++ b/src/VTKViewer/VTKViewer_MarkerWidget.h
@@ -25,7 +25,7 @@
 #include "VTKViewer.h"
 #include "VTKViewer_MarkerDef.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QComboBox;
 class QLabel;
diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
index b59d4714e..5399ee0e6 100644
--- a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
+++ b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
@@ -25,7 +25,7 @@
 
 #include <utilities.h>
 
-#include <QString>
+#include <QtCore/QString>
 
 #include <vtkCellArray.h>
 #include <vtkXMLImageDataReader.h>
diff --git a/src/VTKViewer/VTKViewer_RenderWindow.cxx b/src/VTKViewer/VTKViewer_RenderWindow.cxx
index 29fdf177e..96a26e28b 100644
--- a/src/VTKViewer/VTKViewer_RenderWindow.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindow.cxx
@@ -22,8 +22,8 @@
 
 #include "VTKViewer_RenderWindow.h"
 
-#include <QColorDialog>
-#include <QContextMenuEvent>
+#include <QtWidgets/QColorDialog>
+#include <QtGui/QContextMenuEvent>
 
 #include <stdlib.h>
 #include <math.h>
@@ -32,7 +32,7 @@
 #include <vtkRendererCollection.h>
 #include <vtkCamera.h>
 #if !defined WIN32 && !defined __APPLE__
-#include <QX11Info>
+#include <QtX11Extras/QX11Info>
 #include <vtkXOpenGLRenderWindow.h>
 #endif
 
diff --git a/src/VTKViewer/VTKViewer_RenderWindow.h b/src/VTKViewer/VTKViewer_RenderWindow.h
index c1bfd8eae..a729f8488 100644
--- a/src/VTKViewer/VTKViewer_RenderWindow.h
+++ b/src/VTKViewer/VTKViewer_RenderWindow.h
@@ -27,7 +27,7 @@
 
 #include <vtkRenderWindow.h>
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class VTKVIEWER_EXPORT VTKViewer_RenderWindow : public QWidget 
 {
diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
index a8f036b3c..e96627f93 100644
--- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
@@ -49,10 +49,10 @@
 #include <vtkProperty.h>
 
 // QT Includes
-#include <QTimer>
+#include <QtCore/QTimer>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QKeyEvent>
-#include <QContextMenuEvent>
+#include <QtGui/QContextMenuEvent>
 
 /*! Create new instance of VTKViewer_RenderWindowInteractor*/
 VTKViewer_RenderWindowInteractor* VTKViewer_RenderWindowInteractor::New() 
diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.h b/src/VTKViewer/VTKViewer_RenderWindowInteractor.h
index 7b997843c..67f9eeb16 100644
--- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.h
+++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.h
@@ -26,7 +26,7 @@
 #include "VTKViewer.h"
 #include "VTKViewer_Actor.h"
 
-#include <QObject>
+#include <QtCore/QObject>
 
 class QTimer;
 class QMouseEvent;
diff --git a/src/VTKViewer/VTKViewer_ViewModel.cxx b/src/VTKViewer/VTKViewer_ViewModel.cxx
index e0d47ff0f..615f6b0d1 100644
--- a/src/VTKViewer/VTKViewer_ViewModel.cxx
+++ b/src/VTKViewer/VTKViewer_ViewModel.cxx
@@ -30,10 +30,10 @@
 #include "SUIT_Desktop.h"
 #include "SUIT_Session.h"
 
-#include <QColorDialog>
-#include <QMenu>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QMenu>
 #include <QtGui/QMouseEvent>
-#include <QToolBar>
+#include <QtWidgets/QToolBar>
 
 // VSR: Uncomment below line to allow texture background support in VTK viewer
 #define VTK_ENABLE_TEXTURED_BACKGROUND
diff --git a/src/VTKViewer/VTKViewer_ViewWindow.cxx b/src/VTKViewer/VTKViewer_ViewWindow.cxx
index affd6c6d3..f35016a27 100644
--- a/src/VTKViewer/VTKViewer_ViewWindow.cxx
+++ b/src/VTKViewer/VTKViewer_ViewWindow.cxx
@@ -36,7 +36,7 @@
 #include <SUIT_Tools.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <QFileInfo>
+#include <QtCore/QFileInfo>
 #include <QtGui/QImage>
 
 #include <vtkCamera.h>
diff --git a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx
index 17d459703..46b27ca1a 100644
--- a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx
+++ b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.cxx
@@ -27,14 +27,14 @@
 #include "QtxAction.h"
 #include "QtxIntSpinBox.h"
 
-#include <QHBoxLayout>
-#include <QVBoxLayout>
-#include <QPushButton>
-#include <QTabWidget>
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QLineEdit>
-#include <QLabel>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QLabel>
 
 /*!
  * Class       : ViewerTools_AxisWidgetBase
diff --git a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h
index 66ed8218f..33b337c93 100644
--- a/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h
+++ b/src/ViewerTools/ViewerTools_CubeAxesDlgBase.h
@@ -25,7 +25,7 @@
 
 #include "ViewerTools_DialogBase.h"
 
-#include <QFrame>
+#include <QtWidgets/QFrame>
 
 class QWidget;
 class QPushButton;
diff --git a/src/ViewerTools/ViewerTools_FontWidgetBase.cxx b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx
index 5ae68a985..7ea1ffd0b 100644
--- a/src/ViewerTools/ViewerTools_FontWidgetBase.cxx
+++ b/src/ViewerTools/ViewerTools_FontWidgetBase.cxx
@@ -22,11 +22,11 @@
 
 #include "ViewerTools_FontWidgetBase.h"
 
-#include <QToolButton>
-#include <QComboBox>
-#include <QColorDialog>
-#include <QCheckBox>
-#include <QHBoxLayout>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QHBoxLayout>
 
 /*!
  * Class       : ViewerTools_FontWidgetBase
diff --git a/src/ViewerTools/ViewerTools_FontWidgetBase.h b/src/ViewerTools/ViewerTools_FontWidgetBase.h
index f9c678dee..f00df39de 100644
--- a/src/ViewerTools/ViewerTools_FontWidgetBase.h
+++ b/src/ViewerTools/ViewerTools_FontWidgetBase.h
@@ -25,7 +25,7 @@
 
 #include "ViewerTools.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class QToolButton;
 class QComboBox;
diff --git a/tools/CurvePlot/src/cpp/test/test_curveplot.cxx b/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
index 1ae7fc369..28dd08777 100644
--- a/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
+++ b/tools/CurvePlot/src/cpp/test/test_curveplot.cxx
@@ -30,13 +30,13 @@
 #include <PyInterp_Interp.h>  // GUI
 
 #include <QtWidgets/QApplication>
-#include <QDesktopWidget>
-#include <QMainWindow>
-#include <QList>
-#include <QWidget>
-#include <QVBoxLayout>
-#include <QDockWidget>
-#include <QPushButton>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QList>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QPushButton>
 
 using namespace CURVEPLOT;
 
diff --git a/tools/PyConsole/src/PyConsole_Console.cxx b/tools/PyConsole/src/PyConsole_Console.cxx
index 78b1b952e..5f303f710 100644
--- a/tools/PyConsole/src/PyConsole_Console.cxx
+++ b/tools/PyConsole/src/PyConsole_Console.cxx
@@ -26,12 +26,12 @@
 #include "PyConsole_Console.h"
 #include "PyConsole_Editor.h"
 
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
-#include <QClipboard>
-#include <QContextMenuEvent>
-#include <QMenu>
-#include <QVBoxLayout>
+#include <QtGui/QClipboard>
+#include <QtGui/QContextMenuEvent>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   \class PyConsole_Console
diff --git a/tools/PyConsole/src/PyConsole_Console.h b/tools/PyConsole/src/PyConsole_Console.h
index 49b3ccb74..c2c6d0165 100644
--- a/tools/PyConsole/src/PyConsole_Console.h
+++ b/tools/PyConsole/src/PyConsole_Console.h
@@ -27,8 +27,8 @@
 
 #include "PyConsole.h"
 
-#include <QWidget>
-#include <QMap>
+#include <QtWidgets/QWidget>
+#include <QtCore/QMap>
 
 class QMenu;
 
diff --git a/tools/PyConsole/src/PyConsole_Editor.cxx b/tools/PyConsole/src/PyConsole_Editor.cxx
index 585ab5aeb..af9dc0bf4 100644
--- a/tools/PyConsole/src/PyConsole_Editor.cxx
+++ b/tools/PyConsole/src/PyConsole_Editor.cxx
@@ -95,19 +95,19 @@
 #include "PyConsole_Request.h"
 
 #include <QtWidgets/QApplication>
-#include <QClipboard>
-#include <QDropEvent>
-#include <QEvent>
+#include <QtGui/QClipboard>
+#include <QtGui/QDropEvent>
+#include <QtCore/QEvent>
 #include <QtGui/QKeyEvent>
-#include <QMimeData>
+#include <QtCore/QMimeData>
 #include <QtGui/QMouseEvent>
-#include <QScrollBar>
-#include <QTextBlock>
-#include <QTextCursor>
-#include <QTextStream>
-#include <QChar>
-#include <QFileDialog>
-#include <QMessageBox>
+#include <QtWidgets/QScrollBar>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>
+#include <QtCore/QTextStream>
+#include <QtCore/QChar>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
 
 //VSR: uncomment below macro to support unicode text properly in SALOME
 //     current commented out due to regressions
diff --git a/tools/PyConsole/src/PyConsole_Editor.h b/tools/PyConsole/src/PyConsole_Editor.h
index 3f3bdffc3..e85ba34be 100644
--- a/tools/PyConsole/src/PyConsole_Editor.h
+++ b/tools/PyConsole/src/PyConsole_Editor.h
@@ -29,8 +29,8 @@
 
 #include "PyInterp_RefCounterObj.h"
 
-#include <QTextEdit>
-#include <QQueue>
+#include <QtWidgets/QTextEdit>
+#include <QtCore/QQueue>
 
 class PyConsole_Interp;
 class PyInterp_Request;
diff --git a/tools/PyConsole/src/PyConsole_Event.h b/tools/PyConsole/src/PyConsole_Event.h
index e56afcb88..65f85cd03 100644
--- a/tools/PyConsole/src/PyConsole_Event.h
+++ b/tools/PyConsole/src/PyConsole_Event.h
@@ -28,9 +28,9 @@
 #include "PyConsole.h"
 #include "PyInterp_Event.h"
 
-#include <QEvent>
-#include <QString>
-#include <QStringList>
+#include <QtCore/QEvent>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 class PyConsole_PrintEvent : public QEvent
 {
diff --git a/tools/PyConsole/src/PyConsole_Interp.h b/tools/PyConsole/src/PyConsole_Interp.h
index f4e409f4a..6bf86cf13 100644
--- a/tools/PyConsole/src/PyConsole_Interp.h
+++ b/tools/PyConsole/src/PyConsole_Interp.h
@@ -28,7 +28,7 @@
 #include "PyInterp_Interp.h"
 #include "PyConsole.h"
 
-#include <QStringList>
+#include <QtCore/QStringList>
 
 class PYCONSOLE_EXPORT PyConsole_Interp : public PyInterp_Interp
 {
diff --git a/tools/PyConsole/src/PyConsole_Request.cxx b/tools/PyConsole/src/PyConsole_Request.cxx
index 92d46211f..eb3e34eaa 100644
--- a/tools/PyConsole/src/PyConsole_Request.cxx
+++ b/tools/PyConsole/src/PyConsole_Request.cxx
@@ -23,7 +23,7 @@
 #include "PyConsole_Interp.h"
 #include "PyConsole_Event.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 /*!
   \class PyConsole_ExecCommand
diff --git a/tools/PyConsole/src/PyConsole_Request.h b/tools/PyConsole/src/PyConsole_Request.h
index e71adfb25..1708b83d5 100644
--- a/tools/PyConsole/src/PyConsole_Request.h
+++ b/tools/PyConsole/src/PyConsole_Request.h
@@ -24,8 +24,8 @@
 
 #include "PyInterp_Request.h"
 
-#include <QString>
-#include <QStringList>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 class QEvent;
 class PyInterp_Interp;
diff --git a/tools/PyEditor/src/PyEditor.cxx b/tools/PyEditor/src/PyEditor.cxx
index 39bbb2f3a..b11be97dc 100644
--- a/tools/PyEditor/src/PyEditor.cxx
+++ b/tools/PyEditor/src/PyEditor.cxx
@@ -25,12 +25,12 @@
 #include "PyEditor_StdSettings.h"
 
 #include <QtWidgets/QApplication>
-#include <QCommandLineParser>
-#include <QDir>
-#include <QLibraryInfo>
-#include <QLocale>
-#include <QStringList>
-#include <QTranslator>
+#include <QtCore/QCommandLineParser>
+#include <QtCore/QDir>
+#include <QtCore/QLibraryInfo>
+#include <QtCore/QLocale>
+#include <QtCore/QStringList>
+#include <QtCore/QTranslator>
 
 QString qtTrDir()
 {
diff --git a/tools/PyEditor/src/PyEditor_Completer.cxx b/tools/PyEditor/src/PyEditor_Completer.cxx
index 27a688ec2..08fe70ff0 100644
--- a/tools/PyEditor/src/PyEditor_Completer.cxx
+++ b/tools/PyEditor/src/PyEditor_Completer.cxx
@@ -25,12 +25,12 @@
 #include "PyEditor_Editor.h"
 #include "PyEditor_Keywords.h"
 
-#include <QSet>
-#include <QTimer>
-#include <QTextBlock>
-#include <QTextCursor>
+#include <QtCore/QSet>
+#include <QtCore/QTimer>
+#include <QtGui/QTextBlock>
+#include <QtGui/QTextCursor>
 #include <QtWidgets/QApplication>
-#include <QAbstractItemView>
+#include <QtWidgets/QAbstractItemView>
 #include <QtGui/QStandardItemModel>
 
 /*!
diff --git a/tools/PyEditor/src/PyEditor_Completer.h b/tools/PyEditor/src/PyEditor_Completer.h
index 51239516c..9c8f0bd26 100644
--- a/tools/PyEditor/src/PyEditor_Completer.h
+++ b/tools/PyEditor/src/PyEditor_Completer.h
@@ -23,7 +23,7 @@
 #ifndef PYEDITOR_COMPLETER_H
 #define PYEDITOR_COMPLETER_H
 
-#include <QCompleter>
+#include <QtWidgets/QCompleter>
 
 class QTimer;
 class PyEditor_Editor;
diff --git a/tools/PyEditor/src/PyEditor_Editor.cxx b/tools/PyEditor/src/PyEditor_Editor.cxx
index de11e4cac..a70e07845 100644
--- a/tools/PyEditor/src/PyEditor_Editor.cxx
+++ b/tools/PyEditor/src/PyEditor_Editor.cxx
@@ -27,10 +27,10 @@
 #include "PyEditor_Settings.h"
 #include "PyEditor_Keywords.h"
 
-#include <QMenu>
+#include <QtWidgets/QMenu>
 #include <QtGui/QPainter>
-#include <QTextBlock>
-#include <QScrollBar>
+#include <QtGui/QTextBlock>
+#include <QtWidgets/QScrollBar>
 
 #include <iostream>
 
diff --git a/tools/PyEditor/src/PyEditor_Editor.h b/tools/PyEditor/src/PyEditor_Editor.h
index 349318573..73dda720a 100644
--- a/tools/PyEditor/src/PyEditor_Editor.h
+++ b/tools/PyEditor/src/PyEditor_Editor.h
@@ -26,7 +26,7 @@
 #include "PyEditor.h"
 #include "PyEditor_Settings.h"
 
-#include <QPlainTextEdit>
+#include <QtWidgets/QPlainTextEdit>
 
 class PyEditor_Keywords;
 class PyEditor_Completer;
diff --git a/tools/PyEditor/src/PyEditor_FindTool.cxx b/tools/PyEditor/src/PyEditor_FindTool.cxx
index 7555e6368..34540a88f 100644
--- a/tools/PyEditor/src/PyEditor_FindTool.cxx
+++ b/tools/PyEditor/src/PyEditor_FindTool.cxx
@@ -23,16 +23,16 @@
 #include "PyEditor_FindTool.h"
 #include "PyEditor_Editor.h"
 
-#include <QAction>
-#include <QCompleter>
-#include <QEvent>
-#include <QGridLayout>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QCompleter>
+#include <QtCore/QEvent>
+#include <QtWidgets/QGridLayout>
 #include <QtGui/QIcon>
-#include <QLabel>
-#include <QLineEdit>
-#include <QMenu>
-#include <QSignalMapper>
-#include <QToolButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QMenu>
+#include <QtCore/QSignalMapper>
+#include <QtWidgets/QToolButton>
 
 /*!
   \class PyEditor_FindTool
diff --git a/tools/PyEditor/src/PyEditor_FindTool.h b/tools/PyEditor/src/PyEditor_FindTool.h
index e1a3b84a4..5d36c1203 100644
--- a/tools/PyEditor/src/PyEditor_FindTool.h
+++ b/tools/PyEditor/src/PyEditor_FindTool.h
@@ -26,8 +26,8 @@
 #include "PyEditor.h"
 
 #include <QtGui/QTextDocument>
-#include <QStringListModel>
-#include <QWidget>
+#include <QtCore/QStringListModel>
+#include <QtWidgets/QWidget>
 
 class PyEditor_Editor;
 class QAction;
diff --git a/tools/PyEditor/src/PyEditor_Keywords.cxx b/tools/PyEditor/src/PyEditor_Keywords.cxx
index 0e6620deb..0dd487e0b 100644
--- a/tools/PyEditor/src/PyEditor_Keywords.cxx
+++ b/tools/PyEditor/src/PyEditor_Keywords.cxx
@@ -22,7 +22,7 @@
 
 #include "PyEditor_Keywords.h"
 
-#include <QSet>
+#include <QtCore/QSet>
 
 /*!
   \brief PyEditor_Keywords
diff --git a/tools/PyEditor/src/PyEditor_Keywords.h b/tools/PyEditor/src/PyEditor_Keywords.h
index eb6166378..1c389e81e 100644
--- a/tools/PyEditor/src/PyEditor_Keywords.h
+++ b/tools/PyEditor/src/PyEditor_Keywords.h
@@ -23,10 +23,10 @@
 #ifndef PYEDITOR_KEYWORDS_H
 #define PYEDITOR_KEYWORDS_H
 
-#include <QObject>
+#include <QtCore/QObject>
 #include <QtGui/QColor>
-#include <QList>
-#include <QMap>
+#include <QtCore/QList>
+#include <QtCore/QMap>
 
 class PyEditor_Keywords : public QObject
 {
diff --git a/tools/PyEditor/src/PyEditor_LineNumberArea.h b/tools/PyEditor/src/PyEditor_LineNumberArea.h
index 5cbf99995..3d794bb34 100644
--- a/tools/PyEditor/src/PyEditor_LineNumberArea.h
+++ b/tools/PyEditor/src/PyEditor_LineNumberArea.h
@@ -23,7 +23,7 @@
 #ifndef PYEDITOR_LINENUMBERAREA_H
 #define PYEDITOR_LINENUMBERAREA_H
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class PyEditor_Editor;
 
diff --git a/tools/PyEditor/src/PyEditor_PyHighlighter.cxx b/tools/PyEditor/src/PyEditor_PyHighlighter.cxx
index 553f5f4e6..2677fdc75 100644
--- a/tools/PyEditor/src/PyEditor_PyHighlighter.cxx
+++ b/tools/PyEditor/src/PyEditor_PyHighlighter.cxx
@@ -24,7 +24,7 @@
 
 #include "PyEditor_Keywords.h"
 
-#include <QSet>
+#include <QtCore/QSet>
 
 #define NORMAL 0
 #define TRIPLESINGLE 1
diff --git a/tools/PyEditor/src/PyEditor_PyHighlighter.h b/tools/PyEditor/src/PyEditor_PyHighlighter.h
index 071083fe0..c36155496 100644
--- a/tools/PyEditor/src/PyEditor_PyHighlighter.h
+++ b/tools/PyEditor/src/PyEditor_PyHighlighter.h
@@ -23,7 +23,7 @@
 #ifndef PYEDITOR_PYHIGHLIGHTER_H
 #define PYEDITOR_PYHIGHLIGHTER_H
 
-#include <QSyntaxHighlighter>
+#include <QtGui/QSyntaxHighlighter>
 
 class QTextDocument;
 class PyEditor_Keywords;
diff --git a/tools/PyEditor/src/PyEditor_SettingsDlg.cxx b/tools/PyEditor/src/PyEditor_SettingsDlg.cxx
index e2b77199c..4edc5e64f 100644
--- a/tools/PyEditor/src/PyEditor_SettingsDlg.cxx
+++ b/tools/PyEditor/src/PyEditor_SettingsDlg.cxx
@@ -25,14 +25,14 @@
 #include "PyEditor_Editor.h"
 #include "PyEditor_Settings.h"
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QFontComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QPushButton>
-#include <QSpinBox>
-#include <QVBoxLayout>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QFontComboBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   \class PyEditor_SettingsDlg
diff --git a/tools/PyEditor/src/PyEditor_StdSettings.h b/tools/PyEditor/src/PyEditor_StdSettings.h
index 7f9f99663..b7d0af734 100644
--- a/tools/PyEditor/src/PyEditor_StdSettings.h
+++ b/tools/PyEditor/src/PyEditor_StdSettings.h
@@ -26,7 +26,7 @@
 #include "PyEditor.h"
 #include "PyEditor_Settings.h"
 
-#include <QSettings>
+#include <QtCore/QSettings>
 
 class PYEDITOR_EXPORT PyEditor_StdSettings : public PyEditor_Settings
 {
diff --git a/tools/PyEditor/src/PyEditor_Widget.cxx b/tools/PyEditor/src/PyEditor_Widget.cxx
index b4cfcb959..1b5685021 100644
--- a/tools/PyEditor/src/PyEditor_Widget.cxx
+++ b/tools/PyEditor/src/PyEditor_Widget.cxx
@@ -24,7 +24,7 @@
 #include "PyEditor_FindTool.h"
 #include "PyEditor_Widget.h"
 
-#include <QVBoxLayout>
+#include <QtWidgets/QVBoxLayout>
 
 /*!
   \class PyEditor_Widget
diff --git a/tools/PyEditor/src/PyEditor_Widget.h b/tools/PyEditor/src/PyEditor_Widget.h
index 8bc78176d..6b004ca45 100644
--- a/tools/PyEditor/src/PyEditor_Widget.h
+++ b/tools/PyEditor/src/PyEditor_Widget.h
@@ -26,7 +26,7 @@
 #include "PyEditor.h"
 #include "PyEditor_Settings.h"
 
-#include <QWidget>
+#include <QtWidgets/QWidget>
 
 class PyEditor_Editor;
 class PyEditor_FindTool;
diff --git a/tools/PyEditor/src/PyEditor_Window.cxx b/tools/PyEditor/src/PyEditor_Window.cxx
index 552749a2f..636decf03 100644
--- a/tools/PyEditor/src/PyEditor_Window.cxx
+++ b/tools/PyEditor/src/PyEditor_Window.cxx
@@ -25,15 +25,15 @@
 #include "PyEditor_Settings.h"
 #include "PyEditor_SettingsDlg.h"
 
-#include <QAction>
+#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
-#include <QCloseEvent>
-#include <QFileDialog>
-#include <QMenuBar>
-#include <QMessageBox>
-#include <QStatusBar>
-#include <QTextStream>
-#include <QToolBar>
+#include <QtGui/QCloseEvent>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QStatusBar>
+#include <QtCore/QTextStream>
+#include <QtWidgets/QToolBar>
 
 /*!
   \class PyEditor_Window
diff --git a/tools/PyEditor/src/PyEditor_Window.h b/tools/PyEditor/src/PyEditor_Window.h
index 4cbf67260..bdc17e49c 100644
--- a/tools/PyEditor/src/PyEditor_Window.h
+++ b/tools/PyEditor/src/PyEditor_Window.h
@@ -25,8 +25,8 @@
 
 #include "PyEditor.h"
 
-#include <QMainWindow>
-#include <QMap>
+#include <QtWidgets/QMainWindow>
+#include <QtCore/QMap>
 
 class QAction;
 class PyEditor_Widget;
diff --git a/tools/PyInterp/src/PyInterp_Dispatcher.h b/tools/PyInterp/src/PyInterp_Dispatcher.h
index 9d97cc1a9..62473a8f9 100644
--- a/tools/PyInterp/src/PyInterp_Dispatcher.h
+++ b/tools/PyInterp/src/PyInterp_Dispatcher.h
@@ -30,9 +30,9 @@
 #include "PyInterp_Request.h"   // full include instead of forward declaration
                                 // everyone inc'ing the Dispatcher will get the requests for free.
 
-#include <QMutex>
-#include <QThread>
-#include <QQueue>
+#include <QtCore/QMutex>
+#include <QtCore/QThread>
+#include <QtCore/QQueue>
 
 class PYINTERP_EXPORT PyInterp_Dispatcher : protected QThread
 {
diff --git a/tools/PyInterp/src/PyInterp_Event.h b/tools/PyInterp/src/PyInterp_Event.h
index 2b0a46855..96c7fbab6 100644
--- a/tools/PyInterp/src/PyInterp_Event.h
+++ b/tools/PyInterp/src/PyInterp_Event.h
@@ -27,7 +27,7 @@
 
 #include "PyInterp.h"
 
-#include <QEvent>
+#include <QtCore/QEvent>
 
 class PyInterp_Request;
 
diff --git a/tools/PyInterp/src/PyInterp_Interp.cxx b/tools/PyInterp/src/PyInterp_Interp.cxx
index e741cce27..7f82b140d 100644
--- a/tools/PyInterp/src/PyInterp_Interp.cxx
+++ b/tools/PyInterp/src/PyInterp_Interp.cxx
@@ -35,8 +35,8 @@
 #include <sstream>
 #include <algorithm>
 
-#include <QRegExp>
-#include <QStringList>
+#include <QtCore/QRegExp>
+#include <QtCore/QStringList>
 
 #define TOP_HISTORY_PY   "--- top of history ---"
 #define BEGIN_HISTORY_PY "--- begin of history ---"
diff --git a/tools/PyInterp/src/PyInterp_Request.cxx b/tools/PyInterp/src/PyInterp_Request.cxx
index baf83e1c6..f8108a41b 100644
--- a/tools/PyInterp/src/PyInterp_Request.cxx
+++ b/tools/PyInterp/src/PyInterp_Request.cxx
@@ -25,7 +25,7 @@
 #include "PyInterp_Request.h"
 #include "PyInterp_Utils.h"
 
-#include <QCoreApplication>
+#include <QtCore/QCoreApplication>
 
 void PyInterp_Request::process()
 {
diff --git a/tools/PyInterp/src/PyInterp_Request.h b/tools/PyInterp/src/PyInterp_Request.h
index 98ab6d4b3..399c19850 100644
--- a/tools/PyInterp/src/PyInterp_Request.h
+++ b/tools/PyInterp/src/PyInterp_Request.h
@@ -28,7 +28,7 @@
 #include "PyInterp.h"
 #include "PyInterp_Event.h"
 
-#include <QMutex>
+#include <QtCore/QMutex>
 
 class QObject;
 class PyInterp_Interp;
diff --git a/tools/RemoteFileBrowser/QMachineBrowser.h b/tools/RemoteFileBrowser/QMachineBrowser.h
index 5b2efe9e0..8de5e143d 100644
--- a/tools/RemoteFileBrowser/QMachineBrowser.h
+++ b/tools/RemoteFileBrowser/QMachineBrowser.h
@@ -23,8 +23,8 @@
 
 #include "RemoteFileBrowser.h"
 
-#include <QWidget>
-#include <QComboBox>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QComboBox>
 
 class QPushButton;
 class QLineEdit;
diff --git a/tools/dlgfactory/GenericDialog.cxx b/tools/dlgfactory/GenericDialog.cxx
index 6b177d929..9f485da29 100644
--- a/tools/dlgfactory/GenericDialog.cxx
+++ b/tools/dlgfactory/GenericDialog.cxx
@@ -18,7 +18,7 @@
 //
 
 #include "GenericDialog.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 
 GenericDialog::GenericDialog(QDialog* parent) : QDialog(parent)
 {
diff --git a/tools/dlgfactory/__QDIALOG__.cxx b/tools/dlgfactory/__QDIALOG__.cxx
index df9145685..fdcc5aa95 100644
--- a/tools/dlgfactory/__QDIALOG__.cxx
+++ b/tools/dlgfactory/__QDIALOG__.cxx
@@ -1,5 +1,5 @@
 #include "__CLASSNAME__.h"
-#include <QDebug>
+#include <QtCore/QDebug>
 
 __CLASSNAME__::__CLASSNAME__(QDialog* parent) : QDialog(parent)
 {