Index: src/conv/raw/RegionList.h
===================================================================
--- src/conv/raw/RegionList.h	(revision 58931)
+++ src/conv/raw/RegionList.h	(working copy)
@@ -26,8 +26,8 @@
  *	IABG mbH (Germany)
  */
 
-#ifndef REGIONLIST_INCLUDED
-#define REGIONLIST_INCLUDED
+#ifndef CONV_RAW_REGIONLIST_H
+#define CONV_RAW_REGIONLIST_H
 
 #include "common.h"
 
@@ -64,4 +64,4 @@
 }
 
 
-#endif // REGIONLIST_INCLUDED
+#endif /* CONV_RAW_REGIONLIST_H */
Index: src/conv/raw/Bot.h
===================================================================
--- src/conv/raw/Bot.h	(revision 58931)
+++ src/conv/raw/Bot.h	(working copy)
@@ -26,8 +26,8 @@
  *	IABG mbH (Germany)
  */
 
-#ifndef BOT_INCLUDED
-#define BOT_INCLUDED
+#ifndef CONV_RAW_BOT_H
+#define CONV_RAW_BOT_H
 
 #include "common.h"
 #include <vector>
@@ -60,4 +60,4 @@
 };
 
 
-#endif //BOT_INCLUDED
+#endif /* CONV_RAW_BOT_H */
Index: src/conv/vdeck/std.h
===================================================================
--- src/conv/vdeck/std.h	(revision 58931)
+++ src/conv/vdeck/std.h	(working copy)
@@ -31,8 +31,8 @@
     leader only.  Currently, this is Douglas A. Gwyn <Gwyn@BRL.ARPA>.
 */
 
-#ifndef	_VLD_STD_H_
-#define	_VLD_STD_H_			/* once-only latch */
+#ifndef	CONV_VDECK_STD_H
+#define	CONV_VDECK_STD_H			/* once-only latch */
 
 /* Extended data types */
 
@@ -72,7 +72,7 @@
 #define tonumber(c)	((c) - '0')	/* convt digit char to number */
 #define todigit(n)	((n) + '0')	/* convt digit number to char */
 
-#endif	/* _VLD_STD_H_ */
+#endif	/* CONV_VDECK_STD_H */
 
 /*
  * Local Variables:
Index: src/conv/vdeck/vextern.h
===================================================================
--- src/conv/vdeck/vextern.h	(revision 58931)
+++ src/conv/vdeck/vextern.h	(working copy)
@@ -21,6 +21,9 @@
  *	Author:		Gary Moss
  */
 
+#ifndef CONV_VDECK_VEXTERN_H
+#define CONV_VDECK_VEXTERN_H
+
 /* Special characters.							*/
 #define	LF		"\n"
 #define BLANKS	"                                                                          "
@@ -85,6 +88,8 @@
 
 extern struct db_i	*dbip;		/* Database instance ptr */
 
+#endif /* CONV_VDECK_VEXTERN_H */
+
 /*
  * Local Variables:
  * mode: C
Index: src/conv/intaval/glob.h
===================================================================
--- src/conv/intaval/glob.h	(revision 58931)
+++ src/conv/intaval/glob.h	(working copy)
@@ -27,8 +27,8 @@
  *	IABG mbH (Germany)
  */
 
-#ifndef GLOB_INCLUDED
-#define GLOB_INCLUDED
+#ifndef CONV_INTAVAL_GLOB_H
+#define CONV_INTAVAL_GLOB_H
 
 #include "common.h"
 
@@ -66,4 +66,4 @@
 };
 
 
-#endif // GLOB_INCLUDED
+#endif /* CONV_INTAVAL_GLOB_H */
Index: src/conv/intaval/regtab.h
===================================================================
--- src/conv/intaval/regtab.h	(revision 58931)
+++ src/conv/intaval/regtab.h	(working copy)
@@ -27,8 +27,8 @@
  *	IABG mbH (Germany)
  */
 
-#ifndef REGTAB_INCLUDED
-#define REGTAB_INCLUDED
+#ifndef CONV_INTAVAL_REGTAB_H
+#define CONV_INTAVAL_REGTAB_H
 
 #include "common.h"
 
@@ -169,4 +169,4 @@
 };
 
 
-#endif // REGTAB_INCLUDED
+#endif /* CONV_INTAVAL_REGTAB_H */
Index: src/conv/intaval/write_brl.h
===================================================================
--- src/conv/intaval/write_brl.h	(revision 58931)
+++ src/conv/intaval/write_brl.h	(working copy)
@@ -27,8 +27,8 @@
  *	IABG mbH (Germany)
  */
 
-#ifndef WRITE_BRL_INCLUDED
-#define WRITE_BRL_INCLUDED
+#ifndef CONV_INTAVAL_WRITE_BRL_H
+#define CONV_INTAVAL_WRITE_BRL_H
 
 #include "glob.h"
 #include "regtab.h"
@@ -115,4 +115,4 @@
 );
 
 
-#endif // WRITE_BRL_INCLUDED
+#endif /* CONV_INTAVAL_WRITE_BRL_H */
Index: src/conv/intaval/read_dra.h
===================================================================
--- src/conv/intaval/read_dra.h	(revision 58931)
+++ src/conv/intaval/read_dra.h	(working copy)
@@ -27,8 +27,8 @@
  *	IABG mbH (Germany)
  */
 
-#ifndef READ_DRA_INCLUDED
-#define READ_DRA_INCLUDED
+#ifndef CONV_INTAVAL_READ_DRA_H
+#define CONV_INTAVAL_READ_DRA_H
 
 #include "common.h"
 
@@ -43,4 +43,4 @@
 );
 
 
-#endif // READ_DRA_INCLUDED
+#endif /* CONV_INTAVAL_READ_DRA_H */
Index: src/conv/dxf/dxf.h
===================================================================
--- src/conv/dxf/dxf.h	(revision 58931)
+++ src/conv/dxf/dxf.h	(working copy)
@@ -23,6 +23,8 @@
  *
  */
 
+#ifndef CONV_DXF_DXF_H
+#define CONV_DXF_DXF_H
 
 static unsigned char rgb[]={
     0, 0, 0,
@@ -283,7 +285,9 @@
     255, 255, 255
 };
 
+#endif /* CONV_DXF_DXF_H */
 
+
 /*
  * Local Variables:
  * tab-width: 8
Index: src/conv/iges/iges_extern.h
===================================================================
--- src/conv/iges/iges_extern.h	(revision 58931)
+++ src/conv/iges/iges_extern.h	(working copy)
@@ -18,6 +18,9 @@
  * information.
  */
 
+#ifndef CONV_IGES_IGES_EXTERN_H
+#define CONV_IGES_IGES_EXTERN_H
+
 #define CARDLEN 71 /* length of data portion in Global records */
 #define PARAMLEN 63 /* length of data portion in Parameter records */
 
@@ -57,6 +60,8 @@
 extern struct file_list iges_list;
 extern struct name_list *name_root;
 
+#endif /* CONV_IGES_IGES_EXTERN_H */
+
 /*
  * Local Variables:
  * mode: C
Index: src/conv/iges/iges.h
===================================================================
--- src/conv/iges/iges.h	(revision 58931)
+++ src/conv/iges/iges.h	(working copy)
@@ -18,6 +18,9 @@
  * information.
  */
 
+#ifndef CONV_IGES_IGES_H
+#define CONV_IGES_IGES_H
+
 #define CSG_MODE 1
 #define FACET_MODE 2
 #define TRIMMED_SURF_MODE 3
@@ -40,7 +43,9 @@
 
 };
 
+#endif /* CONV_IGES_IGES_H */
 
+
 /*
  * Local Variables:
  * mode: C
Index: src/conv/iges/PullbackCurve.h
===================================================================
--- src/conv/iges/PullbackCurve.h	(revision 58931)
+++ src/conv/iges/PullbackCurve.h	(working copy)
@@ -18,8 +18,8 @@
  * information.
  */
 
-#ifndef PULLBACK_CURVE
-#define PULLBACK_CURVE
+#ifndef CONV_IGES_PULLBACK_CURVE_H
+#define CONV_IGES_PULLBACK_CURVE_H
 
 #include "opennurbs.h"
 
@@ -57,7 +57,7 @@
 double flatness = 1.0e-3);
 
 
-#endif
+#endif /* CONV_IGES_PULLBACK_CURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/iges/iges_types.h
===================================================================
--- src/conv/iges/iges_types.h	(revision 58931)
+++ src/conv/iges/iges_types.h	(working copy)
@@ -18,6 +18,9 @@
  * information.
  */
 
+#ifndef CONV_IGES_IGES_TYPES_H
+#define CONV_IGES_IGES_TYPES_H
+
 #define NTYPES 78
 
 struct types typecount[NTYPES+1]={
@@ -102,7 +105,9 @@
     { 700, "Transformation Matrix (4X4)", 0 }
 };
 
+#endif /* CONV_IGES_IGES_TYPES_H */
 
+
 /*
  * Local Variables:
  * mode: C
Index: src/conv/iges/iges_struct.h
===================================================================
--- src/conv/iges/iges_struct.h	(revision 58931)
+++ src/conv/iges/iges_struct.h	(working copy)
@@ -18,6 +18,9 @@
  * information.
  */
 
+#ifndef CONV_IGES_IGES_STRUCT_H
+#define CONV_IGES_IGES_STRUCT_H
+
 #include "common.h"
 
 #include <stdlib.h>
@@ -318,6 +321,8 @@
 extern void Readcols(char *id, int cols);
 extern void Readmatrix(int xform, mat_t rot);
 
+#endif /* CONV_IGES_IGES_STRUCT_H */
+
 /*
  * Local Variables:
  * mode: C
Index: src/conv/shp/shapelib/shapefil.h
===================================================================
--- src/conv/shp/shapelib/shapefil.h	(revision 58931)
+++ src/conv/shp/shapelib/shapefil.h	(working copy)
@@ -1,5 +1,5 @@
-#ifndef SHAPEFILE_H_INCLUDED
-#define SHAPEFILE_H_INCLUDED
+#ifndef CONV_SHP_SHAPELIB_SHAPEFIL_H
+#define CONV_SHP_SHAPELIB_SHAPEFIL_H
 
 /******************************************************************************
  * $Id: shapefil.h,v 1.47 2010-01-28 11:34:34 fwarmerdam Exp $
@@ -609,4 +609,4 @@
 }
 #endif
 
-#endif /* ndef SHAPEFILE_H_INCLUDED */
+#endif /* CONV_SHP_SHAPELIB_SHAPEFIL_H */
Index: src/conv/patch/patch-g.h
===================================================================
--- src/conv/patch/patch-g.h	(revision 58931)
+++ src/conv/patch/patch-g.h	(working copy)
@@ -18,6 +18,9 @@
  * information.
  */
 
+#ifndef CONV_PATCH_PATCH_G_H
+#define CONV_PATCH_PATCH_G_H
+
 #include "vmath.h"
 
 /* structures are currently using approximately this much memory:
@@ -142,7 +145,9 @@
 
 struct rt_wdb *outfp;
 
+#endif /* CONV_PATCH_PATCH_G_H */
 
+
 /*
  * Local Variables:
  * mode: C
Index: src/conv/step/BRLCADWrapper.h
===================================================================
--- src/conv/step/BRLCADWrapper.h	(revision 58931)
+++ src/conv/step/BRLCADWrapper.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef BRLCADWRAPPER_H_
-#define BRLCADWRAPPER_H_
+#ifndef CONV_STEP_BRLCADWRAPPER_H
+#define CONV_STEP_BRLCADWRAPPER_H
 
 #include "common.h"
 
@@ -61,7 +61,7 @@
 };
 
 
-#endif /* BRLCADWRAPPER_H_ */
+#endif /* CONV_STEP_BRLCADWRAPPER_H */
 
 /*
  * Local Variables:
Index: src/conv/step/g-step/G_STEP_internal.h
===================================================================
--- src/conv/step/g-step/G_STEP_internal.h	(revision 58931)
+++ src/conv/step/g-step/G_STEP_internal.h	(working copy)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef G_STEP_internal_H_
-#define G_STEP_internal_H_
+#ifndef CONV_STEP_G_STEP_G_STEP_INTERNAL_H
+#define CONV_STEP_G_STEP_G_STEP_INTERNAL_H
 
 #include "STEPWrapper.h"
 
@@ -34,7 +34,7 @@
 STEPentity * Add_Shape_Definition_Representation(Registry *registry, InstMgr *instance_list, SdaiRepresentation *sdairep);
 STEPcomplex * Add_Default_Geometric_Context(Registry *registry, InstMgr *instance_list);
 
-#endif /* G_STEP_internal_H_ */
+#endif /* CONV_STEP_G_STEP_G_STEP_INTERNAL_H */
 
 /*
  * Local Variables:
Index: src/conv/step/g-step/Assembly_Product.h
===================================================================
--- src/conv/step/g-step/Assembly_Product.h	(revision 58931)
+++ src/conv/step/g-step/Assembly_Product.h	(working copy)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef ASSEMBLY_PRODUCT_H_
-#define ASSEMBLY_PRODUCT_H_
+#ifndef CONV_STEP_G_STEP_ASSEMBLY_PRODUCT_H
+#define CONV_STEP_G_STEP_ASSEMBLY_PRODUCT_H
 
 #include "common.h"
 #include <map>
@@ -35,7 +35,7 @@
 				 Registry *registry,
 				 InstMgr *instance_list);
 
-#endif /* ASSEMBLY_PRODUCT_H_ */
+#endif /* CONV_STEP_G_STEP_ASSEMBLY_PRODUCT_H */
 /*
  * Local Variables:
  * tab-width: 8
Index: src/conv/step/g-step/ON_Brep.h
===================================================================
--- src/conv/step/g-step/ON_Brep.h	(revision 58931)
+++ src/conv/step/g-step/ON_Brep.h	(working copy)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef ON_BREP_H_
-#define ON_BREP_H_
+#ifndef CONV_STEP_G_STEP_ON_BREP_H
+#define CONV_STEP_G_STEP_ON_BREP_H
 
 #include "common.h"
 #include <map>
@@ -62,7 +62,7 @@
 void ON_BRep_to_STEP(struct directory *dp, ON_Brep *brep, Registry *registry,
        	InstMgr *instance_list, STEPentity **brep_shape, STEPentity **brep_product);
 
-#endif /* ON_BREP_H_ */
+#endif /* CONV_STEP_G_STEP_ON_BREP_H */
 
 /*
  * Local Variables:
Index: src/conv/step/g-step/Comb_Tree.h
===================================================================
--- src/conv/step/g-step/Comb_Tree.h	(revision 58931)
+++ src/conv/step/g-step/Comb_Tree.h	(working copy)
@@ -21,8 +21,8 @@
  *
  */
 
-#ifndef COMB_TREE_H_
-#define COMB_TREE_H_
+#ifndef CONV_STEP_G_STEP_COMB_TREE_H
+#define CONV_STEP_G_STEP_COMB_TREE_H
 
 #include "common.h"
 #include <map>
@@ -40,7 +40,7 @@
                               Registry *registry,
                               InstMgr *instance_list);
 
-#endif /* COMB_TREE_H_ */
+#endif /* CONV_STEP_G_STEP_COMB_TREE_H */
 /*
  * Local Variables:
  * tab-width: 8
Index: src/conv/step/step-g/RationalBSplineSurfaceWithKnots.h
===================================================================
--- src/conv/step/step-g/RationalBSplineSurfaceWithKnots.h	(revision 58931)
+++ src/conv/step/step-g/RationalBSplineSurfaceWithKnots.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALBSPLINESURFACEWITHKNOTS_H_
-#define RATIONALBSPLINESURFACEWITHKNOTS_H_
+#ifndef CONV_STEP_STEP_G_RATIONALBSPLINESURFACEWITHKNOTS_H
+#define CONV_STEP_STEP_G_RATIONALBSPLINESURFACEWITHKNOTS_H
 
 #include "RationalBSplineSurface.h"
 #include "BSplineSurfaceWithKnots.h"
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALBSPLINESURFACEWITHKNOTS_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALBSPLINESURFACEWITHKNOTS_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ElementarySurface.h
===================================================================
--- src/conv/step/step-g/ElementarySurface.h	(revision 58931)
+++ src/conv/step/step-g/ElementarySurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef ELEMENTARY_SURFACE_H_
-#define ELEMENTARY_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_ELEMENTARYSURFACE_H
+#define CONV_STEP_STEP_G_ELEMENTARYSURFACE_H
 
 #include "Surface.h"
 
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* ELEMENTARY_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_ELEMENTARYSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductCategory.h
===================================================================
--- src/conv/step/step-g/ProductCategory.h	(revision 58931)
+++ src/conv/step/step-g/ProductCategory.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_CATEGORY_H_
-#define PRODUCT_CATEGORY_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTCATEGORY_H
+#define CONV_STEP_STEP_G_PRODUCTCATEGORY_H
 
 #include "STEPEntity.h"
 
@@ -59,7 +59,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_CATEGORY_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTCATEGORY_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/GeometricRepresentationItem.h
===================================================================
--- src/conv/step/step-g/GeometricRepresentationItem.h	(revision 58931)
+++ src/conv/step/step-g/GeometricRepresentationItem.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef GEOMETRICREPRESENTATIONITEM_H_
-#define GEOMETRICREPRESENTATIONITEM_H_
+#ifndef CONV_STEP_STEP_G_GEOMETRICREPRESENTATIONITEM_H
+#define CONV_STEP_STEP_G_GEOMETRICREPRESENTATIONITEM_H
 
 #include "RepresentationItem.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* GEOMETRICREPRESENTATIONITEM_H_ */
+#endif /* CONV_STEP_STEP_G_GEOMETRICREPRESENTATIONITEM_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RationalQuasiUniformCurve.h
===================================================================
--- src/conv/step/step-g/RationalQuasiUniformCurve.h	(revision 58931)
+++ src/conv/step/step-g/RationalQuasiUniformCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALQUASIUNIFORMCURVE_H_
-#define RATIONALQUASIUNIFORMCURVE_H_
+#ifndef CONV_STEP_STEP_G_RATIONALQUASIUNIFORMCURVE_H
+#define CONV_STEP_STEP_G_RATIONALQUASIUNIFORMCURVE_H
 
 #include "RationalBSplineCurve.h"
 #include "QuasiUniformCurve.h"
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALQUASIUNIFORMCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALQUASIUNIFORMCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LengthConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/LengthConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/LengthConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LENGTHCONVERSIONBASEDUNIT_H_
-#define LENGTHCONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_LENGTHCONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_LENGTHCONVERSIONBASEDUNIT_H
 
 #include "LengthUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LENGTHCONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_LENGTHCONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/OrientedClosedShell.h
===================================================================
--- src/conv/step/step-g/OrientedClosedShell.h	(revision 58931)
+++ src/conv/step/step-g/OrientedClosedShell.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef ORIENTEDCLOSEDSHELL_H_
-#define ORIENTEDCLOSEDSHELL_H_
+#ifndef CONV_STEP_STEP_G_ORIENTEDCLOSEDSHELL_H
+#define CONV_STEP_STEP_G_ORIENTEDCLOSEDSHELL_H
 
 #include "ClosedShell.h"
 
@@ -51,7 +51,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* ORIENTEDCLOSEDSHELL_H_ */
+#endif /* CONV_STEP_STEP_G_ORIENTEDCLOSEDSHELL_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LengthMeasureWithUnit.h
===================================================================
--- src/conv/step/step-g/LengthMeasureWithUnit.h	(revision 58931)
+++ src/conv/step/step-g/LengthMeasureWithUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LENGTH_MEASURE_WITH_UNIT_H_
-#define LENGTH_MEASURE_WITH_UNIT_H_
+#ifndef CONV_STEP_STEP_G_LENGTHMEASUREWITHUNIT_H
+#define CONV_STEP_STEP_G_LENGTHMEASUREWITHUNIT_H
 
 #include "MeasureWithUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LENGTH_MEASURE_WITH_UNIT_H_ */
+#endif /* CONV_STEP_STEP_G_LENGTHMEASUREWITHUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/OffsetSurface.h
===================================================================
--- src/conv/step/step-g/OffsetSurface.h	(revision 58931)
+++ src/conv/step/step-g/OffsetSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef OFFSET_SURFACE_H_
-#define OFFSET_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_OFFSETSURFACE_H
+#define CONV_STEP_STEP_G_OFFSETSURFACE_H
 
 #include "Surface.h"
 
@@ -51,7 +51,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* OFFSET_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_OFFSETSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/VolumeContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/VolumeContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/VolumeContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef VOLUMECONTEXTDEPENDENTUNIT_H_
-#define VOLUMECONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_VOLUMECONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_VOLUMECONTEXTDEPENDENTUNIT_H
 
 #include "VolumeUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* VOLUMECONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_VOLUMECONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Transformation.h
===================================================================
--- src/conv/step/step-g/Transformation.h	(revision 58931)
+++ src/conv/step/step-g/Transformation.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef TRANSFORMATION_H_
-#define TRANSFORMATION_H_
+#ifndef CONV_STEP_STEP_G_TRANSFORMATION_H
+#define CONV_STEP_STEP_G_TRANSFORMATION_H
 
 #include "STEPEntity.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* TRANSFORMATION_H_ */
+#endif /* CONV_STEP_STEP_G_TRANSFORMATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/GeometricRepresentationContext.h
===================================================================
--- src/conv/step/step-g/GeometricRepresentationContext.h	(revision 58931)
+++ src/conv/step/step-g/GeometricRepresentationContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef GEOMETRICREPRESENTATIONCONTEXT_H_
-#define GEOMETRICREPRESENTATIONCONTEXT_H_
+#ifndef CONV_STEP_STEP_G_GEOMETRICREPRESENTATIONCONTEXT_H
+#define CONV_STEP_STEP_G_GEOMETRICREPRESENTATIONCONTEXT_H
 
 #include "RepresentationContext.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* GEOMETRICREPRESENTATIONCONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_GEOMETRICREPRESENTATIONCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Axis2Placement3D.h
===================================================================
--- src/conv/step/step-g/Axis2Placement3D.h	(revision 58931)
+++ src/conv/step/step-g/Axis2Placement3D.h	(working copy)
@@ -63,7 +63,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AXIS2_PLACEMENT_3D_H_ */
+#endif /* CONV_STEP_STEP_G_AXIS2PLACEMENT3D_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/PlaneAngleConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/PlaneAngleConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/PlaneAngleConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PLANEANGLECONVERSIONBASEDUNIT_H_
-#define PLANEANGLECONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_PLANEANGLECONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_PLANEANGLECONVERSIONBASEDUNIT_H
 
 #include "PlaneAngleUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PLANEANGLECONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_PLANEANGLECONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/PCurveOrSurface.h
===================================================================
--- src/conv/step/step-g/PCurveOrSurface.h	(revision 58931)
+++ src/conv/step/step-g/PCurveOrSurface.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PCURVEORSURFACE_H_
-#define PCURVEORSURFACE_H_
+#ifndef CONV_STEP_STEP_G_PCURVEORSURFACE_H
+#define CONV_STEP_STEP_G_PCURVEORSURFACE_H
 
 #include "STEPEntity.h"
 
@@ -61,7 +61,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PCURVEORSURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_PCURVEORSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Line.h
===================================================================
--- src/conv/step/step-g/Line.h	(revision 58931)
+++ src/conv/step/step-g/Line.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LINE_H_
-#define LINE_H_
+#ifndef CONV_STEP_STEP_G_LINE_H
+#define CONV_STEP_STEP_G_LINE_H
 
 #include "Curve.h"
 
@@ -63,7 +63,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LINE_H_ */
+#endif /* CONV_STEP_STEP_G_LINE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Face.h
===================================================================
--- src/conv/step/step-g/Face.h	(revision 58931)
+++ src/conv/step/step-g/Face.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef FACE_H_
-#define FACE_H_
+#ifndef CONV_STEP_STEP_G_FACE_H
+#define CONV_STEP_STEP_G_FACE_H
 
 #include "common.h"
 
@@ -62,7 +62,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* FACE_H_ */
+#endif /* CONV_STEP_STEP_G_FACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AmountOfSubstanceConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/AmountOfSubstanceConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/AmountOfSubstanceConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AMOUNTOFSUBSTANCECONVERSIONBASEDUNIT_H_
-#define AMOUNTOFSUBSTANCECONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_AMOUNTOFSUBSTANCECONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_AMOUNTOFSUBSTANCECONVERSIONBASEDUNIT_H
 
 #include "AmountOfSubstanceUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AMOUNTOFSUBSTANCECONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_AMOUNTOFSUBSTANCECONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/FaceSurface.h
===================================================================
--- src/conv/step/step-g/FaceSurface.h	(revision 58931)
+++ src/conv/step/step-g/FaceSurface.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef FACESURFACE_H_
-#define FACESURFACE_H_
+#ifndef CONV_STEP_STEP_G_FACESURFACE_H
+#define CONV_STEP_STEP_G_FACESURFACE_H
 
 #include "Face.h"
 #include "GeometricRepresentationItem.h"
@@ -57,7 +57,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* FACESURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_FACESURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Factory.h
===================================================================
--- src/conv/step/step-g/Factory.h	(revision 58931)
+++ src/conv/step/step-g/Factory.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef FACTORY_H_
-#define FACTORY_H_
+#ifndef CONV_STEP_STEP_G_FACTORY_H
+#define CONV_STEP_STEP_G_FACTORY_H
 
 #include "common.h"
 
@@ -86,7 +86,7 @@
 };
 
 
-#endif /* FACTORY_H_ */
+#endif /* CONV_STEP_STEP_G_FACTORY_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/VertexLoop.h
===================================================================
--- src/conv/step/step-g/VertexLoop.h	(revision 58931)
+++ src/conv/step/step-g/VertexLoop.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef VERTEX_LOOP_H_
-#define VERTEX_LOOP_H_
+#ifndef CONV_STEP_STEP_G_VERTEXLOOP_H
+#define CONV_STEP_STEP_G_VERTEXLOOP_H
 
 #include "Loop.h"
 
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* VERTEX_LOOP_H_ */
+#endif /* CONV_STEP_STEP_G_VERTEXLOOP_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SweptSurface.h
===================================================================
--- src/conv/step/step-g/SweptSurface.h	(revision 58931)
+++ src/conv/step/step-g/SweptSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SWEPT_SURFACE_H_
-#define SWEPT_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_SWEPTSURFACE_H
+#define CONV_STEP_STEP_G_SWEPTSURFACE_H
 
 #include "Surface.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SWEPT_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_SWEPTSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Unit.h
===================================================================
--- src/conv/step/step-g/Unit.h	(revision 58931)
+++ src/conv/step/step-g/Unit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef UNIT_H_
-#define UNIT_H_
+#ifndef CONV_STEP_STEP_G_UNIT_H
+#define CONV_STEP_STEP_G_UNIT_H
 
 #include "STEPEntity.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* UNIT_H_ */
+#endif /* CONV_STEP_STEP_G_UNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Product.h
===================================================================
--- src/conv/step/step-g/Product.h	(revision 58931)
+++ src/conv/step/step-g/Product.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_H_
-#define PRODUCT_H_
+#ifndef CONV_STEP_STEP_G_PRODUCT_H
+#define CONV_STEP_STEP_G_PRODUCT_H
 
 #include "STEPEntity.h"
 
@@ -62,7 +62,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ThermodynamicTemperatureUnit.h
===================================================================
--- src/conv/step/step-g/ThermodynamicTemperatureUnit.h	(revision 58931)
+++ src/conv/step/step-g/ThermodynamicTemperatureUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef THERMODYNAMICTEMPERATUREUNIT_H_
-#define THERMODYNAMICTEMPERATUREUNIT_H_
+#ifndef CONV_STEP_STEP_G_THERMODYNAMICTEMPERATUREUNIT_H
+#define CONV_STEP_STEP_G_THERMODYNAMICTEMPERATUREUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* THERMODYNAMICTEMPERATUREUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_THERMODYNAMICTEMPERATUREUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LuminousIntensityUnit.h
===================================================================
--- src/conv/step/step-g/LuminousIntensityUnit.h	(revision 58931)
+++ src/conv/step/step-g/LuminousIntensityUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LUMINOUSINTENSITYUNIT_H_
-#define LUMINOUSINTENSITYUNIT_H_
+#ifndef CONV_STEP_STEP_G_LUMINOUSINTENSITYUNIT_H
+#define CONV_STEP_STEP_G_LUMINOUSINTENSITYUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LUMINOUSINTENSITYUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_LUMINOUSINTENSITYUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SphericalSurface.h
===================================================================
--- src/conv/step/step-g/SphericalSurface.h	(revision 58931)
+++ src/conv/step/step-g/SphericalSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SPHERICAL_SURFACE_H_
-#define SPHERICAL_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_SPHERICALSURFACE_H
+#define CONV_STEP_STEP_G_SPHERICALSURFACE_H
 
 #include "ElementarySurface.h"
 
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SPHERICAL_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_SPHERICALSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CartesianPoint.h
===================================================================
--- src/conv/step/step-g/CartesianPoint.h	(revision 58931)
+++ src/conv/step/step-g/CartesianPoint.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CARTESIANPOINT_H_
-#define CARTESIANPOINT_H_
+#ifndef CONV_STEP_STEP_G_CARTESIANPOINT_H
+#define CONV_STEP_STEP_G_CARTESIANPOINT_H
 
 #include "Point.h"
 
@@ -67,7 +67,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CARTESIANPOINT_H_ */
+#endif /* CONV_STEP_STEP_G_CARTESIANPOINT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BezierCurve.h
===================================================================
--- src/conv/step/step-g/BezierCurve.h	(revision 58931)
+++ src/conv/step/step-g/BezierCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BEZIERCURVE_H_
-#define BEZIERCURVE_H_
+#ifndef CONV_STEP_STEP_G_BEZIERCURVE_H
+#define CONV_STEP_STEP_G_BEZIERCURVE_H
 
 #include "BSplineCurve.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BEZIERCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_BEZIERCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductContext.h
===================================================================
--- src/conv/step/step-g/ProductContext.h	(revision 58931)
+++ src/conv/step/step-g/ProductContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_CONTEXT_H_
-#define PRODUCT_CONTEXT_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTCONTEXT_H
+#define CONV_STEP_STEP_G_PRODUCTCONTEXT_H
 
 #include "ApplicationContextElement.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_CONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/VertexPoint.h
===================================================================
--- src/conv/step/step-g/VertexPoint.h	(revision 58931)
+++ src/conv/step/step-g/VertexPoint.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef VERTEXPOINT_H_
-#define VERTEXPOINT_H_
+#ifndef CONV_STEP_STEP_G_VERTEXPOINT_H
+#define CONV_STEP_STEP_G_VERTEXPOINT_H
 
 #include "Point.h"
 #include "Vertex.h"
@@ -63,7 +63,7 @@
     virtual void AddVertex(ON_Brep *brep);
 };
 
-#endif /* VERTEXPOINT_H_ */
+#endif /* CONV_STEP_STEP_G_VERTEXPOINT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LuminousIntensityConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/LuminousIntensityConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/LuminousIntensityConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LUMINOUSINTENSITYCONVERSIONBASEDUNIT_H_
-#define LUMINOUSINTENSITYCONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_LUMINOUSINTENSITYCONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_LUMINOUSINTENSITYCONVERSIONBASEDUNIT_H
 
 #include "LuminousIntensityUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LUMINOUSINTENSITYCONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_LUMINOUSINTENSITYCONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/UniformSurface.h
===================================================================
--- src/conv/step/step-g/UniformSurface.h	(revision 58931)
+++ src/conv/step/step-g/UniformSurface.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef UNIFORMSURFACE_H_
-#define UNIFORMSURFACE_H_
+#ifndef CONV_STEP_STEP_G_UNIFORMSURFACE_H
+#define CONV_STEP_STEP_G_UNIFORMSURFACE_H
 
 #include "BSplineSurface.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* UNIFORMSURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_UNIFORMSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BoundedSurface.h
===================================================================
--- src/conv/step/step-g/BoundedSurface.h	(revision 58931)
+++ src/conv/step/step-g/BoundedSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef BOUNDEDSURFACE_H_
-#define BOUNDEDSURFACE_H_
+#ifndef CONV_STEP_STEP_G_BOUNDEDSURFACE_H
+#define CONV_STEP_STEP_G_BOUNDEDSURFACE_H
 
 #include "Surface.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BOUNDEDSURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_BOUNDEDSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BoundedSurfaceCurve.h
===================================================================
--- src/conv/step/step-g/BoundedSurfaceCurve.h	(revision 58931)
+++ src/conv/step/step-g/BoundedSurfaceCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BOUNDEDSURFACECURVE_H_
-#define BOUNDEDSURFACECURVE_H_
+#ifndef CONV_STEP_STEP_G_BOUNDEDSURFACECURVE_H
+#define CONV_STEP_STEP_G_BOUNDEDSURFACECURVE_H
 
 #include "SurfaceCurve.h"
 #include "BoundedCurve.h"
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BOUNDEDSURFACECURVE_H_ */
+#endif /* CONV_STEP_STEP_G_BOUNDEDSURFACECURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/MassContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/MassContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/MassContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MASSCONTEXTDEPENDENTUNIT_H_
-#define MASSCONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_MASSCONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_MASSCONTEXTDEPENDENTUNIT_H
 
 #include "MassUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* MASSCONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_MASSCONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RationalBSplineSurface.h
===================================================================
--- src/conv/step/step-g/RationalBSplineSurface.h	(revision 58931)
+++ src/conv/step/step-g/RationalBSplineSurface.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALBSPLINESURFACE_H_
-#define RATIONALBSPLINESURFACE_H_
+#ifndef CONV_STEP_STEP_G_RATIONALBSPLINESURFACE_H
+#define CONV_STEP_STEP_G_RATIONALBSPLINESURFACE_H
 
 #include "BSplineSurface.h"
 
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALBSPLINESURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALBSPLINESURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Vector.h
===================================================================
--- src/conv/step/step-g/Vector.h	(revision 58931)
+++ src/conv/step/step-g/Vector.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef VECTOR_H_
-#define VECTOR_H_
+#ifndef CONV_STEP_STEP_G_VECTOR_H
+#define CONV_STEP_STEP_G_VECTOR_H
 
 #include "GeometricRepresentationItem.h"
 
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* VECTOR_H_ */
+#endif /* CONV_STEP_STEP_G_VECTOR_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CartesianTransformationOperator3D.h
===================================================================
--- src/conv/step/step-g/CartesianTransformationOperator3D.h	(revision 58931)
+++ src/conv/step/step-g/CartesianTransformationOperator3D.h	(working copy)
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CARTESIAN_TRANSFORMATION_OPERATOR_3D_H_ */
+#endif /* CONV_STEP_STEP_G_CARTESIANTRANSFORMATIONOPERATOR3D_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/DimensionalExponents.h
===================================================================
--- src/conv/step/step-g/DimensionalExponents.h	(revision 58931)
+++ src/conv/step/step-g/DimensionalExponents.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef DIMENSIONALEXPONENTS_H_
-#define DIMENSIONALEXPONENTS_H_
+#ifndef CONV_STEP_STEP_G_DIMENSIONALEXPONENTS_H
+#define CONV_STEP_STEP_G_DIMENSIONALEXPONENTS_H
 
 #include "STEPEntity.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* DIMENSIONALEXPONENTS_H_ */
+#endif /* CONV_STEP_STEP_G_DIMENSIONALEXPONENTS_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Loop.h
===================================================================
--- src/conv/step/step-g/Loop.h	(revision 58931)
+++ src/conv/step/step-g/Loop.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LOOP_H_
-#define LOOP_H_
+#ifndef CONV_STEP_STEP_G_LOOP_H
+#define CONV_STEP_STEP_G_LOOP_H
 
 #include "TopologicalRepresentationItem.h"
 
@@ -57,7 +57,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LOOP_H_ */
+#endif /* CONV_STEP_STEP_G_LOOP_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LengthContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/LengthContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/LengthContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LENGTHCONTEXTDEPENDENTUNIT_H_
-#define LENGTHCONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_LENGTHCONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_LENGTHCONTEXTDEPENDENTUNIT_H
 
 #include "LengthUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LENGTHCONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_LENGTHCONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ShapeRepresentation.h
===================================================================
--- src/conv/step/step-g/ShapeRepresentation.h	(revision 58931)
+++ src/conv/step/step-g/ShapeRepresentation.h	(working copy)
@@ -23,8 +23,8 @@
  * structures.
  *
  */
-#ifndef SHAPEREPRESENTATION_H_
-#define SHAPEREPRESENTATION_H_
+#ifndef CONV_STEP_STEP_G_SHAPEREPRESENTATION_H
+#define CONV_STEP_STEP_G_SHAPEREPRESENTATION_H
 
 #include "common.h"
 
@@ -57,7 +57,7 @@
 };
 
 
-#endif /* SHAPEREPRESENTATION_H_ */
+#endif /* CONV_STEP_STEP_G_SHAPEREPRESENTATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/UncertaintyMeasureWithUnit.h
===================================================================
--- src/conv/step/step-g/UncertaintyMeasureWithUnit.h	(revision 58931)
+++ src/conv/step/step-g/UncertaintyMeasureWithUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef UNCERTAINTYMEASUREWITHUNIT_H_
-#define UNCERTAINTYMEASUREWITHUNIT_H_
+#ifndef CONV_STEP_STEP_G_UNCERTAINTYMEASUREWITHUNIT_H
+#define CONV_STEP_STEP_G_UNCERTAINTYMEASUREWITHUNIT_H
 
 #include "MeasureWithUnit.h"
 
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* UNCERTAINTYMEASUREWITHUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_UNCERTAINTYMEASUREWITHUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Curve.h
===================================================================
--- src/conv/step/step-g/Curve.h	(revision 58931)
+++ src/conv/step/step-g/Curve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CURVE_H_
-#define CURVE_H_
+#ifndef CONV_STEP_STEP_G_CURVE_H
+#define CONV_STEP_STEP_G_CURVE_H
 
 #include "GeometricRepresentationItem.h"
 class Vertex;
@@ -78,7 +78,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CURVE_H_ */
+#endif /* CONV_STEP_STEP_G_CURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RationalQuasiUniformSurface.h
===================================================================
--- src/conv/step/step-g/RationalQuasiUniformSurface.h	(revision 58931)
+++ src/conv/step/step-g/RationalQuasiUniformSurface.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALQUASIUNIFORMSURFACE_H_
-#define RATIONALQUASIUNIFORMSURFACE_H_
+#ifndef CONV_STEP_STEP_G_RATIONALQUASIUNIFORMSURFACE_H
+#define CONV_STEP_STEP_G_RATIONALQUASIUNIFORMSURFACE_H
 
 #include "RationalBSplineSurface.h"
 #include "QuasiUniformSurface.h"
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALQUASIUNIFORMSURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALQUASIUNIFORMSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ThermodynamicTemperatureConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/ThermodynamicTemperatureConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/ThermodynamicTemperatureConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef THERMODYNAMICTEMPERATURECONVERSIONBASEDUNIT_H_
-#define THERMODYNAMICTEMPERATURECONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_THERMODYNAMICTEMPERATURECONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_THERMODYNAMICTEMPERATURECONVERSIONBASEDUNIT_H
 
 #include "ThermodynamicTemperatureUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* THERMODYNAMICTEMPERATURECONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_THERMODYNAMICTEMPERATURECONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SurfaceOfLinearExtrusion.h
===================================================================
--- src/conv/step/step-g/SurfaceOfLinearExtrusion.h	(revision 58931)
+++ src/conv/step/step-g/SurfaceOfLinearExtrusion.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SURFACE_OF_LINEAR_EXTRUSION_H_
-#define SURFACE_OF_LINEAR_EXTRUSION_H_
+#ifndef CONV_STEP_STEP_G_SURFACEOFLINEAREXTRUSION_H
+#define CONV_STEP_STEP_G_SURFACEOFLINEAREXTRUSION_H
 
 #include "SweptSurface.h"
 
@@ -53,7 +53,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SURFACE_OF_LINEAR_EXTRUSION_H_ */
+#endif /* CONV_STEP_STEP_G_SURFACEOFLINEAREXTRUSION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/TimeContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/TimeContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/TimeContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef TIMECONTEXTDEPENDENTUNIT_H_
-#define TIMECONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_TIMECONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_TIMECONTEXTDEPENDENTUNIT_H
 
 #include "TimeUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* TIMECONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_TIMECONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AmountOfSubstanceContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/AmountOfSubstanceContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/AmountOfSubstanceContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AMOUNTOFSUBSTANCECONTEXTDEPENDENTUNIT_H_
-#define AMOUNTOFSUBSTANCECONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_AMOUNTOFSUBSTANCECONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_AMOUNTOFSUBSTANCECONTEXTDEPENDENTUNIT_H
 
 #include "AmountOfSubstanceUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AMOUNTOFSUBSTANCECONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_AMOUNTOFSUBSTANCECONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductDefinitionFormationWithSpecifiedSource.h
===================================================================
--- src/conv/step/step-g/ProductDefinitionFormationWithSpecifiedSource.h	(revision 58931)
+++ src/conv/step/step-g/ProductDefinitionFormationWithSpecifiedSource.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_DEFINITION_FORMATION_WITH_SPECIFIED_SOURCE_H_
-#define PRODUCT_DEFINITION_FORMATION_WITH_SPECIFIED_SOURCE_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTDEFINITIONFORMATIONWITHSPECIFIEDSOURCE_H
+#define CONV_STEP_STEP_G_PRODUCTDEFINITIONFORMATIONWITHSPECIFIEDSOURCE_H
 
 #include "STEPEntity.h"
 
@@ -59,7 +59,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_DEFINITION_FORMATION_WITH_SPECIFIED_SOURCE_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTDEFINITIONFORMATIONWITHSPECIFIEDSOURCE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/VolumeSiUnit.h
===================================================================
--- src/conv/step/step-g/VolumeSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/VolumeSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef VOLUMESIUNIT_H_
-#define VOLUMESIUNIT_H_
+#ifndef CONV_STEP_STEP_G_VOLUMESIUNIT_H
+#define CONV_STEP_STEP_G_VOLUMESIUNIT_H
 
 #include "VolumeUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* VOLUMESIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_VOLUMESIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RectangularCompositeSurface.h
===================================================================
--- src/conv/step/step-g/RectangularCompositeSurface.h	(revision 58931)
+++ src/conv/step/step-g/RectangularCompositeSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef RECTANGULAR_COMPOSITE_SURFACE_H_
-#define RECTANGULAR_COMPOSITE_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_RECTANGULARCOMPOSITESURFACE_H
+#define CONV_STEP_STEP_G_RECTANGULARCOMPOSITESURFACE_H
 
 #include "BoundedSurface.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RECTANGULAR_COMPOSITE_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_RECTANGULARCOMPOSITESURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/TimeConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/TimeConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/TimeConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef TIMECONVERSIONBASEDUNIT_H_
-#define TIMECONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_TIMECONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_TIMECONVERSIONBASEDUNIT_H
 
 #include "TimeUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* TIMECONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_TIMECONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/FaceOuterBound.h
===================================================================
--- src/conv/step/step-g/FaceOuterBound.h	(revision 58931)
+++ src/conv/step/step-g/FaceOuterBound.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef FACEOUTERBOUND_H_
-#define FACEOUTERBOUND_H_
+#ifndef CONV_STEP_STEP_G_FACEOUTERBOUND_H
+#define CONV_STEP_STEP_G_FACEOUTERBOUND_H
 
 #include "FaceBound.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* FACEOUTERBOUND_H_ */
+#endif /* CONV_STEP_STEP_G_FACEOUTERBOUND_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/STEPEntity.h
===================================================================
--- src/conv/step/step-g/STEPEntity.h	(revision 58931)
+++ src/conv/step/step-g/STEPEntity.h	(working copy)
@@ -18,8 +18,8 @@
  * information.
  */
 
-#ifndef STEPENTITY_H_
-#define STEPENTITY_H_
+#ifndef CONV_STEP_STEP_G_STEPENTITY_H
+#define CONV_STEP_STEP_G_STEPENTITY_H
 
 #include "common.h"
 
@@ -79,7 +79,7 @@
 };
 
 
-#endif /* STEPENTITY_H_ */
+#endif /* CONV_STEP_STEP_G_STEPENTITY_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductRelatedProductCategory.h
===================================================================
--- src/conv/step/step-g/ProductRelatedProductCategory.h	(revision 58931)
+++ src/conv/step/step-g/ProductRelatedProductCategory.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_RELATED_PRODUCT_CATEGORY_H_
-#define PRODUCT_RELATED_PRODUCT_CATEGORY_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTRELATEDPRODUCTCATEGORY_H
+#define CONV_STEP_STEP_G_PRODUCTRELATEDPRODUCTCATEGORY_H
 
 #include "STEPEntity.h"
 
@@ -60,7 +60,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_RELATED_PRODUCT_CATEGORY_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTRELATEDPRODUCTCATEGORY_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SolidAngleUnit.h
===================================================================
--- src/conv/step/step-g/SolidAngleUnit.h	(revision 58931)
+++ src/conv/step/step-g/SolidAngleUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SOLIDANGLEUNIT_H_
-#define SOLIDANGLEUNIT_H_
+#ifndef CONV_STEP_STEP_G_SOLIDANGLEUNIT_H
+#define CONV_STEP_STEP_G_SOLIDANGLEUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SOLIDANGLEUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_SOLIDANGLEUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AdvancedBrepShapeRepresentation.h
===================================================================
--- src/conv/step/step-g/AdvancedBrepShapeRepresentation.h	(revision 58931)
+++ src/conv/step/step-g/AdvancedBrepShapeRepresentation.h	(working copy)
@@ -23,8 +23,8 @@
  * structures.
  *
  */
-#ifndef ADVANCEDBREPSHAPEREPRESENTATION_H_
-#define ADVANCEDBREPSHAPEREPRESENTATION_H_
+#ifndef CONV_STEP_STEP_G_ADVANCEDBREPSHAPEREPRESENTATION_H
+#define CONV_STEP_STEP_G_ADVANCEDBREPSHAPEREPRESENTATION_H
 
 #include "common.h"
 
@@ -66,7 +66,7 @@
 };
 
 
-#endif /* ADVANCEDBREPSHAPEREPRESENTATION_H_ */
+#endif /* CONV_STEP_STEP_G_ADVANCEDBREPSHAPEREPRESENTATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/DerivedUnit.h
===================================================================
--- src/conv/step/step-g/DerivedUnit.h	(revision 58931)
+++ src/conv/step/step-g/DerivedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef DERIVEDUNIT_H_
-#define DERIVEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_DERIVEDUNIT_H
+#define CONV_STEP_STEP_G_DERIVEDUNIT_H
 
 #include "Unit.h"
 
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* DERIVEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_DERIVEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SurfaceReplica.h
===================================================================
--- src/conv/step/step-g/SurfaceReplica.h	(revision 58931)
+++ src/conv/step/step-g/SurfaceReplica.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SURFACE_REPLICA_H_
-#define SURFACE_REPLICA_H_
+#ifndef CONV_STEP_STEP_G_SURFACEREPLICA_H
+#define CONV_STEP_STEP_G_SURFACEREPLICA_H
 
 #include "Surface.h"
 
@@ -53,7 +53,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SURFACE_REPLICA_H_ */
+#endif /* CONV_STEP_STEP_G_SURFACEREPLICA_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/TimeSiUnit.h
===================================================================
--- src/conv/step/step-g/TimeSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/TimeSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef TIMESIUNIT_H_
-#define TIMESIUNIT_H_
+#ifndef CONV_STEP_STEP_G_TIMESIUNIT_H
+#define CONV_STEP_STEP_G_TIMESIUNIT_H
 
 #include "TimeUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* TIMESIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_TIMESIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Ellipse.h
===================================================================
--- src/conv/step/step-g/Ellipse.h	(revision 58931)
+++ src/conv/step/step-g/Ellipse.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef ELLIPSE_H_
-#define ELLIPSE_H_
+#ifndef CONV_STEP_STEP_G_ELLIPSE_H
+#define CONV_STEP_STEP_G_ELLIPSE_H
 
 #include "Conic.h"
 
@@ -59,7 +59,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* ELLIPSE_H_ */
+#endif /* CONV_STEP_STEP_G_ELLIPSE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AreaSiUnit.h
===================================================================
--- src/conv/step/step-g/AreaSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/AreaSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AREASIUNIT_H_
-#define AREASIUNIT_H_
+#ifndef CONV_STEP_STEP_G_AREASIUNIT_H
+#define CONV_STEP_STEP_G_AREASIUNIT_H
 
 #include "AreaUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AREASIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_AREASIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Edge.h
===================================================================
--- src/conv/step/step-g/Edge.h	(revision 58931)
+++ src/conv/step/step-g/Edge.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef EDGE_H_
-#define EDGE_H_
+#ifndef CONV_STEP_STEP_G_EDGE_H
+#define CONV_STEP_STEP_G_EDGE_H
 
 #include "TopologicalRepresentationItem.h"
 
@@ -60,7 +60,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* EDGE_H_ */
+#endif /* CONV_STEP_STEP_G_EDGE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RationalBSplineCurveWithKnots.h
===================================================================
--- src/conv/step/step-g/RationalBSplineCurveWithKnots.h	(revision 58931)
+++ src/conv/step/step-g/RationalBSplineCurveWithKnots.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALBSPLINECURVEWITHKNOTS_H_
-#define RATIONALBSPLINECURVEWITHKNOTS_H_
+#ifndef CONV_STEP_STEP_G_RATIONALBSPLINECURVEWITHKNOTS_H
+#define CONV_STEP_STEP_G_RATIONALBSPLINECURVEWITHKNOTS_H
 
 #include "RationalBSplineCurve.h"
 #include "BSplineCurveWithKnots.h"
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALBSPLINECURVEWITHKNOTS_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALBSPLINECURVEWITHKNOTS_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/PlaneAngleUnit.h
===================================================================
--- src/conv/step/step-g/PlaneAngleUnit.h	(revision 58931)
+++ src/conv/step/step-g/PlaneAngleUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PLANEANGLEUNIT_H_
-#define PLANEANGLEUNIT_H_
+#ifndef CONV_STEP_STEP_G_PLANEANGLEUNIT_H
+#define CONV_STEP_STEP_G_PLANEANGLEUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PLANEANGLEUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_PLANEANGLEUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RepresentationRelationship.h
===================================================================
--- src/conv/step/step-g/RepresentationRelationship.h	(revision 58931)
+++ src/conv/step/step-g/RepresentationRelationship.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef REPRESENTATION_RELATIONSHIP_H_
-#define REPRESENTATION_RELATIONSHIP_H_
+#ifndef CONV_STEP_STEP_G_REPRESENTATIONRELATIONSHIP_H
+#define CONV_STEP_STEP_G_REPRESENTATIONRELATIONSHIP_H
 
 #include "STEPEntity.h"
 
@@ -65,7 +65,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* REPRESENTATION_RELATIONSHIP_H_ */
+#endif /* CONV_STEP_STEP_G_REPRESENTATIONRELATIONSHIP_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/ConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/ConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CONVERSIONBASEDUNIT_H_
-#define CONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_CONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_CONVERSIONBASEDUNIT_H
 
 #include "NamedUnit.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_CONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SolidAngleConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/SolidAngleConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/SolidAngleConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SOLIDANGLECONVERSIONBASEDUNIT_H_
-#define SOLIDANGLECONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_SOLIDANGLECONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_SOLIDANGLECONVERSIONBASEDUNIT_H
 
 #include "SolidAngleUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SOLIDANGLECONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_SOLIDANGLECONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Point.h
===================================================================
--- src/conv/step/step-g/Point.h	(revision 58931)
+++ src/conv/step/step-g/Point.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef POINT_H_
-#define POINT_H_
+#ifndef CONV_STEP_STEP_G_POINT_H
+#define CONV_STEP_STEP_G_POINT_H
 
 #include "GeometricRepresentationItem.h"
 
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* POINT_H_ */
+#endif /* CONV_STEP_STEP_G_POINT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/DerivedUnitElement.h
===================================================================
--- src/conv/step/step-g/DerivedUnitElement.h	(revision 58931)
+++ src/conv/step/step-g/DerivedUnitElement.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef DERIVEDUNITELEMENT_H_
-#define DERIVEDUNITELEMENT_H_
+#ifndef CONV_STEP_STEP_G_DERIVEDUNITELEMENT_H
+#define CONV_STEP_STEP_G_DERIVEDUNITELEMENT_H
 
 #include "STEPEntity.h"
 
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* DERIVEDUNITELEMENT_H_ */
+#endif /* CONV_STEP_STEP_G_DERIVEDUNITELEMENT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/PropertyDefinition.h
===================================================================
--- src/conv/step/step-g/PropertyDefinition.h	(revision 58931)
+++ src/conv/step/step-g/PropertyDefinition.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PROPERTY_DEFINITION_H_
-#define PROPERTY_DEFINITION_H_
+#ifndef CONV_STEP_STEP_G_PROPERTYDEFINITION_H
+#define CONV_STEP_STEP_G_PROPERTYDEFINITION_H
 
 #include "STEPEntity.h"
 
@@ -61,7 +61,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PROPERTY_DEFINITION_H_ */
+#endif /* CONV_STEP_STEP_G_PROPERTYDEFINITION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ShapeRepresentationRelationship.h
===================================================================
--- src/conv/step/step-g/ShapeRepresentationRelationship.h	(revision 58931)
+++ src/conv/step/step-g/ShapeRepresentationRelationship.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SHAPE_REPRESENTATION_RELATIONSHIP_H_
-#define SHAPE_REPRESENTATION_RELATIONSHIP_H_
+#ifndef CONV_STEP_STEP_G_SHAPEREPRESENTATIONRELATIONSHIP_H
+#define CONV_STEP_STEP_G_SHAPEREPRESENTATIONRELATIONSHIP_H
 
 #include "STEPEntity.h"
 
@@ -56,7 +56,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SHAPE_REPRESENTATION_RELATIONSHIP_H_ */
+#endif /* CONV_STEP_STEP_G_SHAPEREPRESENTATIONRELATIONSHIP_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SurfacePatch.h
===================================================================
--- src/conv/step/step-g/SurfacePatch.h	(revision 58931)
+++ src/conv/step/step-g/SurfacePatch.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SURFACE_PATCH_H_
-#define SURFACE_PATCH_H_
+#ifndef CONV_STEP_STEP_G_SURFACEPATCH_H
+#define CONV_STEP_STEP_G_SURFACEPATCH_H
 
 #include "FoundedItem.h"
 
@@ -56,7 +56,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SURFACE_PATCH_H_ */
+#endif /* CONV_STEP_STEP_G_SURFACEPATCH_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/ContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/ContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CONTEXTDEPENDENTUNIT_H_
-#define CONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_CONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_CONTEXTDEPENDENTUNIT_H
 
 #include "NamedUnit.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_CONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ThermodynamicTemperatureContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/ThermodynamicTemperatureContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/ThermodynamicTemperatureContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef THERMODYNAMICTEMPERATURECONTEXTDEPENDENTUNIT_H_
-#define THERMODYNAMICTEMPERATURECONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_THERMODYNAMICTEMPERATURECONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_THERMODYNAMICTEMPERATURECONTEXTDEPENDENTUNIT_H
 
 #include "ThermodynamicTemperatureUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* THERMODYNAMICTEMPERATURECONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_THERMODYNAMICTEMPERATURECONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AreaConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/AreaConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/AreaConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AREACONVERSIONBASEDUNIT_H_
-#define AREACONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_AREACONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_AREACONVERSIONBASEDUNIT_H
 
 #include "AreaUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AREACONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_AREACONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LuminousIntensityContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/LuminousIntensityContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/LuminousIntensityContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LUMINOUSINTENSITYCONTEXTDEPENDENTUNIT_H_
-#define LUMINOUSINTENSITYCONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_LUMINOUSINTENSITYCONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_LUMINOUSINTENSITYCONTEXTDEPENDENTUNIT_H
 
 #include "LuminousIntensityUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LUMINOUSINTENSITYCONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_LUMINOUSINTENSITYCONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Axis2Placement.h
===================================================================
--- src/conv/step/step-g/Axis2Placement.h	(revision 58931)
+++ src/conv/step/step-g/Axis2Placement.h	(working copy)
@@ -63,7 +63,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AXIS2PLACEMENT_H_ */
+#endif /* CONV_STEP_STEP_G_AXIS2PLACEMENT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ApplicationContextElement.h
===================================================================
--- src/conv/step/step-g/ApplicationContextElement.h	(revision 58931)
+++ src/conv/step/step-g/ApplicationContextElement.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef APPLICATION_CONTEXT_ELEMENT_H_
-#define APPLICATION_CONTEXT_ELEMENT_H_
+#ifndef CONV_STEP_STEP_G_APPLICATIONCONTEXTELEMENT_H
+#define CONV_STEP_STEP_G_APPLICATIONCONTEXTELEMENT_H
 
 #include "STEPEntity.h"
 
@@ -60,7 +60,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* APPLICATION_CONTEXT_ELEMENT_H_ */
+#endif /* CONV_STEP_STEP_G_APPLICATIONCONTEXTELEMENT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CurveBoundedSurface.h
===================================================================
--- src/conv/step/step-g/CurveBoundedSurface.h	(revision 58931)
+++ src/conv/step/step-g/CurveBoundedSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CURVE_BOUNDED_SURFACE_H_
-#define CURVE_BOUNDED_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_CURVEBOUNDEDSURFACE_H
+#define CONV_STEP_STEP_G_CURVEBOUNDEDSURFACE_H
 
 #include "BoundedSurface.h"
 
@@ -57,7 +57,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CURVE_BOUNDED_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_CURVEBOUNDEDSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/EdgeLoop.h
===================================================================
--- src/conv/step/step-g/EdgeLoop.h	(revision 58931)
+++ src/conv/step/step-g/EdgeLoop.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef EDGELOOP_H_
-#define EDGELOOP_H_
+#ifndef CONV_STEP_STEP_G_EDGELOOP_H
+#define CONV_STEP_STEP_G_EDGELOOP_H
 
 #include "Loop.h"
 #include "Path.h"
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* EDGELOOP_H_ */
+#endif /* CONV_STEP_STEP_G_EDGELOOP_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/FoundedItem.h
===================================================================
--- src/conv/step/step-g/FoundedItem.h	(revision 58931)
+++ src/conv/step/step-g/FoundedItem.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef FOUNDEDITEM_H_
-#define FOUNDEDITEM_H_
+#ifndef CONV_STEP_STEP_G_FOUNDEDITEM_H
+#define CONV_STEP_STEP_G_FOUNDEDITEM_H
 
 #include "STEPEntity.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* FOUNDEDITEM_H_ */
+#endif /* CONV_STEP_STEP_G_FOUNDEDITEM_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductDefinitionFormation.h
===================================================================
--- src/conv/step/step-g/ProductDefinitionFormation.h	(revision 58931)
+++ src/conv/step/step-g/ProductDefinitionFormation.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_DEFINITION_FORMATION_H_
-#define PRODUCT_DEFINITION_FORMATION_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTDEFINITIONFORMATION_H
+#define CONV_STEP_STEP_G_PRODUCTDEFINITIONFORMATION_H
 
 #include "STEPEntity.h"
 
@@ -61,7 +61,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_DEFINITION_FORMATION_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTDEFINITIONFORMATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BSplineCurveWithKnots.h
===================================================================
--- src/conv/step/step-g/BSplineCurveWithKnots.h	(revision 58931)
+++ src/conv/step/step-g/BSplineCurveWithKnots.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BSPLINECURVEWITHKNOTS_H_
-#define BSPLINECURVEWITHKNOTS_H_
+#ifndef CONV_STEP_STEP_G_BSPLINECURVEWITHKNOTS_H
+#define CONV_STEP_STEP_G_BSPLINECURVEWITHKNOTS_H
 
 #include "BSplineCurve.h"
 
@@ -57,7 +57,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BSPLINECURVEWITHKNOTS_H_ */
+#endif /* CONV_STEP_STEP_G_BSPLINECURVEWITHKNOTS_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RatioUnit.h
===================================================================
--- src/conv/step/step-g/RatioUnit.h	(revision 58931)
+++ src/conv/step/step-g/RatioUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIOUNIT_H_
-#define RATIOUNIT_H_
+#ifndef CONV_STEP_STEP_G_RATIOUNIT_H
+#define CONV_STEP_STEP_G_RATIOUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIOUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_RATIOUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/DesignContext.h
===================================================================
--- src/conv/step/step-g/DesignContext.h	(revision 58931)
+++ src/conv/step/step-g/DesignContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef DESIGN_CONTEXT_H_
-#define DESIGN_CONTEXT_H_
+#ifndef CONV_STEP_STEP_G_DESIGNCONTEXT_H
+#define CONV_STEP_STEP_G_DESIGNCONTEXT_H
 
 #include "ProductDefinitionContext.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* DESIGN_CONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_DESIGNCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductDefinitionContextRole.h
===================================================================
--- src/conv/step/step-g/ProductDefinitionContextRole.h	(revision 58931)
+++ src/conv/step/step-g/ProductDefinitionContextRole.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_DEFINITION_CONTEXT_ROLE_H_
-#define PRODUCT_DEFINITION_CONTEXT_ROLE_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTDEFINITIONCONTEXTROLE_H
+#define CONV_STEP_STEP_G_PRODUCTDEFINITIONCONTEXTROLE_H
 
 #include "STEPEntity.h"
 
@@ -59,7 +59,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_DEFINITION_CONTEXT_ROLE_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTDEFINITIONCONTEXTROLE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BoundedCurve.h
===================================================================
--- src/conv/step/step-g/BoundedCurve.h	(revision 58931)
+++ src/conv/step/step-g/BoundedCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BOUNDEDCURVE_H_
-#define BOUNDEDCURVE_H_
+#ifndef CONV_STEP_STEP_G_BOUNDEDCURVE_H
+#define CONV_STEP_STEP_G_BOUNDEDCURVE_H
 
 #include "Curve.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BOUNDEDCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_BOUNDEDCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SurfaceCurve.h
===================================================================
--- src/conv/step/step-g/SurfaceCurve.h	(revision 58931)
+++ src/conv/step/step-g/SurfaceCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SURFACECURVE_H_
-#define SURFACECURVE_H_
+#ifndef CONV_STEP_STEP_G_SURFACECURVE_H
+#define CONV_STEP_STEP_G_SURFACECURVE_H
 
 #include "Curve.h"
 
@@ -63,7 +63,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SURFACECURVE_H_ */
+#endif /* CONV_STEP_STEP_G_SURFACECURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Plane.h
===================================================================
--- src/conv/step/step-g/Plane.h	(revision 58931)
+++ src/conv/step/step-g/Plane.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef PLANE_H_
-#define PLANE_H_
+#ifndef CONV_STEP_STEP_G_PLANE_H
+#define CONV_STEP_STEP_G_PLANE_H
 
 #include "ElementarySurface.h"
 
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PLANE_H_ */
+#endif /* CONV_STEP_STEP_G_PLANE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BSplineCurve.h
===================================================================
--- src/conv/step/step-g/BSplineCurve.h	(revision 58931)
+++ src/conv/step/step-g/BSplineCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BSPLINECURVE_H_
-#define BSPLINECURVE_H_
+#ifndef CONV_STEP_STEP_G_BSPLINECURVE_H
+#define CONV_STEP_STEP_G_BSPLINECURVE_H
 
 #include "BoundedCurve.h"
 
@@ -62,7 +62,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BSPLINECURVE_H_ */
+#endif /* CONV_STEP_STEP_G_BSPLINECURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SurfaceOfRevolution.h
===================================================================
--- src/conv/step/step-g/SurfaceOfRevolution.h	(revision 58931)
+++ src/conv/step/step-g/SurfaceOfRevolution.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SURFACE_OF_REVOLUTION_H_
-#define SURFACE_OF_REVOLUTION_H_
+#ifndef CONV_STEP_STEP_G_SURFACEOFREVOLUTION_H
+#define CONV_STEP_STEP_G_SURFACEOFREVOLUTION_H
 
 #include "SweptSurface.h"
 
@@ -53,7 +53,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SURFACE_OF_REVOLUTION_H_ */
+#endif /* CONV_STEP_STEP_G_SURFACEOFREVOLUTION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductDefinitionShape.h
===================================================================
--- src/conv/step/step-g/ProductDefinitionShape.h	(revision 58931)
+++ src/conv/step/step-g/ProductDefinitionShape.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_DEFINITION_SHAPE_H_
-#define PRODUCT_DEFINITION_SHAPE_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTDEFINITIONSHAPE_H
+#define CONV_STEP_STEP_G_PRODUCTDEFINITIONSHAPE_H
 
 #include "STEPEntity.h"
 
@@ -57,7 +57,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_DEFINITION_SHAPE_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTDEFINITIONSHAPE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/VolumeConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/VolumeConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/VolumeConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef VOLUMECONVERSIONBASEDUNIT_H_
-#define VOLUMECONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_VOLUMECONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_VOLUMECONVERSIONBASEDUNIT_H
 
 #include "VolumeUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* VOLUMECONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_VOLUMECONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SolidAngleContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/SolidAngleContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/SolidAngleContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SOLIDANGLECONTEXTDEPENDENTUNIT_H_
-#define SOLIDANGLECONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_SOLIDANGLECONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_SOLIDANGLECONTEXTDEPENDENTUNIT_H
 
 #include "SolidAngleUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SOLIDANGLECONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_SOLIDANGLECONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/NamedUnit.h
===================================================================
--- src/conv/step/step-g/NamedUnit.h	(revision 58931)
+++ src/conv/step/step-g/NamedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef NAMEDUNIT_H_
-#define NAMEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_NAMEDUNIT_H
+#define CONV_STEP_STEP_G_NAMEDUNIT_H
 
 #include "Unit.h"
 
@@ -51,7 +51,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* NAMEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_NAMEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/FaceBound.h
===================================================================
--- src/conv/step/step-g/FaceBound.h	(revision 58931)
+++ src/conv/step/step-g/FaceBound.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef FACEBOUND_H_
-#define FACEBOUND_H_
+#ifndef CONV_STEP_STEP_G_FACEBOUND_H
+#define CONV_STEP_STEP_G_FACEBOUND_H
 
 #include "TopologicalRepresentationItem.h"
 
@@ -76,7 +76,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* FACEBOUND_H_ */
+#endif /* CONV_STEP_STEP_G_FACEBOUND_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/TrimmingSelect.h
===================================================================
--- src/conv/step/step-g/TrimmingSelect.h	(revision 58931)
+++ src/conv/step/step-g/TrimmingSelect.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef TRIMMINGSELECT_H_
-#define TRIMMINGSELECT_H_
+#ifndef CONV_STEP_STEP_G_TRIMMINGSELECT_H
+#define CONV_STEP_STEP_G_TRIMMINGSELECT_H
 
 #include "STEPEntity.h"
 
@@ -63,7 +63,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* TRIMMINGSELECT_H_ */
+#endif /* CONV_STEP_STEP_G_TRIMMINGSELECT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductDefinitionContextAssociation.h
===================================================================
--- src/conv/step/step-g/ProductDefinitionContextAssociation.h	(revision 58931)
+++ src/conv/step/step-g/ProductDefinitionContextAssociation.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_DEFINITION_CONTEXT_ASSOCIATION_H_
-#define PRODUCT_DEFINITION_CONTEXT_ASSOCIATION_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTDEFINITIONCONTEXTASSOCIATION_H
+#define CONV_STEP_STEP_G_PRODUCTDEFINITIONCONTEXTASSOCIATION_H
 
 #include "STEPEntity.h"
 
@@ -61,7 +61,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_DEFINITION_CONTEXT_ASSOCIATION_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTDEFINITIONCONTEXTASSOCIATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AmountOfSubstanceSiUnit.h
===================================================================
--- src/conv/step/step-g/AmountOfSubstanceSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/AmountOfSubstanceSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AMOUNTOFSUBSTANCESIUNIT_H_
-#define AMOUNTOFSUBSTANCESIUNIT_H_
+#ifndef CONV_STEP_STEP_G_AMOUNTOFSUBSTANCESIUNIT_H
+#define CONV_STEP_STEP_G_AMOUNTOFSUBSTANCESIUNIT_H
 
 #include "AmountOfSubstanceUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AMOUNTOFSUBSTANCESIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_AMOUNTOFSUBSTANCESIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Circle.h
===================================================================
--- src/conv/step/step-g/Circle.h	(revision 58931)
+++ src/conv/step/step-g/Circle.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CIRCLE_H_
-#define CIRCLE_H_
+#ifndef CONV_STEP_STEP_G_CIRCLE_H
+#define CONV_STEP_STEP_G_CIRCLE_H
 
 #include "Conic.h"
 
@@ -58,7 +58,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CIRCLE_H_ */
+#endif /* CONV_STEP_STEP_G_CIRCLE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/PlaneAngleContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/PlaneAngleContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/PlaneAngleContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PLANEANGLECONTEXTDEPENDENTUNIT_H_
-#define PLANEANGLECONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_PLANEANGLECONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_PLANEANGLECONTEXTDEPENDENTUNIT_H
 
 #include "PlaneAngleUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PLANEANGLECONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_PLANEANGLECONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/PCurve.h
===================================================================
--- src/conv/step/step-g/PCurve.h	(revision 58931)
+++ src/conv/step/step-g/PCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PCURVE_H_
-#define PCURVE_H_
+#ifndef CONV_STEP_STEP_G_PCURVE_H
+#define CONV_STEP_STEP_G_PCURVE_H
 
 #include "Curve.h"
 
@@ -58,7 +58,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_PCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/TrimmedCurve.h
===================================================================
--- src/conv/step/step-g/TrimmedCurve.h	(revision 58931)
+++ src/conv/step/step-g/TrimmedCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef TRIMMEDCURVE_H_
-#define TRIMMEDCURVE_H_
+#ifndef CONV_STEP_STEP_G_TRIMMEDCURVE_H
+#define CONV_STEP_STEP_G_TRIMMEDCURVE_H
 
 #include "BoundedCurve.h"
 
@@ -59,7 +59,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* TRIMMEDCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_TRIMMEDCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SiUnit.h
===================================================================
--- src/conv/step/step-g/SiUnit.h	(revision 58931)
+++ src/conv/step/step-g/SiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SIUNIT_H_
-#define SIUNIT_H_
+#ifndef CONV_STEP_STEP_G_SIUNIT_H
+#define CONV_STEP_STEP_G_SIUNIT_H
 
 #include "NamedUnit.h"
 
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_SIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/OffsetCurve2D.h
===================================================================
--- src/conv/step/step-g/OffsetCurve2D.h	(revision 58931)
+++ src/conv/step/step-g/OffsetCurve2D.h	(working copy)
@@ -58,7 +58,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* OFFSETCURVE2D_H_ */
+#endif /* CONV_STEP_STEP_G_OFFSETCURVE2D_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RepresentationItem.h
===================================================================
--- src/conv/step/step-g/RepresentationItem.h	(revision 58931)
+++ src/conv/step/step-g/RepresentationItem.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef REPRESENTATIONITEM_H_
-#define REPRESENTATIONITEM_H_
+#ifndef CONV_STEP_STEP_G_REPRESENTATIONITEM_H
+#define CONV_STEP_STEP_G_REPRESENTATIONITEM_H
 
 #include "STEPEntity.h"
 
@@ -56,7 +56,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* REPRESENTATIONITEM_H_ */
+#endif /* CONV_STEP_STEP_G_REPRESENTATIONITEM_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/UniformCurve.h
===================================================================
--- src/conv/step/step-g/UniformCurve.h	(revision 58931)
+++ src/conv/step/step-g/UniformCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef UNIFORMCURVE_H_
-#define UNIFORMCURVE_H_
+#ifndef CONV_STEP_STEP_G_UNIFORMCURVE_H
+#define CONV_STEP_STEP_G_UNIFORMCURVE_H
 
 #include "BSplineCurve.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* UNIFORMCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_UNIFORMCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Hyperbola.h
===================================================================
--- src/conv/step/step-g/Hyperbola.h	(revision 58931)
+++ src/conv/step/step-g/Hyperbola.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef HHYPERBOLA_H_
-#define HHYPERBOLA_H_
+#ifndef CONV_STEP_STEP_G_HYPERBOLA_H
+#define CONV_STEP_STEP_G_HYPERBOLA_H
 
 #include "Conic.h"
 
@@ -59,7 +59,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* HHYPERBOLA_H_ */
+#endif /* CONV_STEP_STEP_G_HYPERBOLA_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/MechanicalContext.h
===================================================================
--- src/conv/step/step-g/MechanicalContext.h	(revision 58931)
+++ src/conv/step/step-g/MechanicalContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MECHANICAL_CONTEXT_H_
-#define MECHANICAL_CONTEXT_H_
+#ifndef CONV_STEP_STEP_G_MECHANICALCONTEXT_H
+#define CONV_STEP_STEP_G_MECHANICALCONTEXT_H
 
 #include "ProductContext.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* MECHANICAL_CONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_MECHANICALCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SeamCurve.h
===================================================================
--- src/conv/step/step-g/SeamCurve.h	(revision 58931)
+++ src/conv/step/step-g/SeamCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SEAM_CURVE_H_
-#define SEAM_CURVE_H_
+#ifndef CONV_STEP_STEP_G_SEAMCURVE_H
+#define CONV_STEP_STEP_G_SEAMCURVE_H
 
 #include "SurfaceCurve.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SEAM_CURVE_H_ */
+#endif /* CONV_STEP_STEP_G_SEAMCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/QuasiUniformSurface.h
===================================================================
--- src/conv/step/step-g/QuasiUniformSurface.h	(revision 58931)
+++ src/conv/step/step-g/QuasiUniformSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef QUASIUNIFORMSURFACE_H_
-#define QUASIUNIFORMSURFACE_H_
+#ifndef CONV_STEP_STEP_G_QUASIUNIFORMSURFACE_H
+#define CONV_STEP_STEP_G_QUASIUNIFORMSURFACE_H
 
 #include "BSplineSurface.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* QUASIUNIFORMSURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_QUASIUNIFORMSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SolidModel.h
===================================================================
--- src/conv/step/step-g/SolidModel.h	(revision 58931)
+++ src/conv/step/step-g/SolidModel.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SOLIDMODEL_H_
-#define SOLIDMODEL_H_
+#ifndef CONV_STEP_STEP_G_SOLIDMODEL_H
+#define CONV_STEP_STEP_G_SOLIDMODEL_H
 
 #include "GeometricRepresentationItem.h"
 
@@ -51,7 +51,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SOLIDMODEL_H_ */
+#endif /* CONV_STEP_STEP_G_SOLIDMODEL_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Conic.h
===================================================================
--- src/conv/step/step-g/Conic.h	(revision 58931)
+++ src/conv/step/step-g/Conic.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CONIC_H_
-#define CONIC_H_
+#ifndef CONV_STEP_STEP_G_CONIC_H
+#define CONV_STEP_STEP_G_CONIC_H
 
 #include "Curve.h"
 
@@ -73,7 +73,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CONIC_H_ */
+#endif /* CONV_STEP_STEP_G_CONIC_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/PlaneAngleSiUnit.h
===================================================================
--- src/conv/step/step-g/PlaneAngleSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/PlaneAngleSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PLANEANGLESIUNIT_H_
-#define PLANEANGLESIUNIT_H_
+#ifndef CONV_STEP_STEP_G_PLANEANGLESIUNIT_H
+#define CONV_STEP_STEP_G_PLANEANGLESIUNIT_H
 
 #include "PlaneAngleUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PLANEANGLESIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_PLANEANGLESIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ItemDefinedTransformation.h
===================================================================
--- src/conv/step/step-g/ItemDefinedTransformation.h	(revision 58931)
+++ src/conv/step/step-g/ItemDefinedTransformation.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef REPRESENTATION_RELATIONSHIP_WITH_TRANSFORMATION_H_
-#define REPRESENTATION_RELATIONSHIP_WITH_TRANSFORMATION_H_
+#ifndef CONV_STEP_STEP_G_ITEMDEFINEDTRANSFORMATION_H
+#define CONV_STEP_STEP_G_ITEMDEFINEDTRANSFORMATION_H
 
 #include "STEPEntity.h"
 
@@ -63,7 +63,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* REPRESENTATION_RELATIONSHIP_WITH_TRANSFORMATION_H_ */
+#endif /* CONV_STEP_STEP_G_ITEMDEFINEDTRANSFORMATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CompositeCurveOnSurface.h
===================================================================
--- src/conv/step/step-g/CompositeCurveOnSurface.h	(revision 58931)
+++ src/conv/step/step-g/CompositeCurveOnSurface.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef COMPOSITE_CURVE_ON_SURFACE_H_
-#define COMPOSITE_CURVE_ON_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_COMPOSITECURVEONSURFACE_H
+#define CONV_STEP_STEP_G_COMPOSITECURVEONSURFACE_H
 
 #include "CompositeCurve.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* COMPOSITE_CURVE_ON_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_COMPOSITECURVEONSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/FunctionallyDefinedTransformation.h
===================================================================
--- src/conv/step/step-g/FunctionallyDefinedTransformation.h	(revision 58931)
+++ src/conv/step/step-g/FunctionallyDefinedTransformation.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef FUNCTIONALLYDEFINEDTRANSFORMATION_H_
-#define FUNCTIONALLYDEFINEDTRANSFORMATION_H_
+#ifndef CONV_STEP_STEP_G_FUNCTIONALLYDEFINEDTRANSFORMATION_H
+#define CONV_STEP_STEP_G_FUNCTIONALLYDEFINEDTRANSFORMATION_H
 
 #include "STEPEntity.h"
 
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* FUNCTIONALLYDEFINEDTRANSFORMATION_H_ */
+#endif /* CONV_STEP_STEP_G_FUNCTIONALLYDEFINEDTRANSFORMATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LengthSiUnit.h
===================================================================
--- src/conv/step/step-g/LengthSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/LengthSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LENGTHSIUNIT_H_
-#define LENGTHSIUNIT_H_
+#ifndef CONV_STEP_STEP_G_LENGTHSIUNIT_H
+#define CONV_STEP_STEP_G_LENGTHSIUNIT_H
 
 #include "LengthUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LENGTHSIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_LENGTHSIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RationalUniformSurface.h
===================================================================
--- src/conv/step/step-g/RationalUniformSurface.h	(revision 58931)
+++ src/conv/step/step-g/RationalUniformSurface.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALUNIFORMSURFACE_H_
-#define RATIONALUNIFORMSURFACE_H_
+#ifndef CONV_STEP_STEP_G_RATIONALUNIFORMSURFACE_H
+#define CONV_STEP_STEP_G_RATIONALUNIFORMSURFACE_H
 
 #include "RationalBSplineSurface.h"
 #include "UniformSurface.h"
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALUNIFORMSURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALUNIFORMSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/QuasiUniformCurve.h
===================================================================
--- src/conv/step/step-g/QuasiUniformCurve.h	(revision 58931)
+++ src/conv/step/step-g/QuasiUniformCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef QUASIUNIFORMCURVE_H_
-#define QUASIUNIFORMCURVE_H_
+#ifndef CONV_STEP_STEP_G_QUASIUNIFORMCURVE_H
+#define CONV_STEP_STEP_G_QUASIUNIFORMCURVE_H
 
 #include "BSplineCurve.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* QUASIUNIFORMCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_QUASIUNIFORMCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BoundaryCurve.h
===================================================================
--- src/conv/step/step-g/BoundaryCurve.h	(revision 58931)
+++ src/conv/step/step-g/BoundaryCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BOUNDARY_CURVE_H_
-#define BOUNDARY_CURVE_H_
+#ifndef CONV_STEP_STEP_G_BOUNDARYCURVE_H
+#define CONV_STEP_STEP_G_BOUNDARYCURVE_H
 
 #include "CompositeCurveOnSurface.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BOUNDARY_CURVE_H_ */
+#endif /* CONV_STEP_STEP_G_BOUNDARYCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CompositeCurveSegment.h
===================================================================
--- src/conv/step/step-g/CompositeCurveSegment.h	(revision 58931)
+++ src/conv/step/step-g/CompositeCurveSegment.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef COMPOSITECURVESEGMENT_H_
-#define COMPOSITECURVESEGMENT_H_
+#ifndef CONV_STEP_STEP_G_COMPOSITECURVESEGMENT_H
+#define CONV_STEP_STEP_G_COMPOSITECURVESEGMENT_H
 
 #include "FoundedItem.h"
 
@@ -53,7 +53,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* COMPOSITECURVESEGMENT_H_ */
+#endif /* CONV_STEP_STEP_G_COMPOSITECURVESEGMENT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ElectricCurrentUnit.h
===================================================================
--- src/conv/step/step-g/ElectricCurrentUnit.h	(revision 58931)
+++ src/conv/step/step-g/ElectricCurrentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef ELECTRICCURRENTUNIT_H_
-#define ELECTRICCURRENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_ELECTRICCURRENTUNIT_H
+#define CONV_STEP_STEP_G_ELECTRICCURRENTUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* ELECTRICCURRENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_ELECTRICCURRENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BSplineSurface.h
===================================================================
--- src/conv/step/step-g/BSplineSurface.h	(revision 58931)
+++ src/conv/step/step-g/BSplineSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef BSPLINESURFACE_H_
-#define BSPLINESURFACE_H_
+#ifndef CONV_STEP_STEP_G_BSPLINESURFACE_H
+#define CONV_STEP_STEP_G_BSPLINESURFACE_H
 
 #include "common.h"
 
@@ -65,7 +65,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BSPLINESURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_BSPLINESURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CompositeCurve.h
===================================================================
--- src/conv/step/step-g/CompositeCurve.h	(revision 58931)
+++ src/conv/step/step-g/CompositeCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef COMPOSITECURVE_H_
-#define COMPOSITECURVE_H_
+#ifndef CONV_STEP_STEP_G_COMPOSITECURVE_H
+#define CONV_STEP_STEP_G_COMPOSITECURVE_H
 
 #include "BoundedCurve.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* COMPOSITECURVE_H_ */
+#endif /* CONV_STEP_STEP_G_COMPOSITECURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Placement.h
===================================================================
--- src/conv/step/step-g/Placement.h	(revision 58931)
+++ src/conv/step/step-g/Placement.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PLACEMENT_H_
-#define PLACEMENT_H_
+#ifndef CONV_STEP_STEP_G_PLACEMENT_H
+#define CONV_STEP_STEP_G_PLACEMENT_H
 
 #include "GeometricRepresentationItem.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PLACEMENT_H_ */
+#endif /* CONV_STEP_STEP_G_PLACEMENT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ApplicationContext.h
===================================================================
--- src/conv/step/step-g/ApplicationContext.h	(revision 58931)
+++ src/conv/step/step-g/ApplicationContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef APPLICATION_CONTEXT_H_
-#define APPLICATION_CONTEXT_H_
+#ifndef CONV_STEP_STEP_G_APPLICATIONCONTEXT_H
+#define CONV_STEP_STEP_G_APPLICATIONCONTEXT_H
 
 #include "STEPEntity.h"
 
@@ -57,7 +57,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* APPLICATION_CONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_APPLICATIONCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/GlobalUncertaintyAssignedContext.h
===================================================================
--- src/conv/step/step-g/GlobalUncertaintyAssignedContext.h	(revision 58931)
+++ src/conv/step/step-g/GlobalUncertaintyAssignedContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef GLOBALUNCERTAINTYASSIGNEDCONTEXT_H_
-#define GLOBALUNCERTAINTYASSIGNEDCONTEXT_H_
+#ifndef CONV_STEP_STEP_G_GLOBALUNCERTAINTYASSIGNEDCONTEXT_H
+#define CONV_STEP_STEP_G_GLOBALUNCERTAINTYASSIGNEDCONTEXT_H
 
 #include "RepresentationContext.h"
 
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* GLOBALUNCERTAINTYASSIGNEDCONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_GLOBALUNCERTAINTYASSIGNEDCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RatioContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/RatioContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/RatioContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIOCONTEXTDEPENDENTUNIT_H_
-#define RATIOCONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_RATIOCONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_RATIOCONTEXTDEPENDENTUNIT_H
 
 #include "RatioUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIOCONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_RATIOCONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/TopologicalRepresentationItem.h
===================================================================
--- src/conv/step/step-g/TopologicalRepresentationItem.h	(revision 58931)
+++ src/conv/step/step-g/TopologicalRepresentationItem.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef TOPOLOGICALREPRESENTATIONITEM_H_
-#define TOPOLOGICALREPRESENTATIONITEM_H_
+#ifndef CONV_STEP_STEP_G_TOPOLOGICALREPRESENTATIONITEM_H
+#define CONV_STEP_STEP_G_TOPOLOGICALREPRESENTATIONITEM_H
 
 #include "RepresentationItem.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* TOPOLOGICALREPRESENTATIONITEM_H_ */
+#endif /* CONV_STEP_STEP_G_TOPOLOGICALREPRESENTATIONITEM_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Axis1Placement.h
===================================================================
--- src/conv/step/step-g/Axis1Placement.h	(revision 58931)
+++ src/conv/step/step-g/Axis1Placement.h	(working copy)
@@ -61,7 +61,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AXIS1_PLACEMENT_H_ */
+#endif /* CONV_STEP_STEP_G_AXIS1PLACEMENT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ContextDependentShapeRepresentation.h
===================================================================
--- src/conv/step/step-g/ContextDependentShapeRepresentation.h	(revision 58931)
+++ src/conv/step/step-g/ContextDependentShapeRepresentation.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CONTEXT_DEPENDENT_SHAPE_REPRESENTATION_H_
-#define CONTEXT_DEPENDENT_SHAPE_REPRESENTATION_H_
+#ifndef CONV_STEP_STEP_G_CONTEXTDEPENDENTSHAPEREPRESENTATION_H
+#define CONV_STEP_STEP_G_CONTEXTDEPENDENTSHAPEREPRESENTATION_H
 
 #include "STEPEntity.h"
 
@@ -65,7 +65,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CONTEXT_DEPENDENT_SHAPE_REPRESENTATION_H_ */
+#endif /* CONV_STEP_STEP_G_CONTEXTDEPENDENTSHAPEREPRESENTATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RatioConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/RatioConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/RatioConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIOCONVERSIONBASEDUNIT_H_
-#define RATIOCONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_RATIOCONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_RATIOCONVERSIONBASEDUNIT_H
 
 #include "RatioUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIOCONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_RATIOCONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RationalBezierSurface.h
===================================================================
--- src/conv/step/step-g/RationalBezierSurface.h	(revision 58931)
+++ src/conv/step/step-g/RationalBezierSurface.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALBEZIERSURFACE_H_
-#define RATIONALBEZIERSURFACE_H_
+#ifndef CONV_STEP_STEP_G_RATIONALBEZIERSURFACE_H
+#define CONV_STEP_STEP_G_RATIONALBEZIERSURFACE_H
 
 #include "RationalBSplineSurface.h"
 #include "BezierSurface.h"
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALBEZIERSURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALBEZIERSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/GlobalUnitAssignedContext.h
===================================================================
--- src/conv/step/step-g/GlobalUnitAssignedContext.h	(revision 58931)
+++ src/conv/step/step-g/GlobalUnitAssignedContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef GLOBALUNITASSIGNEDCONTEXT_H_
-#define GLOBALUNITASSIGNEDCONTEXT_H_
+#ifndef CONV_STEP_STEP_G_GLOBALUNITASSIGNEDCONTEXT_H
+#define CONV_STEP_STEP_G_GLOBALUNITASSIGNEDCONTEXT_H
 
 #include "RepresentationContext.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* GLOBALUNITASSIGNEDCONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_GLOBALUNITASSIGNEDCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BrepWithVoids.h
===================================================================
--- src/conv/step/step-g/BrepWithVoids.h	(revision 58931)
+++ src/conv/step/step-g/BrepWithVoids.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BREPWITHVOIDS_H_
-#define BREPWITHVOIDS_H_
+#ifndef CONV_STEP_STEP_G_BREPWITHVOIDS_H
+#define CONV_STEP_STEP_G_BREPWITHVOIDS_H
 
 #include "ManifoldSolidBrep.h"
 
@@ -57,7 +57,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BREPWITHVOIDS_H_ */
+#endif /* CONV_STEP_STEP_G_BREPWITHVOIDS_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RationalBSplineCurve.h
===================================================================
--- src/conv/step/step-g/RationalBSplineCurve.h	(revision 58931)
+++ src/conv/step/step-g/RationalBSplineCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALBSPLINECURVE_H_
-#define RATIONALBSPLINECURVE_H_
+#ifndef CONV_STEP_STEP_G_RATIONALBSPLINECURVE_H
+#define CONV_STEP_STEP_G_RATIONALBSPLINECURVE_H
 
 #include "BSplineCurve.h"
 
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALBSPLINECURVE_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALBSPLINECURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ConnectedFaceSet.h
===================================================================
--- src/conv/step/step-g/ConnectedFaceSet.h	(revision 58931)
+++ src/conv/step/step-g/ConnectedFaceSet.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CONNECTEDFACESET_H_
-#define CONNECTEDFACESET_H_
+#ifndef CONV_STEP_STEP_G_CONNECTEDFACESET_H
+#define CONV_STEP_STEP_G_CONNECTEDFACESET_H
 
 #include "TopologicalRepresentationItem.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CONNECTEDFACESET_H_ */
+#endif /* CONV_STEP_STEP_G_CONNECTEDFACESET_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AreaUnit.h
===================================================================
--- src/conv/step/step-g/AreaUnit.h	(revision 58931)
+++ src/conv/step/step-g/AreaUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AREAUNIT_H_
-#define AREAUNIT_H_
+#ifndef CONV_STEP_STEP_G_AREAUNIT_H
+#define CONV_STEP_STEP_G_AREAUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AREAUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_AREAUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/EdgeCurve.h
===================================================================
--- src/conv/step/step-g/EdgeCurve.h	(revision 58931)
+++ src/conv/step/step-g/EdgeCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef EDGECURVE_H_
-#define EDGECURVE_H_
+#ifndef CONV_STEP_STEP_G_EDGECURVE_H
+#define CONV_STEP_STEP_G_EDGECURVE_H
 
 #include "Edge.h"
 #include "GeometricRepresentationItem.h"
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* EDGECURVE_H_ */
+#endif /* CONV_STEP_STEP_G_EDGECURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RatioSiUnit.h
===================================================================
--- src/conv/step/step-g/RatioSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/RatioSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIOSIUNIT_H_
-#define RATIOSIUNIT_H_
+#ifndef CONV_STEP_STEP_G_RATIOSIUNIT_H
+#define CONV_STEP_STEP_G_RATIOSIUNIT_H
 
 #include "RatioUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIOSIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_RATIOSIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Vertex.h
===================================================================
--- src/conv/step/step-g/Vertex.h	(revision 58931)
+++ src/conv/step/step-g/Vertex.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef VERTEX_H_
-#define VERTEX_H_
+#ifndef CONV_STEP_STEP_G_VERTEX_H
+#define CONV_STEP_STEP_G_VERTEX_H
 
 #include "TopologicalRepresentationItem.h"
 
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* VERTEX_H_ */
+#endif /* CONV_STEP_STEP_G_VERTEX_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RationalBezierCurve.h
===================================================================
--- src/conv/step/step-g/RationalBezierCurve.h	(revision 58931)
+++ src/conv/step/step-g/RationalBezierCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALBEZIERCURVE_H_
-#define RATIONALBEZIERCURVE_H_
+#ifndef CONV_STEP_STEP_G_RATIONALBEZIERCURVE_H
+#define CONV_STEP_STEP_G_RATIONALBEZIERCURVE_H
 
 #include "RationalBSplineCurve.h"
 #include "BezierCurve.h"
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALBEZIERCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALBEZIERCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Direction.h
===================================================================
--- src/conv/step/step-g/Direction.h	(revision 58931)
+++ src/conv/step/step-g/Direction.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef DIRECTION_H_
-#define DIRECTION_H_
+#ifndef CONV_STEP_STEP_G_DIRECTION_H
+#define CONV_STEP_STEP_G_DIRECTION_H
 
 #include "GeometricRepresentationItem.h"
 
@@ -53,7 +53,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* DIRECTION_H_ */
+#endif /* CONV_STEP_STEP_G_DIRECTION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/OffsetCurve3D.h
===================================================================
--- src/conv/step/step-g/OffsetCurve3D.h	(revision 58931)
+++ src/conv/step/step-g/OffsetCurve3D.h	(working copy)
@@ -61,7 +61,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* OFFSETCURVE3D_H_ */
+#endif /* CONV_STEP_STEP_G_OFFSETCURVE3D_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AdvancedFace.h
===================================================================
--- src/conv/step/step-g/AdvancedFace.h	(revision 58931)
+++ src/conv/step/step-g/AdvancedFace.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef ADVANCEDFACE_H_
-#define ADVANCEDFACE_H_
+#ifndef CONV_STEP_STEP_G_ADVANCEDFACE_H
+#define CONV_STEP_STEP_G_ADVANCEDFACE_H
 
 #include "FaceSurface.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* ADVANCEDFACE_H_ */
+#endif /* CONV_STEP_STEP_G_ADVANCEDFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ToroidalSurface.h
===================================================================
--- src/conv/step/step-g/ToroidalSurface.h	(revision 58931)
+++ src/conv/step/step-g/ToroidalSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef TOROIDAL_SURFACE_H_
-#define TOROIDAL_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_TOROIDALSURFACE_H
+#define CONV_STEP_STEP_G_TOROIDALSURFACE_H
 
 #include "ElementarySurface.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* TOROIDAL_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_TOROIDALSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Surface.h
===================================================================
--- src/conv/step/step-g/Surface.h	(revision 58931)
+++ src/conv/step/step-g/Surface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef SURFACE_H_
-#define SURFACE_H_
+#ifndef CONV_STEP_STEP_G_SURFACE_H
+#define CONV_STEP_STEP_G_SURFACE_H
 
 #include "GeometricRepresentationItem.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_SURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/VolumeUnit.h
===================================================================
--- src/conv/step/step-g/VolumeUnit.h	(revision 58931)
+++ src/conv/step/step-g/VolumeUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef VOLUMEUNIT_H_
-#define VOLUMEUNIT_H_
+#ifndef CONV_STEP_STEP_G_VOLUMEUNIT_H
+#define CONV_STEP_STEP_G_VOLUMEUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* VOLUMEUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_VOLUMEUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RepresentationContext.h
===================================================================
--- src/conv/step/step-g/RepresentationContext.h	(revision 58931)
+++ src/conv/step/step-g/RepresentationContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef REPRESENTATIONCONTEXT_H_
-#define REPRESENTATIONCONTEXT_H_
+#ifndef CONV_STEP_STEP_G_REPRESENTATIONCONTEXT_H
+#define CONV_STEP_STEP_G_REPRESENTATIONCONTEXT_H
 
 #include "STEPEntity.h"
 
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* REPRESENTATIONCONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_REPRESENTATIONCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/IntersectionCurve.h
===================================================================
--- src/conv/step/step-g/IntersectionCurve.h	(revision 58931)
+++ src/conv/step/step-g/IntersectionCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef INTERSECTION_CURVE_H_
-#define INTERSECTION_CURVE_H_
+#ifndef CONV_STEP_STEP_G_INTERSECTIONCURVE_H
+#define CONV_STEP_STEP_G_INTERSECTIONCURVE_H
 
 #include "SurfaceCurve.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* INTERSECTION_CURVE_H_ */
+#endif /* CONV_STEP_STEP_G_INTERSECTIONCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ThermodynamicTemperatureSiUnit.h
===================================================================
--- src/conv/step/step-g/ThermodynamicTemperatureSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/ThermodynamicTemperatureSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef THERMODYNAMICTEMPERATURESIUNIT_H_
-#define THERMODYNAMICTEMPERATURESIUNIT_H_
+#ifndef CONV_STEP_STEP_G_THERMODYNAMICTEMPERATURESIUNIT_H
+#define CONV_STEP_STEP_G_THERMODYNAMICTEMPERATURESIUNIT_H
 
 #include "ThermodynamicTemperatureUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* THERMODYNAMICTEMPERATURESIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_THERMODYNAMICTEMPERATURESIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RationalUniformCurve.h
===================================================================
--- src/conv/step/step-g/RationalUniformCurve.h	(revision 58931)
+++ src/conv/step/step-g/RationalUniformCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef RATIONALUNIFORMCURVE_H_
-#define RATIONALUNIFORMCURVE_H_
+#ifndef CONV_STEP_STEP_G_RATIONALUNIFORMCURVE_H
+#define CONV_STEP_STEP_G_RATIONALUNIFORMCURVE_H
 
 #include "RationalBSplineCurve.h"
 #include "UniformCurve.h"
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RATIONALUNIFORMCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_RATIONALUNIFORMCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ParametricRepresentationContext.h
===================================================================
--- src/conv/step/step-g/ParametricRepresentationContext.h	(revision 58931)
+++ src/conv/step/step-g/ParametricRepresentationContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PARAMETRICREPRESENTATIONCONTEXT_H_
-#define PARAMETRICREPRESENTATIONCONTEXT_H_
+#ifndef CONV_STEP_STEP_G_PARAMETRICREPRESENTATIONCONTEXT_H
+#define CONV_STEP_STEP_G_PARAMETRICREPRESENTATIONCONTEXT_H
 
 #include "RepresentationContext.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PARAMETRICREPRESENTATIONCONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_PARAMETRICREPRESENTATIONCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/PlaneAngleMeasureWithUnit.h
===================================================================
--- src/conv/step/step-g/PlaneAngleMeasureWithUnit.h	(revision 58931)
+++ src/conv/step/step-g/PlaneAngleMeasureWithUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PLANE_ANGLE_MEASURE_WITH_UNIT_H_
-#define PLANE_ANGLE_MEASURE_WITH_UNIT_H_
+#ifndef CONV_STEP_STEP_G_PLANEANGLEMEASUREWITHUNIT_H
+#define CONV_STEP_STEP_G_PLANEANGLEMEASUREWITHUNIT_H
 
 #include "MeasureWithUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PLANE_ANGLE_MEASURE_WITH_UNIT_H_ */
+#endif /* CONV_STEP_STEP_G_PLANEANGLEMEASUREWITHUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ElectricCurrentSiUnit.h
===================================================================
--- src/conv/step/step-g/ElectricCurrentSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/ElectricCurrentSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef ELECTRICCURRENTSIUNIT_H_
-#define ELECTRICCURRENTSIUNIT_H_
+#ifndef CONV_STEP_STEP_G_ELECTRICCURRENTSIUNIT_H
+#define CONV_STEP_STEP_G_ELECTRICCURRENTSIUNIT_H
 
 #include "ElectricCurrentUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* ELECTRICCURRENTSIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_ELECTRICCURRENTSIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BezierSurface.h
===================================================================
--- src/conv/step/step-g/BezierSurface.h	(revision 58931)
+++ src/conv/step/step-g/BezierSurface.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BEZIERSURFACE_H_
-#define BEZIERSURFACE_H_
+#ifndef CONV_STEP_STEP_G_BEZIERSURFACE_H
+#define CONV_STEP_STEP_G_BEZIERSURFACE_H
 
 #include "BSplineSurface.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BEZIERSURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_BEZIERSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Polyline.h
===================================================================
--- src/conv/step/step-g/Polyline.h	(revision 58931)
+++ src/conv/step/step-g/Polyline.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef POLYLINE_H_
-#define POLYLINE_H_
+#ifndef CONV_STEP_STEP_G_POLYLINE_H
+#define CONV_STEP_STEP_G_POLYLINE_H
 
 #include "BoundedCurve.h"
 
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* POLYLINE_H_ */
+#endif /* CONV_STEP_STEP_G_POLYLINE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Path.h
===================================================================
--- src/conv/step/step-g/Path.h	(revision 58931)
+++ src/conv/step/step-g/Path.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PATH_H_
-#define PATH_H_
+#ifndef CONV_STEP_STEP_G_PATH_H
+#define CONV_STEP_STEP_G_PATH_H
 
 #include "common.h"
 
@@ -78,7 +78,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PATH_H_ */
+#endif /* CONV_STEP_STEP_G_PATH_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/MeasureWithUnit.h
===================================================================
--- src/conv/step/step-g/MeasureWithUnit.h	(revision 58931)
+++ src/conv/step/step-g/MeasureWithUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MEASURE_WITH_UNIT_H_
-#define MEASURE_WITH_UNIT_H_
+#ifndef CONV_STEP_STEP_G_MEASUREWITHUNIT_H
+#define CONV_STEP_STEP_G_MEASUREWITHUNIT_H
 
 #include "STEPEntity.h"
 
@@ -56,7 +56,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* MEASURE_WITH_UNIT_H_ */
+#endif /* CONV_STEP_STEP_G_MEASUREWITHUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/MassSiUnit.h
===================================================================
--- src/conv/step/step-g/MassSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/MassSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MASSSIUNIT_H_
-#define MASSSIUNIT_H_
+#ifndef CONV_STEP_STEP_G_MASSSIUNIT_H
+#define CONV_STEP_STEP_G_MASSSIUNIT_H
 
 #include "MassUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* MASSSIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_MASSSIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BoundedPCurve.h
===================================================================
--- src/conv/step/step-g/BoundedPCurve.h	(revision 58931)
+++ src/conv/step/step-g/BoundedPCurve.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BOUNDEDPCURVE_H_
-#define BOUNDEDPCURVE_H_
+#ifndef CONV_STEP_STEP_G_BOUNDEDPCURVE_H
+#define CONV_STEP_STEP_G_BOUNDEDPCURVE_H
 
 #include "PCurve.h"
 #include "BoundedCurve.h"
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BOUNDEDPCURVE_H_ */
+#endif /* CONV_STEP_STEP_G_BOUNDEDPCURVE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Axis2Placement2D.h
===================================================================
--- src/conv/step/step-g/Axis2Placement2D.h	(revision 58931)
+++ src/conv/step/step-g/Axis2Placement2D.h	(working copy)
@@ -62,7 +62,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AXIS2_PLACEMENT_2D_H_ */
+#endif /* CONV_STEP_STEP_G_AXIS2PLACEMENT2D_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/MassConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/MassConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/MassConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MASSCONVERSIONBASEDUNIT_H_
-#define MASSCONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_MASSCONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_MASSCONVERSIONBASEDUNIT_H
 
 #include "MassUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* MASSCONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_MASSCONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CartesianTransformationOperator.h
===================================================================
--- src/conv/step/step-g/CartesianTransformationOperator.h	(revision 58931)
+++ src/conv/step/step-g/CartesianTransformationOperator.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CARTESIANTRANSFORMATIONOPERATOR_H_
-#define CARTESIANTRANSFORMATIONOPERATOR_H_
+#ifndef CONV_STEP_STEP_G_CARTESIANTRANSFORMATIONOPERATOR_H
+#define CONV_STEP_STEP_G_CARTESIANTRANSFORMATIONOPERATOR_H
 
 #include "GeometricRepresentationItem.h"
 #include "FunctionallyDefinedTransformation.h"
@@ -58,7 +58,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CARTESIANTRANSFORMATIONOPERATOR_H_ */
+#endif /* CONV_STEP_STEP_G_CARTESIANTRANSFORMATIONOPERATOR_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LocalUnits.h
===================================================================
--- src/conv/step/step-g/LocalUnits.h	(revision 58931)
+++ src/conv/step/step-g/LocalUnits.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef LOCALUNITS_H_
-#define LOCALUNITS_H_
+#ifndef CONV_STEP_STEP_G_LOCALUNITS_H
+#define CONV_STEP_STEP_G_LOCALUNITS_H
 
 class LocalUnits
 {
@@ -36,7 +36,7 @@
     virtual ~LocalUnits();
 };
 
-#endif /* LOCALUNITS_H_ */
+#endif /* CONV_STEP_STEP_G_LOCALUNITS_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/BSplineSurfaceWithKnots.h
===================================================================
--- src/conv/step/step-g/BSplineSurfaceWithKnots.h	(revision 58931)
+++ src/conv/step/step-g/BSplineSurfaceWithKnots.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef BSPLINESURFACEWITHKNOTS_H_
-#define BSPLINESURFACEWITHKNOTS_H_
+#ifndef CONV_STEP_STEP_G_BSPLINESURFACEWITHKNOTS_H
+#define CONV_STEP_STEP_G_BSPLINESURFACEWITHKNOTS_H
 
 #include "BSplineSurface.h"
 
@@ -58,7 +58,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* BSPLINESURFACEWITHKNOTS_H_ */
+#endif /* CONV_STEP_STEP_G_BSPLINESURFACEWITHKNOTS_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Parabola.h
===================================================================
--- src/conv/step/step-g/Parabola.h	(revision 58931)
+++ src/conv/step/step-g/Parabola.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PARABOLA_H_
-#define PARABOLA_H_
+#ifndef CONV_STEP_STEP_G_PARABOLA_H
+#define CONV_STEP_STEP_G_PARABOLA_H
 
 #include "Conic.h"
 
@@ -58,7 +58,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PARABOLA_H_ */
+#endif /* CONV_STEP_STEP_G_PARABOLA_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ElectricCurrentContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/ElectricCurrentContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/ElectricCurrentContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef ELECTRICCURRENTCONTEXTDEPENDENTUNIT_H_
-#define ELECTRICCURRENTCONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_ELECTRICCURRENTCONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_ELECTRICCURRENTCONTEXTDEPENDENTUNIT_H
 
 #include "ElectricCurrentUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* ELECTRICCURRENTCONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_ELECTRICCURRENTCONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductDefinitionContext.h
===================================================================
--- src/conv/step/step-g/ProductDefinitionContext.h	(revision 58931)
+++ src/conv/step/step-g/ProductDefinitionContext.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_DEFINITION_CONTEXT_H_
-#define PRODUCT_DEFINITION_CONTEXT_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTDEFINITIONCONTEXT_H
+#define CONV_STEP_STEP_G_PRODUCTDEFINITIONCONTEXT_H
 
 #include "ApplicationContextElement.h"
 
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_DEFINITION_CONTEXT_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTDEFINITIONCONTEXT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/Representation.h
===================================================================
--- src/conv/step/step-g/Representation.h	(revision 58931)
+++ src/conv/step/step-g/Representation.h	(working copy)
@@ -23,8 +23,8 @@
  * structures.
  *
  */
-#ifndef REPRESENTATION_H_
-#define REPRESENTATION_H_
+#ifndef CONV_STEP_STEP_G_REPRESENTATION_H
+#define CONV_STEP_STEP_G_REPRESENTATION_H
 
 #include "common.h"
 
@@ -69,7 +69,7 @@
 };
 
 
-#endif /* REPRESENTATION_H_ */
+#endif /* CONV_STEP_STEP_G_REPRESENTATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/MassUnit.h
===================================================================
--- src/conv/step/step-g/MassUnit.h	(revision 58931)
+++ src/conv/step/step-g/MassUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MASSUNIT_H_
-#define MASSUNIT_H_
+#ifndef CONV_STEP_STEP_G_MASSUNIT_H
+#define CONV_STEP_STEP_G_MASSUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* MASSUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_MASSUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CylindricalSurface.h
===================================================================
--- src/conv/step/step-g/CylindricalSurface.h	(revision 58931)
+++ src/conv/step/step-g/CylindricalSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CYLINDRICAL_SURFACE_H_
-#define CYLINDRICAL_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_CYLINDRICALSURFACE_H
+#define CONV_STEP_STEP_G_CYLINDRICALSURFACE_H
 
 #include "ElementarySurface.h"
 
@@ -54,7 +54,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CYLINDRICAL_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_CYLINDRICALSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RepresentationRelationshipWithTransformation.h
===================================================================
--- src/conv/step/step-g/RepresentationRelationshipWithTransformation.h	(revision 58931)
+++ src/conv/step/step-g/RepresentationRelationshipWithTransformation.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef REPRESENTATION_RELATIONSHIP_WITH_TRANSFORMATION_H_
-#define REPRESENTATION_RELATIONSHIP_WITH_TRANSFORMATION_H_
+#ifndef CONV_STEP_STEP_G_REPRESENTATIONRELATIONSHIPWITHTRANSFORMATION_H
+#define CONV_STEP_STEP_G_REPRESENTATIONRELATIONSHIPWITHTRANSFORMATION_H
 
 #include "STEPEntity.h"
 
@@ -58,7 +58,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* REPRESENTATION_RELATIONSHIP_WITH_TRANSFORMATION_H_ */
+#endif /* CONV_STEP_STEP_G_REPRESENTATIONRELATIONSHIPWITHTRANSFORMATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/SolidAngleSiUnit.h
===================================================================
--- src/conv/step/step-g/SolidAngleSiUnit.h	(revision 58931)
+++ src/conv/step/step-g/SolidAngleSiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef SOLIDANGLESIUNIT_H_
-#define SOLIDANGLESIUNIT_H_
+#ifndef CONV_STEP_STEP_G_SOLIDANGLESIUNIT_H
+#define CONV_STEP_STEP_G_SOLIDANGLESIUNIT_H
 
 #include "SolidAngleUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* SOLIDANGLESIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_SOLIDANGLESIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LuminousIntensitySiUnit.h
===================================================================
--- src/conv/step/step-g/LuminousIntensitySiUnit.h	(revision 58931)
+++ src/conv/step/step-g/LuminousIntensitySiUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LUMINOUSINTENSITYSIUNIT_H_
-#define LUMINOUSINTENSITYSIUNIT_H_
+#ifndef CONV_STEP_STEP_G_LUMINOUSINTENSITYSIUNIT_H
+#define CONV_STEP_STEP_G_LUMINOUSINTENSITYSIUNIT_H
 
 #include "LuminousIntensityUnit.h"
 #include "SiUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LUMINOUSINTENSITYSIUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_LUMINOUSINTENSITYSIUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ConicalSurface.h
===================================================================
--- src/conv/step/step-g/ConicalSurface.h	(revision 58931)
+++ src/conv/step/step-g/ConicalSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef CONICAL_SURFACE_H_
-#define CONICAL_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_CONICALSURFACE_H
+#define CONV_STEP_STEP_G_CONICALSURFACE_H
 
 #include "ElementarySurface.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CONICAL_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_CONICALSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/LengthUnit.h
===================================================================
--- src/conv/step/step-g/LengthUnit.h	(revision 58931)
+++ src/conv/step/step-g/LengthUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef LENGTHUNIT_H_
-#define LENGTHUNIT_H_
+#ifndef CONV_STEP_STEP_G_LENGTHUNIT_H
+#define CONV_STEP_STEP_G_LENGTHUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* LENGTHUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_LENGTHUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CurveReplica.h
===================================================================
--- src/conv/step/step-g/CurveReplica.h	(revision 58931)
+++ src/conv/step/step-g/CurveReplica.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CURVEREPLICA_H_
-#define CURVEREPLICA_H_
+#ifndef CONV_STEP_STEP_G_CURVEREPLICA_H
+#define CONV_STEP_STEP_G_CURVEREPLICA_H
 
 #include "Curve.h"
 
@@ -58,7 +58,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CURVEREPLICA_H_ */
+#endif /* CONV_STEP_STEP_G_CURVEREPLICA_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/DefinitionalRepresentation.h
===================================================================
--- src/conv/step/step-g/DefinitionalRepresentation.h	(revision 58931)
+++ src/conv/step/step-g/DefinitionalRepresentation.h	(working copy)
@@ -23,8 +23,8 @@
  * structures.
  *
  */
-#ifndef DEFINITIONALREPRESENTATION_H_
-#define DEFINITIONALREPRESENTATION_H_
+#ifndef CONV_STEP_STEP_G_DEFINITIONALREPRESENTATION_H
+#define CONV_STEP_STEP_G_DEFINITIONALREPRESENTATION_H
 
 #include "Representation.h"
 
@@ -47,7 +47,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* DEFINITIONALREPRESENTATION_H_ */
+#endif /* CONV_STEP_STEP_G_DEFINITIONALREPRESENTATION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ProductDefinition.h
===================================================================
--- src/conv/step/step-g/ProductDefinition.h	(revision 58931)
+++ src/conv/step/step-g/ProductDefinition.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef PRODUCT_DEFINITION_H_
-#define PRODUCT_DEFINITION_H_
+#ifndef CONV_STEP_STEP_G_PRODUCTDEFINITION_H
+#define CONV_STEP_STEP_G_PRODUCTDEFINITION_H
 
 #include "STEPEntity.h"
 
@@ -63,7 +63,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* PRODUCT_DEFINITION_H_ */
+#endif /* CONV_STEP_STEP_G_PRODUCTDEFINITION_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ManifoldSolidBrep.h
===================================================================
--- src/conv/step/step-g/ManifoldSolidBrep.h	(revision 58931)
+++ src/conv/step/step-g/ManifoldSolidBrep.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MANIFOLDSOLIDBREP_H_
-#define MANIFOLDSOLIDBREP_H_
+#ifndef CONV_STEP_STEP_G_MANIFOLDSOLIDBREP_H
+#define CONV_STEP_STEP_G_MANIFOLDSOLIDBREP_H
 
 #include "SolidModel.h"
 
@@ -55,7 +55,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* MANIFOLDSOLIDBREP_H_ */
+#endif /* CONV_STEP_STEP_G_MANIFOLDSOLIDBREP_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/TimeUnit.h
===================================================================
--- src/conv/step/step-g/TimeUnit.h	(revision 58931)
+++ src/conv/step/step-g/TimeUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef TIMEUNIT_H_
-#define TIMEUNIT_H_
+#ifndef CONV_STEP_STEP_G_TIMEUNIT_H
+#define CONV_STEP_STEP_G_TIMEUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* TIMEUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_TIMEUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/OrientedEdge.h
===================================================================
--- src/conv/step/step-g/OrientedEdge.h	(revision 58931)
+++ src/conv/step/step-g/OrientedEdge.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef ORIENTEDEDGE_H_
-#define ORIENTEDEDGE_H_
+#ifndef CONV_STEP_STEP_G_ORIENTEDEDGE_H
+#define CONV_STEP_STEP_G_ORIENTEDEDGE_H
 
 #include "Edge.h"
 
@@ -52,7 +52,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* ORIENTEDEDGE_H_ */
+#endif /* CONV_STEP_STEP_G_ORIENTEDEDGE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/MeasureValue.h
===================================================================
--- src/conv/step/step-g/MeasureValue.h	(revision 58931)
+++ src/conv/step/step-g/MeasureValue.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef MEASUREVALUE_H_
-#define MEASUREVALUE_H_
+#ifndef CONV_STEP_STEP_G_MEASUREVALUE_H
+#define CONV_STEP_STEP_G_MEASUREVALUE_H
 
 #include "STEPEntity.h"
 
@@ -82,7 +82,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* MEASUREVALUE_H_ */
+#endif /* CONV_STEP_STEP_G_MEASUREVALUE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AmountOfSubstanceUnit.h
===================================================================
--- src/conv/step/step-g/AmountOfSubstanceUnit.h	(revision 58931)
+++ src/conv/step/step-g/AmountOfSubstanceUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AMOUNTOFSUBSTANCEUNIT_H_
-#define AMOUNTOFSUBSTANCEUNIT_H_
+#ifndef CONV_STEP_STEP_G_AMOUNTOFSUBSTANCEUNIT_H
+#define CONV_STEP_STEP_G_AMOUNTOFSUBSTANCEUNIT_H
 
 #include "NamedUnit.h"
 
@@ -48,7 +48,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AMOUNTOFSUBSTANCEUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_AMOUNTOFSUBSTANCEUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ClosedShell.h
===================================================================
--- src/conv/step/step-g/ClosedShell.h	(revision 58931)
+++ src/conv/step/step-g/ClosedShell.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef CLOSEDSHELL_H_
-#define CLOSEDSHELL_H_
+#ifndef CONV_STEP_STEP_G_CLOSEDSHELL_H
+#define CONV_STEP_STEP_G_CLOSEDSHELL_H
 
 #include "ConnectedFaceSet.h"
 
@@ -50,7 +50,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CLOSEDSHELL_H_ */
+#endif /* CONV_STEP_STEP_G_CLOSEDSHELL_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/CartesianTransformationOperator2D.h
===================================================================
--- src/conv/step/step-g/CartesianTransformationOperator2D.h	(revision 58931)
+++ src/conv/step/step-g/CartesianTransformationOperator2D.h	(working copy)
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* CARTESIAN_TRANSFORMATION_OPERATOR_2D_H_ */
+#endif /* CONV_STEP_STEP_G_CARTESIANTRANSFORMATIONOPERATOR2D_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/RectangularTrimmedSurface.h
===================================================================
--- src/conv/step/step-g/RectangularTrimmedSurface.h	(revision 58931)
+++ src/conv/step/step-g/RectangularTrimmedSurface.h	(working copy)
@@ -23,8 +23,8 @@
  *
  */
 
-#ifndef RECTANGULAR_TRIMMED_SURFACE_H_
-#define RECTANGULAR_TRIMMED_SURFACE_H_
+#ifndef CONV_STEP_STEP_G_RECTANGULARTRIMMEDSURFACE_H
+#define CONV_STEP_STEP_G_RECTANGULARTRIMMEDSURFACE_H
 
 #include "BoundedSurface.h"
 
@@ -58,7 +58,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* RECTANGULAR_TRIMMED_SURFACE_H_ */
+#endif /* CONV_STEP_STEP_G_RECTANGULARTRIMMEDSURFACE_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/ElectricCurrentConversionBasedUnit.h
===================================================================
--- src/conv/step/step-g/ElectricCurrentConversionBasedUnit.h	(revision 58931)
+++ src/conv/step/step-g/ElectricCurrentConversionBasedUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef ELECTRICCURRENTCONVERSIONBASEDUNIT_H_
-#define ELECTRICCURRENTCONVERSIONBASEDUNIT_H_
+#ifndef CONV_STEP_STEP_G_ELECTRICCURRENTCONVERSIONBASEDUNIT_H
+#define CONV_STEP_STEP_G_ELECTRICCURRENTCONVERSIONBASEDUNIT_H
 
 #include "ElectricCurrentUnit.h"
 #include "ConversionBasedUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* ELECTRICCURRENTCONVERSIONBASEDUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_ELECTRICCURRENTCONVERSIONBASEDUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/step-g/AreaContextDependentUnit.h
===================================================================
--- src/conv/step/step-g/AreaContextDependentUnit.h	(revision 58931)
+++ src/conv/step/step-g/AreaContextDependentUnit.h	(working copy)
@@ -24,8 +24,8 @@
  *
  */
 
-#ifndef AREACONTEXTDEPENDENTUNIT_H_
-#define AREACONTEXTDEPENDENTUNIT_H_
+#ifndef CONV_STEP_STEP_G_AREACONTEXTDEPENDENTUNIT_H
+#define CONV_STEP_STEP_G_AREACONTEXTDEPENDENTUNIT_H
 
 #include "AreaUnit.h"
 #include "ContextDependentUnit.h"
@@ -49,7 +49,7 @@
     static STEPEntity *Create(STEPWrapper *sw, SDAI_Application_instance *sse);
 };
 
-#endif /* AREACONTEXTDEPENDENTUNIT_H_ */
+#endif /* CONV_STEP_STEP_G_AREACONTEXTDEPENDENTUNIT_H */
 
 /*
  * Local Variables:
Index: src/conv/step/STEPWrapper.h
===================================================================
--- src/conv/step/STEPWrapper.h	(revision 58931)
+++ src/conv/step/STEPWrapper.h	(working copy)
@@ -23,9 +23,10 @@
  * functions.
  *
  */
-#ifndef STEPWRAPPER_H_
-#define STEPWRAPPER_H_
 
+#ifndef CONV_STEP_STEPWRAPPER_H
+#define CONV_STEP_STEPWRAPPER_H
+
 #include "common.h"
 
 #ifdef DEBUG
@@ -140,7 +141,7 @@
     void printLoadStatistics();
 };
 
-#endif /* STEPWRAPPER_H_ */
+#endif /* CONV_STEP_STEPWRAPPER_H */
 
 /*
  * Local Variables:
Index: src/conv/step/ap_schema.h
===================================================================
--- src/conv/step/ap_schema.h	(revision 58931)
+++ src/conv/step/ap_schema.h	(working copy)
@@ -22,9 +22,10 @@
  * Definition based switching for current STEP schema
  *
  */
-#ifndef AP_SCHEMA_H_
-#define AP_SCHEMA_H_
 
+#ifndef CONV_STEP_AP_SCHEMA_H
+#define CONV_STEP_AP_SCHEMA_H
+
 #include "common.h"
 
 #ifdef AP203
@@ -42,7 +43,7 @@
 #  define SCHEMA_NAMESPACE automotive_design
 #endif
 
-#endif /* AP_SCHEMA_H_ */
+#endif /* CONV_STEP_AP_SCHEMA_H */
 
 /*
  * Local Variables:
