From: adv <adv@opencascade.com>
Date: Wed, 17 Feb 2010 10:34:38 +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=f8ab164744df203a8a19f55696ce27b81c2ade89;p=modules%2Fgui.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_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4
index 931449768..86876d4ab 100755
--- a/adm_local/unix/config_files/check_GUI.m4
+++ b/adm_local/unix/config_files/check_GUI.m4
@@ -74,7 +74,7 @@ else
     GUI_ROOT_DIR=${SALOME_GUI_DIR}
 
     GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-    GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome
+    GUI_CXXFLAGS="-I${SALOME_GUI_DIR}/include/salome -I${SALOME_GUI_DIR}/include/salome/skel"
 
     AC_CHECKING(for full GUI)
     if test -f ${SALOME_GUI_DIR}/bin/salome/SALOME_Session_Server ; then
diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 1911a0339..fe23431bc 100644
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -34,7 +34,8 @@ AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
 # ============================================================
 # Standard directory for installation
 #
-salomeincludedir   = $(includedir)/salome
+salomeincludedir   = $(includedir)/salome/@MODULE_NAME@
+salomeskeldir      = $(includedir)/salome/skel
 libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
 bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)
diff --git a/idl/Makefile.am b/idl/Makefile.am
index c234fd06e..0505b25a3 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLGUI.la
 nodist_libSalomeIDLGUI_la_SOURCES = SalomeApp_EngineSK.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)
 
 libSalomeIDLGUI_la_CPPFLAGS = \
 	-I$(top_builddir)/idl \
diff --git a/src/CAF/CAF_Tools.h b/src/CAF/CAF_Tools.h
index 2674afeb5..66b3ac6d4 100755
--- a/src/CAF/CAF_Tools.h
+++ b/src/CAF/CAF_Tools.h
@@ -27,7 +27,7 @@
 
 #include "CAF.h"
 
-#include <SUIT_Tools.h>
+#include "SUIT_Tools.h"
 
 #include <QColor>
 
diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index 14dc92813..e4e90481e 100755
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.h
@@ -24,7 +24,7 @@
 
 #include "CAM.h"
 
-#include <STD_Application.h>
+#include "STD_Application.h"
 #include <QList>
 
 class QMenu;
diff --git a/src/CAM/CAM_DataObject.h b/src/CAM/CAM_DataObject.h
index a2f9aae40..6e49edf1e 100755
--- a/src/CAM/CAM_DataObject.h
+++ b/src/CAM/CAM_DataObject.h
@@ -24,7 +24,7 @@
 
 #include "CAM.h"
 
-#include <SUIT_DataObject.h>
+#include "SUIT_DataObject.h"
 
 class CAM_Module;
 class CAM_DataModel;
diff --git a/src/CAM/CAM_Study.h b/src/CAM/CAM_Study.h
index a90d0e5c5..eeecc2793 100755
--- a/src/CAM/CAM_Study.h
+++ b/src/CAM/CAM_Study.h
@@ -24,7 +24,7 @@
 
 #include "CAM.h"
 
-#include <SUIT_Study.h>
+#include "SUIT_Study.h"
 #include <QList>
 
 class CAM_DataModel;
diff --git a/src/GLViewer/GLViewer_ToolTip.h b/src/GLViewer/GLViewer_ToolTip.h
index fc81dfe27..b40603a4c 100644
--- a/src/GLViewer/GLViewer_ToolTip.h
+++ b/src/GLViewer/GLViewer_ToolTip.h
@@ -29,7 +29,7 @@
 #include "GLViewer.h"
 
 //#include <qtooltip.h>
-//#include <QtxToolTip.h>
+//#include "QtxToolTip.h"
 #include <QObject>
 #include <QPoint>
 
diff --git a/src/GLViewer/GLViewer_ViewFrame.h b/src/GLViewer/GLViewer_ViewFrame.h
index 86cb9ccf7..5fe060adb 100644
--- a/src/GLViewer/GLViewer_ViewFrame.h
+++ b/src/GLViewer/GLViewer_ViewFrame.h
@@ -36,7 +36,7 @@ class SUIT_Desktop;
 class GLViewer_Viewer;
 class GLViewer_ViewPort;
 
-#include <QtxAction.h>
+#include "QtxAction.h"
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
diff --git a/src/GLViewer/GLViewer_Viewer.h b/src/GLViewer/GLViewer_Viewer.h
index c6626f622..306368528 100644
--- a/src/GLViewer/GLViewer_Viewer.h
+++ b/src/GLViewer/GLViewer_Viewer.h
@@ -28,7 +28,7 @@
 
 #include "GLViewer.h"
 #include "GLViewer_Defs.h"
-#include <SUIT_ViewModel.h>
+#include "SUIT_ViewModel.h"
 
 #include <QCursor>
 #include <QObject>
diff --git a/src/LightApp/LightApp_AboutDlg.h b/src/LightApp/LightApp_AboutDlg.h
index 71216a37e..18a52997c 100644
--- a/src/LightApp/LightApp_AboutDlg.h
+++ b/src/LightApp/LightApp_AboutDlg.h
@@ -28,7 +28,7 @@
 
 #include "LightApp.h"
 
-#include <QtxDialog.h>
+#include "QtxDialog.h"
 
 class QLabel;
 
diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 02a85782a..8a9da8c42 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -161,7 +161,7 @@
 #include <QProcess>
 #include <QTimer>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #define FIRST_HELP_ID 1000000
 
diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 27d0852af..6d9fae10c 100644
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -31,7 +31,7 @@
 #endif // _MSC_VER > 1000
 
 #include "LightApp.h"
-#include <CAM_Application.h>
+#include "CAM_Application.h"
 
 #include <QPointer>
 
diff --git a/src/LightApp/LightApp_DataObject.h b/src/LightApp/LightApp_DataObject.h
index 94b4b838b..9d693589d 100644
--- a/src/LightApp/LightApp_DataObject.h
+++ b/src/LightApp/LightApp_DataObject.h
@@ -26,7 +26,7 @@
 #define LIGHTAPP_DATAOBJECT_H
 
 #include "LightApp.h"
-#include <CAM_DataObject.h>
+#include "CAM_DataObject.h"
 
 class CAM_DataModel;
 class LightApp_Study;
diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h
index e7bd0db0d..d2ab47ef4 100644
--- a/src/LightApp/LightApp_Dialog.h
+++ b/src/LightApp/LightApp_Dialog.h
@@ -26,7 +26,7 @@
 #define LIGHTAPP_DIALOG_H
 
 #include "LightApp.h"
-#include <QtxDialog.h>
+#include "QtxDialog.h"
 
 #include <QList>
 #include <QMap>
diff --git a/src/LightApp/LightApp_Displayer.h b/src/LightApp/LightApp_Displayer.h
index 4e3544f2a..1e29b89ce 100644
--- a/src/LightApp/LightApp_Displayer.h
+++ b/src/LightApp/LightApp_Displayer.h
@@ -24,7 +24,7 @@
 
 #include "LightApp.h"
 
-#include <SALOME_Prs.h>
+#include "SALOME_Prs.h"
 
 class QString;
 
diff --git a/src/LightApp/LightApp_GLSelector.h b/src/LightApp/LightApp_GLSelector.h
index 45260e314..27e2dcd6d 100644
--- a/src/LightApp/LightApp_GLSelector.h
+++ b/src/LightApp/LightApp_GLSelector.h
@@ -24,9 +24,9 @@
 
 #include "LightApp.h"
 
-#include <SUIT_Selector.h>
+#include "SUIT_Selector.h"
 
-#include <GLViewer_Viewer2d.h>
+#include "GLViewer_Viewer2d.h"
 
 #include <QObject>
 
diff --git a/src/LightApp/LightApp_HDFDriver.cxx b/src/LightApp/LightApp_HDFDriver.cxx
index 168f18013..8fdf8bc58 100644
--- a/src/LightApp/LightApp_HDFDriver.cxx
+++ b/src/LightApp/LightApp_HDFDriver.cxx
@@ -21,7 +21,7 @@
 //
 #include "LightApp_HDFDriver.h"
 
-#include "HDFOI.hxx"
+#include "kernel/HDFOI.hxx"
 
 // OCCT Includes
 #include <TCollection_AsciiString.hxx>
diff --git a/src/LightApp/LightApp_Module.h b/src/LightApp/LightApp_Module.h
index c608497e5..5a81044fb 100644
--- a/src/LightApp/LightApp_Module.h
+++ b/src/LightApp/LightApp_Module.h
@@ -28,7 +28,7 @@
 
 #include "LightApp.h"
 #include "LightApp_Preferences.h"
-#include <CAM_Module.h>
+#include "CAM_Module.h"
 
 class LightApp_Application;
 class LightApp_Selection;
diff --git a/src/LightApp/LightApp_ModuleAction.h b/src/LightApp/LightApp_ModuleAction.h
index 4be268dec..7a3859292 100755
--- a/src/LightApp/LightApp_ModuleAction.h
+++ b/src/LightApp/LightApp_ModuleAction.h
@@ -27,7 +27,7 @@
 
 #include "LightApp.h"
 
-#include <QtxAction.h>
+#include "QtxAction.h"
 
 #ifdef WIN32
 #pragma warning ( disable:4251 )
diff --git a/src/LightApp/LightApp_OBSelector.h b/src/LightApp/LightApp_OBSelector.h
index 742633565..73a2d0955 100644
--- a/src/LightApp/LightApp_OBSelector.h
+++ b/src/LightApp/LightApp_OBSelector.h
@@ -27,8 +27,8 @@
 
 #include "LightApp.h"
 
-#include <SUIT_Selector.h>
-#include <SUIT_DataOwner.h>
+#include "SUIT_Selector.h"
+#include "SUIT_DataOwner.h"
 
 #include <QObject>
 
diff --git a/src/LightApp/LightApp_OCCSelector.h b/src/LightApp/LightApp_OCCSelector.h
index d266c7f50..8dc11a39c 100644
--- a/src/LightApp/LightApp_OCCSelector.h
+++ b/src/LightApp/LightApp_OCCSelector.h
@@ -24,13 +24,13 @@
 
 #include "LightApp.h"
 
-#include <SUIT_Selector.h>
-#include <SUIT_DataOwner.h>
+#include "SUIT_Selector.h"
+#include "SUIT_DataOwner.h"
 
 #include <QObject>
 
 #ifndef DISABLE_OCCVIEWER
-#include <OCCViewer_ViewModel.h>
+#include "OCCViewer_ViewModel.h"
 
 class Handle_AIS_InteractiveObject;
 #endif
diff --git a/src/LightApp/LightApp_Operation.h b/src/LightApp/LightApp_Operation.h
index c48787502..ccc5d3f70 100755
--- a/src/LightApp/LightApp_Operation.h
+++ b/src/LightApp/LightApp_Operation.h
@@ -27,7 +27,7 @@
 #define LightApp_Operation_H
 
 #include "LightApp.h"
-#include <SUIT_Operation.h>
+#include "SUIT_Operation.h"
 
 class LightApp_Module;
 class LightApp_SelectionMgr;
diff --git a/src/LightApp/LightApp_Plot2dSelector.h b/src/LightApp/LightApp_Plot2dSelector.h
index b9ba299a3..676c45dae 100755
--- a/src/LightApp/LightApp_Plot2dSelector.h
+++ b/src/LightApp/LightApp_Plot2dSelector.h
@@ -24,9 +24,9 @@
 
 #include "LightApp.h"
 
-#include <SUIT_Selector.h>
-#include <SUIT_DataOwner.h>
-#include <SPlot2d_ViewModel.h>
+#include "SUIT_Selector.h"
+#include "SUIT_DataOwner.h"
+#include "SPlot2d_ViewModel.h"
 
 class LightApp_DataObject;
 
diff --git a/src/LightApp/LightApp_Preferences.h b/src/LightApp/LightApp_Preferences.h
index 8ab8fbd82..ed71cb235 100644
--- a/src/LightApp/LightApp_Preferences.h
+++ b/src/LightApp/LightApp_Preferences.h
@@ -26,7 +26,7 @@
 #define LIGHTAPP_PREFERENCES_H
 
 #include "LightApp.h"
-#include <SUIT_PreferenceMgr.h>
+#include "SUIT_PreferenceMgr.h"
 
 #include <QMap>
 
diff --git a/src/LightApp/LightApp_PreferencesDlg.h b/src/LightApp/LightApp_PreferencesDlg.h
index 64299c972..7a257a7c2 100644
--- a/src/LightApp/LightApp_PreferencesDlg.h
+++ b/src/LightApp/LightApp_PreferencesDlg.h
@@ -27,7 +27,7 @@
 
 #include "LightApp.h"
 
-#include <QtxDialog.h>
+#include "QtxDialog.h"
 
 class LightApp_Preferences;
 
diff --git a/src/LightApp/LightApp_Selection.h b/src/LightApp/LightApp_Selection.h
index 5e2e17a19..25fddc635 100644
--- a/src/LightApp/LightApp_Selection.h
+++ b/src/LightApp/LightApp_Selection.h
@@ -29,7 +29,7 @@
 #define LIGHTAPP_SELECTION_HeaderFile
 
 #include "LightApp.h"
-#include <QtxPopupMgr.h>
+#include "QtxPopupMgr.h"
 
 class LightApp_SelectionMgr;
 class LightApp_DataOwner;
diff --git a/src/LightApp/LightApp_SelectionMgr.h b/src/LightApp/LightApp_SelectionMgr.h
index 9a6b11804..d68089cfe 100644
--- a/src/LightApp/LightApp_SelectionMgr.h
+++ b/src/LightApp/LightApp_SelectionMgr.h
@@ -24,10 +24,10 @@
 
 #include "LightApp.h"
 
-#include <SUIT_SelectionMgr.h>
+#include "SUIT_SelectionMgr.h"
 
 #ifndef DISABLE_SALOMEOBJECT
-  #include <SALOME_InteractiveObject.hxx>
+  #include "SALOME_InteractiveObject.hxx"
   #include <QMap>
   #include <NCollection_DataMap.hxx>
 
diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h
index d47e7c054..5081f8f19 100644
--- a/src/LightApp/LightApp_Study.h
+++ b/src/LightApp/LightApp_Study.h
@@ -25,7 +25,7 @@
 #include "LightApp.h"
 #include "LightApp_Driver.h"
 
-#include <CAM_Study.h>
+#include "CAM_Study.h"
 
 #include "string"
 #include "vector"
diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h
index f552a4229..40d2e817a 100755
--- a/src/LogWindow/LogWindow.h
+++ b/src/LogWindow/LogWindow.h
@@ -36,7 +36,7 @@
 #  define LOGWINDOW_EXPORT
 #endif
 
-#include <SUIT_PopupClient.h>
+#include "SUIT_PopupClient.h"
 
 #include <QWidget>
 #include <QMap>
diff --git a/src/OBJECT/SALOME_AISObject.hxx b/src/OBJECT/SALOME_AISObject.hxx
index b94df74c8..ac5cb380f 100755
--- a/src/OBJECT/SALOME_AISObject.hxx
+++ b/src/OBJECT/SALOME_AISObject.hxx
@@ -37,7 +37,7 @@
 #include <AIS_InteractiveObject.hxx>
 #endif
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include <Handle_SALOME_InteractiveObject.hxx>
+#include "Handle_SALOME_InteractiveObject.hxx"
 #endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
diff --git a/src/OBJECT/SALOME_AISShape.hxx b/src/OBJECT/SALOME_AISShape.hxx
index 9d5cc5a24..6dd577210 100755
--- a/src/OBJECT/SALOME_AISShape.hxx
+++ b/src/OBJECT/SALOME_AISShape.hxx
@@ -37,7 +37,7 @@
 #include <Standard_CString.hxx>
 #endif
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include <Handle_SALOME_InteractiveObject.hxx>
+#include "Handle_SALOME_InteractiveObject.hxx"
 #endif
 #ifndef _AIS_Shape_HeaderFile
 #include <AIS_Shape.hxx>
diff --git a/src/OBJECT/SALOME_TypeFilter.hxx b/src/OBJECT/SALOME_TypeFilter.hxx
index b4304ce89..4d7e26e36 100644
--- a/src/OBJECT/SALOME_TypeFilter.hxx
+++ b/src/OBJECT/SALOME_TypeFilter.hxx
@@ -43,7 +43,7 @@
 #include <Standard_Boolean.hxx>
 #endif
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include <Handle_SALOME_InteractiveObject.hxx>
+#include "Handle_SALOME_InteractiveObject.hxx"
 #endif
 
 class SALOME_TypeFilter : public SALOME_Filter {
diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
index bc67b5468..c5431d76b 100755
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
@@ -27,8 +27,8 @@
 #include "OCCViewer_ViewModel.h"
 #include "OCCViewer_ViewWindow.h"
 
-#include <QtxDialog.h>
-#include <SUIT_Application.h>
+#include "QtxDialog.h"
+#include "SUIT_Application.h"
 
 #include <QDialog>
 #include <QListWidget>
diff --git a/src/OCCViewer/OCCViewer_ToolTip.h b/src/OCCViewer/OCCViewer_ToolTip.h
index 5ff60c81c..731c98d93 100644
--- a/src/OCCViewer/OCCViewer_ToolTip.h
+++ b/src/OCCViewer/OCCViewer_ToolTip.h
@@ -23,7 +23,7 @@
 #define OCCVIEWER_TOOLTIP_H
 
 #include "OCCViewer.h"
-#include <QtxToolTip.h>
+#include "QtxToolTip.h"
 #include <QFont>
 
 class OCCViewer_ViewWindow;
diff --git a/src/Plot2d/Plot2d_ToolTip.h b/src/Plot2d/Plot2d_ToolTip.h
index 95afdf432..10ebd71f8 100644
--- a/src/Plot2d/Plot2d_ToolTip.h
+++ b/src/Plot2d/Plot2d_ToolTip.h
@@ -26,7 +26,7 @@
 #define PLOT2D_TOOLTIP_H
 
 #include "Plot2d.h"
-#include <QtxToolTip.h>
+#include "QtxToolTip.h"
 
 class Plot2d_ViewFrame;
 class Plot2d_Plot2d;
diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h
index bd3c15dcb..3dbc0d0df 100755
--- a/src/Plot2d/Plot2d_ViewWindow.h
+++ b/src/Plot2d/Plot2d_ViewWindow.h
@@ -26,7 +26,7 @@
 #define PLOT2D_VIEWWINDOW_H
 
 #include "Plot2d.h"
-#include <SUIT_ViewWindow.h>
+#include "SUIT_ViewWindow.h"
 #include <QMap>
 
 
diff --git a/src/PyConsole/PyConsole_Console.h b/src/PyConsole/PyConsole_Console.h
index 790450c61..5460282d8 100644
--- a/src/PyConsole/PyConsole_Console.h
+++ b/src/PyConsole/PyConsole_Console.h
@@ -27,7 +27,7 @@
 
 #include "PyConsole.h"
 
-#include <SUIT_PopupClient.h>
+#include "SUIT_PopupClient.h"
 #include <QWidget>
 #include <QMap>
 
diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index 8bc0f1c58..aabaa2dc7 100644
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.h
@@ -28,7 +28,7 @@
 #include <QPixmap>
 #include <QStringList>
 
-#include <Qtx.h>
+#include "Qtx.h"
 
 class QtxComboBox;
 
diff --git a/src/QDS/QDS_Datum.h b/src/QDS/QDS_Datum.h
index e438a4e17..ecfcd428b 100644
--- a/src/QDS/QDS_Datum.h
+++ b/src/QDS/QDS_Datum.h
@@ -32,7 +32,7 @@ class QVBoxLayout;
 class QGridLayout;
 class QValidator;
 
-#include <DDS_DicItem.h>
+#include "DDS_DicItem.h"
 
 class QWidget;
 
diff --git a/src/QDS/QDS_RadioBox.h b/src/QDS/QDS_RadioBox.h
index 0d667d45c..1f64dcaaf 100644
--- a/src/QDS/QDS_RadioBox.h
+++ b/src/QDS/QDS_RadioBox.h
@@ -24,7 +24,7 @@
 
 #include "QDS_Datum.h"
 
-#include <Qtx.h>
+#include "Qtx.h"
 
 #include <QMap>
 #include <QStringList>
diff --git a/src/QDS/QDS_Table.h b/src/QDS/QDS_Table.h
index 9384371aa..137f827bb 100644
--- a/src/QDS/QDS_Table.h
+++ b/src/QDS/QDS_Table.h
@@ -24,7 +24,7 @@
 
 #include "QDS_Datum.h"
 
-#include <QtxTable.h>
+#include "QtxTable.h"
 
 #include <QMap>
 #include <QVector>
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index 10d777ce2..7ae9e597b 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
@@ -29,8 +29,8 @@
 #include "SalomeApp_Application.h"
 #include "SALOME_PYQT_ModuleLight.h"
 
-#include <SALOME_LifeCycleCORBA.hxx>
-#include <Container_init_python.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Container_init_python.hxx>
 #include <CORBA.h>
 
 
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
index 614dfba64..8690b287b 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
@@ -27,7 +27,7 @@
 #include "SALOME_PYQT_DataModelLight.h" 
 #include "SALOME_PYQT_DataObjectLight.h"
 #include "SALOME_PYQT_ModuleLight.h"
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <LightApp_Study.h>
 #include <CAM_Module.h>
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
index 275c084d4..a48632abc 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
@@ -26,9 +26,9 @@
 #define SALOME_PYQT_DATAMODELLIGHT_H
 
 #include "SALOME_PYQT_GUILight.h"
-#include <LightApp_DataModel.h>
+#include "LightApp_DataModel.h"
 
-#include <CAM_Module.h>
+#include "CAM_Module.h"
 #include "SALOME_PYQT_DataObjectLight.h"
 
 class SALOME_PYQT_RootObjectLight;
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx
index 9e0ef56d6..121e9a25e 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx
@@ -26,7 +26,7 @@
 #include "SALOME_PYQT_DataObjectLight.h"
 #include <LightApp_Application.h>
 #include <SUIT_Session.h>
-#include <utilities.h>
+#include <kernel/utilities.h>
 #include <SUIT_ResourceMgr.h>
 
 
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
index a99e0212a..979efe5f4 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
@@ -28,8 +28,8 @@
 
 
 #include "SALOME_PYQT_GUILight.h"
-#include <LightApp_DataObject.h>
-#include <LightApp_Study.h>
+#include "LightApp_DataObject.h"
+#include "LightApp_Study.h"
 
 #include <qstring.h>
 
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
index b9e9bed8d..5a85c726e 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
@@ -34,7 +34,7 @@
 #include "SALOME_PYQT_DataModelLight.h"
 
 #ifndef GUI_DISABLE_CORBA
-#include <Container_init_python.hxx>
+#include <kernel/Container_init_python.hxx>
 #endif
 
 #include <SUIT_ResourceMgr.h>
@@ -71,7 +71,7 @@
 #include "sipQtGuiQMenu.h"
 #endif
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 /*!
   \brief Default name of the module, replaced at the moment
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
index 6326e1df8..5339b4738 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
@@ -30,7 +30,7 @@
 #include "SALOME_PYQT_GUILight.h"
 #include "LightApp_Module.h"
 #include "SALOME_PYQT_DataObjectLight.h"
-#include <CAM_Module.h>
+#include "CAM_Module.h"
 
 #include <map>
 #include <QStringList>
diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx
index eac78e7ea..25a2d9099 100644
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx
@@ -3,10 +3,10 @@
 
 #include <SUITApp_init_python.hxx>
 #include <PyInterp_Interp.h>
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #ifndef GUI_DISABLE_CORBA
-#include <Container_init_python.hxx>
+#include <kernel/Container_init_python.hxx>
 #endif
 
 
diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 0818fe7cf..6a1d5c33d 100644
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
@@ -29,8 +29,8 @@
 #include <QString>
 #include <QColor>
 
-#include <LightApp_Application.h>
-#include <LightApp_Preferences.h>
+#include "LightApp_Application.h"
+#include "LightApp_Preferences.h"
 
 class LightApp_SelectionMgr;
 class LightApp_Application;
diff --git a/src/SOCC/SOCC_Prs.h b/src/SOCC/SOCC_Prs.h
index 007a68f90..9fdd118ec 100644
--- a/src/SOCC/SOCC_Prs.h
+++ b/src/SOCC/SOCC_Prs.h
@@ -30,7 +30,7 @@
 
 #include "SOCC.h"
 
-#include <SALOME_Prs.h>
+#include "SALOME_Prs.h"
 
 #include <AIS_ListOfInteractive.hxx>
 
diff --git a/src/SPlot2d/SPlot2d_Curve.h b/src/SPlot2d/SPlot2d_Curve.h
index 444fddda7..0dc4a734d 100644
--- a/src/SPlot2d/SPlot2d_Curve.h
+++ b/src/SPlot2d/SPlot2d_Curve.h
@@ -31,7 +31,7 @@
 #include "Plot2d_Curve.h"
 
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile
-#include <Handle_SALOME_InteractiveObject.hxx>
+#include "Handle_SALOME_InteractiveObject.hxx"
 #endif
 #include "SALOME_InteractiveObject.hxx"
 
diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 6f8fc68fb..15be521fe 100755
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.h
@@ -24,7 +24,7 @@
 
 #include "STD.h"
 
-#include <SUIT_Application.h>
+#include "SUIT_Application.h"
 
 #include <QList>
 
diff --git a/src/STD/STD_MDIDesktop.h b/src/STD/STD_MDIDesktop.h
index a229ab713..c03e91f32 100755
--- a/src/STD/STD_MDIDesktop.h
+++ b/src/STD/STD_MDIDesktop.h
@@ -24,7 +24,7 @@
 
 #include "STD.h"
 
-#include <SUIT_Desktop.h>
+#include "SUIT_Desktop.h"
 
 class QtxWorkspace;
 class QtxWorkspaceAction;
diff --git a/src/STD/STD_SDIDesktop.h b/src/STD/STD_SDIDesktop.h
index d5e17e891..e6883f2f1 100755
--- a/src/STD/STD_SDIDesktop.h
+++ b/src/STD/STD_SDIDesktop.h
@@ -24,7 +24,7 @@
 
 #include "STD.h"
 
-#include <SUIT_Desktop.h>
+#include "SUIT_Desktop.h"
 
 class QFrame;
 
diff --git a/src/STD/STD_TabDesktop.h b/src/STD/STD_TabDesktop.h
index 57d5195ad..5673f8bdd 100644
--- a/src/STD/STD_TabDesktop.h
+++ b/src/STD/STD_TabDesktop.h
@@ -24,7 +24,7 @@
 
 #include "STD.h"
 
-#include <SUIT_Desktop.h>
+#include "SUIT_Desktop.h"
 
 class QtxWorkstack;
 class QtxWorkstackAction;
diff --git a/src/SUIT/SUIT_DataBrowser.h b/src/SUIT/SUIT_DataBrowser.h
index f619e4ff3..16b32f454 100644
--- a/src/SUIT/SUIT_DataBrowser.h
+++ b/src/SUIT/SUIT_DataBrowser.h
@@ -28,7 +28,7 @@
 #include "SUIT.h"
 #include "SUIT_PopupClient.h"
 #include "SUIT_DataObject.h"
-#include <OB_Browser.h>
+#include "OB_Browser.h"
 
 class QShortcut;
 
diff --git a/src/SUIT/SUIT_Desktop.h b/src/SUIT/SUIT_Desktop.h
index ad49bd55e..44f877562 100755
--- a/src/SUIT/SUIT_Desktop.h
+++ b/src/SUIT/SUIT_Desktop.h
@@ -27,7 +27,7 @@
 #include <QList>
 #include <QEvent>
 
-#include <QtxMainWindow.h>
+#include "QtxMainWindow.h"
 
 class QMovie;
 
diff --git a/src/SUIT/SUIT_ResourceMgr.h b/src/SUIT/SUIT_ResourceMgr.h
index e0ff7ce17..b2159089b 100755
--- a/src/SUIT/SUIT_ResourceMgr.h
+++ b/src/SUIT/SUIT_ResourceMgr.h
@@ -24,7 +24,7 @@
 
 #include "SUIT.h"
 
-#include <QtxResourceMgr.h>
+#include "QtxResourceMgr.h"
 
 class SUIT_EXPORT SUIT_ResourceMgr : public QtxResourceMgr
 {
diff --git a/src/SUIT/SUIT_Tools.h b/src/SUIT/SUIT_Tools.h
index ec2527826..e34c6bc16 100755
--- a/src/SUIT/SUIT_Tools.h
+++ b/src/SUIT/SUIT_Tools.h
@@ -24,7 +24,7 @@
 
 #include "SUIT.h"
 
-#include <Qtx.h>
+#include "Qtx.h"
 
 #include <QRect>
 #include <QString>
diff --git a/src/SUIT/SUIT_TreeModel.h b/src/SUIT/SUIT_TreeModel.h
index 59828481e..ec8a25000 100755
--- a/src/SUIT/SUIT_TreeModel.h
+++ b/src/SUIT/SUIT_TreeModel.h
@@ -27,7 +27,7 @@
 
 #include "SUIT.h"
 
-#include <Qtx.h>
+#include "Qtx.h"
 
 #include <QAbstractItemModel>
 #include <QSortFilterProxyModel>
diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
index 2bbf9d8d7..72faad8f6 100755
--- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
+++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
@@ -34,7 +34,7 @@
 #include "SUIT_PopupClient.h"
 #include "SUIT_ViewWindow.h"
 
-#include <QtxAction.h>
+#include "QtxAction.h"
 
 #ifdef WIN32
 #pragma warning ( disable:4251 )
diff --git a/src/SVTK/SVTK_Functor.h b/src/SVTK/SVTK_Functor.h
index 2cf0f02ce..612098555 100644
--- a/src/SVTK/SVTK_Functor.h
+++ b/src/SVTK/SVTK_Functor.h
@@ -26,7 +26,7 @@
 
 #include <string>
 
-#include <VTKViewer_Functor.h>
+#include "VTKViewer_Functor.h"
 
 #include "SALOME_InteractiveObject.hxx"
 
diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 41896b0b8..9f605a8aa 100644
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.cxx
@@ -70,9 +70,9 @@
 
 #include <PyConsole_Console.h>
 
-#include <Utils_ORB_INIT.hxx>
-#include <Utils_SINGLETON.hxx>
-#include <SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
 #include <QApplication>
 #include <QAction>
@@ -84,8 +84,8 @@
 #include <QGridLayout>
 #include <QMenu>
 
-#include <SALOMEDSClient_ClientFactory.hxx>
-#include <Basics_Utils.hxx>
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <SALOME_ListIteratorOfListIO.hxx>
 #include <SALOME_ListIO.hxx>
diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index 57c3f87f7..d85f14de9 100644
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.h
@@ -31,15 +31,15 @@
 #endif // _MSC_VER > 1000
 
 #include "SalomeApp.h"
-#include <LightApp_Application.h>
+#include "LightApp_Application.h"
 
 #include <CORBA.h>
 
 //#include <SALOMEconfig.h>
 //#include CORBA_CLIENT_HEADER(SALOMEDS)
-#include <SALOME_NamingService.hxx>
+#include <kernel/SALOME_NamingService.hxx>
 
-#include "SALOMEDSClient.hxx"
+#include <kernel/SALOMEDSClient.hxx>
 
 class LightApp_Preferences;
 class SalomeApp_Study;
diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.h b/src/SalomeApp/SalomeApp_CheckFileDlg.h
index 74e857b6b..af73e5e36 100644
--- a/src/SalomeApp/SalomeApp_CheckFileDlg.h
+++ b/src/SalomeApp/SalomeApp_CheckFileDlg.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <SUIT_FileDlg.h>
+#include "SUIT_FileDlg.h"
 
 class QCheckBox;
 
diff --git a/src/SalomeApp/SalomeApp_DataModel.h b/src/SalomeApp/SalomeApp_DataModel.h
index 53b2f701c..89870dc01 100644
--- a/src/SalomeApp/SalomeApp_DataModel.h
+++ b/src/SalomeApp/SalomeApp_DataModel.h
@@ -33,7 +33,7 @@
 #include "SalomeApp.h"
 #include "LightApp_DataModel.h"
 
-#include "SALOMEDSClient.hxx"
+#include <kernel/SALOMEDSClient.hxx>
 
 class SalomeApp_Module;
 class SalomeApp_Study;
diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index dbc07fe66..95f09b4bf 100644
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.cxx
@@ -32,8 +32,8 @@
 #include <SUIT_Application.h>
 #include <SUIT_ResourceMgr.h>
 
-#include <SALOME_LifeCycleCORBA.hxx>
-#include <Basics_Utils.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Basics_Utils.hxx>
 
 #include <QObject>
 #include <QVariant>
diff --git a/src/SalomeApp/SalomeApp_DataObject.h b/src/SalomeApp/SalomeApp_DataObject.h
index b8f4b39a1..dff9b5fa5 100644
--- a/src/SalomeApp/SalomeApp_DataObject.h
+++ b/src/SalomeApp/SalomeApp_DataObject.h
@@ -26,8 +26,8 @@
 #define SALOMEAPP_DATAOBJECT_H
 
 #include "SalomeApp.h"
-#include <LightApp_DataObject.h>
-#include <SALOMEDSClient.hxx>
+#include "LightApp_DataObject.h"
+#include <kernel/SALOMEDSClient.hxx>
 
 class SalomeApp_Study;
 
diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
index f83897839..390cfbe1c 100644
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
@@ -28,7 +28,7 @@
 
 #include <SUIT_Session.h>
 
-#include "SALOMEDSClient_ClientFactory.hxx" 
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QKeyEvent>
diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.h b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
index c5b6539ca..f185ab725 100644
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.h
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <QtxDoubleSpinBox.h>
+#include "QtxDoubleSpinBox.h"
 
 #include <QValidator>
 
diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.h b/src/SalomeApp/SalomeApp_ExceptionHandler.h
index 64a26afbe..1f705135b 100644
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.h
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <SUIT_ExceptionHandler.h>
+#include "SUIT_ExceptionHandler.h"
 
 class SALOMEAPP_EXPORT SalomeApp_ExceptionHandler : public SUIT_ExceptionHandler
 {
diff --git a/src/SalomeApp/SalomeApp_ImportOperation.h b/src/SalomeApp/SalomeApp_ImportOperation.h
index 337aa9a83..dea5e7ec3 100644
--- a/src/SalomeApp/SalomeApp_ImportOperation.h
+++ b/src/SalomeApp/SalomeApp_ImportOperation.h
@@ -32,7 +32,7 @@
 #pragma once
 #endif // _MSC_VER > 1000
 
-#include <SUIT_Operation.h>
+#include "SUIT_Operation.h"
 
 class SUIT_Application;
 
diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
index 76625adc9..fafa466c3 100644
--- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
@@ -28,7 +28,7 @@
 
 #include <SUIT_Session.h>
 
-#include "SALOMEDSClient_ClientFactory.hxx" 
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QKeyEvent>
diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.h b/src/SalomeApp/SalomeApp_IntSpinBox.h
index d15fe99c1..928a1fcfc 100644
--- a/src/SalomeApp/SalomeApp_IntSpinBox.h
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <QtxIntSpinBox.h>
+#include "QtxIntSpinBox.h"
 
 #include <QValidator>
 
diff --git a/src/SalomeApp/SalomeApp_ListView.h b/src/SalomeApp/SalomeApp_ListView.h
index ea418cad6..100eea1ff 100644
--- a/src/SalomeApp/SalomeApp_ListView.h
+++ b/src/SalomeApp/SalomeApp_ListView.h
@@ -27,7 +27,7 @@
 
 //#include <QtxListView.h>
 
-#include <SUIT_PopupClient.h>
+#include "SUIT_PopupClient.h"
 
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
diff --git a/src/SalomeApp/SalomeApp_Module.h b/src/SalomeApp/SalomeApp_Module.h
index b248966db..b3fbf2f01 100644
--- a/src/SalomeApp/SalomeApp_Module.h
+++ b/src/SalomeApp/SalomeApp_Module.h
@@ -28,7 +28,7 @@
 
 #include "SalomeApp.h"
 
-#include <LightApp_Module.h>
+#include "LightApp_Module.h"
 
 class CAM_DataModel;
 class SalomeApp_Application;
diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
index e4e4934b9..65cb60f4c 100644
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
@@ -37,7 +37,7 @@
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
 
-#include <SALOMEDS_Tool.hxx>
+#include <kernel/SALOMEDS_Tool.hxx>
 
 #include <QWidget>
 #include <QDialog>
diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.h b/src/SalomeApp/SalomeApp_NoteBookDlg.h
index 93709477c..afc3cb6d3 100644
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.h
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.h
@@ -25,7 +25,7 @@
 
 #include "SalomeApp.h"
 
-#include "SALOMEDSClient_ClientFactory.hxx" 
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
 #include <QDialog>
diff --git a/src/SalomeApp/SalomeApp_PyInterp.cxx b/src/SalomeApp/SalomeApp_PyInterp.cxx
index 51868318c..5ec530862 100755
--- a/src/SalomeApp/SalomeApp_PyInterp.cxx
+++ b/src/SalomeApp/SalomeApp_PyInterp.cxx
@@ -27,8 +27,8 @@
 //
 #include "SalomeApp_PyInterp.h"
 
-#include <utilities.h>
-#include <Container_init_python.hxx>
+#include <kernel/utilities.h>
+#include <kernel/Container_init_python.hxx>
 
 #include "PyInterp.h" // this include must be first (see PyInterp_base.h)!
 
diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 4b18f8a6c..17bf0cf91 100644
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.cxx
@@ -33,11 +33,11 @@
 
 #include <SUIT_ResourceMgr.h>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
-#include "SALOMEDS_Tool.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
 
-#include "SALOMEDSClient_ClientFactory.hxx"
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Exception)
diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h
index 217423d1a..6e791fdeb 100644
--- a/src/SalomeApp/SalomeApp_Study.h
+++ b/src/SalomeApp/SalomeApp_Study.h
@@ -24,13 +24,13 @@
 
 #include "SalomeApp.h"
 
-#include <LightApp_Study.h>
+#include "LightApp_Study.h"
 
 #ifdef WIN32
 #pragma warning( disable:4251 )
 #endif
 
-#include "SALOMEDSClient.hxx"
+#include <kernel/SALOMEDSClient.hxx>
 
 class SALOMEAPP_EXPORT SalomeApp_Study : public LightApp_Study
 {
diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
index ce56f996e..05e3395c4 100644
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
@@ -33,7 +33,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <SALOMEDSClient_Study.hxx>
+#include <kernel/SALOMEDSClient_Study.hxx>
 
 class SalomeApp_ListView;
 class QPushButton;
diff --git a/src/SalomeApp/SalomeApp_Tools.cxx b/src/SalomeApp/SalomeApp_Tools.cxx
index 80f6a9639..6e1a5f701 100644
--- a/src/SalomeApp/SalomeApp_Tools.cxx
+++ b/src/SalomeApp/SalomeApp_Tools.cxx
@@ -25,7 +25,7 @@
 #include <SUIT_Desktop.h>
 #include <SUIT_MessageBox.h>
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 
 #include <QColor>
 #include <QString>
diff --git a/src/SalomeApp/SalomeApp_Tools.h b/src/SalomeApp/SalomeApp_Tools.h
index f341a2824..87df8a2fe 100644
--- a/src/SalomeApp/SalomeApp_Tools.h
+++ b/src/SalomeApp/SalomeApp_Tools.h
@@ -24,7 +24,7 @@
 
 #include "SalomeApp.h"
 
-#include <SUIT_Tools.h>
+#include "SUIT_Tools.h"
 
 class QColor;
 class QString;
diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx
index a642bd2df..7b86aa0e5 100644
--- a/src/SalomeApp/SalomeApp_VisualState.cxx
+++ b/src/SalomeApp/SalomeApp_VisualState.cxx
@@ -36,8 +36,8 @@
 #include <QApplication>
 #include <QMultiHash>
 
-#include <SALOMEDSClient_ClientFactory.hxx>//?
-#include <SALOMEDSClient_IParameters.hxx>//?
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>//?
+#include <kernel/SALOMEDSClient_IParameters.hxx>//?
 
 #include <vector>//?
 #include <string>//?
diff --git a/src/SalomeApp/Test/TestSalomeApp.cxx b/src/SalomeApp/Test/TestSalomeApp.cxx
index bc917025c..32587cbd8 100644
--- a/src/SalomeApp/Test/TestSalomeApp.cxx
+++ b/src/SalomeApp/Test/TestSalomeApp.cxx
@@ -29,4 +29,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION( SalomeAppTest );
 
 // --- generic Main program from Basic/Test
 
-#include "BasicMainTest.hxx"
+#include "kernel/BasicMainTest.hxx"
diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index b9fdb1525..1c338a3bb 100755
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -24,15 +24,15 @@
 //  Author : Paul RASCLE, EDF
 //  Module : SALOME
 //
-#include <Container_init_python.hxx>
-#include <Utils_ORB_INIT.hxx>
-#include <Utils_SINGLETON.hxx>
-#include <SALOME_NamingService.hxx>
-#include <SALOME_ModuleCatalog_impl.hxx>
-#include <OpUtil.hxx>
-#include <RegistryService.hxx>
-#include <ConnectionManager_i.hxx>
-#include <SALOME_LifeCycleCORBA.hxx>
+#include <kernel/Container_init_python.hxx>
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_ModuleCatalog_impl.hxx>
+#include <kernel/OpUtil.hxx>
+#include <kernel/RegistryService.hxx>
+#include <kernel/ConnectionManager_i.hxx>
+#include <kernel/SALOME_LifeCycleCORBA.hxx>
 
 #ifdef ENABLE_TESTRECORDER
   #include <TestApplication.h>
@@ -46,15 +46,15 @@
 #include <QRegExp>
 #include <QTextStream>
 
-#include <Utils_SALOME_Exception.hxx>
-#include <Utils_CorbaException.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
+#include <kernel/Utils_CorbaException.hxx>
 #include <SALOME_Event.h>
 
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Session)
 #include CORBA_SERVER_HEADER(SALOMEDS)
 
-#include <utilities.h>
+#include <kernel/utilities.h>
 #include "Session_ServerLauncher.hxx"
 #include "Session_ServerCheck.hxx"
 
diff --git a/src/Session/SalomeApp_Engine_i.cxx b/src/Session/SalomeApp_Engine_i.cxx
index e861236f7..8355e8e9b 100644
--- a/src/Session/SalomeApp_Engine_i.cxx
+++ b/src/Session/SalomeApp_Engine_i.cxx
@@ -27,7 +27,7 @@
 //
 #include "SalomeApp_Engine_i.hxx"
 
-#include "SALOMEDS_Tool.hxx"
+#include <kernel/SALOMEDS_Tool.hxx>
 
 #include <iostream>
 
diff --git a/src/Session/SalomeApp_Engine_i.hxx b/src/Session/SalomeApp_Engine_i.hxx
index b338785d2..4f580bb38 100755
--- a/src/Session/SalomeApp_Engine_i.hxx
+++ b/src/Session/SalomeApp_Engine_i.hxx
@@ -30,7 +30,7 @@
 
 #include "SALOME_Session.hxx"
 
-#include "SALOME_Component_i.hxx"
+#include <kernel/SALOME_Component_i.hxx>
 
 #include <vector> 
 #include <map> 
diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx
index 37218c190..df1630369 100644
--- a/src/Session/Session_ServerCheck.cxx
+++ b/src/Session/Session_ServerCheck.cxx
@@ -31,11 +31,11 @@
 #include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
 #include CORBA_CLIENT_HEADER(SALOME_Component)
 
-#include "Utils_ORB_INIT.hxx"
-#include "Utils_SINGLETON.hxx"
-#include "SALOME_NamingService.hxx"
-#include "Basics_Utils.hxx"
-#include "utilities.h"
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/Basics_Utils.hxx>
+#include <kernel/utilities.h>
 
 #include <QApplication> 
 #include <QWaitCondition>
diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx
index 14f952927..5f3b315c2 100755
--- a/src/Session/Session_ServerLauncher.cxx
+++ b/src/Session/Session_ServerLauncher.cxx
@@ -28,8 +28,8 @@
 #include "Session_ServerLauncher.hxx"
 #include "Session_ServerThread.hxx"
 
-#include "Utils_SALOME_Exception.hxx"
-#include "utilities.h"
+#include <kernel/Utils_SALOME_Exception.hxx>
+#include <kernel/utilities.h>
 
 #include <QMutex>
 #include <QWaitCondition>
diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx
index 83f6c2de8..6d0a37f13 100755
--- a/src/Session/Session_ServerThread.cxx
+++ b/src/Session/Session_ServerThread.cxx
@@ -30,22 +30,22 @@
 //
 #include "Session_ServerThread.hxx"
 
-#include <SALOME_NamingService.hxx>
-#include <SALOME_Container_i.hxx>
-#include <SALOME_Launcher.hxx>
-#include <SALOMEDSClient_ClientFactory.hxx>
-#include <SALOME_ModuleCatalog_impl.hxx>
-#include <RegistryService.hxx>
+#include <kernel/SALOME_NamingService.hxx>
+#include <kernel/SALOME_Container_i.hxx>
+#include <kernel/SALOME_Launcher.hxx>
+#include <kernel/SALOMEDSClient_ClientFactory.hxx>
+#include <kernel/SALOME_ModuleCatalog_impl.hxx>
+#include <kernel/RegistryService.hxx>
 
 #include "Session_Session_i.hxx"
 #include "SalomeApp_Engine_i.hxx"
 
-#include <Utils_ORB_INIT.hxx>
-#include <Utils_SINGLETON.hxx>
-#include <Utils_SALOME_Exception.hxx>
-#include <Basics_Utils.hxx>
-#include <NamingService_WaitForServerReadiness.hxx>
-#include <utilities.h>
+#include <kernel/Utils_ORB_INIT.hxx>
+#include <kernel/Utils_SINGLETON.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>
+#include <kernel/Basics_Utils.hxx>
+#include <kernel/NamingService_WaitForServerReadiness.hxx>
+#include <kernel/utilities.h>
 
 #include <cstdlib>
 #include <ctime>
diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx
index ec065d692..c3ebec182 100755
--- a/src/Session/Session_Session_i.cxx
+++ b/src/Session/Session_Session_i.cxx
@@ -25,18 +25,18 @@
 //  Module : SALOME
 //  $Header$
 //
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 #include "Session_Session_i.hxx"
 
-#include "SALOME_NamingService.hxx"
+#include <kernel/SALOME_NamingService.hxx>
 #include "SALOME_Event.h"
 
 #include "SUIT_Session.h"
 #include "SUIT_Desktop.h"
 #include "SUIT_Study.h"
 
-#include "Basics_Utils.hxx"
+#include <kernel/Basics_Utils.hxx>
 
 #include <QMutex>
 #include <QWaitCondition>
diff --git a/src/Style/Style_PrefDlg.h b/src/Style/Style_PrefDlg.h
index d96a4f083..d66c2f2cf 100644
--- a/src/Style/Style_PrefDlg.h
+++ b/src/Style/Style_PrefDlg.h
@@ -27,7 +27,7 @@
 
 #include "Style.h"
 
-#include <QtxDialog.h>
+#include "QtxDialog.h"
 #include <QFrame>
 #include <QMap>
 
diff --git a/src/Style/Style_ResourceMgr.h b/src/Style/Style_ResourceMgr.h
index ab2aaa2fb..3cd6920de 100644
--- a/src/Style/Style_ResourceMgr.h
+++ b/src/Style/Style_ResourceMgr.h
@@ -27,7 +27,7 @@
 
 #include "Style.h"
 
-#include <QtxResourceMgr.h>
+#include "QtxResourceMgr.h"
 
 //
 // This class is private for Style package.
diff --git a/src/TOOLSGUI/ToolsGUI.h b/src/TOOLSGUI/ToolsGUI.h
index ec62ef5a1..95f1cbb8c 100755
--- a/src/TOOLSGUI/ToolsGUI.h
+++ b/src/TOOLSGUI/ToolsGUI.h
@@ -36,8 +36,8 @@
 #  define TOOLSGUI_EXPORT
 #endif  // WIN32
 
-#include "utilities.h"
-#include "SALOMEDSClient.hxx"
+#include <kernel/utilities.h>
+#include <kernel/SALOMEDSClient.hxx>
 
 class TOOLSGUI_EXPORT ToolsGUI  
 {
diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
index 0326eecd4..5be8687e6 100755
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
@@ -47,7 +47,7 @@
 #include <TCollection_AsciiString.hxx>
 #include <Standard_CString.hxx>
 
-#include "utilities.h"
+#include <kernel/utilities.h>
 
 using namespace std;
 
diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
index 038eaafbf..6117d4d89 100755
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
@@ -44,13 +44,13 @@
 # include <QLabel>
 # include <QGroupBox>
 
-# include <SALOME_NamingService.hxx>
-# include <ServiceUnreachable.hxx>
-# include <Utils_SINGLETON.hxx>
-# include <Utils_CommException.hxx>
+# include <kernel/SALOME_NamingService.hxx>
+# include <kernel/ServiceUnreachable.hxx>
+# include <kernel/Utils_SINGLETON.hxx>
+# include <kernel/Utils_CommException.hxx>
 
-# include <utilities.h>
-# include <OpUtil.hxx>
+# include <kernel/utilities.h>
+# include <kernel/OpUtil.hxx>
 
 # include <Qtx.h>
 
diff --git a/src/VTKViewer/VTKViewer_ViewManager.h b/src/VTKViewer/VTKViewer_ViewManager.h
index 213df207a..306363b75 100755
--- a/src/VTKViewer/VTKViewer_ViewManager.h
+++ b/src/VTKViewer/VTKViewer_ViewManager.h
@@ -24,7 +24,7 @@
 
 #include "VTKViewer.h"
 
-#include <SUIT_ViewManager.h>
+#include "SUIT_ViewManager.h"
 
 class SUIT_Desktop;