From: adv <adv@opencascade.com>
Date: Thu, 18 Feb 2010 12:01:18 +0000 (+0000)
Subject: Improve build system: install each module's header files to the sub-directory of... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_IMP_INCLUDE;p=modules%2Fsmesh.git

Improve build system: install each module's header files to the sub-directory of ${prefix}/include/salome/${module_name}
---

diff --git a/adm_local/unix/config_files/check_SMESH.m4 b/adm_local/unix/config_files/check_SMESH.m4
index 4c0cdb6e4..a3d866466 100644
--- a/adm_local/unix/config_files/check_SMESH.m4
+++ b/adm_local/unix/config_files/check_SMESH.m4
@@ -73,7 +73,7 @@ if test -f ${SMESH_DIR}/bin/salome/smesh.py ; then
    AC_SUBST(SMESH_ROOT_DIR)
 
    SMESH_LDFLAGS=-L${SMESH_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   SMESH_CXXFLAGS=-I${SMESH_DIR}/include/salome
+   SMESH_CXXFLAGS="-I${SMESH_DIR}/include/salome -I${SMESH_DIR}/include/salome/skel"
 
    AC_SUBST(SMESH_LDFLAGS)
    AC_SUBST(SMESH_CXXFLAGS)   
diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index cd851519b..42063b9dc 100644
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -34,7 +34,8 @@ AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
 # ============================================================
 # Standard directory for installation
 #
-salomeincludedir   = $(includedir)/salome
+salomeincludedir   = $(includedir)/salome/@MODULE_NAME@
+salomeskeldir      = $(includedir)/salome/skel
 libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
 bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)
diff --git a/idl/Makefile.am b/idl/Makefile.am
index 03486bd07..b3eb90b6f 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -54,7 +54,7 @@ nodist_libSalomeIDLSMESH_la_SOURCES = \
 	SMESH_MeshEditorSK.cc
 
 # header files must be exported: other modules have to use this library
-nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
+nodist_salomeskel_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
 libSalomeIDLSMESH_la_CPPFLAGS =			\
 	-I$(top_builddir)/idl			\
diff --git a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
index b44499f9c..33051e479 100644
--- a/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_R_SMDS_Mesh.cxx
@@ -24,9 +24,9 @@
 #include "DriverDAT_R_SMDS_Mesh.h"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 
diff --git a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
index 796cd5b66..c068b6c7c 100644
--- a/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
+++ b/src/DriverDAT/DriverDAT_W_SMDS_Mesh.cxx
@@ -25,9 +25,9 @@
 
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 
diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx
index 31a69cfc1..78766900d 100644
--- a/src/DriverMED/DriverMED_Family.cxx
+++ b/src/DriverMED/DriverMED_Family.cxx
@@ -25,7 +25,7 @@
 //  Module : SMESH
 //
 #include "DriverMED_Family.h"
-#include "MED_Factory.hxx"
+#include <med/MED_Factory.hxx>
 
 #include <sstream>      
 
diff --git a/src/DriverMED/DriverMED_Family.h b/src/DriverMED/DriverMED_Family.h
index f91693a88..9c7ef720f 100644
--- a/src/DriverMED/DriverMED_Family.h
+++ b/src/DriverMED/DriverMED_Family.h
@@ -32,7 +32,7 @@
 #include "SMDS_Mesh.hxx"
 #include "SMESHDS_GroupBase.hxx"
 #include "SMESHDS_SubMesh.hxx"
-#include "MED_Common.hxx"
+#include <med/MED_Common.hxx>
 
 #include <boost/shared_ptr.hpp>
 #include <set>
diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
index af538f52f..a72da2655 100644
--- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
@@ -26,15 +26,15 @@
 #include "DriverMED_R_SMESHDS_Mesh.h"
 #include "DriverMED_R_SMDS_Mesh.h"
 #include "SMESHDS_Mesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "DriverMED_Family.h"
 
 #include "SMESHDS_Group.hxx"
 
-#include "MED_Factory.hxx"
-#include "MED_CoordUtils.hxx"
-#include "MED_Utilities.hxx"
+#include <med/MED_Factory.hxx>
+#include <med/MED_CoordUtils.hxx>
+#include <med/MED_Utilities.hxx>
 
 #include <stdlib.h>
 
diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
index ca0753da7..f32b274cd 100644
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
@@ -34,9 +34,9 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_PolyhedralVolumeOfNodes.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include "MED_Utilities.hxx"
+#include <med/MED_Utilities.hxx>
 
 #define _EDF_NODE_IDS_
 //#define _ELEMENTS_BY_DIM_
diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
index 5b8287ef2..e8fc54713 100644
--- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
+++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
@@ -29,7 +29,7 @@
 #include "SMESH_DriverMED.hxx"
 
 #include "Driver_SMESHDS_Mesh.h"
-#include "MED_Factory.hxx"
+#include <med/MED_Factory.hxx>
 
 #include <string>
 #include <list>
diff --git a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
index bd01c08bf..147462310 100644
--- a/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
+++ b/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cxx
@@ -64,7 +64,7 @@ inline Standard_Boolean IsEqual
 #include <OSD_SingleProtection.hxx>
 #include <Standard_NoMoreObject.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 static const int HEADER_SIZE           =  84;
 static const int SIZEOF_STL_FACET      =  50;
diff --git a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
index ca2387b47..43f0dfd23 100644
--- a/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
+++ b/src/DriverSTL/DriverSTL_W_SMDS_Mesh.cxx
@@ -35,7 +35,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColgp_Array1OfXYZ.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //using namespace std;
 
diff --git a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
index ecea333f8..61e35280f 100644
--- a/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
@@ -23,14 +23,14 @@
 #include "SMDS_Mesh.hxx"
 #include "SMDS_MeshGroup.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "UNV2411_Structure.hxx"
 #include "UNV2412_Structure.hxx"
 #include "UNV2417_Structure.hxx"
 #include "UNV_Utilities.hxx"
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 
diff --git a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
index 99ed2d738..aa9925c04 100644
--- a/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
+++ b/src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
@@ -29,14 +29,14 @@
 #include "SMDS_PolyhedralVolumeOfNodes.hxx"
 #include "SMESHDS_GroupBase.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "UNV2411_Structure.hxx"
 #include "UNV2412_Structure.hxx"
 #include "UNV2417_Structure.hxx"
 #include "UNV_Utilities.hxx"
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 using namespace UNV;
diff --git a/src/MEFISTO2/aptrte.cxx b/src/MEFISTO2/aptrte.cxx
index 04ed46700..ae34f73bf 100755
--- a/src/MEFISTO2/aptrte.cxx
+++ b/src/MEFISTO2/aptrte.cxx
@@ -26,7 +26,7 @@
 
 #include "Rn.h"
 #include "aptrte.h"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/OBJECT/SMESH_Actor.cxx b/src/OBJECT/SMESH_Actor.cxx
index 16d71448f..5077ab26a 100644
--- a/src/OBJECT/SMESH_Actor.cxx
+++ b/src/OBJECT/SMESH_Actor.cxx
@@ -30,12 +30,12 @@
 #include "SMESH_DeviceActor.h"
 #include "SMESH_ObjectDef.h"
 #include "SMESH_ControlsDef.hxx"
-#include "VTKViewer_ExtractUnstructuredGrid.h"
-#include "VTKViewer_FramedTextActor.h"
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/VTKViewer_ExtractUnstructuredGrid.h>
+#include <gui/VTKViewer_FramedTextActor.h>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <vtkProperty.h>
 #include <vtkTimeStamp.h>
@@ -77,7 +77,7 @@
 #define VTK_XVERSION (VTK_MAJOR_VERSION<<16)+(VTK_MINOR_VERSION<<8)+(VTK_BUILD_VERSION)
 #endif
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 1;
diff --git a/src/OBJECT/SMESH_Actor.h b/src/OBJECT/SMESH_Actor.h
index fee096c57..04fca0478 100644
--- a/src/OBJECT/SMESH_Actor.h
+++ b/src/OBJECT/SMESH_Actor.h
@@ -27,7 +27,7 @@
 #ifndef SMESH_ACTOR_H
 #define SMESH_ACTOR_H
 
-#include <SALOME_Actor.h>
+#include <gui/SALOME_Actor.h>
 #include "SMESH_Object.h"
 
 class vtkUnstructuredGrid;
diff --git a/src/OBJECT/SMESH_ActorUtils.cxx b/src/OBJECT/SMESH_ActorUtils.cxx
index 872a30acd..1a0bde4c8 100644
--- a/src/OBJECT/SMESH_ActorUtils.cxx
+++ b/src/OBJECT/SMESH_ActorUtils.cxx
@@ -21,11 +21,11 @@
 //
 #include "SMESH_ActorUtils.h"
 
-#include "SUIT_Tools.h"
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <vtkUnstructuredGrid.h>
 #include <vtkUnstructuredGridWriter.h>
diff --git a/src/OBJECT/SMESH_DeviceActor.cxx b/src/OBJECT/SMESH_DeviceActor.cxx
index f7d455ddb..4cf45e8ea 100644
--- a/src/OBJECT/SMESH_DeviceActor.cxx
+++ b/src/OBJECT/SMESH_DeviceActor.cxx
@@ -30,11 +30,11 @@
 #include "SMESH_ControlsDef.hxx"
 #include "SMESH_ActorUtils.h"
 #include "SMESH_FaceOrientationFilter.h"
-#include "VTKViewer_CellLocationsArray.h"
+#include <gui/VTKViewer_CellLocationsArray.h>
 
-#include <VTKViewer_Transform.h>
-#include <VTKViewer_TransformFilter.h>
-#include <VTKViewer_ExtractUnstructuredGrid.h>
+#include <gui/VTKViewer_Transform.h>
+#include <gui/VTKViewer_TransformFilter.h>
+#include <gui/VTKViewer_ExtractUnstructuredGrid.h>
 
 // VTK Includes
 #include <vtkObjectFactory.h>
@@ -62,7 +62,7 @@
 
 #include <vtkRenderer.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/OBJECT/SMESH_DeviceActor.h b/src/OBJECT/SMESH_DeviceActor.h
index 8b2fd6bf7..bf5d20def 100644
--- a/src/OBJECT/SMESH_DeviceActor.h
+++ b/src/OBJECT/SMESH_DeviceActor.h
@@ -28,7 +28,7 @@
 #ifndef SMESH_DEVICE_ACTOR_H
 #define SMESH_DEVICE_ACTOR_H
 
-#include <VTKViewer_GeometryFilter.h>
+#include <gui/VTKViewer_GeometryFilter.h>
 #include "SMESH_Controls.hxx"
 #include "SMESH_Object.h"
 
diff --git a/src/OBJECT/SMESH_ExtractGeometry.h b/src/OBJECT/SMESH_ExtractGeometry.h
index f1796b098..32cd3bc93 100644
--- a/src/OBJECT/SMESH_ExtractGeometry.h
+++ b/src/OBJECT/SMESH_ExtractGeometry.h
@@ -27,7 +27,7 @@
 #include <vtkExtractGeometry.h>
 #include <vector>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class SMESHOBJECT_EXPORT SMESH_ExtractGeometry : public vtkExtractGeometry{
 public:
diff --git a/src/OBJECT/SMESH_FaceOrientationFilter.cxx b/src/OBJECT/SMESH_FaceOrientationFilter.cxx
index 63b66d5a4..d55d2879c 100644
--- a/src/OBJECT/SMESH_FaceOrientationFilter.cxx
+++ b/src/OBJECT/SMESH_FaceOrientationFilter.cxx
@@ -22,8 +22,8 @@
 #include "SMESH_FaceOrientationFilter.h"
 #include "SMESH_ActorUtils.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <vtkCellData.h>
 #include <vtkDataSet.h>
diff --git a/src/OBJECT/SMESH_Object.cxx b/src/OBJECT/SMESH_Object.cxx
index e7ef139a4..5da045e30 100644
--- a/src/OBJECT/SMESH_Object.cxx
+++ b/src/OBJECT/SMESH_Object.cxx
@@ -31,9 +31,9 @@
 #include "SMDS_PolyhedralVolumeOfNodes.hxx"
 #include "SMESH_Actor.h"
 #include "SMESH_ControlsDef.hxx"
-#include "SalomeApp_Application.h"
-#include "VTKViewer_ExtractUnstructuredGrid.h"
-#include "VTKViewer_CellLocationsArray.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/VTKViewer_ExtractUnstructuredGrid.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 #include CORBA_SERVER_HEADER(SMESH_Gen)
 #include CORBA_SERVER_HEADER(SALOME_Exception)
@@ -50,7 +50,7 @@
 #include <stdexcept>
 #include <set>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/OBJECT/SMESH_PreviewActorsCollection.cxx b/src/OBJECT/SMESH_PreviewActorsCollection.cxx
index e565701da..be7a02fbb 100644
--- a/src/OBJECT/SMESH_PreviewActorsCollection.cxx
+++ b/src/OBJECT/SMESH_PreviewActorsCollection.cxx
@@ -27,9 +27,9 @@
 
 #include "SMESH_PreviewActorsCollection.h"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // OCC includes
 #include <TopoDS.hxx>
@@ -43,10 +43,10 @@
 #include <vtkRenderer.h>
 #include <vtkProperty.h>
 
-#include "VTKViewer_Actor.h"
+#include <gui/VTKViewer_Actor.h>
 
-#include "SVTK_DeviceActor.h"
-#include "SALOME_Actor.h"
+#include <gui/SVTK_DeviceActor.h>
+#include <gui/SALOME_Actor.h>
 
 // QT
 #include <QString>
diff --git a/src/OBJECT/SMESH_PreviewActorsCollection.h b/src/OBJECT/SMESH_PreviewActorsCollection.h
index c5b4c041a..c91c85a73 100644
--- a/src/OBJECT/SMESH_PreviewActorsCollection.h
+++ b/src/OBJECT/SMESH_PreviewActorsCollection.h
@@ -29,10 +29,10 @@
 #define SMESH_PREVIEW_ACTOR_COLLECTION_H
 
 #include "SMESH_Actor.h"
-#include <GEOM_Actor.h>
+#include <geom/GEOM_Actor.h>
 #include "SMESH_Object.h"
 #include <TopoDS_Shape.hxx>
-#include <SMDS_SetIterator.hxx>
+#include "SMDS_SetIterator.hxx"
 #include <TopAbs_ShapeEnum.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <QString>
diff --git a/src/PluginUtils/GeomSelectionTools.cxx b/src/PluginUtils/GeomSelectionTools.cxx
index 74a5f64c2..cd2e75a83 100644
--- a/src/PluginUtils/GeomSelectionTools.cxx
+++ b/src/PluginUtils/GeomSelectionTools.cxx
@@ -25,24 +25,24 @@
 
 #include "GeomSelectionTools.h"
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SUIT_Session.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SUIT_Session.h>
 
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <GEOM_Client.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <geom/GEOM_Client.hxx>
 #include <SMESHGUI_Utils.h>
 #include <boost/shared_ptr.hpp>
-#include <GEOMImpl_Types.hxx>
+#include <geom/GEOMImpl_Types.hxx>
 
 #include <TopoDS.hxx>
 #include <BRep_Tool.hxx>
 #include <Handle_Geom_Surface.hxx>
 #include <BRepAdaptor_Surface.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include "SALOME_LifeCycleCORBA.hxx"
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 #include <sstream>
 
 /*!
diff --git a/src/PluginUtils/GeomSelectionTools.h b/src/PluginUtils/GeomSelectionTools.h
index 2ec4e9f9d..4ecc29ce3 100644
--- a/src/PluginUtils/GeomSelectionTools.h
+++ b/src/PluginUtils/GeomSelectionTools.h
@@ -32,10 +32,10 @@
 #  define GEOMSELECTIONTOOLS_EXPORT
 #endif
 
-#include "SALOMEDSClient.hxx"
-#include "SALOME_InteractiveObject.hxx"
-#include <SALOME_ListIO.hxx>
-#include <SalomeApp_Application.h>
+#include <kernel/SALOMEDSClient.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SalomeApp_Application.h>
 
 #include <TopoDS_Shape.hxx>
 #include <GeomAbs_SurfaceType.hxx>
diff --git a/src/SMDS/SMDS_EdgePosition.cxx b/src/SMDS/SMDS_EdgePosition.cxx
index ae5bf5ccd..1ff5fe425 100644
--- a/src/SMDS/SMDS_EdgePosition.cxx
+++ b/src/SMDS/SMDS_EdgePosition.cxx
@@ -26,7 +26,7 @@
 //
 #include "SMDS_EdgePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMDS/SMDS_FaceOfNodes.cxx b/src/SMDS/SMDS_FaceOfNodes.cxx
index 7fd7f62f9..4a522213a 100644
--- a/src/SMDS/SMDS_FaceOfNodes.cxx
+++ b/src/SMDS/SMDS_FaceOfNodes.cxx
@@ -31,7 +31,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMDS/SMDS_FacePosition.cxx b/src/SMDS/SMDS_FacePosition.cxx
index 6d4d2a223..13bedd259 100644
--- a/src/SMDS/SMDS_FacePosition.cxx
+++ b/src/SMDS/SMDS_FacePosition.cxx
@@ -26,7 +26,7 @@
 //
 #include "SMDS_FacePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMDS/SMDS_Mesh.cxx b/src/SMDS/SMDS_Mesh.cxx
index fb7bd9a94..20e959cba 100644
--- a/src/SMDS/SMDS_Mesh.cxx
+++ b/src/SMDS/SMDS_Mesh.cxx
@@ -25,7 +25,7 @@
 #pragma warning(disable:4786)
 #endif
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "SMDS_Mesh.hxx"
 #include "SMDS_VolumeOfNodes.hxx"
 #include "SMDS_VolumeOfFaces.hxx"
diff --git a/src/SMDS/SMDS_MeshElement.cxx b/src/SMDS/SMDS_MeshElement.cxx
index e2a7f61da..ae99cf295 100644
--- a/src/SMDS/SMDS_MeshElement.cxx
+++ b/src/SMDS/SMDS_MeshElement.cxx
@@ -30,7 +30,7 @@
 #include "SMDS_MeshEdge.hxx"
 #include "SMDS_MeshFace.hxx"
 #include "SMDS_MeshVolume.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMDS/SMDS_MeshGroup.cxx b/src/SMDS/SMDS_MeshGroup.cxx
index c69bb3e42..19fd2df01 100644
--- a/src/SMDS/SMDS_MeshGroup.cxx
+++ b/src/SMDS/SMDS_MeshGroup.cxx
@@ -29,7 +29,7 @@
 #endif
 
 #include "SMDS_MeshGroup.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx b/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx
index d6c8fb5b1..04ab9eed9 100644
--- a/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx
+++ b/src/SMDS/SMDS_PolygonalFaceOfNodes.cxx
@@ -31,7 +31,7 @@
 #include "SMDS_SetIterator.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx
index ce8ace830..804b469d0 100644
--- a/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_PolyhedralVolumeOfNodes.cxx
@@ -29,7 +29,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_SetIterator.hxx"
 #include "SMDS_VolumeTool.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <set>
 
diff --git a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
index 168457cf5..cb0e6408f 100644
--- a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
+++ b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
@@ -31,7 +31,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx b/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx
index 8d68ee4d0..a8b1df107 100644
--- a/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_QuadraticVolumeOfNodes.cxx
@@ -31,7 +31,7 @@
 #include "SMDS_SetIterator.hxx"
 #include "SMDS_VolumeTool.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMDS/SMDS_VertexPosition.cxx b/src/SMDS/SMDS_VertexPosition.cxx
index 3de9ed6ac..55009fe90 100644
--- a/src/SMDS/SMDS_VertexPosition.cxx
+++ b/src/SMDS/SMDS_VertexPosition.cxx
@@ -26,7 +26,7 @@
 //
 #include "SMDS_VertexPosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMDS/SMDS_VolumeOfNodes.cxx b/src/SMDS/SMDS_VolumeOfNodes.cxx
index 73b61ca3f..df8ec1215 100644
--- a/src/SMDS/SMDS_VolumeOfNodes.cxx
+++ b/src/SMDS/SMDS_VolumeOfNodes.cxx
@@ -29,7 +29,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_SetIterator.hxx"
 #include "SMDS_VolumeTool.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <vector>
 
diff --git a/src/SMDS/SMDS_VolumeTool.cxx b/src/SMDS/SMDS_VolumeTool.cxx
index 24509b255..334871cd8 100644
--- a/src/SMDS/SMDS_VolumeTool.cxx
+++ b/src/SMDS/SMDS_VolumeTool.cxx
@@ -34,7 +34,7 @@
 #include "SMDS_PolyhedralVolumeOfNodes.hxx"
 #include "SMDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <map>
 #include <float.h>
diff --git a/src/SMESH/SMESH_2D_Algo.cxx b/src/SMESH/SMESH_2D_Algo.cxx
index 00723cbd7..4064ff87c 100644
--- a/src/SMESH/SMESH_2D_Algo.cxx
+++ b/src/SMESH/SMESH_2D_Algo.cxx
@@ -28,7 +28,7 @@
 #include "SMESH_2D_Algo.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopExp_Explorer.hxx>
 #include <TopExp.hxx>
diff --git a/src/SMESH/SMESH_3D_Algo.cxx b/src/SMESH/SMESH_3D_Algo.cxx
index ee547368f..5eeb84d1e 100644
--- a/src/SMESH/SMESH_3D_Algo.cxx
+++ b/src/SMESH/SMESH_3D_Algo.cxx
@@ -28,7 +28,7 @@
 #include "SMESH_3D_Algo.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESH/SMESH_Algo.cxx b/src/SMESH/SMESH_Algo.cxx
index da8647c40..949986e38 100644
--- a/src/SMESH/SMESH_Algo.cxx
+++ b/src/SMESH/SMESH_Algo.cxx
@@ -58,7 +58,7 @@
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <algorithm>
 
diff --git a/src/SMESH/SMESH_Block.cxx b/src/SMESH/SMESH_Block.cxx
index 14b373536..9d923f19e 100644
--- a/src/SMESH/SMESH_Block.cxx
+++ b/src/SMESH/SMESH_Block.cxx
@@ -55,7 +55,7 @@
 #include "SMDS_MeshNode.hxx"
 #include "SMDS_MeshVolume.hxx"
 #include "SMDS_VolumeTool.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <list>
 
diff --git a/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx b/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx
index 0ac60ca29..3d3f22309 100644
--- a/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx
+++ b/src/SMESH/SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_SMESH.hxx"
 
-#include <SMESH_SequenceOfElemPtr.hxx>
+#include "SMESH_SequenceOfElemPtr.hxx"
 
 #include <NCollection_DefineDataMap.hxx>
 
diff --git a/src/SMESH/SMESH_Gen.cxx b/src/SMESH/SMESH_Gen.cxx
index 08c1dd868..3e782c6a4 100644
--- a/src/SMESH/SMESH_Gen.cxx
+++ b/src/SMESH/SMESH_Gen.cxx
@@ -31,9 +31,9 @@
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <gp_Pnt.hxx>
 #include <BRep_Tool.hxx>
diff --git a/src/SMESH/SMESH_Gen.hxx b/src/SMESH/SMESH_Gen.hxx
index 44c7d5a79..159bbfc10 100644
--- a/src/SMESH/SMESH_Gen.hxx
+++ b/src/SMESH/SMESH_Gen.hxx
@@ -30,7 +30,7 @@
 
 #include "SMESH_SMESH.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include "SMESH_Hypothesis.hxx"
 #include "SMESH_ComputeError.hxx"
diff --git a/src/SMESH/SMESH_Hypothesis.cxx b/src/SMESH/SMESH_Hypothesis.cxx
index c731f60cf..db3f14170 100644
--- a/src/SMESH/SMESH_Hypothesis.cxx
+++ b/src/SMESH/SMESH_Hypothesis.cxx
@@ -27,7 +27,7 @@
 #include "SMESH_Hypothesis.hxx"
 #include "SMESH_Gen.hxx"
 #include "SMESH_subMesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx
index ea3beb9f0..f70e8fd59 100644
--- a/src/SMESH/SMESH_Mesh.cxx
+++ b/src/SMESH/SMESH_Mesh.cxx
@@ -37,7 +37,7 @@
 #include "SMDS_MeshVolume.hxx"
 #include "SMDS_SetIterator.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "DriverMED_W_SMESHDS_Mesh.h"
 #include "DriverDAT_W_SMDS_Mesh.h"
@@ -59,7 +59,7 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopoDS_Iterator.hxx>
 
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 using namespace std;
 
diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx
index b93e8b5e7..923d6ee71 100644
--- a/src/SMESH/SMESH_Mesh.hxx
+++ b/src/SMESH/SMESH_Mesh.hxx
@@ -35,7 +35,7 @@
 #include "SMESHDS_Command.hxx"
 #include "SMDSAbs_ElementType.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Shape.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
diff --git a/src/SMESH/SMESH_MeshEditor.cxx b/src/SMESH/SMESH_MeshEditor.cxx
index 9822c70ea..2ef27dab0 100644
--- a/src/SMESH/SMESH_MeshEditor.cxx
+++ b/src/SMESH/SMESH_MeshEditor.cxx
@@ -44,7 +44,7 @@
 #include "SMESH_OctreeNode.hxx"
 #include "SMESH_Group.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Surface.hxx>
 #include <BRepClass3d_SolidClassifier.hxx>
diff --git a/src/SMESH/SMESH_MeshEditor.hxx b/src/SMESH/SMESH_MeshEditor.hxx
index 3c197b2ac..7f5419183 100644
--- a/src/SMESH/SMESH_MeshEditor.hxx
+++ b/src/SMESH/SMESH_MeshEditor.hxx
@@ -36,7 +36,7 @@
 #include "SMESH_SequenceOfElemPtr.hxx"
 #include "SMESH_SequenceOfNode.hxx"
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <TColStd_HSequenceOfReal.hxx>
 #include <gp_Dir.hxx>
diff --git a/src/SMESH/SMESH_MesherHelper.cxx b/src/SMESH/SMESH_MesherHelper.cxx
index 47c21bcb0..8e616240a 100644
--- a/src/SMESH/SMESH_MesherHelper.cxx
+++ b/src/SMESH/SMESH_MesherHelper.cxx
@@ -53,7 +53,7 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <limits>
 
diff --git a/src/SMESH/SMESH_MesherHelper.hxx b/src/SMESH/SMESH_MesherHelper.hxx
index d6b310d65..8844b5cee 100644
--- a/src/SMESH/SMESH_MesherHelper.hxx
+++ b/src/SMESH/SMESH_MesherHelper.hxx
@@ -29,8 +29,8 @@
 #include "SMESH_SMESH.hxx"
 
 #include "SMESH_MeshEditor.hxx" // needed for many meshers
-#include <SMDS_MeshNode.hxx>
-#include <SMDS_QuadraticEdge.hxx>
+#include "SMDS_MeshNode.hxx"
+#include "SMDS_QuadraticEdge.hxx"
 
 #include <Geom_Surface.hxx>
 #include <TopoDS_Face.hxx>
diff --git a/src/SMESH/SMESH_Pattern.cxx b/src/SMESH/SMESH_Pattern.cxx
index 834003e8c..0b77ae57c 100644
--- a/src/SMESH/SMESH_Pattern.cxx
+++ b/src/SMESH/SMESH_Pattern.cxx
@@ -72,7 +72,7 @@
 #include "SMESH_MesherHelper.hxx"
 #include "SMESH_subMesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESH/SMESH_SequenceOfElemPtr.hxx b/src/SMESH/SMESH_SequenceOfElemPtr.hxx
index 77c92ad5a..ba9c01137 100644
--- a/src/SMESH/SMESH_SequenceOfElemPtr.hxx
+++ b/src/SMESH/SMESH_SequenceOfElemPtr.hxx
@@ -30,7 +30,7 @@
 
 #include <NCollection_DefineSequence.hxx>
 
-#include <SMDS_MeshElement.hxx>
+#include "SMDS_MeshElement.hxx"
 
 typedef const SMDS_MeshElement* SMDS_MeshElementPtr;
 
diff --git a/src/SMESH/SMESH_subMesh.cxx b/src/SMESH/SMESH_subMesh.cxx
index d93b598a5..548eb89b5 100644
--- a/src/SMESH/SMESH_subMesh.cxx
+++ b/src/SMESH/SMESH_subMesh.cxx
@@ -37,8 +37,8 @@
 #include "SMDS_SetIterator.hxx"
 #include "SMDSAbs_ElementType.hxx"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
 
 #include <BRep_Builder.hxx>
 #include <BRep_Tool.hxx>
diff --git a/src/SMESH/SMESH_subMesh.hxx b/src/SMESH/SMESH_subMesh.hxx
index 4dbf1795a..a1b00dc51 100644
--- a/src/SMESH/SMESH_subMesh.hxx
+++ b/src/SMESH/SMESH_subMesh.hxx
@@ -35,7 +35,7 @@
 #include "SMESH_ComputeError.hxx"
 #include "SMESH_Algo.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Shape.hxx>
 
diff --git a/src/SMESHClient/SMESH_Client.cxx b/src/SMESHClient/SMESH_Client.cxx
index a1374e47f..41126d1ef 100644
--- a/src/SMESHClient/SMESH_Client.cxx
+++ b/src/SMESHClient/SMESH_Client.cxx
@@ -27,15 +27,15 @@
 #include "SMESH_Client.hxx"
 #include "SMESH_Mesh.hxx"
 
-#include "SALOME_NamingService.hxx"
-#include "SALOME_LifeCycleCORBA.hxx"
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Component)
 #include CORBA_SERVER_HEADER(SALOME_Exception)
 
-#include "Basics_Utils.hxx"
-#include "utilities.h"
+#include <kernel/Basics_Utils.hxx>
+#include <kernel/utilities.h>
 
 #ifdef WNT
 #include <process.h>
diff --git a/src/SMESHDS/SMESHDS_Command.cxx b/src/SMESHDS/SMESHDS_Command.cxx
index dd5c751bd..afc9f5cda 100644
--- a/src/SMESHDS/SMESHDS_Command.cxx
+++ b/src/SMESHDS/SMESHDS_Command.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESHDS_Command.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESHDS/SMESHDS_Document.cxx b/src/SMESHDS/SMESHDS_Document.cxx
index 838e7a487..36a936492 100644
--- a/src/SMESHDS/SMESHDS_Document.cxx
+++ b/src/SMESHDS/SMESHDS_Document.cxx
@@ -26,7 +26,7 @@
 //  $Header: 
 //
 #include "SMESHDS_Document.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESHDS/SMESHDS_GroupBase.cxx b/src/SMESHDS/SMESHDS_GroupBase.cxx
index b14afd408..213b2f5d4 100644
--- a/src/SMESHDS/SMESHDS_GroupBase.cxx
+++ b/src/SMESHDS/SMESHDS_GroupBase.cxx
@@ -27,7 +27,7 @@
 #include "SMESHDS_GroupBase.hxx"
 #include "SMESHDS_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
index 5fae9fda2..122c80b8e 100644
--- a/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
+++ b/src/SMESHDS/SMESHDS_GroupOnGeom.cxx
@@ -25,7 +25,7 @@
 //
 #include "SMESHDS_GroupOnGeom.hxx"
 #include "SMESHDS_Mesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESHDS/SMESHDS_Mesh.cxx b/src/SMESHDS/SMESHDS_Mesh.cxx
index c4479f35b..8e0ca34e2 100644
--- a/src/SMESHDS/SMESHDS_Mesh.cxx
+++ b/src/SMESHDS/SMESHDS_Mesh.cxx
@@ -40,7 +40,7 @@
 #include <TopExp_Explorer.hxx>
 #include <TopoDS_Iterator.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESHDS/SMESHDS_SubMesh.cxx b/src/SMESHDS/SMESHDS_SubMesh.cxx
index 2f1f0ca8f..eb5199d66 100644
--- a/src/SMESHDS/SMESHDS_SubMesh.cxx
+++ b/src/SMESHDS/SMESHDS_SubMesh.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESHDS_SubMesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "SMDS_SetIterator.hxx"
 
 using namespace std;
diff --git a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
index 928313f80..a296019ae 100644
--- a/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
+++ b/src/SMESHFiltersSelection/SMESH_LogicalFilter.hxx
@@ -27,7 +27,7 @@
 
 #include "SMESH_Type.h"
 
-#include <SUIT_SelectionFilter.h>
+#include <gui/SUIT_SelectionFilter.h>
 
 #include <QList>
 
diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
index d8633f307..6190a5d7d 100644
--- a/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.cxx
@@ -24,18 +24,18 @@
 //
 #include "SMESH_NumberFilter.hxx"
 
-#include "GEOM_Client.hxx"
-#include "GeometryGUI.h"
+#include <geom/GEOM_Client.hxx>
+#include <geom/GeometryGUI.h>
 
-#include "SUIT_Application.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Session.h>
 
-#include "SalomeApp_Study.h"
-#include "LightApp_DataOwner.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_DataOwner.h>
 
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOMEDSClient_SObject.hxx"
-#include "SALOMEDS_SObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 #include <TopExp_Explorer.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
diff --git a/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx b/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx
index 45724cfa1..72f5c9b50 100644
--- a/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx
+++ b/src/SMESHFiltersSelection/SMESH_NumberFilter.hxx
@@ -27,7 +27,7 @@
 
 #include "SMESH_Type.h"
 
-#include "SUIT_SelectionFilter.h"
+#include <gui/SUIT_SelectionFilter.h>
 
 #include <TopAbs_ShapeEnum.hxx>
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
index 6cf6fac59..f5ea6fa06 100644
--- a/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
+++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.cxx
@@ -21,10 +21,10 @@
 //
 #include "SMESH_TypeFilter.hxx"
 
-#include <SUIT_Session.h>
+#include <gui/SUIT_Session.h>
 
-#include <SalomeApp_Study.h>
-#include <LightApp_DataOwner.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_DataOwner.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SMESH_Gen)
diff --git a/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx b/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
index d966bfaa5..00479dace 100644
--- a/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
+++ b/src/SMESHFiltersSelection/SMESH_TypeFilter.hxx
@@ -26,7 +26,7 @@
 #define _SMESH_TypeFilter_HeaderFile
 
 #include "SMESH_Type.h"
-#include "SUIT_SelectionFilter.h"
+#include <gui/SUIT_SelectionFilter.h>
 
 class SUIT_DataOwner;
 
diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index a57406e8c..152f9a7cd 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -85,35 +85,35 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_CheckFileDlg.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_CheckFileDlg.h>
 
-#include <LightApp_DataOwner.h>
-#include <LightApp_Preferences.h>
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_UpdateFlags.h>
-#include <LightApp_NameDlg.h>
+#include <gui/LightApp_DataOwner.h>
+#include <gui/LightApp_Preferences.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/LightApp_NameDlg.h>
 
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewManager.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewManager.h>
 
-#include <VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_Algorithm.h>
 
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_FileDlg.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Session.h>
 
-#include <QtxPopupMgr.h>
-#include <QtxFontEdit.h>
+#include <gui/QtxPopupMgr.h>
+#include <gui/QtxFontEdit.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>
@@ -134,11 +134,11 @@
 #include <vtkPlane.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_Study.hxx>
-#include <SALOMEDSClient_StudyBuilder.hxx>
-#include <SALOMEDSClient_SComponent.hxx>
-#include <SALOMEDSClient_ClientFactory.hxx>
-#include <SALOMEDSClient_IParameters.hxx>
+#include <kernel/SALOMEDS_Study.hxx>
+#include <kernel/SALOMEDSClient_StudyBuilder.hxx>
+#include <kernel/SALOMEDSClient_SComponent.hxx>
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/SALOMEDSClient_IParameters.hxx>
 
 // OCCT includes
 #include <Standard_ErrorHandler.hxx>
diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h
index 66ac986ec..cb28128e8 100644
--- a/src/SMESHGUI/SMESHGUI.h
+++ b/src/SMESHGUI/SMESHGUI.h
@@ -30,8 +30,8 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SalomeApp_Module.h>
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SalomeApp_Module.h>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
index 9814a97f4..5ea0bbb5f 100644
--- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.cxx
@@ -39,16 +39,16 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI inclues
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ViewManager.h>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
-#include <SalomeApp_Application.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // IDL incldues
 #include CORBA_SERVER_HEADER(SMESH_MeshEditor)
diff --git a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
index ae0c44e0f..b2873dc81 100644
--- a/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
+++ b/src/SMESHGUI/SMESHGUI_AddMeshElementDlg.h
@@ -29,7 +29,7 @@
 // SMESH includes
 #include "SMESH_SMESHGUI.hxx"
 
-#include <SMDSAbs_ElementType.hxx>
+#include "SMDSAbs_ElementType.hxx"
 
 // Qt includes
 #include <QDialog>
diff --git a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
index 23b49bc12..113b27f70 100644
--- a/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_AddQuadraticElementDlg.cxx
@@ -39,20 +39,20 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewManager.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewManager.h>
 
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
-#include <SalomeApp_Application.h>
+#include <gui/SalomeApp_Application.h>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
index 1e58867d0..1006abd13 100644
--- a/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_BuildCompoundDlg.cxx
@@ -34,16 +34,16 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Study.h>
-#include <SUIT_OverrideCursor.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SUIT_OverrideCursor.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // Qt includes
 #include <QApplication>
diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
index be11acf6c..bdf6170e0 100644
--- a/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx
@@ -35,18 +35,18 @@
 #include <SMESH_ActorUtils.h>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // Qt includes
 #include <QLabel>
diff --git a/src/SMESHGUI/SMESHGUI_ClippingDlg.h b/src/SMESHGUI/SMESHGUI_ClippingDlg.h
index ed92330f2..c57d7b263 100644
--- a/src/SMESHGUI/SMESHGUI_ClippingDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ClippingDlg.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME includes
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // Qt includes
 #include <QDialog>
diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
index 004b18496..8a32acea3 100644
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
@@ -41,25 +41,25 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
-#include <GEOM_Actor.h>
+#include <geom/GEOMBase.h>
+#include <geom/GEOM_Actor.h>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_UpdateFlags.h>
-#include <SALOME_ListIO.hxx>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
-#include <SalomeApp_Application.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <QtxComboBox.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/QtxComboBox.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <BRep_Tool.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.h b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
index ab64b33e3..7e0aa8fe1 100644
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
@@ -32,7 +32,7 @@
 #include "SMESHGUI_Operation.h"
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // Qt includes
 #include <QMap>
diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
index 15a6d8ff8..91e42bcf8 100644
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.cxx
@@ -32,10 +32,10 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <LightApp_UpdateFlags.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-#include <SalomeApp_Tools.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SalomeApp_Tools.h>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
index 5ee6ade48..6ad736361 100755
--- a/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_CreatePatternDlg.cxx
@@ -35,22 +35,22 @@
 #include <SMESH_NumberFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_FileDlg.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
index b97b4d7f2..3e2da11fe 100644
--- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx
@@ -38,17 +38,17 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // OCCT includes
 #include <TColStd_ListOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
index 1922e70de..a7d2989d8 100644
--- a/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_DeleteGroupDlg.cxx
@@ -32,20 +32,20 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SalomeApp_Study.h>
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SVTK_Selection.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_Selection.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // Qt includes
 #include <QHBoxLayout>
diff --git a/src/SMESHGUI/SMESHGUI_Dialog.cxx b/src/SMESHGUI/SMESHGUI_Dialog.cxx
index 754221521..089f10d94 100644
--- a/src/SMESHGUI/SMESHGUI_Dialog.cxx
+++ b/src/SMESHGUI/SMESHGUI_Dialog.cxx
@@ -29,9 +29,9 @@
 #include <SMESH_Type.h>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
 
 // Qt includes
 #include <QFrame>
diff --git a/src/SMESHGUI/SMESHGUI_Dialog.h b/src/SMESHGUI/SMESHGUI_Dialog.h
index eb60f800b..21f71bb64 100644
--- a/src/SMESHGUI/SMESHGUI_Dialog.h
+++ b/src/SMESHGUI/SMESHGUI_Dialog.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <LightApp_Dialog.h>
+#include <gui/LightApp_Dialog.h>
 
 class SUIT_Desktop;
 class SUIT_ResourceMgr;
diff --git a/src/SMESHGUI/SMESHGUI_Displayer.cxx b/src/SMESHGUI/SMESHGUI_Displayer.cxx
index 0b41a00d0..16b2d2361 100644
--- a/src/SMESHGUI/SMESHGUI_Displayer.cxx
+++ b/src/SMESHGUI/SMESHGUI_Displayer.cxx
@@ -29,11 +29,11 @@
 #include "SMESHGUI_VTKUtils.h"
 
 // SALOME GUI includes
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Application.h>
-#include <SUIT_ViewManager.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
 SMESHGUI_Displayer::SMESHGUI_Displayer( SalomeApp_Application* app )
 : LightApp_Displayer(),
diff --git a/src/SMESHGUI/SMESHGUI_Displayer.h b/src/SMESHGUI/SMESHGUI_Displayer.h
index 61288ee13..837d3fe0b 100644
--- a/src/SMESHGUI/SMESHGUI_Displayer.h
+++ b/src/SMESHGUI/SMESHGUI_Displayer.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <LightApp_Displayer.h>
+#include <gui/LightApp_Displayer.h>
 
 class SalomeApp_Application;
 class SalomeApp_Study;
diff --git a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
index ac4ce0550..f78c1b310 100644
--- a/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx
@@ -38,18 +38,18 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
index 2131b25e6..c75b00b33 100644
--- a/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionAlongPathDlg.cxx
@@ -42,19 +42,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
+#include <geom/GEOMBase.h>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // OCCT includes
 #include <BRep_Tool.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
index 7c32fc1e2..f25be1957 100644
--- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.cxx
@@ -41,19 +41,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <SalomeApp_IntSpinBox.h>
+#include <gui/SalomeApp_IntSpinBox.h>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
index 4425d29f7..b97316e01 100644
--- a/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ExtrusionDlg.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // Qt includes
 #include <QDialog>
diff --git a/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx b/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
index b6f6f0e48..18c6dada5 100644
--- a/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FileInfoDlg.cxx
@@ -25,7 +25,7 @@
 //
 #include "SMESHGUI_FileInfoDlg.h"
 
-#include <MED_Common.hxx>
+#include <med/MED_Common.hxx>
 
 #include <QGridLayout>
 #include <QLabel>
diff --git a/src/SMESHGUI/SMESHGUI_FileInfoDlg.h b/src/SMESHGUI/SMESHGUI_FileInfoDlg.h
index 0303acb61..f47e6e4d4 100644
--- a/src/SMESHGUI/SMESHGUI_FileInfoDlg.h
+++ b/src/SMESHGUI/SMESHGUI_FileInfoDlg.h
@@ -26,7 +26,7 @@
 #ifndef SMESHGUI_FILEINFODLG_H
 #define SMESHGUI_FILEINFODLG_H
 
-#include <QtxDialog.h>
+#include <gui/QtxDialog.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(MED)
diff --git a/src/SMESHGUI/SMESHGUI_FileValidator.cxx b/src/SMESHGUI/SMESHGUI_FileValidator.cxx
index f2aa3161b..36f771030 100755
--- a/src/SMESHGUI/SMESHGUI_FileValidator.cxx
+++ b/src/SMESHGUI/SMESHGUI_FileValidator.cxx
@@ -27,8 +27,8 @@
 #include "SMESHGUI_FileValidator.h"
 
 // SALOME GUI includes
-#include <SUIT_MessageBox.h>
-#include <SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Tools.h>
 
 // Qt includes
 #include <QFileInfo>
diff --git a/src/SMESHGUI/SMESHGUI_FileValidator.h b/src/SMESHGUI/SMESHGUI_FileValidator.h
index ae426677f..395405db6 100755
--- a/src/SMESHGUI/SMESHGUI_FileValidator.h
+++ b/src/SMESHGUI/SMESHGUI_FileValidator.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SUIT_FileValidator.h>
+#include <gui/SUIT_FileValidator.h>
 
 class SMESHGUI_EXPORT SMESHGUI_FileValidator : public SUIT_FileValidator
 {
diff --git a/src/SMESHGUI/SMESHGUI_Filter.h b/src/SMESHGUI/SMESHGUI_Filter.h
index 6da648be9..91ee1b762 100755
--- a/src/SMESHGUI/SMESHGUI_Filter.h
+++ b/src/SMESHGUI/SMESHGUI_Filter.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <VTKViewer_Filter.h>
+#include <gui/VTKViewer_Filter.h>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
index 4cc5d3fdc..5834d3909 100755
--- a/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FilterDlg.cxx
@@ -38,30 +38,30 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
-#include <GEOM_FaceFilter.h>
-#include <GEOM_TypeFilter.h>
+#include <geom/GEOMBase.h>
+#include <geom/GEOM_FaceFilter.h>
+#include <geom/GEOM_TypeFilter.h>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <QtxColorButton.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/QtxColorButton.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Study.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // OCCT includes
 #include <StdSelect_TypeOfFace.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_FilterDlg.h b/src/SMESHGUI/SMESHGUI_FilterDlg.h
index e38b5b6cd..ab3296267 100755
--- a/src/SMESHGUI/SMESHGUI_FilterDlg.h
+++ b/src/SMESHGUI/SMESHGUI_FilterDlg.h
@@ -36,8 +36,8 @@
 #include <QList>
 
 // SALOME GUI includes
-#include <SALOME_DataMapOfIOMapOfInteger.hxx>
-#include <SVTK_Selection.h>
+#include <gui/SALOME_DataMapOfIOMapOfInteger.hxx>
+#include <gui/SVTK_Selection.h>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
index 9eb27ab6b..d042c4a99 100644
--- a/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FilterLibraryDlg.cxx
@@ -31,13 +31,13 @@
 #include "SMESHGUI_FilterDlg.h"
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_FileDlg.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <LightApp_Application.h>
+#include <gui/LightApp_Application.h>
 
 // Qt includes
 #include <QApplication>
diff --git a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
index 03cca227b..1b0f4a963 100644
--- a/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_FindElemByPointDlg.cxx
@@ -36,17 +36,17 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <QtxComboBox.h>
-#include <SALOME_ListIO.hxx>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_ResourceMgr.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_TypeFilter.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/QtxComboBox.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_TypeFilter.h>
 
 // Qt includes
 #include <QAbstractButton>
diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
index d3544b4d2..7bc44acb3 100644
--- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.cxx
@@ -28,10 +28,10 @@
 #include "SMESHGUI_Utils.h"
 
 // SALOME GEOM includes
-#include <GeometryGUI.h>
+#include <geom/GeometryGUI.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
index 8461a6432..a5c306595 100644
--- a/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
+++ b/src/SMESHGUI/SMESHGUI_GEOMGenUtils.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
index 9fc6d36fe..fa3759ac2 100644
--- a/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupDlg.cxx
@@ -40,31 +40,31 @@
 #include <SMESH_ActorUtils.h>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
-#include <GEOM_SelectionFilter.h>
+#include <geom/GEOMBase.h>
+#include <geom/GEOM_SelectionFilter.h>
 
 // SALOME GUI includes
-#include <QtxColorButton.h>
+#include <gui/QtxColorButton.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_Algorithm.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // VTK Includes
 #include <vtkRenderer.h>
diff --git a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
index 1b4fb4adb..de04ff6d9 100644
--- a/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOnShapeDlg.cxx
@@ -32,13 +32,13 @@
 #include "SMESHGUI_Utils.h"
 #include "SMESHGUI_GEOMGenUtils.h"
 
-#include <GeometryGUI.h>
-#include <GEOM_SelectionFilter.h>
+#include <geom/GeometryGUI.h>
+#include <geom/GEOM_SelectionFilter.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <LightApp_UpdateFlags.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
diff --git a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
index 13f5f4a93..39155e207 100644
--- a/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupOpDlg.cxx
@@ -33,16 +33,16 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SVTK_Selection.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SVTK_Selection.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // Qt includes
 #include <QHBoxLayout>
@@ -55,9 +55,9 @@
 #include <QKeyEvent>
 #include <QListWidget>
 #include <QButtonGroup>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 #include <QComboBox>
-#include <QtxColorButton.h>
+#include <gui/QtxColorButton.h>
 
 #define SPACING 6
 #define MARGIN  11
diff --git a/src/SMESHGUI/SMESHGUI_GroupUtils.cxx b/src/SMESHGUI/SMESHGUI_GroupUtils.cxx
index 6b4079b19..45f90e00f 100644
--- a/src/SMESHGUI/SMESHGUI_GroupUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_GroupUtils.cxx
@@ -30,7 +30,7 @@
 #include "SMESHGUI_Utils.h"
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
+#include <gui/SalomeApp_Tools.h>
 
 namespace SMESH
 {
diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
index b0ced7bb6..fed252cb7 100644
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.cxx
@@ -32,15 +32,15 @@
 #include "SMESHGUI_SpinBox.h"
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
-#include <utilities.h>
+#include <kernel/SALOMEDSClient_Study.hxx>
+#include <kernel/utilities.h>
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <LightApp_Application.h>
-#include <SalomeApp_IntSpinBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_IntSpinBox.h>
 
 // Qt includes
 #include <QFrame>
diff --git a/src/SMESHGUI/SMESHGUI_Hypotheses.h b/src/SMESHGUI/SMESHGUI_Hypotheses.h
index 0891def1b..655dca15f 100644
--- a/src/SMESHGUI/SMESHGUI_Hypotheses.h
+++ b/src/SMESHGUI/SMESHGUI_Hypotheses.h
@@ -31,7 +31,7 @@
 #include "SMESHGUI_HypothesesUtils.h"
 
 // Qt includes
-#include <QtxDialog.h>
+#include <gui/QtxDialog.h>
 #include <QVariant>
 
 // IDL includes
diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
index 65a599579..e3113550a 100644
--- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
@@ -33,16 +33,16 @@
 #include "SMESHGUI_GEOMGenUtils.h"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Tools.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Tools.h>
 
 // SALOME KERNEL includes
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 // STL includes
 #include <string>
diff --git a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
index 56a80e434..2ebc1ca19 100644
--- a/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
+++ b/src/SMESHGUI/SMESHGUI_HypothesesUtils.h
@@ -34,10 +34,10 @@
 #include <QStringList>
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
index 5c6f73c33..236b2b374 100644
--- a/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_Make2DFrom3DOp.cxx
@@ -32,18 +32,18 @@
 #include "SMESHGUI_MeshInfosBox.h"
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // Qt includes
 // IDL includes
diff --git a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
index ae769c301..9b72e3a8a 100644
--- a/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MakeNodeAtPointDlg.cxx
@@ -39,18 +39,18 @@
 #include <SMESH_LogicalFilter.hxx>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
+#include <geom/GEOMBase.h>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
-#include <SUIT_Desktop.h>
-#include <SVTK_ViewModel.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_TypeFilter.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_TypeFilter.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
index a3446f299..2f5725eb8 100644
--- a/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshDlg.cxx
@@ -27,8 +27,8 @@
 #include "SMESHGUI_MeshDlg.h"
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 // Qt includes
 #include <QVBoxLayout>
diff --git a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
index 8bed7191f..344de01e5 100644
--- a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
@@ -32,8 +32,8 @@
 #include <SMESH_ActorUtils.h>
 
 // SALOME GUI includes
-#include <VTKViewer_CellLocationsArray.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // VTK includes
 #include <vtkPoints.h>
diff --git a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx
index fd6d42e52..362dbdf6f 100644
--- a/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshInfosDlg.cxx
@@ -31,18 +31,18 @@
 #include "SMESHGUI_MeshInfosBox.h"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_Application.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // Qt includes
 #include <QGroupBox>
diff --git a/src/SMESHGUI/SMESHGUI_MeshOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
index eaa3098aa..421bf3994 100644
--- a/src/SMESHGUI/SMESHGUI_MeshOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOp.cxx
@@ -38,23 +38,23 @@
 #include <SMESH_NumberFilter.hxx>
 
 // SALOME GEOM includes
-#include <GEOM_SelectionFilter.h>
-#include <GEOMBase.h>
-#include <GeometryGUI.h>
+#include <geom/GEOM_SelectionFilter.h>
+#include <geom/GEOMBase.h>
+#include <geom/GeometryGUI.h>
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_UpdateFlags.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-#include <SALOME_InteractiveObject.hxx>
-#include <SALOME_ListIO.hxx>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_UpdateFlags.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SComponent.hxx>
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SComponent.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 // Qt includes
 #include <QStringList>
diff --git a/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx b/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
index f0de18e7a..cec065d0d 100644
--- a/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshOrderOp.cxx
@@ -30,16 +30,16 @@
 #include "SMESHGUI_MeshUtils.h"
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // STL includes
 #include <set>
diff --git a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
index d80523066..fa234a178 100755
--- a/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx
@@ -42,25 +42,25 @@
 #include <SMDS_MeshElement.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_FileDlg.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
-#include <LightApp_Application.h>
-#include <SalomeApp_IntSpinBox.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_IntSpinBox.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // SALOME KERNEL includes 
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
index df71815c2..fce2bdb87 100644
--- a/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshUtils.cxx
@@ -29,7 +29,7 @@
 #include "SMESHGUI_Utils.h"
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // Qt includes
 #include <QStringList>
diff --git a/src/SMESHGUI/SMESHGUI_MeshUtils.h b/src/SMESHGUI/SMESHGUI_MeshUtils.h
index 0544d4306..7311c3b34 100644
--- a/src/SMESHGUI/SMESHGUI_MeshUtils.h
+++ b/src/SMESHGUI/SMESHGUI_MeshUtils.h
@@ -33,7 +33,7 @@
 #include <QString>
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
index 6243255af..16619d660 100644
--- a/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx
@@ -37,18 +37,18 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_Application.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
-
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
+
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
index 907f8a65b..b4287e187 100755
--- a/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx
@@ -39,19 +39,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_Application.h>
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
-
-#include <SVTK_Selector.h>
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // OCCT includes
 #include <TColStd_IndexedMapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
index ebc42b198..4b256252c 100644
--- a/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_NodesDlg.cxx
@@ -41,24 +41,24 @@
 #include <SMDS_MeshNode.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_Algorithm.h>
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_Study.hxx>
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_Study.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 // VTK includes
 #include <vtkIdList.h>
diff --git a/src/SMESHGUI/SMESHGUI_Operation.cxx b/src/SMESHGUI/SMESHGUI_Operation.cxx
index 863d4333a..7f789ef58 100755
--- a/src/SMESHGUI/SMESHGUI_Operation.cxx
+++ b/src/SMESHGUI/SMESHGUI_Operation.cxx
@@ -30,13 +30,13 @@
 #include "SMESHGUI_Dialog.h"
 
 // SALOME GUI includes
-#include <SalomeApp_Study.h>
-#include <LightApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_Application.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 // Qt includes
 #include <QStringList>
diff --git a/src/SMESHGUI/SMESHGUI_Operation.h b/src/SMESHGUI/SMESHGUI_Operation.h
index b3b119e71..bbf2c4434 100755
--- a/src/SMESHGUI/SMESHGUI_Operation.h
+++ b/src/SMESHGUI/SMESHGUI_Operation.h
@@ -30,10 +30,10 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <LightApp_Operation.h>
+#include <gui/LightApp_Operation.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient.hxx>
+#include <kernel/SALOMEDSClient.hxx>
 
 class SMESHGUI;
 
diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
index 7e0981d63..405e00eda 100644
--- a/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_Preferences_ColorDlg.cxx
@@ -30,10 +30,10 @@
 #include "SMESHGUI_Utils.h"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <QtxColorButton.h>
-#include <QtxDoubleSpinBox.h>
-#include <QtxIntSpinBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
 
 // Qt includes
 #include <QGroupBox>
diff --git a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
index 175677f53..ebaa65212 100644
--- a/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_Preferences_ScalarBarDlg.cxx
@@ -33,17 +33,17 @@
 #include <SMESH_Actor.h>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
 
-#include <QtxDoubleSpinBox.h>
-#include <QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxColorButton.h>
 
 // Qt includes
 #include <QButtonGroup>
diff --git a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
index 9af8862ef..9924ee12f 100644
--- a/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
@@ -37,19 +37,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
-
-#include <SVTK_Selector.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
index e6687ff29..8442a816e 100644
--- a/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RemoveNodesDlg.cxx
@@ -37,19 +37,19 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
-
-#include <SVTK_Selector.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
index 5e575a670..09cc9875a 100644
--- a/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RenumberingDlg.cxx
@@ -34,16 +34,16 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // Qt includes
 #include <QApplication>
diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
index 484989dfd..ed899a2e9 100644
--- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.cxx
@@ -41,21 +41,21 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_OverrideCursor.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_IntSpinBox.h>
-
-#include <SVTK_ViewWindow.h>
-#include <SVTK_Selector.h>
-#include <SALOME_ListIO.hxx>
-#include <VTKViewer_CellLocationsArray.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_OverrideCursor.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_IntSpinBox.h>
+
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/VTKViewer_CellLocationsArray.h>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
index 4d0c51693..7746f00e3 100644
--- a/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
+++ b/src/SMESHGUI/SMESHGUI_RevolutionDlg.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // Qt includes
 #include <QDialog>
diff --git a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
index d9352dbc8..8c0e9b6e7 100644
--- a/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_RotationDlg.cxx
@@ -40,21 +40,21 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_Selection.cxx b/src/SMESHGUI/SMESHGUI_Selection.cxx
index 4afc541ee..c4db929fa 100644
--- a/src/SMESHGUI/SMESHGUI_Selection.cxx
+++ b/src/SMESHGUI/SMESHGUI_Selection.cxx
@@ -35,9 +35,9 @@
 #include <SMESH_Actor.h>
 
 // SALOME GUI includes
-#include <SalomeApp_Study.h>
-#include <LightApp_VTKSelector.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_VTKSelector.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_Selection.h b/src/SMESHGUI/SMESHGUI_Selection.h
index 11fdbad71..b9539859a 100644
--- a/src/SMESHGUI/SMESHGUI_Selection.h
+++ b/src/SMESHGUI/SMESHGUI_Selection.h
@@ -30,10 +30,10 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <LightApp_Selection.h>
+#include <gui/LightApp_Selection.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 class LightApp_SelectionMgr;
 class LightApp_DataOwner;
diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
index 30ca05205..b3b46112a 100644
--- a/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
+++ b/src/SMESHGUI/SMESHGUI_SelectionOp.cxx
@@ -35,17 +35,17 @@
 #include <SMDS_MeshNode.hxx>
 
 // SALOME GUI includes
-#include <SUIT_SelectionFilter.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Study.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
+#include <gui/SUIT_SelectionFilter.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 // SALOME KERNEL includes 
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 /*
   Class       : SMESHGUI_SelectionOp
diff --git a/src/SMESHGUI/SMESHGUI_SelectionOp.h b/src/SMESHGUI/SMESHGUI_SelectionOp.h
index 083df7390..a713754c4 100644
--- a/src/SMESHGUI/SMESHGUI_SelectionOp.h
+++ b/src/SMESHGUI/SMESHGUI_SelectionOp.h
@@ -32,8 +32,8 @@
 #include "SMESHGUI_Dialog.h"
 
 // SALOME GUI includes
-#include <SVTK_Selection.h>
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SVTK_Selection.h>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
index 2a94befb8..37938839c 100644
--- a/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SewingDlg.cxx
@@ -36,18 +36,18 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
index aeae0ef73..e93a1ee33 100644
--- a/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_ShapeByMeshDlg.cxx
@@ -37,21 +37,21 @@
 #include <SMESH_Actor.h>
 
 // SALOME GEOM includes
-#include <GEOMBase.h>
-#include <GeometryGUI.h>
+#include <geom/GEOMBase.h>
+#include <geom/GeometryGUI.h>
 
 // SALOME GUI includes
-#include <LightApp_DataOwner.h>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIO.hxx>
-#include <SUIT_Desktop.h>
-#include <SVTK_Selector.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
-#include <SalomeApp_Tools.h>
+#include <gui/LightApp_DataOwner.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SalomeApp_Tools.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
index a99a2ae96..a09dcdc7f 100755
--- a/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SingleEditDlg.cxx
@@ -34,16 +34,16 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_Application.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-
-#include <SVTK_Selector.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
index 1cab8d3f4..73f1fc90d 100644
--- a/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SmoothingDlg.cxx
@@ -41,22 +41,22 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SalomeApp_IntSpinBox.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_Selector.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_Selection.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SalomeApp_IntSpinBox.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Selection.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_SpinBox.h b/src/SMESHGUI/SMESHGUI_SpinBox.h
index aa757ee63..bc7b5bcaf 100644
--- a/src/SMESHGUI/SMESHGUI_SpinBox.h
+++ b/src/SMESHGUI/SMESHGUI_SpinBox.h
@@ -30,7 +30,7 @@
 #include "SMESH_SMESHGUI.hxx"
 
 // SALOME GUI includes
-#include <SalomeApp_DoubleSpinBox.h>
+#include <gui/SalomeApp_DoubleSpinBox.h>
 
 #define COORD_MIN -1e+15
 #define COORD_MAX +1e+15
diff --git a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx
index d62b3a702..4e314eabb 100644
--- a/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_StandardMeshInfosDlg.cxx
@@ -33,20 +33,20 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME KERNEL includes 
-#include <SALOMEDSClient_Study.hxx>
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // Qt includes
 #include <QGroupBox>
diff --git a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
index 5da44a6ae..0f2082fd3 100644
--- a/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_SymmetryDlg.cxx
@@ -40,21 +40,21 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
index 97d5ca582..8ce68b849 100644
--- a/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_TranslationDlg.cxx
@@ -40,21 +40,21 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx b/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx
index 28f5af456..d5a0f852f 100644
--- a/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_TransparencyDlg.cxx
@@ -32,19 +32,19 @@
 #include "SMESH_Actor.h"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
 
 // Qt includes
 #include <QLabel>
diff --git a/src/SMESHGUI/SMESHGUI_Utils.cxx b/src/SMESHGUI/SMESHGUI_Utils.cxx
index 7c6b279c4..7dc8965fd 100644
--- a/src/SMESHGUI/SMESHGUI_Utils.cxx
+++ b/src/SMESHGUI/SMESHGUI_Utils.cxx
@@ -31,17 +31,17 @@
 #include <SMDS_MeshFace.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Module.h>
-#include <SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Module.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 // OCC includes
 #include <gp_XYZ.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_Utils.h b/src/SMESHGUI/SMESHGUI_Utils.h
index 2604ca57f..2ef3e5e15 100644
--- a/src/SMESHGUI/SMESHGUI_Utils.h
+++ b/src/SMESHGUI/SMESHGUI_Utils.h
@@ -33,11 +33,11 @@
 #include <omniORB4/CORBA.h>
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
-#include <LightApp_DataOwner.h>
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <gui/LightApp_DataOwner.h>
 
 //OCC includes
 #include <gp_XYZ.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
index 7b5db1430..783d33946 100644
--- a/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
+++ b/src/SMESHGUI/SMESHGUI_VTKUtils.cxx
@@ -36,27 +36,27 @@
 #include <SMDS_Mesh.hxx>
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SVTK_Selector.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_Algorithm.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
 // SALOME KERNEL includes
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h
index 0d49a4437..2a2f58414 100644
--- a/src/SMESHGUI/SMESHGUI_VTKUtils.h
+++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h
@@ -30,14 +30,14 @@
 #include "SMESH_SMESHGUI.hxx"
 
 #include "SMESHGUI_Utils.h"
-#include <SMESH_Object.h>
+#include "SMESH_Object.h"
 
 // SALOME KERNEL includes
-#include <SALOMEDSClient_definitions.hxx>
+#include <kernel/SALOMEDSClient_definitions.hxx>
 
 // SALOME GUI includes
-#include <SALOME_InteractiveObject.hxx>
-#include <VTKViewer_Filter.h>
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <gui/VTKViewer_Filter.h>
 
 class TColStd_IndexedMapOfInteger;
 
diff --git a/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx b/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
index f2913e836..0cb3df443 100755
--- a/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
+++ b/src/SMESHGUI/SMESHGUI_WhatIsDlg.cxx
@@ -39,19 +39,19 @@
 #include "SMDS_VolumeTool.hxx"
 
 // SALOME GUI includes
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SVTK_ViewModel.h>
-#include <SVTK_Selection.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_Selection.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 // OCCT includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
index 16833ee66..34ab00b44 100644
--- a/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
+++ b/src/SMESHGUI/SMESHGUI_XmlHandler.cxx
@@ -30,10 +30,10 @@
 #include "SMESHGUI_Hypotheses.h"
 
 // SALOME GUI includes
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 // SALOME KERNEL includes
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 /*!
   Constructor
diff --git a/src/SMESH_I/SMESH_1D_Algo_i.cxx b/src/SMESH_I/SMESH_1D_Algo_i.cxx
index e5da53f79..078eccd18 100644
--- a/src/SMESH_I/SMESH_1D_Algo_i.cxx
+++ b/src/SMESH_I/SMESH_1D_Algo_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_1D_Algo_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESH_I/SMESH_2D_Algo_i.cxx b/src/SMESH_I/SMESH_2D_Algo_i.cxx
index 7fcf5a86d..dd76ced54 100644
--- a/src/SMESH_I/SMESH_2D_Algo_i.cxx
+++ b/src/SMESH_I/SMESH_2D_Algo_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_2D_Algo_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx
index ee137822c..f0c82e837 100644
--- a/src/SMESH_I/SMESH_2smeshpy.cxx
+++ b/src/SMESH_I/SMESH_2smeshpy.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_2smeshpy.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "SMESH_PythonDump.hxx"
 #include "SMESH_NoteBook.hxx"
 #include "Resource_DataMapOfAsciiStringAsciiString.hxx"
diff --git a/src/SMESH_I/SMESH_3D_Algo_i.cxx b/src/SMESH_I/SMESH_3D_Algo_i.cxx
index 8aa242ba6..0fd8f7b37 100644
--- a/src/SMESH_I/SMESH_3D_Algo_i.cxx
+++ b/src/SMESH_I/SMESH_3D_Algo_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_3D_Algo_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESH_I/SMESH_Algo_i.cxx b/src/SMESH_I/SMESH_Algo_i.cxx
index e567a15d6..b4c91e978 100644
--- a/src/SMESH_I/SMESH_Algo_i.cxx
+++ b/src/SMESH_I/SMESH_Algo_i.cxx
@@ -28,7 +28,7 @@
 #include "SMESH_Algo_i.hxx"
 #include "SMESH_Algo.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <string>
 #include <vector>
diff --git a/src/SMESH_I/SMESH_Filter_i.hxx b/src/SMESH_I/SMESH_Filter_i.hxx
index 44cc246bf..8912923e6 100644
--- a/src/SMESH_I/SMESH_Filter_i.hxx
+++ b/src/SMESH_I/SMESH_Filter_i.hxx
@@ -35,7 +35,7 @@
 #include <LDOM_Document.hxx>
 #include <TopoDS_Shape.hxx>
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 #include "SMESH_ControlsDef.hxx"
 
 class SMESHDS_Mesh;
diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index f5de7bd50..260560a94 100644
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -46,9 +46,9 @@
 #include <TCollection_AsciiString.hxx>
 #include <OSD.hxx>
 
-#include "Utils_CorbaException.hxx"
+#include <kernel/Utils_CorbaException.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include <fstream>
 #include <stdio.h>
 
@@ -70,7 +70,7 @@
  #define UnLoadLib( handle ) dlclose( handle );
 #endif
 
-#include <HDFOI.hxx>
+#include <kernel/HDFOI.hxx>
 
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Mesh_i.hxx"
@@ -100,18 +100,18 @@
 #include "DriverMED_W_SMESHDS_Mesh.h"
 #include "DriverMED_R_SMESHDS_Mesh.h"
 
-#include "SALOMEDS_Tool.hxx"
-#include "SALOME_NamingService.hxx"
-#include "SALOME_LifeCycleCORBA.hxx"
-#include "Utils_SINGLETON.hxx"
-#include "OpUtil.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/OpUtil.hxx>
 
 #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
 #include CORBA_CLIENT_HEADER(SALOME_Session)
 
-#include "GEOM_Client.hxx"
-#include "Utils_ExceptHandlers.hxx"
-#include "Basics_Utils.hxx"
+#include <geom/GEOM_Client.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <map>
 
diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index 174b1b2eb..d2afada24 100644
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -39,11 +39,11 @@
 
 #include "SMESH_Mesh_i.hxx"
 #include "SMESH_Hypothesis_i.hxx"
-#include "SALOME_Component_i.hxx"
-#include "SALOME_NamingService.hxx"
+#include <kernel/SALOME_Component_i.hxx>
+#include <kernel/SALOME_NamingService.hxx>
 
 #include "SMESH_Gen.hxx"
-#include "GEOM_Client.hxx"
+#include <geom/GEOM_Client.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <Resource_DataMapOfAsciiStringAsciiString.hxx>
diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx
index 2b216fe26..920240aa3 100644
--- a/src/SMESH_I/SMESH_Gen_i_1.cxx
+++ b/src/SMESH_I/SMESH_Gen_i_1.cxx
@@ -36,8 +36,8 @@
 
 #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx
index 7502c5409..7cba7351c 100644
--- a/src/SMESH_I/SMESH_Group_i.cxx
+++ b/src/SMESH_I/SMESH_Group_i.cxx
@@ -35,7 +35,7 @@
 #include "SMESH_Filter_i.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace SMESH;
 
diff --git a/src/SMESH_I/SMESH_Group_i.hxx b/src/SMESH_I/SMESH_Group_i.hxx
index 93f8354b9..5f4c4bb23 100644
--- a/src/SMESH_I/SMESH_Group_i.hxx
+++ b/src/SMESH_I/SMESH_Group_i.hxx
@@ -35,7 +35,7 @@
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 class SMESH_Group;
 class SMESHDS_GroupBase;
diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx
index b677e647b..d96113625 100644
--- a/src/SMESH_I/SMESH_Hypothesis_i.cxx
+++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx
@@ -29,7 +29,7 @@
 #include <sstream>
 #include "SMESH_Hypothesis_i.hxx"
 #include "SMESH_Gen_i.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/SMESH_I/SMESH_Hypothesis_i.hxx b/src/SMESH_I/SMESH_Hypothesis_i.hxx
index 13bd7742f..1c17f8308 100644
--- a/src/SMESH_I/SMESH_Hypothesis_i.hxx
+++ b/src/SMESH_I/SMESH_Hypothesis_i.hxx
@@ -34,7 +34,7 @@
 #include CORBA_SERVER_HEADER(SMESH_Hypothesis)
 
 #include "SMESH_Hypothesis.hxx"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 #include "SMESH_Gen.hxx"
 
diff --git a/src/SMESH_I/SMESH_MEDFamily_i.cxx b/src/SMESH_I/SMESH_MEDFamily_i.cxx
index 393e49c42..0afa9158a 100644
--- a/src/SMESH_I/SMESH_MEDFamily_i.cxx
+++ b/src/SMESH_I/SMESH_MEDFamily_i.cxx
@@ -24,8 +24,8 @@
 //  Module : SMESH
 //
 #include "SMESH_MEDFamily_i.hxx"
-#include "utilities.h"
-#include "Utils_CorbaException.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
 
 using namespace std;
 
diff --git a/src/SMESH_I/SMESH_MEDMesh_i.cxx b/src/SMESH_I/SMESH_MEDMesh_i.cxx
index f73bf1102..f77073ac1 100644
--- a/src/SMESH_I/SMESH_MEDMesh_i.cxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.cxx
@@ -45,15 +45,15 @@
 #include <TopoDS_Shape.hxx>
 #include <TopTools_MapOfShape.hxx>
 
-#include "utilities.h"
-#include "Utils_CorbaException.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
 
 #include "SMESH_MEDSupport_i.hxx"
 #include "SMESH_MEDFamily_i.hxx"
 
-# include "Utils_ORB_INIT.hxx"
-# include "Utils_SINGLETON.hxx"
-# include "Utils_ExceptHandlers.hxx"
+# include <kernel/Utils_ORB_INIT.hxx>
+# include <kernel/Utils_SINGLETON.hxx>
+# include <kernel/Utils_ExceptHandlers.hxx>
 
 extern "C"
 {
diff --git a/src/SMESH_I/SMESH_MEDMesh_i.hxx b/src/SMESH_I/SMESH_MEDMesh_i.hxx
index 72b31032e..f0e19580d 100644
--- a/src/SMESH_I/SMESH_MEDMesh_i.hxx
+++ b/src/SMESH_I/SMESH_MEDMesh_i.hxx
@@ -38,7 +38,7 @@
 
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 #define MED_NBR_GEOMETRIE_MAILLE 15
 #define MED_NBR_TYPE 5
diff --git a/src/SMESH_I/SMESH_MEDSupport_i.cxx b/src/SMESH_I/SMESH_MEDSupport_i.cxx
index 4b1e66ddf..1a798626f 100644
--- a/src/SMESH_I/SMESH_MEDSupport_i.cxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.cxx
@@ -24,9 +24,9 @@
 //  Module : SMESH
 //
 #include "SMESH_MEDSupport_i.hxx"
-#include "utilities.h"
-#include "Utils_CorbaException.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <TopoDS_Iterator.hxx>
 #include "SMESHDS_Mesh.hxx"
diff --git a/src/SMESH_I/SMESH_MEDSupport_i.hxx b/src/SMESH_I/SMESH_MEDSupport_i.hxx
index 56c36a881..966683f78 100644
--- a/src/SMESH_I/SMESH_MEDSupport_i.hxx
+++ b/src/SMESH_I/SMESH_MEDSupport_i.hxx
@@ -38,7 +38,7 @@
 #include "SMDS_MeshNode.hxx"
 
 #include "SMESH_MEDSupport_i.hxx"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 class SMESH_subMesh_i;
 
 class SMESH_I_EXPORT SMESH_MEDSupport_i:
diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx
index 000bc95e8..eb334fb1d 100644
--- a/src/SMESH_I/SMESH_MeshEditor_i.cxx
+++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx
@@ -39,9 +39,9 @@
 #include "SMESH_Group_i.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
-#include "Utils_CorbaException.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
+#include <kernel/Utils_CorbaException.hxx>
 
 #include <BRepAdaptor_Surface.hxx>
 #include <BRep_Tool.hxx>
diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx
index 9c44e29d2..014c36bf8 100644
--- a/src/SMESH_I/SMESH_Mesh_i.cxx
+++ b/src/SMESH_I/SMESH_Mesh_i.cxx
@@ -47,13 +47,13 @@
 #include "SMDS_EdgePosition.hxx"
 #include "SMDS_FacePosition.hxx"
 
-#include "OpUtil.hxx"
-#include "SALOME_NamingService.hxx"
-#include "Utils_CorbaException.hxx"
-#include "Utils_ExceptHandlers.hxx"
-#include "Utils_SINGLETON.hxx"
-#include "utilities.h"
-#include "GEOMImpl_Types.hxx"
+#include <kernel/OpUtil.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/utilities.h>
+#include <geom/GEOMImpl_Types.hxx>
 
 // OCCT Includes
 #include <BRep_Builder.hxx>
diff --git a/src/SMESH_I/SMESH_Mesh_i.hxx b/src/SMESH_I/SMESH_Mesh_i.hxx
index ab8abdabf..52bc314d3 100644
--- a/src/SMESH_I/SMESH_Mesh_i.hxx
+++ b/src/SMESH_I/SMESH_Mesh_i.hxx
@@ -41,7 +41,7 @@
 //#include "SMESH_subMesh_i.hxx"
 #include "SMESH_subMesh.hxx"
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 class SMESH_Gen_i;
 class SMESH_GroupBase_i;
diff --git a/src/SMESH_I/SMESH_Pattern_i.cxx b/src/SMESH_I/SMESH_Pattern_i.cxx
index f3f1fcfbc..6110e5111 100644
--- a/src/SMESH_I/SMESH_Pattern_i.cxx
+++ b/src/SMESH_I/SMESH_Pattern_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SMESH_Pattern_i.hxx"
 
-#include "GEOM_Client.hxx"
+#include <geom/GEOM_Client.hxx>
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Mesh_i.hxx"
diff --git a/src/SMESH_I/SMESH_subMesh_i.cxx b/src/SMESH_I/SMESH_subMesh_i.cxx
index 2720de2c7..a4f40cae3 100644
--- a/src/SMESH_I/SMESH_subMesh_i.cxx
+++ b/src/SMESH_I/SMESH_subMesh_i.cxx
@@ -29,10 +29,10 @@
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Mesh_i.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <TopoDS_Iterator.hxx>
 #include <TopExp_Explorer.hxx>
diff --git a/src/SMESH_I/SMESH_subMesh_i.hxx b/src/SMESH_I/SMESH_subMesh_i.hxx
index 5a6eb8bd8..463e61a5d 100644
--- a/src/SMESH_I/SMESH_subMesh_i.hxx
+++ b/src/SMESH_I/SMESH_subMesh_i.hxx
@@ -35,7 +35,7 @@
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 #include CORBA_CLIENT_HEADER(MED)
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 #include "SMESH_Mesh_i.hxx"
 
 class SMESH_Gen_i;
diff --git a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
index 463d1fd27..9e321c32b 100644
--- a/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
+++ b/src/SMESH_SWIG_WITHIHM/libSMESH_Swig.cxx
@@ -31,17 +31,17 @@
 #include <SMESHGUI_Displayer.h>
 
 // SALOME KERNEL includes
-#include <Utils_ORB_INIT.hxx>
-#include <Utils_SINGLETON.hxx>
-#include <SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 // SALOME GUI includes
-#include <SUIT_Session.h>
-#include <VTKViewer_ViewModel.h>
-#include <SALOME_Event.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/VTKViewer_ViewModel.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Application.h>
 
 // OCCT includes
 #include <TopAbs.hxx>
diff --git a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx
index e3f3c37a8..a1d32f3a5 100644
--- a/src/StdMeshers/StdMeshers_Arithmetic1D.hxx
+++ b/src/StdMeshers/StdMeshers_Arithmetic1D.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <vector>
 
diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.cxx b/src/StdMeshers/StdMeshers_AutomaticLength.cxx
index 95710c94e..af5c61f46 100644
--- a/src/StdMeshers/StdMeshers_AutomaticLength.cxx
+++ b/src/StdMeshers/StdMeshers_AutomaticLength.cxx
@@ -31,7 +31,7 @@
 #include "SMESH_Algo.hxx"
 #include "SMESHDS_SubMesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopExp.hxx>
diff --git a/src/StdMeshers/StdMeshers_AutomaticLength.hxx b/src/StdMeshers/StdMeshers_AutomaticLength.hxx
index 627003aa6..e1942fd45 100644
--- a/src/StdMeshers/StdMeshers_AutomaticLength.hxx
+++ b/src/StdMeshers/StdMeshers_AutomaticLength.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <map>
 
diff --git a/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx b/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
index eee3ef012..e46c90c3d 100644
--- a/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
+++ b/src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
@@ -40,7 +40,7 @@
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_CompCurve.hxx>
 #include <BRep_Builder.hxx>
diff --git a/src/StdMeshers/StdMeshers_Deflection1D.cxx b/src/StdMeshers/StdMeshers_Deflection1D.cxx
index 42ad9219a..c70e6a2ff 100644
--- a/src/StdMeshers/StdMeshers_Deflection1D.cxx
+++ b/src/StdMeshers/StdMeshers_Deflection1D.cxx
@@ -24,7 +24,7 @@
 //  Module : SMESH
 //
 #include "StdMeshers_Deflection1D.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Algo.hxx"
diff --git a/src/StdMeshers/StdMeshers_Deflection1D.hxx b/src/StdMeshers/StdMeshers_Deflection1D.hxx
index a3cf19b70..abafe7e6b 100644
--- a/src/StdMeshers/StdMeshers_Deflection1D.hxx
+++ b/src/StdMeshers/StdMeshers_Deflection1D.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_Deflection1D:public SMESH_Hypothesis
 {
diff --git a/src/StdMeshers/StdMeshers_Distribution.cxx b/src/StdMeshers/StdMeshers_Distribution.cxx
index a3b2707aa..2da734173 100644
--- a/src/StdMeshers/StdMeshers_Distribution.cxx
+++ b/src/StdMeshers/StdMeshers_Distribution.cxx
@@ -28,7 +28,7 @@
 #include "StdMeshers_Distribution.hxx"
 
 #include <math_GaussSingleIntegration.hxx>
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
 #define NO_CAS_CATCH
diff --git a/src/StdMeshers/StdMeshers_FaceSide.cxx b/src/StdMeshers/StdMeshers_FaceSide.cxx
index 55ff0aa3b..f50ea9915 100644
--- a/src/StdMeshers/StdMeshers_FaceSide.cxx
+++ b/src/StdMeshers/StdMeshers_FaceSide.cxx
@@ -51,7 +51,7 @@
 
 #include <map>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //================================================================================
 /*!
diff --git a/src/StdMeshers/StdMeshers_FixedPoints1D.hxx b/src/StdMeshers/StdMeshers_FixedPoints1D.hxx
index b5126e1c3..5749533f8 100644
--- a/src/StdMeshers/StdMeshers_FixedPoints1D.hxx
+++ b/src/StdMeshers/StdMeshers_FixedPoints1D.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <vector>
 
diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.cxx b/src/StdMeshers/StdMeshers_Hexa_3D.cxx
index 42b5488ec..cfa9396db 100644
--- a/src/StdMeshers/StdMeshers_Hexa_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.cxx
@@ -53,8 +53,8 @@
 #include <TopoDS.hxx>
 #include <gp_Pnt2d.hxx>
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 typedef SMESH_Comment TComm;
 
diff --git a/src/StdMeshers/StdMeshers_Hexa_3D.hxx b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
index c892ac729..3b5db4728 100644
--- a/src/StdMeshers/StdMeshers_Hexa_3D.hxx
+++ b/src/StdMeshers/StdMeshers_Hexa_3D.hxx
@@ -33,7 +33,7 @@
 #include "SMESH_3D_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 #include "StdMeshers_Quadrangle_2D.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include "SMESH_MesherHelper.hxx"
 
diff --git a/src/StdMeshers/StdMeshers_LayerDistribution.cxx b/src/StdMeshers/StdMeshers_LayerDistribution.cxx
index 8e5987e6b..e796a388d 100644
--- a/src/StdMeshers/StdMeshers_LayerDistribution.cxx
+++ b/src/StdMeshers/StdMeshers_LayerDistribution.cxx
@@ -26,7 +26,7 @@
 //
 #include "StdMeshers_LayerDistribution.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers/StdMeshers_LayerDistribution.hxx b/src/StdMeshers/StdMeshers_LayerDistribution.hxx
index aca054d4f..e419d13d9 100644
--- a/src/StdMeshers/StdMeshers_LayerDistribution.hxx
+++ b/src/StdMeshers/StdMeshers_LayerDistribution.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <string>
 
diff --git a/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx b/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx
index 23d039bee..6f41349ee 100644
--- a/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx
+++ b/src/StdMeshers/StdMeshers_LayerDistribution2D.cxx
@@ -26,7 +26,7 @@
 //
 #include "StdMeshers_LayerDistribution2D.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 
 //=============================================================================
diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx
index cad6e9186..1ffd0b875 100644
--- a/src/StdMeshers/StdMeshers_LengthFromEdges.cxx
+++ b/src/StdMeshers/StdMeshers_LengthFromEdges.cxx
@@ -27,7 +27,7 @@
 //
 #include "StdMeshers_LengthFromEdges.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx
index cb52638e5..781b4fd58 100644
--- a/src/StdMeshers/StdMeshers_LengthFromEdges.hxx
+++ b/src/StdMeshers/StdMeshers_LengthFromEdges.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_LengthFromEdges:
   public SMESH_Hypothesis
diff --git a/src/StdMeshers/StdMeshers_LocalLength.cxx b/src/StdMeshers/StdMeshers_LocalLength.cxx
index d52d2de54..44dfc5a5b 100644
--- a/src/StdMeshers/StdMeshers_LocalLength.cxx
+++ b/src/StdMeshers/StdMeshers_LocalLength.cxx
@@ -31,7 +31,7 @@
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Algo.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Tool.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
diff --git a/src/StdMeshers/StdMeshers_LocalLength.hxx b/src/StdMeshers/StdMeshers_LocalLength.hxx
index 1c8d72b27..1045a5505 100644
--- a/src/StdMeshers/StdMeshers_LocalLength.hxx
+++ b/src/StdMeshers/StdMeshers_LocalLength.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_LocalLength: public SMESH_Hypothesis
 {
diff --git a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
index b10f3902c..00bea4225 100644
--- a/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
+++ b/src/StdMeshers/StdMeshers_MEFISTO_2D.cxx
@@ -46,7 +46,7 @@
 #include "SMDS_EdgePosition.hxx"
 #include "SMDS_FacePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepTools.hxx>
 #include <BRep_Tool.hxx>
diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.cxx b/src/StdMeshers/StdMeshers_MaxElementArea.cxx
index 1dce3de1f..ea7f2e995 100644
--- a/src/StdMeshers/StdMeshers_MaxElementArea.cxx
+++ b/src/StdMeshers/StdMeshers_MaxElementArea.cxx
@@ -36,7 +36,7 @@
 #include <TopExp.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers/StdMeshers_MaxElementArea.hxx b/src/StdMeshers/StdMeshers_MaxElementArea.hxx
index 095067363..084f12207 100644
--- a/src/StdMeshers/StdMeshers_MaxElementArea.hxx
+++ b/src/StdMeshers/StdMeshers_MaxElementArea.hxx
@@ -31,7 +31,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_MaxElementArea:public SMESH_Hypothesis
 {
diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
index 79be9d6bc..c88ca17ac 100644
--- a/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
+++ b/src/StdMeshers/StdMeshers_MaxElementVolume.cxx
@@ -32,7 +32,7 @@
 #include "SMESH_ControlsDef.hxx"
 #include "SMESH_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
diff --git a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx
index 6395fd419..58aa8c92a 100644
--- a/src/StdMeshers/StdMeshers_MaxElementVolume.hxx
+++ b/src/StdMeshers/StdMeshers_MaxElementVolume.hxx
@@ -31,7 +31,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_MaxElementVolume:
   public SMESH_Hypothesis
diff --git a/src/StdMeshers/StdMeshers_MaxLength.cxx b/src/StdMeshers/StdMeshers_MaxLength.cxx
index 918fe6c78..de6d965bd 100644
--- a/src/StdMeshers/StdMeshers_MaxLength.cxx
+++ b/src/StdMeshers/StdMeshers_MaxLength.cxx
@@ -27,7 +27,7 @@
 #include "SMESH_Mesh.hxx"
 #include "SMESH_Algo.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Tool.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
diff --git a/src/StdMeshers/StdMeshers_MaxLength.hxx b/src/StdMeshers/StdMeshers_MaxLength.hxx
index 23d94a9f2..0185cd0af 100644
--- a/src/StdMeshers/StdMeshers_MaxLength.hxx
+++ b/src/StdMeshers/StdMeshers_MaxLength.hxx
@@ -28,7 +28,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_MaxLength: public SMESH_Hypothesis
 {
diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx
index 66c58f13c..81ec8f84d 100644
--- a/src/StdMeshers/StdMeshers_NotConformAllowed.cxx
+++ b/src/StdMeshers/StdMeshers_NotConformAllowed.cxx
@@ -25,7 +25,7 @@
 //  Module : SMESH
 //
 #include "StdMeshers_NotConformAllowed.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx
index ddcfcb445..5b4cfdac5 100644
--- a/src/StdMeshers/StdMeshers_NotConformAllowed.hxx
+++ b/src/StdMeshers/StdMeshers_NotConformAllowed.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_NotConformAllowed:
   public SMESH_Hypothesis
diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
index 8abb02c63..c53c21512 100644
--- a/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
+++ b/src/StdMeshers/StdMeshers_NumberOfLayers.cxx
@@ -28,7 +28,7 @@
 
 
 #include "SMESH_Mesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers.hxx b/src/StdMeshers/StdMeshers_NumberOfLayers.hxx
index ebaae84a9..4aaf00ccd 100644
--- a/src/StdMeshers/StdMeshers_NumberOfLayers.hxx
+++ b/src/StdMeshers/StdMeshers_NumberOfLayers.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class SMESH_Gen;
 
diff --git a/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx b/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx
index af2f04dab..9df5ea5ef 100644
--- a/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx
+++ b/src/StdMeshers/StdMeshers_NumberOfLayers2D.cxx
@@ -27,7 +27,7 @@
 
 #include "StdMeshers_NumberOfLayers2D.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 
 //=============================================================================
diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
index ce4876ee3..eb8b9865a 100644
--- a/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
+++ b/src/StdMeshers/StdMeshers_NumberOfSegments.cxx
@@ -49,7 +49,7 @@
 #include <Standard_ErrorHandler.hxx>
 #endif
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 
diff --git a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx
index 985d192b2..3ddc5ecb7 100644
--- a/src/StdMeshers/StdMeshers_NumberOfSegments.hxx
+++ b/src/StdMeshers/StdMeshers_NumberOfSegments.hxx
@@ -31,7 +31,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 #include <vector>
 
 /*!
diff --git a/src/StdMeshers/StdMeshers_Penta_3D.cxx b/src/StdMeshers/StdMeshers_Penta_3D.cxx
index 7ae2e3a54..36878ba67 100644
--- a/src/StdMeshers/StdMeshers_Penta_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Penta_3D.cxx
@@ -25,8 +25,8 @@
 //
 #include "StdMeshers_Penta_3D.hxx"
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include "SMDS_EdgePosition.hxx"
 #include "SMDS_MeshElement.hxx"
diff --git a/src/StdMeshers/StdMeshers_Prism_3D.cxx b/src/StdMeshers/StdMeshers_Prism_3D.cxx
index 590cd65eb..9b45f7219 100644
--- a/src/StdMeshers/StdMeshers_Prism_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Prism_3D.cxx
@@ -34,7 +34,7 @@
 #include "SMDS_EdgePosition.hxx"
 #include "SMESH_Comment.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Tool.hxx>
 #include <Geom2dAdaptor_Curve.hxx>
diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx
index 9be958436..51140c05f 100644
--- a/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.cxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopoDS.hxx>
 
diff --git a/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx
index 301dedf30..f4307d621 100644
--- a/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource1D.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Vertex.hxx>
 
diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
index be0d809eb..7d050afde 100644
--- a/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.cxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_Mesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopoDS.hxx>
 
diff --git a/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx
index a23d4c494..7a447167d 100644
--- a/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource2D.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Vertex.hxx>
 
diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx
index 4a8aa1086..2d1034626 100644
--- a/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.cxx
@@ -26,7 +26,7 @@
 
 #include "StdMeshers_ProjectionSource3D.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "SMESH_Gen.hxx"
 
 #include <TopoDS.hxx>
diff --git a/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx b/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx
index fd6848aec..f8344e7f5 100644
--- a/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx
+++ b/src/StdMeshers/StdMeshers_ProjectionSource3D.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Vertex.hxx>
 
diff --git a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
index a4d4fdfbc..6af8dd865 100644
--- a/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
+++ b/src/StdMeshers/StdMeshers_ProjectionUtils.cxx
@@ -41,7 +41,7 @@
 #include "SMESH_subMeshEventListener.hxx"
 #include "SMDS_EdgePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepTools.hxx>
 #include <BRepTools_WireExplorer.hxx>
diff --git a/src/StdMeshers/StdMeshers_Projection_1D.cxx b/src/StdMeshers/StdMeshers_Projection_1D.cxx
index 40568111a..521feb625 100644
--- a/src/StdMeshers/StdMeshers_Projection_1D.cxx
+++ b/src/StdMeshers/StdMeshers_Projection_1D.cxx
@@ -49,7 +49,7 @@
 #include <gp_Pnt.hxx>
 #include <TopTools_ListIteratorOfListOfShape.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 
 using namespace std;
diff --git a/src/StdMeshers/StdMeshers_Projection_2D.cxx b/src/StdMeshers/StdMeshers_Projection_2D.cxx
index 05a11f7d7..95d0f63a8 100644
--- a/src/StdMeshers/StdMeshers_Projection_2D.cxx
+++ b/src/StdMeshers/StdMeshers_Projection_2D.cxx
@@ -42,7 +42,7 @@
 #include "SMESH_Comment.hxx"
 #include "SMDS_EdgePosition.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Tool.hxx>
 #include <Bnd_B2d.hxx>
diff --git a/src/StdMeshers/StdMeshers_Projection_3D.cxx b/src/StdMeshers/StdMeshers_Projection_3D.cxx
index d8939fead..f395c6193 100644
--- a/src/StdMeshers/StdMeshers_Projection_3D.cxx
+++ b/src/StdMeshers/StdMeshers_Projection_3D.cxx
@@ -43,7 +43,7 @@
 #include "SMESH_subMesh.hxx"
 #include "SMESH_subMeshEventListener.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
diff --git a/src/StdMeshers/StdMeshers_Propagation.cxx b/src/StdMeshers/StdMeshers_Propagation.cxx
index c6b9b015f..e5bf8ac14 100644
--- a/src/StdMeshers/StdMeshers_Propagation.cxx
+++ b/src/StdMeshers/StdMeshers_Propagation.cxx
@@ -25,7 +25,7 @@
 
 #include "StdMeshers_Propagation.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "SMDS_SetIterator.hxx"
 #include "SMESH_Algo.hxx"
diff --git a/src/StdMeshers/StdMeshers_Propagation.hxx b/src/StdMeshers/StdMeshers_Propagation.hxx
index b02f9aebe..d01540390 100644
--- a/src/StdMeshers/StdMeshers_Propagation.hxx
+++ b/src/StdMeshers/StdMeshers_Propagation.hxx
@@ -30,7 +30,7 @@
 
 #include "SMESH_Hypothesis.hxx"
 #include "SMESH_subMeshEventListener.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <TopoDS_Edge.hxx>
 
diff --git a/src/StdMeshers/StdMeshers_QuadrangleParams.hxx b/src/StdMeshers/StdMeshers_QuadrangleParams.hxx
index 47cfc7468..63955a9fd 100644
--- a/src/StdMeshers/StdMeshers_QuadrangleParams.hxx
+++ b/src/StdMeshers/StdMeshers_QuadrangleParams.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class STDMESHERS_EXPORT StdMeshers_QuadrangleParams:
   public SMESH_Hypothesis
diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.cxx b/src/StdMeshers/StdMeshers_QuadranglePreference.cxx
index cf3986e38..d1cc7feb8 100644
--- a/src/StdMeshers/StdMeshers_QuadranglePreference.cxx
+++ b/src/StdMeshers/StdMeshers_QuadranglePreference.cxx
@@ -24,7 +24,7 @@
 //  Module : SMESH
 
 #include "StdMeshers_QuadranglePreference.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx
index ec641d15a..114f68f53 100644
--- a/src/StdMeshers/StdMeshers_QuadranglePreference.hxx
+++ b/src/StdMeshers/StdMeshers_QuadranglePreference.hxx
@@ -29,7 +29,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 /*!
  * \brief Hypothesis for StdMeshers_Quadrangle_2D, forcing construction
diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
index 1c8899d60..3032df626 100644
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.cxx
@@ -55,8 +55,8 @@
 #include <TopTools_MapOfShape.hxx>
 #include <TopoDS.hxx>
 
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #ifndef StdMeshers_Array2OfNode_HeaderFile
 #define StdMeshers_Array2OfNode_HeaderFile
diff --git a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
index b4257bb40..3ee10dfd1 100644
--- a/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
+++ b/src/StdMeshers/StdMeshers_Quadrangle_2D.hxx
@@ -32,7 +32,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_2D_Algo.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 class SMESH_Mesh;
 class SMESH_MesherHelper;
diff --git a/src/StdMeshers/StdMeshers_QuadraticMesh.cxx b/src/StdMeshers/StdMeshers_QuadraticMesh.cxx
index 4764356f2..1a31186e3 100644
--- a/src/StdMeshers/StdMeshers_QuadraticMesh.cxx
+++ b/src/StdMeshers/StdMeshers_QuadraticMesh.cxx
@@ -24,7 +24,7 @@
 //  Module : SMESH
 
 #include "StdMeshers_QuadraticMesh.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers/StdMeshers_QuadraticMesh.hxx b/src/StdMeshers/StdMeshers_QuadraticMesh.hxx
index 9972469c0..e31aa0b27 100644
--- a/src/StdMeshers/StdMeshers_QuadraticMesh.hxx
+++ b/src/StdMeshers/StdMeshers_QuadraticMesh.hxx
@@ -29,7 +29,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 /*!
  * \brief Hypothesis for StdMeshers_Regular_1D, forcing construction of quadratic edges.
diff --git a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
index f2e32397f..c080f7e66 100644
--- a/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
+++ b/src/StdMeshers/StdMeshers_RadialPrism_3D.cxx
@@ -40,7 +40,7 @@
 #include "SMESH_MesherHelper.hxx"
 #include "SMESH_subMesh.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
diff --git a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
index 6911ee752..098996004 100644
--- a/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
+++ b/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cxx
@@ -41,7 +41,7 @@
 #include "SMESH_subMesh.hxx"
 #include "SMESH_subMeshEventListener.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
diff --git a/src/StdMeshers/StdMeshers_Regular_1D.cxx b/src/StdMeshers/StdMeshers_Regular_1D.cxx
index f4fa4a18e..6540e75a8 100644
--- a/src/StdMeshers/StdMeshers_Regular_1D.cxx
+++ b/src/StdMeshers/StdMeshers_Regular_1D.cxx
@@ -48,8 +48,8 @@
 #include "SMDS_MeshElement.hxx"
 #include "SMDS_MeshNode.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
-#include "utilities.h"
+#include <kernel/Utils_SALOME_Exception.hxx>
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRep_Tool.hxx>
diff --git a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx
index 599690c6a..c54b754d3 100644
--- a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx
+++ b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.cxx
@@ -32,7 +32,7 @@
 #include "SMESHDS_SubMesh.hxx"
 #include "SMESH_MesherHelper.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <GCPnts_AbscissaPoint.hxx>
diff --git a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx
index c7c54bbf6..17d499f46 100644
--- a/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx
+++ b/src/StdMeshers/StdMeshers_SegmentLengthAroundVertex.hxx
@@ -30,7 +30,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 /*!
  * \brief This hypothesis specifies length of segments adjacent to the vertex the
diff --git a/src/StdMeshers/StdMeshers_StartEndLength.hxx b/src/StdMeshers/StdMeshers_StartEndLength.hxx
index 35ae4e0c4..2f1dfc40e 100644
--- a/src/StdMeshers/StdMeshers_StartEndLength.hxx
+++ b/src/StdMeshers/StdMeshers_StartEndLength.hxx
@@ -29,7 +29,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 #include <vector>
 
diff --git a/src/StdMeshers/StdMeshers_TrianglePreference.cxx b/src/StdMeshers/StdMeshers_TrianglePreference.cxx
index 331cd0d1c..078e4f8fe 100644
--- a/src/StdMeshers/StdMeshers_TrianglePreference.cxx
+++ b/src/StdMeshers/StdMeshers_TrianglePreference.cxx
@@ -24,7 +24,7 @@
 //  Module : SMESH
 
 #include "StdMeshers_TrianglePreference.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers/StdMeshers_TrianglePreference.hxx b/src/StdMeshers/StdMeshers_TrianglePreference.hxx
index 34ec364a1..25c8f915c 100644
--- a/src/StdMeshers/StdMeshers_TrianglePreference.hxx
+++ b/src/StdMeshers/StdMeshers_TrianglePreference.hxx
@@ -29,7 +29,7 @@
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 
 /*!
  * \brief Hypothesis for StdMeshers_Quadrangle_2D, forcing construction
diff --git a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
index a45ccbd1f..aebbd2df2 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_DistrPreview.cxx
@@ -50,7 +50,7 @@
 # include <algorithm>
 #endif
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 StdMeshersGUI_DistrPreview::StdMeshersGUI_DistrPreview( QWidget* p, StdMeshers::StdMeshers_NumberOfSegments_ptr h )
 : QwtPlot( p ),
diff --git a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx
index 2ff99486f..e52d11d77 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.cxx
@@ -25,8 +25,8 @@
 //
 #include "StdMeshersGUI_FixedPointsParamWdg.h"
 
-#include <QtxIntSpinBox.h>
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 // Qt includes
 #include <QPushButton>
diff --git a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.h b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.h
index 273781d34..1f31b5fff 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_FixedPointsParamWdg.h
@@ -26,7 +26,7 @@
 #define STDMESHERSGUI_FIXEDPOINTSPARAMWGD_H
 
 // SMESH includes
-#include <SMESHGUI.h>
+#include "SMESHGUI.h"
 #include "SMESH_StdMeshersGUI.hxx"
 
 // Qt includes
diff --git a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
index 7265cc88f..91b8b1f8b 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_LayerDistributionParamWdg.cxx
@@ -30,7 +30,7 @@
 #include <SMESHGUI_Hypotheses.h>
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
+#include <gui/SalomeApp_Tools.h>
 
 // Qt includes
 #include <QPushButton>
diff --git a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
index 2ee5473af..f7004be10 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
@@ -37,9 +37,9 @@
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_IntSpinBox.h>
-#include <QtxComboBox.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_IntSpinBox.h>
+#include <gui/QtxComboBox.h>
 
 // Qt includes
 #include <QLabel>
diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
index 37a3ce7ee..086e54aca 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.cxx
@@ -30,13 +30,13 @@
 #include <SMESH_TypeFilter.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
-#include <LightApp_SelectionMgr.h>
-#include <SVTK_ViewWindow.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_ListIO.hxx>
 
 // SALOME KERNEL incldues
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 // Qt includes
 #include <QPushButton>
diff --git a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
index 62e5096af..352111f5c 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_ObjectReferenceParamWdg.h
@@ -28,7 +28,7 @@
 // SMESH includes
 #include "SMESH_StdMeshersGUI.hxx"
 
-#include <SMESH_Type.h>
+#include "SMESH_Type.h"
 
 // Qt includes
 #include <QWidget>
diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
index fd9413046..eef868e5b 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx
@@ -35,10 +35,10 @@
 #include "StdMeshersGUI_LayerDistributionParamWdg.h"
 #include "StdMeshersGUI_SubShapeSelectorWdg.h"
 #include "StdMeshersGUI_FixedPointsParamWdg.h"
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // SALOME GUI includes
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 // IDL includes
 #include <SALOMEconfig.h>
diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h
index 0973c5c03..52fb79706 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.h
@@ -27,7 +27,7 @@
 
 // SMESH includes
 #include "SMESH_StdMeshersGUI.hxx"
-#include <SMESHGUI_Hypotheses.h>
+#include "SMESHGUI_Hypotheses.h"
 
 
 /*!
diff --git a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
index 26527d85b..1cd4774dc 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
+++ b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.cxx
@@ -37,21 +37,21 @@
 #include "SMESHGUI_GEOMGenUtils.h"
 
 // SVTK Includes
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Selector.h>
 
 // SALOME GUI includes
-#include <SALOME_ListIO.hxx>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 // SUIT Includes
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 // GEOM Includes
-#include <GEOMBase.h>
+#include <geom/GEOMBase.h>
 
 // Qt includes
 #include <QPushButton>
@@ -68,7 +68,7 @@
 #include <TopExp_Explorer.hxx>
 
 // SALOME KERNEL includes
-#include <SALOMEDS_SObject.hxx>
+#include <kernel/SALOMEDS_SObject.hxx>
 
 #define SPACING 6
 #define MARGIN 0
diff --git a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.h b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.h
index 49e49e82a..deb2a3298 100644
--- a/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.h
+++ b/src/StdMeshersGUI/StdMeshersGUI_SubShapeSelectorWdg.h
@@ -26,7 +26,7 @@
 #define STDMESHERSGUI_SUBSHAPESELECTORWDG_H
 
 // SMESH includes
-#include <SMESHGUI.h>
+#include "SMESHGUI.h"
 #include "SMESH_StdMeshersGUI.hxx"
 #include "SMESH_SMESHGUI.hxx"
 
@@ -35,7 +35,7 @@
 #include <QStringList>
 #include <TopoDS_Shape.hxx>
 
-#include <SMESHGUI_VTKUtils.h>
+#include "SMESHGUI_VTKUtils.h"
 
 class SMESHGUI;
 class LightApp_SelectionMgr;
diff --git a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
index e8b26b21a..98fa5cb4d 100644
--- a/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Arithmetic1D_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx
index aeb7bb96a..76ca74f34 100644
--- a/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_AutomaticLength_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx b/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx
index c9d1d7693..69929adbf 100644
--- a/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_CompositeSegment_1D_i.cxx
@@ -27,8 +27,8 @@
 #include "StdMeshers_CompositeSegment_1D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
index a8eaca72f..5f9d2b51d 100644
--- a/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Deflection1D_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx
index e4ff4ac79..786ce556b 100644
--- a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
index 7910d716b..97484a75c 100644
--- a/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Hexa_3D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_Hexa_3D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx
index 7ad41bb93..6f0a18856 100644
--- a/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LayerDistribution2D_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "StdMeshers_LayerDistribution2D_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx
index 53707613c..455d71e80 100644
--- a/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LayerDistribution_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx
index 9b9260094..ecacc27c9 100644
--- a/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LengthFromEdges_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_LengthFromEdges_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
index ca58ed632..4312b7ad4 100644
--- a/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_LocalLength_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx
index 80721eb2b..af9b7d9c5 100644
--- a/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MEFISTO_2D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_MEFISTO_2D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
index e4f59f5e3..54fd57b1d 100644
--- a/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementArea_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
index 35a01717f..ce5ae7ba8 100644
--- a/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxElementVolume_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx b/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx
index 6104c81c5..e5d487221 100644
--- a/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_MaxLength_i.cxx
@@ -27,8 +27,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx
index 59f13b891..8b2efee29 100644
--- a/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NotConformAllowed_i.cxx
@@ -28,7 +28,7 @@
 #include "StdMeshers_NotConformAllowed_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx
index 2dabe905d..3c9b5fee1 100644
--- a/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers2D_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "StdMeshers_NumberOfLayers2D_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx
index 9779cfbdb..2c5a34ce4 100644
--- a/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfLayers_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
index a2cc07c42..51bbbf40f 100644
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx
index bdb6e87d4..42b869ac6 100644
--- a/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Prism_3D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_Prism_3D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
index 62d7d7af7..3f3edddae 100644
--- a/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_ProjectionSource1D_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include "StdMeshers_ObjRefUlils.hxx"
 
diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
index 6186a7b04..2a8b07144 100644
--- a/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_ProjectionSource2D_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include "StdMeshers_ObjRefUlils.hxx"
 
diff --git a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx
index 5ee44b3fc..e88d0caf1 100644
--- a/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_ProjectionSource3D_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include "StdMeshers_ObjRefUlils.hxx"
 
diff --git a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx
index 836352163..d08c49eeb 100644
--- a/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Projection_1D_2D_3D_i.cxx
@@ -30,8 +30,8 @@
 
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include "StdMeshers_ObjRefUlils.hxx"
 
diff --git a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx
index 707e41600..1557c6362 100644
--- a/src/StdMeshers_I/StdMeshers_Propagation_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Propagation_i.cxx
@@ -27,8 +27,8 @@
 #include "StdMeshers_Propagation_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
index 875a7df50..5ff8f6a09 100644
--- a/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadrangleParams_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx
index c199fcebd..03a5a7ee7 100644
--- a/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadranglePreference_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx
index 674410304..2a255ae57 100644
--- a/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Quadrangle_2D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_Quadrangle_2D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx
index 46052eb94..3f4f8b961 100644
--- a/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_QuadraticMesh_i.cxx
@@ -30,8 +30,8 @@
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 //#include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx b/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx
index d588453dc..e5ea3c217 100644
--- a/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_RadialQuadrangle_1D2D_i.cxx
@@ -27,8 +27,8 @@
 #include "StdMeshers_RadialQuadrangle_1D2D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx b/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx
index 1ac655bda..934e3ac82 100644
--- a/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_Regular_1D_i.cxx
@@ -29,8 +29,8 @@
 #include "StdMeshers_Regular_1D_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx b/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx
index fb81f9e9f..7f8f0d910 100644
--- a/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_SegmentAroundVertex_0D_i.cxx
@@ -30,8 +30,8 @@
 
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx
index 9ee69e626..629143578 100644
--- a/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_SegmentLengthAroundVertex_i.cxx
@@ -28,8 +28,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
index 9af54879d..b45374673 100644
--- a/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_StartEndLength_i.cxx
@@ -31,8 +31,8 @@
 #include "SMESH_Gen.hxx"
 #include "SMESH_PythonDump.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx b/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx
index 330216d89..4344ac67d 100644
--- a/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_TrianglePreference_i.cxx
@@ -27,8 +27,8 @@
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
 
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
 #include <TCollection_AsciiString.hxx>
 
diff --git a/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx b/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx
index 63814d218..56ae7ddf5 100644
--- a/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_UseExisting_1D2D_i.cxx
@@ -30,7 +30,7 @@
 
 #include "SMESH_Gen.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //=============================================================================
 /*!
diff --git a/src/StdMeshers_I/StdMeshers_i.cxx b/src/StdMeshers_I/StdMeshers_i.cxx
index 952bc8a8d..b2f8d16ae 100644
--- a/src/StdMeshers_I/StdMeshers_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_i.cxx
@@ -28,7 +28,7 @@
 
 #include "SMESH_Gen_i.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "StdMeshers_LocalLength_i.hxx"
 #include "StdMeshers_AutomaticLength_i.hxx"