From: adv <adv@opencascade.com>
Date: Fri, 19 Feb 2010 16:02:22 +0000 (+0000)
Subject: Improve build system: install each module's header files to the sub-directory of... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_IMP_INCLUDE;p=modules%2Fvisu.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_VISU.m4 b/adm_local/unix/config_files/check_VISU.m4
index 1fde1814..1bce9cf4 100755
--- a/adm_local/unix/config_files/check_VISU.m4
+++ b/adm_local/unix/config_files/check_VISU.m4
@@ -58,7 +58,7 @@ if test -f ${VISU_DIR}/idl/salome/VISU_Gen.idl ; then
    AC_SUBST(VISU_ROOT_DIR)
 
    VISU_LDFLAGS=-L${VISU_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   VISU_CXXFLAGS=-I${VISU_DIR}/include/salome
+   VISU_CXXFLAGS="-I${VISU_DIR}/include/salome -I${VISU_DIR}/include/salome/skel"
 
    AC_SUBST(VISU_LDFLAGS)
    AC_SUBST(VISU_CXXFLAGS)
diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 958becf8..c169b4e2 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
 purebindir         = $(prefix)/bin
diff --git a/idl/Makefile.am b/idl/Makefile.am
index 28f4db67..0a31071a 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLVISU.la
 nodist_libSalomeIDLVISU_la_SOURCES = VISU_GenSK.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)
 
 libSalomeIDLVISU_la_CPPFLAGS =			\
 	-I$(top_builddir)/idl			\
diff --git a/src/CONVERTOR/VISUConvertor.cxx b/src/CONVERTOR/VISUConvertor.cxx
index 6e6170d9..3ee6ba43 100644
--- a/src/CONVERTOR/VISUConvertor.cxx
+++ b/src/CONVERTOR/VISUConvertor.cxx
@@ -42,7 +42,7 @@
 #include <QStringList>
 
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/CONVERTOR/VISU_ConvertorDef.hxx b/src/CONVERTOR/VISU_ConvertorDef.hxx
index 9e9099d3..c494f50c 100644
--- a/src/CONVERTOR/VISU_ConvertorDef.hxx
+++ b/src/CONVERTOR/VISU_ConvertorDef.hxx
@@ -32,7 +32,7 @@
   \brief The file contains predeclarations for basic classes of the VISU CONVERTER package
 */
 
-#include "MED_SharedPtr.hxx"
+#include <med/MED_SharedPtr.hxx>
 
 namespace VISU
 {
diff --git a/src/CONVERTOR/VISU_ConvertorUtils.hxx b/src/CONVERTOR/VISU_ConvertorUtils.hxx
index 2d51c376..5f5f7db7 100644
--- a/src/CONVERTOR/VISU_ConvertorUtils.hxx
+++ b/src/CONVERTOR/VISU_ConvertorUtils.hxx
@@ -31,9 +31,9 @@
 
 #include "VISU_ConvertorDef.hxx"
 #include "VISU_IDMapper.hxx"
-#include "MED_Utilities.hxx"
+#include <med/MED_Utilities.hxx>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 #include <vtkSystemIncludes.h>
 
 #include <string>
diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx
index f3c03075..292805c6 100644
--- a/src/CONVERTOR/VISU_Convertor_impl.cxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.cxx
@@ -31,7 +31,7 @@
 
 #include "VISU_AppendFilter.hxx"
 #include "VISU_AppendPolyData.hxx"
-#include "VTKViewer_CellLocationsArray.h"
+#include <gui/VTKViewer_CellLocationsArray.h>
 #include "VISU_CommonCellsFilter.hxx"
 
 #include "VISU_ConvertorUtils.hxx"
diff --git a/src/CONVERTOR/VISU_IDMapper.hxx b/src/CONVERTOR/VISU_IDMapper.hxx
index 5a9fec79..00705ba0 100644
--- a/src/CONVERTOR/VISU_IDMapper.hxx
+++ b/src/CONVERTOR/VISU_IDMapper.hxx
@@ -34,9 +34,9 @@
 
 #include "VISUConvertor.hxx"
 
-#include "MED_SharedPtr.hxx"
-#include "MED_Vector.hxx"
-#include "VTKViewer.h"
+#include <med/MED_SharedPtr.hxx>
+#include <med/MED_Vector.hxx>
+#include <gui/VTKViewer.h>
 
 #include <string>
 #include <map>
diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 457fde69..f1410c56 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -27,10 +27,10 @@
 #include "VISU_MedConvertor.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
-#include "MED_Factory.hxx"
-#include "MED_Algorithm.hxx"
-#include "MED_GaussUtils.hxx"
-#include "MED_Utilities.hxx"
+#include <med/MED_Factory.hxx>
+#include <med/MED_Algorithm.hxx>
+#include <med/MED_GaussUtils.hxx>
+#include <med/MED_Utilities.hxx>
 
 #include "SALOMEconfig.h"
 
diff --git a/src/CONVERTOR/VISU_MedConvertor.hxx b/src/CONVERTOR/VISU_MedConvertor.hxx
index 216e8a15..c2dee74b 100644
--- a/src/CONVERTOR/VISU_MedConvertor.hxx
+++ b/src/CONVERTOR/VISU_MedConvertor.hxx
@@ -32,10 +32,10 @@
 #include "VISU_PointCoords.hxx"
 #include "VISU_MeshValue.hxx"
 
-#include "MED_Wrapper.hxx"
-#include "MED_Common.hxx"
-#include "MED_Structures.hxx"
-#include "MED_GaussUtils.hxx"
+#include <med/MED_Wrapper.hxx>
+#include <med/MED_Common.hxx>
+#include <med/MED_Structures.hxx>
+#include <med/MED_GaussUtils.hxx>
 
 #include <boost/thread/mutex.hpp>
 
diff --git a/src/CONVERTOR/VISU_MeshValue.hxx b/src/CONVERTOR/VISU_MeshValue.hxx
index e29f2922..e78e36db 100644
--- a/src/CONVERTOR/VISU_MeshValue.hxx
+++ b/src/CONVERTOR/VISU_MeshValue.hxx
@@ -35,8 +35,8 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorDef_impl.hxx"
 
-#include "MED_SliceArray.hxx"
-#include "MED_Vector.hxx"
+#include <med/MED_SliceArray.hxx>
+#include <med/MED_Vector.hxx>
 
 namespace VISU
 {
diff --git a/src/CONVERTOR/VISU_PointCoords.hxx b/src/CONVERTOR/VISU_PointCoords.hxx
index b1fcd87b..1f4a1ce3 100644
--- a/src/CONVERTOR/VISU_PointCoords.hxx
+++ b/src/CONVERTOR/VISU_PointCoords.hxx
@@ -36,8 +36,8 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorDef_impl.hxx"
 
-#include "MED_SliceArray.hxx"
-#include "MED_Structures.hxx"
+#include <med/MED_SliceArray.hxx>
+#include <med/MED_Structures.hxx>
 
 #include <vtkSmartPointer.h>
 
diff --git a/src/CONVERTOR/VISU_Structures.hxx b/src/CONVERTOR/VISU_Structures.hxx
index 70f620fb..993ad66e 100644
--- a/src/CONVERTOR/VISU_Structures.hxx
+++ b/src/CONVERTOR/VISU_Structures.hxx
@@ -35,7 +35,7 @@
 #include "VISU_IDMapper.hxx"
 #include "VISU_ConvertorDef.hxx"
 
-#include "MED_Vector.hxx"
+#include <med/MED_Vector.hxx>
 
 #include <map>
 #include <set>
diff --git a/src/CONVERTOR/VISU_TableReader.cxx b/src/CONVERTOR/VISU_TableReader.cxx
index cb431dab..60e7b474 100644
--- a/src/CONVERTOR/VISU_TableReader.cxx
+++ b/src/CONVERTOR/VISU_TableReader.cxx
@@ -45,7 +45,7 @@
 #include <vtkStructuredGrid.h>
 #include <vtkStructuredGridGeometryFilter.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx b/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
index b6e3a872..ec7118c0 100644
--- a/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
@@ -55,7 +55,7 @@
 #include <vtkFloatArray.h>
 
 // MED Warpper includes
-#include "MED_Factory.hxx"
+#include <med/MED_Factory.hxx>
 
 // STL includes
 #include <string>
diff --git a/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx b/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx
index 50610707..2c6dfbc6 100644
--- a/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx
+++ b/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx
@@ -28,7 +28,7 @@
 
 #include "VISUConvertor.hxx"
 
-#include <MED_Common.hxx>
+#include <med/MED_Common.hxx>
 #include <vtkIntArray.h>
 #include <vtkDataSet.h>
 
diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc
index 2d0f66ad..77c76de8 100644
--- a/src/ENGINE/VISU_Engine_i.cc
+++ b/src/ENGINE/VISU_Engine_i.cc
@@ -20,12 +20,12 @@
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 #include "VISU_Engine_i.hh"
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog)
 
-#include "SALOME_NamingService.hxx"
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 using namespace std;
 
diff --git a/src/ENGINE/VISU_Engine_i.hh b/src/ENGINE/VISU_Engine_i.hh
index 950246d3..53723c34 100644
--- a/src/ENGINE/VISU_Engine_i.hh
+++ b/src/ENGINE/VISU_Engine_i.hh
@@ -30,7 +30,7 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
-#include "SALOME_Component_i.hxx"
+#include <kernel/SALOME_Component_i.hxx>
 
 namespace VISU
 {
diff --git a/src/GUITOOLS/VisuGUI_TableDlg.cxx b/src/GUITOOLS/VisuGUI_TableDlg.cxx
index b782a881..b320ed78 100644
--- a/src/GUITOOLS/VisuGUI_TableDlg.cxx
+++ b/src/GUITOOLS/VisuGUI_TableDlg.cxx
@@ -25,20 +25,20 @@
 //
 #include "VisuGUI_TableDlg.h"
 
-#include "SUIT_Tools.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SALOMEDSClient_Study.hxx"
-#include "SALOMEDSClient_GenericAttribute.hxx"
-#include "SALOMEDSClient_AttributeTableOfInteger.hxx"
-#include "SALOMEDSClient_AttributeTableOfReal.hxx"
-#include "SALOMEDSClient_StudyBuilder.hxx"
+#include <kernel/SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_GenericAttribute.hxx>
+#include <kernel/SALOMEDSClient_AttributeTableOfInteger.hxx>
+#include <kernel/SALOMEDSClient_AttributeTableOfReal.hxx>
+#include <kernel/SALOMEDSClient_StudyBuilder.hxx>
 
 #include <QLayout>
 #include <QValidator>
@@ -53,7 +53,7 @@
 #include <QKeyEvent>
 #include <QHeaderView>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/GUITOOLS/VisuGUI_TableDlg.h b/src/GUITOOLS/VisuGUI_TableDlg.h
index 9f708ae7..89820cf3 100644
--- a/src/GUITOOLS/VisuGUI_TableDlg.h
+++ b/src/GUITOOLS/VisuGUI_TableDlg.h
@@ -34,7 +34,7 @@
 class QTableWidget;
 class VisuGUI_TableWidget;
 
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 #include "VisuGUITools.h"
 
diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index 20a5a842..8302a152 100644
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -33,17 +33,17 @@
 
 #include "VISU_PipeLine.hxx"
 
-#include "SVTK_Actor.h"
-#include "SVTK_Event.h"
+#include <gui/SVTK_Actor.h>
+#include <gui/SVTK_Event.h>
 
-#include "VTKViewer_FramedTextActor.h"
-#include "VTKViewer_ShrinkFilter.h"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_FramedTextActor.h>
+#include <gui/VTKViewer_ShrinkFilter.h>
+#include <gui/VTKViewer_GeometryFilter.h>
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <stdexcept>
 #include <sstream>
@@ -84,7 +84,7 @@
 
 #include <boost/bind.hpp>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "VISU_PipeLineUtils.hxx"
 
diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h
index 41152cfc..78b45663 100644
--- a/src/OBJECT/VISU_Actor.h
+++ b/src/OBJECT/VISU_Actor.h
@@ -29,10 +29,10 @@
 
 #include "VISU_OBJECT.h"
 
-#include "SALOME_Actor.h"
+#include <gui/SALOME_Actor.h>
 #include "VISU_ActorBase.h"
 #include "VISU_BoostSignals.h"
-#include "SVTK_DeviceActor.h"
+#include <gui/SVTK_DeviceActor.h>
 
 #include <string>
 #include <vtkTimeStamp.h>
diff --git a/src/OBJECT/VISU_ActorBase.cxx b/src/OBJECT/VISU_ActorBase.cxx
index 44dbbc6f..07bb20d6 100644
--- a/src/OBJECT/VISU_ActorBase.cxx
+++ b/src/OBJECT/VISU_ActorBase.cxx
@@ -27,7 +27,7 @@
 //
 #include "VISU_ActorBase.h"
 #include "VISU_ActorFactory.h"
-#include "VTKViewer_ShrinkFilter.h"
+#include <gui/VTKViewer_ShrinkFilter.h>
 
 #include <vtkObjectFactory.h>
 #include <vtkProperty.h>
@@ -37,7 +37,7 @@
 #include <vtkShrinkPolyData.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <boost/bind.hpp>
 
diff --git a/src/OBJECT/VISU_ActorBase.h b/src/OBJECT/VISU_ActorBase.h
index 7a39f0a5..dba175f1 100644
--- a/src/OBJECT/VISU_ActorBase.h
+++ b/src/OBJECT/VISU_ActorBase.h
@@ -29,7 +29,7 @@
 #define VISU_ACTOR_BASE_H
 
 #include "VISU_OBJECT.h"
-#include "SALOME_Actor.h"
+#include <gui/SALOME_Actor.h>
 #include "VISU_BoostSignals.h"
 #include <boost/bind.hpp>
 
diff --git a/src/OBJECT/VISU_Event.h b/src/OBJECT/VISU_Event.h
index 4b50add9..182b9784 100644
--- a/src/OBJECT/VISU_Event.h
+++ b/src/OBJECT/VISU_Event.h
@@ -28,8 +28,8 @@
 #ifndef VISU_Event_h
 #define VISU_Event_h
 
-#include "SVTK_Event.h"
-#include "SVTK_Selection.h"
+#include <gui/SVTK_Event.h>
+#include <gui/SVTK_Selection.h>
 
 namespace VISU
 {
diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index 1071352a..6d3c502e 100644
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -37,8 +37,8 @@
 #include "VISU_ScalarBarActor.hxx"
 
 #include "VISU_Event.h" 
-#include "SVTK_Actor.h"
-#include "VTKViewer_FramedTextActor.h"
+#include <gui/SVTK_Actor.h>
+#include <gui/VTKViewer_FramedTextActor.h>
 #include <SALOME_ExtractPolyDataGeometry.h>
 
 #include <vtkCamera.h>
@@ -82,7 +82,7 @@
 
 #include <vtkViewport.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx
index 72faaef4..60e558c1 100644
--- a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx
+++ b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx
@@ -30,8 +30,8 @@
 #include "VISU_GaussPointsPL.hxx"
 #include "VISU_OpenGLPointSpriteMapper.hxx"
 
-#include "VTKViewer_Transform.h"
-#include "VTKViewer_TransformFilter.h"
+#include <gui/VTKViewer_Transform.h>
+#include <gui/VTKViewer_TransformFilter.h>
 #include <SALOME_ExtractPolyDataGeometry.h>
 
 #include <vtkObjectFactory.h>
@@ -45,7 +45,7 @@
 
 #include <QFileInfo>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include "VISU_PipeLineUtils.hxx"
 
 #ifdef _DEBUG_
diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.h b/src/OBJECT/VISU_GaussPtsDeviceActor.h
index 6a9b6501..b092d310 100644
--- a/src/OBJECT/VISU_GaussPtsDeviceActor.h
+++ b/src/OBJECT/VISU_GaussPtsDeviceActor.h
@@ -30,7 +30,7 @@
 
 #include "VISU_OBJECT.h"
 #include "VISU_Actor.h"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 
 #include <vtkLODActor.h>
 #include <vtkSmartPointer.h>
diff --git a/src/OBJECT/VISU_GaussPtsSettings.cxx b/src/OBJECT/VISU_GaussPtsSettings.cxx
index bb9dd393..35d3ae69 100644
--- a/src/OBJECT/VISU_GaussPtsSettings.cxx
+++ b/src/OBJECT/VISU_GaussPtsSettings.cxx
@@ -26,11 +26,11 @@
 //  $Header$
 //
 #include "VISU_GaussPtsSettings.h"
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
 #include <vtkObjectFactory.h>
 #include <vtkImageData.h>
diff --git a/src/OBJECT/VISU_GaussPtsSettings.h b/src/OBJECT/VISU_GaussPtsSettings.h
index 627d8980..686a78f1 100644
--- a/src/OBJECT/VISU_GaussPtsSettings.h
+++ b/src/OBJECT/VISU_GaussPtsSettings.h
@@ -33,7 +33,7 @@
 #include <vtkObject.h>
 #include <vtkCommand.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class vtkImageData;
 
diff --git a/src/OBJECT/VISU_MeshAct.cxx b/src/OBJECT/VISU_MeshAct.cxx
index 13e81879..03f32974 100644
--- a/src/OBJECT/VISU_MeshAct.cxx
+++ b/src/OBJECT/VISU_MeshAct.cxx
@@ -27,8 +27,8 @@
 //
 #include "VISU_MeshAct.h"
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
 #include <vtkObjectFactory.h>
 #include <vtkRenderer.h>
diff --git a/src/OBJECT/VISU_MeshAct.h b/src/OBJECT/VISU_MeshAct.h
index 1c041bde..0a044fca 100644
--- a/src/OBJECT/VISU_MeshAct.h
+++ b/src/OBJECT/VISU_MeshAct.h
@@ -30,7 +30,7 @@
 
 #include "VISU_OBJECT.h"
 #include "VISU_DataSetActor.h"
-#include "SVTK_DeviceActor.h"
+#include <gui/SVTK_DeviceActor.h>
 
 
 class VISU_OBJECT_EXPORT VISU_MeshAct : public VISU_DataSetActor 
diff --git a/src/OBJECT/VISU_PickingSettings.cxx b/src/OBJECT/VISU_PickingSettings.cxx
index 9cbdeaed..7690299d 100644
--- a/src/OBJECT/VISU_PickingSettings.cxx
+++ b/src/OBJECT/VISU_PickingSettings.cxx
@@ -26,8 +26,8 @@
 //
 #include "VISU_PickingSettings.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
 #include <vtkObjectFactory.h>
 
diff --git a/src/OBJECT/VISU_PickingSettings.h b/src/OBJECT/VISU_PickingSettings.h
index e5b894d1..b7116a6e 100644
--- a/src/OBJECT/VISU_PickingSettings.h
+++ b/src/OBJECT/VISU_PickingSettings.h
@@ -31,7 +31,7 @@
 #include <vtkObject.h>
 #include <vtkCommand.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 #include "VISU_Actor.h"
 
diff --git a/src/OBJECT/VISU_PointMap3dActor.cxx b/src/OBJECT/VISU_PointMap3dActor.cxx
index d92b698a..c3803c76 100644
--- a/src/OBJECT/VISU_PointMap3dActor.cxx
+++ b/src/OBJECT/VISU_PointMap3dActor.cxx
@@ -30,9 +30,9 @@
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_DeformedGridPL.hxx"
 
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 #include <vtkRenderer.h>
 #include <vtkObjectFactory.h>
 
diff --git a/src/OBJECT/VISU_PointMap3dActor.h b/src/OBJECT/VISU_PointMap3dActor.h
index cf0ab13c..7fb32c20 100644
--- a/src/OBJECT/VISU_PointMap3dActor.h
+++ b/src/OBJECT/VISU_PointMap3dActor.h
@@ -29,7 +29,7 @@
 #define VISU_PointMap3dActor_HeaderFile
 
 #include "VISU_OBJECT.h"
-#include "SALOME_Actor.h"
+#include <gui/SALOME_Actor.h>
 #include "VISU_DataSetActor.h"
 #include "VISU_BoostSignals.h"
 
diff --git a/src/OBJECT/VISU_ScalarMapAct.cxx b/src/OBJECT/VISU_ScalarMapAct.cxx
index 7daf7259..82fb0d9e 100644
--- a/src/OBJECT/VISU_ScalarMapAct.cxx
+++ b/src/OBJECT/VISU_ScalarMapAct.cxx
@@ -36,8 +36,8 @@
 #include "VISU_PipeLineUtils.hxx"
 
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
 #include <SALOME_ExtractGeometry.h>
 #include <SALOME_ExtractPolyDataGeometry.h>
diff --git a/src/OBJECT/VISU_VectorsAct.cxx b/src/OBJECT/VISU_VectorsAct.cxx
index 0742a57a..b978051e 100644
--- a/src/OBJECT/VISU_VectorsAct.cxx
+++ b/src/OBJECT/VISU_VectorsAct.cxx
@@ -26,7 +26,7 @@
 
 #include "VISU_VectorsAct.h"
 #include "VISU_VectorsPL.hxx"
-#include <SVTK_Actor.h>
+#include <gui/SVTK_Actor.h>
  
 // VTK Includes
 #include <vtkObjectFactory.h>
diff --git a/src/PIPELINE/VISUPipeLine.cxx b/src/PIPELINE/VISUPipeLine.cxx
index b789ff69..873dd518 100644
--- a/src/PIPELINE/VISUPipeLine.cxx
+++ b/src/PIPELINE/VISUPipeLine.cxx
@@ -43,7 +43,7 @@
 
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_OpenGLPointSpriteMapper.hxx"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 
 #include "VISU_ElnoDisassembleFilter.hxx"
 #include "VISU_ElnoAssembleFilter.hxx"
@@ -107,7 +107,7 @@ typedef VISU_CutLinesPL TPresent;
 */
 //RKV:End
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 static int isOnlyMesh = false;
 
diff --git a/src/PIPELINE/VISU_CutLinesPL.cxx b/src/PIPELINE/VISU_CutLinesPL.cxx
index 3182a43e..e04456a1 100644
--- a/src/PIPELINE/VISU_CutLinesPL.cxx
+++ b/src/PIPELINE/VISU_CutLinesPL.cxx
@@ -26,7 +26,7 @@
 #include "VISU_CutLinesPL.hxx"
 #include "VISU_FieldTransform.hxx"
 #include "VISU_PipeLineUtils.hxx"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 
 #include <vtkAppendPolyData.h>
 
diff --git a/src/PIPELINE/VISU_CutPlanesPL.cxx b/src/PIPELINE/VISU_CutPlanesPL.cxx
index 247f8943..7bb6ecd8 100644
--- a/src/PIPELINE/VISU_CutPlanesPL.cxx
+++ b/src/PIPELINE/VISU_CutPlanesPL.cxx
@@ -27,7 +27,7 @@
 #include "VISU_CutPlanesPL.hxx"
 #include "VISU_FieldTransform.hxx"
 #include "VISU_PipeLineUtils.hxx"
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 #include "VISU_MapperHolder.hxx"
 #include "VISU_DeformationPL.hxx"
 
diff --git a/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx
index 30b2ce06..0bc5377e 100644
--- a/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx
+++ b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx
@@ -29,8 +29,8 @@
 #include "VISU_Extractor.hxx"
 #include "VISU_LookupTable.hxx"
 #include "VISU_DeformedShapePL.hxx"
-#include "VTKViewer_TransformFilter.h"
-#include "VTKViewer_Transform.h"
+#include <gui/VTKViewer_TransformFilter.h>
+#include <gui/VTKViewer_Transform.h>
 #include "VISU_MergeFilter.hxx"
 #include "VISU_ElnoDisassembleFilter.hxx"
 #include "VISU_PipeLineUtils.hxx"
diff --git a/src/PIPELINE/VISU_DeformedShapePL.cxx b/src/PIPELINE/VISU_DeformedShapePL.cxx
index b3c93c87..3372ba2d 100644
--- a/src/PIPELINE/VISU_DeformedShapePL.cxx
+++ b/src/PIPELINE/VISU_DeformedShapePL.cxx
@@ -26,7 +26,7 @@
 //
 #include "VISU_DeformedShapePL.hxx"
 #include "VISU_PipeLineUtils.hxx"
-#include "VTKViewer_Transform.h"
+#include <gui/VTKViewer_Transform.h>
 
 #include <vtkWarpVector.h>
 
diff --git a/src/PIPELINE/VISU_Extractor.cxx b/src/PIPELINE/VISU_Extractor.cxx
index 52831311..7c86179a 100644
--- a/src/PIPELINE/VISU_Extractor.cxx
+++ b/src/PIPELINE/VISU_Extractor.cxx
@@ -28,8 +28,8 @@
 #include "VISU_ConvertorUtils.hxx"
 #include "VISU_MeshValue.hxx"
 
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <sstream>
 
diff --git a/src/PIPELINE/VISU_FieldTransform.cxx b/src/PIPELINE/VISU_FieldTransform.cxx
index 16a36d01..bde29030 100644
--- a/src/PIPELINE/VISU_FieldTransform.cxx
+++ b/src/PIPELINE/VISU_FieldTransform.cxx
@@ -23,7 +23,7 @@
 //  Module : VISU
 //
 #include "VISU_FieldTransform.hxx"
-#include "VTKViewer_Transform.h"
+#include <gui/VTKViewer_Transform.h>
 #include "VISU_PipeLineUtils.hxx"
 
 #include <vtkObjectFactory.h>
diff --git a/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx b/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
index 7adb1b8c..ce05e255 100644
--- a/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
+++ b/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
@@ -32,7 +32,7 @@
 
 #include "VISUPipeline.hxx"
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class VISU_UnScaledActor: public vtkFollower
 {
diff --git a/src/PIPELINE/VISU_LookupTable.hxx b/src/PIPELINE/VISU_LookupTable.hxx
index 0026a774..af596eca 100644
--- a/src/PIPELINE/VISU_LookupTable.hxx
+++ b/src/PIPELINE/VISU_LookupTable.hxx
@@ -30,7 +30,7 @@
 
 #include <vtkLookupTable.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class VISU_PIPELINE_EXPORT VISU_LookupTable: public vtkLookupTable 
 {
diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
index fbf5a895..c0e290d3 100755
--- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
+++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
@@ -48,7 +48,7 @@
 #include <cmath>
 #include <string>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifndef WNT
 # ifndef GLX_GLXEXT_LEGACY
diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
index 94fa3b23..ebb657e0 100755
--- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
+++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
@@ -40,7 +40,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkConfigure.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class vtkCellArray;
 class vtkPoints;
diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.hxx b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
index a8f7bf3d..06e497b7 100644
--- a/src/PIPELINE/VISU_ScalarBarCtrl.hxx
+++ b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
@@ -31,7 +31,7 @@
 
 #include <vtkObject.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class vtkRenderer;
 class VISU_LookupTable;
diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx
index 1a832266..214cc1d4 100644
--- a/src/PIPELINE/VISU_StreamLinesPL.cxx
+++ b/src/PIPELINE/VISU_StreamLinesPL.cxx
@@ -32,7 +32,7 @@
 #include "VISU_MaskPointsFilter.hxx"
 #include "VISU_PipeLineUtils.hxx"
 
-#include "VTKViewer_GeometryFilter.h"
+#include <gui/VTKViewer_GeometryFilter.h>
 
 #include <algorithm>
 
diff --git a/src/PIPELINE/VISU_VectorsPL.cxx b/src/PIPELINE/VISU_VectorsPL.cxx
index 4c0f2ebd..42b58ddb 100644
--- a/src/PIPELINE/VISU_VectorsPL.cxx
+++ b/src/PIPELINE/VISU_VectorsPL.cxx
@@ -28,8 +28,8 @@
 #include "VISU_FieldTransform.hxx"
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_UsedPointsFilter.hxx"
-#include "VTKViewer_TransformFilter.h"
-#include "VTKViewer_Transform.h"
+#include <gui/VTKViewer_TransformFilter.h>
+#include <gui/VTKViewer_Transform.h>
 
 #include <vtkGlyph3D.h>
 #include <vtkConeSource.h>
diff --git a/src/PIPELINE/VISU_WidgetCtrl.hxx b/src/PIPELINE/VISU_WidgetCtrl.hxx
index 7faa4c1f..a6aa28c5 100644
--- a/src/PIPELINE/VISU_WidgetCtrl.hxx
+++ b/src/PIPELINE/VISU_WidgetCtrl.hxx
@@ -31,7 +31,7 @@
 #include "VISUPipeline.hxx"
 #include <vtkImplicitFunction.h>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 class vtkImplicitFunction;
 class vtkObject;
diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 792634a7..e902b767 100644
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -45,48 +45,48 @@
 #include <vtkTimerLog.h>
 
 // SALOME Includes
-#include "SALOME_LifeCycleCORBA.hxx"
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_MessageBox.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_DataBrowser.h"
-#include "SUIT_OverrideCursor.h"
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_DataBrowser.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_ViewModel.h"
-#include "SVTK_Functor.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_Functor.h>
 //#include "SVTK_MainWindow.h"
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SPlot2d_ViewModel.h"
+#include <gui/SPlot2d_ViewModel.h>
 #include "VisuGUI_SetupPlot2dDlg.h"
-#include "Plot2d_SetupCurveDlg.h"
-#include "Plot2d_ViewManager.h"
+#include <gui/Plot2d_SetupCurveDlg.h>
+#include <gui/Plot2d_ViewManager.h>
 
-#include "QtxPagePrefMgr.h"
-#include "OB_Browser.h"
+#include <gui/QtxPagePrefMgr.h>
+#include <gui/OB_Browser.h>
 
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include "SalomeApp_Application.h"
-#include "SalomeApp_DataModel.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_CheckFileDlg.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_DataModel.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_CheckFileDlg.h>
 
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_Selection.h"
-#include "LightApp_Preferences.h"
-#include "LightApp_DataOwner.h"
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Selection.h>
+#include <gui/LightApp_Preferences.h>
+#include <gui/LightApp_DataOwner.h>
 
-#include "QtxAction.h"
-#include "QtxFontEdit.h"
+#include <gui/QtxAction.h>
+#include <gui/QtxFontEdit.h>
 
 #include "VISUConfig.hh"
 #include "VISU_Gen_i.hh"
@@ -156,7 +156,7 @@
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(MED_Gen)
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "VisuGUI_ActionsDef.h"
 
diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h
index 90205718..ccfce01d 100644
--- a/src/VISUGUI/VisuGUI.h
+++ b/src/VISUGUI/VisuGUI.h
@@ -27,10 +27,10 @@
 #ifndef VisuGUI_HeaderFile
 #define VisuGUI_HeaderFile
 
-#include <SalomeApp_Module.h>
+#include <gui/SalomeApp_Module.h>
 
-#include <SVTK_ViewWindow.h>
-#include <VISU_Prs3d_i.hh>
+#include <gui/SVTK_ViewWindow.h>
+#include "VISU_Prs3d_i.hh"
 
 #include "VisuGUI_Panel.h"
 
diff --git a/src/VISUGUI/VisuGUI_BasePanel.cxx b/src/VISUGUI/VisuGUI_BasePanel.cxx
index 2db8ded0..3d1d4c36 100755
--- a/src/VISUGUI/VisuGUI_BasePanel.cxx
+++ b/src/VISUGUI/VisuGUI_BasePanel.cxx
@@ -27,7 +27,7 @@
 #include "VisuGUI_BasePanel.h"
 #include "VisuGUI_Tools.h"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QScrollArea>
 #include <QHBoxLayout>
diff --git a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
index 1ac19ffd..3db9cd76 100644
--- a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
+++ b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
@@ -29,12 +29,12 @@
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 
-#include "SUIT_FileDlg.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
 #include <vtkTimerLog.h>
 
diff --git a/src/VISUGUI/VisuGUI_CacheDlg.cxx b/src/VISUGUI/VisuGUI_CacheDlg.cxx
index e4b5748f..6a015de1 100644
--- a/src/VISUGUI/VisuGUI_CacheDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CacheDlg.cxx
@@ -30,16 +30,16 @@
 
 #include "VISU_PipeLine.hxx"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SalomeApp_Module.h"
+#include <gui/SalomeApp_Module.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QButtonGroup>
 #include <QGroupBox>
diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
index 31bf08c8..6c6af88e 100644
--- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
@@ -32,19 +32,19 @@
 #include "VISU_PipeLine.hxx"
 #include "VISU_DataSetActor.h"
 
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_Application.h"
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
 
-#include "SVTK_ViewWindow.h"
-#include <VTKViewer_Utilities.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_Utilities.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_OverrideCursor.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_OverrideCursor.h>
 
-#include "SALOME_Actor.h"
+#include <gui/SALOME_Actor.h>
 #include "VISU_ViewManager_i.hh"
 
 // QT Includes
diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.h b/src/VISUGUI/VisuGUI_ClippingDlg.h
index aabea300..23349838 100644
--- a/src/VISUGUI/VisuGUI_ClippingDlg.h
+++ b/src/VISUGUI/VisuGUI_ClippingDlg.h
@@ -22,9 +22,9 @@
 #ifndef DIALOGBOX_CLIPPING_H
 #define DIALOGBOX_CLIPPING_H
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 // QT Includes
 #include <QDialog>
diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.cxx b/src/VISUGUI/VisuGUI_ClippingPanel.cxx
index 2aa3ed50..7b5a22d0 100644
--- a/src/VISUGUI/VisuGUI_ClippingPanel.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingPanel.cxx
@@ -30,15 +30,15 @@
 #include <VISU_Gen_i.hh>
 #include <VISU_ColoredPrs3dHolder_i.hh>
 
-#include <LightApp_Application.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_ViewWindow.h>
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_Utilities.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_Utilities.h>
 
 
 
@@ -57,8 +57,8 @@
 #include <vtkCutter.h>
 #include <vtkPolyDataMapper.h>
 
-#include <SALOMEDSClient_AttributeSequenceOfReal.hxx>
-#include <SALOMEDSClient_AttributeInteger.hxx>
+#include <kernel/SALOMEDSClient_AttributeSequenceOfReal.hxx>
+#include <kernel/SALOMEDSClient_AttributeInteger.hxx>
 
 
 
diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.h b/src/VISUGUI/VisuGUI_ClippingPanel.h
index a3d6f004..b3a814d3 100644
--- a/src/VISUGUI/VisuGUI_ClippingPanel.h
+++ b/src/VISUGUI/VisuGUI_ClippingPanel.h
@@ -37,13 +37,13 @@ class vtkCutter;
 #include "VISU_Prs3d_i.hh"
 #include "VisuGUI_Panel.h"
 //#include <VisuGUI_SegmentationMgr.h>
-#include <VISU_ClippingPlaneMgr.hxx>
+#include "VISU_ClippingPlaneMgr.hxx"
 
 #include <QList>
 #include <vtkActor.h>
 #include <vtkPlane.h>
 
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 
 /*class CutPlaneFunction: public vtkPlane
diff --git a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx
index b3a4f662..de9d1737 100644
--- a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx
@@ -26,15 +26,15 @@
 
 #include <VISU_Gen_i.hh>
 
-#include <LightApp_Application.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_ViewManager.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <QtxDoubleSpinBox.h>
-#include <SVTK_ViewWindow.h>
-#include <VTKViewer_Utilities.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/VTKViewer_Utilities.h>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h
index 91aa434c..349c2c12 100644
--- a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h
+++ b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h
@@ -35,7 +35,7 @@ class SVTK_ViewWindow;
 #include <QDialog>
 #include <vtkSmartPointer.h>
 #include "VisuGUI_ClippingPanel.h"
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 
 class VisuGUI_ClippingPlaneDlg: public QDialog
diff --git a/src/VISUGUI/VisuGUI_CursorDlg.cxx b/src/VISUGUI/VisuGUI_CursorDlg.cxx
index a3d1b0d6..6a7776dd 100644
--- a/src/VISUGUI/VisuGUI_CursorDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CursorDlg.cxx
@@ -31,11 +31,11 @@ using namespace std;
 #include "VisuGUI.h"
 #include "VisuGUI_CursorDlg.h"
 
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
index 365f4e0b..08f4c83e 100644
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
@@ -40,18 +40,18 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_CutLinesPL.hxx"
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "LightApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 //TO DO
-//#include "OB_Browser.h"
+//#include <gui/OB_Browser.h>
 
 #include "VisuGUI_TableDlg.h"
 
diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index 5b48ab40..463ade9c 100644
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -39,21 +39,21 @@
 #include "VISU_Result_i.hh"
 #include "VISU_CutPlanesPL.hxx"
 
-//#include "OB_Browser.h"
+//#include <gui/OB_Browser.h>
 
 #include "VisuGUI_TableDlg.h"
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "SUIT_Application.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.h b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
index dd668ec8..686e166f 100644
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.h
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
@@ -30,9 +30,9 @@
 
 #include "VisuGUI_Prs3dDlg.h"
 
-#include <SALOME_Actor.h>
+#include <gui/SALOME_Actor.h>
 
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QFrame>
 
diff --git a/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx b/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx
index 56ba80ce..b5a724a0 100644
--- a/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx
@@ -37,12 +37,12 @@
 #include "VISU_PipeLine.hxx"
 #include "VISU_CutSegmentPL.hxx"
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "LightApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QLayout>
 #include <QTabWidget>
diff --git a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
index 9f778170..22124e0e 100644
--- a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
@@ -38,19 +38,19 @@
 
 #include "VISU_Convertor.hxx"
 
-#include <QtxDoubleSpinBox.h>
-#include <SalomeApp_Module.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 <SALOME_ListIO.hxx>
-
-#include <SALOMEDSClient_AttributeString.hxx>
-#include <SALOMEDSClient_AttributeName.hxx>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/SalomeApp_Module.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 <gui/SALOME_ListIO.hxx>
+
+#include <kernel/SALOMEDSClient_AttributeString.hxx>
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
 
 #include <QVBoxLayout>
 #include <QHBoxLayout>
diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
index 03f87a4c..d792f2fd 100644
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
@@ -36,13 +36,13 @@
 #include "VISU_Gen_i.hh"
 #include "VISU_Result_i.hh"
 #include "VisuGUI_Prs3dTools.h"
-#include "SVTK_ViewWindow.h"
-#include "SalomeApp_Module.h"
-#include "LightApp_Application.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SalomeApp_Module.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QLayout>
 #include <QDialog>
diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
index 5589baf4..f44ce7d2 100644
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
@@ -30,7 +30,7 @@
 
 #include "VisuGUI_Prs3dDlg.h"
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QCheckBox>
 
diff --git a/src/VISUGUI/VisuGUI_Displayer.cxx b/src/VISUGUI/VisuGUI_Displayer.cxx
index 49fa883c..1d55c3b7 100644
--- a/src/VISUGUI/VisuGUI_Displayer.cxx
+++ b/src/VISUGUI/VisuGUI_Displayer.cxx
@@ -35,19 +35,19 @@
 
 //#include "VVTK_ViewModel.h"
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <SPlot2d_ViewModel.h>
-#include <SPlot2d_Prs.h>
-#include <Plot2d_ViewWindow.h>
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/SPlot2d_Prs.h>
+#include <gui/Plot2d_ViewWindow.h>
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <SUIT_ViewManager.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Desktop.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
 
 VisuGUI_Displayer::VisuGUI_Displayer( SalomeApp_Application* app )
 : LightApp_Displayer(),
diff --git a/src/VISUGUI/VisuGUI_Displayer.h b/src/VISUGUI/VisuGUI_Displayer.h
index 8a625784..67b6bb27 100644
--- a/src/VISUGUI/VisuGUI_Displayer.h
+++ b/src/VISUGUI/VisuGUI_Displayer.h
@@ -28,10 +28,10 @@
 #ifndef VISUGUI_DISPLAYER_HEADER
 #define VISUGUI_DISPLAYER_HEADER
 
-#include <LightApp_Displayer.h>
-#include <VISU_Prs3d_i.hh>
-#include <VISU_Table_i.hh>
-#include <VISU_PointMap3d_i.hh>
+#include <gui/LightApp_Displayer.h>
+#include "VISU_Prs3d_i.hh"
+#include "VISU_Table_i.hh"
+#include "VISU_PointMap3d_i.hh"
 
 class SalomeApp_Application;
 class SVTK_ViewWindow;
diff --git a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx
index d5dd350a..76e48056 100644
--- a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx
+++ b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx
@@ -30,11 +30,11 @@
 
 #include "VISU_Table_i.hh"
 
-#include "SalomeApp_Application.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QLayout>
 #include <QCheckBox>
diff --git a/src/VISUGUI/VisuGUI_EditContainerDlg.h b/src/VISUGUI/VisuGUI_EditContainerDlg.h
index 2c9cbd67..da57aea0 100644
--- a/src/VISUGUI/VisuGUI_EditContainerDlg.h
+++ b/src/VISUGUI/VisuGUI_EditContainerDlg.h
@@ -33,7 +33,7 @@ class QTreeWidget;
 class QToolButton;
 
 
-#include "SALOMEDSClient_SObject.hxx"
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 class VisuGUI;
 
diff --git a/src/VISUGUI/VisuGUI_EvolutionDlg.cxx b/src/VISUGUI/VisuGUI_EvolutionDlg.cxx
index b5298f14..ae00d367 100644
--- a/src/VISUGUI/VisuGUI_EvolutionDlg.cxx
+++ b/src/VISUGUI/VisuGUI_EvolutionDlg.cxx
@@ -36,16 +36,16 @@
 
 #include <VISU_Convertor.hxx>
 
-#include <SALOME_InteractiveObject.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-#include <SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
 
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SPlot2d_ViewModel.h>
-#include <Plot2d_ViewFrame.h>
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/Plot2d_ViewFrame.h>
 
 #include <QComboBox>
 #include <QGroupBox>
diff --git a/src/VISUGUI/VisuGUI_EvolutionDlg.h b/src/VISUGUI/VisuGUI_EvolutionDlg.h
index bf86a0bb..4ab8457b 100644
--- a/src/VISUGUI/VisuGUI_EvolutionDlg.h
+++ b/src/VISUGUI/VisuGUI_EvolutionDlg.h
@@ -26,11 +26,11 @@
 #ifndef VISUGUI_EVOLUTIONDLG_H
 #define VISUGUI_EVOLUTIONDLG_H
 
-#include <QtxDialog.h>
+#include <gui/QtxDialog.h>
 
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
-#include <SVTK_Selection.h>
+#include <gui/SVTK_Selection.h>
 
 class QComboBox;
 class QIntValidator;
diff --git a/src/VISUGUI/VisuGUI_Factory.cxx b/src/VISUGUI/VisuGUI_Factory.cxx
index a09a628e..7ef9a30f 100644
--- a/src/VISUGUI/VisuGUI_Factory.cxx
+++ b/src/VISUGUI/VisuGUI_Factory.cxx
@@ -27,7 +27,7 @@
 //
 #include "VisuGUI_Module.h"
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
 #ifdef WNT
 #if defined VISU_VISUGUI_EXPORTS || defined VISU_EXPORTS
diff --git a/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx b/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx
index 9e0c33c8..54475078 100644
--- a/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx
+++ b/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx
@@ -37,15 +37,15 @@
 #include <QLayout>
 #include <QPushButton>
 
-#include <QtxDoubleSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SalomeApp_Application.h>
+#include <gui/SalomeApp_Application.h>
 
-#include <LightApp_SelectionMgr.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 VisuGUI_FeatureEdgesPanel::VisuGUI_FeatureEdgesPanel( VisuGUI* theModule, QWidget* theParent ) :
   VisuGUI_Panel( tr( "WINDOW_TITLE" ), theModule, theParent, ApplyBtn | CloseBtn | HelpBtn ),
diff --git a/src/VISUGUI/VisuGUI_FieldFilter.cxx b/src/VISUGUI/VisuGUI_FieldFilter.cxx
index 526eabed..93c7c30f 100644
--- a/src/VISUGUI/VisuGUI_FieldFilter.cxx
+++ b/src/VISUGUI/VisuGUI_FieldFilter.cxx
@@ -31,10 +31,10 @@
 #include "VISUConfig.hh"
 #include "VISU_ColoredPrs3dFactory.hh"
 
-#include <SUIT_Session.h>
+#include <gui/SUIT_Session.h>
 
-#include <SalomeApp_Study.h>
-#include <LightApp_DataOwner.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_DataOwner.h>
 
 using namespace VISU;
 
diff --git a/src/VISUGUI/VisuGUI_FieldFilter.h b/src/VISUGUI/VisuGUI_FieldFilter.h
index d9215fc0..ca2c439b 100644
--- a/src/VISUGUI/VisuGUI_FieldFilter.h
+++ b/src/VISUGUI/VisuGUI_FieldFilter.h
@@ -28,7 +28,7 @@
 
 #include "VISUConfig.hh"
 
-#include "SUIT_SelectionFilter.h"
+#include <gui/SUIT_SelectionFilter.h>
 
 class SUIT_DataOwner;
 
diff --git a/src/VISUGUI/VisuGUI_FileDlg.cxx b/src/VISUGUI/VisuGUI_FileDlg.cxx
index d37e8e06..604923dc 100644
--- a/src/VISUGUI/VisuGUI_FileDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FileDlg.cxx
@@ -32,7 +32,7 @@
 
 #include "VISUConfig.hh"
 #include "VisuGUI_FileDlg.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 using namespace std;
 
diff --git a/src/VISUGUI/VisuGUI_FileDlg.h b/src/VISUGUI/VisuGUI_FileDlg.h
index 3c236a6b..41600466 100644
--- a/src/VISUGUI/VisuGUI_FileDlg.h
+++ b/src/VISUGUI/VisuGUI_FileDlg.h
@@ -27,7 +27,7 @@
 #ifndef VISU_FILEDIALOG_H
 #define VISU_FILEDIALOG_H
 
-#include "SUIT_FileDlg.h"
+#include <gui/SUIT_FileDlg.h>
 
 class QCheckBox;
 
diff --git a/src/VISUGUI/VisuGUI_FileInfoDlg.cxx b/src/VISUGUI/VisuGUI_FileInfoDlg.cxx
index 5a7ffb40..cf920c5a 100644
--- a/src/VISUGUI/VisuGUI_FileInfoDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FileInfoDlg.cxx
@@ -26,7 +26,7 @@
 //
 #include "VisuGUI_FileInfoDlg.h"
 
-#include <MED_Common.hxx>
+#include <med/MED_Common.hxx>
 
 #include <QGridLayout>
 #include <QLabel>
diff --git a/src/VISUGUI/VisuGUI_FileInfoDlg.h b/src/VISUGUI/VisuGUI_FileInfoDlg.h
index 09899737..b814c699 100644
--- a/src/VISUGUI/VisuGUI_FileInfoDlg.h
+++ b/src/VISUGUI/VisuGUI_FileInfoDlg.h
@@ -27,7 +27,7 @@
 #define VISUGUI_FILEINFODLG_H
 
 #include <MED.hh>
-#include <QtxDialog.h>
+#include <gui/QtxDialog.h>
 
 class VisuGUI_FileInfoDlg : public QtxDialog
 {
diff --git a/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx b/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
index f94d05ab..996c3502 100644
--- a/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
@@ -27,13 +27,13 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
 
-#include <SalomeApp_Application.h>
-#include <LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include <SUIT_Desktop.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QPushButton>
 #include <QVBoxLayout>
diff --git a/src/VISUGUI/VisuGUI_FindPane.cxx b/src/VISUGUI/VisuGUI_FindPane.cxx
index 07b2cdc8..41e2c6be 100644
--- a/src/VISUGUI/VisuGUI_FindPane.cxx
+++ b/src/VISUGUI/VisuGUI_FindPane.cxx
@@ -35,8 +35,8 @@
 #include "VISU_GaussPointsPL.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QComboBox>
 #include <QLabel>
diff --git a/src/VISUGUI/VisuGUI_FindPane.h b/src/VISUGUI/VisuGUI_FindPane.h
index 40d374ae..023ea71a 100644
--- a/src/VISUGUI/VisuGUI_FindPane.h
+++ b/src/VISUGUI/VisuGUI_FindPane.h
@@ -27,7 +27,7 @@
 #ifndef VISUGUI_FINDPANE_H
 #define VISUGUI_FINDPANE_H
 
-#include <SVTK_Selection.h>
+#include <gui/SVTK_Selection.h>
 
 #include <QGroupBox>
 
diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
index 89ddfa56..43b56194 100644
--- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
@@ -41,16 +41,16 @@
 #include "VVTK_PrimitiveBox.h"
 #include "VVTK_SizeBox.h"
 
-#include "LightApp_Application.h"
-#include "SalomeApp_Module.h"
-#include "LightApp_SelectionMgr.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SVTK_FontWidget.h"
-
-#include "QtxDoubleSpinBox.h"
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_Module.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 <gui/SVTK_FontWidget.h>
+
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QLayout>
 #include <QTabWidget>
diff --git a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
index 7ae3c886..2615bf60 100644
--- a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
@@ -32,19 +32,19 @@
 #include "VISU_GaussPointsPL.hxx"
 #include "VISU_PickingSettings.h"
 
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SVTK_Selector.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_ViewWindow.h>
 //#include "SVTK_MainWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_RenderWindowInteractor.h>
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 
 #include <vtkActorCollection.h>
 #include <vtkCallbackCommand.h>
@@ -53,7 +53,7 @@
 #include <vtkGenericRenderWindowInteractor.h>
 #include <vtkSmartPointer.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <QCheckBox>
 #include <QComboBox>
@@ -66,7 +66,7 @@
 #include <QIntValidator>
 #include <QToolButton>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
 namespace
 {
diff --git a/src/VISUGUI/VisuGUI_InputPane.cxx b/src/VISUGUI/VisuGUI_InputPane.cxx
index cf6197ef..ba44b86e 100644
--- a/src/VISUGUI/VisuGUI_InputPane.cxx
+++ b/src/VISUGUI/VisuGUI_InputPane.cxx
@@ -35,17 +35,17 @@
 #include "VISU_Result_i.hh"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SalomeApp_Module.h"
+#include <gui/SalomeApp_Module.h>
 
-#include "LightApp_Application.h"
-#include "LightApp_SelectionMgr.h"
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
 
-#include "SALOME_ListIO.hxx"
+#include <gui/SALOME_ListIO.hxx>
 
-#include "SALOMEDSClient_AttributeString.hxx"
-#include "SALOMEDSClient_AttributeName.hxx"
+#include <kernel/SALOMEDSClient_AttributeString.hxx>
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
 
 //#include "QtxListBox.h"
 
diff --git a/src/VISUGUI/VisuGUI_InputPane.h b/src/VISUGUI/VisuGUI_InputPane.h
index ae807c85..9c38584b 100644
--- a/src/VISUGUI/VisuGUI_InputPane.h
+++ b/src/VISUGUI/VisuGUI_InputPane.h
@@ -29,7 +29,7 @@
 
 #include "VISUConfig.hh"
 
-#include "SALOME_ListIO.hxx"
+#include <gui/SALOME_ListIO.hxx>
 
 #include <QGroupBox>
 
diff --git a/src/VISUGUI/VisuGUI_InputPanel.h b/src/VISUGUI/VisuGUI_InputPanel.h
index c40029c7..e5d48f3a 100755
--- a/src/VISUGUI/VisuGUI_InputPanel.h
+++ b/src/VISUGUI/VisuGUI_InputPanel.h
@@ -27,7 +27,7 @@
 #ifndef VISUGUI_INPUTPANEL_H
 #define VISUGUI_INPUTPANEL_H
 
-#include <QtxDockWidget.h>
+#include <gui/QtxDockWidget.h>
 
 #include <QMap>
 
diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
index 7ab8e93a..a1266191 100644
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
@@ -33,13 +33,13 @@
 
 #include <VISU_ColoredPrs3dFactory.hh>
 
-#include <LightApp_Application.h>
+#include <gui/LightApp_Application.h>
 
-#include <QtxColorButton.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/QtxColorButton.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <limits.h>
 
diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx
index 5beb580f..699f7a0d 100644
--- a/src/VISUGUI/VisuGUI_Module.cxx
+++ b/src/VISUGUI/VisuGUI_Module.cxx
@@ -27,37 +27,37 @@
 //
 #include "VisuGUI_Module.h"
 
-#include "QtxPopupMgr.h"
+#include <gui/QtxPopupMgr.h>
 
-#include "SUIT_Study.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Accel.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Study.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Accel.h>
+#include <gui/SUIT_Session.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SALOME_Event.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_VTKSelector.h"
-#include "LightApp_Preferences.h"
-#include "LightApp_Displayer.h"
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_VTKSelector.h>
+#include <gui/LightApp_Preferences.h>
+#include <gui/LightApp_Displayer.h>
 
-#include "SALOMEDSClient_ClientFactory.hxx"
-#include "SALOMEDSClient_IParameters.hxx"
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/SALOMEDSClient_IParameters.hxx>
 
 //#include "VVTK_ViewManager.h"
 //#include "VVTK_ViewWindow.h"
 //#include "VVTK_ViewModel.h"
 
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewManager.h"
-#include "SVTK_ViewWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewManager.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
 #include "VISU_Event.h"
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
 #include "VisuGUI_Prs3dTools.h"
 #include "VisuGUI_ClippingDlg.h"
@@ -79,39 +79,39 @@
 #include "VISU_PlanesWidget.hxx"
 #include "VISU_SphereWidget.hxx"
 
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Study.h>
 //#include "VVTK_MainWindow.h"
 #include "VISU_View_i.hh"
 
 #ifndef DISABLE_VTKVIEWER
 #ifndef DISABLE_SALOMEOBJECT
-  #include <SVTK_ViewWindow.h>
-  #include <SVTK_ViewModel.h>
+  #include <gui/SVTK_ViewWindow.h>
+  #include <gui/SVTK_ViewModel.h>
 #else
-  #include <VTKViewer_ViewWindow.h>
+  #include <gui/VTKViewer_ViewWindow.h>
 #endif
-  #include <VTKViewer_ViewModel.h>
+  #include <gui/VTKViewer_ViewModel.h>
 #endif
 #ifndef DISABLE_OCCVIEWER
-  #include <OCCViewer_ViewWindow.h>
-  #include <OCCViewer_ViewPort3d.h>
+  #include <gui/OCCViewer_ViewWindow.h>
+  #include <gui/OCCViewer_ViewPort3d.h>
 #ifndef DISABLE_SALOMEOBJECT
-  #include <SOCC_ViewModel.h>
+  #include <gui/SOCC_ViewModel.h>
 #else
-  #include <OCCViewer_ViewModel.h>
+  #include <gui/OCCViewer_ViewModel.h>
 #endif
 #endif
 #ifndef DISABLE_GLVIEWER
-  #include <GLViewer_ViewFrame.h>
-  #include <GLViewer_ViewPort.h>
+  #include <gui/GLViewer_ViewFrame.h>
+  #include <gui/GLViewer_ViewPort.h>
 #endif
 #ifndef DISABLE_PLOT2DVIEWER
-  #include <Plot2d_ViewWindow.h>
-  #include <Plot2d_ViewFrame.h>
+  #include <gui/Plot2d_ViewWindow.h>
+  #include <gui/Plot2d_ViewFrame.h>
 #ifndef DISABLE_SALOMEOBJECT
-  #include <SPlot2d_ViewModel.h>
+  #include <gui/SPlot2d_ViewModel.h>
 #else
-  #include <Plot2d_ViewModel.h>
+  #include <gui/Plot2d_ViewModel.h>
 #endif
 #endif
 
diff --git a/src/VISUGUI/VisuGUI_Module.h b/src/VISUGUI/VisuGUI_Module.h
index 52ccb936..b78bb180 100644
--- a/src/VISUGUI/VisuGUI_Module.h
+++ b/src/VISUGUI/VisuGUI_Module.h
@@ -28,14 +28,14 @@
 #define VisuGUI_Module_HeaderFile
 
 #include "VisuGUI.h"
-#include "STD_Application.h"
-#include "SALOMEDSClient_SObject.hxx"
+#include <gui/STD_Application.h>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 class SUIT_ViewManager;
 class SVTK_ViewManager;
 class SVTK_ViewWindow;
 
-#include "MED_SharedPtr.hxx"
+#include <med/MED_SharedPtr.hxx>
 
 //! This class inherits base VisuGUI.
 /*! Used to display, erase end edit presentations in the VVTK viewer. */
diff --git a/src/VISUGUI/VisuGUI_NameDlg.cxx b/src/VISUGUI/VisuGUI_NameDlg.cxx
index 8c6300f8..45a9a17b 100644
--- a/src/VISUGUI/VisuGUI_NameDlg.cxx
+++ b/src/VISUGUI/VisuGUI_NameDlg.cxx
@@ -27,14 +27,14 @@
 #include "VisuGUI_NameDlg.h"
 #include "VisuGUI.h"
 
-#include <SUIT_Session.h>
-#include <SUIT_Application.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Tools.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-
-#include <LightApp_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+
+#include <gui/LightApp_Application.h>
 
 #include <QGroupBox>
 #include <QLabel>
diff --git a/src/VISUGUI/VisuGUI_OffsetDlg.cxx b/src/VISUGUI/VisuGUI_OffsetDlg.cxx
index 1049e4c5..7189a86a 100644
--- a/src/VISUGUI/VisuGUI_OffsetDlg.cxx
+++ b/src/VISUGUI/VisuGUI_OffsetDlg.cxx
@@ -27,19 +27,19 @@
 #include "VISU_ViewManager_i.hh"
 #include "VISU_Actor.h"
 
-#include "LightApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SalomeApp_Application.h"
-#include "SVTK_ViewWindow.h"
-#include "SVTK_ViewModel.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-
-#include "QtxDoubleSpinBox.h"
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+
+#include <gui/QtxDoubleSpinBox.h>
 
 // VTK Includes
 #include "vtkRenderer.h"
diff --git a/src/VISUGUI/VisuGUI_OffsetDlg.h b/src/VISUGUI/VisuGUI_OffsetDlg.h
index 71e034d0..a7a9e32f 100644
--- a/src/VISUGUI/VisuGUI_OffsetDlg.h
+++ b/src/VISUGUI/VisuGUI_OffsetDlg.h
@@ -22,7 +22,7 @@
 #ifndef DIALOGBOX_OFFSET_H
 #define DIALOGBOX_OFFSET_H
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 #include "VISU_Prs3d_i.hh"
 #include "VISU_PointMap3d_i.hh"
 
diff --git a/src/VISUGUI/VisuGUI_Panel.cxx b/src/VISUGUI/VisuGUI_Panel.cxx
index 85d15da6..cc405c91 100755
--- a/src/VISUGUI/VisuGUI_Panel.cxx
+++ b/src/VISUGUI/VisuGUI_Panel.cxx
@@ -29,7 +29,7 @@
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <QScrollArea>
 #include <QHBoxLayout>
diff --git a/src/VISUGUI/VisuGUI_Panel.h b/src/VISUGUI/VisuGUI_Panel.h
index e7eedb4b..6753775a 100755
--- a/src/VISUGUI/VisuGUI_Panel.h
+++ b/src/VISUGUI/VisuGUI_Panel.h
@@ -27,7 +27,7 @@
 #ifndef VISUGUI_PANEL_H
 #define VISUGUI_PANEL_H
 
-#include <QtxDockWidget.h>
+#include <gui/QtxDockWidget.h>
 
 class QScrollArea;
 class QPushButton;
diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
index 98954c00..3e3b0d4b 100644
--- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
@@ -36,16 +36,16 @@
 #include "VISU_ViewManager_i.hh"
 #include "VISU_Plot3DPL.hxx"
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SALOME_Actor.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "LightApp_Application.h"
+#include <gui/SALOME_Actor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/LightApp_Application.h>
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QLayout>
 #include <QValidator>
diff --git a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
index d0cb296d..c3f7affe 100644
--- a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
@@ -31,8 +31,8 @@
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_FontWidget.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_FontWidget.h>
 
 #include "VISUConfig.hh"
 #include "VISU_Convertor.hxx"
@@ -45,12 +45,12 @@
 #include "VISU_Result_i.hh"
 #include "VISU_Prs3dUtils.hh"
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Desktop.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
 
 #include <QCheckBox>
 #include <QLineEdit>
@@ -68,7 +68,7 @@
 #include <QKeyEvent>
 #include <QGridLayout>
 
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <vtkTextProperty.h>
 
diff --git a/src/VISUGUI/VisuGUI_Prs3dTools.h b/src/VISUGUI/VisuGUI_Prs3dTools.h
index 7fa0e657..a43e08d0 100644
--- a/src/VISUGUI/VisuGUI_Prs3dTools.h
+++ b/src/VISUGUI/VisuGUI_Prs3dTools.h
@@ -34,10 +34,10 @@
 #include "VISU_PipeLine.hxx"
 #include "VisuGUI_DialogRunner.h"
 
-#include <SUIT_Desktop.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include <SPlot2d_ViewWindow.h>
+#include <gui/SPlot2d_ViewWindow.h>
 
 #include <vtkRenderer.h>
 
diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
index 5bf97d0a..b1a557ca 100644
--- a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
@@ -32,8 +32,8 @@
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_FontWidget.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_FontWidget.h>
 
 #include "VISUConfig.hh"
 #include "VISU_Convertor.hxx"
@@ -45,11 +45,11 @@
 #include "VISU_Result_i.hh"
 #include "VISU_ColoredPrs3dFactory.hh"
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <limits.h>
 
diff --git a/src/VISUGUI/VisuGUI_Selection.cxx b/src/VISUGUI/VisuGUI_Selection.cxx
index 1610288d..d618f50a 100644
--- a/src/VISUGUI/VisuGUI_Selection.cxx
+++ b/src/VISUGUI/VisuGUI_Selection.cxx
@@ -36,9 +36,9 @@
 #include "VISU_ScalarMapAct.h"
 #include "VISU_GaussPtsAct.h"
 
-#include "SalomeApp_Study.h"
-#include "LightApp_Study.h"
-#include "LightApp_Displayer.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_Study.h>
+#include <gui/LightApp_Displayer.h>
 
 using namespace VISU;
 
diff --git a/src/VISUGUI/VisuGUI_Selection.h b/src/VISUGUI/VisuGUI_Selection.h
index 07fd8024..445c3ed2 100644
--- a/src/VISUGUI/VisuGUI_Selection.h
+++ b/src/VISUGUI/VisuGUI_Selection.h
@@ -27,7 +27,7 @@
 #ifndef VisuGUI_Selection_HeaderFile
 #define VisuGUI_Selection_HeaderFile
 
-#include <LightApp_Selection.h>
+#include <gui/LightApp_Selection.h>
 
 //////////////////////////////////////////////////
 // Class: VisuGUI_Selection
diff --git a/src/VISUGUI/VisuGUI_SelectionPanel.cxx b/src/VISUGUI/VisuGUI_SelectionPanel.cxx
index 943acf03..77dcdfcc 100644
--- a/src/VISUGUI/VisuGUI_SelectionPanel.cxx
+++ b/src/VISUGUI/VisuGUI_SelectionPanel.cxx
@@ -45,28 +45,28 @@
 #include "VISU_GaussPtsSettings.h"
 #include "VISU_PickingSettings.h"
 
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_VTKSelector.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_VTKSelector.h>
 
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_Selector.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 // OCCT Includes
 #include <TColStd_IndexedMapOfInteger.hxx>
diff --git a/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx b/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx
index 9615a047..5bdc854a 100644
--- a/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx
+++ b/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx
@@ -28,18 +28,18 @@
 
 #include "VISU_PickingSettings.h"
 
-#include <SUIT_Session.h>
-#include <SUIT_Application.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Tools.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-
-#include <LightApp_Application.h>
-
-#include <QtxColorButton.h>
-#include <QtxDoubleSpinBox.h>
-#include <QtxIntSpinBox.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+
+#include <gui/LightApp_Application.h>
+
+#include <gui/QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
 
 #include <QComboBox>
 #include <QGroupBox>
diff --git a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
index a12fad46..dd89f9ef 100644
--- a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
@@ -26,19 +26,19 @@
 //
 #include "VisuGUI_SetupPlot2dDlg.h"
 #include "VisuGUI.h"
-#include "SPlot2d_Curve.h"
+#include <gui/SPlot2d_Curve.h>
 
-#include "SUIT_Tools.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include <QtxColorButton.h>
+#include <gui/QtxColorButton.h>
 
-#include <SALOMEDSClient_AttributeTableOfInteger.hxx>
-#include <SALOMEDSClient_AttributeTableOfReal.hxx>
+#include <kernel/SALOMEDSClient_AttributeTableOfInteger.hxx>
+#include <kernel/SALOMEDSClient_AttributeTableOfReal.hxx>
 
 #include <QLabel>
 #include <QPushButton>
@@ -55,7 +55,7 @@
 #include <vector>
 #include <string>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h
index 985c34f7..d89f279c 100644
--- a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h
+++ b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h
@@ -26,9 +26,9 @@
 #ifndef VISUGUI_SetupPlot2dDlg_H
 #define VISUGUI_SetupPlot2dDlg_H
 
-#include "Plot2d_Curve.h"
+#include <gui/Plot2d_Curve.h>
 
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
 #include <QDialog>
 #include <QList>
diff --git a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx
index 1037bb3a..f5eb8d9f 100644
--- a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx
@@ -30,21 +30,21 @@
 #include "VisuGUI_Tools.h"
 #include "VISU_Actor.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_OverrideCursor.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "LightApp_Study.h"
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_Application.h"
+#include <gui/LightApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
 // QT Includes
 #include <QLabel>
diff --git a/src/VISUGUI/VisuGUI_Slider.cxx b/src/VISUGUI/VisuGUI_Slider.cxx
index e32654e7..8d011947 100644
--- a/src/VISUGUI/VisuGUI_Slider.cxx
+++ b/src/VISUGUI/VisuGUI_Slider.cxx
@@ -26,15 +26,15 @@
 //
 #include "VisuGUI_Slider.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include "LightApp_SelectionMgr.h"
+#include <gui/LightApp_SelectionMgr.h>
 
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 #include "VISU_PipeLine.hxx"
 
@@ -45,11 +45,11 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_Prs3dTools.h"
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 
-#include "QtxDockWidget.h"
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDockWidget.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <vtkActorCollection.h>
 #include <vtkRenderer.h>
diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
index 55d9c652..aa13568a 100644
--- a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
@@ -36,23 +36,23 @@
 #include "VISU_StreamLinesPL.hxx"
 #include "VISU_Actor.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 "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SUIT_Desktop.h"
-#include "SUIT_Session.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_MessageBox.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include "SALOME_ListIO.hxx"
+#include <gui/SALOME_ListIO.hxx>
 
-#include <SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_SObject.hxx>
 
-#include <QtxDoubleSpinBox.h>
-#include <QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxColorButton.h>
 
 #include <limits.h>
 
diff --git a/src/VISUGUI/VisuGUI_Sweep.cxx b/src/VISUGUI/VisuGUI_Sweep.cxx
index d5f5a904..867ebb0e 100644
--- a/src/VISUGUI/VisuGUI_Sweep.cxx
+++ b/src/VISUGUI/VisuGUI_Sweep.cxx
@@ -26,9 +26,9 @@
 //
 #include "VisuGUI_Sweep.h"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "LightApp_SelectionMgr.h"
+#include <gui/LightApp_SelectionMgr.h>
 
 #include "VISU_Actor.h"
 
@@ -38,9 +38,9 @@
 #include "VISU_ColoredPrs3d_i.hh"
 #include "VISU_Actor.h"
 
-#include "QtxDockWidget.h"
-#include "QtxIntSpinBox.h"
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDockWidget.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QMainWindow>
 #include <QComboBox>
diff --git a/src/VISUGUI/VisuGUI_Table3dDlg.cxx b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
index a90fccc5..d6036239 100644
--- a/src/VISUGUI/VisuGUI_Table3dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
@@ -34,15 +34,15 @@
 #include "VISU_ViewManager_i.hh"
 #include "VISU_Prs3dUtils.hh"
 
-#include <SVTK_ViewWindow.h>
-#include <SALOME_Actor.h>
-#include <SUIT_Desktop.h>
-#include <SUIT_Session.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <LightApp_Application.h>
-#include <SVTK_FontWidget.h>
-#include <QtxDoubleSpinBox.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_Actor.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SVTK_FontWidget.h>
+#include <gui/QtxDoubleSpinBox.h>
 
 #include <QGridLayout>
 #include <QHBoxLayout>
diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
index 00192d5a..393b64d5 100644
--- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
@@ -59,19 +59,19 @@
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_Actor.h"
 
-#include "SalomeApp_Study.h"
-#include "LightApp_Application.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/LightApp_Application.h>
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SUIT_OverrideCursor.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_FileDlg.h"
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_FileDlg.h>
 
 #include <vtkRenderer.h>
 #include <vtkMapper.h>
diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.h b/src/VISUGUI/VisuGUI_TimeAnimation.h
index 40f40f67..bbf83ace 100644
--- a/src/VISUGUI/VisuGUI_TimeAnimation.h
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.h
@@ -26,10 +26,10 @@
 #ifndef VISUGUI_TIMEANIMATION_H
 #define VISUGUI_TIMEANIMATION_H
 
-#include "QtxDoubleSpinBox.h"
-#include "SALOMEDSClient_Study.hxx"
+#include <gui/QtxDoubleSpinBox.h>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 #include <QDialog>
 #include <QButtonGroup>
diff --git a/src/VISUGUI/VisuGUI_Timer.cxx b/src/VISUGUI/VisuGUI_Timer.cxx
index d78348b5..a5fc0e09 100644
--- a/src/VISUGUI/VisuGUI_Timer.cxx
+++ b/src/VISUGUI/VisuGUI_Timer.cxx
@@ -25,9 +25,9 @@
 //
 #include "VisuGUI_Timer.h"
 
-#include "SUIT_Desktop.h"
+#include <gui/SUIT_Desktop.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifndef WNT
 static struct timezone *tz=(struct timezone*) malloc(sizeof(struct timezone));
diff --git a/src/VISUGUI/VisuGUI_Timer.h b/src/VISUGUI/VisuGUI_Timer.h
index e5856d8c..e639e16c 100644
--- a/src/VISUGUI/VisuGUI_Timer.h
+++ b/src/VISUGUI/VisuGUI_Timer.h
@@ -23,7 +23,7 @@
 //  File   : VisuGUI_Timer.h
 //  Module : SALOME
 //
-#include <Utils_Timer.hxx>
+#include <kernel/Utils_Timer.hxx>
 
 #include <QString>
 
diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx
index 665c0450..30bc28b5 100644
--- a/src/VISUGUI/VisuGUI_Tools.cxx
+++ b/src/VISUGUI/VisuGUI_Tools.cxx
@@ -44,34 +44,34 @@
 #include "VISU_Actor.h"
 #include "VISU_ScalarMapAct.h"
 
-#include "SalomeApp_Module.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
+#include <gui/SalomeApp_Module.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
-#include "LightApp_DataObject.h"
-#include "LightApp_SelectionMgr.h"
+#include <gui/LightApp_DataObject.h>
+#include <gui/LightApp_SelectionMgr.h>
 
 //TODO
-//#include "OB_Browser.h"
+//#include <gui/OB_Browser.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_Functor.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_Functor.h>
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SPlot2d_ViewModel.h"
-#include "Plot2d_ViewFrame.h"
-#include "Plot2d_ViewManager.h"
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/Plot2d_ViewFrame.h>
+#include <gui/Plot2d_ViewManager.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_ViewWindow.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_ViewWindow.h>
 
-#include "CAM_DataModel.h"
+#include <gui/CAM_DataModel.h>
 
 #include <vtkRenderer.h>
 #include <vtkActorCollection.h>
diff --git a/src/VISUGUI/VisuGUI_Tools.h b/src/VISUGUI/VisuGUI_Tools.h
index 33c55c7b..1b76a2dc 100644
--- a/src/VISUGUI/VisuGUI_Tools.h
+++ b/src/VISUGUI/VisuGUI_Tools.h
@@ -27,12 +27,12 @@
 #ifndef VisuGUI_Tools_HeaderFile
 #define VisuGUI_Tools_HeaderFile
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
 #include "VISUConfig.hh"
 #include "VISU_ColoredPrs3d_i.hh"
 
-#include "SALOMEDSClient_Study.hxx"
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(MED_Gen)
diff --git a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
index 0227625a..e31d1cf8 100644
--- a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
+++ b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
@@ -32,21 +32,21 @@
 #include "VisuGUI_Tools.h"
 #include "VISU_Actor.h"
 
-#include "SUIT_Desktop.h"
-#include "SUIT_OverrideCursor.h"
-#include "SUIT_Session.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_OverrideCursor.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "LightApp_Study.h"
-#include "LightApp_SelectionMgr.h"
-#include "LightApp_Application.h"
+#include <gui/LightApp_Study.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/LightApp_Application.h>
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
 // QT Includes
 #include <QLabel>
diff --git a/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx b/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx
index 54c71d16..3a370177 100755
--- a/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx
@@ -28,8 +28,8 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPushButton>
-#include <QtxColorButton.h>
-#include <QtxFontEdit.h>
+#include <gui/QtxColorButton.h>
+#include <gui/QtxFontEdit.h>
 #include <QVBoxLayout>
 
 /*!
diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.cxx b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
index 640c6f13..998b81da 100644
--- a/src/VISUGUI/VisuGUI_VectorsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
@@ -33,15 +33,15 @@
 
 #include "VISU_ColoredPrs3dFactory.hh"
 #include "VISU_Vectors_i.hh"
-#include "LightApp_Application.h"
-#include "SalomeApp_Module.h"
+#include <gui/LightApp_Application.h>
+#include <gui/SalomeApp_Module.h>
 
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include <QtxColorButton.h>
+#include <gui/QtxColorButton.h>
 
 #include <QLayout>
 #include <QColorDialog>
diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.h b/src/VISUGUI/VisuGUI_VectorsDlg.h
index 6e0562d3..6d31c881 100644
--- a/src/VISUGUI/VisuGUI_VectorsDlg.h
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.h
@@ -29,7 +29,7 @@
 #define VISUGUI_VECTORSDLG_H
 
 #include "VisuGUI_Prs3dDlg.h"
-#include "QtxDoubleSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
 
 class QGroupBox;
 class QTabWidget;
diff --git a/src/VISUGUI/VisuGUI_ViewExtender.cxx b/src/VISUGUI/VisuGUI_ViewExtender.cxx
index 3dff1134..f0536113 100644
--- a/src/VISUGUI/VisuGUI_ViewExtender.cxx
+++ b/src/VISUGUI/VisuGUI_ViewExtender.cxx
@@ -30,17 +30,17 @@
 #include "VisuGUI_SegmentationMgr.h"
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_Tools.h"
-#include <VTKViewer_Actor.h>
+#include <gui/VTKViewer_Actor.h>
 
-#include <LightApp_SelectionMgr.h>
-#include <SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SalomeApp_Application.h>
 
 #include <VISU_PipeLine.hxx>
-#include <SUIT_ViewManager.h>
-#include <SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ViewWindow.h>
 
-#include <SVTK_ViewModel.h>
-#include <SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
 
 
diff --git a/src/VISUGUI/VisuGUI_ViewExtender.h b/src/VISUGUI/VisuGUI_ViewExtender.h
index 16303177..2ab6d013 100644
--- a/src/VISUGUI/VisuGUI_ViewExtender.h
+++ b/src/VISUGUI/VisuGUI_ViewExtender.h
@@ -28,7 +28,7 @@
 #define VisuGUI_ViewExtender_HeaderFile
 
 #include <CAM_ViewExtender.h>
-#include <SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIO.hxx>
 #include <QObject>
 #include <QMap>
 
diff --git a/src/VISUGUI/VisuGUI_ViewTools.cxx b/src/VISUGUI/VisuGUI_ViewTools.cxx
index 65aaeed9..a2fbf8e1 100644
--- a/src/VISUGUI/VisuGUI_ViewTools.cxx
+++ b/src/VISUGUI/VisuGUI_ViewTools.cxx
@@ -28,10 +28,10 @@
 
 #include "VISU_Actor.h"
 
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include <SUIT_Desktop.h>
+#include <gui/SUIT_Desktop.h>
 
 namespace VISU 
 {
diff --git a/src/VISUGUI/VisuGUI_ViewTools.h b/src/VISUGUI/VisuGUI_ViewTools.h
index 772d780a..73a8025f 100644
--- a/src/VISUGUI/VisuGUI_ViewTools.h
+++ b/src/VISUGUI/VisuGUI_ViewTools.h
@@ -38,28 +38,28 @@
 
 #include "VISU_Actor.h"
 
-#include "SalomeApp_Module.h"
-#include "SalomeApp_Application.h"
+#include <gui/SalomeApp_Module.h>
+#include <gui/SalomeApp_Application.h>
 
 //#include "VVTK_ViewModel.h"
 //#include "VVTK_ViewWindow.h"
 
-#include "SVTK_Functor.h"
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_Functor.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SPlot2d_ViewModel.h"
+#include <gui/SPlot2d_ViewModel.h>
 
-#include "VTKViewer_Algorithm.h"
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SUIT_Session.h"
-#include "SUIT_Desktop.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_ViewWindow.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Desktop.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_ViewWindow.h>
 
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
 #include <vtkActorCollection.h>
 #include <vtkRenderer.h>
diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc
index 8407799a..1defae4d 100644
--- a/src/VISU_I/VISUConfig.cc
+++ b/src/VISU_I/VISUConfig.cc
@@ -26,16 +26,16 @@
 //
 #include "VISUConfig.hh"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "SALOMEDSClient_GenericAttribute.hxx"
-#include "SALOMEDSClient_AttributeIOR.hxx"
+#include <kernel/SALOMEDSClient_GenericAttribute.hxx>
+#include <kernel/SALOMEDSClient_AttributeIOR.hxx>
 
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
 #include <QRegExp>
 
diff --git a/src/VISU_I/VISUConfig.hh b/src/VISU_I/VISUConfig.hh
index 27af4103..e746eb72 100644
--- a/src/VISU_I/VISUConfig.hh
+++ b/src/VISU_I/VISUConfig.hh
@@ -36,13 +36,13 @@
 #include CORBA_SERVER_HEADER(SALOMEDS)
 #include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
-#include "SALOME_NamingService.hxx"
-#include "SALOME_LifeCycleCORBA.hxx"
-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>
 
-#include "SALOMEDSClient_SObject.hxx"
-#include "SALOMEDSClient_Study.hxx"
+#include <kernel/SALOMEDSClient_SObject.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 // QT headers
 #include <QString>
diff --git a/src/VISU_I/VISU_ClippingPlaneMgr.cxx b/src/VISU_I/VISU_ClippingPlaneMgr.cxx
index d1346758..7dd331fd 100644
--- a/src/VISU_I/VISU_ClippingPlaneMgr.cxx
+++ b/src/VISU_I/VISU_ClippingPlaneMgr.cxx
@@ -25,10 +25,10 @@
 //#include CORBA_SERVER_HEADER(SALOMEDS)
 //#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
 
-#include "SALOMEDSClient_GenericAttribute.hxx"
-#include "SALOMEDSClient_AttributeName.hxx"
-#include "SALOMEDSClient_AttributeSequenceOfReal.hxx"
-#include "SALOMEDSClient_AttributeInteger.hxx"
+#include <kernel/SALOMEDSClient_GenericAttribute.hxx>
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
+#include <kernel/SALOMEDSClient_AttributeSequenceOfReal.hxx>
+#include <kernel/SALOMEDSClient_AttributeInteger.hxx>
 
 
 #include <vtkImplicitFunctionCollection.h>
diff --git a/src/VISU_I/VISU_ClippingPlaneMgr.hxx b/src/VISU_I/VISU_ClippingPlaneMgr.hxx
index 09ca4759..95ed4c4d 100644
--- a/src/VISU_I/VISU_ClippingPlaneMgr.hxx
+++ b/src/VISU_I/VISU_ClippingPlaneMgr.hxx
@@ -29,7 +29,7 @@
 
 #include "VISU_I.hxx"
 #include "VISUConfig.hh"
-#include "SALOME_Component_i.hxx"
+#include <kernel/SALOME_Component_i.hxx>
 #include "VISU_ColoredPrs3d_i.hh"
 
 #include <vtkPlane.h>
diff --git a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
index adfef8b8..dbe7c525 100644
--- a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
@@ -39,19 +39,19 @@
 
 #include "VISU_PipeLine.hxx"
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <vtkRenderWindow.h>
 
 #include <QtGlobal>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
index 539a7912..58fbfedc 100644
--- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
@@ -29,7 +29,7 @@
 #include "VISU_ColoredPrs3dCache_i.hh"
 #include "VISU_ColoredPrs3d_i.hh"
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
 using namespace VISU;
 using namespace std;
diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh b/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh
index 40859e8c..f3e3e23d 100644
--- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh
+++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh
@@ -30,7 +30,7 @@
 #include "VISU_I.hxx"
 #include "VISU_PrsObject_i.hh"
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 namespace VISU
 {
diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc
index 0b984dd0..1b12dcea 100644
--- a/src/VISU_I/VISU_ColoredPrs3d_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <strstream>
 #include <vtkMapper.h>
diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx
index 262d9399..592629a4 100644
--- a/src/VISU_I/VISU_CorbaMedConvertor.cxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx
@@ -32,10 +32,10 @@
 
 #include <boost/tuple/tuple.hpp>
 
-#include "ReceiverFactory.hxx"
-#include "MED_SliceArray.hxx"
+#include <kernel/ReceiverFactory.hxx>
+#include <med/MED_SliceArray.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #define USER_INTERLACE MED_FULL_INTERLACE
 
diff --git a/src/VISU_I/VISU_CutLinesBase_i.cc b/src/VISU_I/VISU_CutLinesBase_i.cc
index 2a256794..6d9232c2 100644
--- a/src/VISU_I/VISU_CutLinesBase_i.cc
+++ b/src/VISU_I/VISU_CutLinesBase_i.cc
@@ -32,7 +32,7 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_PipeLineUtils.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include <vtkAppendPolyData.h>
 
diff --git a/src/VISU_I/VISU_CutLines_i.cc b/src/VISU_I/VISU_CutLines_i.cc
index a1dccb01..299c0a1f 100644
--- a/src/VISU_I/VISU_CutLines_i.cc
+++ b/src/VISU_I/VISU_CutLines_i.cc
@@ -33,8 +33,8 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_PipeLineUtils.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkAppendPolyData.h>
 
diff --git a/src/VISU_I/VISU_CutPlanes_i.cc b/src/VISU_I/VISU_CutPlanes_i.cc
index c9411b38..a5a8a1c2 100644
--- a/src/VISU_I/VISU_CutPlanes_i.cc
+++ b/src/VISU_I/VISU_CutPlanes_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_Result_i.hh"
 #include "VISU_Actor.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/VISU_I/VISU_CutSegment_i.cc b/src/VISU_I/VISU_CutSegment_i.cc
index 4e01b20b..96661716 100644
--- a/src/VISU_I/VISU_CutSegment_i.cc
+++ b/src/VISU_I/VISU_CutSegment_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_PipeLineUtils.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkAppendPolyData.h>
 
diff --git a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc
index 8fa94e4d..b8b98b4e 100644
--- a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc
+++ b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_DeformedShapeAndScalarMapPL.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkUnstructuredGrid.h>
 #include <vtkProperty.h>
diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc
index fa280ebf..26059a6f 100644
--- a/src/VISU_I/VISU_DeformedShape_i.cc
+++ b/src/VISU_I/VISU_DeformedShape_i.cc
@@ -33,8 +33,8 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkDataSetMapper.h>
 #include <vtkProperty.h>
diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc
index e07a785f..409512d7 100644
--- a/src/VISU_I/VISU_DumpPython.cc
+++ b/src/VISU_I/VISU_DumpPython.cc
@@ -46,7 +46,7 @@
 #include "VISU_ColoredPrs3dCache_i.hh"
 #include "VISU_ColoredPrs3dHolder_i.hh"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <cctype>
 #include <strstream>
diff --git a/src/VISU_I/VISU_Evolution.cxx b/src/VISU_I/VISU_Evolution.cxx
index 75e971cd..0d5486f5 100644
--- a/src/VISU_I/VISU_Evolution.cxx
+++ b/src/VISU_I/VISU_Evolution.cxx
@@ -35,12 +35,12 @@
 #include <VISU_Structures_impl.hxx>
 #include <VISU_VTKTypeList.hxx>
 
-#include <SUIT_Session.h>
+#include <gui/SUIT_Session.h>
 
-#include <SalomeApp_Application.h>
-#include <SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <SALOME_Event.h>
+#include <gui/SALOME_Event.h>
 
 //------------------------------------------------------------------------
 template<int EDataType> bool ProcessValForTime( VISU::PValForTimeImpl theValForTime,
diff --git a/src/VISU_I/VISU_Evolution.h b/src/VISU_I/VISU_Evolution.h
index b40e9aec..0a6a8655 100644
--- a/src/VISU_I/VISU_Evolution.h
+++ b/src/VISU_I/VISU_Evolution.h
@@ -28,8 +28,8 @@
 
 #include "VISUConfig.hh"
 
-#include <VISU_ConvertorDef_impl.hxx>
-#include <SALOMEDSClient_Study.hxx>
+#include "VISU_ConvertorDef_impl.hxx"
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 #include <QList>
 #include <QMap>
diff --git a/src/VISU_I/VISU_GaussPoints_i.cc b/src/VISU_I/VISU_GaussPoints_i.cc
index ac8886f3..0f177453 100644
--- a/src/VISU_I/VISU_GaussPoints_i.cc
+++ b/src/VISU_I/VISU_GaussPoints_i.cc
@@ -39,7 +39,7 @@
 #include "VISU_LookupTable.hxx"
 #include "VISU_MedConvertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #include "VISU_PipeLineUtils.hxx"
 
diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index 3c2304e0..64d0f6a4 100644
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -44,23 +44,23 @@
 
 #include "VISU_Actor.h"
 
-#include "HDFascii.hxx"
-#include "SALOMEDS_Tool.hxx"
+#include <kernel/HDFascii.hxx>
+#include <kernel/SALOMEDS_Tool.hxx>
 
-#include "SALOMEDSClient_AttributeName.hxx"
-#include "SALOMEDSClient_AttributePixMap.hxx"
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
+#include <kernel/SALOMEDSClient_AttributePixMap.hxx>
 
-#include "SUIT_Session.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-#include "SVTK_ViewModel.h"
-#include "SVTK_ViewWindow.h"
-#include "SALOME_Event.h"
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
+#include <gui/SUIT_Session.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 // IDL Headers
 #include <omnithread.h>
@@ -80,7 +80,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
 
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/Utils_ExceptHandlers.hxx>
 UNEXPECT_CATCH(SalomeException, SALOME::SALOME_Exception);
 
 // STL Includes
diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh
index 32eec815..6b4fa2a6 100644
--- a/src/VISU_I/VISU_Gen_i.hh
+++ b/src/VISU_I/VISU_Gen_i.hh
@@ -29,8 +29,8 @@
 #include "VISUConfig.hh"
 
 #include "VISU_I.hxx"
-#include "SALOME_Component_i.hxx"
-#include "SALOME_NamingService.hxx"
+#include <kernel/SALOME_Component_i.hxx>
+#include <kernel/SALOME_NamingService.hxx>
 #include "VISU_ColoredPrs3d_i.hh"
 #include "VISU_ClippingPlaneMgr.hxx"
 
diff --git a/src/VISU_I/VISU_IsoSurfaces_i.cc b/src/VISU_I/VISU_IsoSurfaces_i.cc
index 906aef86..215c842a 100644
--- a/src/VISU_I/VISU_IsoSurfaces_i.cc
+++ b/src/VISU_I/VISU_IsoSurfaces_i.cc
@@ -33,8 +33,8 @@
 #include "VISU_ScalarMapAct.h"
 #include "VISU_IsoSurfActor.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 #include <vtkMapper.h>
 
 #ifdef _DEBUG_
diff --git a/src/VISU_I/VISU_Mesh_i.cc b/src/VISU_I/VISU_Mesh_i.cc
index f703ca22..c916ffed 100644
--- a/src/VISU_I/VISU_Mesh_i.cc
+++ b/src/VISU_I/VISU_Mesh_i.cc
@@ -34,9 +34,9 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/VISU_I/VISU_MultiResult_i.cc b/src/VISU_I/VISU_MultiResult_i.cc
index 42ef355f..45435f48 100644
--- a/src/VISU_I/VISU_MultiResult_i.cc
+++ b/src/VISU_I/VISU_MultiResult_i.cc
@@ -32,12 +32,12 @@
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
-#include "MULTIPR_Obj.hxx"
-#include "MULTIPR_API.hxx"
-#include "MULTIPR_Exceptions.hxx"
+#include <med/MULTIPR_Obj.hxx>
+#include <med/MULTIPR_API.hxx>
+#include <med/MULTIPR_Exceptions.hxx>
 
-#include "SALOMEDS_Tool.hxx"
-#include "HDFascii.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
+#include <kernel/HDFascii.hxx>
 
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>
diff --git a/src/VISU_I/VISU_MultiResult_i.hh b/src/VISU_I/VISU_MultiResult_i.hh
index 1bbfad1b..d7b74fda 100644
--- a/src/VISU_I/VISU_MultiResult_i.hh
+++ b/src/VISU_I/VISU_MultiResult_i.hh
@@ -33,7 +33,7 @@
 #  define RESULT_CLASS_NAME MultiResult_i
 
 #include "VISU_Result_i.hh"
-#include "MULTIPR_Obj.hxx"
+#include <med/MULTIPR_Obj.hxx>
 
 #include <set>
 
diff --git a/src/VISU_I/VISU_Plot3D_i.cc b/src/VISU_I/VISU_Plot3D_i.cc
index cea07c35..ff8cd116 100644
--- a/src/VISU_I/VISU_Plot3D_i.cc
+++ b/src/VISU_I/VISU_Plot3D_i.cc
@@ -26,8 +26,8 @@
 #include "VISU_Plot3DPL.hxx"
 #include "VISU_Actor.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/VISU_I/VISU_PointMap3d_i.cc b/src/VISU_I/VISU_PointMap3d_i.cc
index f0533c30..32ab674c 100644
--- a/src/VISU_I/VISU_PointMap3d_i.cc
+++ b/src/VISU_I/VISU_PointMap3d_i.cc
@@ -31,18 +31,18 @@
 #include "VISU_Result_i.hh"
 #include "VISU_ViewManager_i.hh"
 #include "VISU_ScalarBarActor.hxx"
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 #include "VISU_Prs3dUtils.hh"
-#include "SPlot2d_Curve.h"
+#include <gui/SPlot2d_Curve.h>
 #include "VISU_PipeLineUtils.hxx"
 
 #include "VISU_TableReader.hxx"
 #include "VISU_ConvertorUtils.hxx"
 #include "VISU_DeformedGridPL.hxx"
 
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 #include "VISU_Gen_i.hh"
 
 #include <vtkTextProperty.h>
diff --git a/src/VISU_I/VISU_PointMap3d_i.hh b/src/VISU_I/VISU_PointMap3d_i.hh
index 547191d8..68a77f86 100644
--- a/src/VISU_I/VISU_PointMap3d_i.hh
+++ b/src/VISU_I/VISU_PointMap3d_i.hh
@@ -28,7 +28,7 @@
 #define VISU_PointMap3d_i_HeaderFile
 
 #include "VISU_PrsObject_i.hh"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 #include "VISU_TableReader.hxx"
 #include "VISU_PointMap3dActor.h"
diff --git a/src/VISU_I/VISU_Prs3dUtils.cc b/src/VISU_I/VISU_Prs3dUtils.cc
index 35685d9f..0df47948 100644
--- a/src/VISU_I/VISU_Prs3dUtils.cc
+++ b/src/VISU_I/VISU_Prs3dUtils.cc
@@ -25,8 +25,8 @@
 //  Module : VISU
 //
 #include "VISU_Prs3dUtils.hh"
-#include "SalomeApp_Study.h"
-#include "SALOME_Event.h"
+#include <gui/SalomeApp_Study.h>
+#include <gui/SALOME_Event.h>
 
 
 namespace VISU
diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc
index 17468de9..d21fe066 100644
--- a/src/VISU_I/VISU_Prs3d_i.cc
+++ b/src/VISU_I/VISU_Prs3d_i.cc
@@ -31,9 +31,9 @@
 #include "VISU_Result_i.hh"
 #include "VISU_Actor.h"
 
-#include "SALOME_Event.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_MessageBox.h"
+#include <gui/SALOME_Event.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_MessageBox.h>
 
 #include <vtkActorCollection.h>
 #include <vtkUnstructuredGrid.h>
diff --git a/src/VISU_I/VISU_Prs3d_i.hh b/src/VISU_I/VISU_Prs3d_i.hh
index 6f54053c..e6bc967c 100644
--- a/src/VISU_I/VISU_Prs3d_i.hh
+++ b/src/VISU_I/VISU_Prs3d_i.hh
@@ -32,11 +32,11 @@
 #include "VISU_ActorFactory.h"
 #include "VISU_ConvertorDef.hxx"
 
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 #include "SALOME_GenericObjPointer.hh"
-#include "SALOME_InteractiveObject.hxx"
+#include <gui/SALOME_InteractiveObject.hxx>
 
-#include "VTKViewer.h"
+#include <gui/VTKViewer.h>
 
 #include <vtkSmartPointer.h>
 #include <vtkTimeStamp.h>
diff --git a/src/VISU_I/VISU_ResultUtils.cc b/src/VISU_I/VISU_ResultUtils.cc
index 640dd24e..e52997ff 100644
--- a/src/VISU_I/VISU_ResultUtils.cc
+++ b/src/VISU_I/VISU_ResultUtils.cc
@@ -26,10 +26,10 @@
 //
 #include "VISU_ResultUtils.hh"
 
-#include "SUIT_Session.h"
-#include "SALOME_Event.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
 #include "VISU_Convertor.hxx"
 #include "VISU_ConvertorUtils.hxx"
diff --git a/src/VISU_I/VISU_ResultUtils.hh b/src/VISU_I/VISU_ResultUtils.hh
index 639e22a0..8acf84b0 100644
--- a/src/VISU_I/VISU_ResultUtils.hh
+++ b/src/VISU_I/VISU_ResultUtils.hh
@@ -28,7 +28,7 @@
 #define __VISU_RESULT_UTILS_H__
 
 #include "VISU_Result_i.hh"
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
 #include <set>
 
diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc
index 3099bec2..0d56744a 100644
--- a/src/VISU_I/VISU_Result_i.cc
+++ b/src/VISU_I/VISU_Result_i.cc
@@ -33,18 +33,18 @@
 #include "VISU_ConvertorUtils.hxx"
 #include "VISU_PipeLine.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SALOMEDS_Tool.hxx"
-#include "HDFascii.hxx"
-#include "Basics_Utils.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
+#include <kernel/HDFascii.hxx>
+#include <kernel/Basics_Utils.hxx>
 
-#include "SUIT_Session.h"
-#include "SALOME_Event.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
-#include "MED_Factory.hxx"
+#include <med/MED_Factory.hxx>
 
 #include <boost/thread/thread.hpp>
 #include <boost/bind.hpp>
diff --git a/src/VISU_I/VISU_Result_i.hh b/src/VISU_I/VISU_Result_i.hh
index 8871cfcc..8008cb5f 100644
--- a/src/VISU_I/VISU_Result_i.hh
+++ b/src/VISU_I/VISU_Result_i.hh
@@ -29,10 +29,10 @@
 
 #include "VISU_PrsObject_i.hh"
 #include "VISU_BoostSignals.h"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
-#include "SALOME_Event.h"
-#include "VTKViewer.h"
+#include <gui/SALOME_Event.h>
+#include <gui/VTKViewer.h>
 
 #include <boost/shared_ptr.hpp>
 #include <gp_Dir.hxx>
diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc
index 8b0326d6..e1385d1c 100644
--- a/src/VISU_I/VISU_ScalarMap_i.cc
+++ b/src/VISU_I/VISU_ScalarMap_i.cc
@@ -37,12 +37,12 @@
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
+#include <gui/SUIT_ResourceMgr.h>
 
-#include "SUIT_Session.h"
-#include "SALOME_Event.h"
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
+#include <gui/SUIT_Session.h>
+#include <gui/SALOME_Event.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
 #include <vtkDataSetMapper.h>
 #include <vtkTextProperty.h>
diff --git a/src/VISU_I/VISU_StreamLines_i.cc b/src/VISU_I/VISU_StreamLines_i.cc
index de15f772..93f4d974 100644
--- a/src/VISU_I/VISU_StreamLines_i.cc
+++ b/src/VISU_I/VISU_StreamLines_i.cc
@@ -32,8 +32,8 @@
 #include "VISU_StreamLinesPL.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkDataSetMapper.h>
 #include <vtkAppendFilter.h>
diff --git a/src/VISU_I/VISU_Table_i.cc b/src/VISU_I/VISU_Table_i.cc
index fa9e334a..e175e88d 100644
--- a/src/VISU_I/VISU_Table_i.cc
+++ b/src/VISU_I/VISU_Table_i.cc
@@ -31,15 +31,15 @@
 #include "VISU_Result_i.hh"
 #include "VISU_ViewManager_i.hh"
 
-#include "SALOME_Event.h"
-#include "SPlot2d_Curve.h"
+#include <gui/SALOME_Event.h>
+#include <gui/SPlot2d_Curve.h>
 
 #include "VISU_TableReader.hxx"
 #include "VISU_ConvertorUtils.hxx"
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include <Basics_Utils.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 using namespace std;
 
diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index c2b29a68..120b210f 100644
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -52,22 +52,22 @@
 #include "VISU_ScalarBarActor.hxx"
 #include "VISU_Actor.h"
 
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Study.h>
 
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Application.h"
-#include "SUIT_Session.h"
-#include "SUIT_Study.h"
-#include "SUIT_MessageBox.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Study.h>
+#include <gui/SUIT_MessageBox.h>
 
-#include "SALOMEDSClient_AttributeString.hxx"
-#include "SALOMEDSClient_AttributeName.hxx"
+#include <kernel/SALOMEDSClient_AttributeString.hxx>
+#include <kernel/SALOMEDSClient_AttributeName.hxx>
 
-#include "Utils_ExceptHandlers.hxx"
+#include <kernel/Utils_ExceptHandlers.hxx>
 
 #include <QPixmap>
 #include <QImage>
diff --git a/src/VISU_I/VISU_Tools.cxx b/src/VISU_I/VISU_Tools.cxx
index e2963b9d..28869f9f 100644
--- a/src/VISU_I/VISU_Tools.cxx
+++ b/src/VISU_I/VISU_Tools.cxx
@@ -29,14 +29,14 @@
 #include "VISU_Table_i.hh"
 #include "VISU_ViewManager_i.hh"
 
-#include <SalomeApp_Study.h>
-#include <SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
 
-#include <SPlot2d_ViewModel.h>
-#include <Plot2d_ViewFrame.h>
-#include <Plot2d_ViewManager.h>
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/Plot2d_ViewFrame.h>
+#include <gui/Plot2d_ViewManager.h>
 
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_ResourceMgr.h>
 
 //=============================================================================
 namespace VISU
diff --git a/src/VISU_I/VISU_Tools.h b/src/VISU_I/VISU_Tools.h
index bae032d8..76078e0a 100644
--- a/src/VISU_I/VISU_Tools.h
+++ b/src/VISU_I/VISU_Tools.h
@@ -29,7 +29,7 @@
 #include "VISUConfig.hh"
 #include "VISU_I.hxx"
 
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 class SPlot2d_Curve;
 class Plot2d_ViewFrame;
diff --git a/src/VISU_I/VISU_Vectors_i.cc b/src/VISU_I/VISU_Vectors_i.cc
index d2d4cfd3..e7bd3ac5 100644
--- a/src/VISU_I/VISU_Vectors_i.cc
+++ b/src/VISU_I/VISU_Vectors_i.cc
@@ -33,8 +33,8 @@
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SALOME_Event.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SALOME_Event.h>
 
 #include <vtkProperty.h>
 
diff --git a/src/VISU_I/VISU_ViewManager_i.cc b/src/VISU_I/VISU_ViewManager_i.cc
index 0bc32345..159e647a 100644
--- a/src/VISU_I/VISU_ViewManager_i.cc
+++ b/src/VISU_I/VISU_ViewManager_i.cc
@@ -32,29 +32,29 @@
 #include "VISU_Actor.h"
 #include "VISU_ActorFactory.h"
 
-#include "SUIT_Tools.h"
-#include "SUIT_Session.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ViewManager.h"
-
-#include "SVTK_ViewWindow.h"
-#include "SVTK_ViewModel.h"
-#include "VTKViewer_Algorithm.h"
-#include "SPlot2d_Curve.h"
-#include "Plot2d_ViewFrame.h"
-#include "Plot2d_ViewWindow.h"
-#include "Plot2d_ViewModel.h"
-
-#include "SalomeApp_Study.h"
-#include "SalomeApp_Application.h"
-#include "LightApp_SelectionMgr.h"
-
-#include "SALOME_Event.h"
-#include "SALOME_ListIO.hxx"
-#include "SALOME_ListIteratorOfListIO.hxx"
-
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SPlot2d_Curve.h>
+#include <gui/Plot2d_ViewFrame.h>
+#include <gui/Plot2d_ViewWindow.h>
+#include <gui/Plot2d_ViewModel.h>
+
+#include <gui/SalomeApp_Study.h>
+#include <gui/SalomeApp_Application.h>
+#include <gui/LightApp_SelectionMgr.h>
+
+#include <gui/SALOME_Event.h>
+#include <gui/SALOME_ListIO.hxx>
+#include <gui/SALOME_ListIteratorOfListIO.hxx>
+
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 
 #include <vtkCamera.h>
 #include <vtkRenderer.h>
diff --git a/src/VISU_I/VISU_View_i.cc b/src/VISU_I/VISU_View_i.cc
index 89ebe9d2..783a054c 100644
--- a/src/VISU_I/VISU_View_i.cc
+++ b/src/VISU_I/VISU_View_i.cc
@@ -40,27 +40,27 @@
 #include "VISU_PointMap3dActor.h"
 #include "VISU_DeformedGridPL.hxx"
 
-#include "SALOME_Event.h"
+#include <gui/SALOME_Event.h>
 
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ViewManager.h"
-#include "SUIT_Tools.h"
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewManager.h>
+#include <gui/SUIT_Tools.h>
 
-#include "STD_MDIDesktop.h"
-#include "STD_TabDesktop.h"
+#include <gui/STD_MDIDesktop.h>
+#include <gui/STD_TabDesktop.h>
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_ViewModel.h"
-#include "VTKViewer_Algorithm.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_ViewModel.h>
+#include <gui/VTKViewer_Algorithm.h>
 
-#include "SPlot2d_ViewModel.h"
-#include "Plot2d_ViewFrame.h"
+#include <gui/SPlot2d_ViewModel.h>
+#include <gui/Plot2d_ViewFrame.h>
 
-#include "SalomeApp_Application.h"
-#include "SalomeApp_Study.h"
+#include <gui/SalomeApp_Application.h>
+#include <gui/SalomeApp_Study.h>
 
-#include <QtxWorkstack.h>
-#include <QtxWorkspace.h>
+#include <gui/QtxWorkstack.h>
+#include <gui/QtxWorkspace.h>
 
 #include <QWorkspace>
 #include <QImage>
diff --git a/src/VISU_I/VISU_View_i.hh b/src/VISU_I/VISU_View_i.hh
index 6e644af5..4117945e 100644
--- a/src/VISU_I/VISU_View_i.hh
+++ b/src/VISU_I/VISU_View_i.hh
@@ -28,7 +28,7 @@
 #define VISU_View_i_HeaderFile
 
 #include "VISUConfig.hh"
-#include "SALOME_GenericObj_i.hh"
+#include <kernel/SALOME_GenericObj_i.hh>
 
 class QWidget;
 
diff --git a/src/VVTK/VVTK_ImageWriter.cxx b/src/VVTK/VVTK_ImageWriter.cxx
index 326498f2..b84acb53 100755
--- a/src/VVTK/VVTK_ImageWriter.cxx
+++ b/src/VVTK/VVTK_ImageWriter.cxx
@@ -29,7 +29,7 @@
 
 #include <QSemaphore>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <vtkImageData.h>
 #include <vtkImageClip.h>
diff --git a/src/VVTK/VVTK_ImageWriterMgr.cxx b/src/VVTK/VVTK_ImageWriterMgr.cxx
index bba9094a..a33c77e8 100755
--- a/src/VVTK/VVTK_ImageWriterMgr.cxx
+++ b/src/VVTK/VVTK_ImageWriterMgr.cxx
@@ -32,7 +32,7 @@
 
 #include <QSemaphore>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <limits>
 
diff --git a/src/VVTK/VVTK_InteractorStyle.cxx b/src/VVTK/VVTK_InteractorStyle.cxx
index c50c8cd0..3809e102 100644
--- a/src/VVTK/VVTK_InteractorStyle.cxx
+++ b/src/VVTK/VVTK_InteractorStyle.cxx
@@ -27,7 +27,7 @@
 //
 #include "VVTK_InteractorStyle.h"
 #include "VISU_GaussPtsSettings.h"
-#include "SVTK_Selector.h"
+#include <gui/SVTK_Selector.h>
 #include "VISU_Event.h" 
 
 #include <vtkObjectFactory.h>
diff --git a/src/VVTK/VVTK_InteractorStyle.h b/src/VVTK/VVTK_InteractorStyle.h
index 86702bed..0c379d4e 100644
--- a/src/VVTK/VVTK_InteractorStyle.h
+++ b/src/VVTK/VVTK_InteractorStyle.h
@@ -31,7 +31,7 @@
 
 #include "VVTK.h"
 
-#include "SVTK_InteractorStyle.h"
+#include <gui/SVTK_InteractorStyle.h>
 //
 //-------------------------------------------
 //! Control the value of increment in new style of interaction.
diff --git a/src/VVTK/VVTK_MainWindow.cxx b/src/VVTK/VVTK_MainWindow.cxx
index b0324408..5442360c 100644
--- a/src/VVTK/VVTK_MainWindow.cxx
+++ b/src/VVTK/VVTK_MainWindow.cxx
@@ -33,22 +33,22 @@
 #include "VISU_GaussPtsAct.h"
 #include "VISU_Event.h" 
 
-#include "SVTK_ViewWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_ViewWindow.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
 #include "VVTK_Renderer.h"
 #include "VVTK_PickingDlg.h"
 #include "VVTK_SegmentationCursorDlg.h"
 
-#include "SUIT_Application.h"
-#include "SUIT_Session.h"
-#include "SUIT_Tools.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Accel.h"
-#include "SUIT_MessageBox.h"
-#include "QtxAction.h"
-#include "QtxMultiAction.h"
-#include "QtxActionToolMgr.h"
+#include <gui/SUIT_Application.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_Tools.h>
+#include <gui/SUIT_ViewWindow.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Accel.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/QtxAction.h>
+#include <gui/QtxMultiAction.h>
+#include <gui/QtxActionToolMgr.h>
 
 #include <QImage>
 #include <QToolBar>
diff --git a/src/VVTK/VVTK_PickingDlg.cxx b/src/VVTK/VVTK_PickingDlg.cxx
index 37730f7f..69324136 100644
--- a/src/VVTK/VVTK_PickingDlg.cxx
+++ b/src/VVTK/VVTK_PickingDlg.cxx
@@ -29,18 +29,18 @@
 #include "VISU_PickingSettings.h"
 #include "VISU_GaussPointsPL.hxx"
 
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
-#include "SVTK_Selector.h"
+#include <gui/SVTK_Selector.h>
 #include "SVTK_MainWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
+#include <gui/SVTK_RenderWindowInteractor.h>
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 
 #include <vtkActorCollection.h>
 #include <vtkCallbackCommand.h>
@@ -49,7 +49,7 @@
 #include <vtkGenericRenderWindowInteractor.h>
 #include <vtkSmartPointer.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <QCheckBox>
 #include <QColorDialog>
@@ -62,12 +62,12 @@
 #include <QKeyEvent>
 #include <QIntValidator>
 
-#include "QtxAction.h"
-#include "QtxDoubleSpinBox.h"
-#include "QtxIntSpinBox.h"
-#include "QtxColorButton.h"
+#include <gui/QtxAction.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/QtxColorButton.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
 namespace
 {
diff --git a/src/VVTK/VVTK_PickingDlg.h b/src/VVTK/VVTK_PickingDlg.h
index 0b06abae..9787f5c4 100644
--- a/src/VVTK/VVTK_PickingDlg.h
+++ b/src/VVTK/VVTK_PickingDlg.h
@@ -26,7 +26,7 @@
 #ifndef VVTK_PICKINGDLG_H
 #define VVTK_PICKINGDLG_H
 
-#include "SVTK_DialogBase.h"
+#include <gui/SVTK_DialogBase.h>
 
 #include <vtkObject.h>
 #include <vtkSmartPointer.h>
diff --git a/src/VVTK/VVTK_PrimitiveBox.cxx b/src/VVTK/VVTK_PrimitiveBox.cxx
index 67023c5c..e2db2f24 100644
--- a/src/VVTK/VVTK_PrimitiveBox.cxx
+++ b/src/VVTK/VVTK_PrimitiveBox.cxx
@@ -28,11 +28,11 @@
 
 #include "VISU_OpenGLPointSpriteMapper.hxx"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "QtxDoubleSpinBox.h"
-#include "QtxIntSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/VVTK/VVTK_Recorder.cxx b/src/VVTK/VVTK_Recorder.cxx
index 9ef0f6dc..440c4076 100755
--- a/src/VVTK/VVTK_Recorder.cxx
+++ b/src/VVTK/VVTK_Recorder.cxx
@@ -51,7 +51,7 @@
 #include <QFileInfo>
 #include <QDir>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/VVTK/VVTK_RecorderDlg.cxx b/src/VVTK/VVTK_RecorderDlg.cxx
index 5b68652d..026877f3 100644
--- a/src/VVTK/VVTK_RecorderDlg.cxx
+++ b/src/VVTK/VVTK_RecorderDlg.cxx
@@ -27,17 +27,17 @@
 #include "VVTK_RecorderDlg.h"
 #include "VVTK_Recorder.h"
 
-#include "SUIT_FileDlg.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_FileDlg.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include "QtxDoubleSpinBox.h"
-#include "QtxIntSpinBox.h"
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
 
-#include "LightApp_Application.h"
+#include <gui/LightApp_Application.h>
 
-#include "CAM_Module.h"
+#include <gui/CAM_Module.h>
 
 #include <QCheckBox>
 #include <QComboBox>
diff --git a/src/VVTK/VVTK_Renderer.cxx b/src/VVTK/VVTK_Renderer.cxx
index 23cc1c54..b60977fe 100644
--- a/src/VVTK/VVTK_Renderer.cxx
+++ b/src/VVTK/VVTK_Renderer.cxx
@@ -33,7 +33,7 @@
 #include "VISU_PlanesWidget.hxx"
 #include "VISU_SphereWidget.hxx"
 
-#include <VTKViewer_Algorithm.h>
+#include <gui/VTKViewer_Algorithm.h>
 
 #include <vtkObjectFactory.h>
 #include <vtkProperty.h>
@@ -66,7 +66,7 @@
 #include <vtkTextProperty.h>
 #include <vtkRenderer.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #ifdef _DEBUG_
 static int MYDEBUG = 0;
diff --git a/src/VVTK/VVTK_Renderer.h b/src/VVTK/VVTK_Renderer.h
index ae558db2..660ad835 100644
--- a/src/VVTK/VVTK_Renderer.h
+++ b/src/VVTK/VVTK_Renderer.h
@@ -30,7 +30,7 @@
 
 #include "VVTK.h"
 
-#include "SVTK_Renderer.h"
+#include <gui/SVTK_Renderer.h>
 
 class VISU_WidgetCtrl;
 class VISU_InsideCursorSettings;
diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.cxx b/src/VVTK/VVTK_SegmentationCursorDlg.cxx
index 5b927c7e..1f2108e2 100644
--- a/src/VVTK/VVTK_SegmentationCursorDlg.cxx
+++ b/src/VVTK/VVTK_SegmentationCursorDlg.cxx
@@ -37,13 +37,13 @@
 #include "VISU_GaussPointsPL.hxx"
 #include "VISU_OpenGLPointSpriteMapper.hxx"
 
-#include <LightApp_Application.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
+#include <gui/LightApp_Application.h>
+#include <gui/SUIT_MessageBox.h>
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include <SVTK_RenderWindowInteractor.h>
-#include <VTKViewer_Algorithm.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
+#include <gui/VTKViewer_Algorithm.h>
 
 #include <vtkActorCollection.h>
 #include <vtkCallbackCommand.h>
@@ -53,7 +53,7 @@
 #include <vtkSmartPointer.h>
 #include <vtkImageData.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include <QButtonGroup>
 #include <QColorDialog>
@@ -67,10 +67,10 @@
 #include <QRadioButton>
 #include <QTabWidget>
 
-#include <QtxAction.h>
-#include <QtxDoubleSpinBox.h>
-#include <QtxIntSpinBox.h>
-#include <CAM_Module.h>
+#include <gui/QtxAction.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/CAM_Module.h>
 
 //----------------------------------------------------------------
 VVTK_SegmentationCursorDlg::VVTK_SegmentationCursorDlg( QWidget* parent, const char* name )
diff --git a/src/VVTK/VVTK_SizeBox.cxx b/src/VVTK/VVTK_SizeBox.cxx
index 7d040131..27a4872b 100644
--- a/src/VVTK/VVTK_SizeBox.cxx
+++ b/src/VVTK/VVTK_SizeBox.cxx
@@ -26,12 +26,12 @@
 //
 #include "VVTK_SizeBox.h"
 
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
+#include <gui/SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
 
-#include <QtxDoubleSpinBox.h>
-#include <QtxIntSpinBox.h>
-#include <QtxColorButton.h>
+#include <gui/QtxDoubleSpinBox.h>
+#include <gui/QtxIntSpinBox.h>
+#include <gui/QtxColorButton.h>
 
 #include <QLayout>
 #include <QLabel>
diff --git a/src/VVTK/VVTK_ViewManager.cxx b/src/VVTK/VVTK_ViewManager.cxx
index 2c9f8512..a1feabf8 100644
--- a/src/VVTK/VVTK_ViewManager.cxx
+++ b/src/VVTK/VVTK_ViewManager.cxx
@@ -22,7 +22,7 @@
 #include "VVTK_ViewManager.h"
 #include "VVTK_ViewModel.h"
 
-#include <SUIT_ViewWindow.h>
+#include <gui/SUIT_ViewWindow.h>
 
 int VVTK_ViewManager::_VVTKViewMgr_Id = 0;
 
diff --git a/src/VVTK/VVTK_ViewManager.h b/src/VVTK/VVTK_ViewManager.h
index 5bc84e43..630aa6f7 100644
--- a/src/VVTK/VVTK_ViewManager.h
+++ b/src/VVTK/VVTK_ViewManager.h
@@ -22,7 +22,7 @@
 #ifndef VVTK_VIEWMANAGER_H
 #define VVTK_VIEWMANAGER_H
 
-#include "SVTK_ViewManager.h"
+#include <gui/SVTK_ViewManager.h>
 #include "VVTK.h"
 
 class SUIT_Desktop;
diff --git a/src/VVTK/VVTK_ViewModel.cxx b/src/VVTK/VVTK_ViewModel.cxx
index a06b2ca3..92cb2531 100644
--- a/src/VVTK/VVTK_ViewModel.cxx
+++ b/src/VVTK/VVTK_ViewModel.cxx
@@ -23,13 +23,13 @@
 #include "VISU_ActorFactory.h"
 #include "VVTK_ViewWindow.h"
 
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
+#include <gui/VTKViewer_Algorithm.h>
+#include <gui/SVTK_Functor.h>
 #include "VISU_ActorBase.h"
-#include "SVTK_View.h"
-#include "SVTK_Prs.h"
+#include <gui/SVTK_View.h>
+#include <gui/SVTK_Prs.h>
 
-#include <SUIT_ViewManager.h>
+#include <gui/SUIT_ViewManager.h>
 
 #include <vtkActorCollection.h>
 #include <vtkRenderer.h>
diff --git a/src/VVTK/VVTK_ViewModel.h b/src/VVTK/VVTK_ViewModel.h
index 7cfb87c3..877e5da0 100644
--- a/src/VVTK/VVTK_ViewModel.h
+++ b/src/VVTK/VVTK_ViewModel.h
@@ -25,7 +25,7 @@
 #include <QColor>
 
 #include "VVTK.h"
-#include "SVTK_ViewModel.h"
+#include <gui/SVTK_ViewModel.h>
 
 class VVTK_ViewWindow;
 
diff --git a/src/VVTK/VVTK_ViewWindow.cxx b/src/VVTK/VVTK_ViewWindow.cxx
index 1d5be16b..7297982e 100755
--- a/src/VVTK/VVTK_ViewWindow.cxx
+++ b/src/VVTK/VVTK_ViewWindow.cxx
@@ -28,15 +28,15 @@
 #include "VVTK_ViewWindow.h"
 #include "VVTK_ViewModel.h"
 #include "VVTK_MainWindow.h"
-#include "SVTK_View.h"
+#include <gui/SVTK_View.h>
 
-#include "SUIT_Session.h"
+#include <gui/SUIT_Session.h>
 
 #include "VVTK_Renderer.h"
-#include "SVTK_Selector.h"
-#include "SVTK_InteractorStyle.h"
-#include "SVTK_RenderWindowInteractor.h"
-#include "SVTK_GenericRenderWindowInteractor.h"
+#include <gui/SVTK_Selector.h>
+#include <gui/SVTK_InteractorStyle.h>
+#include <gui/SVTK_RenderWindowInteractor.h>
+#include <gui/SVTK_GenericRenderWindowInteractor.h>
 
 #include <vtkRenderWindow.h>
 
diff --git a/src/VVTK/VVTK_ViewWindow.h b/src/VVTK/VVTK_ViewWindow.h
index bedf4b44..c992b245 100755
--- a/src/VVTK/VVTK_ViewWindow.h
+++ b/src/VVTK/VVTK_ViewWindow.h
@@ -27,7 +27,7 @@
 #endif
 
 #include "VVTK.h"
-#include "SVTK_ViewWindow.h"
+#include <gui/SVTK_ViewWindow.h>
 
 #include <QImage>