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

2010-02-19 15:48:19 +00:00 · 2010-02-19 15:48:19 +00:00 · 368dfaae0d
commit 368dfaae0d
parent b6d4daa757
41 changed files with 129 additions and 128 deletions
--- a/adm_local/unix/config_files/check_NETGENPLUGIN.m4
+++ b/adm_local/unix/config_files/check_NETGENPLUGIN.m4
@ -60,7 +60,7 @@ if test -f ${NETGENPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/libNETGENEngine.
   AC_SUBST(NETGENPLUGIN_ROOT_DIR)

   NETGENPLUGIN_LDFLAGS=-L${NETGENPLUGIN_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
-   NETGENPLUGIN_CXXFLAGS=-I${NETGENPLUGIN_DIR}/include/salome
+   NETGENPLUGIN_CXXFLAGS="-I${NETGENPLUGIN_DIR}/include/salome -I${NETGENPLUGIN_DIR}/include/salome/skel"

   AC_SUBST(NETGENPLUGIN_LDFLAGS)
   AC_SUBST(NETGENPLUGIN_CXXFLAGS)
--- 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)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@ -38,7 +38,7 @@ lib_LTLIBRARIES = libSalomeIDLNETGENPLUGIN.la
 nodist_libSalomeIDLNETGENPLUGIN_la_SOURCES = NETGENPlugin_AlgorithmSK.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)

 libSalomeIDLNETGENPLUGIN_la_CPPFLAGS = \
 	$(KERNEL_CXXFLAGS) \
--- a/src/GUI/NETGENPluginGUI.cxx
+++ b/src/GUI/NETGENPluginGUI.cxx
@ -24,7 +24,7 @@
 //  Author : Michael Zorin
 //  Module : NETGENPlugin
 //  $Header: 
-//#include "SMESHGUI_Hypotheses.h"
+//#include <smesh/SMESHGUI_Hypotheses.h>
 //
 #include "NETGENPluginGUI_HypothesisCreator.h"
 #include "NETGENPluginGUI_SimpleCreator.h"
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.cxx
@ -27,18 +27,18 @@
 //
 #include "NETGENPluginGUI_HypothesisCreator.h"

-#include <SMESHGUI_Utils.h>
-#include <SMESHGUI_HypothesesUtils.h>
-#include <SMESHGUI.h>
+#include <smesh/SMESHGUI_Utils.h>
+#include <smesh/SMESHGUI_HypothesesUtils.h>
+#include <smesh/SMESHGUI.h>

 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)

-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>

-#include <SalomeApp_Tools.h>
+#include <gui/SalomeApp_Tools.h>

-#include <SalomeApp_DoubleSpinBox.h>
+#include <gui/SalomeApp_DoubleSpinBox.h>

 #include <QComboBox>
 #include <QLabel>
--- a/src/GUI/NETGENPluginGUI_HypothesisCreator.h
+++ b/src/GUI/NETGENPluginGUI_HypothesisCreator.h
@ -30,7 +30,7 @@

 #include "NETGENPluginGUI.h"

-#include <SMESHGUI_Hypotheses.h>
+#include <smesh/SMESHGUI_Hypotheses.h>

 class SalomeApp_DoubleSpinBox;
 class QComboBox;
--- a/src/GUI/NETGENPluginGUI_SimpleCreator.cxx
+++ b/src/GUI/NETGENPluginGUI_SimpleCreator.cxx
@ -25,20 +25,20 @@
 //
 #include "NETGENPluginGUI_SimpleCreator.h"

-#include <SMESHGUI_Utils.h>
-#include <SMESHGUI_HypothesesUtils.h>
-#include <SMESHGUI_SpinBox.h>
-#include <SMESHGUI.h>
+#include <smesh/SMESHGUI_Utils.h>
+#include <smesh/SMESHGUI_HypothesesUtils.h>
+#include <smesh/SMESHGUI_SpinBox.h>
+#include <smesh/SMESHGUI.h>

 // IDL includes
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)

-#include <SUIT_Session.h>
-#include <SUIT_ResourceMgr.h>
+#include <gui/SUIT_Session.h>
+#include <gui/SUIT_ResourceMgr.h>

 // SALOME GUI includes
-#include <SalomeApp_Tools.h>
-#include <SalomeApp_IntSpinBox.h>
+#include <gui/SalomeApp_Tools.h>
+#include <gui/SalomeApp_IntSpinBox.h>

 // Qt includes
 #include <QLabel>
--- a/src/GUI/NETGENPluginGUI_SimpleCreator.h
+++ b/src/GUI/NETGENPluginGUI_SimpleCreator.h
@ -28,7 +28,7 @@

 #include "NETGENPluginGUI.h"
 // SMESH includes
-#include <SMESHGUI_Hypotheses.h>
+#include <smesh/SMESHGUI_Hypotheses.h>

 class  QCheckBox;
 class  QLineEdit;
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.cxx
@ -26,7 +26,7 @@
 // Project   : SALOME
 //
 #include "NETGENPlugin_Hypothesis.hxx"
-#include <utilities.h>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis.hxx
@ -30,8 +30,8 @@

 #include "NETGENPlugin_Defs.hxx"

-#include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_Hypothesis.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>

 //  Parameters for work of NETGEN
 //
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.cxx
@ -28,7 +28,7 @@
 //=============================================================================
 //
 #include "NETGENPlugin_Hypothesis_2D.hxx"
-#include <utilities.h>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D.hxx
@ -33,7 +33,7 @@
 #include "NETGENPlugin_Defs.hxx"

 #include "NETGENPlugin_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <kernel/Utils_SALOME_Exception.hxx>

 //  Parameters for work of NETGEN.
 // This class is just to give 2D dimension, actually
--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_2D_i.cxx
@ -28,11 +28,11 @@
 //=============================================================================
 //
 #include "NETGENPlugin_Hypothesis_2D_i.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_PythonDump.hxx"
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>

-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.cxx
@ -28,11 +28,11 @@
 //=============================================================================
 //
 #include "NETGENPlugin_Hypothesis_i.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_PythonDump.hxx"
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>

-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Hypothesis_i.hxx
@ -35,7 +35,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)

-#include "SMESH_Hypothesis_i.hxx"
+#include <smesh/SMESH_Hypothesis_i.hxx>
 #include "NETGENPlugin_Hypothesis.hxx"

 class SMESH_Gen;
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@ -30,15 +30,15 @@
 #include "NETGENPlugin_Hypothesis_2D.hxx"
 #include "NETGENPlugin_SimpleHypothesis_3D.hxx"

-#include <SMESH_Mesh.hxx>
-#include <SMESH_Comment.hxx>
-#include <SMESH_ComputeError.hxx>
-#include <SMESH_subMesh.hxx>
-#include <SMESH_MesherHelper.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <SMDS_MeshElement.hxx>
-#include <SMDS_MeshNode.hxx>
-#include <utilities.h>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_Comment.hxx>
+#include <smesh/SMESH_ComputeError.hxx>
+#include <smesh/SMESH_subMesh.hxx>
+#include <smesh/SMESH_MesherHelper.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <smesh/SMDS_MeshElement.hxx>
+#include <smesh/SMDS_MeshNode.hxx>
+#include <kernel/utilities.h>

 #include <vector>
 #include <limits>
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
@ -29,7 +29,7 @@
 #define _NETGENPlugin_Mesher_HXX_

 #include "NETGENPlugin_Defs.hxx"
-#include "StdMeshers_FaceSide.hxx"
+#include <smesh/StdMeshers_FaceSide.hxx>
 #include <map>

 class SMESH_Mesh;
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.cxx
@ -32,11 +32,11 @@
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"
 #include "NETGENPlugin_Mesher.hxx"

-#include <SMESH_Gen.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMESH_ControlsDef.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <utilities.h>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <kernel/utilities.h>

 #include <list>

--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D.hxx
@ -32,10 +32,10 @@

 #include "NETGENPlugin_Defs.hxx"

-#include "SMESH_2D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
-#include "StdMeshers_MaxElementVolume.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_2D_Algo.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/StdMeshers_MaxElementVolume.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>

 //class NETGENPlugin_Hypothesis_2D;

--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.cxx
@ -32,11 +32,11 @@
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"
 #include "NETGENPlugin_Mesher.hxx"

-#include <SMESH_Gen.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMESH_ControlsDef.hxx>
-#include <SMESHDS_Mesh.hxx>
-#include <utilities.h>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <kernel/utilities.h>

 #include <list>

--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D.hxx
@ -32,10 +32,10 @@

 #include "NETGENPlugin_Defs.hxx"

-#include "SMESH_3D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
-#include "StdMeshers_MaxElementVolume.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_3D_Algo.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/StdMeshers_MaxElementVolume.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>

 //class NETGENPlugin_Hypothesis;

--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.cxx
@ -26,10 +26,10 @@
 //  $Header$
 //
 #include "NETGENPlugin_NETGEN_2D3D_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>

-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D3D_i.hxx
@ -33,7 +33,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)

-#include "SMESH_3D_Algo_i.hxx"
+#include <smesh/SMESH_3D_Algo_i.hxx>
 #include "NETGENPlugin_NETGEN_2D3D.hxx"

 // ======================================================
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
@ -27,23 +27,23 @@

 #include "NETGENPlugin_Mesher.hxx"

-#include "SMDS_MeshElement.hxx"
-#include "SMDS_MeshNode.hxx"
-#include "SMESHDS_Mesh.hxx"
-#include "SMESH_Comment.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_Mesh.hxx"
-#include "SMESH_MesherHelper.hxx"
-#include "StdMeshers_FaceSide.hxx"
-#include "StdMeshers_MaxElementArea.hxx"
-#include "StdMeshers_LengthFromEdges.hxx"
-#include "StdMeshers_QuadranglePreference.hxx"
+#include <smesh/SMDS_MeshElement.hxx>
+#include <smesh/SMDS_MeshNode.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <smesh/SMESH_Comment.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_MesherHelper.hxx>
+#include <smesh/StdMeshers_FaceSide.hxx>
+#include <smesh/StdMeshers_MaxElementArea.hxx>
+#include <smesh/StdMeshers_LengthFromEdges.hxx>
+#include <smesh/StdMeshers_QuadranglePreference.hxx>

 #include <Precision.hxx>
 #include <Standard_ErrorHandler.hxx>
 #include <Standard_Failure.hxx>

-#include "utilities.h"
+#include <kernel/utilities.h>

 #include <list>
 #include <vector>
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.hxx
@ -26,8 +26,8 @@
 #ifndef _NETGENPlugin_NETGEN_2D_ONLY_HXX_
 #define _NETGENPlugin_NETGEN_2D_ONLY_HXX_

-#include "SMESH_2D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
+#include <smesh/SMESH_2D_Algo.hxx>
+#include <smesh/SMESH_Mesh.hxx>

 /*#define OCCGEOMETRY
 #include <occgeom.hpp>
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.cxx
@ -25,9 +25,9 @@
 //  Module : SMESH
 //
 #include "NETGENPlugin_NETGEN_2D_ONLY_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>

-#include "utilities.h"
+#include <kernel/utilities.h>

 //=============================================================================
 /*!
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY_i.hxx
@ -30,7 +30,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)

-#include "SMESH_2D_Algo_i.hxx"
+#include <smesh/SMESH_2D_Algo_i.hxx>
 #include "NETGENPlugin_NETGEN_2D_ONLY.hxx"

 // ======================================================
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.cxx
@ -26,10 +26,10 @@
 //  $Header$
 //
 #include "NETGENPlugin_NETGEN_2D_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>

-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_i.hxx
@ -33,7 +33,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)

-#include "SMESH_2D_Algo_i.hxx"
+#include <smesh/SMESH_2D_Algo_i.hxx>
 #include "NETGENPlugin_NETGEN_2D.hxx"

 // ======================================================
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
@ -31,16 +31,16 @@

 #include "NETGENPlugin_Mesher.hxx"

-#include "SMDS_MeshElement.hxx"
-#include "SMDS_MeshNode.hxx"
-#include "SMESHDS_Mesh.hxx"
-#include "SMESH_Comment.hxx"
-#include "SMESH_ControlsDef.hxx"
-#include "SMESH_Gen.hxx"
-#include "SMESH_Mesh.hxx"
-#include "SMESH_MesherHelper.hxx"
-#include "SMESH_MeshEditor.hxx"
-#include "StdMeshers_QuadToTriaAdaptor.hxx"
+#include <smesh/SMDS_MeshElement.hxx>
+#include <smesh/SMDS_MeshNode.hxx>
+#include <smesh/SMESHDS_Mesh.hxx>
+#include <smesh/SMESH_Comment.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_MesherHelper.hxx>
+#include <smesh/SMESH_MeshEditor.hxx>
+#include <smesh/StdMeshers_QuadToTriaAdaptor.hxx>

 #include <BRep_Tool.hxx>
 #include <GProp_GProps.hxx>
@ -52,7 +52,7 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx>

-#include "utilities.h"
+#include <kernel/utilities.h>

 #include <list>
 #include <vector>
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.hxx
@ -33,10 +33,10 @@

 #include "NETGENPlugin_Defs.hxx"

-#include "SMESH_3D_Algo.hxx"
-#include "SMESH_Mesh.hxx"
-#include "StdMeshers_MaxElementVolume.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_3D_Algo.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/StdMeshers_MaxElementVolume.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>

 class NETGENPLUGIN_EXPORT NETGENPlugin_NETGEN_3D: public SMESH_3D_Algo
 {
--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.cxx
@ -27,10 +27,10 @@
 //  $Header$
 //
 #include "NETGENPlugin_NETGEN_3D_i.hxx"
-#include "SMESH_Gen.hxx"
+#include <smesh/SMESH_Gen.hxx>

-#include "Utils_CorbaException.hxx"
-#include "utilities.h"
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_NETGEN_3D_i.hxx
@ -34,7 +34,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)

-#include "SMESH_3D_Algo_i.hxx"
+#include <smesh/SMESH_3D_Algo_i.hxx>
 #include "NETGENPlugin_NETGEN_3D.hxx"

 // ======================================================
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
@ -28,13 +28,13 @@
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"
 #include "NETGENPlugin_Hypothesis.hxx"

-#include <SMESH_Mesh.hxx>
-#include <SMESH_subMesh.hxx>
-#include <SMESH_ControlsDef.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_subMesh.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>

 #include <TopExp_Explorer.hxx>

-#include <utilities.h>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.hxx
@ -30,8 +30,8 @@

 #include "NETGENPlugin_Defs.hxx"

-#include "SMESH_Hypothesis.hxx"
-#include "Utils_SALOME_Exception.hxx"
+#include <smesh/SMESH_Hypothesis.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>

 //  Simplified parameters of NETGEN
 //
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.cxx
@ -28,11 +28,11 @@
 #include "NETGENPlugin_SimpleHypothesis_2D_i.hxx"
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"

-#include <SMESH_Gen.hxx>
-#include <SMESH_PythonDump.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>

-#include <Utils_CorbaException.hxx>
-#include <utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D_i.hxx
@ -33,7 +33,7 @@
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(NETGENPlugin_Algorithm)

-#include "SMESH_Hypothesis_i.hxx"
+#include <smesh/SMESH_Hypothesis_i.hxx>

 class SMESH_Gen;
 class NETGENPlugin_SimpleHypothesis_2D;
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
@ -28,13 +28,13 @@
 #include "NETGENPlugin_SimpleHypothesis_3D.hxx"
 #include "NETGENPlugin_Hypothesis.hxx"

-#include <SMESH_ControlsDef.hxx>
-#include <SMESH_Mesh.hxx>
-#include <SMESH_subMesh.hxx>
+#include <smesh/SMESH_ControlsDef.hxx>
+#include <smesh/SMESH_Mesh.hxx>
+#include <smesh/SMESH_subMesh.hxx>

 #include <TopExp_Explorer.hxx>

-#include <utilities.h>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.hxx
@ -31,7 +31,7 @@
 #include "NETGENPlugin_Defs.hxx"
 #include "NETGENPlugin_SimpleHypothesis_2D.hxx"

-#include <Utils_SALOME_Exception.hxx>
+#include <kernel/Utils_SALOME_Exception.hxx>

 //  Simplified parameters of NETGEN
 //
--- a/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D_i.cxx
@ -28,11 +28,11 @@
 #include "NETGENPlugin_SimpleHypothesis_3D_i.hxx"
 #include "NETGENPlugin_SimpleHypothesis_3D.hxx"

-#include <SMESH_Gen.hxx>
-#include <SMESH_PythonDump.hxx>
+#include <smesh/SMESH_Gen.hxx>
+#include <smesh/SMESH_PythonDump.hxx>

-#include <Utils_CorbaException.hxx>
-#include <utilities.h>
+#include <kernel/Utils_CorbaException.hxx>
+#include <kernel/utilities.h>

 using namespace std;

--- a/src/NETGENPlugin/NETGENPlugin_i.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_i.cxx
@ -25,7 +25,7 @@
 //  Module : SMESH
 //  $Header$
 //
-#include "utilities.h"
+#include <kernel/utilities.h>

 #include "NETGENPlugin_NETGEN_3D_i.hxx"
 #include "NETGENPlugin_NETGEN_2D_i.hxx"