From: adv <adv@opencascade.com>
Date: Thu, 18 Feb 2010 11:55:09 +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=dd4ba5bbc97f8f06a85ea58c2eb897d54c3c46a1;p=modules%2Fgeom.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_GEOM.m4 b/adm_local/unix/config_files/check_GEOM.m4
index dd30f1b07..8c676d5ac 100644
--- a/adm_local/unix/config_files/check_GEOM.m4
+++ b/adm_local/unix/config_files/check_GEOM.m4
@@ -69,7 +69,7 @@ if test -f ${GEOM_DIR}/bin/salome/geompy.py ; then
    AC_SUBST(GEOM_ROOT_DIR)
 
    GEOM_LDFLAGS=-L${GEOM_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   GEOM_CXXFLAGS=-I${GEOM_DIR}/include/salome
+   GEOM_CXXFLAGS="-I${GEOM_DIR}/include/salome -I${GEOM_DIR}/include/salome/skel"
 
    AC_SUBST(GEOM_LDFLAGS)
    AC_SUBST(GEOM_CXXFLAGS)
diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4
index 931449768..86876d4ab 100755
--- a/adm_local/unix/config_files/check_GUI.m4
+++ b/adm_local/unix/config_files/check_GUI.m4
@@ -74,7 +74,7 @@ else
     GUI_ROOT_DIR=${SALOME_GUI_DIR}
 
     GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-    GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome
+    GUI_CXXFLAGS="-I${SALOME_GUI_DIR}/include/salome -I${SALOME_GUI_DIR}/include/salome/skel"
 
     AC_CHECKING(for full GUI)
     if test -f ${SALOME_GUI_DIR}/bin/salome/SALOME_Session_Server ; then
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 e7bf544b5..32783b3fb 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLGEOM.la
 nodist_libSalomeIDLGEOM_la_SOURCES = GEOM_GenSK.cc GEOM_SupervSK.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)
 
 libSalomeIDLGEOM_la_CPPFLAGS =			\
 	-I$(top_builddir)/idl			\
diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.cxx b/src/ARCHIMEDE/Archimede_VolumeSection.cxx
index f9276aa46..dda4c6ee7 100644
--- a/src/ARCHIMEDE/Archimede_VolumeSection.cxx
+++ b/src/ARCHIMEDE/Archimede_VolumeSection.cxx
@@ -26,7 +26,7 @@
 //  $Header$
 //
 #include "Archimede_VolumeSection.hxx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepMesh_IncrementalMesh.hxx>
 #include <TopExp_Explorer.hxx>
diff --git a/src/BREPExport/BREPExport.cxx b/src/BREPExport/BREPExport.cxx
index 154d4986f..f375e42c5 100644
--- a/src/BREPExport/BREPExport.cxx
+++ b/src/BREPExport/BREPExport.cxx
@@ -24,7 +24,7 @@
 // Author:      Pavel TELKOV
 //              <ptv@mutex.nnov.opencascade.com>
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepTools.hxx>
 
diff --git a/src/BREPImport/BREPImport.cxx b/src/BREPImport/BREPImport.cxx
index cb7d8692e..2bf5d6ae3 100644
--- a/src/BREPImport/BREPImport.cxx
+++ b/src/BREPImport/BREPImport.cxx
@@ -24,7 +24,7 @@
 // Author:      Pavel TELKOV
 //              <ptv@mutex.nnov.opencascade.com>
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepTools.hxx>
 #include <BRep_Builder.hxx>
diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx
index ab7c09429..5e830b8f3 100644
--- a/src/BasicGUI/BasicGUI.cxx
+++ b/src/BasicGUI/BasicGUI.cxx
@@ -38,13 +38,13 @@
 
 #include <GeometryGUI.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ViewWindow.h>
-#include <OCCViewer_ViewWindow.h>
-#include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewManager.h>
-#include <OCCViewer_ViewPort3d.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/OCCViewer_ViewWindow.h>
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewManager.h>
+#include <gui/OCCViewer_ViewPort3d.h>
 
 #include <BRep_Tool.hxx>
 #include <ProjLib.hxx>
diff --git a/src/BasicGUI/BasicGUI.h b/src/BasicGUI/BasicGUI.h
index 1b95e5fbf..a8dd8157e 100644
--- a/src/BasicGUI/BasicGUI.h
+++ b/src/BasicGUI/BasicGUI.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_H
 #define BASICGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 #include <V3d_View.hxx>
 
 //=================================================================================
diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx
index 59d131720..ba1874f3f 100644
--- a/src/BasicGUI/BasicGUI_ArcDlg.cxx
+++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h
index 49828b720..610dce6a7 100644
--- a/src/BasicGUI/BasicGUI_ArcDlg.h
+++ b/src/BasicGUI/BasicGUI_ArcDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_ARCDLG_H
 #define BASICGUI_ARCDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_3Sel;
 class DlgRef_3Sel1Check;
diff --git a/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx
index e92e92374..9512524b1 100644
--- a/src/BasicGUI/BasicGUI_CircleDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx
@@ -30,10 +30,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h
index b1574fd6d..4d2c5f805 100644
--- a/src/BasicGUI/BasicGUI_CircleDlg.h
+++ b/src/BasicGUI/BasicGUI_CircleDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_CIRCLEDLG_H
 #define BASICGUI_CIRCLEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_3Sel;
 class DlgRef_2Sel1Spin;
diff --git a/src/BasicGUI/BasicGUI_CurveDlg.cxx b/src/BasicGUI/BasicGUI_CurveDlg.cxx
index 2689f3c2a..8c5c2909e 100644
--- a/src/BasicGUI/BasicGUI_CurveDlg.cxx
+++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx
@@ -29,14 +29,14 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <LightApp_SelectionMgr.h>
-
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <SALOME_ListIO.hxx>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h
index f0308d634..bc0928b28 100644
--- a/src/BasicGUI/BasicGUI_CurveDlg.h
+++ b/src/BasicGUI/BasicGUI_CurveDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_CURVEDLG_H
 #define BASICGUI_CURVEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <list>
 
diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx
index 549074327..a3071f1a6 100644
--- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx
+++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx
@@ -30,10 +30,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h
index c80bce197..93bf890da 100644
--- a/src/BasicGUI/BasicGUI_EllipseDlg.h
+++ b/src/BasicGUI/BasicGUI_EllipseDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_ELLIPSEDLG_H
 #define BASICGUI_ELLIPSEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_3Sel2Spin;
 
diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx
index f094ed9a2..e88864874 100644
--- a/src/BasicGUI/BasicGUI_LineDlg.cxx
+++ b/src/BasicGUI/BasicGUI_LineDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h
index 5b716f206..2f2be08ea 100644
--- a/src/BasicGUI/BasicGUI_LineDlg.h
+++ b/src/BasicGUI/BasicGUI_LineDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_LINEDLG_H
 #define BASICGUI_LINEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel;
 
diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
index 75c490a49..7f50e8ab1 100644
--- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <QLabel>
 
diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h
index 18e765af4..a6edea61f 100644
--- a/src/BasicGUI/BasicGUI_MarkerDlg.h
+++ b/src/BasicGUI/BasicGUI_MarkerDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_MARKERDLG_H
 #define BASICGUI_MARKERDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <QMap>
 
diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
index 075a0c86b..703dfe758 100644
--- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx
@@ -30,10 +30,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TColStd_MapOfInteger.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h
index 6b2a6fde3..ddb4341df 100644
--- a/src/BasicGUI/BasicGUI_PlaneDlg.h
+++ b/src/BasicGUI/BasicGUI_PlaneDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_PLANEDLG_H
 #define BASICGUI_PLANEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Spin;
 class DlgRef_2Sel1Spin;
diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx
index 2eebfdca6..ac82a6d6c 100644
--- a/src/BasicGUI/BasicGUI_PointDlg.cxx
+++ b/src/BasicGUI/BasicGUI_PointDlg.cxx
@@ -25,10 +25,10 @@
 
 #include "BasicGUI_PointDlg.h"
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h
index f12f74bf1..b5792512b 100644
--- a/src/BasicGUI/BasicGUI_PointDlg.h
+++ b/src/BasicGUI/BasicGUI_PointDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_POINTDLG_H
 #define BASICGUI_POINTDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 #include <QMap>
 
 class DlgRef_1Sel1Spin;
diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx
index ff085f0fb..ccbe89521 100644
--- a/src/BasicGUI/BasicGUI_VectorDlg.cxx
+++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h
index 747ef534b..8bdea64b2 100644
--- a/src/BasicGUI/BasicGUI_VectorDlg.h
+++ b/src/BasicGUI/BasicGUI_VectorDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_VECTORDLG_H
 #define BASICGUI_VECTORDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel;
 class DlgRef_3Spin1Check;
diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
index e3207ab76..a41f98563 100644
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <BRep_Tool.hxx>
diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
index e125b8c7c..2cb15028a 100644
--- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
+++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_WORKINGPLANEDLG_H
 #define BASICGUI_WORKINGPLANEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <gp_Ax3.hxx>
 
diff --git a/src/BlocksGUI/BlocksGUI.cxx b/src/BlocksGUI/BlocksGUI.cxx
index 547510dc8..9f9441e3d 100644
--- a/src/BlocksGUI/BlocksGUI.cxx
+++ b/src/BlocksGUI/BlocksGUI.cxx
@@ -33,10 +33,10 @@
 
 #include <GeometryGUI.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
 
 //=======================================================================
 // function : BlocksGUI()
diff --git a/src/BlocksGUI/BlocksGUI.h b/src/BlocksGUI/BlocksGUI.h
index b9d48fb0e..217ef0511 100644
--- a/src/BlocksGUI/BlocksGUI.h
+++ b/src/BlocksGUI/BlocksGUI.h
@@ -26,7 +26,7 @@
 #ifndef BLOCKSGUI_H
 #define BLOCKSGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
 //=================================================================================
 // class    : BlocksGUI
diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx
index 715bc222c..c7f6c6ed0 100644
--- a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <GEOMImpl_Types.hxx>
 
diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.h b/src/BlocksGUI/BlocksGUI_BlockDlg.h
index 23e372ba6..9b7301d40 100644
--- a/src/BlocksGUI/BlocksGUI_BlockDlg.h
+++ b/src/BlocksGUI/BlocksGUI_BlockDlg.h
@@ -26,7 +26,7 @@
 #ifndef BLOCKSGUI_BLOCKDLG_H
 #define BLOCKSGUI_BLOCKDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel;
 class DlgRef_6Sel;
diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
index 6f8983e59..b75b797e0 100644
--- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx
@@ -29,16 +29,16 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_MessageBox.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <OCCViewer_ViewModel.h>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 //=================================================================================
 // class    : BlocksGUI_ExplodeDlg()
diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h
index 63b616a4d..61ed1095d 100644
--- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h
+++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h
@@ -26,7 +26,7 @@
 #ifndef BLOCKSGUI_EXPLODEDLG_H
 #define BLOCKSGUI_EXPLODEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel2Spin1View1Check;
 
diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
index e3fdd559d..f141d76f3 100644
--- a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx
@@ -30,10 +30,10 @@
 #include <GEOMBase.h>
 #include <GEOMImpl_Types.hxx>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TColStd_MapOfInteger.hxx>
 
diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.h b/src/BlocksGUI/BlocksGUI_PropagateDlg.h
index a4eaf5a83..6f4d5cc28 100644
--- a/src/BlocksGUI/BlocksGUI_PropagateDlg.h
+++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.h
@@ -26,7 +26,7 @@
 #ifndef BLOCKSGUI_PROPAGATEDLG_H
 #define BLOCKSGUI_PROPAGATEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel;
 
diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
index fd32bbbd8..8f95c28e0 100644
--- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // QT Includes
 #include <qlabel.h>
diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
index 1d55983f3..a794d2907 100644
--- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
+++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h
@@ -26,7 +26,7 @@
 #ifndef BLOCKSGUI_QUADFACEDLG_H
 #define BLOCKSGUI_QUADFACEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <QMap>
 
diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
index 27143ade1..a23b32a26 100644
--- a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
+++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx
@@ -29,14 +29,14 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <OCCViewer_ViewModel.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/OCCViewer_ViewModel.h>
 
 // OCCT Includes
 #include <TColStd_IndexedMapOfInteger.hxx>
diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.h b/src/BlocksGUI/BlocksGUI_TrsfDlg.h
index 558ea7516..7e858a433 100644
--- a/src/BlocksGUI/BlocksGUI_TrsfDlg.h
+++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.h
@@ -26,7 +26,7 @@
 #ifndef BLOCKSGUI_TRSFDLG_H
 #define BLOCKSGUI_TRSFDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <QMap>
 
diff --git a/src/BooleanGUI/BooleanGUI.cxx b/src/BooleanGUI/BooleanGUI.cxx
index c05c03462..3357749ab 100644
--- a/src/BooleanGUI/BooleanGUI.cxx
+++ b/src/BooleanGUI/BooleanGUI.cxx
@@ -27,7 +27,7 @@
 #include "BooleanGUI_Dialog.h"
 
 #include <GeometryGUI.h>
-#include <SUIT_Desktop.h>
+#include <gui/SUIT_Desktop.h>
 
 //=======================================================================
 // function : BooleanGUI()
diff --git a/src/BooleanGUI/BooleanGUI.h b/src/BooleanGUI/BooleanGUI.h
index d4868c358..40b7a16c6 100644
--- a/src/BooleanGUI/BooleanGUI.h
+++ b/src/BooleanGUI/BooleanGUI.h
@@ -26,7 +26,7 @@
 #ifndef BOOLEANGUI_H
 #define BOOLEANGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
 //=================================================================================
 // class    : BooleanGUI
diff --git a/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx
index 85ea087c2..db0db9112 100644
--- a/src/BooleanGUI/BooleanGUI_Dialog.cxx
+++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx
@@ -30,10 +30,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : BooleanGUI_Dialog()
diff --git a/src/BooleanGUI/BooleanGUI_Dialog.h b/src/BooleanGUI/BooleanGUI_Dialog.h
index 7187896b3..74286fa0c 100644
--- a/src/BooleanGUI/BooleanGUI_Dialog.h
+++ b/src/BooleanGUI/BooleanGUI_Dialog.h
@@ -26,7 +26,7 @@
 #ifndef BOOLEANGUI_DIALOG_H
 #define BOOLEANGUI_DIALOG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel;
 
diff --git a/src/BuildGUI/BuildGUI.cxx b/src/BuildGUI/BuildGUI.cxx
index 643cbf11a..0a17e2183 100644
--- a/src/BuildGUI/BuildGUI.cxx
+++ b/src/BuildGUI/BuildGUI.cxx
@@ -25,8 +25,8 @@
 //
 #include "BuildGUI.h"
 
-#include <SUIT_Desktop.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SalomeApp_Application.h>
 
 #include "BuildGUI_EdgeDlg.h"       // Method EDGE
 #include "BuildGUI_WireDlg.h"       // Method WIRE
diff --git a/src/BuildGUI/BuildGUI.h b/src/BuildGUI/BuildGUI.h
index 1ae6aed71..42e6a7da5 100644
--- a/src/BuildGUI/BuildGUI.h
+++ b/src/BuildGUI/BuildGUI.h
@@ -26,7 +26,7 @@
 #ifndef BUILDGUI_H
 #define BUILDGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
 //=================================================================================
 // class    : BuildGUI
diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
index 6090bb469..52e27cc03 100644
--- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx
+++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx
@@ -31,10 +31,10 @@
 
 #include <GEOMImpl_Types.hxx>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : BuildGUI_CompoundDlg()
diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.h b/src/BuildGUI/BuildGUI_CompoundDlg.h
index 4aa6de210..2acf8730d 100644
--- a/src/BuildGUI/BuildGUI_CompoundDlg.h
+++ b/src/BuildGUI/BuildGUI_CompoundDlg.h
@@ -26,7 +26,7 @@
 #ifndef BUILDGUI_COMPOUNDDLG_H
 #define BUILDGUI_COMPOUNDDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel;
 
diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
index 9bf572613..8877c54a6 100644
--- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx
+++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <GEOMImpl_Types.hxx>
 
diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.h b/src/BuildGUI/BuildGUI_EdgeDlg.h
index 17dda7703..788e32a23 100644
--- a/src/BuildGUI/BuildGUI_EdgeDlg.h
+++ b/src/BuildGUI/BuildGUI_EdgeDlg.h
@@ -26,7 +26,7 @@
 #ifndef BUILDGUI_EDGEDLG_H
 #define BUILDGUI_EDGEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel;
 
diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx
index 1a1ae8134..d5e6a89cf 100644
--- a/src/BuildGUI/BuildGUI_FaceDlg.cxx
+++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx
@@ -32,10 +32,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : BuildGUI_FaceDlg()
diff --git a/src/BuildGUI/BuildGUI_FaceDlg.h b/src/BuildGUI/BuildGUI_FaceDlg.h
index 12bd7d713..fe35ef2e5 100644
--- a/src/BuildGUI/BuildGUI_FaceDlg.h
+++ b/src/BuildGUI/BuildGUI_FaceDlg.h
@@ -26,7 +26,7 @@
 #ifndef BUILDGUI_FACEDLG_H
 #define BUILDGUI_FACEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Check;
 
diff --git a/src/BuildGUI/BuildGUI_ShellDlg.cxx b/src/BuildGUI/BuildGUI_ShellDlg.cxx
index ebaad3b07..f04e33d78 100644
--- a/src/BuildGUI/BuildGUI_ShellDlg.cxx
+++ b/src/BuildGUI/BuildGUI_ShellDlg.cxx
@@ -31,10 +31,10 @@
 
 #include <GEOMImpl_Types.hxx>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TColStd_MapOfInteger.hxx>
 
diff --git a/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h
index d611afe24..553e573e2 100644
--- a/src/BuildGUI/BuildGUI_ShellDlg.h
+++ b/src/BuildGUI/BuildGUI_ShellDlg.h
@@ -26,7 +26,7 @@
 #ifndef BUILDGUI_SHELLDLG_H
 #define BUILDGUI_SHELLDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel;
 
diff --git a/src/BuildGUI/BuildGUI_SolidDlg.cxx b/src/BuildGUI/BuildGUI_SolidDlg.cxx
index 5e1154a2a..56f10f158 100644
--- a/src/BuildGUI/BuildGUI_SolidDlg.cxx
+++ b/src/BuildGUI/BuildGUI_SolidDlg.cxx
@@ -31,11 +31,11 @@
 
 #include <GEOMImpl_Types.hxx>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : BuildGUI_SolidDlg()
diff --git a/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h
index 3a40326b8..26f4db598 100644
--- a/src/BuildGUI/BuildGUI_SolidDlg.h
+++ b/src/BuildGUI/BuildGUI_SolidDlg.h
@@ -26,7 +26,7 @@
 #ifndef BUILDGUI_SOLIDDLG_H
 #define BUILDGUI_SOLIDDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Check;
 
diff --git a/src/BuildGUI/BuildGUI_WireDlg.cxx b/src/BuildGUI/BuildGUI_WireDlg.cxx
index 29f54f671..2c96301e5 100644
--- a/src/BuildGUI/BuildGUI_WireDlg.cxx
+++ b/src/BuildGUI/BuildGUI_WireDlg.cxx
@@ -31,10 +31,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TColStd_MapOfInteger.hxx>
 #include <Precision.hxx>
diff --git a/src/BuildGUI/BuildGUI_WireDlg.h b/src/BuildGUI/BuildGUI_WireDlg.h
index 6b500ee30..f4282bbd6 100644
--- a/src/BuildGUI/BuildGUI_WireDlg.h
+++ b/src/BuildGUI/BuildGUI_WireDlg.h
@@ -26,7 +26,7 @@
 #ifndef BUILDGUI_WIREDLG_H
 #define BUILDGUI_WIREDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Spin;
 
diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx
index c3238572b..bb2387b8d 100644
--- a/src/DisplayGUI/DisplayGUI.cxx
+++ b/src/DisplayGUI/DisplayGUI.cxx
@@ -29,28 +29,28 @@
 #include <GEOM_AISShape.hxx>
 #include <GEOM_Actor.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <OCCViewer_ViewManager.h>
-#include <OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewManager.h>
+#include <gui/OCCViewer_ViewModel.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SVTK_ViewWindow.h>
-#include <SVTK_View.h>
-#include <SVTK_ViewModel.h>
-#include <SOCC_ViewModel.h>
-#include <SVTK_Prs.h>
-#include <SOCC_Prs.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_View.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SOCC_ViewModel.h>
+#include <gui/SVTK_Prs.h>
+#include <gui/SOCC_Prs.h>
 
-#include <QtxActionMenuMgr.h>
+#include <gui/QtxActionMenuMgr.h>
 
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Study.h>
 
 #include <AIS_ListIteratorOfListOfInteractive.hxx>
 
diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.ui
index ab8c89f83..db2e6fab3 100644
--- a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.ui
@@ -124,7 +124,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_1Sel1Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel1Spin_QTD.ui
index 06d9d7c13..9ac7a4900 100644
--- a/src/DlgRef/DlgRef_1Sel1Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel1Spin_QTD.ui
@@ -117,7 +117,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
index 675626f54..eb1edb03b 100644
--- a/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
@@ -130,7 +130,7 @@
   <customwidget>
    <class>SalomeApp_IntSpinBox</class>
    <extends>QSpinBox</extends>
-   <header location="global" >SalomeApp_IntSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_IntSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_1Sel2Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel2Spin_QTD.ui
index 432160bea..d218cd04a 100644
--- a/src/DlgRef/DlgRef_1Sel2Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel2Spin_QTD.ui
@@ -136,7 +136,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_1Sel3Spin1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel3Spin1Check_QTD.ui
index 37a9f4a66..ce9e92c26 100644
--- a/src/DlgRef/DlgRef_1Sel3Spin1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel3Spin1Check_QTD.ui
@@ -162,7 +162,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_1Sel3Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel3Spin_QTD.ui
index 6ec567c6e..1bd12d1dc 100644
--- a/src/DlgRef/DlgRef_1Sel3Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel3Spin_QTD.ui
@@ -155,7 +155,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui
index 5bb4e299c..4c12dfcda 100644
--- a/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel4Spin_QTD.ui
@@ -198,7 +198,7 @@
   <customwidget>
    <class>QtxDoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >QtxDoubleSpinBox.h</header>
+   <header location="global" >gui/QtxDoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.ui
index 3c50b200c..2d102e727 100644
--- a/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel5Spin1Check_QTD.ui
@@ -178,7 +178,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui
index eb2fd7743..0ff5513a6 100644
--- a/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_1Sel5Spin_QTD.ui
@@ -215,7 +215,7 @@
   <customwidget>
    <class>QtxDoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >QtxDoubleSpinBox.h</header>
+   <header location="global" >gui/QtxDoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_1Spin_QTD.ui b/src/DlgRef/DlgRef_1Spin_QTD.ui
index 1ede440a5..4db598bc6 100644
--- a/src/DlgRef/DlgRef_1Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_1Spin_QTD.ui
@@ -85,7 +85,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.ui b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.ui
index 5bb1b8e38..e237e31e9 100644
--- a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.ui
+++ b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.ui
@@ -176,7 +176,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_2Sel1SpinInt_QTD.ui b/src/DlgRef/DlgRef_2Sel1SpinInt_QTD.ui
index c86bf826b..1551f7932 100644
--- a/src/DlgRef/DlgRef_2Sel1SpinInt_QTD.ui
+++ b/src/DlgRef/DlgRef_2Sel1SpinInt_QTD.ui
@@ -155,7 +155,7 @@
   <customwidget>
    <class>SalomeApp_IntSpinBox</class>
    <extends>QSpinBox</extends>
-   <header location="global" >SalomeApp_IntSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_IntSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_2Sel1Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel1Spin_QTD.ui
index 76fc2d494..61f4d6a4b 100644
--- a/src/DlgRef/DlgRef_2Sel1Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_2Sel1Spin_QTD.ui
@@ -155,7 +155,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.ui b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.ui
index 6a0b63ac2..258284904 100644
--- a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.ui
@@ -175,12 +175,12 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
   <customwidget>
    <class>SalomeApp_IntSpinBox</class>
    <extends>QSpinBox</extends>
-   <header location="global" >SalomeApp_IntSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_IntSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_2Sel2Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel2Spin_QTD.ui
index f9df9178f..5a22d9d61 100644
--- a/src/DlgRef/DlgRef_2Sel2Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_2Sel2Spin_QTD.ui
@@ -168,7 +168,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui b/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui
index 050f8baae..72d7321df 100644
--- a/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui
+++ b/src/DlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui
@@ -192,7 +192,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui
index b3f27fb8e..e2ddb7d04 100644
--- a/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_2Sel3Spin_QTD.ui
@@ -187,7 +187,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.ui b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.ui
index 5d0afce71..9fb678d49 100644
--- a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.ui
@@ -213,12 +213,12 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
   <customwidget>
    <class>SalomeApp_IntSpinBox</class>
    <extends>QSpinBox</extends>
-   <header location="global" >SalomeApp_IntSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_IntSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_2Spin_QTD.ui b/src/DlgRef/DlgRef_2Spin_QTD.ui
index 466bf527d..23498ce33 100644
--- a/src/DlgRef/DlgRef_2Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_2Spin_QTD.ui
@@ -104,7 +104,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui b/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui
index f6f82c007..ab533da4e 100644
--- a/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui
@@ -145,7 +145,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_3Sel1Spin_QTD.ui b/src/DlgRef/DlgRef_3Sel1Spin_QTD.ui
index d1f2f04f4..2ca8162c4 100644
--- a/src/DlgRef/DlgRef_3Sel1Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_3Sel1Spin_QTD.ui
@@ -193,7 +193,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>	
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_3Sel2Spin_QTD.ui b/src/DlgRef/DlgRef_3Sel2Spin_QTD.ui
index 509282969..89f0e13d5 100644
--- a/src/DlgRef/DlgRef_3Sel2Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_3Sel2Spin_QTD.ui
@@ -182,7 +182,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
index ac29be9fd..048731dd8 100644
--- a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
@@ -238,7 +238,7 @@
   <customwidget>
    <class>QtxDoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >QtxDoubleSpinBox.h</header>
+   <header location="global" >gui/QtxDoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.ui b/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.ui
index 10ee30bc3..0b05401e6 100644
--- a/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.ui
+++ b/src/DlgRef/DlgRef_3Sel3Spin2Check_QTD.ui
@@ -209,7 +209,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.ui b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.ui
index 27e9963dd..d3c2c1694 100644
--- a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.ui
+++ b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.ui
@@ -252,12 +252,12 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
   <customwidget>
    <class>SalomeApp_IntSpinBox</class>
    <extends>QSpinBox</extends>
-   <header location="global" >SalomeApp_IntSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_IntSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_3Spin1Check_QTD.ui b/src/DlgRef/DlgRef_3Spin1Check_QTD.ui
index 7408ae941..19cf5d1c1 100644
--- a/src/DlgRef/DlgRef_3Spin1Check_QTD.ui
+++ b/src/DlgRef/DlgRef_3Spin1Check_QTD.ui
@@ -130,7 +130,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_3Spin_QTD.ui b/src/DlgRef/DlgRef_3Spin_QTD.ui
index 4ac7e5d12..1ae829703 100644
--- a/src/DlgRef/DlgRef_3Spin_QTD.ui
+++ b/src/DlgRef/DlgRef_3Spin_QTD.ui
@@ -123,7 +123,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.ui b/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.ui
index 83501ec05..50250546e 100644
--- a/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.ui
+++ b/src/DlgRef/DlgRef_4Sel1Spin2Check_QTD.ui
@@ -232,7 +232,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/DlgRef/DlgRef_4Sel1Spin3Check_QTD.ui b/src/DlgRef/DlgRef_4Sel1Spin3Check_QTD.ui
index 7dc96d006..1ae9bbdf3 100755
--- a/src/DlgRef/DlgRef_4Sel1Spin3Check_QTD.ui
+++ b/src/DlgRef/DlgRef_4Sel1Spin3Check_QTD.ui
@@ -245,7 +245,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx
index 5a03fc00f..b03881de2 100644
--- a/src/EntityGUI/EntityGUI.cxx
+++ b/src/EntityGUI/EntityGUI.cxx
@@ -27,12 +27,12 @@
 
 #include <GeometryGUI.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ViewWindow.h>
-#include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewManager.h>
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewManager.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
 #include <TopoDS_Shape.hxx>
 
diff --git a/src/EntityGUI/EntityGUI.h b/src/EntityGUI/EntityGUI.h
index bc401c68c..e38941cf7 100644
--- a/src/EntityGUI/EntityGUI.h
+++ b/src/EntityGUI/EntityGUI.h
@@ -26,9 +26,9 @@
 #ifndef ENTITYGUI_H
 #define ENTITYGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
-#include <SALOMEDSClient.hxx>
+#include <kernel/SALOMEDSClient.hxx>
 
 #include <AIS_Shape.hxx>
 
diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.ui b/src/EntityGUI/EntityGUI_1Spin_QTD.ui
index 687f962dc..18b87207b 100644
--- a/src/EntityGUI/EntityGUI_1Spin_QTD.ui
+++ b/src/EntityGUI/EntityGUI_1Spin_QTD.ui
@@ -94,7 +94,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.ui b/src/EntityGUI/EntityGUI_2Spin_QTD.ui
index f28257dd4..6253371af 100644
--- a/src/EntityGUI/EntityGUI_2Spin_QTD.ui
+++ b/src/EntityGUI/EntityGUI_2Spin_QTD.ui
@@ -115,7 +115,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
index 0f2c9092a..21af8c9ab 100755
--- a/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
@@ -25,7 +25,7 @@
 
 #include "EntityGUI_3DSketcherDlg.h"
 #include "EntityGUI_Widgets.h"
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <GEOMBase.h>
 #include <GeometryGUI.h>
@@ -33,13 +33,13 @@
 #include <Precision.hxx>  
 
 #include <DlgRef.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <BRep_Tool.hxx>
 #include <TopExp.hxx>
diff --git a/src/EntityGUI/EntityGUI_3DSketcherDlg.h b/src/EntityGUI/EntityGUI_3DSketcherDlg.h
index 2fc2b8605..c521d31b9 100755
--- a/src/EntityGUI/EntityGUI_3DSketcherDlg.h
+++ b/src/EntityGUI/EntityGUI_3DSketcherDlg.h
@@ -26,7 +26,7 @@
 #ifndef ENTITYGUI_3DSKETCHERDLG_H
 #define ENTITYGUI_3DSKETCHERDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class QDoubleSpinBox;
 class EntityGUI_3Spin;
diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.ui b/src/EntityGUI/EntityGUI_3Spin_QTD.ui
index 51dd64cfd..055174b28 100644
--- a/src/EntityGUI/EntityGUI_3Spin_QTD.ui
+++ b/src/EntityGUI/EntityGUI_3Spin_QTD.ui
@@ -136,7 +136,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.ui b/src/EntityGUI/EntityGUI_4Spin_QTD.ui
index 661beab41..6648dd52b 100644
--- a/src/EntityGUI/EntityGUI_4Spin_QTD.ui
+++ b/src/EntityGUI/EntityGUI_4Spin_QTD.ui
@@ -157,7 +157,7 @@
   <customwidget>
    <class>SalomeApp_DoubleSpinBox</class>
    <extends>QDoubleSpinBox</extends>
-   <header location="global" >SalomeApp_DoubleSpinBox.h</header>
+   <header location="global" >gui/SalomeApp_DoubleSpinBox.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
index 472a52eb4..45620cf59 100644
--- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
@@ -25,7 +25,7 @@
 //
 #include "EntityGUI_SketcherDlg.h"
 #include "EntityGUI_Widgets.h"
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <GEOMBase.h>
 #include <GeometryGUI.h>
@@ -33,13 +33,13 @@
 #include <Geom_Surface.hxx>
 #include <Geom_Plane.hxx>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <QKeyEvent>
 
@@ -52,7 +52,7 @@
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <Sketcher_Profile.hxx>
 
-#include <SalomeApp_Study.h>
+#include <gui/SalomeApp_Study.h>
 
 #include <gp_Pln.hxx>
 
diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.h b/src/EntityGUI/EntityGUI_SketcherDlg.h
index 13d2a880e..2a86f2f27 100644
--- a/src/EntityGUI/EntityGUI_SketcherDlg.h
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.h
@@ -26,7 +26,7 @@
 #ifndef ENTITYGUI_SKETCHERDLG_H
 #define ENTITYGUI_SKETCHERDLG_H
 
-#include <GEOMBase_Helper.h>
+#include "GEOMBase_Helper.h"
 
 #include <QGroupBox>
 #include <QComboBox>
diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
index 1510f79f0..00ecaa2c2 100644
--- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx
@@ -29,14 +29,14 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ViewWindow.h>
-#include <OCCViewer_ViewModel.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 #include <TopoDS_Iterator.hxx>
diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.h b/src/EntityGUI/EntityGUI_SubShapeDlg.h
index 943d21e8a..e23fddaf8 100644
--- a/src/EntityGUI/EntityGUI_SubShapeDlg.h
+++ b/src/EntityGUI/EntityGUI_SubShapeDlg.h
@@ -26,7 +26,7 @@
 #ifndef ENTITYGUI_SUBSHAPEDLG_H
 #define ENTITYGUI_SUBSHAPEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Check1List;
 
diff --git a/src/GEOM/GEOM_Application.hxx b/src/GEOM/GEOM_Application.hxx
index 119f84d95..f5346f959 100644
--- a/src/GEOM/GEOM_Application.hxx
+++ b/src/GEOM/GEOM_Application.hxx
@@ -29,7 +29,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOM_Application_HeaderFile
-#include <Handle_GEOM_Application.hxx>
+#include "Handle_GEOM_Application.hxx"
 #endif
 
 #ifndef _TDocStd_Application_HeaderFile
diff --git a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
index 1d590cd26..b5baa72a4 100644
--- a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
+++ b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx
@@ -29,7 +29,7 @@
 #include <Handle_Standard_Transient.hxx>
 #endif
 #ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
-#include <Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
+#include "Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx"
 #endif
 class Standard_NoSuchObject;
 class TCollection_AsciiString;
diff --git a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
index c91aa4823..32de4fb85 100644
--- a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
+++ b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
-#include <Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
+#include "Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx"
 #endif
 
 #ifndef _TCollection_AsciiString_HeaderFile
diff --git a/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
index 1b4a70d4c..90ed68196 100644
--- a/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
+++ b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
@@ -29,7 +29,7 @@
 #include <Handle_Standard_Transient.hxx>
 #endif
 #ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
-#include <Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
+#include "Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx
index e6da3ad15..7065eb529 100644
--- a/src/GEOM/GEOM_Engine.cxx
+++ b/src/GEOM/GEOM_Engine.cxx
@@ -32,7 +32,7 @@
 #include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx"
 #include "GEOM_PythonDump.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TDF_Tool.hxx>
 #include <TDF_Data.hxx>
diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx
index d9d1c321e..9e388b71b 100644
--- a/src/GEOM/GEOM_Function.cxx
+++ b/src/GEOM/GEOM_Function.cxx
@@ -26,7 +26,7 @@
 #include <GEOM_Solver.hxx>
 #include <GEOM_ISubShape.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TDF.hxx>
 #include <TDF_Tool.hxx>
diff --git a/src/GEOM/GEOM_IOperations.cxx b/src/GEOM/GEOM_IOperations.cxx
index 699a7b8f3..7e89209b2 100644
--- a/src/GEOM/GEOM_IOperations.cxx
+++ b/src/GEOM/GEOM_IOperations.cxx
@@ -23,9 +23,9 @@
 
 #include <GEOM_IOperations.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 <TDataStd_TreeNode.hxx>
 #include <TDataStd_ChildNodeIterator.hxx>
diff --git a/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx
index fc2170a86..7fa245479 100644
--- a/src/GEOM/GEOM_Object.cxx
+++ b/src/GEOM/GEOM_Object.cxx
@@ -21,7 +21,7 @@
 //
 #include <Standard_Stream.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <GEOM_Object.hxx>
 #include <GEOM_Engine.hxx>
diff --git a/src/GEOMAlgo/BlockFix.ixx b/src/GEOMAlgo/BlockFix.ixx
index 700a7f37a..1174ff0e2 100644
--- a/src/GEOMAlgo/BlockFix.ixx
+++ b/src/GEOMAlgo/BlockFix.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <BlockFix.jxx>
+#include "BlockFix.jxx"
 
  
 
diff --git a/src/GEOMAlgo/BlockFix.jxx b/src/GEOMAlgo/BlockFix.jxx
index 3c9000120..3889549da 100644
--- a/src/GEOMAlgo/BlockFix.jxx
+++ b/src/GEOMAlgo/BlockFix.jxx
@@ -23,5 +23,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _BlockFix_HeaderFile
-#include <BlockFix.hxx>
+#include "BlockFix.hxx"
 #endif
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx
index 686bc170d..c22d7df78 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_BlockFix_BlockFixAPI_HeaderFile
-#include <Handle_BlockFix_BlockFixAPI.hxx>
+#include "Handle_BlockFix_BlockFixAPI.hxx"
 #endif
 
 #ifndef _Handle_ShapeBuild_ReShape_HeaderFile
@@ -88,6 +88,6 @@ private:
   Standard_Integer myOptimumNbFaces;
 };
 
-#include <BlockFix_BlockFixAPI.lxx>
+#include "BlockFix_BlockFixAPI.lxx"
 
 #endif
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx b/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx
index 52c772bac..0058a9d97 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <BlockFix_BlockFixAPI.jxx>
+#include "BlockFix_BlockFixAPI.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx
index 6dee401ac..75b70a0aa 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx
@@ -26,5 +26,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _BlockFix_BlockFixAPI_HeaderFile
-#include <BlockFix_BlockFixAPI.hxx>
+#include "BlockFix_BlockFixAPI.hxx"
 #endif
diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx
index e66051950..40508eab2 100644
--- a/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx
+++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
-#include <BlockFix_BlockFixAPI.hxx>
+#include "BlockFix_BlockFixAPI.hxx"
 
 //=======================================================================
 //function : SetShape
diff --git a/src/GEOMAlgo/BlockFix_CheckTool.ixx b/src/GEOMAlgo/BlockFix_CheckTool.ixx
index a0af6be71..717c60364 100644
--- a/src/GEOMAlgo/BlockFix_CheckTool.ixx
+++ b/src/GEOMAlgo/BlockFix_CheckTool.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <BlockFix_CheckTool.jxx>
+#include "BlockFix_CheckTool.jxx"
 
  
 
diff --git a/src/GEOMAlgo/BlockFix_CheckTool.jxx b/src/GEOMAlgo/BlockFix_CheckTool.jxx
index 017d344ba..5b312f509 100644
--- a/src/GEOMAlgo/BlockFix_CheckTool.jxx
+++ b/src/GEOMAlgo/BlockFix_CheckTool.jxx
@@ -23,5 +23,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _BlockFix_CheckTool_HeaderFile
-#include <BlockFix_CheckTool.hxx>
+#include "BlockFix_CheckTool.hxx"
 #endif
diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx
index 842398a2f..665f7ea80 100644
--- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx
+++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_BlockFix_PeriodicSurfaceModifier_HeaderFile
-#include <Handle_BlockFix_PeriodicSurfaceModifier.hxx>
+#include "Handle_BlockFix_PeriodicSurfaceModifier.hxx"
 #endif
 
 #ifndef _Standard_Real_HeaderFile
diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx
index d400fa4a0..1a0e2e1bc 100644
--- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx
+++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <BlockFix_PeriodicSurfaceModifier.jxx>
+#include "BlockFix_PeriodicSurfaceModifier.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx
index 72b3e9684..ad5ffe864 100644
--- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx
+++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx
@@ -44,5 +44,5 @@
 #include <Geom2d_Curve.hxx>
 #endif
 #ifndef _BlockFix_PeriodicSurfaceModifier_HeaderFile
-#include <BlockFix_PeriodicSurfaceModifier.hxx>
+#include "BlockFix_PeriodicSurfaceModifier.hxx"
 #endif
diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx
index 095dfd3ad..397eebf3e 100644
--- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx
+++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_BlockFix_SphereSpaceModifier_HeaderFile
-#include <Handle_BlockFix_SphereSpaceModifier.hxx>
+#include "Handle_BlockFix_SphereSpaceModifier.hxx"
 #endif
 
 #ifndef _Standard_Real_HeaderFile
diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx
index 3dfcebe53..8b2bda39b 100644
--- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx
+++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <BlockFix_SphereSpaceModifier.jxx>
+#include "BlockFix_SphereSpaceModifier.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx
index 1b3792c56..f1759f2ab 100644
--- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx
+++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx
@@ -44,5 +44,5 @@
 #include <Geom2d_Curve.hxx>
 #endif
 #ifndef _BlockFix_SphereSpaceModifier_HeaderFile
-#include <BlockFix_SphereSpaceModifier.hxx>
+#include "BlockFix_SphereSpaceModifier.hxx"
 #endif
diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.cxx b/src/GEOMAlgo/BlockFix_UnionEdges.cxx
index 0749b0e06..2609c4350 100644
--- a/src/GEOMAlgo/BlockFix_UnionEdges.cxx
+++ b/src/GEOMAlgo/BlockFix_UnionEdges.cxx
@@ -57,7 +57,7 @@
 #include <TopoDS_Vertex.hxx>
 #include <TopoDS_Iterator.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //=======================================================================
 //function : BlockFix_UnionEdges()
diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.ixx b/src/GEOMAlgo/BlockFix_UnionEdges.ixx
index 03646c839..3bc204acf 100644
--- a/src/GEOMAlgo/BlockFix_UnionEdges.ixx
+++ b/src/GEOMAlgo/BlockFix_UnionEdges.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <BlockFix_UnionEdges.jxx>
+#include "BlockFix_UnionEdges.jxx"
 
  
 
diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.jxx b/src/GEOMAlgo/BlockFix_UnionEdges.jxx
index 4b4c3b635..8ceb8fd02 100644
--- a/src/GEOMAlgo/BlockFix_UnionEdges.jxx
+++ b/src/GEOMAlgo/BlockFix_UnionEdges.jxx
@@ -26,5 +26,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _BlockFix_UnionEdges_HeaderFile
-#include <BlockFix_UnionEdges.hxx>
+#include "BlockFix_UnionEdges.hxx"
 #endif
diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.ixx b/src/GEOMAlgo/BlockFix_UnionFaces.ixx
index 155eca0f5..a7db687b7 100644
--- a/src/GEOMAlgo/BlockFix_UnionFaces.ixx
+++ b/src/GEOMAlgo/BlockFix_UnionFaces.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <BlockFix_UnionFaces.jxx>
+#include "BlockFix_UnionFaces.jxx"
 
  
 
diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.jxx b/src/GEOMAlgo/BlockFix_UnionFaces.jxx
index 7a735aac6..d9a6dfae0 100644
--- a/src/GEOMAlgo/BlockFix_UnionFaces.jxx
+++ b/src/GEOMAlgo/BlockFix_UnionFaces.jxx
@@ -26,5 +26,5 @@
 #include <TopoDS_Face.hxx>
 #endif
 #ifndef _BlockFix_UnionFaces_HeaderFile
-#include <BlockFix_UnionFaces.hxx>
+#include "BlockFix_UnionFaces.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.ixx b/src/GEOMAlgo/GEOMAlgo_Algo.ixx
index c45fc54ca..6a8618a25 100644
--- a/src/GEOMAlgo/GEOMAlgo_Algo.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Algo.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_Algo.jxx>
+#include "GEOMAlgo_Algo.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.jxx b/src/GEOMAlgo/GEOMAlgo_Algo.jxx
index 5dcdb780c..57a352424 100644
--- a/src/GEOMAlgo/GEOMAlgo_Algo.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Algo.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_Algo_HeaderFile
-#include <GEOMAlgo_Algo.hxx>
+#include "GEOMAlgo_Algo.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder.hxx b/src/GEOMAlgo/GEOMAlgo_Builder.hxx
index c5aa8f23d..73c60f562 100644
--- a/src/GEOMAlgo/GEOMAlgo_Builder.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder.hxx
@@ -23,7 +23,7 @@
 #define _GEOMAlgo_Builder_HeaderFile
 
 #ifndef _NMTTools_PPaveFiller_HeaderFile
-#include <NMTTools_PPaveFiller.hxx>
+#include "NMTTools_PPaveFiller.hxx"
 #endif
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
@@ -44,7 +44,7 @@
 #include <TopTools_IndexedDataMapOfShapeShape.hxx>
 #endif
 #ifndef _GEOMAlgo_BuilderShape_HeaderFile
-#include <GEOMAlgo_BuilderShape.hxx>
+#include "GEOMAlgo_BuilderShape.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder.ixx b/src/GEOMAlgo/GEOMAlgo_Builder.ixx
index 7926e82e8..488ffda48 100644
--- a/src/GEOMAlgo/GEOMAlgo_Builder.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_Builder.jxx>
+#include "GEOMAlgo_Builder.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_Builder.jxx b/src/GEOMAlgo/GEOMAlgo_Builder.jxx
index 2b50611b6..89ca2bfe0 100644
--- a/src/GEOMAlgo/GEOMAlgo_Builder.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Builder.jxx
@@ -20,7 +20,7 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTTools_PaveFiller_HeaderFile
-#include <NMTTools_PaveFiller.hxx>
+#include "NMTTools_PaveFiller.hxx"
 #endif
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
@@ -32,5 +32,5 @@
 #include <BRepAlgo_Image.hxx>
 #endif
 #ifndef _GEOMAlgo_Builder_HeaderFile
-#include <GEOMAlgo_Builder.hxx>
+#include "GEOMAlgo_Builder.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx
index 91df68865..5b9d96de6 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.hxx
@@ -32,7 +32,7 @@
 #include <IntTools_PContext.hxx>
 #endif
 #ifndef _GEOMAlgo_Algo_HeaderFile
-#include <GEOMAlgo_Algo.hxx>
+#include "GEOMAlgo_Algo.hxx"
 #endif
 class IntTools_Context;
 class TopTools_ListOfShape;
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx
index 3b0db2c03..58f3ff63d 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_BuilderArea.jxx>
+#include "GEOMAlgo_BuilderArea.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx
index a33ada31e..4430e2e32 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderArea.jxx
@@ -26,5 +26,5 @@
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_BuilderArea_HeaderFile
-#include <GEOMAlgo_BuilderArea.hxx>
+#include "GEOMAlgo_BuilderArea.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx
index 08cefeb9d..7eabccba7 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.hxx
@@ -26,7 +26,7 @@
 #include <TopoDS_Face.hxx>
 #endif
 #ifndef _GEOMAlgo_BuilderArea_HeaderFile
-#include <GEOMAlgo_BuilderArea.hxx>
+#include "GEOMAlgo_BuilderArea.hxx"
 #endif
 class TopoDS_Face;
 
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx
index c3630db7b..11bb88b44 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_BuilderFace.jxx>
+#include "GEOMAlgo_BuilderFace.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx
index 97dee3032..9f2498511 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderFace.jxx
@@ -23,5 +23,5 @@
 #include <TopoDS_Face.hxx>
 #endif
 #ifndef _GEOMAlgo_BuilderFace_HeaderFile
-#include <GEOMAlgo_BuilderFace.hxx>
+#include "GEOMAlgo_BuilderFace.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx
index bf760dd97..42963d249 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.hxx
@@ -38,7 +38,7 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_Algo_HeaderFile
-#include <GEOMAlgo_Algo.hxx>
+#include "GEOMAlgo_Algo.hxx"
 #endif
 class TopoDS_Shape;
 class TopTools_ListOfShape;
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx
index 754725182..92b0eefe4 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_BuilderShape.jxx>
+#include "GEOMAlgo_BuilderShape.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx
index 4470c4034..fc6830141 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderShape.jxx
@@ -26,5 +26,5 @@
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_BuilderShape_HeaderFile
-#include <GEOMAlgo_BuilderShape.hxx>
+#include "GEOMAlgo_BuilderShape.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx
index be21d28b2..6a853abfa 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.hxx
@@ -23,7 +23,7 @@
 #define _GEOMAlgo_BuilderSolid_HeaderFile
 
 #ifndef _GEOMAlgo_BuilderArea_HeaderFile
-#include <GEOMAlgo_BuilderArea.hxx>
+#include "GEOMAlgo_BuilderArea.hxx"
 #endif
 
 
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx
index c4209997c..2e5cfa5cd 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_BuilderSolid.jxx>
+#include "GEOMAlgo_BuilderSolid.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx
index 7660e31d6..22da5d087 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderSolid.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_BuilderSolid_HeaderFile
-#include <GEOMAlgo_BuilderSolid.hxx>
+#include "GEOMAlgo_BuilderSolid.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx b/src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx
index daa0bae98..a20a2e6d5 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_BuilderTools.jxx>
+#include "GEOMAlgo_BuilderTools.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx b/src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx
index 5b843c4a3..3400325aa 100644
--- a/src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_BuilderTools.jxx
@@ -23,5 +23,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_BuilderTools_HeaderFile
-#include <GEOMAlgo_BuilderTools.hxx>
+#include "GEOMAlgo_BuilderTools.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx
index ae1b76918..9fb4dfad1 100644
--- a/src/GEOMAlgo/GEOMAlgo_Clsf.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Clsf.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_Clsf_HeaderFile
-#include <Handle_GEOMAlgo_Clsf.hxx>
+#include "Handle_GEOMAlgo_Clsf.hxx"
 #endif
 
 #ifndef _TopAbs_State_HeaderFile
@@ -39,7 +39,7 @@
 #include <Standard_Real.hxx>
 #endif
 #ifndef _GEOMAlgo_HAlgo_HeaderFile
-#include <GEOMAlgo_HAlgo.hxx>
+#include "GEOMAlgo_HAlgo.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.ixx b/src/GEOMAlgo/GEOMAlgo_Clsf.ixx
index be7494b00..623fcb11c 100644
--- a/src/GEOMAlgo/GEOMAlgo_Clsf.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Clsf.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_Clsf.jxx>
+#include "GEOMAlgo_Clsf.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_Clsf.jxx b/src/GEOMAlgo/GEOMAlgo_Clsf.jxx
index df2281b67..a24aaad50 100644
--- a/src/GEOMAlgo/GEOMAlgo_Clsf.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Clsf.jxx
@@ -29,5 +29,5 @@
 #include <Geom_Surface.hxx>
 #endif
 #ifndef _GEOMAlgo_Clsf_HeaderFile
-#include <GEOMAlgo_Clsf.hxx>
+#include "GEOMAlgo_Clsf.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx
index 37a6c6897..4fc96fdc6 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_ClsfBox_HeaderFile
-#include <Handle_GEOMAlgo_ClsfBox.hxx>
+#include "Handle_GEOMAlgo_ClsfBox.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
@@ -36,7 +36,7 @@
 #include <GeomAdaptor_Surface.hxx>
 #endif
 #ifndef _GEOMAlgo_Clsf_HeaderFile
-#include <GEOMAlgo_Clsf.hxx>
+#include "GEOMAlgo_Clsf.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx
index 90df38e33..b5407c7e7 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_ClsfBox.jxx>
+#include "GEOMAlgo_ClsfBox.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx b/src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx
index 90fc5e97a..7f2a1c5c0 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfBox.jxx
@@ -29,5 +29,5 @@
 #include <Geom_Surface.hxx>
 #endif
 #ifndef _GEOMAlgo_ClsfBox_HeaderFile
-#include <GEOMAlgo_ClsfBox.hxx>
+#include "GEOMAlgo_ClsfBox.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx
index f3831e73f..31c46a6c8 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_ClsfSolid_HeaderFile
-#include <Handle_GEOMAlgo_ClsfSolid.hxx>
+#include "Handle_GEOMAlgo_ClsfSolid.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
@@ -36,7 +36,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _GEOMAlgo_Clsf_HeaderFile
-#include <GEOMAlgo_Clsf.hxx>
+#include "GEOMAlgo_Clsf.hxx"
 #endif
 class TopoDS_Shape;
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx
index df6e8b8a2..43ea48861 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_ClsfSolid.jxx>
+#include "GEOMAlgo_ClsfSolid.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx
index 0c1f5add0..71989cf51 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSolid.jxx
@@ -23,5 +23,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_ClsfSolid_HeaderFile
-#include <GEOMAlgo_ClsfSolid.hxx>
+#include "GEOMAlgo_ClsfSolid.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx
index 76a6b66ec..0663c4bdb 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_ClsfSurf_HeaderFile
-#include <Handle_GEOMAlgo_ClsfSurf.hxx>
+#include "Handle_GEOMAlgo_ClsfSurf.hxx"
 #endif
 
 #ifndef _Handle_Geom_Surface_HeaderFile
@@ -36,7 +36,7 @@
 #include <GeomAdaptor_Surface.hxx>
 #endif
 #ifndef _GEOMAlgo_Clsf_HeaderFile
-#include <GEOMAlgo_Clsf.hxx>
+#include "GEOMAlgo_Clsf.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx
index e884810ee..4368d8a81 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_ClsfSurf.jxx>
+#include "GEOMAlgo_ClsfSurf.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx
index c0a70f3dc..4865828af 100644
--- a/src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ClsfSurf.jxx
@@ -26,5 +26,5 @@
 #include <Geom_Curve.hxx>
 #endif
 #ifndef _GEOMAlgo_ClsfSurf_HeaderFile
-#include <GEOMAlgo_ClsfSurf.hxx>
+#include "GEOMAlgo_ClsfSurf.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx
index 4567f905f..e01ace886 100644
--- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_CoupleOfShapes.jxx>
+#include "GEOMAlgo_CoupleOfShapes.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx
index cd50cfedb..29624f374 100644
--- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx
@@ -23,5 +23,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_CoupleOfShapes_HeaderFile
-#include <GEOMAlgo_CoupleOfShapes.hxx>
+#include "GEOMAlgo_CoupleOfShapes.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
index 854f60c7e..bb1e499fa 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx"
 #endif
 class Standard_NoSuchObject;
 class GEOMAlgo_PassKey;
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
index 19064241d..a456be95d 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMapIterator.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx"
 #endif
 class Standard_NoSuchObject;
 class GEOMAlgo_PassKeyShape;
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
index d2aaa68a5..97577ce23 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Real.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx"
 #endif
 class Standard_NoSuchObject;
 class TopTools_ListOfShape;
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
index 15bb79e4d..e7fbdaa5c 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Real.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx"
 #endif
 class Standard_NoSuchObject;
 class TopoDS_Shape;
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
index 77720cdb5..49db19d8b 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMapIterator.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx"
 #endif
 class Standard_NoSuchObject;
 class TopoDS_Shape;
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
index 40b3407e3..a67d376bd 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx
@@ -26,11 +26,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx"
 #endif
 
 #ifndef _GEOMAlgo_PassKey_HeaderFile
-#include <GEOMAlgo_PassKey.hxx>
+#include "GEOMAlgo_PassKey.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
index 53e2ed84d..cf254e9f2 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx
@@ -26,11 +26,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx"
 #endif
 
 #ifndef _GEOMAlgo_PassKeyShape_HeaderFile
-#include <GEOMAlgo_PassKeyShape.hxx>
+#include "GEOMAlgo_PassKeyShape.hxx"
 #endif
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
index 24b977a06..7a6b0d24c 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx"
 #endif
 
 #ifndef _Standard_Real_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
index b1f6b3a51..1c6fd2431 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
index 5429a89e4..9b218d4df 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx
@@ -26,14 +26,14 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeSet_HeaderFile
-#include <GEOMAlgo_ShapeSet.hxx>
+#include "GEOMAlgo_ShapeSet.hxx"
 #endif
 #ifndef _TCollection_MapNode_HeaderFile
 #include <TCollection_MapNode.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx
index 4a48fe108..c57bbb19e 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
index 28693baea..f787ad137 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyShapeShape.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
index 108370ac1..3756fe23a 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Real.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx
index 7e121ac24..9281b3e1d 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeReal.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Real.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx
index 8c372df0a..20dfbf5ba 100644
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
-#include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
+#include "Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
index 632ad722f..fffee21e2 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx
@@ -29,7 +29,7 @@
 #include <TopAbs_ShapeEnum.hxx>
 #endif
 #ifndef _GEOMAlgo_State_HeaderFile
-#include <GEOMAlgo_State.hxx>
+#include "GEOMAlgo_State.hxx"
 #endif
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
@@ -41,13 +41,13 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #endif
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
-#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
+#include "GEOMAlgo_IndexedDataMapOfShapeState.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
-#include <GEOMAlgo_ShapeAlgo.hxx>
+#include "GEOMAlgo_ShapeAlgo.hxx"
 #endif
 class Geom_Surface;
 class TopTools_ListOfShape;
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx
index 2dfc0be17..28c77e8b6 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_FinderShapeOn.jxx>
+#include "GEOMAlgo_FinderShapeOn.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx
index f7161c607..80ec5d53b 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx
@@ -32,5 +32,5 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #endif
 #ifndef _GEOMAlgo_FinderShapeOn_HeaderFile
-#include <GEOMAlgo_FinderShapeOn.hxx>
+#include "GEOMAlgo_FinderShapeOn.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx
index f3860edb0..262176e1f 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx
@@ -29,7 +29,7 @@
 #include <TopAbs_ShapeEnum.hxx>
 #endif
 #ifndef _GEOMAlgo_State_HeaderFile
-#include <GEOMAlgo_State.hxx>
+#include "GEOMAlgo_State.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
@@ -41,10 +41,10 @@
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
-#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
+#include "GEOMAlgo_IndexedDataMapOfShapeState.hxx"
 #endif
 #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
-#include <GEOMAlgo_ShapeAlgo.hxx>
+#include "GEOMAlgo_ShapeAlgo.hxx"
 #endif
 #ifndef _TopAbs_State_HeaderFile
 #include <TopAbs_State.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx
index 9b9caa61c..b8dd0d942 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_FinderShapeOn1.jxx>
+#include "GEOMAlgo_FinderShapeOn1.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx
index 196f0e706..0bf5db940 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx
@@ -29,17 +29,17 @@
 #include <TopoDS_Face.hxx>
 #endif
 #ifndef _GEOMAlgo_ListOfPnt_HeaderFile
-#include <GEOMAlgo_ListOfPnt.hxx>
+#include "GEOMAlgo_ListOfPnt.hxx"
 #endif
 #ifndef _TopoDS_Edge_HeaderFile
 #include <TopoDS_Edge.hxx>
 #endif
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
-#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
+#include "GEOMAlgo_IndexedDataMapOfShapeState.hxx"
 #endif
 #ifndef _gp_Pnt_HeaderFile
 #include <gp_Pnt.hxx>
 #endif
 #ifndef _GEOMAlgo_FinderShapeOn1_HeaderFile
-#include <GEOMAlgo_FinderShapeOn1.hxx>
+#include "GEOMAlgo_FinderShapeOn1.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx
index 7eaa024a8..cf426ccfb 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.hxx
@@ -26,22 +26,22 @@
 #include <TopAbs_ShapeEnum.hxx>
 #endif
 #ifndef _GEOMAlgo_State_HeaderFile
-#include <GEOMAlgo_State.hxx>
+#include "GEOMAlgo_State.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_Clsf_HeaderFile
-#include <Handle_GEOMAlgo_Clsf.hxx>
+#include "Handle_GEOMAlgo_Clsf.hxx"
 #endif
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
-#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
+#include "GEOMAlgo_IndexedDataMapOfShapeState.hxx"
 #endif
 #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
-#include <GEOMAlgo_ShapeAlgo.hxx>
+#include "GEOMAlgo_ShapeAlgo.hxx"
 #endif
 class GEOMAlgo_Clsf;
 class TopTools_ListOfShape;
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx
index d9cef81ac..ba906715e 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_FinderShapeOn2.jxx>
+#include "GEOMAlgo_FinderShapeOn2.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx
index 448209129..2e7f8f6b4 100644
--- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn2.jxx
@@ -20,7 +20,7 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_Clsf_HeaderFile
-#include <GEOMAlgo_Clsf.hxx>
+#include "GEOMAlgo_Clsf.hxx"
 #endif
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
@@ -29,14 +29,14 @@
 #include <TopoDS_Face.hxx>
 #endif
 #ifndef _GEOMAlgo_ListOfPnt_HeaderFile
-#include <GEOMAlgo_ListOfPnt.hxx>
+#include "GEOMAlgo_ListOfPnt.hxx"
 #endif
 #ifndef _TopoDS_Edge_HeaderFile
 #include <TopoDS_Edge.hxx>
 #endif
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile
-#include <GEOMAlgo_IndexedDataMapOfShapeState.hxx>
+#include "GEOMAlgo_IndexedDataMapOfShapeState.hxx"
 #endif
 #ifndef _GEOMAlgo_FinderShapeOn2_HeaderFile
-#include <GEOMAlgo_FinderShapeOn2.hxx>
+#include "GEOMAlgo_FinderShapeOn2.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx
index 45d174918..7d02d3c37 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx
@@ -23,13 +23,13 @@
 #define _GEOMAlgo_GlueAnalyser_HeaderFile
 
 #ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
-#include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
+#include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
 #endif
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_Gluer_HeaderFile
-#include <GEOMAlgo_Gluer.hxx>
+#include "GEOMAlgo_Gluer.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx
index 6a279b7ef..2896dc852 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_GlueAnalyser.jxx>
+#include "GEOMAlgo_GlueAnalyser.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx
index bc6388ba6..6801916b6 100644
--- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx
@@ -20,11 +20,11 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
-#include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
+#include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
 #endif
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_GlueAnalyser_HeaderFile
-#include <GEOMAlgo_GlueAnalyser.hxx>
+#include "GEOMAlgo_GlueAnalyser.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx
index 980424de0..a52f0ddfa 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx
@@ -44,7 +44,7 @@
 #include <TopTools_MapOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
-#include <GEOMAlgo_ShapeAlgo.hxx>
+#include "GEOMAlgo_ShapeAlgo.hxx"
 #endif
 #ifndef _TopAbs_ShapeEnum_HeaderFile
 #include <TopAbs_ShapeEnum.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.ixx b/src/GEOMAlgo/GEOMAlgo_Gluer.ixx
index 574d72d81..20e1ccfb6 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_Gluer.jxx>
+#include "GEOMAlgo_Gluer.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.jxx b/src/GEOMAlgo/GEOMAlgo_Gluer.jxx
index 86f3f36ab..bda82bc04 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.jxx
@@ -29,7 +29,7 @@
 #include <TopoDS_Edge.hxx>
 #endif
 #ifndef _GEOMAlgo_PassKeyShape_HeaderFile
-#include <GEOMAlgo_PassKeyShape.hxx>
+#include "GEOMAlgo_PassKeyShape.hxx"
 #endif
 #ifndef _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
@@ -44,5 +44,5 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #endif
 #ifndef _GEOMAlgo_Gluer_HeaderFile
-#include <GEOMAlgo_Gluer.hxx>
+#include "GEOMAlgo_Gluer.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer1.hxx b/src/GEOMAlgo/GEOMAlgo_Gluer1.hxx
index ed68594be..2401a0243 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer1.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer1.hxx
@@ -23,13 +23,13 @@
 #define _GEOMAlgo_Gluer1_HeaderFile
 
 #ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
-#include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
+#include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
 #endif
 #ifndef _GEOMAlgo_DataMapOfPassKeyShapeShape_HeaderFile
-#include <GEOMAlgo_DataMapOfPassKeyShapeShape.hxx>
+#include "GEOMAlgo_DataMapOfPassKeyShapeShape.hxx"
 #endif
 #ifndef _GEOMAlgo_Gluer_HeaderFile
-#include <GEOMAlgo_Gluer.hxx>
+#include "GEOMAlgo_Gluer.hxx"
 #endif
 class GEOMAlgo_ListOfCoupleOfShapes;
 
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer1.ixx b/src/GEOMAlgo/GEOMAlgo_Gluer1.ixx
index 8081a3d03..a1c64ac7f 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer1.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer1.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_Gluer1.jxx>
+#include "GEOMAlgo_Gluer1.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer1.jxx b/src/GEOMAlgo/GEOMAlgo_Gluer1.jxx
index 307f27e7f..b1a8fbf89 100644
--- a/src/GEOMAlgo/GEOMAlgo_Gluer1.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer1.jxx
@@ -20,8 +20,8 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile
-#include <GEOMAlgo_ListOfCoupleOfShapes.hxx>
+#include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
 #endif
 #ifndef _GEOMAlgo_Gluer1_HeaderFile
-#include <GEOMAlgo_Gluer1.hxx>
+#include "GEOMAlgo_Gluer1.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx
index dba798166..41475b3d6 100644
--- a/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_HAlgo_HeaderFile
-#include <Handle_GEOMAlgo_HAlgo.hxx>
+#include "Handle_GEOMAlgo_HAlgo.hxx"
 #endif
 
 #ifndef _Standard_Integer_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.ixx b/src/GEOMAlgo/GEOMAlgo_HAlgo.ixx
index 0914f0cdd..8297ccf2d 100644
--- a/src/GEOMAlgo/GEOMAlgo_HAlgo.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_HAlgo.jxx>
+#include "GEOMAlgo_HAlgo.jxx"
 
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_HAlgo.jxx b/src/GEOMAlgo/GEOMAlgo_HAlgo.jxx
index 6be6b1b67..5a97056de 100644
--- a/src/GEOMAlgo/GEOMAlgo_HAlgo.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_HAlgo.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_HAlgo_HeaderFile
-#include <GEOMAlgo_HAlgo.hxx>
+#include "GEOMAlgo_HAlgo.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
index de824bea8..d2bb2ae44 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx"
 #endif
 
 #ifndef _Standard_Integer_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
index 3576d32f5..215f3e179 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx
@@ -26,11 +26,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx"
 #endif
 
 #ifndef _GEOMAlgo_PassKey_HeaderFile
-#include <GEOMAlgo_PassKey.hxx>
+#include "GEOMAlgo_PassKey.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
index 7fbe3e900..aefcda0a1 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx
@@ -26,11 +26,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx"
 #endif
 
 #ifndef _GEOMAlgo_PassKeyShape_HeaderFile
-#include <GEOMAlgo_PassKeyShape.hxx>
+#include "GEOMAlgo_PassKeyShape.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
index 78a8ef08c..277a8bc6f 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
index 215eefe28..ef65f8ad4 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
@@ -36,7 +36,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeInfo_HeaderFile
-#include <GEOMAlgo_ShapeInfo.hxx>
+#include "GEOMAlgo_ShapeInfo.hxx"
 #endif
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
index e73e2fd97..3ccb95919 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
index a89e0146a..52192293a 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx
index de91f020f..fb5b1b451 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
index 7bf5b4b4e..231fe3b29 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
index 8660ceb8f..76deab296 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
index 3051acc43..4c7b6ff58 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx
index 59fa7a7cb..251a72abd 100644
--- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx
@@ -29,7 +29,7 @@
 #include <TopAbs_State.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile
-#include <Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx>
+#include "Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
index 9464a35f3..f3cf14cd8 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile
-#include <Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx>
+#include "Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx
index 1c1b7ca2c..f7b3b72bc 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_ListNodeOfListOfPnt_HeaderFile
-#include <Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx>
+#include "Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
index dba83ac06..52fd78802 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx
@@ -26,11 +26,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile
-#include <Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx>
+#include "Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx"
 #endif
 
 #ifndef _GEOMAlgo_CoupleOfShapes_HeaderFile
-#include <GEOMAlgo_CoupleOfShapes.hxx>
+#include "GEOMAlgo_CoupleOfShapes.hxx"
 #endif
 #ifndef _TCollection_MapNode_HeaderFile
 #include <TCollection_MapNode.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx
index 304a3d98e..0bd0fe9b4 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_ListNodeOfListOfPnt_HeaderFile
-#include <Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx>
+#include "Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx"
 #endif
 
 #ifndef _gp_Pnt_HeaderFile
diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx
index 0a4be4cc8..009c15142 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile
-#include <Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx>
+#include "Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx
index 5e425bce3..012741025 100644
--- a/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_GEOMAlgo_ListNodeOfListOfPnt_HeaderFile
-#include <Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx>
+#include "Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.ixx b/src/GEOMAlgo/GEOMAlgo_PassKey.ixx
index 4b098cfda..b2d124b53 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKey.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKey.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_PassKey.jxx>
+#include "GEOMAlgo_PassKey.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.jxx b/src/GEOMAlgo/GEOMAlgo_PassKey.jxx
index 4a975175e..73debb27b 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKey.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKey.jxx
@@ -23,5 +23,5 @@
 #include <TColStd_ListOfInteger.hxx>
 #endif
 #ifndef _GEOMAlgo_PassKey_HeaderFile
-#include <GEOMAlgo_PassKey.hxx>
+#include "GEOMAlgo_PassKey.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx
index c21de3f68..a0a263b0b 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_PassKeyMapHasher.jxx>
+#include "GEOMAlgo_PassKeyMapHasher.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx
index 7b8138bd1..ddb89bd47 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx
@@ -20,8 +20,8 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_PassKey_HeaderFile
-#include <GEOMAlgo_PassKey.hxx>
+#include "GEOMAlgo_PassKey.hxx"
 #endif
 #ifndef _GEOMAlgo_PassKeyMapHasher_HeaderFile
-#include <GEOMAlgo_PassKeyMapHasher.hxx>
+#include "GEOMAlgo_PassKeyMapHasher.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx
index 94c1a74fa..a43527178 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_PassKeyShape.jxx>
+#include "GEOMAlgo_PassKeyShape.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx
index 37f591564..ce001274e 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx
@@ -26,5 +26,5 @@
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_PassKeyShape_HeaderFile
-#include <GEOMAlgo_PassKeyShape.hxx>
+#include "GEOMAlgo_PassKeyShape.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.ixx b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.ixx
index 3115037ae..8d84d6ca5 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_PassKeyShapeMapHasher.jxx>
+#include "GEOMAlgo_PassKeyShapeMapHasher.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.jxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.jxx
index df8089e56..322225923 100644
--- a/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShapeMapHasher.jxx
@@ -20,8 +20,8 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_PassKeyShape_HeaderFile
-#include <GEOMAlgo_PassKeyShape.hxx>
+#include "GEOMAlgo_PassKeyShape.hxx"
 #endif
 #ifndef _GEOMAlgo_PassKeyShapeMapHasher_HeaderFile
-#include <GEOMAlgo_PassKeyShapeMapHasher.hxx>
+#include "GEOMAlgo_PassKeyShapeMapHasher.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx
index f8a385f34..eb0c598c5 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx
@@ -32,7 +32,7 @@
 #include <IntTools_Context.hxx>
 #endif
 #ifndef _GEOMAlgo_Algo_HeaderFile
-#include <GEOMAlgo_Algo.hxx>
+#include "GEOMAlgo_Algo.hxx"
 #endif
 class TopoDS_Shape;
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx
index 58a281fef..f1596c556 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_ShapeAlgo.jxx>
+#include "GEOMAlgo_ShapeAlgo.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx
index b5fda6902..cfd4ab553 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx
@@ -23,5 +23,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile
-#include <GEOMAlgo_ShapeAlgo.hxx>
+#include "GEOMAlgo_ShapeAlgo.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx
index 20dded14d..81a7078ba 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.hxx
@@ -29,16 +29,16 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _GEOMAlgo_KindOfShape_HeaderFile
-#include <GEOMAlgo_KindOfShape.hxx>
+#include "GEOMAlgo_KindOfShape.hxx"
 #endif
 #ifndef _GEOMAlgo_KindOfName_HeaderFile
-#include <GEOMAlgo_KindOfName.hxx>
+#include "GEOMAlgo_KindOfName.hxx"
 #endif
 #ifndef _GEOMAlgo_KindOfBounds_HeaderFile
-#include <GEOMAlgo_KindOfBounds.hxx>
+#include "GEOMAlgo_KindOfBounds.hxx"
 #endif
 #ifndef _GEOMAlgo_KindOfClosed_HeaderFile
-#include <GEOMAlgo_KindOfClosed.hxx>
+#include "GEOMAlgo_KindOfClosed.hxx"
 #endif
 #ifndef _gp_Pnt_HeaderFile
 #include <gp_Pnt.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx
index e7ae2d9ae..e34692256 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_ShapeInfo.jxx>
+#include "GEOMAlgo_ShapeInfo.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx
index 2ad3d50e7..d39800db9 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfo.jxx
@@ -32,5 +32,5 @@
 #include <gp_Ax3.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeInfo_HeaderFile
-#include <GEOMAlgo_ShapeInfo.hxx>
+#include "GEOMAlgo_ShapeInfo.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx
index a25c2e0a4..245b63524 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.hxx
@@ -26,16 +26,16 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeInfo_HeaderFile
-#include <GEOMAlgo_ShapeInfo.hxx>
+#include "GEOMAlgo_ShapeInfo.hxx"
 #endif
 #ifndef _GEOMAlgo_IndexedDataMapOfShapeShapeInfo_HeaderFile
-#include <GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx>
+#include "GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx"
 #endif
 #ifndef _Standard_Real_HeaderFile
 #include <Standard_Real.hxx>
 #endif
 #ifndef _GEOMAlgo_Algo_HeaderFile
-#include <GEOMAlgo_Algo.hxx>
+#include "GEOMAlgo_Algo.hxx"
 #endif
 class TopoDS_Shape;
 class GEOMAlgo_ShapeInfo;
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx
index 99038a856..e1b4349c6 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_ShapeInfoFiller.jxx>
+#include "GEOMAlgo_ShapeInfoFiller.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx
index e7edb1ea6..361226415 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeInfoFiller.jxx
@@ -23,7 +23,7 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeInfo_HeaderFile
-#include <GEOMAlgo_ShapeInfo.hxx>
+#include "GEOMAlgo_ShapeInfo.hxx"
 #endif
 #ifndef _TopoDS_Face_HeaderFile
 #include <TopoDS_Face.hxx>
@@ -47,5 +47,5 @@
 #include <TopoDS_Solid.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeInfoFiller_HeaderFile
-#include <GEOMAlgo_ShapeInfoFiller.hxx>
+#include "GEOMAlgo_ShapeInfoFiller.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx
index 984facf18..8e29f00dc 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_ShapeSet.jxx>
+#include "GEOMAlgo_ShapeSet.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx
index 927257846..2ff50b151 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSet.jxx
@@ -26,5 +26,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeSet_HeaderFile
-#include <GEOMAlgo_ShapeSet.hxx>
+#include "GEOMAlgo_ShapeSet.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
index a913d917c..80b828f7d 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx
@@ -32,7 +32,7 @@
 #include <BOPTools_PDSFiller.hxx>
 #endif
 #ifndef _GEOMAlgo_Algo_HeaderFile
-#include <GEOMAlgo_Algo.hxx>
+#include "GEOMAlgo_Algo.hxx"
 #endif
 #ifndef _TopAbs_State_HeaderFile
 #include <TopAbs_State.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx
index 22f64b475..76e9cc1b7 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_ShapeSolid.jxx>
+#include "GEOMAlgo_ShapeSolid.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx
index e21210348..e1d7b2b7c 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx
@@ -26,5 +26,5 @@
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_ShapeSolid_HeaderFile
-#include <GEOMAlgo_ShapeSolid.hxx>
+#include "GEOMAlgo_ShapeSolid.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx
index b00ac92c7..6ae30fe6a 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx
@@ -23,7 +23,7 @@
 #define _GEOMAlgo_ShellSolid_HeaderFile
 
 #ifndef _GEOMAlgo_ShapeSolid_HeaderFile
-#include <GEOMAlgo_ShapeSolid.hxx>
+#include "GEOMAlgo_ShapeSolid.hxx"
 #endif
 
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx
index d34ab8352..ff5013b7d 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_ShellSolid.jxx>
+#include "GEOMAlgo_ShellSolid.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx
index 587bf30e3..367294805 100644
--- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_ShellSolid_HeaderFile
-#include <GEOMAlgo_ShellSolid.hxx>
+#include "GEOMAlgo_ShellSolid.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
index 8fafb7b71..0897dca16 100644
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx
@@ -26,7 +26,7 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_ShellSolid_HeaderFile
-#include <GEOMAlgo_ShellSolid.hxx>
+#include "GEOMAlgo_ShellSolid.hxx"
 #endif
 class TopoDS_Shape;
 
diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx
index a17ae72e2..b6731da55 100644
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_SolidSolid.jxx>
+#include "GEOMAlgo_SolidSolid.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx
index 41feab2d2..e4581af25 100644
--- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx
@@ -23,5 +23,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_SolidSolid_HeaderFile
-#include <GEOMAlgo_SolidSolid.hxx>
+#include "GEOMAlgo_SolidSolid.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.hxx b/src/GEOMAlgo/GEOMAlgo_Splitter.hxx
index d5ceaaf8b..cb7f87f8e 100644
--- a/src/GEOMAlgo/GEOMAlgo_Splitter.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_Splitter.hxx
@@ -35,7 +35,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _GEOMAlgo_Builder_HeaderFile
-#include <GEOMAlgo_Builder.hxx>
+#include "GEOMAlgo_Builder.hxx"
 #endif
 class TopoDS_Shape;
 class TopTools_ListOfShape;
diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.ixx b/src/GEOMAlgo/GEOMAlgo_Splitter.ixx
index 9837af7dc..d6f64203e 100644
--- a/src/GEOMAlgo/GEOMAlgo_Splitter.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Splitter.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_Splitter.jxx>
+#include "GEOMAlgo_Splitter.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_Splitter.jxx b/src/GEOMAlgo/GEOMAlgo_Splitter.jxx
index d12cbbdd8..a5aa43261 100644
--- a/src/GEOMAlgo/GEOMAlgo_Splitter.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Splitter.jxx
@@ -26,5 +26,5 @@
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_Splitter_HeaderFile
-#include <GEOMAlgo_Splitter.hxx>
+#include "GEOMAlgo_Splitter.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx b/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx
index f777e3344..d8ac467fc 100644
--- a/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_StateCollector.jxx>
+#include "GEOMAlgo_StateCollector.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx b/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx
index 3bdd7984c..cbd436852 100644
--- a/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_StateCollector_HeaderFile
-#include <GEOMAlgo_StateCollector.hxx>
+#include "GEOMAlgo_StateCollector.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
index fbcd3ebbe..0cd222872 100644
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx
@@ -35,7 +35,7 @@
 #include <TopAbs_State.hxx>
 #endif
 #ifndef _GEOMAlgo_State_HeaderFile
-#include <GEOMAlgo_State.hxx>
+#include "GEOMAlgo_State.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx
index 53cb8c9ad..2fac1da71 100644
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_SurfaceTools.jxx>
+#include "GEOMAlgo_SurfaceTools.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx
index 716140b2d..e87d46a08 100644
--- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx
@@ -38,5 +38,5 @@
 #include <gp_Sphere.hxx>
 #endif
 #ifndef _GEOMAlgo_SurfaceTools_HeaderFile
-#include <GEOMAlgo_SurfaceTools.hxx>
+#include "GEOMAlgo_SurfaceTools.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.ixx b/src/GEOMAlgo/GEOMAlgo_Tools.ixx
index 6e05fe29e..51658fb32 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_Tools.jxx>
+#include "GEOMAlgo_Tools.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.jxx b/src/GEOMAlgo/GEOMAlgo_Tools.jxx
index 5ff48c3d3..532fb9e95 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools.jxx
@@ -23,7 +23,7 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile
-#include <GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx>
+#include "GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx"
 #endif
 #ifndef _IntTools_Context_HeaderFile
 #include <IntTools_Context.hxx>
@@ -47,5 +47,5 @@
 #include <Geom_Surface.hxx>
 #endif
 #ifndef _GEOMAlgo_Tools_HeaderFile
-#include <GEOMAlgo_Tools.hxx>
+#include "GEOMAlgo_Tools.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools3D.ixx b/src/GEOMAlgo/GEOMAlgo_Tools3D.ixx
index 76dbf81ed..05602e09c 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools3D.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_Tools3D.jxx>
+#include "GEOMAlgo_Tools3D.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_Tools3D.jxx b/src/GEOMAlgo/GEOMAlgo_Tools3D.jxx
index 328d5bb72..da483a0dc 100644
--- a/src/GEOMAlgo/GEOMAlgo_Tools3D.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_Tools3D.jxx
@@ -50,8 +50,8 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #endif
 #ifndef _NMTTools_ListOfCoupleOfShape_HeaderFile
-#include <NMTTools_ListOfCoupleOfShape.hxx>
+#include "NMTTools_ListOfCoupleOfShape.hxx"
 #endif
 #ifndef _GEOMAlgo_Tools3D_HeaderFile
-#include <GEOMAlgo_Tools3D.hxx>
+#include "GEOMAlgo_Tools3D.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx
index 9514f5239..f684d1af4 100644
--- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx
@@ -23,7 +23,7 @@
 #define _GEOMAlgo_VertexSolid_HeaderFile
 
 #ifndef _GEOMAlgo_ShapeSolid_HeaderFile
-#include <GEOMAlgo_ShapeSolid.hxx>
+#include "GEOMAlgo_ShapeSolid.hxx"
 #endif
 
 
diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx
index 0ce665520..52caca784 100644
--- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_VertexSolid.jxx>
+#include "GEOMAlgo_VertexSolid.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx
index 9a546c6e5..35e7f97c8 100644
--- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_VertexSolid_HeaderFile
-#include <GEOMAlgo_VertexSolid.hxx>
+#include "GEOMAlgo_VertexSolid.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx b/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx
index 4fef49e1a..1dea8e075 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.hxx
@@ -23,16 +23,16 @@
 #define _GEOMAlgo_WESCorrector_HeaderFile
 
 #ifndef _GEOMAlgo_PWireEdgeSet_HeaderFile
-#include <GEOMAlgo_PWireEdgeSet.hxx>
+#include "GEOMAlgo_PWireEdgeSet.hxx"
 #endif
 #ifndef _GEOMAlgo_WireEdgeSet_HeaderFile
-#include <GEOMAlgo_WireEdgeSet.hxx>
+#include "GEOMAlgo_WireEdgeSet.hxx"
 #endif
 #ifndef _BOP_ListOfConnexityBlock_HeaderFile
 #include <BOP_ListOfConnexityBlock.hxx>
 #endif
 #ifndef _GEOMAlgo_Algo_HeaderFile
-#include <GEOMAlgo_Algo.hxx>
+#include "GEOMAlgo_Algo.hxx"
 #endif
 class GEOMAlgo_WireEdgeSet;
 
diff --git a/src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx b/src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx
index 3e166ac8b..8f6a7ddb9 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_WESCorrector.jxx>
+#include "GEOMAlgo_WESCorrector.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx b/src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx
index 0b46e1d00..d9eeaa01d 100644
--- a/src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_WESCorrector.jxx
@@ -20,8 +20,8 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_WireEdgeSet_HeaderFile
-#include <GEOMAlgo_WireEdgeSet.hxx>
+#include "GEOMAlgo_WireEdgeSet.hxx"
 #endif
 #ifndef _GEOMAlgo_WESCorrector_HeaderFile
-#include <GEOMAlgo_WESCorrector.hxx>
+#include "GEOMAlgo_WESCorrector.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx
index 68e641785..79931a202 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_WireEdgeSet.jxx>
+#include "GEOMAlgo_WireEdgeSet.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx
index 1c8f96a17..2f1c75036 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireEdgeSet.jxx
@@ -29,5 +29,5 @@
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_WireEdgeSet_HeaderFile
-#include <GEOMAlgo_WireEdgeSet.hxx>
+#include "GEOMAlgo_WireEdgeSet.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx
index 58af52ede..e571ecb63 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx
@@ -23,7 +23,7 @@
 #define _GEOMAlgo_WireSolid_HeaderFile
 
 #ifndef _GEOMAlgo_ShapeSolid_HeaderFile
-#include <GEOMAlgo_ShapeSolid.hxx>
+#include "GEOMAlgo_ShapeSolid.hxx"
 #endif
 
 
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx b/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx
index 32aa1fbfd..d2ab4f185 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_WireSolid.jxx>
+#include "GEOMAlgo_WireSolid.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx
index cba4ece22..736b5ccb6 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _GEOMAlgo_WireSolid_HeaderFile
-#include <GEOMAlgo_WireSolid.hxx>
+#include "GEOMAlgo_WireSolid.hxx"
 #endif
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx
index 24c2da7bc..5b50f3fdf 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.hxx
@@ -38,7 +38,7 @@
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_Algo_HeaderFile
-#include <GEOMAlgo_Algo.hxx>
+#include "GEOMAlgo_Algo.hxx"
 #endif
 class TopoDS_Face;
 class TopTools_ListOfShape;
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx
index 668dcb466..fa21c87cd 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <GEOMAlgo_WireSplitter.jxx>
+#include "GEOMAlgo_WireSplitter.jxx"
 
  
 
diff --git a/src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx b/src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx
index 415548656..791d03dae 100644
--- a/src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx
+++ b/src/GEOMAlgo/GEOMAlgo_WireSplitter.jxx
@@ -29,5 +29,5 @@
 #include <BOPTColStd_ListOfListOfShape.hxx>
 #endif
 #ifndef _GEOMAlgo_WireSplitter_HeaderFile
-#include <GEOMAlgo_WireSplitter.hxx>
+#include "GEOMAlgo_WireSplitter.hxx"
 #endif
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx
index 7db50df1d..c5ca7d7d7 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_Clsf.hxx
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef _Handle_GEOMAlgo_HAlgo_HeaderFile
-#include <Handle_GEOMAlgo_HAlgo.hxx>
+#include "Handle_GEOMAlgo_HAlgo.hxx"
 #endif
 
 class Standard_Transient;
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx
index 82c8df8b5..2745014d8 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfBox.hxx
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef _Handle_GEOMAlgo_Clsf_HeaderFile
-#include <Handle_GEOMAlgo_Clsf.hxx>
+#include "Handle_GEOMAlgo_Clsf.hxx"
 #endif
 
 class Standard_Transient;
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx
index ae126bd84..dc34e4698 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSolid.hxx
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef _Handle_GEOMAlgo_Clsf_HeaderFile
-#include <Handle_GEOMAlgo_Clsf.hxx>
+#include "Handle_GEOMAlgo_Clsf.hxx"
 #endif
 
 class Standard_Transient;
diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx
index 0dc562e39..a9f00cd20 100644
--- a/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx
+++ b/src/GEOMAlgo/Handle_GEOMAlgo_ClsfSurf.hxx
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef _Handle_GEOMAlgo_Clsf_HeaderFile
-#include <Handle_GEOMAlgo_Clsf.hxx>
+#include "Handle_GEOMAlgo_Clsf.hxx"
 #endif
 
 class Standard_Transient;
diff --git a/src/GEOMBase/GEOMBase.cxx b/src/GEOMBase/GEOMBase.cxx
index 455cb6875..a2a0e0a0c 100644
--- a/src/GEOMBase/GEOMBase.cxx
+++ b/src/GEOMBase/GEOMBase.cxx
@@ -30,22 +30,22 @@
 
 ////  SALOME Includes
 #include <GEOM_Actor.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <OCCViewer_ViewPort3d.h>
-#include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewWindow.h>
-
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
-
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_MessageBox.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/OCCViewer_ViewPort3d.h>
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewWindow.h>
+
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
 // // Open CASCADE Includes
 #include <BRep_Tool.hxx>
diff --git a/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h
index 33c4b15a0..6224f0d95 100644
--- a/src/GEOMBase/GEOMBase.h
+++ b/src/GEOMBase/GEOMBase.h
@@ -29,7 +29,7 @@
 #include "GEOM_GEOMBase.hxx"
 
 // SALOME Includes
-#include <GEOM_AISShape.hxx>
+#include "GEOM_AISShape.hxx"
 
 // IDL Headers
 #include <SALOMEconfig.h>
diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx
index c17facd82..73fc446e6 100755
--- a/src/GEOMBase/GEOMBase_Helper.cxx
+++ b/src/GEOMBase/GEOMBase_Helper.cxx
@@ -29,25 +29,25 @@
 
 #include <GeometryGUI.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewModel.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-
-#include <SalomeApp_Module.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_DataOwner.h>
-#include <SalomeApp_Tools.h>
-
-#include <SALOME_Prs.h>
-
-#include <OCCViewer_ViewModel.h>
-#include <SVTK_ViewModel.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewModel.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+
+#include <gui/SalomeApp_Module.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_DataOwner.h>
+#include <gui/SalomeApp_Tools.h>
+
+#include <gui/SALOME_Prs.h>
+
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/SVTK_ViewModel.h>
 
 #include <TColStd_MapOfInteger.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h
index 42a7cc4cb..5813a779e 100755
--- a/src/GEOMBase/GEOMBase_Helper.h
+++ b/src/GEOMBase/GEOMBase_Helper.h
@@ -28,8 +28,8 @@
 
 #include "GEOM_GEOMBase.hxx"
 
-#include <GEOM_Displayer.h>
-#include <SALOME_ListIO.hxx>
+#include "GEOM_Displayer.h"
+#include <gui/SALOME_ListIO.hxx>
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 
diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index 1bc6adbe6..59ede283f 100644
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -29,15 +29,15 @@
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_DoubleSpinBox.h>
-#include <SalomeApp_Study.h>
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_DoubleSpinBox.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
 
 #include <QKeyEvent>
 #include <QSpinBox>
diff --git a/src/GEOMBase/GEOM_Operation.cxx b/src/GEOMBase/GEOM_Operation.cxx
index 060f4e26d..aa674be9b 100644
--- a/src/GEOMBase/GEOM_Operation.cxx
+++ b/src/GEOMBase/GEOM_Operation.cxx
@@ -25,8 +25,8 @@
 //
 #include "GEOM_Operation.h"
 
-#include <SUIT_Application.h>
-#include <SalomeApp_Tools.h>
+#include <gui/SUIT_Application.h>
+#include <gui/SalomeApp_Tools.h>
 
 
 //================================================================
diff --git a/src/GEOMBase/GEOM_Operation.h b/src/GEOMBase/GEOM_Operation.h
index 39e9fd682..29c7c4621 100644
--- a/src/GEOMBase/GEOM_Operation.h
+++ b/src/GEOMBase/GEOM_Operation.h
@@ -28,7 +28,7 @@
 
 #include "GEOM_GEOMBase.hxx"
 
-#include <SUIT_Operation.h>
+#include <gui/SUIT_Operation.h>
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 
diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx
index 470df2704..b5803af56 100644
--- a/src/GEOMClient/GEOM_Client.cxx
+++ b/src/GEOMClient/GEOM_Client.cxx
@@ -33,8 +33,8 @@
 
 #include "GEOM_Client.hxx"
 #include <SALOMEconfig.h>
-#include "Basics_Utils.hxx"
-#include "utilities.h"
+#include <kernel/Basics_Utils.hxx>
+#include <kernel/utilities.h>
 
 #include <BRep_Builder.hxx>
 #include <BRepTools.hxx>
diff --git a/src/GEOMDS/GEOMDS_Commands.cxx b/src/GEOMDS/GEOMDS_Commands.cxx
index fa858673d..f12be673a 100644
--- a/src/GEOMDS/GEOMDS_Commands.cxx
+++ b/src/GEOMDS/GEOMDS_Commands.cxx
@@ -26,7 +26,7 @@
 //  $Header$
 //
 using namespace std;
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "GEOMDS_Commands.ixx"
 
 #include <TNaming_Builder.hxx>
diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h
index d0ba7c683..6cfdbaf04 100644
--- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h
@@ -22,7 +22,7 @@
 #ifndef GEOM_LOGICALFILTER_H
 #define GEOM_LOGICALFILTER_H
 
-#include <SUIT_SelectionFilter.h>
+#include <gui/SUIT_SelectionFilter.h>
 #include <Standard_Macro.hxx>
 
 #include <QList>
diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
index 75027c74c..13e4faaf9 100644
--- a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx
@@ -21,10 +21,10 @@
 //
 #include "GEOM_OCCFilter.h"
 
-#include <LightApp_SelectionMgr.h> 
-#include <LightApp_DataOwner.h>
+#include <gui/LightApp_SelectionMgr.h> 
+#include <gui/LightApp_DataOwner.h>
 
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 #include <AIS_InteractiveObject.hxx>
 #include <SelectMgr_EntityOwner.hxx>
diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
index 40ce102be..09958d279 100644
--- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx
@@ -21,7 +21,7 @@
 //
 #include "GEOM_PreviewFilter.h"
 
-#include <LightApp_DataOwner.h>
+#include <gui/LightApp_DataOwner.h>
 
 //=======================================================================
 // function : GEOM_SelectionFilter
diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h
index 68b7f4644..eff9183ee 100644
--- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h
@@ -22,7 +22,7 @@
 #ifndef GEOM_PREVIEW_FILTER_H
 #define GEOM_PREVIEW_FILTER_H
 
-#include <SalomeApp_Filter.h>
+#include <gui/SalomeApp_Filter.h>
 #include <Standard_Macro.hxx>
 
 class Standard_EXPORT GEOM_PreviewFilter : public SalomeApp_Filter
diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
index 929bed410..a03e99d73 100644
--- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
+++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx
@@ -23,13 +23,13 @@
 
 #include "GEOM_Client.hxx"
 
-#include <LightApp_DataOwner.h>
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Application.h>
+#include <gui/LightApp_DataOwner.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
-#include <SALOME_LifeCycleCORBA.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
-#include <SUIT_Session.h>
+#include <gui/SUIT_Session.h>
 
 //=======================================================================
 // function : GEOM_SelectionFilter
diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h
index aca520747..3dde6713b 100644
--- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h
+++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h
@@ -22,7 +22,7 @@
 #ifndef GEOM_SELECTIONFILTER_H
 #define GEOM_SELECTIONFILTER_H
 
-#include <SalomeApp_Filter.h>
+#include <gui/SalomeApp_Filter.h>
 
 #include <TopoDS_Shape.hxx>
 
diff --git a/src/GEOMGUI/GEOMGUI.cxx b/src/GEOMGUI/GEOMGUI.cxx
index c6797a789..e1fa9c9b1 100644
--- a/src/GEOMGUI/GEOMGUI.cxx
+++ b/src/GEOMGUI/GEOMGUI.cxx
@@ -26,8 +26,8 @@
 #include "GEOMGUI.h"
 #include "GeometryGUI.h"
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ViewWindow.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewWindow.h>
 
 //=================================================================================
 // class    : GEOMGUI::GEOMGUI
diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
index e99774513..2cdde033e 100644
--- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
+++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx
@@ -24,13 +24,13 @@
 
 #include "GEOMGUI_OCCSelector.h"
 
-#include <LightApp_DataSubOwner.h>
+#include <gui/LightApp_DataSubOwner.h>
 
-#include <OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewModel.h>
 
-#include <SUIT_Session.h>
-#include <SalomeApp_Study.h>
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 #include <StdSelect_BRepOwner.hxx>
 #include <SelectMgr_Selection.hxx>
diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.h b/src/GEOMGUI/GEOMGUI_OCCSelector.h
index ff16ecf25..9eac7d24c 100644
--- a/src/GEOMGUI/GEOMGUI_OCCSelector.h
+++ b/src/GEOMGUI/GEOMGUI_OCCSelector.h
@@ -28,7 +28,7 @@
 
 #include "GEOM_GEOMGUI.hxx"
 
-#include <LightApp_OCCSelector.h>
+#include <gui/LightApp_OCCSelector.h>
 
 class GEOMGUI_EXPORT GEOMGUI_OCCSelector : public LightApp_OCCSelector
 {
diff --git a/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx
index eca862007..2b121f555 100644
--- a/src/GEOMGUI/GEOMGUI_Selection.cxx
+++ b/src/GEOMGUI/GEOMGUI_Selection.cxx
@@ -27,26 +27,26 @@
 #include "GeometryGUI.h"
 #include "GEOM_Displayer.h"
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include "LightApp_DataOwner.h"
+#include <gui/LightApp_DataOwner.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
 
-#include <SALOME_Prs.h>
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_Prs.h>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include <SOCC_Prs.h>
-#include <SVTK_Prs.h>
-#include <SALOME_Actor.h>
+#include <gui/SOCC_Prs.h>
+#include <gui/SVTK_Prs.h>
+#include <gui/SALOME_Actor.h>
 #include <GEOM_Actor.h>
 
-#include <OCCViewer_ViewModel.h>
-#include <SVTK_ViewModel.h>
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/SVTK_ViewModel.h>
 
 #include <GEOMImpl_Types.hxx>
 
diff --git a/src/GEOMGUI/GEOMGUI_Selection.h b/src/GEOMGUI/GEOMGUI_Selection.h
index ee195625b..21babb3a4 100644
--- a/src/GEOMGUI/GEOMGUI_Selection.h
+++ b/src/GEOMGUI/GEOMGUI_Selection.h
@@ -27,8 +27,8 @@
 
 #include "GEOM_GEOMGUI.hxx"
 
-#include <LightApp_Selection.h>
-#include <SALOMEDSClient.hxx>
+#include <gui/LightApp_Selection.h>
+#include <kernel/SALOMEDSClient.hxx>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(GEOM_Gen)
diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index ab52189af..7545f63ee 100644
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -42,27 +42,27 @@
 #include <GEOM_AISTrihedron.hxx>
 #include <GEOM_VTKTrihedron.hxx>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ResourceMgr.h>
-
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_TypeFilter.h>
-#include <SalomeApp_Tools.h>
-
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <SALOME_ListIO.hxx>
-#include <SALOME_Prs.h>
-
-#include <SOCC_Prs.h>
-#include <SOCC_ViewModel.h>
-
-#include <SVTK_Prs.h>
-#include <SVTK_ViewModel.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ResourceMgr.h>
+
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_TypeFilter.h>
+#include <gui/SalomeApp_Tools.h>
+
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_Prs.h>
+
+#include <gui/SOCC_Prs.h>
+#include <gui/SOCC_ViewModel.h>
+
+#include <gui/SVTK_Prs.h>
+#include <gui/SVTK_ViewModel.h>
 
 // OCCT Includes
 #include <AIS_Drawer.hxx>
diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h
index 7ae0eeb2a..fc8388ff6 100644
--- a/src/GEOMGUI/GEOM_Displayer.h
+++ b/src/GEOMGUI/GEOM_Displayer.h
@@ -28,7 +28,7 @@
 
 #include "GEOM_GEOMGUI.hxx"
 
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 class SALOME_ListIO;
 class SALOME_View;
@@ -39,7 +39,7 @@ class SALOME_OCCViewType;
 
 #include <TopoDS_Shape.hxx>
 #include <Quantity_Color.hxx>
-#include <LightApp_Displayer.h>
+#include <gui/LightApp_Displayer.h>
 #include <Aspect_TypeOfMarker.hxx>
 
 #include <QList>
diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index d5df83adb..d87512cd2 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -31,39 +31,39 @@
 
 #include "GEOM_Actor.h"
 
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewManager.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewManager.h>
 
-#include <OCCViewer_ViewWindow.h>
-#include <OCCViewer_ViewPort3d.h>
-#include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewManager.h>
+#include <gui/OCCViewer_ViewWindow.h>
+#include <gui/OCCViewer_ViewPort3d.h>
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewManager.h>
 
-#include <SOCC_ViewModel.h>
-#include <SOCC_ViewWindow.h>
+#include <gui/SOCC_ViewModel.h>
+#include <gui/SOCC_ViewWindow.h>
 
-#include <SVTK_ViewWindow.h>
-#include <SVTK_RenderWindowInteractor.h>
-#include <SVTK_InteractorStyle.h>
-#include <SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
+#include <gui/SVTK_InteractorStyle.h>
+#include <gui/SVTK_ViewModel.h>
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_VTKSelector.h>
-#include <LightApp_DataObject.h>
-#include <LightApp_Preferences.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_VTKSelector.h>
+#include <gui/LightApp_DataObject.h>
+#include <gui/LightApp_Preferences.h>
 
-#include <SALOME_LifeCycleCORBA.hxx>
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SALOMEDSClient_ClientFactory.hxx>
-#include <SALOMEDSClient_IParameters.hxx>
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/SALOMEDSClient_IParameters.hxx>
 
 // External includes
 #include <QMenu>
@@ -82,7 +82,7 @@
 #include <NCollection_DataMap.hxx>
 #include <Graphic3d_HArray1OfBytes.hxx>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h
index 249359762..b4a9745c0 100644
--- a/src/GEOMGUI/GeometryGUI.h
+++ b/src/GEOMGUI/GeometryGUI.h
@@ -28,11 +28,11 @@
 
 #include "GEOM_GEOMGUI.hxx"
 
-#include <SalomeApp_Module.h>
+#include <gui/SalomeApp_Module.h>
 
-#include <GEOM_Client.hxx>
-#include <SALOME_InteractiveObject.hxx>
-#include <SALOMEDSClient.hxx>
+#include "GEOM_Client.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
+#include <kernel/SALOMEDSClient.hxx>
 
 #include "GEOMGUI.h"
 
diff --git a/src/GEOMGUI/GeometryGUI_Swig.cxx b/src/GEOMGUI/GeometryGUI_Swig.cxx
index 473955738..f3f05e53f 100644
--- a/src/GEOMGUI/GeometryGUI_Swig.cxx
+++ b/src/GEOMGUI/GeometryGUI_Swig.cxx
@@ -28,23 +28,23 @@
 
 #include "GeometryGUI.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include "OB_Browser.h"
+#include <gui/OB_Browser.h>
 
-#include "OCCViewer_ViewWindow.h"
-#include "OCCViewer_ViewManager.h"
-#include "SOCC_ViewModel.h"
-#include <SOCC_Prs.h>
+#include <gui/OCCViewer_ViewWindow.h>
+#include <gui/OCCViewer_ViewManager.h>
+#include <gui/SOCC_ViewModel.h>
+#include <gui/SOCC_Prs.h>
 
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewWindow.h"
-#include "SVTK_View.h"
-#include "SVTK_Renderer.h"
-#include <SVTK_Prs.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_View.h>
+#include <gui/SVTK_Renderer.h>
+#include <gui/SVTK_Prs.h>
 
 #include "GEOM_Actor.h"
 #include "GEOM_Client.hxx"
@@ -52,7 +52,7 @@
 #include "GEOM_InteractiveObject.hxx"
 #include "GEOM_Displayer.h"
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
 // OCCT Includes
 #include <TopAbs.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx
index 2af822f42..782c238a6 100644
--- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx
@@ -48,7 +48,7 @@
 #include <Geom_Circle.hxx>
 #include <Geom_Ellipse.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //=======================================================================
 //function : GetID
diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
index 2df09e352..e0ac7ffc7 100644
--- a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
+++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx
@@ -25,7 +25,7 @@
 
 #include <ShHealOper_ShapeProcess.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Tool.hxx>
 #include <BRep_TFace.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx
index 4c7604739..8a449793f 100644
--- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx
@@ -39,7 +39,7 @@
 #include <GEOMAlgo_Gluer.hxx>
 #include <BlockFix_BlockFixAPI.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TNaming_CopyShape.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx
index a920fe3cf..f8258d25f 100644
--- a/src/GEOMImpl/GEOMImpl_Gen.cxx
+++ b/src/GEOMImpl/GEOMImpl_Gen.cxx
@@ -27,9 +27,9 @@
 
 #include <GEOMImpl_Gen.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 <TFunction_Driver.hxx>
 #include <TFunction_DriverTable.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_Gen.hxx b/src/GEOMImpl/GEOMImpl_Gen.hxx
index c777a3a6b..e60fbf3d2 100644
--- a/src/GEOMImpl/GEOMImpl_Gen.hxx
+++ b/src/GEOMImpl/GEOMImpl_Gen.hxx
@@ -22,7 +22,7 @@
 #ifndef _GEOMImpl_GEN_HXX_
 #define _GEOMImpl_GEN_HXX_
 
-#include <GEOM_GEOMImpl.hxx>
+#include "GEOM_GEOMImpl.hxx"
 
 #include <map>
 
diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx
index af0d29f43..fdb73d4e8 100644
--- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx
@@ -34,7 +34,7 @@
 #include "GEOMAlgo_CoupleOfShapes.hxx"
 #include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TDataStd_IntegerArray.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
index c0a8d0fb8..447bc7525 100644
--- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx
@@ -23,9 +23,9 @@
 
 #include <GEOMImpl_I3DPrimOperations.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 <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx
index 7214d4807..732503344 100644
--- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx
@@ -22,7 +22,7 @@
 #ifndef _GEOMImpl_I3DPrimOperations_HXX_
 #define _GEOMImpl_I3DPrimOperations_HXX_
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
index 3bce36434..fecbf968a 100644
--- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx
@@ -23,9 +23,9 @@
 
 #include <GEOMImpl_IBasicOperations.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 <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx
index 195f80354..9eb72a108 100644
--- a/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.hxx
@@ -22,7 +22,7 @@
 #ifndef _GEOMImpl_IBasicOperations_HXX_
 #define _GEOMImpl_IBasicOperations_HXX_
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
index a3f53ce5b..aeca4b081 100644
--- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx
@@ -44,9 +44,9 @@
 #include <GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx>
 #include <BlockFix_CheckTool.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 <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
index 33744cce5..562e1f12f 100644
--- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx
@@ -36,7 +36,7 @@
 
 #include <TDF_Tool.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
index 364c16c23..8d8bec00f 100644
--- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx
@@ -46,7 +46,7 @@
 #include <GEOMImpl_ISketcher.hxx>
 #include <GEOMImpl_I3DSketcher.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TDF_Tool.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
index 09658a18b..0786b5e63 100644
--- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx
@@ -29,9 +29,9 @@
 #include <GEOM_ISubShape.hxx>
 #include <GEOM_PythonDump.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 <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx
index 272d2c532..b4b66301e 100644
--- a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx
@@ -22,7 +22,7 @@
 #ifndef _GEOMImpl_IGroupOperations_HXX_
 #define _GEOMImpl_IGroupOperations_HXX_
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
index 7c90d1e2c..10f1b84c8 100644
--- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx
@@ -36,9 +36,9 @@
 
 #include <ShHealOper_ShapeProcess.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 <ShapeAnalysis_FreeBounds.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index a15a5f284..5d860aac8 100644
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
@@ -23,9 +23,9 @@
 
 #include <GEOMImpl_IInsertOperations.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 <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
index 529795f7c..14ce66d4e 100644
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
@@ -22,7 +22,7 @@
 #ifndef _GEOMImpl_IInsertOperations_HXX_
 #define _GEOMImpl_IInsertOperations_HXX_
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
index 7236bb052..43bd290cc 100644
--- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx
@@ -44,9 +44,9 @@
 #include <GEOMImpl_Gen.hxx>
 #include <GEOMImpl_IShapesOperations.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 <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
index 5bdf61848..017c30824 100644
--- a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx
@@ -22,7 +22,7 @@
 #ifndef _GEOMImpl_ILocalOperations_HXX_
 #define _GEOMImpl_ILocalOperations_HXX_
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
index cb04f5776..6995b0b6e 100644
--- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx
@@ -33,9 +33,9 @@
 #include <GEOM_Function.hxx>
 #include <GEOM_PythonDump.hxx>
 
-#include <utilities.h>
-#include <OpUtil.hxx>
-#include <Utils_ExceptHandlers.hxx>
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 // OCCT Includes
 #include <TFunction_DriverTable.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
index 7e247e126..5efe9e802 100644
--- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
@@ -56,9 +56,9 @@
 #include "GEOMAlgo_CoupleOfShapes.hxx"
 #include "GEOMAlgo_ListOfCoupleOfShapes.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 <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
index 541ed569c..1304085f3 100644
--- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx
@@ -23,9 +23,9 @@
 
 #include <GEOMImpl_ITransformOperations.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 <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx
index 462bc223c..28cb493bb 100644
--- a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx
@@ -22,7 +22,7 @@
 #ifndef _GEOMImpl_ITransformOperations_HXX_
 #define _GEOMImpl_ITransformOperations_HXX_
 
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
index 443f74870..5759e7580 100644
--- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx
@@ -26,7 +26,7 @@
 #include <GEOMImpl_Types.hxx>
 #include <GEOM_Function.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <TopoDS_Shape.hxx>
 
diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
index e35a5119c..81efcbab7 100644
--- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx
@@ -92,7 +92,7 @@
 #include <Standard_TypeMismatch.hxx>
 #include <Standard_ConstructionError.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //=======================================================================
 //function : GetID
diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
index 46de123a8..556a18ee4 100644
--- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
+++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx
@@ -28,7 +28,7 @@
 
 #include <GEOMImpl_IMeasureOperations.hxx>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 // OCCT Includes
 #include <BRepBuilderAPI_Transform.hxx>
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
index cb93e55af..a3c745782 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
@@ -31,23 +31,23 @@
 #include <GEOM_Operation.h>
 #include <GEOM_Displayer.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Tools.h>
-#include <SUIT_FileDlg.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ViewModel.h>
-#include <SUIT_ViewManager.h>
-
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewModel.h>
+#include <gui/SUIT_ViewManager.h>
+
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
 #include <GEOMImpl_Types.hxx>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <SALOME_Prs.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_Prs.h>
 
 // QT Includes
 #include <QApplication>
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h
index d60f23484..fe38fe9ed 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI.h
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.h
@@ -28,9 +28,9 @@
 
 #include "GEOM_ToolsGUI.hxx"
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
-#include <SALOMEDSClient.hxx>
+#include <kernel/SALOMEDSClient.hxx>
 
 class GEOM_Displayer;
 class SALOME_View;
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
index 34b1f0835..8062f5a45 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
@@ -23,7 +23,7 @@
 //  File   : GEOMToolsGUI_1.cxx
 //  Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
 
-#include <PyConsole_Console.h>
+#include <gui/PyConsole_Console.h>
 
 #include "GEOMToolsGUI.h"
 #include "GEOMToolsGUI_TransparencyDlg.h"
@@ -37,36 +37,36 @@
 #include <GEOMBase.h>
 #include <GEOM_Actor.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SOCC_Prs.h>
+#include <gui/SOCC_Prs.h>
 
-#include <SVTK_Prs.h>
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_View.h>
+#include <gui/SVTK_Prs.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_View.h>
 
-#include <OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewModel.h>
 
-#include <SUIT_ViewManager.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Tools.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Tools.h>
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Module.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Module.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <LightApp_NameDlg.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_NameDlg.h>
 
 #include <GEOMImpl_Types.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 // OCCT Includes
 #include <AIS_Drawer.hxx>
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
index 715c22dee..09aa7dc51 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeflectionDlg.cxx
@@ -25,13 +25,13 @@
 
 #include "GEOMToolsGUI_DeflectionDlg.h"
 #include <GeometryGUI.h>
-#include <LightApp_Application.h>
-#include <QtxDoubleSpinBox.h>
+#include <gui/LightApp_Application.h>
+#include <gui/QtxDoubleSpinBox.h>
 
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Tools.h>
 
 #include <QLabel>
 #include <QPushButton>
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx
index d2d0dc11f..c87a45171 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_DeleteDlg.cxx
@@ -30,7 +30,7 @@
 #include <QTextBrowser>
 #include <QStringList>
 #include <QGridLayout>
-#include <SUIT_MessageBox.h>
+#include <gui/SUIT_MessageBox.h>
  
 static bool isEntryLess( const QString& e1, const QString& e2 )
 {
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
index af3a7ba79..233d648e9 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx
@@ -28,14 +28,14 @@
 #include <GeometryGUI.h>
 #include <GEOM_Displayer.h>
 
-#include <QtxComboBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/QtxComboBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 #include <QButtonGroup>
 #include <QGridLayout>
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
index e121ce402..7a87a66da 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx
@@ -25,11 +25,11 @@
 //
 #include "GEOMToolsGUI_NbIsosDlg.h"
 #include <GeometryGUI.h>
-#include <LightApp_Application.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_Tools.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Tools.h>
 
 #include <QLabel>
 #include <QPushButton>
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
index 08c943795..5a658f94c 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx
@@ -28,25 +28,25 @@
 #include <GEOM_AISShape.hxx>
 #include <GeometryGUI.h>
 
-#include <SALOME_ListIO.hxx>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_View.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_View.h>
 
-#include <OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewModel.h>
 
-#include <SUIT_ViewManager.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include <SalomeApp_Application.h>
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <QLabel>
 #include <QPushButton>
diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index 58471eebb..bca84cc08 100644
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -32,10 +32,10 @@
 #include <strstream>
 //#include <sstream>
 
-#include "Utils_CorbaException.hxx"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
+#include <kernel/utilities.h>
 
 #include "GEOM_Object_i.hh"
 #include "GEOM_Object.hxx"
@@ -60,7 +60,7 @@
 #include <TopExp.hxx>
 #include <OSD.hxx>
 
-#include "SALOMEDS_Tool.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
 
 //============================================================================
 // function : GEOM_Gen_i()
diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh
index 4bd530fa1..d7466725d 100644
--- a/src/GEOM_I/GEOM_Gen_i.hh
+++ b/src/GEOM_I/GEOM_Gen_i.hh
@@ -34,8 +34,8 @@
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
 
-#include "SALOME_Component_i.hxx"
-#include "SALOME_NamingService.hxx"
+#include <kernel/SALOME_Component_i.hxx>
+#include <kernel/SALOME_NamingService.hxx>
 
 #include "GEOM_IBasicOperations_i.hh"
 #include "GEOM_ITransformOperations_i.hh"
diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc
index 14922b2e0..8b7e70c0c 100644
--- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc
+++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc
@@ -23,9 +23,9 @@
 
 #include "GEOM_I3DPrimOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.cc b/src/GEOM_I/GEOM_IBasicOperations_i.cc
index 06b4fa6b8..aef4d48e1 100644
--- a/src/GEOM_I/GEOM_IBasicOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBasicOperations_i.cc
@@ -23,9 +23,9 @@
 
 #include "GEOM_IBasicOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc
index 08c2c2cdd..24334b841 100644
--- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc
@@ -23,9 +23,9 @@
 
 #include "GEOM_IBlocksOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.cc b/src/GEOM_I/GEOM_IBooleanOperations_i.cc
index 7012ffa3b..09ba1412d 100644
--- a/src/GEOM_I/GEOM_IBooleanOperations_i.cc
+++ b/src/GEOM_I/GEOM_IBooleanOperations_i.cc
@@ -23,8 +23,8 @@
 
 #include "GEOM_IBooleanOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc
index daf9be27b..f2ad9b9dc 100644
--- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc
+++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc
@@ -23,8 +23,8 @@
 
 #include "GEOM_ICurvesOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.cc b/src/GEOM_I/GEOM_IGroupOperations_i.cc
index ec64e411c..394c00a6d 100644
--- a/src/GEOM_I/GEOM_IGroupOperations_i.cc
+++ b/src/GEOM_I/GEOM_IGroupOperations_i.cc
@@ -23,9 +23,9 @@
 
 #include "GEOM_IGroupOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc
index 36f3587c5..806cd8d0a 100644
--- a/src/GEOM_I/GEOM_IHealingOperations_i.cc
+++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc
@@ -27,9 +27,9 @@
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.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 <TColStd_HSequenceOfTransient.hxx>
 
diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc
index c5570650e..2dac28542 100644
--- a/src/GEOM_I/GEOM_IInsertOperations_i.cc
+++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc
@@ -27,9 +27,9 @@
 
 #include "GEOM_IInsertOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc
index fe1091f5b..6042efa33 100644
--- a/src/GEOM_I/GEOM_ILocalOperations_i.cc
+++ b/src/GEOM_I/GEOM_ILocalOperations_i.cc
@@ -23,9 +23,9 @@
 
 #include "GEOM_ILocalOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
index 0508b7945..dcc8b844b 100644
--- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc
+++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc
@@ -23,8 +23,8 @@
 
 #include "GEOM_IMeasureOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc
index 4114d6647..209896c1c 100644
--- a/src/GEOM_I/GEOM_IOperations_i.cc
+++ b/src/GEOM_I/GEOM_IOperations_i.cc
@@ -23,9 +23,9 @@
 
 #include "GEOM_Engine.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 <Standard_Stream.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/GEOM_I/GEOM_IOperations_i.hh b/src/GEOM_I/GEOM_IOperations_i.hh
index 54e7b6dad..68e9a679d 100644
--- a/src/GEOM_I/GEOM_IOperations_i.hh
+++ b/src/GEOM_I/GEOM_IOperations_i.hh
@@ -27,7 +27,7 @@
 #include <SALOMEconfig.h>
 
 #include CORBA_SERVER_HEADER(GEOM_Gen)
-#include "SALOME_GenericObj_i.hh" 
+#include <kernel/SALOME_GenericObj_i.hh> 
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Object_i.hh" 
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc
index 3681742ca..ac895815e 100644
--- a/src/GEOM_I/GEOM_IShapesOperations_i.cc
+++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc
@@ -23,9 +23,9 @@
 
 #include "GEOM_IShapesOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.cc b/src/GEOM_I/GEOM_ITransformOperations_i.cc
index ef24cb390..13b9b5b90 100644
--- a/src/GEOM_I/GEOM_ITransformOperations_i.cc
+++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc
@@ -23,9 +23,9 @@
 
 #include "GEOM_ITransformOperations_i.hh"
 
-#include "utilities.h"
-#include "OpUtil.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/utilities.h>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <TDF_Label.hxx>
 #include <TDF_Tool.hxx>
diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc
index f164b4ef4..c78b5d187 100644
--- a/src/GEOM_I/GEOM_Object_i.cc
+++ b/src/GEOM_I/GEOM_Object_i.cc
@@ -25,13 +25,13 @@
 #include <GEOM_ISubShape.hxx>
 #include <GEOMImpl_Types.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include <fstream>
 #include <strstream>
 //#include <sstream>
 
-#include <OpUtil.hxx>
-#include <Utils_ExceptHandlers.hxx>
+#include <kernel/OpUtil.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 #include <TDF_Tool.hxx>
 #include <TDF_Label.hxx>
 #include <TCollection_AsciiString.hxx>
diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh
index b6f16c354..e7f1d971c 100644
--- a/src/GEOM_I/GEOM_Object_i.hh
+++ b/src/GEOM_I/GEOM_Object_i.hh
@@ -30,7 +30,7 @@
 #include CORBA_CLIENT_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(GEOM_Gen)
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 #include "GEOM_Object.hxx"
 
diff --git a/src/GEOM_I_Superv/GEOM_List_i.hh b/src/GEOM_I_Superv/GEOM_List_i.hh
index 292cb4fb9..f5e7ce884 100644
--- a/src/GEOM_I_Superv/GEOM_List_i.hh
+++ b/src/GEOM_I_Superv/GEOM_List_i.hh
@@ -27,7 +27,7 @@
 #include CORBA_SERVER_HEADER(GEOM_Superv)
 
 #include "GEOM_Gen_i.hh"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 template <class Type>
 class GEOM_List_i : 
diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc
index 6518d8338..31274dfd3 100644
--- a/src/GEOM_I_Superv/GEOM_Superv_i.cc
+++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc
@@ -20,10 +20,10 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include "GEOM_Superv_i.hh"
-#include "SALOME_LifeCycleCORBA.hxx"
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
 #include CORBA_SERVER_HEADER(SALOME_Session)
-#include "SALOMEDSClient_ClientFactory.hxx"
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 
 #define isNewStudy(a,b) (a > 0 && a != b)
 
diff --git a/src/GenerationGUI/GenerationGUI.cxx b/src/GenerationGUI/GenerationGUI.cxx
index 0b16254ac..0af3a5eb7 100644
--- a/src/GenerationGUI/GenerationGUI.cxx
+++ b/src/GenerationGUI/GenerationGUI.cxx
@@ -27,8 +27,8 @@
 
 #include <GeometryGUI.h>
 
-#include <SUIT_Desktop.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SalomeApp_Application.h>
 
 #include "GenerationGUI_PrismDlg.h"     // Method PRISM
 #include "GenerationGUI_RevolDlg.h"     // Method REVOL
diff --git a/src/GenerationGUI/GenerationGUI.h b/src/GenerationGUI/GenerationGUI.h
index 17a28b815..6339d776d 100644
--- a/src/GenerationGUI/GenerationGUI.h
+++ b/src/GenerationGUI/GenerationGUI.h
@@ -26,7 +26,7 @@
 #ifndef GENERATIONGUI_H
 #define GENERATIONGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
 //=================================================================================
 // class    : GenerationGUI
diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx
index d658806b5..796a97d4a 100644
--- a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TopoDS_Iterator.hxx>
 #include <GEOMImpl_Types.hxx>
diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.h b/src/GenerationGUI/GenerationGUI_FillingDlg.h
index ed4de1d3d..fb8c34562 100644
--- a/src/GenerationGUI/GenerationGUI_FillingDlg.h
+++ b/src/GenerationGUI/GenerationGUI_FillingDlg.h
@@ -26,7 +26,7 @@
 #ifndef GENERATIONGUI_FILLINGDLG_H
 #define GENERATIONGUI_FILLINGDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel5Spin1Check;
 
diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
index 2f596dafa..6462bdf97 100644
--- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.h b/src/GenerationGUI/GenerationGUI_PipeDlg.h
index 38249faec..1350a4b8e 100644
--- a/src/GenerationGUI/GenerationGUI_PipeDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PipeDlg.h
@@ -26,7 +26,7 @@
 #ifndef GENERATIONGUI_PIPEDLG_H
 #define GENERATIONGUI_PIPEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_3Sel1Check;
 
diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
index bb609f2dd..94fc3a2f5 100644
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h
index cfa1b5412..dc3d6566f 100644
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h
@@ -26,7 +26,7 @@
 #ifndef GENERATIONGUI_PRISMDLG_H
 #define GENERATIONGUI_PRISMDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel1Spin2Check;
 class DlgRef_3Sel1Check;
diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
index 1a3f3d34d..b9e0c7779 100644
--- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.h b/src/GenerationGUI/GenerationGUI_RevolDlg.h
index f4bc70631..be8fe607a 100644
--- a/src/GenerationGUI/GenerationGUI_RevolDlg.h
+++ b/src/GenerationGUI/GenerationGUI_RevolDlg.h
@@ -26,7 +26,7 @@
 #ifndef GENERATIONGUI_REVOLUTIONDLG_H
 #define GENERATIONGUI_REVOLUTIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel1Spin2Check;
 
diff --git a/src/GroupGUI/GroupGUI.cxx b/src/GroupGUI/GroupGUI.cxx
index fd59b68b5..84587fbf1 100644
--- a/src/GroupGUI/GroupGUI.cxx
+++ b/src/GroupGUI/GroupGUI.cxx
@@ -30,12 +30,12 @@
 #include <GEOMBase.h>
 #include <GEOMImpl_Types.hxx>
 
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //=======================================================================
 // function : GroupGUI()
diff --git a/src/GroupGUI/GroupGUI.h b/src/GroupGUI/GroupGUI.h
index a0e97d948..e59a60583 100644
--- a/src/GroupGUI/GroupGUI.h
+++ b/src/GroupGUI/GroupGUI.h
@@ -26,7 +26,7 @@
 #ifndef GROUPGUI_H
 #define GROUPGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
 //=================================================================================
 // class    : GroupGUI
diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx
index 657ca570f..17fdd4654 100644
--- a/src/GroupGUI/GroupGUI_GroupDlg.cxx
+++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx
@@ -30,23 +30,23 @@
 #include <GeometryGUI.h>
 #include <GEOM_Displayer.h>
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-
-#include <LightApp_SelectionMgr.h>
-
-#include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewManager.h>
-#include <SVTK_ViewModel.h>
-#include <SALOME_Prs.h>
-#include <SALOME_ListIteratorOfListIO.hxx>
-
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewManager.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SALOME_Prs.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
 
 #include <QLabel>
 #include <QListWidget>
diff --git a/src/GroupGUI/GroupGUI_GroupDlg.h b/src/GroupGUI/GroupGUI_GroupDlg.h
index fcee5bde7..5d87526fe 100644
--- a/src/GroupGUI/GroupGUI_GroupDlg.h
+++ b/src/GroupGUI/GroupGUI_GroupDlg.h
@@ -26,7 +26,7 @@
 #ifndef GROUPGUI_GROUPDLG_H
 #define GROUPGUI_GROUPDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <TopAbs_ShapeEnum.hxx>
 #include <TColStd_DataMapOfIntegerInteger.hxx>
diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx
index bd6557b20..3a6df5b7a 100644
--- a/src/IGESExport/IGESExport.cxx
+++ b/src/IGESExport/IGESExport.cxx
@@ -24,9 +24,9 @@
 // Author:      Pavel TELKOV
 //              <ptv@mutex.nnov.opencascade.com>
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <IGESControl_Controller.hxx>
 #include <IGESControl_Writer.hxx>
diff --git a/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx
index 08a72d7d8..b236a0787 100644
--- a/src/IGESImport/IGESImport.cxx
+++ b/src/IGESImport/IGESImport.cxx
@@ -24,9 +24,9 @@
 // Author:      Pavel TELKOV
 //              <ptv@mutex.nnov.opencascade.com>
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <IFSelect_ReturnStatus.hxx>
 #include <IGESControl_Reader.hxx>
diff --git a/src/MeasureGUI/MeasureGUI.cxx b/src/MeasureGUI/MeasureGUI.cxx
index a240d7562..a0851c584 100644
--- a/src/MeasureGUI/MeasureGUI.cxx
+++ b/src/MeasureGUI/MeasureGUI.cxx
@@ -26,8 +26,8 @@
 #include "MeasureGUI.h"
 
 #include <GeometryGUI.h>
-#include <SUIT_Desktop.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SalomeApp_Application.h>
 
 #include "MeasureGUI_PropertiesDlg.h"    // Method PROPERTIES
 #include "MeasureGUI_CenterMassDlg.h"    // Method CENTER MASS
diff --git a/src/MeasureGUI/MeasureGUI.h b/src/MeasureGUI/MeasureGUI.h
index 71d34a71b..cc538332c 100644
--- a/src/MeasureGUI/MeasureGUI.h
+++ b/src/MeasureGUI/MeasureGUI.h
@@ -26,7 +26,7 @@
 #ifndef MEASUREGUI_H
 #define MEASUREGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
 //=================================================================================
 // class    : MeasureGUI
diff --git a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
index a0843985e..655824c97 100644
--- a/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_AngleDlg.cxx
@@ -30,17 +30,17 @@
 #include <GEOMBase.h>
 #include <GeometryGUI.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
-#include <SOCC_Prs.h>
-#include <SOCC_ViewModel.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SOCC_Prs.h>
+#include <gui/SOCC_ViewModel.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <AIS_AngleDimension.hxx>
@@ -66,7 +66,7 @@
 
 #include "GEOMImpl_Types.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
index 914d68c4a..3f24f7487 100644
--- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx
@@ -41,9 +41,9 @@
 #include <TopoDS_Face.hxx>
 #include <TopExp_Explorer.hxx>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Tools.h>
 
 // #include <qlineedit.h>
 // #include <qlabel.h>
diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
index ee5cd7703..ba520b98e 100644
--- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx
@@ -31,11 +31,11 @@
 
 #include <GeometryGUI.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
 
 #include <BRep_Tool.hxx>
 #include <TopoDS_Vertex.hxx>
diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h
index 4de61e99a..db215fc3c 100644
--- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h
+++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h
@@ -26,7 +26,7 @@
 #ifndef MEASUREGUI_CENTERMASSDLG_H
 #define MEASUREGUI_CENTERMASSDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class MeasureGUI_1Sel3LineEdit;
 
diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
index 13d658028..adf1e30e3 100644
--- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx
@@ -26,11 +26,11 @@
 #include "MeasureGUI_CheckCompoundOfBlocksDlg.h"
 #include "MeasureGUI_Widgets.h"
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Application.h>
 
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopExp.hxx>
diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h
index a96be34ab..03aece8ba 100644
--- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h
+++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h
@@ -26,7 +26,7 @@
 #ifndef MEASUREGUI_CHECKCOMPOUNDOFBLOCKSDLG_H
 #define MEASUREGUI_CHECKCOMPOUNDOFBLOCKSDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class MeasureGUI_1Sel1TextView2ListBox;
 
diff --git a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx
index b890cc0c9..bb5c8a0db 100644
--- a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx
@@ -26,9 +26,9 @@
 #include "MeasureGUI_CheckShapeDlg.h"
 #include "MeasureGUI_Widgets.h"
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Tools.h>
 
 #define TEXTEDIT_FONT_FAMILY "Courier"
 #define TEXTEDIT_FONT_SIZE 11
diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
index 30613d7cd..f43aa292d 100644
--- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx
@@ -30,16 +30,16 @@
 #include <GEOMBase.h>
 #include <GeometryGUI.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
-#include <SOCC_Prs.h>
-#include <SOCC_ViewModel.h>
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SOCC_Prs.h>
+#include <gui/SOCC_ViewModel.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <Geom_Plane.hxx>
diff --git a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
index b6c602862..e652a931d 100644
--- a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
@@ -30,9 +30,9 @@
 
 #include <gp_XYZ.hxx>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Tools.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Tools.h>
 
 //=================================================================================
 // class    : MeasureGUI_InertiaDlg()
diff --git a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx
index 43d0c8637..bcf19a8a0 100644
--- a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx
@@ -26,9 +26,9 @@
 #include "MeasureGUI_MaxToleranceDlg.h"
 #include "MeasureGUI_Widgets.h"
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Tools.h>
 
 //=================================================================================
 // class    : MeasureGUI_MaxToleranceDlg()
diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
index 681931526..9e84e48ed 100644
--- a/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.cxx
@@ -29,10 +29,10 @@
 #include <GEOMBase.h>
 #include <GeometryGUI.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/MeasureGUI/MeasureGUI_NormaleDlg.h b/src/MeasureGUI/MeasureGUI_NormaleDlg.h
index 60eef7b17..fbdd42553 100644
--- a/src/MeasureGUI/MeasureGUI_NormaleDlg.h
+++ b/src/MeasureGUI/MeasureGUI_NormaleDlg.h
@@ -26,7 +26,7 @@
 #ifndef MEASUREGUI_NORMALEDLG_H
 #define MEASUREGUI_NORMALEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel;
 
diff --git a/src/MeasureGUI/MeasureGUI_PointDlg.cxx b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
index bba75ea59..e020fd634 100644
--- a/src/MeasureGUI/MeasureGUI_PointDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_PointDlg.cxx
@@ -31,10 +31,10 @@
 
 #include <GeometryGUI.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
diff --git a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
index b92298f4d..122718759 100644
--- a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx
@@ -30,9 +30,9 @@
 #include <GEOMBase.h>
 #include <DlgRef.h>
 
-#include <SalomeApp_Tools.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <TColStd_MapOfInteger.hxx>
 
diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.cxx b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
index c32aa169e..1d918a07c 100644
--- a/src/MeasureGUI/MeasureGUI_Skeleton.cxx
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
@@ -30,14 +30,14 @@
 #include <GEOM_Displayer.h>
 #include <GeometryGUI.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Tools.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
 
 #include <QKeyEvent>
 
diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.h b/src/MeasureGUI/MeasureGUI_Skeleton.h
index 01633884f..2a7ae496c 100644
--- a/src/MeasureGUI/MeasureGUI_Skeleton.h
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.h
@@ -27,7 +27,7 @@
 #define MEASUREGUI_SKELETON_H
 
 #include <QDialog>
-#include <GEOMBase_Helper.h>
+#include "GEOMBase_Helper.h"
 
 class GeometryGUI;
 class MeasureGUI_SkeletonBox;
diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
index 64faf036b..4762b0e80 100644
--- a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx
@@ -29,9 +29,9 @@
 #include <DlgRef.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Tools.h>
 
 #include <QGroupBox>
 #include <QScrollBar>
diff --git a/src/NMTAlgo/NMTAlgo_Algo.hxx b/src/NMTAlgo/NMTAlgo_Algo.hxx
index dc73c1088..1f2d38496 100644
--- a/src/NMTAlgo/NMTAlgo_Algo.hxx
+++ b/src/NMTAlgo/NMTAlgo_Algo.hxx
@@ -23,7 +23,7 @@
 #define _NMTAlgo_Algo_HeaderFile
 
 #ifndef _NMTTools_PDSFiller_HeaderFile
-#include <NMTTools_PDSFiller.hxx>
+#include "NMTTools_PDSFiller.hxx"
 #endif
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
diff --git a/src/NMTAlgo/NMTAlgo_Algo.ixx b/src/NMTAlgo/NMTAlgo_Algo.ixx
index cb4c135df..5a17feba8 100644
--- a/src/NMTAlgo/NMTAlgo_Algo.ixx
+++ b/src/NMTAlgo/NMTAlgo_Algo.ixx
@@ -19,4 +19,4 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTAlgo_Algo.jxx>
+#include "NMTAlgo_Algo.jxx"
diff --git a/src/NMTAlgo/NMTAlgo_Algo.jxx b/src/NMTAlgo/NMTAlgo_Algo.jxx
index fc8787025..298258785 100644
--- a/src/NMTAlgo/NMTAlgo_Algo.jxx
+++ b/src/NMTAlgo/NMTAlgo_Algo.jxx
@@ -20,11 +20,11 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTTools_DSFiller_HeaderFile
-#include <NMTTools_DSFiller.hxx>
+#include "NMTTools_DSFiller.hxx"
 #endif
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _NMTAlgo_Algo_HeaderFile
-#include <NMTAlgo_Algo.hxx>
+#include "NMTAlgo_Algo.hxx"
 #endif
diff --git a/src/NMTAlgo/NMTAlgo_Builder.hxx b/src/NMTAlgo/NMTAlgo_Builder.hxx
index a5df73c8e..e94637b3e 100644
--- a/src/NMTAlgo/NMTAlgo_Builder.hxx
+++ b/src/NMTAlgo/NMTAlgo_Builder.hxx
@@ -35,7 +35,7 @@
 #include <TopTools_IndexedDataMapOfShapeShape.hxx>
 #endif
 #ifndef _NMTAlgo_Algo_HeaderFile
-#include <NMTAlgo_Algo.hxx>
+#include "NMTAlgo_Algo.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTAlgo/NMTAlgo_Builder.ixx b/src/NMTAlgo/NMTAlgo_Builder.ixx
index 283ec7648..a2db99922 100644
--- a/src/NMTAlgo/NMTAlgo_Builder.ixx
+++ b/src/NMTAlgo/NMTAlgo_Builder.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTAlgo_Builder.jxx>
+#include "NMTAlgo_Builder.jxx"
 
  
 
diff --git a/src/NMTAlgo/NMTAlgo_Builder.jxx b/src/NMTAlgo/NMTAlgo_Builder.jxx
index f3e4dbe5a..2ce1564be 100644
--- a/src/NMTAlgo/NMTAlgo_Builder.jxx
+++ b/src/NMTAlgo/NMTAlgo_Builder.jxx
@@ -20,7 +20,7 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTTools_DSFiller_HeaderFile
-#include <NMTTools_DSFiller.hxx>
+#include "NMTTools_DSFiller.hxx"
 #endif
 #ifndef _TopoDS_Edge_HeaderFile
 #include <TopoDS_Edge.hxx>
@@ -29,5 +29,5 @@
 #include <TopoDS_Face.hxx>
 #endif
 #ifndef _NMTAlgo_Builder_HeaderFile
-#include <NMTAlgo_Builder.hxx>
+#include "NMTAlgo_Builder.hxx"
 #endif
diff --git a/src/NMTAlgo/NMTAlgo_Loop3d.ixx b/src/NMTAlgo/NMTAlgo_Loop3d.ixx
index 97c229d65..a1f992679 100644
--- a/src/NMTAlgo/NMTAlgo_Loop3d.ixx
+++ b/src/NMTAlgo/NMTAlgo_Loop3d.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTAlgo_Loop3d.jxx>
+#include "NMTAlgo_Loop3d.jxx"
 
  
 
diff --git a/src/NMTAlgo/NMTAlgo_Loop3d.jxx b/src/NMTAlgo/NMTAlgo_Loop3d.jxx
index 02c10b8dd..29abc4f2b 100644
--- a/src/NMTAlgo/NMTAlgo_Loop3d.jxx
+++ b/src/NMTAlgo/NMTAlgo_Loop3d.jxx
@@ -38,5 +38,5 @@
 #include <gp_Vec.hxx>
 #endif
 #ifndef _NMTAlgo_Loop3d_HeaderFile
-#include <NMTAlgo_Loop3d.hxx>
+#include "NMTAlgo_Loop3d.hxx"
 #endif
diff --git a/src/NMTAlgo/NMTAlgo_Splitter.hxx b/src/NMTAlgo/NMTAlgo_Splitter.hxx
index 64aa244e4..2954d23f2 100644
--- a/src/NMTAlgo/NMTAlgo_Splitter.hxx
+++ b/src/NMTAlgo/NMTAlgo_Splitter.hxx
@@ -47,7 +47,7 @@
 #include <TopTools_DataMapOfShapeListOfShape.hxx>
 #endif
 #ifndef _NMTAlgo_Builder_HeaderFile
-#include <NMTAlgo_Builder.hxx>
+#include "NMTAlgo_Builder.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTAlgo/NMTAlgo_Splitter.ixx b/src/NMTAlgo/NMTAlgo_Splitter.ixx
index 53377eb6e..ba83e4561 100644
--- a/src/NMTAlgo/NMTAlgo_Splitter.ixx
+++ b/src/NMTAlgo/NMTAlgo_Splitter.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTAlgo_Splitter.jxx>
+#include "NMTAlgo_Splitter.jxx"
 
  
 
diff --git a/src/NMTAlgo/NMTAlgo_Splitter.jxx b/src/NMTAlgo/NMTAlgo_Splitter.jxx
index f76213b04..8fe1bfed1 100644
--- a/src/NMTAlgo/NMTAlgo_Splitter.jxx
+++ b/src/NMTAlgo/NMTAlgo_Splitter.jxx
@@ -23,11 +23,11 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _NMTTools_DSFiller_HeaderFile
-#include <NMTTools_DSFiller.hxx>
+#include "NMTTools_DSFiller.hxx"
 #endif
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _NMTAlgo_Splitter_HeaderFile
-#include <NMTAlgo_Splitter.hxx>
+#include "NMTAlgo_Splitter.hxx"
 #endif
diff --git a/src/NMTAlgo/NMTAlgo_Splitter1.hxx b/src/NMTAlgo/NMTAlgo_Splitter1.hxx
index c9e733d3e..d84c4a143 100644
--- a/src/NMTAlgo/NMTAlgo_Splitter1.hxx
+++ b/src/NMTAlgo/NMTAlgo_Splitter1.hxx
@@ -32,7 +32,7 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _NMTAlgo_Splitter_HeaderFile
-#include <NMTAlgo_Splitter.hxx>
+#include "NMTAlgo_Splitter.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTAlgo/NMTAlgo_Splitter1.ixx b/src/NMTAlgo/NMTAlgo_Splitter1.ixx
index 479cf4180..1baf379f7 100644
--- a/src/NMTAlgo/NMTAlgo_Splitter1.ixx
+++ b/src/NMTAlgo/NMTAlgo_Splitter1.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTAlgo_Splitter1.jxx>
+#include "NMTAlgo_Splitter1.jxx"
 
  
 
diff --git a/src/NMTAlgo/NMTAlgo_Splitter1.jxx b/src/NMTAlgo/NMTAlgo_Splitter1.jxx
index c804ba376..aa2ba82a5 100644
--- a/src/NMTAlgo/NMTAlgo_Splitter1.jxx
+++ b/src/NMTAlgo/NMTAlgo_Splitter1.jxx
@@ -26,5 +26,5 @@
 #include <TopTools_DataMapOfShapeInteger.hxx>
 #endif
 #ifndef _NMTAlgo_Splitter1_HeaderFile
-#include <NMTAlgo_Splitter1.hxx>
+#include "NMTAlgo_Splitter1.hxx"
 #endif
diff --git a/src/NMTAlgo/NMTAlgo_Tools.ixx b/src/NMTAlgo/NMTAlgo_Tools.ixx
index 90f39ea0d..3de47349f 100644
--- a/src/NMTAlgo/NMTAlgo_Tools.ixx
+++ b/src/NMTAlgo/NMTAlgo_Tools.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTAlgo_Tools.jxx>
+#include "NMTAlgo_Tools.jxx"
 
  
 
diff --git a/src/NMTAlgo/NMTAlgo_Tools.jxx b/src/NMTAlgo/NMTAlgo_Tools.jxx
index 080737905..68a747773 100644
--- a/src/NMTAlgo/NMTAlgo_Tools.jxx
+++ b/src/NMTAlgo/NMTAlgo_Tools.jxx
@@ -38,5 +38,5 @@
 #include <TopTools_IndexedMapOfShape.hxx>
 #endif
 #ifndef _NMTAlgo_Tools_HeaderFile
-#include <NMTAlgo_Tools.hxx>
+#include "NMTAlgo_Tools.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_BndSphere.hxx b/src/NMTDS/NMTDS_BndSphere.hxx
index a873c14d0..c213441d4 100644
--- a/src/NMTDS/NMTDS_BndSphere.hxx
+++ b/src/NMTDS/NMTDS_BndSphere.hxx
@@ -114,7 +114,7 @@ private:
 };
 
 
-#include <NMTDS_BndSphere.lxx>
+#include "NMTDS_BndSphere.lxx"
 
 
 
diff --git a/src/NMTDS/NMTDS_BndSphere.ixx b/src/NMTDS/NMTDS_BndSphere.ixx
index 9925b37d9..b40d36184 100644
--- a/src/NMTDS/NMTDS_BndSphere.ixx
+++ b/src/NMTDS/NMTDS_BndSphere.ixx
@@ -19,7 +19,7 @@
 // the specific terms and conditions governing rights and limitations under the
 // License.
 
-#include <NMTDS_BndSphere.jxx>
+#include "NMTDS_BndSphere.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_BndSphere.jxx b/src/NMTDS/NMTDS_BndSphere.jxx
index e1ee36054..0588c4981 100644
--- a/src/NMTDS/NMTDS_BndSphere.jxx
+++ b/src/NMTDS/NMTDS_BndSphere.jxx
@@ -2,5 +2,5 @@
 #include <gp_Pnt.hxx>
 #endif
 #ifndef _NMTDS_BndSphere_HeaderFile
-#include <NMTDS_BndSphere.hxx>
+#include "NMTDS_BndSphere.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_BndSphereTree.hxx b/src/NMTDS/NMTDS_BndSphereTree.hxx
index ee107c0c2..422117af5 100644
--- a/src/NMTDS/NMTDS_BndSphereTree.hxx
+++ b/src/NMTDS/NMTDS_BndSphereTree.hxx
@@ -28,7 +28,7 @@
 #define NMTDS_BndSphereTree_HeaderFile
 
 #include <NCollection_UBTree.hxx>
-#include <NMTDS_BndSphere.hxx>
+#include "NMTDS_BndSphere.hxx"
 #include <TColStd_MapOfInteger.hxx>
 #include <TColStd_ListOfInteger.hxx>
 
diff --git a/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
index 7456aa64c..abf2f31b6 100644
--- a/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS/NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_HeaderFile
-#include <Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx>
+#include "Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx"
 #endif
 class Standard_NoSuchObject;
 class TColStd_MapOfInteger;
diff --git a/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
index 061f4bae1..4e4a391b2 100644
--- a/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS/NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_HeaderFile
-#include <Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx>
+#include "Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx"
 #endif
 
 #ifndef _Standard_Integer_HeaderFile
diff --git a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
index 09e17e834..5e56126b5 100644
--- a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger_HeaderFile
-#include <Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx>
+#include "Handle_NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTDS/NMTDS_IndexRange.ixx b/src/NMTDS/NMTDS_IndexRange.ixx
index 5c9a8d46f..322fdccda 100644
--- a/src/NMTDS/NMTDS_IndexRange.ixx
+++ b/src/NMTDS/NMTDS_IndexRange.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_IndexRange.jxx>
+#include "NMTDS_IndexRange.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_IndexRange.jxx b/src/NMTDS/NMTDS_IndexRange.jxx
index a93688411..579a5c695 100644
--- a/src/NMTDS/NMTDS_IndexRange.jxx
+++ b/src/NMTDS/NMTDS_IndexRange.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTDS_IndexRange_HeaderFile
-#include <NMTDS_IndexRange.hxx>
+#include "NMTDS_IndexRange.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
index a4ed07f9d..9939f1d7c 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
-#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx>
+#include "Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx"
 #endif
 
 #ifndef _Standard_Integer_HeaderFile
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
index e92a031a4..4dd0d363e 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
-#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx>
+#include "Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx"
 #endif
 
 #ifndef _Standard_Integer_HeaderFile
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
index 713e28208..f9427d0b1 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
@@ -27,7 +27,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_HeaderFile
-#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx>
+#include "Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
@@ -37,7 +37,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _NMTDS_BndSphere_HeaderFile
-#include <NMTDS_BndSphere.hxx>
+#include "NMTDS_BndSphere.hxx"
 #endif
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
index 67ff43f39..e1cd8b63e 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
-#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx>
+#include "Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
index 7bfc49cca..cbb8d64ca 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
-#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx>
+#include "Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx
index a97123c77..4662d3f05 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerShape.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile
-#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx>
+#include "Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
index fb62c36ec..1fd36321c 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_HeaderFile
-#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx>
+#include "Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx
index 1be992921..561b7f4d7 100644
--- a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBox.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile
-#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx>
+#include "Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTDS/NMTDS_InterfPool.hxx b/src/NMTDS/NMTDS_InterfPool.hxx
index 3722c0046..4b461f818 100644
--- a/src/NMTDS/NMTDS_InterfPool.hxx
+++ b/src/NMTDS/NMTDS_InterfPool.hxx
@@ -23,10 +23,10 @@
 #define _NMTDS_InterfPool_HeaderFile
 
 #ifndef _NMTDS_MapOfPassKeyBoolean_HeaderFile
-#include <NMTDS_MapOfPassKeyBoolean.hxx>
+#include "NMTDS_MapOfPassKeyBoolean.hxx"
 #endif
 #ifndef _NMTDS_ListOfPassKeyBoolean_HeaderFile
-#include <NMTDS_ListOfPassKeyBoolean.hxx>
+#include "NMTDS_ListOfPassKeyBoolean.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
@@ -53,7 +53,7 @@
 #include <Standard_Boolean.hxx>
 #endif
 #ifndef _NMTDS_InterfType_HeaderFile
-#include <NMTDS_InterfType.hxx>
+#include "NMTDS_InterfType.hxx"
 #endif
 class NMTDS_PassKeyBoolean;
 class NMTDS_ListOfPassKeyBoolean;
diff --git a/src/NMTDS/NMTDS_InterfPool.ixx b/src/NMTDS/NMTDS_InterfPool.ixx
index a26acd90d..663ba0efa 100644
--- a/src/NMTDS/NMTDS_InterfPool.ixx
+++ b/src/NMTDS/NMTDS_InterfPool.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_InterfPool.jxx>
+#include "NMTDS_InterfPool.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_InterfPool.jxx b/src/NMTDS/NMTDS_InterfPool.jxx
index 5ec012a71..e133eb9da 100644
--- a/src/NMTDS/NMTDS_InterfPool.jxx
+++ b/src/NMTDS/NMTDS_InterfPool.jxx
@@ -20,10 +20,10 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTDS_PassKeyBoolean_HeaderFile
-#include <NMTDS_PassKeyBoolean.hxx>
+#include "NMTDS_PassKeyBoolean.hxx"
 #endif
 #ifndef _NMTDS_ListOfPassKeyBoolean_HeaderFile
-#include <NMTDS_ListOfPassKeyBoolean.hxx>
+#include "NMTDS_ListOfPassKeyBoolean.hxx"
 #endif
 #ifndef _BOPTools_CArray1OfSSInterference_HeaderFile
 #include <BOPTools_CArray1OfSSInterference.hxx>
@@ -44,5 +44,5 @@
 #include <BOPTools_CArray1OfVVInterference.hxx>
 #endif
 #ifndef _NMTDS_InterfPool_HeaderFile
-#include <NMTDS_InterfPool.hxx>
+#include "NMTDS_InterfPool.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_Iterator.hxx b/src/NMTDS/NMTDS_Iterator.hxx
index 095eb283c..599268596 100644
--- a/src/NMTDS/NMTDS_Iterator.hxx
+++ b/src/NMTDS/NMTDS_Iterator.hxx
@@ -23,13 +23,13 @@
 #define _NMTDS_Iterator_HeaderFile
 
 #ifndef _NMTDS_PShapesDataStructure_HeaderFile
-#include <NMTDS_PShapesDataStructure.hxx>
+#include "NMTDS_PShapesDataStructure.hxx"
 #endif
 #ifndef _NMTDS_ListOfPassKeyBoolean_HeaderFile
-#include <NMTDS_ListOfPassKeyBoolean.hxx>
+#include "NMTDS_ListOfPassKeyBoolean.hxx"
 #endif
 #ifndef _NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile
-#include <NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx>
+#include "NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTDS/NMTDS_Iterator.ixx b/src/NMTDS/NMTDS_Iterator.ixx
index 641e32522..6f6ef2e7e 100644
--- a/src/NMTDS/NMTDS_Iterator.ixx
+++ b/src/NMTDS/NMTDS_Iterator.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_Iterator.jxx>
+#include "NMTDS_Iterator.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_Iterator.jxx b/src/NMTDS/NMTDS_Iterator.jxx
index ead7afaf6..9d5444402 100644
--- a/src/NMTDS/NMTDS_Iterator.jxx
+++ b/src/NMTDS/NMTDS_Iterator.jxx
@@ -20,11 +20,11 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTDS_ShapesDataStructure_HeaderFile
-#include <NMTDS_ShapesDataStructure.hxx>
+#include "NMTDS_ShapesDataStructure.hxx"
 #endif
 #ifndef _TColStd_DataMapOfIntegerListOfInteger_HeaderFile
 #include <TColStd_DataMapOfIntegerListOfInteger.hxx>
 #endif
 #ifndef _NMTDS_Iterator_HeaderFile
-#include <NMTDS_Iterator.hxx>
+#include "NMTDS_Iterator.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_IteratorCheckerSI.hxx b/src/NMTDS/NMTDS_IteratorCheckerSI.hxx
index e083f88e4..ea996fa3b 100644
--- a/src/NMTDS/NMTDS_IteratorCheckerSI.hxx
+++ b/src/NMTDS/NMTDS_IteratorCheckerSI.hxx
@@ -23,7 +23,7 @@
 #define _NMTDS_IteratorCheckerSI_HeaderFile
 
 #ifndef _NMTDS_Iterator_HeaderFile
-#include <NMTDS_Iterator.hxx>
+#include "NMTDS_Iterator.hxx"
 #endif
 
 
diff --git a/src/NMTDS/NMTDS_IteratorCheckerSI.ixx b/src/NMTDS/NMTDS_IteratorCheckerSI.ixx
index b9fc4a7d9..c10394611 100644
--- a/src/NMTDS/NMTDS_IteratorCheckerSI.ixx
+++ b/src/NMTDS/NMTDS_IteratorCheckerSI.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_IteratorCheckerSI.jxx>
+#include "NMTDS_IteratorCheckerSI.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_IteratorCheckerSI.jxx b/src/NMTDS/NMTDS_IteratorCheckerSI.jxx
index 569dce04a..d0d583024 100644
--- a/src/NMTDS/NMTDS_IteratorCheckerSI.jxx
+++ b/src/NMTDS/NMTDS_IteratorCheckerSI.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTDS_IteratorCheckerSI_HeaderFile
-#include <NMTDS_IteratorCheckerSI.hxx>
+#include "NMTDS_IteratorCheckerSI.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
index dd32df2ab..be6600e41 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
-#include <Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
+#include "Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx
index ae3b3990e..598d8f0ad 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKey.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTDS_ListNodeOfListOfPassKey_HeaderFile
-#include <Handle_NMTDS_ListNodeOfListOfPassKey.hxx>
+#include "Handle_NMTDS_ListNodeOfListOfPassKey.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
index efb4d8be9..d0352db7e 100644
--- a/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTDS_ListNodeOfListOfPassKeyBoolean_HeaderFile
-#include <Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx>
+#include "Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
index 5d48a957e..af5dd8263 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
-#include <Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
+#include "Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx"
 #endif
 
 #ifndef _BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx b/src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx
index 26ec50838..744b9611d 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPassKey.hxx
@@ -26,11 +26,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_ListNodeOfListOfPassKey_HeaderFile
-#include <Handle_NMTDS_ListNodeOfListOfPassKey.hxx>
+#include "Handle_NMTDS_ListNodeOfListOfPassKey.hxx"
 #endif
 
 #ifndef _NMTDS_PassKey_HeaderFile
-#include <NMTDS_PassKey.hxx>
+#include "NMTDS_PassKey.hxx"
 #endif
 #ifndef _TCollection_MapNode_HeaderFile
 #include <TCollection_MapNode.hxx>
diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
index e539f5b30..4fb128467 100644
--- a/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_ListNodeOfListOfPassKeyBoolean.hxx
@@ -26,11 +26,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_ListNodeOfListOfPassKeyBoolean_HeaderFile
-#include <Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx>
+#include "Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx"
 #endif
 
 #ifndef _NMTDS_PassKeyBoolean_HeaderFile
-#include <NMTDS_PassKeyBoolean.hxx>
+#include "NMTDS_PassKeyBoolean.hxx"
 #endif
 #ifndef _TCollection_MapNode_HeaderFile
 #include <TCollection_MapNode.hxx>
diff --git a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
index bc3715363..201665c05 100644
--- a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
+++ b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
-#include <Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx>
+#include "Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTDS/NMTDS_ListOfPassKey.hxx b/src/NMTDS/NMTDS_ListOfPassKey.hxx
index 390a3a5d1..48b905afe 100644
--- a/src/NMTDS/NMTDS_ListOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_ListOfPassKey.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTDS_ListNodeOfListOfPassKey_HeaderFile
-#include <Handle_NMTDS_ListNodeOfListOfPassKey.hxx>
+#include "Handle_NMTDS_ListNodeOfListOfPassKey.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx
index d4dec7ded..58fc21f85 100644
--- a/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_ListOfPassKeyBoolean.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTDS_ListNodeOfListOfPassKeyBoolean_HeaderFile
-#include <Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx>
+#include "Handle_NMTDS_ListNodeOfListOfPassKeyBoolean.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx
index bdb843bfe..b7f21cbb2 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMapIterator.hxx>
 #endif
 #ifndef _Handle_NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
-#include <Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx>
+#include "Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx"
 #endif
 class Standard_NoSuchObject;
 class NMTDS_PassKey;
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
index 52f2bc1df..716b8ab9e 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMapIterator.hxx>
 #endif
 #ifndef _Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
-#include <Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
+#include "Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx"
 #endif
 class Standard_NoSuchObject;
 class NMTDS_PassKeyBoolean;
diff --git a/src/NMTDS/NMTDS_MapOfPassKey.hxx b/src/NMTDS/NMTDS_MapOfPassKey.hxx
index f029f40d9..3ac64d7e7 100644
--- a/src/NMTDS/NMTDS_MapOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_MapOfPassKey.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
-#include <Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx>
+#include "Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
index 5489e2870..bcf3b0004 100644
--- a/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
-#include <Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
+#include "Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTDS/NMTDS_PassKey.ixx b/src/NMTDS/NMTDS_PassKey.ixx
index fee442621..e3a274ae1 100644
--- a/src/NMTDS/NMTDS_PassKey.ixx
+++ b/src/NMTDS/NMTDS_PassKey.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_PassKey.jxx>
+#include "NMTDS_PassKey.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_PassKey.jxx b/src/NMTDS/NMTDS_PassKey.jxx
index 65bb207de..6b50b6896 100644
--- a/src/NMTDS/NMTDS_PassKey.jxx
+++ b/src/NMTDS/NMTDS_PassKey.jxx
@@ -23,5 +23,5 @@
 #include <TColStd_ListOfInteger.hxx>
 #endif
 #ifndef _NMTDS_PassKey_HeaderFile
-#include <NMTDS_PassKey.hxx>
+#include "NMTDS_PassKey.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_PassKeyBoolean.hxx b/src/NMTDS/NMTDS_PassKeyBoolean.hxx
index aa0cc5b50..f107113c2 100644
--- a/src/NMTDS/NMTDS_PassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_PassKeyBoolean.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Boolean.hxx>
 #endif
 #ifndef _NMTDS_PassKey_HeaderFile
-#include <NMTDS_PassKey.hxx>
+#include "NMTDS_PassKey.hxx"
 #endif
 
 
diff --git a/src/NMTDS/NMTDS_PassKeyBoolean.ixx b/src/NMTDS/NMTDS_PassKeyBoolean.ixx
index f879f4ff7..04d8b351f 100644
--- a/src/NMTDS/NMTDS_PassKeyBoolean.ixx
+++ b/src/NMTDS/NMTDS_PassKeyBoolean.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_PassKeyBoolean.jxx>
+#include "NMTDS_PassKeyBoolean.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_PassKeyBoolean.jxx b/src/NMTDS/NMTDS_PassKeyBoolean.jxx
index b4559ce9b..1ddafb9ae 100644
--- a/src/NMTDS/NMTDS_PassKeyBoolean.jxx
+++ b/src/NMTDS/NMTDS_PassKeyBoolean.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTDS_PassKeyBoolean_HeaderFile
-#include <NMTDS_PassKeyBoolean.hxx>
+#include "NMTDS_PassKeyBoolean.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_PassKeyMapHasher.ixx b/src/NMTDS/NMTDS_PassKeyMapHasher.ixx
index 8c37b4e0c..7f3571f84 100644
--- a/src/NMTDS/NMTDS_PassKeyMapHasher.ixx
+++ b/src/NMTDS/NMTDS_PassKeyMapHasher.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_PassKeyMapHasher.jxx>
+#include "NMTDS_PassKeyMapHasher.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_PassKeyMapHasher.jxx b/src/NMTDS/NMTDS_PassKeyMapHasher.jxx
index 7487e5b18..ef0fb40c3 100644
--- a/src/NMTDS/NMTDS_PassKeyMapHasher.jxx
+++ b/src/NMTDS/NMTDS_PassKeyMapHasher.jxx
@@ -20,8 +20,8 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTDS_PassKey_HeaderFile
-#include <NMTDS_PassKey.hxx>
+#include "NMTDS_PassKey.hxx"
 #endif
 #ifndef _NMTDS_PassKeyMapHasher_HeaderFile
-#include <NMTDS_PassKeyMapHasher.hxx>
+#include "NMTDS_PassKeyMapHasher.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_PassKeyShape.ixx b/src/NMTDS/NMTDS_PassKeyShape.ixx
index c98d33542..920338b2a 100644
--- a/src/NMTDS/NMTDS_PassKeyShape.ixx
+++ b/src/NMTDS/NMTDS_PassKeyShape.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_PassKeyShape.jxx>
+#include "NMTDS_PassKeyShape.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_PassKeyShape.jxx b/src/NMTDS/NMTDS_PassKeyShape.jxx
index 7b7553bcf..743cbff81 100644
--- a/src/NMTDS/NMTDS_PassKeyShape.jxx
+++ b/src/NMTDS/NMTDS_PassKeyShape.jxx
@@ -26,5 +26,5 @@
 #include <TopTools_ListOfShape.hxx>
 #endif
 #ifndef _NMTDS_PassKeyShape_HeaderFile
-#include <NMTDS_PassKeyShape.hxx>
+#include "NMTDS_PassKeyShape.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx
index 32be52eaf..464626e9b 100644
--- a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx
+++ b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_PassKeyShapeMapHasher.jxx>
+#include "NMTDS_PassKeyShapeMapHasher.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx
index 34fa8cc5e..92d6d989c 100644
--- a/src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx
+++ b/src/NMTDS/NMTDS_PassKeyShapeMapHasher.jxx
@@ -20,8 +20,8 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTDS_PassKeyShape_HeaderFile
-#include <NMTDS_PassKeyShape.hxx>
+#include "NMTDS_PassKeyShape.hxx"
 #endif
 #ifndef _NMTDS_PassKeyShapeMapHasher_HeaderFile
-#include <NMTDS_PassKeyShapeMapHasher.hxx>
+#include "NMTDS_PassKeyShapeMapHasher.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.hxx b/src/NMTDS/NMTDS_ShapesDataStructure.hxx
index 2dede1f65..dce90f8ac 100644
--- a/src/NMTDS/NMTDS_ShapesDataStructure.hxx
+++ b/src/NMTDS/NMTDS_ShapesDataStructure.hxx
@@ -26,10 +26,10 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _NMTDS_CArray1OfIndexRange_HeaderFile
-#include <NMTDS_CArray1OfIndexRange.hxx>
+#include "NMTDS_CArray1OfIndexRange.hxx"
 #endif
 #ifndef _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile
-#include <NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx>
+#include "NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx"
 #endif
 #ifndef _BooleanOperations_ShapesDataStructure_HeaderFile
 #include <BooleanOperations_ShapesDataStructure.hxx>
diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.ixx b/src/NMTDS/NMTDS_ShapesDataStructure.ixx
index 2eb57d133..78180909e 100644
--- a/src/NMTDS/NMTDS_ShapesDataStructure.ixx
+++ b/src/NMTDS/NMTDS_ShapesDataStructure.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_ShapesDataStructure.jxx>
+#include "NMTDS_ShapesDataStructure.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.jxx b/src/NMTDS/NMTDS_ShapesDataStructure.jxx
index f14232fd4..e4b0b273a 100644
--- a/src/NMTDS/NMTDS_ShapesDataStructure.jxx
+++ b/src/NMTDS/NMTDS_ShapesDataStructure.jxx
@@ -23,7 +23,7 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _NMTDS_CArray1OfIndexRange_HeaderFile
-#include <NMTDS_CArray1OfIndexRange.hxx>
+#include "NMTDS_CArray1OfIndexRange.hxx"
 #endif
 #ifndef _BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors_HeaderFile
 #include <BooleanOperations_IndexedDataMapOfShapeAncestorsSuccessors.hxx>
@@ -35,5 +35,5 @@
 #include <Bnd_Box.hxx>
 #endif
 #ifndef _NMTDS_ShapesDataStructure_HeaderFile
-#include <NMTDS_ShapesDataStructure.hxx>
+#include "NMTDS_ShapesDataStructure.hxx"
 #endif
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
index 321fb4115..5d5f6b06f 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
@@ -27,11 +27,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
-#include <Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx>
+#include "Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx"
 #endif
 
 #ifndef _NMTDS_PassKey_HeaderFile
-#include <NMTDS_PassKey.hxx>
+#include "NMTDS_PassKey.hxx"
 #endif
 #ifndef _TCollection_MapNode_HeaderFile
 #include <TCollection_MapNode.hxx>
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
index e9aaa4cec..3a4984cff 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
@@ -27,11 +27,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
-#include <Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
+#include "Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx"
 #endif
 
 #ifndef _NMTDS_PassKeyBoolean_HeaderFile
-#include <NMTDS_PassKeyBoolean.hxx>
+#include "NMTDS_PassKeyBoolean.hxx"
 #endif
 #ifndef _TCollection_MapNode_HeaderFile
 #include <TCollection_MapNode.hxx>
diff --git a/src/NMTDS/NMTDS_Tools.ixx b/src/NMTDS/NMTDS_Tools.ixx
index da643aa19..5da7f4359 100644
--- a/src/NMTDS/NMTDS_Tools.ixx
+++ b/src/NMTDS/NMTDS_Tools.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTDS_Tools.jxx>
+#include "NMTDS_Tools.jxx"
 
  
 
diff --git a/src/NMTDS/NMTDS_Tools.jxx b/src/NMTDS/NMTDS_Tools.jxx
index 5fdfd4c5d..5f5c24cdc 100644
--- a/src/NMTDS/NMTDS_Tools.jxx
+++ b/src/NMTDS/NMTDS_Tools.jxx
@@ -29,5 +29,5 @@
 #include <TopTools_IndexedDataMapOfShapeShape.hxx>
 #endif
 #ifndef _NMTDS_Tools_HeaderFile
-#include <NMTDS_Tools.hxx>
+#include "NMTDS_Tools.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_CheckerSI.hxx b/src/NMTTools/NMTTools_CheckerSI.hxx
index 2bd804de4..16d6811f3 100644
--- a/src/NMTTools/NMTTools_CheckerSI.hxx
+++ b/src/NMTTools/NMTTools_CheckerSI.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _NMTTools_PaveFiller_HeaderFile
-#include <NMTTools_PaveFiller.hxx>
+#include "NMTTools_PaveFiller.hxx"
 #endif
 #ifndef _TopAbs_ShapeEnum_HeaderFile
 #include <TopAbs_ShapeEnum.hxx>
diff --git a/src/NMTTools/NMTTools_CheckerSI.ixx b/src/NMTTools/NMTTools_CheckerSI.ixx
index ebd56f247..78abe60a2 100644
--- a/src/NMTTools/NMTTools_CheckerSI.ixx
+++ b/src/NMTTools/NMTTools_CheckerSI.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_CheckerSI.jxx>
+#include "NMTTools_CheckerSI.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_CheckerSI.jxx b/src/NMTTools/NMTTools_CheckerSI.jxx
index 774127cac..410b70423 100644
--- a/src/NMTTools/NMTTools_CheckerSI.jxx
+++ b/src/NMTTools/NMTTools_CheckerSI.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTTools_CheckerSI_HeaderFile
-#include <NMTTools_CheckerSI.hxx>
+#include "NMTTools_CheckerSI.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_CommonBlock.ixx b/src/NMTTools/NMTTools_CommonBlock.ixx
index f335f8981..8be69ea20 100644
--- a/src/NMTTools/NMTTools_CommonBlock.ixx
+++ b/src/NMTTools/NMTTools_CommonBlock.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_CommonBlock.jxx>
+#include "NMTTools_CommonBlock.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_CommonBlock.jxx b/src/NMTTools/NMTTools_CommonBlock.jxx
index be3140a9c..c3b38c6be 100644
--- a/src/NMTTools/NMTTools_CommonBlock.jxx
+++ b/src/NMTTools/NMTTools_CommonBlock.jxx
@@ -29,5 +29,5 @@
 #include <BOPTools_ListOfPaveBlock.hxx>
 #endif
 #ifndef _NMTTools_CommonBlock_HeaderFile
-#include <NMTTools_CommonBlock.hxx>
+#include "NMTTools_CommonBlock.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.ixx b/src/NMTTools/NMTTools_CommonBlockAPI.ixx
index fdca4ca4a..1e91635e7 100644
--- a/src/NMTTools/NMTTools_CommonBlockAPI.ixx
+++ b/src/NMTTools/NMTTools_CommonBlockAPI.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_CommonBlockAPI.jxx>
+#include "NMTTools_CommonBlockAPI.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.jxx b/src/NMTTools/NMTTools_CommonBlockAPI.jxx
index 68ffe0ae9..17cc7669d 100644
--- a/src/NMTTools/NMTTools_CommonBlockAPI.jxx
+++ b/src/NMTTools/NMTTools_CommonBlockAPI.jxx
@@ -20,7 +20,7 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTTools_ListOfCommonBlock_HeaderFile
-#include <NMTTools_ListOfCommonBlock.hxx>
+#include "NMTTools_ListOfCommonBlock.hxx"
 #endif
 #ifndef _BOPTools_ListOfPaveBlock_HeaderFile
 #include <BOPTools_ListOfPaveBlock.hxx>
@@ -29,8 +29,8 @@
 #include <BOPTools_PaveBlock.hxx>
 #endif
 #ifndef _NMTTools_CommonBlock_HeaderFile
-#include <NMTTools_CommonBlock.hxx>
+#include "NMTTools_CommonBlock.hxx"
 #endif
 #ifndef _NMTTools_CommonBlockAPI_HeaderFile
-#include <NMTTools_CommonBlockAPI.hxx>
+#include "NMTTools_CommonBlockAPI.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_CoupleOfShape.ixx b/src/NMTTools/NMTTools_CoupleOfShape.ixx
index 65ba2898a..9c229194a 100644
--- a/src/NMTTools/NMTTools_CoupleOfShape.ixx
+++ b/src/NMTTools/NMTTools_CoupleOfShape.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_CoupleOfShape.jxx>
+#include "NMTTools_CoupleOfShape.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_CoupleOfShape.jxx b/src/NMTTools/NMTTools_CoupleOfShape.jxx
index 64230757c..41ffdcad2 100644
--- a/src/NMTTools/NMTTools_CoupleOfShape.jxx
+++ b/src/NMTTools/NMTTools_CoupleOfShape.jxx
@@ -23,5 +23,5 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _NMTTools_CoupleOfShape_HeaderFile
-#include <NMTTools_CoupleOfShape.hxx>
+#include "NMTTools_CoupleOfShape.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_DEProcessor.hxx b/src/NMTTools/NMTTools_DEProcessor.hxx
index c3587312f..ea8d563aa 100644
--- a/src/NMTTools/NMTTools_DEProcessor.hxx
+++ b/src/NMTTools/NMTTools_DEProcessor.hxx
@@ -23,10 +23,10 @@
 #define _NMTTools_DEProcessor_HeaderFile
 
 #ifndef _NMTTools_PPaveFiller_HeaderFile
-#include <NMTTools_PPaveFiller.hxx>
+#include "NMTTools_PPaveFiller.hxx"
 #endif
 #ifndef _NMTDS_PShapesDataStructure_HeaderFile
-#include <NMTDS_PShapesDataStructure.hxx>
+#include "NMTDS_PShapesDataStructure.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTTools/NMTTools_DEProcessor.ixx b/src/NMTTools/NMTTools_DEProcessor.ixx
index e7f2e54f8..bced17486 100644
--- a/src/NMTTools/NMTTools_DEProcessor.ixx
+++ b/src/NMTTools/NMTTools_DEProcessor.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_DEProcessor.jxx>
+#include "NMTTools_DEProcessor.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_DEProcessor.jxx b/src/NMTTools/NMTTools_DEProcessor.jxx
index 9b5931f0e..0585be70d 100644
--- a/src/NMTTools/NMTTools_DEProcessor.jxx
+++ b/src/NMTTools/NMTTools_DEProcessor.jxx
@@ -20,7 +20,7 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTTools_PaveFiller_HeaderFile
-#include <NMTTools_PaveFiller.hxx>
+#include "NMTTools_PaveFiller.hxx"
 #endif
 #ifndef _BOPTools_ListOfPaveBlock_HeaderFile
 #include <BOPTools_ListOfPaveBlock.hxx>
@@ -35,5 +35,5 @@
 #include <TopoDS_Vertex.hxx>
 #endif
 #ifndef _NMTTools_DEProcessor_HeaderFile
-#include <NMTTools_DEProcessor.hxx>
+#include "NMTTools_DEProcessor.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_DSFiller.hxx b/src/NMTTools/NMTTools_DSFiller.hxx
index 2f0064412..3f33c136b 100644
--- a/src/NMTTools/NMTTools_DSFiller.hxx
+++ b/src/NMTTools/NMTTools_DSFiller.hxx
@@ -26,13 +26,13 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _NMTDS_PShapesDataStructure_HeaderFile
-#include <NMTDS_PShapesDataStructure.hxx>
+#include "NMTDS_PShapesDataStructure.hxx"
 #endif
 #ifndef _BOPTools_PInterferencePool_HeaderFile
 #include <BOPTools_PInterferencePool.hxx>
 #endif
 #ifndef _NMTTools_PPaveFiller_HeaderFile
-#include <NMTTools_PPaveFiller.hxx>
+#include "NMTTools_PPaveFiller.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTTools/NMTTools_DSFiller.ixx b/src/NMTTools/NMTTools_DSFiller.ixx
index 798cc4a14..5396b779a 100644
--- a/src/NMTTools/NMTTools_DSFiller.ixx
+++ b/src/NMTTools/NMTTools_DSFiller.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_DSFiller.jxx>
+#include "NMTTools_DSFiller.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_DSFiller.jxx b/src/NMTTools/NMTTools_DSFiller.jxx
index b9e272ee0..6ddf0628b 100644
--- a/src/NMTTools/NMTTools_DSFiller.jxx
+++ b/src/NMTTools/NMTTools_DSFiller.jxx
@@ -23,14 +23,14 @@
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _NMTDS_ShapesDataStructure_HeaderFile
-#include <NMTDS_ShapesDataStructure.hxx>
+#include "NMTDS_ShapesDataStructure.hxx"
 #endif
 #ifndef _BOPTools_InterferencePool_HeaderFile
 #include <BOPTools_InterferencePool.hxx>
 #endif
 #ifndef _NMTTools_PaveFiller_HeaderFile
-#include <NMTTools_PaveFiller.hxx>
+#include "NMTTools_PaveFiller.hxx"
 #endif
 #ifndef _NMTTools_DSFiller_HeaderFile
-#include <NMTTools_DSFiller.hxx>
+#include "NMTTools_DSFiller.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
index cafca05ea..b4f99c533 100644
--- a/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_HeaderFile
-#include <Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx>
+#include "Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx"
 #endif
 class Standard_NoSuchObject;
 class BOPTools_ListOfPaveBlock;
diff --git a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
index d38fc46e4..349e1238e 100644
--- a/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_HeaderFile
-#include <Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx>
+#include "Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx"
 #endif
 
 #ifndef _Standard_Integer_HeaderFile
diff --git a/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx b/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
index 4ee635d04..020b87b49 100644
--- a/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_DataMapOfIntegerListOfPaveBlock.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_HeaderFile
-#include <Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx>
+#include "Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
index 6f6cc6a58..c94529f12 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile
-#include <Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx>
+#include "Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx"
 #endif
 
 #ifndef _Standard_Integer_HeaderFile
diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
index e4cb16eea..9f7f712f7 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
-#include <Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx>
+#include "Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
index e95f7cf64..a2f314024 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile
-#include <Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx>
+#include "Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx"
 #endif
 
 #ifndef _TopoDS_Shape_HeaderFile
diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
index 98cf95b4a..06c08244f 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx
@@ -29,7 +29,7 @@
 #include <Standard_Integer.hxx>
 #endif
 #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile
-#include <Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx>
+#include "Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
index 02fbc923c..962cf20c8 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
-#include <Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx>
+#include "Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
index 78ad92772..964519e0e 100644
--- a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
+++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile
-#include <Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx>
+#include "Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.hxx
index 67128fb0c..51a9ff878 100644
--- a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.hxx
+++ b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.hxx
@@ -23,7 +23,7 @@
 #define _NMTTools_IteratorOfCoupleOfShape_HeaderFile
 
 #ifndef _NMTDS_PShapesDataStructure_HeaderFile
-#include <NMTDS_PShapesDataStructure.hxx>
+#include "NMTDS_PShapesDataStructure.hxx"
 #endif
 #ifndef _BOPTools_IndexedMapOfCoupleOfInteger_HeaderFile
 #include <BOPTools_IndexedMapOfCoupleOfInteger.hxx>
diff --git a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.ixx b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.ixx
index 35f563b13..7dc647a7f 100644
--- a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.ixx
+++ b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_IteratorOfCoupleOfShape.jxx>
+#include "NMTTools_IteratorOfCoupleOfShape.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.jxx b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.jxx
index b2c3333a3..fe21adb10 100644
--- a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.jxx
+++ b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.jxx
@@ -23,8 +23,8 @@
 #include <Standard_NoSuchObject.hxx>
 #endif
 #ifndef _NMTDS_ShapesDataStructure_HeaderFile
-#include <NMTDS_ShapesDataStructure.hxx>
+#include "NMTDS_ShapesDataStructure.hxx"
 #endif
 #ifndef _NMTTools_IteratorOfCoupleOfShape_HeaderFile
-#include <NMTTools_IteratorOfCoupleOfShape.hxx>
+#include "NMTTools_IteratorOfCoupleOfShape.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx
index e4d4eb1fd..e45558b49 100644
--- a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx
+++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTTools_ListNodeOfListOfCommonBlock_HeaderFile
-#include <Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx>
+#include "Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
index dad1e219b..ace65d85a 100644
--- a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
+++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile
-#include <Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx>
+#include "Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx
index b7b004c72..eec46647e 100644
--- a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx
+++ b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx
@@ -26,11 +26,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTTools_ListNodeOfListOfCommonBlock_HeaderFile
-#include <Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx>
+#include "Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx"
 #endif
 
 #ifndef _NMTTools_CommonBlock_HeaderFile
-#include <NMTTools_CommonBlock.hxx>
+#include "NMTTools_CommonBlock.hxx"
 #endif
 #ifndef _TCollection_MapNode_HeaderFile
 #include <TCollection_MapNode.hxx>
diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx
index 752f4a8ac..16108dcd6 100644
--- a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx
+++ b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx
@@ -26,11 +26,11 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile
-#include <Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx>
+#include "Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx"
 #endif
 
 #ifndef _NMTTools_CoupleOfShape_HeaderFile
-#include <NMTTools_CoupleOfShape.hxx>
+#include "NMTTools_CoupleOfShape.hxx"
 #endif
 #ifndef _TCollection_MapNode_HeaderFile
 #include <TCollection_MapNode.hxx>
diff --git a/src/NMTTools/NMTTools_ListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListOfCommonBlock.hxx
index 7e664fd9a..61e3b40d5 100644
--- a/src/NMTTools/NMTTools_ListOfCommonBlock.hxx
+++ b/src/NMTTools/NMTTools_ListOfCommonBlock.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTTools_ListNodeOfListOfCommonBlock_HeaderFile
-#include <Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx>
+#include "Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx
index 27a971107..92897e093 100644
--- a/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx
+++ b/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx
@@ -26,7 +26,7 @@
 #include <Standard_Address.hxx>
 #endif
 #ifndef _Handle_NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile
-#include <Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx>
+#include "Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx b/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
index c00274562..5a2f2e5a7 100644
--- a/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_MapIteratorOfMapOfPaveBlock.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMapIterator.hxx>
 #endif
 #ifndef _Handle_NMTTools_StdMapNodeOfMapOfPaveBlock_HeaderFile
-#include <Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx>
+#include "Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx"
 #endif
 class Standard_NoSuchObject;
 class BOPTools_PaveBlock;
diff --git a/src/NMTTools/NMTTools_MapOfPaveBlock.hxx b/src/NMTTools/NMTTools_MapOfPaveBlock.hxx
index 6dc17138f..53674d7c4 100644
--- a/src/NMTTools/NMTTools_MapOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_MapOfPaveBlock.hxx
@@ -26,7 +26,7 @@
 #include <TCollection_BasicMap.hxx>
 #endif
 #ifndef _Handle_NMTTools_StdMapNodeOfMapOfPaveBlock_HeaderFile
-#include <Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx>
+#include "Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx"
 #endif
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
diff --git a/src/NMTTools/NMTTools_PCurveMaker.hxx b/src/NMTTools/NMTTools_PCurveMaker.hxx
index 25e94667a..99e44e1f0 100644
--- a/src/NMTTools/NMTTools_PCurveMaker.hxx
+++ b/src/NMTTools/NMTTools_PCurveMaker.hxx
@@ -23,7 +23,7 @@
 #define _NMTTools_PCurveMaker_HeaderFile
 
 #ifndef _NMTTools_PDSFiller_HeaderFile
-#include <NMTTools_PDSFiller.hxx>
+#include "NMTTools_PDSFiller.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/NMTTools/NMTTools_PCurveMaker.ixx b/src/NMTTools/NMTTools_PCurveMaker.ixx
index 2b0b74625..a1c638af5 100644
--- a/src/NMTTools/NMTTools_PCurveMaker.ixx
+++ b/src/NMTTools/NMTTools_PCurveMaker.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_PCurveMaker.jxx>
+#include "NMTTools_PCurveMaker.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_PCurveMaker.jxx b/src/NMTTools/NMTTools_PCurveMaker.jxx
index edf46c82d..cc9c21fab 100644
--- a/src/NMTTools/NMTTools_PCurveMaker.jxx
+++ b/src/NMTTools/NMTTools_PCurveMaker.jxx
@@ -20,5 +20,5 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #ifndef _NMTTools_PCurveMaker_HeaderFile
-#include <NMTTools_PCurveMaker.hxx>
+#include "NMTTools_PCurveMaker.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_PaveFiller.hxx b/src/NMTTools/NMTTools_PaveFiller.hxx
index 46b659f05..a7143249f 100644
--- a/src/NMTTools/NMTTools_PaveFiller.hxx
+++ b/src/NMTTools/NMTTools_PaveFiller.hxx
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef _NMTDS_PShapesDataStructure_HeaderFile
-#include <NMTDS_PShapesDataStructure.hxx>
+#include "NMTDS_PShapesDataStructure.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
@@ -42,7 +42,7 @@
 #include <BOPTools_PavePool.hxx>
 #endif
 #ifndef _NMTTools_CommonBlockPool_HeaderFile
-#include <NMTTools_CommonBlockPool.hxx>
+#include "NMTTools_CommonBlockPool.hxx"
 #endif
 #ifndef _BOPTools_SplitShapesPool_HeaderFile
 #include <BOPTools_SplitShapesPool.hxx>
@@ -54,19 +54,19 @@
 #include <BOPTools_SSIntersectionAttribute.hxx>
 #endif
 #ifndef _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
-#include <NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx>
+#include "NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx"
 #endif
 #ifndef _TColStd_DataMapOfIntegerInteger_HeaderFile
 #include <TColStd_DataMapOfIntegerInteger.hxx>
 #endif
 #ifndef _NMTDS_PIterator_HeaderFile
-#include <NMTDS_PIterator.hxx>
+#include "NMTDS_PIterator.hxx"
 #endif
 #ifndef _TopoDS_Shape_HeaderFile
 #include <TopoDS_Shape.hxx>
 #endif
 #ifndef _NMTDS_PInterfPool_HeaderFile
-#include <NMTDS_PInterfPool.hxx>
+#include "NMTDS_PInterfPool.hxx"
 #endif
 #ifndef _TopAbs_ShapeEnum_HeaderFile
 #include <TopAbs_ShapeEnum.hxx>
diff --git a/src/NMTTools/NMTTools_PaveFiller.ixx b/src/NMTTools/NMTTools_PaveFiller.ixx
index 210065e01..08d9db1ba 100644
--- a/src/NMTTools/NMTTools_PaveFiller.ixx
+++ b/src/NMTTools/NMTTools_PaveFiller.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_PaveFiller.jxx>
+#include "NMTTools_PaveFiller.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_PaveFiller.jxx b/src/NMTTools/NMTTools_PaveFiller.jxx
index ec28fecac..2a37007cd 100644
--- a/src/NMTTools/NMTTools_PaveFiller.jxx
+++ b/src/NMTTools/NMTTools_PaveFiller.jxx
@@ -35,7 +35,7 @@
 #include <BOPTools_PavePool.hxx>
 #endif
 #ifndef _NMTTools_CommonBlockPool_HeaderFile
-#include <NMTTools_CommonBlockPool.hxx>
+#include "NMTTools_CommonBlockPool.hxx"
 #endif
 #ifndef _BOPTools_SplitShapesPool_HeaderFile
 #include <BOPTools_SplitShapesPool.hxx>
@@ -47,10 +47,10 @@
 #include <TopoDS_Vertex.hxx>
 #endif
 #ifndef _NMTTools_ListOfCommonBlock_HeaderFile
-#include <NMTTools_ListOfCommonBlock.hxx>
+#include "NMTTools_ListOfCommonBlock.hxx"
 #endif
 #ifndef _NMTTools_CommonBlock_HeaderFile
-#include <NMTTools_CommonBlock.hxx>
+#include "NMTTools_CommonBlock.hxx"
 #endif
 #ifndef _BOPTools_IDMapOfPaveBlockIMapOfPaveBlock_HeaderFile
 #include <BOPTools_IDMapOfPaveBlockIMapOfPaveBlock.hxx>
@@ -83,7 +83,7 @@
 #include <gp_Pnt.hxx>
 #endif
 #ifndef _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile
-#include <NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx>
+#include "NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx"
 #endif
 #ifndef _TopTools_ListOfShape_HeaderFile
 #include <TopTools_ListOfShape.hxx>
@@ -95,5 +95,5 @@
 #include <TopTools_DataMapOfShapeShape.hxx>
 #endif
 #ifndef _NMTTools_PaveFiller_HeaderFile
-#include <NMTTools_PaveFiller.hxx>
+#include "NMTTools_PaveFiller.hxx"
 #endif
diff --git a/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock.hxx b/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
index b121fc402..77a1ecdd4 100644
--- a/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
+++ b/src/NMTTools/NMTTools_StdMapNodeOfMapOfPaveBlock.hxx
@@ -26,7 +26,7 @@
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_NMTTools_StdMapNodeOfMapOfPaveBlock_HeaderFile
-#include <Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx>
+#include "Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx"
 #endif
 
 #ifndef _BOPTools_PaveBlock_HeaderFile
diff --git a/src/NMTTools/NMTTools_Tools.ixx b/src/NMTTools/NMTTools_Tools.ixx
index 5b825b3fc..13905aa74 100644
--- a/src/NMTTools/NMTTools_Tools.ixx
+++ b/src/NMTTools/NMTTools_Tools.ixx
@@ -19,7 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include <NMTTools_Tools.jxx>
+#include "NMTTools_Tools.jxx"
 
  
 
diff --git a/src/NMTTools/NMTTools_Tools.jxx b/src/NMTTools/NMTTools_Tools.jxx
index 7b6f648a2..c4965bf4b 100644
--- a/src/NMTTools/NMTTools_Tools.jxx
+++ b/src/NMTTools/NMTTools_Tools.jxx
@@ -44,14 +44,14 @@
 #include <IntTools_Context.hxx>
 #endif
 #ifndef _NMTTools_ListOfCoupleOfShape_HeaderFile
-#include <NMTTools_ListOfCoupleOfShape.hxx>
+#include "NMTTools_ListOfCoupleOfShape.hxx"
 #endif
 #ifndef _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile
-#include <NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx>
+#include "NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx"
 #endif
 #ifndef _Geom2d_Curve_HeaderFile
 #include <Geom2d_Curve.hxx>
 #endif
 #ifndef _NMTTools_Tools_HeaderFile
-#include <NMTTools_Tools.hxx>
+#include "NMTTools_Tools.hxx"
 #endif
diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx
index 973003606..b440b1937 100644
--- a/src/OBJECT/GEOM_AISShape.cxx
+++ b/src/OBJECT/GEOM_AISShape.cxx
@@ -31,7 +31,7 @@
 */
 
 #include "GEOM_AISShape.ixx"
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
 // Open CASCADE Includes
 #include <AIS_Drawer.hxx>
diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx
index ce59e04ef..53c805551 100644
--- a/src/OBJECT/GEOM_AISShape.hxx
+++ b/src/OBJECT/GEOM_AISShape.hxx
@@ -36,13 +36,13 @@
 #endif
 
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include "Handle_SALOME_InteractiveObject.hxx"
+#include <gui/Handle_SALOME_InteractiveObject.hxx>
 #endif
 #ifndef _Standard_CString_HeaderFile
 #include <Standard_CString.hxx>
 #endif
 #ifndef _SALOME_AISShape_HeaderFile
-#include "SALOME_AISShape.hxx"
+#include <gui/SALOME_AISShape.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/OBJECT/GEOM_AISTrihedron.hxx b/src/OBJECT/GEOM_AISTrihedron.hxx
index b70bea8b4..e8073a88b 100755
--- a/src/OBJECT/GEOM_AISTrihedron.hxx
+++ b/src/OBJECT/GEOM_AISTrihedron.hxx
@@ -27,7 +27,7 @@
 #ifndef GEOM_AISTrihedron_HeaderFile
 #define GEOM_AISTrihedron_HeaderFile
 
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
 #include <AIS_Trihedron.hxx>
 #include <Standard_DefineHandle.hxx>
diff --git a/src/OBJECT/GEOM_AISVector.hxx b/src/OBJECT/GEOM_AISVector.hxx
index 1a61a9e8b..d29d4c250 100644
--- a/src/OBJECT/GEOM_AISVector.hxx
+++ b/src/OBJECT/GEOM_AISVector.hxx
@@ -27,7 +27,7 @@
 #ifndef GEOM_AISVector_HeaderFile
 #define GEOM_AISVector_HeaderFile
 
-#include <GEOM_AISShape.hxx>
+#include "GEOM_AISShape.hxx"
 #include <Standard_DefineHandle.hxx>
 
 /*!
diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx
index 00cf1cef3..51eb4f888 100644
--- a/src/OBJECT/GEOM_Actor.cxx
+++ b/src/OBJECT/GEOM_Actor.cxx
@@ -35,7 +35,7 @@
 #include "GEOM_EdgeSource.h" 
 #include "GEOM_WireframeFace.h" 
 #include "GEOM_ShadingFace.h"
-#include "SVTK_Actor.h"
+#include <gui/SVTK_Actor.h>
 
 #include <vtkObjectFactory.h> 
 #include <vtkRenderer.h> 
@@ -65,9 +65,9 @@
 #include <vtkMath.h>
 #include <vtkCamera.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
 //vtkStandardNewMacro(GEOM_Actor);
 
diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h
index 2d04f8bad..9b2312f45 100644
--- a/src/OBJECT/GEOM_Actor.h
+++ b/src/OBJECT/GEOM_Actor.h
@@ -31,7 +31,7 @@
 #include "GEOM_OBJECT_defs.hxx"
 #include "GEOM_SmartPtr.h"
 
-#include <SALOME_Actor.h>
+#include <gui/SALOME_Actor.h>
 
 #include <TopoDS_Shape.hxx>
 #include <vtkSmartPointer.h>
diff --git a/src/OBJECT/GEOM_AssemblyBuilder.cxx b/src/OBJECT/GEOM_AssemblyBuilder.cxx
index 101f40d8b..51f483f56 100644
--- a/src/OBJECT/GEOM_AssemblyBuilder.cxx
+++ b/src/OBJECT/GEOM_AssemblyBuilder.cxx
@@ -33,8 +33,8 @@
 #include "GEOM_AssemblyBuilder.h"
 #include "GEOM_Actor.h"
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <vtkProperty.h>
 #include <vtkAssembly.h>
@@ -55,7 +55,7 @@
 // Qt includes
 #include <QColor>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 // SALOME
diff --git a/src/OBJECT/GEOM_DeviceActor.cxx b/src/OBJECT/GEOM_DeviceActor.cxx
index ececab19c..abd326f7d 100755
--- a/src/OBJECT/GEOM_DeviceActor.cxx
+++ b/src/OBJECT/GEOM_DeviceActor.cxx
@@ -29,7 +29,7 @@
 #include <vtkPolyDataMapper.h>  
 #include <vtkPolyDataNormals.h>  
 #include <vtkActor.h> 
-#include <VTKViewer_Actor.h>
+#include <gui/VTKViewer_Actor.h>
 #include <vtkRenderer.h> 
  
 vtkStandardNewMacro(GEOM_DeviceActor);
diff --git a/src/OBJECT/GEOM_InteractiveObject.hxx b/src/OBJECT/GEOM_InteractiveObject.hxx
index 48a9b9cc2..9fa7269b5 100644
--- a/src/OBJECT/GEOM_InteractiveObject.hxx
+++ b/src/OBJECT/GEOM_InteractiveObject.hxx
@@ -37,13 +37,13 @@
 #include <Standard_CString.hxx>
 #endif
 #ifndef _SALOME_InteractiveObject_HeaderFile
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
 #endif
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include "Handle_SALOME_InteractiveObject.hxx"
+#include <gui/Handle_SALOME_InteractiveObject.hxx>
 #endif
 
 class GEOM_InteractiveObject : public SALOME_InteractiveObject {
diff --git a/src/OBJECT/GEOM_InteractiveObject.jxx b/src/OBJECT/GEOM_InteractiveObject.jxx
index 7455669f9..ee359d7db 100644
--- a/src/OBJECT/GEOM_InteractiveObject.jxx
+++ b/src/OBJECT/GEOM_InteractiveObject.jxx
@@ -24,7 +24,7 @@
 //  Module : GEOM
 //
 #ifndef _SALOME_InteractiveObject_HeaderFile
-#include "SALOME_InteractiveObject.hxx"
+#include "gui/SALOME_InteractiveObject.hxx"
 #endif
 #ifndef _GEOM_InteractiveObject_HeaderFile
 #include "GEOM_InteractiveObject.hxx"
diff --git a/src/OBJECT/GEOM_OCCReader.cxx b/src/OBJECT/GEOM_OCCReader.cxx
index 381a2ed98..95ea7488e 100644
--- a/src/OBJECT/GEOM_OCCReader.cxx
+++ b/src/OBJECT/GEOM_OCCReader.cxx
@@ -59,7 +59,7 @@
 #include <TColStd_Array1OfReal.hxx>
 #include <Adaptor3d_HCurve.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/OBJECT/GEOM_VTKTrihedron.hxx b/src/OBJECT/GEOM_VTKTrihedron.hxx
index 7808b0b60..a25bef0b1 100644
--- a/src/OBJECT/GEOM_VTKTrihedron.hxx
+++ b/src/OBJECT/GEOM_VTKTrihedron.hxx
@@ -31,8 +31,8 @@
 #include "GEOM_OBJECT_defs.hxx"
 
 #include <Geom_Axis2Placement.hxx>
-#include "SALOME_Actor.h"
-#include "VTKViewer_Trihedron.h"
+#include <gui/SALOME_Actor.h>
+#include <gui/VTKViewer_Trihedron.h>
 
 class vtkRenderer;
 class vtkPolyDataMapper;
diff --git a/src/OBJECT/Handle_GEOM_AISShape.hxx b/src/OBJECT/Handle_GEOM_AISShape.hxx
index 4556c2712..c6d714ece 100644
--- a/src/OBJECT/Handle_GEOM_AISShape.hxx
+++ b/src/OBJECT/Handle_GEOM_AISShape.hxx
@@ -34,7 +34,7 @@
 #endif
 
 #ifndef _Handle_SALOME_AISShape_HeaderFile
-#include "Handle_SALOME_AISShape.hxx"
+#include <gui/Handle_SALOME_AISShape.hxx>
 #endif
 
 class Standard_Transient;
diff --git a/src/OBJECT/Handle_GEOM_InteractiveObject.hxx b/src/OBJECT/Handle_GEOM_InteractiveObject.hxx
index 822359cb7..bed31cd42 100644
--- a/src/OBJECT/Handle_GEOM_InteractiveObject.hxx
+++ b/src/OBJECT/Handle_GEOM_InteractiveObject.hxx
@@ -34,7 +34,7 @@
 #endif
 
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include "Handle_SALOME_InteractiveObject.hxx"
+#include <gui/Handle_SALOME_InteractiveObject.hxx>
 #endif
 
 class Standard_Transient;
diff --git a/src/OperationGUI/OperationGUI.cxx b/src/OperationGUI/OperationGUI.cxx
index 74906380d..a4722e10a 100644
--- a/src/OperationGUI/OperationGUI.cxx
+++ b/src/OperationGUI/OperationGUI.cxx
@@ -27,9 +27,9 @@
 
 #include <GeometryGUI.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SalomeApp_Application.h>
 
 #include <TopTools_MapOfShape.hxx>
 #include <TopExp_Explorer.hxx>
diff --git a/src/OperationGUI/OperationGUI.h b/src/OperationGUI/OperationGUI.h
index 760150bac..72e7f36e1 100644
--- a/src/OperationGUI/OperationGUI.h
+++ b/src/OperationGUI/OperationGUI.h
@@ -26,7 +26,7 @@
 #ifndef OPERATIONGUI_H
 #define OPERATIONGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
 //=================================================================================
 // class    : OperationGUI
diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
index 3da8378c8..64463dd6e 100644
--- a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx
@@ -29,11 +29,11 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : OperationGUI_ArchimedeDlg()
diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.h b/src/OperationGUI/OperationGUI_ArchimedeDlg.h
index 640e06f77..b0e5ab7d0 100644
--- a/src/OperationGUI/OperationGUI_ArchimedeDlg.h
+++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.h
@@ -26,7 +26,7 @@
 #ifndef OPERATIONGUI_ARCHIMEDEDLG_H
 #define OPERATIONGUI_ARCHIMEDEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel3Spin;
 
diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
index 68192ab25..f93409ae7 100644
--- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx
@@ -24,20 +24,20 @@
 // Author : Damien COQUERET, Open CASCADE S.A.S.
 //
 #include "OperationGUI_ChamferDlg.h"
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <OCCViewer_ViewModel.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/OCCViewer_ViewModel.h>
 
 // OCCT Includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.h b/src/OperationGUI/OperationGUI_ChamferDlg.h
index dcdc019ab..63996d9e5 100644
--- a/src/OperationGUI/OperationGUI_ChamferDlg.h
+++ b/src/OperationGUI/OperationGUI_ChamferDlg.h
@@ -26,7 +26,7 @@
 #ifndef OPERATIONGUI_CHAMFERDLG_H
 #define OPERATIONGUI_CHAMFERDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 
diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.cxx b/src/OperationGUI/OperationGUI_ClippingDlg.cxx
index 7bdc0d6e4..5491b0cb0 100644
--- a/src/OperationGUI/OperationGUI_ClippingDlg.cxx
+++ b/src/OperationGUI/OperationGUI_ClippingDlg.cxx
@@ -28,19 +28,19 @@
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ViewManager.h>
-#include <SVTK_ViewWindow.h>
-#include <SVTK_ViewModel.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
 
-#include <OCCViewer_ViewModel.h>
-#include <OCCViewer_ViewWindow.h>
-#include <OCCViewer_ViewPort3d.h>
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/OCCViewer_ViewWindow.h>
+#include <gui/OCCViewer_ViewPort3d.h>
 
-#include <VTKViewer.h>
+#include <gui/VTKViewer.h>
 
 // OCC Includes
 #include <V3d_View.hxx>
diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.h b/src/OperationGUI/OperationGUI_ClippingDlg.h
index 1e6cba6c6..0e2e1dd83 100644
--- a/src/OperationGUI/OperationGUI_ClippingDlg.h
+++ b/src/OperationGUI/OperationGUI_ClippingDlg.h
@@ -26,7 +26,7 @@
 #ifndef OPERATIONGUI_CLIPPINGDLG_H
 #define OPERATIONGUI_CLIPPINGDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class QGroupBox;
 class QLabel;
diff --git a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
index c713a5ddd..39235a5f5 100644
--- a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
+++ b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.cxx
@@ -29,14 +29,14 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <OCCViewer_ViewModel.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/OCCViewer_ViewModel.h>
 
 // OCCT Includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h
index 9e7f679d9..325eeacd5 100644
--- a/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h
+++ b/src/OperationGUI/OperationGUI_Fillet1d2dDlg.h
@@ -26,7 +26,7 @@
 #ifndef OPERATIONGUI_Fillet1d2dDLG_H
 #define OPERATIONGUI_Fillet1d2dDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 
diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx
index 242a03173..0b14458bb 100644
--- a/src/OperationGUI/OperationGUI_FilletDlg.cxx
+++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx
@@ -29,14 +29,14 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <OCCViewer_ViewModel.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/OCCViewer_ViewModel.h>
 
 // OCCT Includes
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/OperationGUI/OperationGUI_FilletDlg.h b/src/OperationGUI/OperationGUI_FilletDlg.h
index 5a5a71a33..faea91d19 100644
--- a/src/OperationGUI/OperationGUI_FilletDlg.h
+++ b/src/OperationGUI/OperationGUI_FilletDlg.h
@@ -26,7 +26,7 @@
 #ifndef OPERATIONGUI_FILLETDLG_H
 #define OPERATIONGUI_FILLETDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <TColStd_IndexedMapOfInteger.hxx>
 
diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
index 49958ccdd..e2d7904d5 100644
--- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
+++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //==============================================================================
 // class    : OperationGUI_GetShapesOnShapeDlg()
diff --git a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h
index 1b819641c..c2248b3e6 100644
--- a/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h
+++ b/src/OperationGUI/OperationGUI_GetShapesOnShapeDlg.h
@@ -26,8 +26,8 @@
 #ifndef OPERATIONGUI_GETSHAPESONSHAPEDLG_H
 #define OPERATIONGUI_GETSHAPESONSHAPEDLG_H
 
-#include <GEOMBase_Skeleton.h>
-#include <GEOMAlgo_State.hxx>
+#include "GEOMBase_Skeleton.h"
+#include "GEOMAlgo_State.hxx"
 
 class DlgRef_2Sel2List;
 
diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.cxx b/src/OperationGUI/OperationGUI_MaterialDlg.cxx
index eb5666828..c022fe70e 100644
--- a/src/OperationGUI/OperationGUI_MaterialDlg.cxx
+++ b/src/OperationGUI/OperationGUI_MaterialDlg.cxx
@@ -30,10 +30,10 @@
 #include <GEOMBase.h>
 #include <GeometryGUI.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : OperationGUI_MaterialDlg()
diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.h b/src/OperationGUI/OperationGUI_MaterialDlg.h
index a35d3e955..15988cabb 100644
--- a/src/OperationGUI/OperationGUI_MaterialDlg.h
+++ b/src/OperationGUI/OperationGUI_MaterialDlg.h
@@ -26,7 +26,7 @@
 #ifndef OPERATIONGUI_MATERIALDLG_H
 #define OPERATIONGUI_MATERIALDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1List1Spin1Btn;
 
diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.cxx b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
index 7c606ad0a..8bf78d7b9 100644
--- a/src/OperationGUI/OperationGUI_PartitionDlg.cxx
+++ b/src/OperationGUI/OperationGUI_PartitionDlg.cxx
@@ -31,12 +31,12 @@
 
 #include <GEOMImpl_Types.hxx>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TopoDS_Iterator.hxx>
 #include <TopoDS_Shape.hxx>
diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.h b/src/OperationGUI/OperationGUI_PartitionDlg.h
index a540a05eb..a2cd8f173 100644
--- a/src/OperationGUI/OperationGUI_PartitionDlg.h
+++ b/src/OperationGUI/OperationGUI_PartitionDlg.h
@@ -26,7 +26,7 @@
 #ifndef OPERATIONGUI_PARTITIONDLG_H
 #define OPERATIONGUI_PARTITIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel1List1Check;
 
diff --git a/src/PARTITION/Partition_Inter2d.cxx b/src/PARTITION/Partition_Inter2d.cxx
index 4469bb5b8..2e4e59479 100644
--- a/src/PARTITION/Partition_Inter2d.cxx
+++ b/src/PARTITION/Partition_Inter2d.cxx
@@ -27,7 +27,7 @@
 //
 #include "Partition_Inter2d.ixx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAdaptor_Curve.hxx>
 #include <BRepAlgo_AsDes.hxx>
diff --git a/src/PARTITION/Partition_Inter3d.cxx b/src/PARTITION/Partition_Inter3d.cxx
index 56bb3bd72..334e1ba59 100644
--- a/src/PARTITION/Partition_Inter3d.cxx
+++ b/src/PARTITION/Partition_Inter3d.cxx
@@ -27,7 +27,7 @@
 //
 #include "Partition_Inter2d.hxx"
 #include "Partition_Inter3d.ixx"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRepAlgo_AsDes.hxx>
 #include <BRepAlgo_Image.hxx>
diff --git a/src/PARTITION/Partition_Loop.cxx b/src/PARTITION/Partition_Loop.cxx
index a14b233ba..a4f991b46 100644
--- a/src/PARTITION/Partition_Loop.cxx
+++ b/src/PARTITION/Partition_Loop.cxx
@@ -29,7 +29,7 @@
 
 #include "Partition_Loop.ixx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <BRep_Builder.hxx>
 #include <BRepAlgo_FaceRestrictor.hxx>
diff --git a/src/PARTITION/Partition_Loop2d.cxx b/src/PARTITION/Partition_Loop2d.cxx
index 534e76a41..78e0ef725 100644
--- a/src/PARTITION/Partition_Loop2d.cxx
+++ b/src/PARTITION/Partition_Loop2d.cxx
@@ -27,7 +27,7 @@
 //
 #include "Partition_Loop2d.ixx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include <stdio.h>
 
 #include <BRepAdaptor_Curve2d.hxx>
diff --git a/src/PARTITION/Partition_Spliter.cxx b/src/PARTITION/Partition_Spliter.cxx
index 7dcb3d85a..524d67175 100644
--- a/src/PARTITION/Partition_Spliter.cxx
+++ b/src/PARTITION/Partition_Spliter.cxx
@@ -31,7 +31,7 @@
 #include "Partition_Loop3d.hxx"
 #include "Partition_Spliter.ixx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <Precision.hxx>
 #include <TopAbs_Orientation.hxx>
diff --git a/src/PrimitiveGUI/PrimitiveGUI.cxx b/src/PrimitiveGUI/PrimitiveGUI.cxx
index b6c831aba..29b17dfe3 100644
--- a/src/PrimitiveGUI/PrimitiveGUI.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI.cxx
@@ -27,8 +27,8 @@
 
 #include <GeometryGUI.h>
 
-#include <SUIT_Desktop.h>
-#include <SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SalomeApp_Application.h>
 
 #include "PrimitiveGUI_BoxDlg.h"      // Method BOX
 #include "PrimitiveGUI_CylinderDlg.h" // Method CYLINDER
diff --git a/src/PrimitiveGUI/PrimitiveGUI.h b/src/PrimitiveGUI/PrimitiveGUI.h
index df97571df..11ee0a1db 100644
--- a/src/PrimitiveGUI/PrimitiveGUI.h
+++ b/src/PrimitiveGUI/PrimitiveGUI.h
@@ -26,7 +26,7 @@
 #ifndef PRIMITIVEGUI_H
 #define PRIMITIVEGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
   
 //=================================================================================
 // class    : PrimitiveGUI
diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
index 5dcbdc41e..367dff5d8 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h
index 8cb75c19b..28d845862 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h
@@ -26,7 +26,7 @@
 #ifndef PRIMITIVEGUI_BOXDLG_H
 #define PRIMITIVEGUI_BOXDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel;
 class DlgRef_3Spin;
diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
index 0c434b2a6..f57a4151e 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h
index 2d1d6dc83..1915a3e86 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h
@@ -26,7 +26,7 @@
 #ifndef PRIMITIVEGUI_CONEDLG_H
 #define PRIMITIVEGUI_CONEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel3Spin;
 class DlgRef_3Spin;
diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
index a316c5ddc..afc2901fe 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
index 0e6fc18fd..14c02fc01 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h
@@ -26,7 +26,7 @@
 #ifndef PRIMITIVEGUI_CYLINDERDLG_H
 #define PRIMITIVEGUI_CYLINDERDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel2Spin;
 class DlgRef_2Spin;
diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
index 9bffe1132..86a314482 100755
--- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h
index 83ddb2df0..4db2dc386 100755
--- a/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_DiskDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_DISKDLG_H
 #define BASICGUI_DISKDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_3Sel;
 class DlgRef_2Sel1Spin;
diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
index dfbab6629..96c8b0f7b 100755
--- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
diff --git a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h
index 90d034e8b..e33a6f783 100755
--- a/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_FaceDlg.h
@@ -26,7 +26,7 @@
 #ifndef BASICGUI_FACEDLG_H
 #define BASICGUI_FACEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Spin;
 class DlgRef_1Sel2Spin;
diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
index 506e8b33d..f0fac71d1 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 #include <TopoDS_Shape.hxx>
 #include <TopoDS.hxx>
diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h
index 80ffe3f27..0dd71f2cf 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h
@@ -26,7 +26,7 @@
 #ifndef PRIMITIVEGUI_SPHEREDLG_H
 #define PRIMITIVEGUI_SPHEREDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Spin;
 class DlgRef_1Spin;
diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
index 0a532e75c..9e9e1352f 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
index c173b0edf..7feb8e714 100644
--- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
+++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h
@@ -26,7 +26,7 @@
 #ifndef PRIMITIVEGUI_TORUSDLG_H
 #define PRIMITIVEGUI_TORUSDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel2Spin;
 class DlgRef_2Spin;
diff --git a/src/RepairGUI/RepairGUI.cxx b/src/RepairGUI/RepairGUI.cxx
index ff1045d49..f15803cf8 100644
--- a/src/RepairGUI/RepairGUI.cxx
+++ b/src/RepairGUI/RepairGUI.cxx
@@ -27,9 +27,9 @@
 
 #include <GeometryGUI.h>
 
-#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>
 
 #include "RepairGUI_SewingDlg.h"        // Method SEWING
 #include "RepairGUI_SuppressFacesDlg.h" // Method SUPPRESS FACES
diff --git a/src/RepairGUI/RepairGUI.h b/src/RepairGUI/RepairGUI.h
index c829b3b80..f0a7f6c4e 100644
--- a/src/RepairGUI/RepairGUI.h
+++ b/src/RepairGUI/RepairGUI.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_H
 #define REPAIRGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
 //=================================================================================
 // class    : RepairGUI
diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
index 6398033c9..f53c1c254 100644
--- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <GEOMImpl_Types.hxx>
 
diff --git a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h
index e248bc7f7..e73a41015 100644
--- a/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h
+++ b/src/RepairGUI/RepairGUI_ChangeOrientationDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_CHANGEORIENTATIONDLG_H
 #define REPAIRGUI_CHANGEORIENTATIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Check;
 
diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
index ce95bb76b..989393037 100644
--- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
+++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopAbs.hxx>
diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.h b/src/RepairGUI/RepairGUI_CloseContourDlg.h
index 71d1a3b7e..95db1c932 100644
--- a/src/RepairGUI/RepairGUI_CloseContourDlg.h
+++ b/src/RepairGUI/RepairGUI_CloseContourDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_CLOSECONTOURDLG_H
 #define REPAIRGUI_CLOSECONTOURDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2SelExt;
 class QButtonGroup;
diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
index 94f9aac4e..1dda91cc4 100644
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx
@@ -28,12 +28,12 @@
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <GEOMImpl_Types.hxx>
 
diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h
index d2a71bf35..086531682 100644
--- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h
+++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_DIVIDEEDGEDLG_H
 #define REPAIRGUI_DIVIDEEDGEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1SelExt;
 class SalomeApp_DoubleSpinBox;
diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
index 6d0cacbe6..23724a028 100644
--- a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx
@@ -30,13 +30,13 @@
 #include <GEOM_Displayer.h>
 #include <GEOMImpl_Types.hxx>
 
-#include <SalomeApp_Application.h>
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <TColStd_MapOfInteger.hxx>
 
diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.h b/src/RepairGUI/RepairGUI_FreeBoundDlg.h
index afca4ef79..390fe11e6 100644
--- a/src/RepairGUI/RepairGUI_FreeBoundDlg.h
+++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.h
@@ -27,7 +27,7 @@
 #define REPAIRGUI_FREEBOUNDDLG_H
 
 #include <QDialog>
-#include <GEOMBase_Helper.h>
+#include "GEOMBase_Helper.h"
 
 class QLineEdit;
 class QLabel;
diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
index 684b383c8..1c2d3db8d 100644
--- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx
@@ -25,16 +25,16 @@
 //
 #include "RepairGUI_FreeFacesDlg.h"
 
-#include <LightApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Tools.h>
-
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Tools.h>
+
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <GEOMImpl_Types.hxx>
 
diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.h b/src/RepairGUI/RepairGUI_FreeFacesDlg.h
index 8cd360721..46888525e 100644
--- a/src/RepairGUI/RepairGUI_FreeFacesDlg.h
+++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.h
@@ -27,7 +27,7 @@
 #define REPAIRGUI_FREEFACESDLG_H
 
 #include <QDialog>
-#include <GEOMBase_Helper.h>
+#include "GEOMBase_Helper.h"
 
 class GEOM_Displayer;
 class QPushButton;
diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx
index 3810eb952..00bad8778 100644
--- a/src/RepairGUI/RepairGUI_GlueDlg.cxx
+++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx
@@ -28,21 +28,21 @@
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
-#include <QtxDoubleSpinBox.h>
-
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Tools.h>
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_OverrideCursor.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
-#include <OCCViewer_ViewModel.h>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/QtxDoubleSpinBox.h>
+
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/OCCViewer_ViewModel.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 #include <GEOMImpl_Types.hxx>
 
diff --git a/src/RepairGUI/RepairGUI_GlueDlg.h b/src/RepairGUI/RepairGUI_GlueDlg.h
index 8d838ab85..4e620f2b8 100644
--- a/src/RepairGUI/RepairGUI_GlueDlg.h
+++ b/src/RepairGUI/RepairGUI_GlueDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_GLUEDLG_H
 #define REPAIRGUI_GLUEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1SelExt;
 class SalomeApp_DoubleSpinBox;
diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
index d744df7f7..e786c7895 100644
--- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <GEOMImpl_Types.hxx>
 
diff --git a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h
index 80ad0511f..7bed8ea7c 100644
--- a/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h
+++ b/src/RepairGUI/RepairGUI_RemoveExtraEdgesDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_REMOVEEXTRAEDGESDLG_H
 #define REPAIRGUI_REMOVEEXTRAEDGESDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Check;
 
diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
index 0feb58ca4..a72c730d5 100644
--- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx
@@ -29,11 +29,11 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopAbs.hxx>
diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h
index efe07f6a1..08e0f26ea 100644
--- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h
+++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_REMOVEHOLESDLG_H
 #define REPAIRGUI_REMOVEHOLESDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Check1Sel;
 class QPushButton;
diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
index b9a5b226e..0fb83c5e2 100644
--- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
+++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopAbs.hxx>
diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h
index 838a6ecde..3994a831f 100644
--- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h
+++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_REMOVEINTWIRESDLG_H
 #define REPAIRGUI_REMOVEINTWIRESDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Check1Sel;
 
diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx
index a2f39ae3d..3ff0ccb7f 100644
--- a/src/RepairGUI/RepairGUI_SewingDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SewingDlg.cxx
@@ -28,13 +28,13 @@
 #include <DlgRef.h>
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <GEOMImpl_Types.hxx>
 
diff --git a/src/RepairGUI/RepairGUI_SewingDlg.h b/src/RepairGUI/RepairGUI_SewingDlg.h
index 3bd6dfb7e..25783b643 100644
--- a/src/RepairGUI/RepairGUI_SewingDlg.h
+++ b/src/RepairGUI/RepairGUI_SewingDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_SEWINGDLG_H
 #define REPAIRGUI_SEWINGDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1SelExt;
 class SalomeApp_DoubleSpinBox;
diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
index ffe7f6596..62ca84ebe 100755
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
@@ -29,17 +29,17 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 #include <GEOMImpl_Types.hxx>
-#include <QtxDoubleSpinBox.h>
-
-#include <SalomeApp_Application.h>
-#include <SalomeApp_DoubleSpinBox.h>
-#include <SalomeApp_IntSpinBox.h>
-#include <LightApp_SelectionMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_MessageBox.h>
-#include <SALOME_ListIteratorOfListIO.hxx>
-#include <SALOME_ListIO.hxx>
+#include <gui/QtxDoubleSpinBox.h>
+
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_DoubleSpinBox.h>
+#include <gui/SalomeApp_IntSpinBox.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_MapOfInteger.hxx>
diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h
index e5fd0e902..542acf656 100755
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_SHAPEPROCESSDLG_H
 #define REPAIRGUI_SHAPEPROCESSDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 #include <QMap>
 
diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
index eede039e7..520d5e928 100644
--- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
+++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx
@@ -29,12 +29,12 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <LightApp_SelectionMgr.h>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 // OCCT Includes
 #include <TopAbs.hxx>
diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h
index bbc015e7a..e8ae57a61 100644
--- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h
+++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h
@@ -26,7 +26,7 @@
 #ifndef REPAIRGUI_SUPPRESSFACESDLG_H
 #define REPAIRGUI_SUPPRESSFACESDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel;
 
diff --git a/src/SKETCHER/Sketcher_Profile.cxx b/src/SKETCHER/Sketcher_Profile.cxx
index eb8fd9f23..9d03f2f53 100644
--- a/src/SKETCHER/Sketcher_Profile.cxx
+++ b/src/SKETCHER/Sketcher_Profile.cxx
@@ -49,7 +49,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_Array1OfAsciiString.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 //=======================================================================
 // profile
diff --git a/src/STEPExport/STEPExport.cxx b/src/STEPExport/STEPExport.cxx
index f07067790..84670c09c 100644
--- a/src/STEPExport/STEPExport.cxx
+++ b/src/STEPExport/STEPExport.cxx
@@ -24,9 +24,9 @@
 // Author:      Pavel TELKOV
 //              <ptv@mutex.nnov.opencascade.com>
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <IFSelect_ReturnStatus.hxx>
 
diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx
index cb5535376..018faa709 100644
--- a/src/STEPImport/STEPImport.cxx
+++ b/src/STEPImport/STEPImport.cxx
@@ -24,9 +24,9 @@
 // Author:      Pavel TELKOV
 //              <ptv@mutex.nnov.opencascade.com>
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <BRep_Builder.hxx>
 
diff --git a/src/STLExport/STLExport.cxx b/src/STLExport/STLExport.cxx
index 84e2907a0..df7c930d0 100644
--- a/src/STLExport/STLExport.cxx
+++ b/src/STLExport/STLExport.cxx
@@ -24,7 +24,7 @@
 // Author:      Pavel TELKOV
 //              <ptv@mutex.nnov.opencascade.com>
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <StlAPI_Writer.hxx>
 
diff --git a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx
index 80c82ebed..0983b30cd 100644
--- a/src/ShHealOper/ShHealOper_ChangeOrientation.hxx
+++ b/src/ShHealOper/ShHealOper_ChangeOrientation.hxx
@@ -27,7 +27,7 @@
 #define ShHealOper_ChangeOrientation_HeaderFile
 
 #include <MMgt_TShared.hxx>
-#include <ShHealOper_Tool.hxx>
+#include "ShHealOper_Tool.hxx"
 #include <TopoDS_Shape.hxx>
 
 ///  Class ShHealOper_ChangeOrientation
diff --git a/src/ShHealOper/ShHealOper_CloseContour.hxx b/src/ShHealOper/ShHealOper_CloseContour.hxx
index 4558bb1c9..9e138ff6a 100644
--- a/src/ShHealOper/ShHealOper_CloseContour.hxx
+++ b/src/ShHealOper/ShHealOper_CloseContour.hxx
@@ -35,7 +35,7 @@
 #include <ShapeExtend_WireData.hxx>
 #include <ShapeAnalysis_Wire.hxx>
 #include <TColStd_MapOfInteger.hxx>
-#include <ShHealOper_Tool.hxx>
+#include "ShHealOper_Tool.hxx"
 #include <TopoDS_Edge.hxx>
 ///  Class ShHealOper_CloseContour
 //
diff --git a/src/ShHealOper/ShHealOper_EdgeDivide.hxx b/src/ShHealOper/ShHealOper_EdgeDivide.hxx
index c09d779bd..35b86ed6b 100644
--- a/src/ShHealOper/ShHealOper_EdgeDivide.hxx
+++ b/src/ShHealOper/ShHealOper_EdgeDivide.hxx
@@ -30,7 +30,7 @@
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Shape.hxx>
-#include <ShHealOper_Tool.hxx>
+#include "ShHealOper_Tool.hxx"
 #include <TColStd_SequenceOfReal.hxx>
 
 ///  Class ShHealOper_EdgeDivide
diff --git a/src/ShHealOper/ShHealOper_FillHoles.hxx b/src/ShHealOper/ShHealOper_FillHoles.hxx
index 473244023..4a06229c3 100644
--- a/src/ShHealOper/ShHealOper_FillHoles.hxx
+++ b/src/ShHealOper/ShHealOper_FillHoles.hxx
@@ -34,7 +34,7 @@
 #include <Geom_Surface.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
 #include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
-#include <ShHealOper_Tool.hxx>
+#include "ShHealOper_Tool.hxx"
 #include <TopTools_HSequenceOfShape.hxx>
 #include <TopTools_IndexedMapOfShape.hxx>
 
diff --git a/src/ShHealOper/ShHealOper_RemoveFace.hxx b/src/ShHealOper/ShHealOper_RemoveFace.hxx
index a93a43dfa..1af4b62bb 100644
--- a/src/ShHealOper/ShHealOper_RemoveFace.hxx
+++ b/src/ShHealOper/ShHealOper_RemoveFace.hxx
@@ -27,7 +27,7 @@
 #define ShHealOper_RemoveFace_HeaderFile
 
 #include <MMgt_TShared.hxx>
-#include <ShHealOper_Tool.hxx>
+#include "ShHealOper_Tool.hxx"
 #include <TopoDS_Shape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
diff --git a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx
index fd684cc71..93622067c 100644
--- a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx
+++ b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx
@@ -27,7 +27,7 @@
 #define ShHealOper_RemoveInternalWires_HeaderFile
 
 #include <MMgt_TShared.hxx>
-#include <ShHealOper_Tool.hxx>
+#include "ShHealOper_Tool.hxx"
 #include <TopoDS_Shape.hxx>
 #include <TopTools_SequenceOfShape.hxx>
 #include <TopoDS_Face.hxx>
diff --git a/src/ShHealOper/ShHealOper_Sewing.hxx b/src/ShHealOper/ShHealOper_Sewing.hxx
index 466cd7a3b..521781131 100644
--- a/src/ShHealOper/ShHealOper_Sewing.hxx
+++ b/src/ShHealOper/ShHealOper_Sewing.hxx
@@ -27,7 +27,7 @@
 #define ShHealOper_Sewing_HeaderFile
 
 #include <MMgt_TShared.hxx>
-#include <ShHealOper_Tool.hxx>
+#include "ShHealOper_Tool.hxx"
 #include <TopoDS_Shape.hxx>
 #include <TopAbs_ShapeEnum.hxx>
 #include <BRepBuilderAPI_Sewing.hxx>
diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx
index 136102503..bc7ef39cf 100644
--- a/src/TransformationGUI/TransformationGUI.cxx
+++ b/src/TransformationGUI/TransformationGUI.cxx
@@ -28,14 +28,14 @@
 #include <GEOMBase.h>
 #include <GeometryGUI.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ViewModel.h>
-#include <SUIT_ViewWindow.h>
-#include <SUIT_ViewManager.h>
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
-#include <SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewModel.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 #include "TransformationGUI_MultiTranslationDlg.h"   // Method MULTI TRANSLATION
 #include "TransformationGUI_MultiRotationDlg.h"      // Method MULTI ROTATION
diff --git a/src/TransformationGUI/TransformationGUI.h b/src/TransformationGUI/TransformationGUI.h
index 41c1967ae..7d4a74434 100644
--- a/src/TransformationGUI/TransformationGUI.h
+++ b/src/TransformationGUI/TransformationGUI.h
@@ -26,7 +26,7 @@
 #ifndef TRANSFORMATIONGUI_H
 #define TRANSFORMATIONGUI_H
 
-#include <GEOMGUI.h>
+#include "GEOMGUI.h"
 
 //=================================================================================
 // class    : TransformationGUI
diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
index bf33d2043..f644c688f 100644
--- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.h b/src/TransformationGUI/TransformationGUI_MirrorDlg.h
index ad6912d24..c16b8343e 100644
--- a/src/TransformationGUI/TransformationGUI_MirrorDlg.h
+++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.h
@@ -26,7 +26,7 @@
 #ifndef TRANSFORMATIONGUI_MIRRORDLG_H
 #define TRANSFORMATIONGUI_MIRRORDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel1Spin2Check;  
 
diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
index 3516b050e..b12ed6521 100644
--- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
index d47bf4b55..6d6be5b64 100644
--- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
+++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h
@@ -26,7 +26,7 @@
 #ifndef TRANSFORMATIONGUI_MULTIROTATIONDLG_H
 #define TRANSFORMATIONGUI_MULTIROTATIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel4Spin1Check;
 class DlgRef_2Sel1SpinInt;
diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
index c41e0a12f..40fc1f564 100644
--- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h
index 49359aab8..13aa878fb 100644
--- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h
+++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h
@@ -26,7 +26,7 @@
 #ifndef TRANSFORMATIONGUI_MULTITRANSLATIONDLG_H
 #define TRANSFORMATIONGUI_MULTITRANSLATIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_2Sel2Spin1Check;
 class DlgRef_3Sel4Spin2Check;
diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
index c6a59d39f..5a73d68be 100644
--- a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //=================================================================================
 // class    : TransformationGUI_OffsetDlg()
diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.h b/src/TransformationGUI/TransformationGUI_OffsetDlg.h
index c830c1352..36cea8a00 100644
--- a/src/TransformationGUI/TransformationGUI_OffsetDlg.h
+++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.h
@@ -26,7 +26,7 @@
 #ifndef TRANSFORMATIONGUI_OFFSETDLG_H
 #define TRANSFORMATIONGUI_OFFSETDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_1Sel1Spin1Check;  
   
diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
index 62ef268ca..3ba9f4d40 100644
--- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 #include <TColStd_IndexedMapOfInteger.hxx>
 
 // OCCT Includes
diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.h b/src/TransformationGUI/TransformationGUI_PositionDlg.h
index 305e4796c..cd47786aa 100644
--- a/src/TransformationGUI/TransformationGUI_PositionDlg.h
+++ b/src/TransformationGUI/TransformationGUI_PositionDlg.h
@@ -26,7 +26,7 @@
 #ifndef TRANSFORMATIONGUI_POSITIONDLG_H
 #define TRANSFORMATIONGUI_POSITIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_4Sel1Spin3Check;
 
diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
index a0f8f7803..95777dd5b 100644
--- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.h b/src/TransformationGUI/TransformationGUI_RotationDlg.h
index c3a42fa77..9edf1dc51 100644
--- a/src/TransformationGUI/TransformationGUI_RotationDlg.h
+++ b/src/TransformationGUI/TransformationGUI_RotationDlg.h
@@ -26,7 +26,7 @@
 #ifndef TRANSFORMATIONGUI_ROTATIONDLG_H
 #define TRANSFORMATIONGUI_ROTATIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_4Sel1Spin2Check;
   
diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
index 112c1c61b..bcc551d0a 100644
--- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx
@@ -29,11 +29,11 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SalomeApp_DoubleSpinBox.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_DoubleSpinBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.h b/src/TransformationGUI/TransformationGUI_ScaleDlg.h
index 29c85ff5c..d41c2cd31 100644
--- a/src/TransformationGUI/TransformationGUI_ScaleDlg.h
+++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.h
@@ -26,7 +26,7 @@
 #ifndef TRANSFORMATIONGUI_SCALEDLG_H
 #define TRANSFORMATIONGUI_SCALEDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class QCheckBox;
 class QGroupBox;
diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
index 5818b64d7..b3b0c1e58 100644
--- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
+++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx
@@ -29,10 +29,10 @@
 #include <GeometryGUI.h>
 #include <GEOMBase.h>
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 // OCCT Includes
 #include <TopoDS_Shape.hxx>
diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.h b/src/TransformationGUI/TransformationGUI_TranslationDlg.h
index 9f6dcabcc..f78533875 100644
--- a/src/TransformationGUI/TransformationGUI_TranslationDlg.h
+++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.h
@@ -26,7 +26,7 @@
 #ifndef TRANSFORMATIONGUI_TRANSLATIONDLG_H
 #define TRANSFORMATIONGUI_TRANSLATIONDLG_H
 
-#include <GEOMBase_Skeleton.h>
+#include "GEOMBase_Skeleton.h"
 
 class DlgRef_3Sel3Spin2Check;