From: sbh <sergey.belash@opencascade.com>
Date: Wed, 30 Jul 2014 06:41:13 +0000 (+0400)
Subject: Define guards are corrected according to the code style
X-Git-Tag: V_0.4.4~113^2~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4cbd08290dc7a540e3fa93913d484e8336df90d9;p=modules%2Fshaper.git

Define guards are corrected according to the code style
---

diff --git a/src/ConstructionPlugin/ConstructionPlugin_Plugin.h b/src/ConstructionPlugin/ConstructionPlugin_Plugin.h
index 1c772033b..95ab19376 100644
--- a/src/ConstructionPlugin/ConstructionPlugin_Plugin.h
+++ b/src/ConstructionPlugin/ConstructionPlugin_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     31 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ConstructionPlugin_Plugin_HeaderFile
-#define ConstructionPlugin_Plugin_HeaderFile
+#ifndef ConstructionPlugin_Plugin_H_
+#define ConstructionPlugin_Plugin_H_
 
 
 #include "ConstructionPlugin.h"
diff --git a/src/ConstructionPlugin/ConstructionPlugin_Point.h b/src/ConstructionPlugin/ConstructionPlugin_Point.h
index a0dda28dd..a5f183690 100644
--- a/src/ConstructionPlugin/ConstructionPlugin_Point.h
+++ b/src/ConstructionPlugin/ConstructionPlugin_Point.h
@@ -2,8 +2,8 @@
 // Created:     3 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ConstructionPlugin_Point_HeaderFile
-#define ConstructionPlugin_Point_HeaderFile
+#ifndef ConstructionPlugin_Point_H_
+#define ConstructionPlugin_Point_H_
 
 #include "ConstructionPlugin.h"
 #include <ModelAPI_Feature.h>
diff --git a/src/Events/Events_Listener.h b/src/Events/Events_Listener.h
index 2fdcb097f..5bac8dc8a 100644
--- a/src/Events/Events_Listener.h
+++ b/src/Events/Events_Listener.h
@@ -2,8 +2,8 @@
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#ifndef Events_Listener_HeaderFile
-#define Events_Listener_HeaderFile
+#ifndef Events_Listener_H_
+#define Events_Listener_H_
 
 #include <Events.h>
 class Events_Message;
diff --git a/src/Events/Events_Loop.h b/src/Events/Events_Loop.h
index d19dd4d4a..e7a0b3a2a 100644
--- a/src/Events/Events_Loop.h
+++ b/src/Events/Events_Loop.h
@@ -2,8 +2,8 @@
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#ifndef Events_Loop_HeaderFile
-#define Events_Loop_HeaderFile
+#ifndef Events_Loop_H_
+#define Events_Loop_H_
 
 #include <Events_Message.h>
 #include <Events_Listener.h>
diff --git a/src/Events/Events_Message.h b/src/Events/Events_Message.h
index 1d5a57d41..fe829a468 100644
--- a/src/Events/Events_Message.h
+++ b/src/Events/Events_Message.h
@@ -2,8 +2,8 @@
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#ifndef Events_Message_HeaderFile
-#define Events_Message_HeaderFile
+#ifndef Events_Message_H_
+#define Events_Message_H_
 
 #include <Events.h>
 
diff --git a/src/Events/Events_MessageGroup.h b/src/Events/Events_MessageGroup.h
index b95f64d87..46d7c420a 100644
--- a/src/Events/Events_MessageGroup.h
+++ b/src/Events/Events_MessageGroup.h
@@ -2,8 +2,8 @@
 // Created:	Thu Mar 13 2014
 // Author:	Mikhail PONIKAROV
 
-#ifndef Events_MessageGroup_HeaderFile
-#define Events_MessageGroup_HeaderFile
+#ifndef Events_MessageGroup_H_
+#define Events_MessageGroup_H_
 
 #include <Events_Message.h>
 
diff --git a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h
index 4e92bd7cb..f42a7d7f5 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_Extrusion.h
@@ -2,8 +2,8 @@
 // Created:     30 May 2014
 // Author:      Vitaly SMETANNIKOV
 
-#ifndef FeaturesPlugin_Extrusion_HeaderFile
-#define FeaturesPlugin_Extrusion_HeaderFile
+#ifndef FeaturesPlugin_Extrusion_H_
+#define FeaturesPlugin_Extrusion_H_
 
 #include "FeaturesPlugin.h"
 #include <ModelAPI_Feature.h>
diff --git a/src/FeaturesPlugin/FeaturesPlugin_Plugin.h b/src/FeaturesPlugin/FeaturesPlugin_Plugin.h
index 3ec8c1239..1b49efe58 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_Plugin.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     07 July 2014
 // Author:      Vitaly SMETANNIKOV
 
-#ifndef FeaturesPlugin_Plugin_HeaderFile
-#define FeaturesPlugin_Plugin_HeaderFile
+#ifndef FeaturesPlugin_Plugin_H_
+#define FeaturesPlugin_Plugin_H_
 
 
 #include "FeaturesPlugin.h"
diff --git a/src/GeomAPI/GeomAPI_AISObject.h b/src/GeomAPI/GeomAPI_AISObject.h
index afd7ee95f..a874e5d3e 100644
--- a/src/GeomAPI/GeomAPI_AISObject.h
+++ b/src/GeomAPI/GeomAPI_AISObject.h
@@ -2,8 +2,8 @@
 // Created:     25 Jun 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_AISObject_HeaderFile
-#define GeomAPI_AISObject_HeaderFile
+#ifndef GeomAPI_AISObject_H_
+#define GeomAPI_AISObject_H_
 
 #include <GeomAPI_Interface.h>
 
diff --git a/src/GeomAPI/GeomAPI_Circ.h b/src/GeomAPI/GeomAPI_Circ.h
index dda6923c6..c74e76c01 100644
--- a/src/GeomAPI/GeomAPI_Circ.h
+++ b/src/GeomAPI/GeomAPI_Circ.h
@@ -2,8 +2,8 @@
 // Created:     24 Jun 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Circ_HeaderFile
-#define GeomAPI_Circ_HeaderFile
+#ifndef GeomAPI_Circ_H_
+#define GeomAPI_Circ_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAPI/GeomAPI_Circ2d.h b/src/GeomAPI/GeomAPI_Circ2d.h
index e95d8643c..d4ec763e4 100644
--- a/src/GeomAPI/GeomAPI_Circ2d.h
+++ b/src/GeomAPI/GeomAPI_Circ2d.h
@@ -2,8 +2,8 @@
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Circ2d_HeaderFile
-#define GeomAPI_Circ2d_HeaderFile
+#ifndef GeomAPI_Circ2d_H_
+#define GeomAPI_Circ2d_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAPI/GeomAPI_Dir.h b/src/GeomAPI/GeomAPI_Dir.h
index 181c4672e..223eb7452 100644
--- a/src/GeomAPI/GeomAPI_Dir.h
+++ b/src/GeomAPI/GeomAPI_Dir.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Dir_HeaderFile
-#define GeomAPI_Dir_HeaderFile
+#ifndef GeomAPI_Dir_H_
+#define GeomAPI_Dir_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAPI/GeomAPI_Dir2d.h b/src/GeomAPI/GeomAPI_Dir2d.h
index 4c9e6fc14..e31059f44 100644
--- a/src/GeomAPI/GeomAPI_Dir2d.h
+++ b/src/GeomAPI/GeomAPI_Dir2d.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Dir2d_HeaderFile
-#define GeomAPI_Dir2d_HeaderFile
+#ifndef GeomAPI_Dir2d_H_
+#define GeomAPI_Dir2d_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAPI/GeomAPI_Edge.h b/src/GeomAPI/GeomAPI_Edge.h
index 584e4756c..bd186c22b 100644
--- a/src/GeomAPI/GeomAPI_Edge.h
+++ b/src/GeomAPI/GeomAPI_Edge.h
@@ -2,8 +2,8 @@
 // Created:     24 Jul 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Edge_HeaderFile
-#define GeomAPI_Edge_HeaderFile
+#ifndef GeomAPI_Edge_H_
+#define GeomAPI_Edge_H_
 
 #include <GeomAPI_Shape.h>
 
diff --git a/src/GeomAPI/GeomAPI_IPresentable.h b/src/GeomAPI/GeomAPI_IPresentable.h
index b28ed8bb0..abb154170 100644
--- a/src/GeomAPI/GeomAPI_IPresentable.h
+++ b/src/GeomAPI/GeomAPI_IPresentable.h
@@ -2,8 +2,8 @@
 // Created:     17 July 2014
 // Author:      Vitaly SMETANNIKOV
 
-#ifndef GeomAPI_IPresentable_HeaderFile
-#define GeomAPI_IPresentable_HeaderFile
+#ifndef GeomAPI_IPresentable_H_
+#define GeomAPI_IPresentable_H_
 
 #include "GeomAPI_AISObject.h"
 
diff --git a/src/GeomAPI/GeomAPI_Interface.h b/src/GeomAPI/GeomAPI_Interface.h
index f77131de6..141571688 100644
--- a/src/GeomAPI/GeomAPI_Interface.h
+++ b/src/GeomAPI/GeomAPI_Interface.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Interface_HeaderFile
-#define GeomAPI_Interface_HeaderFile
+#ifndef GeomAPI_Interface_H_
+#define GeomAPI_Interface_H_
 
 #include <GeomAPI.h>
 
diff --git a/src/GeomAPI/GeomAPI_Lin.h b/src/GeomAPI/GeomAPI_Lin.h
index 260b5ffee..b0b3e265f 100644
--- a/src/GeomAPI/GeomAPI_Lin.h
+++ b/src/GeomAPI/GeomAPI_Lin.h
@@ -2,8 +2,8 @@
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Lin_HeaderFile
-#define GeomAPI_Lin_HeaderFile
+#ifndef GeomAPI_Lin_H_
+#define GeomAPI_Lin_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAPI/GeomAPI_Lin2d.h b/src/GeomAPI/GeomAPI_Lin2d.h
index 71136e035..b213a0d4d 100644
--- a/src/GeomAPI/GeomAPI_Lin2d.h
+++ b/src/GeomAPI/GeomAPI_Lin2d.h
@@ -2,8 +2,8 @@
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Lin2d_HeaderFile
-#define GeomAPI_Lin2d_HeaderFile
+#ifndef GeomAPI_Lin2d_H_
+#define GeomAPI_Lin2d_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAPI/GeomAPI_Pln.h b/src/GeomAPI/GeomAPI_Pln.h
index 217f74331..c0d0d69f1 100644
--- a/src/GeomAPI/GeomAPI_Pln.h
+++ b/src/GeomAPI/GeomAPI_Pln.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Pln_HeaderFile
-#define GeomAPI_Pln_HeaderFile
+#ifndef GeomAPI_Pln_H_
+#define GeomAPI_Pln_H_
 
 #include <boost/shared_ptr.hpp>
 #include <GeomAPI_Interface.h>
diff --git a/src/GeomAPI/GeomAPI_Pnt.h b/src/GeomAPI/GeomAPI_Pnt.h
index 9be8ad0ec..3991b0977 100644
--- a/src/GeomAPI/GeomAPI_Pnt.h
+++ b/src/GeomAPI/GeomAPI_Pnt.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Pnt_HeaderFile
-#define GeomAPI_Pnt_HeaderFile
+#ifndef GeomAPI_Pnt_H_
+#define GeomAPI_Pnt_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAPI/GeomAPI_Pnt2d.h b/src/GeomAPI/GeomAPI_Pnt2d.h
index 91aec7eee..eaea875cc 100644
--- a/src/GeomAPI/GeomAPI_Pnt2d.h
+++ b/src/GeomAPI/GeomAPI_Pnt2d.h
@@ -2,8 +2,8 @@
 // Created:     29 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_Pnt2d_HeaderFile
-#define GeomAPI_Pnt2d_HeaderFile
+#ifndef GeomAPI_Pnt2d_H_
+#define GeomAPI_Pnt2d_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
index b557e845e..7c058d5b3 100644
--- a/src/GeomAPI/GeomAPI_Shape.h
+++ b/src/GeomAPI/GeomAPI_Shape.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Shape_HeaderFile
-#define GeomAPI_Shape_HeaderFile
+#ifndef GeomAPI_Shape_H_
+#define GeomAPI_Shape_H_
 
 #include <GeomAPI_Interface.h>
 
diff --git a/src/GeomAPI/GeomAPI_XY.h b/src/GeomAPI/GeomAPI_XY.h
index 0f0187ae6..1ff89a8f6 100644
--- a/src/GeomAPI/GeomAPI_XY.h
+++ b/src/GeomAPI/GeomAPI_XY.h
@@ -2,8 +2,8 @@
 // Created:     30 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAPI_XY_HeaderFile
-#define GeomAPI_XY_HeaderFile
+#ifndef GeomAPI_XY_H_
+#define GeomAPI_XY_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAPI/GeomAPI_XYZ.h b/src/GeomAPI/GeomAPI_XYZ.h
index ffcaa9d86..840362535 100644
--- a/src/GeomAPI/GeomAPI_XYZ.h
+++ b/src/GeomAPI/GeomAPI_XYZ.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_XYZ_HeaderFile
-#define GeomAPI_XYZ_HeaderFile
+#ifndef GeomAPI_XYZ_H_
+#define GeomAPI_XYZ_H_
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.h
index 5cca6ad87..ea727ef9e 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_CompoundBuilder.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Natalia ERMOLAEVA
 
-#ifndef GeomAlgoAPI_CompoundBuilder_HeaderFile
-#define GeomAlgoAPI_CompoundBuilder_HeaderFile
+#ifndef GeomAlgoAPI_CompoundBuilder_H_
+#define GeomAlgoAPI_CompoundBuilder_H_
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Shape.h>
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.h
index bb01b7bf5..68c239278 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_EdgeBuilder.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAlgoAPI_EdgeBuilder_HeaderFile
-#define GeomAlgoAPI_EdgeBuilder_HeaderFile
+#ifndef GeomAlgoAPI_EdgeBuilder_H_
+#define GeomAlgoAPI_EdgeBuilder_H_
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Edge.h>
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Extrusion.h b/src/GeomAlgoAPI/GeomAlgoAPI_Extrusion.h
index f2a098cea..a41ae8db4 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Extrusion.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Extrusion.h
@@ -2,8 +2,8 @@
 // Created:     06 Jun 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAlgoAPI_Extrusion_HeaderFile
-#define GeomAlgoAPI_Extrusion_HeaderFile
+#ifndef GeomAlgoAPI_Extrusion_H_
+#define GeomAlgoAPI_Extrusion_H_
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Shape.h>
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
index 5d6d731de..d14357a93 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_FaceBuilder.h
@@ -2,8 +2,8 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAlgoAPI_FaceBuilder_HeaderFile
-#define GeomAlgoAPI_FaceBuilder_HeaderFile
+#ifndef GeomAlgoAPI_FaceBuilder_H_
+#define GeomAlgoAPI_FaceBuilder_H_
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Shape.h>
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_PointBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_PointBuilder.h
index 2715062bb..7e24a360a 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_PointBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_PointBuilder.h
@@ -2,8 +2,8 @@
 // Created:     02 Jun 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAlgoAPI_PointBuilder_HeaderFile
-#define GeomAlgoAPI_PointBuilder_HeaderFile
+#ifndef GeomAlgoAPI_PointBuilder_H_
+#define GeomAlgoAPI_PointBuilder_H_
 
 #include <GeomAlgoAPI.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_SketchBuilder.h b/src/GeomAlgoAPI/GeomAlgoAPI_SketchBuilder.h
index c5817d9b0..1a75da204 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_SketchBuilder.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_SketchBuilder.h
@@ -2,8 +2,8 @@
 // Created:     02 Jun 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef GeomAlgoAPI_SketchBuilder_HeaderFile
-#define GeomAlgoAPI_SketchBuilder_HeaderFile
+#ifndef GeomAlgoAPI_SketchBuilder_H_
+#define GeomAlgoAPI_SketchBuilder_H_
 
 #include <GeomAlgoAPI.h>
 
diff --git a/src/GeomData/GeomData_Dir.h b/src/GeomData/GeomData_Dir.h
index 1b6dd6c64..55688d100 100644
--- a/src/GeomData/GeomData_Dir.h
+++ b/src/GeomData/GeomData_Dir.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomData_Dir_HeaderFile
-#define GeomData_Dir_HeaderFile
+#ifndef GeomData_Dir_H_
+#define GeomData_Dir_H_
 
 #include "GeomData.h"
 #include "GeomDataAPI_Dir.h"
diff --git a/src/GeomData/GeomData_Point.h b/src/GeomData/GeomData_Point.h
index 116039cf1..6a3069527 100644
--- a/src/GeomData/GeomData_Point.h
+++ b/src/GeomData/GeomData_Point.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomData_Point_HeaderFile
-#define GeomData_Point_HeaderFile
+#ifndef GeomData_Point_H_
+#define GeomData_Point_H_
 
 #include "GeomData.h"
 #include "GeomDataAPI_Point.h"
diff --git a/src/GeomData/GeomData_Point2D.h b/src/GeomData/GeomData_Point2D.h
index 8e3c124b3..0041f5cfe 100644
--- a/src/GeomData/GeomData_Point2D.h
+++ b/src/GeomData/GeomData_Point2D.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomData_Point2D_HeaderFile
-#define GeomData_Point2D_HeaderFile
+#ifndef GeomData_Point2D_H_
+#define GeomData_Point2D_H_
 
 #include "GeomData.h"
 #include "GeomDataAPI_Point2D.h"
diff --git a/src/GeomDataAPI/GeomDataAPI_Dir.h b/src/GeomDataAPI/GeomDataAPI_Dir.h
index a25c9faaf..c2239633f 100644
--- a/src/GeomDataAPI/GeomDataAPI_Dir.h
+++ b/src/GeomDataAPI/GeomDataAPI_Dir.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomDataAPI_Dir_HeaderFile
-#define GeomDataAPI_Dir_HeaderFile
+#ifndef GeomDataAPI_Dir_H_
+#define GeomDataAPI_Dir_H_
 
 #include "GeomDataAPI.h"
 #include <ModelAPI_Attribute.h>
diff --git a/src/GeomDataAPI/GeomDataAPI_Point.h b/src/GeomDataAPI/GeomDataAPI_Point.h
index 5f08bde02..227a1be51 100644
--- a/src/GeomDataAPI/GeomDataAPI_Point.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomDataAPI_Point_HeaderFile
-#define GeomDataAPI_Point_HeaderFile
+#ifndef GeomDataAPI_Point_H_
+#define GeomDataAPI_Point_H_
 
 #include "GeomDataAPI.h"
 #include <ModelAPI_Attribute.h>
diff --git a/src/GeomDataAPI/GeomDataAPI_Point2D.h b/src/GeomDataAPI/GeomDataAPI_Point2D.h
index f5eb42938..02249c24f 100644
--- a/src/GeomDataAPI/GeomDataAPI_Point2D.h
+++ b/src/GeomDataAPI/GeomDataAPI_Point2D.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomDataAPI_Point2D_HeaderFile
-#define GeomDataAPI_Point2D_HeaderFile
+#ifndef GeomDataAPI_Point2D_H_
+#define GeomDataAPI_Point2D_H_
 
 #include "GeomDataAPI.h"
 #include <ModelAPI_Attribute.h>
diff --git a/src/Model/Model_Application.h b/src/Model/Model_Application.h
index 9281f9ce6..0d6bef774 100644
--- a/src/Model/Model_Application.h
+++ b/src/Model/Model_Application.h
@@ -3,8 +3,8 @@
 // Author:      Mikhail PONIKAROV
 // Copyright:   CEA 2011
 
-#ifndef Model_Application_HeaderFile
-#define Model_Application_HeaderFile
+#ifndef Model_Application_H_
+#define Model_Application_H_
 
 #include <Model_Document.h> 
 #include <TDocStd_Application.hxx>
diff --git a/src/Model/Model_AttributeBoolean.h b/src/Model/Model_AttributeBoolean.h
index 331fa139c..8626cdc11 100644
--- a/src/Model/Model_AttributeBoolean.h
+++ b/src/Model/Model_AttributeBoolean.h
@@ -2,8 +2,8 @@
 // Created:     2 june 2014
 // Author:      Vitaly Smetannikov
 
-#ifndef Model_AttributeBoolean_HeaderFile
-#define Model_AttributeBoolean_HeaderFile
+#ifndef Model_AttributeBoolean_H_
+#define Model_AttributeBoolean_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeBoolean.h"
diff --git a/src/Model/Model_AttributeDocRef.h b/src/Model/Model_AttributeDocRef.h
index f3a3fcf89..b17ddf147 100644
--- a/src/Model/Model_AttributeDocRef.h
+++ b/src/Model/Model_AttributeDocRef.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeDocRef_HeaderFile
-#define Model_AttributeDocRef_HeaderFile
+#ifndef Model_AttributeDocRef_H_
+#define Model_AttributeDocRef_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeDocRef.h"
diff --git a/src/Model/Model_AttributeDouble.h b/src/Model/Model_AttributeDouble.h
index 0079b639c..5b206afe2 100644
--- a/src/Model/Model_AttributeDouble.h
+++ b/src/Model/Model_AttributeDouble.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeDouble_HeaderFile
-#define Model_AttributeDouble_HeaderFile
+#ifndef Model_AttributeDouble_H_
+#define Model_AttributeDouble_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeDouble.h"
diff --git a/src/Model/Model_AttributeRefAttr.h b/src/Model/Model_AttributeRefAttr.h
index 273cfd544..efb879c6d 100644
--- a/src/Model/Model_AttributeRefAttr.h
+++ b/src/Model/Model_AttributeRefAttr.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeRefAttr_HeaderFile
-#define Model_AttributeRefAttr_HeaderFile
+#ifndef Model_AttributeRefAttr_H_
+#define Model_AttributeRefAttr_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeRefAttr.h"
diff --git a/src/Model/Model_AttributeRefList.h b/src/Model/Model_AttributeRefList.h
index 7f797e2de..87525753e 100644
--- a/src/Model/Model_AttributeRefList.h
+++ b/src/Model/Model_AttributeRefList.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeRefList_HeaderFile
-#define Model_AttributeRefList_HeaderFile
+#ifndef Model_AttributeRefList_H_
+#define Model_AttributeRefList_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeRefList.h"
diff --git a/src/Model/Model_AttributeReference.h b/src/Model/Model_AttributeReference.h
index 822225500..356a519b2 100644
--- a/src/Model/Model_AttributeReference.h
+++ b/src/Model/Model_AttributeReference.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_AttributeReference_HeaderFile
-#define Model_AttributeReference_HeaderFile
+#ifndef Model_AttributeReference_H_
+#define Model_AttributeReference_H_
 
 #include "Model.h"
 #include "ModelAPI_AttributeReference.h"
diff --git a/src/Model/Model_Data.h b/src/Model/Model_Data.h
index 7faa34331..cf002ad19 100644
--- a/src/Model/Model_Data.h
+++ b/src/Model/Model_Data.h
@@ -2,8 +2,8 @@
 // Created:     21 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Data_HeaderFile
-#define Model_Data_HeaderFile
+#ifndef Model_Data_H_
+#define Model_Data_H_
 
 #include "Model.h"
 #include <ModelAPI_Data.h>
diff --git a/src/Model/Model_Document.h b/src/Model/Model_Document.h
index 8bb19057c..4e8278ca5 100644
--- a/src/Model/Model_Document.h
+++ b/src/Model/Model_Document.h
@@ -2,8 +2,8 @@
 // Created:     28 Feb 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Document_HeaderFile
-#define Model_Document_HeaderFile
+#ifndef Model_Document_H_
+#define Model_Document_H_
 
 #include <Model.h>
 #include <ModelAPI_Document.h>
diff --git a/src/Model/Model_Events.h b/src/Model/Model_Events.h
index 4125cf81c..f0031e1a8 100644
--- a/src/Model/Model_Events.h
+++ b/src/Model/Model_Events.h
@@ -2,8 +2,8 @@
 // Created:     10 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Events_HeaderFile
-#define Model_Events_HeaderFile
+#ifndef Model_Events_H_
+#define Model_Events_H_
 
 #include <Model.h>
 #include <ModelAPI_Events.h>
diff --git a/src/Model/Model_PluginManager.h b/src/Model/Model_PluginManager.h
index 1819c56d5..3ae74bfc1 100644
--- a/src/Model/Model_PluginManager.h
+++ b/src/Model/Model_PluginManager.h
@@ -2,8 +2,8 @@
 // Created:     20 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_PluginManager_HeaderFile
-#define Model_PluginManager_HeaderFile
+#ifndef Model_PluginManager_H_
+#define Model_PluginManager_H_
 
 #include "Model.h"
 #include <ModelAPI_PluginManager.h>
diff --git a/src/Model/Model_ResultBody.h b/src/Model/Model_ResultBody.h
index 13402b2b6..22a9b561c 100644
--- a/src/Model/Model_ResultBody.h
+++ b/src/Model/Model_ResultBody.h
@@ -2,8 +2,8 @@
 // Created:     08 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_ResultBody_HeaderFile
-#define Model_ResultBody_HeaderFile
+#ifndef Model_ResultBody_H_
+#define Model_ResultBody_H_
 
 #include "Model.h"
 #include <ModelAPI_ResultBody.h>
diff --git a/src/Model/Model_ResultConstruction.h b/src/Model/Model_ResultConstruction.h
index fd04f2f7c..5c37e9961 100644
--- a/src/Model/Model_ResultConstruction.h
+++ b/src/Model/Model_ResultConstruction.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_ResultConstruction_HeaderFile
-#define Model_ResultConstruction_HeaderFile
+#ifndef Model_ResultConstruction_H_
+#define Model_ResultConstruction_H_
 
 #include "Model.h"
 #include <ModelAPI_ResultConstruction.h>
diff --git a/src/Model/Model_ResultPart.h b/src/Model/Model_ResultPart.h
index 4408690d8..4123d69e3 100644
--- a/src/Model/Model_ResultPart.h
+++ b/src/Model/Model_ResultPart.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_ResultPart_HeaderFile
-#define Model_ResultPart_HeaderFile
+#ifndef Model_ResultPart_H_
+#define Model_ResultPart_H_
 
 #include "Model.h"
 #include <ModelAPI_ResultPart.h>
diff --git a/src/Model/Model_Update.h b/src/Model/Model_Update.h
index e5851910f..803dd6056 100644
--- a/src/Model/Model_Update.h
+++ b/src/Model/Model_Update.h
@@ -2,8 +2,8 @@
 // Created:     25 Jun 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Update_HeaderFile
-#define Model_Update_HeaderFile
+#ifndef Model_Update_H_
+#define Model_Update_H_
 
 #include "Model.h"
 #include "Events_Listener.h"
diff --git a/src/Model/Model_Validator.h b/src/Model/Model_Validator.h
index 8655b91a9..a93f450a4 100644
--- a/src/Model/Model_Validator.h
+++ b/src/Model/Model_Validator.h
@@ -2,8 +2,8 @@
 // Created:     2 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef Model_Validator_HeaderFile
-#define Model_Validator_HeaderFile
+#ifndef Model_Validator_H_
+#define Model_Validator_H_
 
 #include <Model.h>
 #include <ModelAPI_Validator.h>
diff --git a/src/ModelAPI/ModelAPI_Attribute.h b/src/ModelAPI/ModelAPI_Attribute.h
index 7ea04aa8e..5173855f9 100644
--- a/src/ModelAPI/ModelAPI_Attribute.h
+++ b/src/ModelAPI/ModelAPI_Attribute.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Attribute_HeaderFile
-#define ModelAPI_Attribute_HeaderFile
+#ifndef ModelAPI_Attribute_H_
+#define ModelAPI_Attribute_H_
 
 #include "ModelAPI.h"
 #include <string>
diff --git a/src/ModelAPI/ModelAPI_AttributeBoolean.h b/src/ModelAPI/ModelAPI_AttributeBoolean.h
index 038b93f6c..8c5a0af8e 100644
--- a/src/ModelAPI/ModelAPI_AttributeBoolean.h
+++ b/src/ModelAPI/ModelAPI_AttributeBoolean.h
@@ -2,8 +2,8 @@
 // Created:     2 june 2014
 // Author:      Vitaly Smetannikov
 
-#ifndef ModelAPI_AttributeBoolean_HeaderFile
-#define ModelAPI_AttributeBoolean_HeaderFile
+#ifndef ModelAPI_AttributeBoolean_H_
+#define ModelAPI_AttributeBoolean_H_
 
 #include "ModelAPI_Attribute.h"
 
diff --git a/src/ModelAPI/ModelAPI_AttributeDocRef.h b/src/ModelAPI/ModelAPI_AttributeDocRef.h
index 4765542cd..b7f312bb1 100644
--- a/src/ModelAPI/ModelAPI_AttributeDocRef.h
+++ b/src/ModelAPI/ModelAPI_AttributeDocRef.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeDocRef_HeaderFile
-#define ModelAPI_AttributeDocRef_HeaderFile
+#ifndef ModelAPI_AttributeDocRef_H_
+#define ModelAPI_AttributeDocRef_H_
 
 #include "ModelAPI_Attribute.h"
 #include "ModelAPI_Document.h"
diff --git a/src/ModelAPI/ModelAPI_AttributeDouble.h b/src/ModelAPI/ModelAPI_AttributeDouble.h
index 837757309..163ebefe9 100644
--- a/src/ModelAPI/ModelAPI_AttributeDouble.h
+++ b/src/ModelAPI/ModelAPI_AttributeDouble.h
@@ -2,8 +2,8 @@
 // Created:     2 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeDouble_HeaderFile
-#define ModelAPI_AttributeDouble_HeaderFile
+#ifndef ModelAPI_AttributeDouble_H_
+#define ModelAPI_AttributeDouble_H_
 
 #include "ModelAPI_Attribute.h"
 
diff --git a/src/ModelAPI/ModelAPI_AttributeRefAttr.h b/src/ModelAPI/ModelAPI_AttributeRefAttr.h
index e2b425f0d..be0bf6e1e 100644
--- a/src/ModelAPI/ModelAPI_AttributeRefAttr.h
+++ b/src/ModelAPI/ModelAPI_AttributeRefAttr.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeRefAttr_HeaderFile
-#define ModelAPI_AttributeRefAttr_HeaderFile
+#ifndef ModelAPI_AttributeRefAttr_H_
+#define ModelAPI_AttributeRefAttr_H_
 
 #include "ModelAPI_Attribute.h"
 #include "ModelAPI_Feature.h"
diff --git a/src/ModelAPI/ModelAPI_AttributeRefList.h b/src/ModelAPI/ModelAPI_AttributeRefList.h
index d6004f7af..d9948dd04 100644
--- a/src/ModelAPI/ModelAPI_AttributeRefList.h
+++ b/src/ModelAPI/ModelAPI_AttributeRefList.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeRefList_HeaderFile
-#define ModelAPI_AttributeRefList_HeaderFile
+#ifndef ModelAPI_AttributeRefList_H_
+#define ModelAPI_AttributeRefList_H_
 
 #include "ModelAPI_Attribute.h"
 #include "ModelAPI_Feature.h"
diff --git a/src/ModelAPI/ModelAPI_AttributeReference.h b/src/ModelAPI/ModelAPI_AttributeReference.h
index 89e24798e..dd13cad06 100644
--- a/src/ModelAPI/ModelAPI_AttributeReference.h
+++ b/src/ModelAPI/ModelAPI_AttributeReference.h
@@ -2,8 +2,8 @@
 // Created:     8 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_AttributeReference_HeaderFile
-#define ModelAPI_AttributeReference_HeaderFile
+#ifndef ModelAPI_AttributeReference_H_
+#define ModelAPI_AttributeReference_H_
 
 #include "ModelAPI_Attribute.h"
 #include <ModelAPI_Feature.h>
diff --git a/src/ModelAPI/ModelAPI_Data.h b/src/ModelAPI/ModelAPI_Data.h
index c7ee92059..0b69acb36 100644
--- a/src/ModelAPI/ModelAPI_Data.h
+++ b/src/ModelAPI/ModelAPI_Data.h
@@ -2,8 +2,8 @@
 // Created:     21 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Data_HeaderFile
-#define ModelAPI_Data_HeaderFile
+#ifndef ModelAPI_Data_H_
+#define ModelAPI_Data_H_
 
 #include "ModelAPI.h"
 #include <string>
diff --git a/src/ModelAPI/ModelAPI_Document.h b/src/ModelAPI/ModelAPI_Document.h
index ab055f324..5e0d28091 100644
--- a/src/ModelAPI/ModelAPI_Document.h
+++ b/src/ModelAPI/ModelAPI_Document.h
@@ -2,8 +2,8 @@
 // Created:     28 Feb 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Document_HeaderFile
-#define ModelAPI_Document_HeaderFile
+#ifndef ModelAPI_Document_H_
+#define ModelAPI_Document_H_
 
 #include <ModelAPI.h>
 #include <string>
diff --git a/src/ModelAPI/ModelAPI_Events.h b/src/ModelAPI/ModelAPI_Events.h
index 143f45e91..965a695af 100644
--- a/src/ModelAPI/ModelAPI_Events.h
+++ b/src/ModelAPI/ModelAPI_Events.h
@@ -2,8 +2,8 @@
 // Created:     10 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Events_HeaderFile
-#define ModelAPI_Events_HeaderFile
+#ifndef ModelAPI_Events_H_
+#define ModelAPI_Events_H_
 
 #include <ModelAPI.h>
 #include <Events_MessageGroup.h>
diff --git a/src/ModelAPI/ModelAPI_Feature.h b/src/ModelAPI/ModelAPI_Feature.h
index b42266074..bf3f233ac 100644
--- a/src/ModelAPI/ModelAPI_Feature.h
+++ b/src/ModelAPI/ModelAPI_Feature.h
@@ -2,8 +2,8 @@
 // Created:     21 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Feature_HeaderFile
-#define ModelAPI_Feature_HeaderFile
+#ifndef ModelAPI_Feature_H_
+#define ModelAPI_Feature_H_
 
 #include "ModelAPI_Object.h"
 #include "ModelAPI_PluginManager.h"
diff --git a/src/ModelAPI/ModelAPI_Object.h b/src/ModelAPI/ModelAPI_Object.h
index 7eb0cf979..d46fb7623 100644
--- a/src/ModelAPI/ModelAPI_Object.h
+++ b/src/ModelAPI/ModelAPI_Object.h
@@ -2,8 +2,8 @@
 // Created:     19 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Object_HeaderFile
-#define ModelAPI_Object_HeaderFile
+#ifndef ModelAPI_Object_H_
+#define ModelAPI_Object_H_
 
 #include "ModelAPI.h"
 
diff --git a/src/ModelAPI/ModelAPI_Plugin.h b/src/ModelAPI/ModelAPI_Plugin.h
index fb65e0b14..31795c3f1 100644
--- a/src/ModelAPI/ModelAPI_Plugin.h
+++ b/src/ModelAPI/ModelAPI_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     31 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Plugin_HeaderFile
-#define ModelAPI_Plugin_HeaderFile
+#ifndef ModelAPI_Plugin_H_
+#define ModelAPI_Plugin_H_
 
 #include "ModelAPI.h"
 #include <string>
diff --git a/src/ModelAPI/ModelAPI_PluginManager.h b/src/ModelAPI/ModelAPI_PluginManager.h
index f23cf9581..355e9814f 100644
--- a/src/ModelAPI/ModelAPI_PluginManager.h
+++ b/src/ModelAPI/ModelAPI_PluginManager.h
@@ -2,8 +2,8 @@
 // Created:     20 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_PluginManager_HeaderFile
-#define ModelAPI_PluginManager_HeaderFile
+#ifndef ModelAPI_PluginManager_H_
+#define ModelAPI_PluginManager_H_
 
 #include "ModelAPI.h"
 #include <string>
diff --git a/src/ModelAPI/ModelAPI_Result.h b/src/ModelAPI/ModelAPI_Result.h
index 97077b11d..4a3adbd76 100644
--- a/src/ModelAPI/ModelAPI_Result.h
+++ b/src/ModelAPI/ModelAPI_Result.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Result_HeaderFile
-#define ModelAPI_Result_HeaderFile
+#ifndef ModelAPI_Result_H_
+#define ModelAPI_Result_H_
 
 #include "ModelAPI_Object.h"
 
diff --git a/src/ModelAPI/ModelAPI_ResultBody.h b/src/ModelAPI/ModelAPI_ResultBody.h
index debc96d3e..cd484031a 100644
--- a/src/ModelAPI/ModelAPI_ResultBody.h
+++ b/src/ModelAPI/ModelAPI_ResultBody.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_ResultBody_HeaderFile
-#define ModelAPI_ResultBody_HeaderFile
+#ifndef ModelAPI_ResultBody_H_
+#define ModelAPI_ResultBody_H_
 
 #include "ModelAPI_Result.h"
 #include <GeomAPI_Shape.h>
diff --git a/src/ModelAPI/ModelAPI_ResultConstruction.h b/src/ModelAPI/ModelAPI_ResultConstruction.h
index 231476e3c..0a7cf17b6 100644
--- a/src/ModelAPI/ModelAPI_ResultConstruction.h
+++ b/src/ModelAPI/ModelAPI_ResultConstruction.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_ResultConstruction_HeaderFile
-#define ModelAPI_ResultConstruction_HeaderFile
+#ifndef ModelAPI_ResultConstruction_H_
+#define ModelAPI_ResultConstruction_H_
 
 #include "ModelAPI_Result.h"
 #include <GeomAPI_Shape.h>
diff --git a/src/ModelAPI/ModelAPI_ResultParameters.h b/src/ModelAPI/ModelAPI_ResultParameters.h
index ee4c1430b..509e064ea 100644
--- a/src/ModelAPI/ModelAPI_ResultParameters.h
+++ b/src/ModelAPI/ModelAPI_ResultParameters.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Vitaly SMETANNIKOV
 
-#ifndef ModelAPI_ResultParameters_HeaderFile
-#define ModelAPI_ResultParameters_HeaderFile
+#ifndef ModelAPI_ResultParameters_H_
+#define ModelAPI_ResultParameters_H_
 
 #include "ModelAPI_Result.h"
 
diff --git a/src/ModelAPI/ModelAPI_ResultPart.h b/src/ModelAPI/ModelAPI_ResultPart.h
index 2f6feb5e5..73bfd1ca3 100644
--- a/src/ModelAPI/ModelAPI_ResultPart.h
+++ b/src/ModelAPI/ModelAPI_ResultPart.h
@@ -2,8 +2,8 @@
 // Created:     07 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_ResultPart_HeaderFile
-#define ModelAPI_ResultPart_HeaderFile
+#ifndef ModelAPI_ResultPart_H_
+#define ModelAPI_ResultPart_H_
 
 #include "ModelAPI_Result.h"
 
diff --git a/src/ModelAPI/ModelAPI_Validator.h b/src/ModelAPI/ModelAPI_Validator.h
index 7bc08324a..522945c3f 100644
--- a/src/ModelAPI/ModelAPI_Validator.h
+++ b/src/ModelAPI/ModelAPI_Validator.h
@@ -2,8 +2,8 @@
 // Created:     2 Jul 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef ModelAPI_Validator_HeaderFile
-#define ModelAPI_Validator_HeaderFile
+#ifndef ModelAPI_Validator_H_
+#define ModelAPI_Validator_H_
 
 #include <ModelAPI.h>
 #include <boost/shared_ptr.hpp>
diff --git a/src/PartSetPlugin/PartSetPlugin_Duplicate.h b/src/PartSetPlugin/PartSetPlugin_Duplicate.h
index 57117a813..446b6f325 100644
--- a/src/PartSetPlugin/PartSetPlugin_Duplicate.h
+++ b/src/PartSetPlugin/PartSetPlugin_Duplicate.h
@@ -2,8 +2,8 @@
 // Created:     20 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef PartSetPlugin_Duplicate_HeaderFile
-#define PartSetPlugin_Duplicate_HeaderFile
+#ifndef PartSetPlugin_Duplicate_H_
+#define PartSetPlugin_Duplicate_H_
 
 #include "PartSetPlugin_Part.h"
 
diff --git a/src/PartSetPlugin/PartSetPlugin_Part.h b/src/PartSetPlugin/PartSetPlugin_Part.h
index 7eb27f5ac..10cdebb85 100644
--- a/src/PartSetPlugin/PartSetPlugin_Part.h
+++ b/src/PartSetPlugin/PartSetPlugin_Part.h
@@ -2,8 +2,8 @@
 // Created:     27 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef PartSetPlugin_Part_HeaderFile
-#define PartSetPlugin_Part_HeaderFile
+#ifndef PartSetPlugin_Part_H_
+#define PartSetPlugin_Part_H_
 
 #include "PartSetPlugin.h"
 #include <ModelAPI_Feature.h>
diff --git a/src/PartSetPlugin/PartSetPlugin_Plugin.h b/src/PartSetPlugin/PartSetPlugin_Plugin.h
index d1ccd314b..1ffda8a72 100644
--- a/src/PartSetPlugin/PartSetPlugin_Plugin.h
+++ b/src/PartSetPlugin/PartSetPlugin_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     31 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef PartSetPlugin_Plugin_HeaderFile
-#define PartSetPlugin_Plugin_HeaderFile
+#ifndef PartSetPlugin_Plugin_H_
+#define PartSetPlugin_Plugin_H_
 
 
 #include "PartSetPlugin.h"
diff --git a/src/PartSetPlugin/PartSetPlugin_Remove.h b/src/PartSetPlugin/PartSetPlugin_Remove.h
index a24cc2632..20ccef4a0 100644
--- a/src/PartSetPlugin/PartSetPlugin_Remove.h
+++ b/src/PartSetPlugin/PartSetPlugin_Remove.h
@@ -2,8 +2,8 @@
 // Created:     20 May 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef PartSetPlugin_Remove_HeaderFile
-#define PartSetPlugin_Remove_HeaderFile
+#ifndef PartSetPlugin_Remove_H_
+#define PartSetPlugin_Remove_H_
 
 #include "PartSetPlugin.h"
 #include <ModelAPI_Feature.h>
diff --git a/src/SketchPlugin/SketchPlugin_Arc.h b/src/SketchPlugin/SketchPlugin_Arc.h
index 66da16cfe..3af4e2fd3 100644
--- a/src/SketchPlugin/SketchPlugin_Arc.h
+++ b/src/SketchPlugin/SketchPlugin_Arc.h
@@ -2,8 +2,8 @@
 // Created:     26 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef SketchPlugin_Arc_HeaderFile
-#define SketchPlugin_Arc_HeaderFile
+#ifndef SketchPlugin_Arc_H_
+#define SketchPlugin_Arc_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Feature.h>
diff --git a/src/SketchPlugin/SketchPlugin_Circle.h b/src/SketchPlugin/SketchPlugin_Circle.h
index 9d923654d..3b8dc851b 100644
--- a/src/SketchPlugin/SketchPlugin_Circle.h
+++ b/src/SketchPlugin/SketchPlugin_Circle.h
@@ -2,8 +2,8 @@
 // Created:     26 May 2014
 // Author:      Artem ZHIDKOV
 
-#ifndef SketchPlugin_Circle_HeaderFile
-#define SketchPlugin_Circle_HeaderFile
+#ifndef SketchPlugin_Circle_H_
+#define SketchPlugin_Circle_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Feature.h>
diff --git a/src/SketchPlugin/SketchPlugin_Constraint.h b/src/SketchPlugin/SketchPlugin_Constraint.h
index 585de840a..5417111e3 100644
--- a/src/SketchPlugin/SketchPlugin_Constraint.h
+++ b/src/SketchPlugin/SketchPlugin_Constraint.h
@@ -2,8 +2,8 @@
 // Created: 08 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_Constraint_HeaderFile
-#define SketchPlugin_Constraint_HeaderFile
+#ifndef SketchPlugin_Constraint_H_
+#define SketchPlugin_Constraint_H_
 
 #include "SketchPlugin.h"
 #include "SketchPlugin_Feature.h"
diff --git a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
index 3670b45ed..6345f59dc 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintCoincidence.h
@@ -2,8 +2,8 @@
 // Created: 08 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintCoincidence_HeaderFile
-#define SketchPlugin_ConstraintCoincidence_HeaderFile
+#ifndef SketchPlugin_ConstraintCoincidence_H_
+#define SketchPlugin_ConstraintCoincidence_H_
 
 #include "SketchPlugin.h"
 #include "SketchPlugin_Constraint.h"
diff --git a/src/SketchPlugin/SketchPlugin_ConstraintDistance.h b/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
index 3aed4ba9e..2294ac6ef 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintDistance.h
@@ -2,8 +2,8 @@
 // Created: 23 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintDistance_HeaderFile
-#define SketchPlugin_ConstraintDistance_HeaderFile
+#ifndef SketchPlugin_ConstraintDistance_H_
+#define SketchPlugin_ConstraintDistance_H_
 
 #include "SketchPlugin.h"
 #include "SketchPlugin_Constraint.h"
diff --git a/src/SketchPlugin/SketchPlugin_ConstraintLength.h b/src/SketchPlugin/SketchPlugin_ConstraintLength.h
index 342bdf1f5..cc96258e3 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintLength.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintLength.h
@@ -2,8 +2,8 @@
 // Created: 30 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintLength_HeaderFile
-#define SketchPlugin_ConstraintLength_HeaderFile
+#ifndef SketchPlugin_ConstraintLength_H_
+#define SketchPlugin_ConstraintLength_H_
 
 #include "SketchPlugin.h"
 #include "SketchPlugin_Constraint.h"
diff --git a/src/SketchPlugin/SketchPlugin_ConstraintParallel.h b/src/SketchPlugin/SketchPlugin_ConstraintParallel.h
index acfab864f..0da78ca64 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintParallel.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintParallel.h
@@ -2,8 +2,8 @@
 // Created: 26 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintParallel_HeaderFile
-#define SketchPlugin_ConstraintParallel_HeaderFile
+#ifndef SketchPlugin_ConstraintParallel_H_
+#define SketchPlugin_ConstraintParallel_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Sketch.h>
diff --git a/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.h b/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.h
index eb82abd6f..33ad334e0 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintPerpendicular.h
@@ -2,8 +2,8 @@
 // Created: 26 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintPerpendicular_HeaderFile
-#define SketchPlugin_ConstraintPerpendicular_HeaderFile
+#ifndef SketchPlugin_ConstraintPerpendicular_H_
+#define SketchPlugin_ConstraintPerpendicular_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Sketch.h>
diff --git a/src/SketchPlugin/SketchPlugin_ConstraintRadius.h b/src/SketchPlugin/SketchPlugin_ConstraintRadius.h
index a604ef120..829a15512 100644
--- a/src/SketchPlugin/SketchPlugin_ConstraintRadius.h
+++ b/src/SketchPlugin/SketchPlugin_ConstraintRadius.h
@@ -2,8 +2,8 @@
 // Created: 26 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_ConstraintRadius_HeaderFile
-#define SketchPlugin_ConstraintRadius_HeaderFile
+#ifndef SketchPlugin_ConstraintRadius_H_
+#define SketchPlugin_ConstraintRadius_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Sketch.h>
diff --git a/src/SketchPlugin/SketchPlugin_Feature.h b/src/SketchPlugin/SketchPlugin_Feature.h
index 7bd7ac8d7..093bf0258 100644
--- a/src/SketchPlugin/SketchPlugin_Feature.h
+++ b/src/SketchPlugin/SketchPlugin_Feature.h
@@ -2,8 +2,8 @@
 // Created:     27 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef SketchPlugin_Feature_HeaderFile
-#define SketchPlugin_Feature_HeaderFile
+#ifndef SketchPlugin_Feature_H_
+#define SketchPlugin_Feature_H_
 
 #include "SketchPlugin.h"
 #include <ModelAPI_Feature.h>
diff --git a/src/SketchPlugin/SketchPlugin_Line.h b/src/SketchPlugin/SketchPlugin_Line.h
index ae301f82f..370f26bfb 100644
--- a/src/SketchPlugin/SketchPlugin_Line.h
+++ b/src/SketchPlugin/SketchPlugin_Line.h
@@ -2,8 +2,8 @@
 // Created:     24 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef SketchPlugin_Line_HeaderFile
-#define SketchPlugin_Line_HeaderFile
+#ifndef SketchPlugin_Line_H_
+#define SketchPlugin_Line_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Feature.h>
diff --git a/src/SketchPlugin/SketchPlugin_Plugin.h b/src/SketchPlugin/SketchPlugin_Plugin.h
index 408ae73cc..63f488ca5 100644
--- a/src/SketchPlugin/SketchPlugin_Plugin.h
+++ b/src/SketchPlugin/SketchPlugin_Plugin.h
@@ -2,8 +2,8 @@
 // Created:     31 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef SketchPlugin_Plugin_HeaderFile
-#define SketchPlugin_Plugin_HeaderFile
+#ifndef SketchPlugin_Plugin_H_
+#define SketchPlugin_Plugin_H_
 
 
 #include "SketchPlugin.h"
diff --git a/src/SketchPlugin/SketchPlugin_Point.h b/src/SketchPlugin/SketchPlugin_Point.h
index 33ec0467e..c60526163 100644
--- a/src/SketchPlugin/SketchPlugin_Point.h
+++ b/src/SketchPlugin/SketchPlugin_Point.h
@@ -2,8 +2,8 @@
 // Created: 07 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchPlugin_Point_HeaderFile
-#define SketchPlugin_Point_HeaderFile
+#ifndef SketchPlugin_Point_H_
+#define SketchPlugin_Point_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Sketch.h>
diff --git a/src/SketchPlugin/SketchPlugin_Sketch.h b/src/SketchPlugin/SketchPlugin_Sketch.h
index 374f8a9e1..9a2e31ee6 100644
--- a/src/SketchPlugin/SketchPlugin_Sketch.h
+++ b/src/SketchPlugin/SketchPlugin_Sketch.h
@@ -2,8 +2,8 @@
 // Created:     27 Mar 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef SketchPlugin_Sketch_HeaderFile
-#define SketchPlugin_Sketch_HeaderFile
+#ifndef SketchPlugin_Sketch_H_
+#define SketchPlugin_Sketch_H_
 
 #include "SketchPlugin.h"
 #include <SketchPlugin_Feature.h>
diff --git a/src/SketchSolver/SketchSolver_Constraint.h b/src/SketchSolver/SketchSolver_Constraint.h
index 934415b34..3f547d8d8 100644
--- a/src/SketchSolver/SketchSolver_Constraint.h
+++ b/src/SketchSolver/SketchSolver_Constraint.h
@@ -2,8 +2,8 @@
 // Created: 27 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchSolver_Constraint_Headerfile
-#define SketchSolver_Constraint_Headerfile
+#ifndef SketchSolver_Constraint_H_
+#define SketchSolver_Constraint_H_
 
 #include "SketchSolver.h"
 
diff --git a/src/SketchSolver/SketchSolver_ConstraintGroup.h b/src/SketchSolver/SketchSolver_ConstraintGroup.h
index 362c31b25..a648fc9b3 100644
--- a/src/SketchSolver/SketchSolver_ConstraintGroup.h
+++ b/src/SketchSolver/SketchSolver_ConstraintGroup.h
@@ -2,8 +2,8 @@
 // Created: 27 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchSolver_ConstraintGroup_Headerfile
-#define SketchSolver_ConstraintGroup_Headerfile
+#ifndef SketchSolver_ConstraintGroup_H_
+#define SketchSolver_ConstraintGroup_H_
 
 #include "SketchSolver.h"
 #include <SketchSolver_Solver.h>
diff --git a/src/SketchSolver/SketchSolver_ConstraintManager.h b/src/SketchSolver/SketchSolver_ConstraintManager.h
index a12cc6d5d..1f5f7f884 100644
--- a/src/SketchSolver/SketchSolver_ConstraintManager.h
+++ b/src/SketchSolver/SketchSolver_ConstraintManager.h
@@ -2,8 +2,8 @@
 // Created: 08 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchSolver_ConstraintManager_Headerfile
-#define SketchSolver_ConstraintManager_Headerfile
+#ifndef SketchSolver_ConstraintManager_H_
+#define SketchSolver_ConstraintManager_H_
 
 #include "SketchSolver.h"
 #include <SketchSolver_Solver.h>
diff --git a/src/SketchSolver/SketchSolver_Solver.h b/src/SketchSolver/SketchSolver_Solver.h
index 8a4f9964e..412b0e180 100644
--- a/src/SketchSolver/SketchSolver_Solver.h
+++ b/src/SketchSolver/SketchSolver_Solver.h
@@ -2,8 +2,8 @@
 // Created: 07 May 2014
 // Author:  Artem ZHIDKOV
 
-#ifndef SketchSolver_Solver_Headerfile
-#define SketchSolver_Solver_Headerfile
+#ifndef SketchSolver_Solver_H_
+#define SketchSolver_Solver_H_
 
 #include "SketchSolver.h"