fixincludeguards.sh: include/svx

Change-Id: I2c280be12f36c1538e922286745aabc62482423d
author: Thomas Arnhold <thomas@arnhold.org> 2013-10-23 19:08:11 +0200
committer: Thomas Arnhold <thomas@arnhold.org> 2013-10-23 23:22:28 +0200
commit: 027ac563630d06aa52801f6b1d601132b96db236 (patch)
tree: 68ff74f758551158d7680aebb67a581f75f36a5b /include/svx
parent: 7921e92cf9853cadb592318c04c302816216035f (diff)
532 files changed, 1339 insertions, 1339 deletions
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx
index 54cdd7719c99..c84391b194aa 100644
--- a/include/svx/AccessibleControlShape.hxx
+++ b/include/svx/AccessibleControlShape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_CONTROL_SHAPE_HXX
-#define _SVX_ACCESSIBILITY_ACCESSIBLE_CONTROL_SHAPE_HXX
+#ifndef INCLUDED_SVX_ACCESSIBLECONTROLSHAPE_HXX
+#define INCLUDED_SVX_ACCESSIBLECONTROLSHAPE_HXX
 
 #include <svx/AccessibleShape.hxx>
 
diff --git a/include/svx/AccessibleGraphicShape.hxx b/include/svx/AccessibleGraphicShape.hxx
index 4af3b913fecb..44aa2440bf67 100644
--- a/include/svx/AccessibleGraphicShape.hxx
+++ b/include/svx/AccessibleGraphicShape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_GRAPHIC_SHAPE_HXX
-#define _SVX_ACCESSIBILITY_ACCESSIBLE_GRAPHIC_SHAPE_HXX
+#ifndef INCLUDED_SVX_ACCESSIBLEGRAPHICSHAPE_HXX
+#define INCLUDED_SVX_ACCESSIBLEGRAPHICSHAPE_HXX
 
 #include <svx/AccessibleShape.hxx>
 #include <com/sun/star/accessibility/XAccessibleImage.hpp>
diff --git a/include/svx/AccessibleOLEShape.hxx b/include/svx/AccessibleOLEShape.hxx
index 378924bd1fc1..4ad550ca70d7 100644
--- a/include/svx/AccessibleOLEShape.hxx
+++ b/include/svx/AccessibleOLEShape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX
-#define _SVX_ACCESSIBILITY_ACCESSIBLE_OLE_SHAPE_HXX
+#ifndef INCLUDED_SVX_ACCESSIBLEOLESHAPE_HXX
+#define INCLUDED_SVX_ACCESSIBLEOLESHAPE_HXX
 
 #include <svx/AccessibleShape.hxx>
 
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx
index 1e1bc6081253..e9700097dcb9 100644
--- a/include/svx/AccessibleShape.hxx
+++ b/include/svx/AccessibleShape.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX
-#define _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_HXX
+#ifndef INCLUDED_SVX_ACCESSIBLESHAPE_HXX
+#define INCLUDED_SVX_ACCESSIBLESHAPE_HXX
 
 #include <editeng/AccessibleContextBase.hxx>
 #include <editeng/AccessibleComponentBase.hxx>
diff --git a/include/svx/AccessibleShapeInfo.hxx b/include/svx/AccessibleShapeInfo.hxx
index dea25656efa9..ef4ada1b9c48 100644
--- a/include/svx/AccessibleShapeInfo.hxx
+++ b/include/svx/AccessibleShapeInfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_INFO_HXX
-#define _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_INFO_HXX
+#ifndef INCLUDED_SVX_ACCESSIBLESHAPEINFO_HXX
+#define INCLUDED_SVX_ACCESSIBLESHAPEINFO_HXX
 
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/include/svx/AccessibleShapeTreeInfo.hxx b/include/svx/AccessibleShapeTreeInfo.hxx
index f3721ca13e07..d55ff52946e2 100644
--- a/include/svx/AccessibleShapeTreeInfo.hxx
+++ b/include/svx/AccessibleShapeTreeInfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_TREE_INFO_HXX
-#define _SVX_ACCESSIBILITY_ACCESSIBLE_SHAPE_TREE_INFO_HXX
+#ifndef INCLUDED_SVX_ACCESSIBLESHAPETREEINFO_HXX
+#define INCLUDED_SVX_ACCESSIBLESHAPETREEINFO_HXX
 
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/include/svx/AccessibleTableShape.hxx b/include/svx/AccessibleTableShape.hxx
index fe239cf271c7..e3d3484fc035 100644
--- a/include/svx/AccessibleTableShape.hxx
+++ b/include/svx/AccessibleTableShape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_TABLE_SHAPE_HXX
-#define _SVX_ACCESSIBILITY_ACCESSIBLE_TABLE_SHAPE_HXX
+#ifndef INCLUDED_SVX_ACCESSIBLETABLESHAPE_HXX
+#define INCLUDED_SVX_ACCESSIBLETABLESHAPE_HXX
 
 #include <com/sun/star/table/XTable.hpp>
 #include <com/sun/star/accessibility/XAccessibleTable.hpp>
diff --git a/include/svx/AccessibleTextHelper.hxx b/include/svx/AccessibleTextHelper.hxx
index c930af0cb2e4..b38032b4654e 100644
--- a/include/svx/AccessibleTextHelper.hxx
+++ b/include/svx/AccessibleTextHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSILE_TEXT_HELPER_HXX_
-#define _SVX_ACCESSILE_TEXT_HELPER_HXX_
+#ifndef INCLUDED_SVX_ACCESSIBLETEXTHELPER_HXX
+#define INCLUDED_SVX_ACCESSIBLETEXTHELPER_HXX
 
 #include <memory>
 #include <sal/types.h>
@@ -420,6 +420,6 @@ namespace accessibility
 
 } // end of namespace accessibility
 
-#endif /* _SVX_ACCESSILE_TEXT_HELPER_HXX_ */
+#endif // INCLUDED_SVX_ACCESSIBLETEXTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/ActionDescriptionProvider.hxx b/include/svx/ActionDescriptionProvider.hxx
index ce616409922e..dce7566949c2 100644
--- a/include/svx/ActionDescriptionProvider.hxx
+++ b/include/svx/ActionDescriptionProvider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACTIONDESCRIPTIONPROVIDER_HXX
-#define _SVX_ACTIONDESCRIPTIONPROVIDER_HXX
+#ifndef INCLUDED_SVX_ACTIONDESCRIPTIONPROVIDER_HXX
+#define INCLUDED_SVX_ACTIONDESCRIPTIONPROVIDER_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/AffineMatrixItem.hxx b/include/svx/AffineMatrixItem.hxx
index 6e374ee9afa0..a9f3eacdc4fc 100644
--- a/include/svx/AffineMatrixItem.hxx
+++ b/include/svx/AffineMatrixItem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_AFFINEMATRIXITEM_HXX
-#define _SVX_AFFINEMATRIXITEM_HXX
+#ifndef INCLUDED_SVX_AFFINEMATRIXITEM_HXX
+#define INCLUDED_SVX_AFFINEMATRIXITEM_HXX
 
 #include <svx/svxdllapi.h>
 #include <svl/poolitem.hxx>
@@ -48,7 +48,7 @@ public:
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
-#endif // _SVX_AFFINEMATRIXITEM_HXX
+#endif // INCLUDED_SVX_AFFINEMATRIXITEM_HXX
 
 // eof
 
diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx
index 216a40f6b7f0..48350dd569fb 100644
--- a/include/svx/ChildrenManager.hxx
+++ b/include/svx/ChildrenManager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_CHILDREN_MANAGER_HXX
-#define _SVX_ACCESSIBILITY_CHILDREN_MANAGER_HXX
+#ifndef INCLUDED_SVX_CHILDRENMANAGER_HXX
+#define INCLUDED_SVX_CHILDRENMANAGER_HXX
 
 #include <svx/IAccessibleViewForwarderListener.hxx>
 #include <svx/AccessibleShapeTreeInfo.hxx>
diff --git a/include/svx/DescriptionGenerator.hxx b/include/svx/DescriptionGenerator.hxx
index fce8478719c9..22278277de9a 100644
--- a/include/svx/DescriptionGenerator.hxx
+++ b/include/svx/DescriptionGenerator.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SVX_ACCESSIBILITY_DESCRIPTION_GENERATOR_HXX
-#define _SVX_ACCESSIBILITY_DESCRIPTION_GENERATOR_HXX
+#ifndef INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX
+#define INCLUDED_SVX_DESCRIPTIONGENERATOR_HXX
 
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx
index 2aee4f527488..980a5a2a1324 100644
--- a/include/svx/EnhancedCustomShape2d.hxx
+++ b/include/svx/EnhancedCustomShape2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCEDCUSTOMSHAPE2D_HXX
-#define _ENHANCEDCUSTOMSHAPE2D_HXX
+#ifndef INCLUDED_SVX_ENHANCEDCUSTOMSHAPE2D_HXX
+#define INCLUDED_SVX_ENHANCEDCUSTOMSHAPE2D_HXX
 
 #include <svx/msdffdef.hxx>
 #include <svx/sdasitm.hxx>
diff --git a/include/svx/EnhancedCustomShapeFunctionParser.hxx b/include/svx/EnhancedCustomShapeFunctionParser.hxx
index 28df983df61c..6024ac667ce9 100644
--- a/include/svx/EnhancedCustomShapeFunctionParser.hxx
+++ b/include/svx/EnhancedCustomShapeFunctionParser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX
-#define _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX
+#ifndef INCLUDED_SVX_ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX
+#define INCLUDED_SVX_ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX
 
 #include <sal/config.h>
 #include <boost/shared_ptr.hpp>
@@ -203,6 +203,6 @@ private:
 
 }
 
-#endif /* _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX */
+#endif // INCLUDED_SVX_ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/EnhancedCustomShapeGeometry.hxx b/include/svx/EnhancedCustomShapeGeometry.hxx
index b5744884ca53..85df1d496ecd 100644
--- a/include/svx/EnhancedCustomShapeGeometry.hxx
+++ b/include/svx/EnhancedCustomShapeGeometry.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCEDCUSTOMSHAPEGEOMETRY_HXX
-#define _ENHANCEDCUSTOMSHAPEGEOMETRY_HXX
+#ifndef INCLUDED_SVX_ENHANCEDCUSTOMSHAPEGEOMETRY_HXX
+#define INCLUDED_SVX_ENHANCEDCUSTOMSHAPEGEOMETRY_HXX
 
 #include <sal/types.h>
 #include <svx/msdffdef.hxx>
diff --git a/include/svx/EnhancedCustomShapeTypeNames.hxx b/include/svx/EnhancedCustomShapeTypeNames.hxx
index 6be004105956..82ebe965e8da 100644
--- a/include/svx/EnhancedCustomShapeTypeNames.hxx
+++ b/include/svx/EnhancedCustomShapeTypeNames.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCED_CUSTOMSHAPE_TYPE_NAMES_HXX
-#define _ENHANCED_CUSTOMSHAPE_TYPE_NAMES_HXX
+#ifndef INCLUDED_SVX_ENHANCEDCUSTOMSHAPETYPENAMES_HXX
+#define INCLUDED_SVX_ENHANCEDCUSTOMSHAPETYPENAMES_HXX
 #include <svx/msdffdef.hxx>
 #include <rtl/ustring.hxx>
 
diff --git a/include/svx/IAccessibleParent.hxx b/include/svx/IAccessibleParent.hxx
index 0e7acdddb784..f50d024c616c 100644
--- a/include/svx/IAccessibleParent.hxx
+++ b/include/svx/IAccessibleParent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_IACCESSIBLE_PARENT_HXX
-#define _SVX_ACCESSIBILITY_IACCESSIBLE_PARENT_HXX
+#ifndef INCLUDED_SVX_IACCESSIBLEPARENT_HXX
+#define INCLUDED_SVX_IACCESSIBLEPARENT_HXX
 
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
diff --git a/include/svx/IAccessibleViewForwarder.hxx b/include/svx/IAccessibleViewForwarder.hxx
index 1509d08aa20b..f3e61650facb 100644
--- a/include/svx/IAccessibleViewForwarder.hxx
+++ b/include/svx/IAccessibleViewForwarder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_IACCESSIBLE_VIEW_FORWARDER_HXX
-#define _SVX_ACCESSIBILITY_IACCESSIBLE_VIEW_FORWARDER_HXX
+#ifndef INCLUDED_SVX_IACCESSIBLEVIEWFORWARDER_HXX
+#define INCLUDED_SVX_IACCESSIBLEVIEWFORWARDER_HXX
 
 #include <sal/types.h>
 #include <tools/gen.hxx>
diff --git a/include/svx/IAccessibleViewForwarderListener.hxx b/include/svx/IAccessibleViewForwarderListener.hxx
index 8a9a061bfb5e..d9f27e80d415 100644
--- a/include/svx/IAccessibleViewForwarderListener.hxx
+++ b/include/svx/IAccessibleViewForwarderListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_IACCESSIBLE_VIEW_FORWARDER_LISTENER_HXX
-#define _SVX_ACCESSIBILITY_IACCESSIBLE_VIEW_FORWARDER_LISTENER_HXX
+#ifndef INCLUDED_SVX_IACCESSIBLEVIEWFORWARDERLISTENER_HXX
+#define INCLUDED_SVX_IACCESSIBLEVIEWFORWARDERLISTENER_HXX
 
 #include <sal/types.h>
 
diff --git a/include/svx/ParseContext.hxx b/include/svx/ParseContext.hxx
index 34002b3d1701..d7ccad9ad00b 100644
--- a/include/svx/ParseContext.hxx
+++ b/include/svx/ParseContext.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SVX_QUERYDESIGNCONTEXT_HXX
-#define SVX_QUERYDESIGNCONTEXT_HXX
+#ifndef INCLUDED_SVX_PARSECONTEXT_HXX
+#define INCLUDED_SVX_PARSECONTEXT_HXX
 
 #include <connectivity/IParseContext.hxx>
 #include <rtl/ustring.hxx>
@@ -71,7 +71,7 @@ namespace svxform
         const OSystemParseContext* getParseContext() const;
     };
 }
-#endif // SVX_QUERYDESIGNCONTEXT_HXX
+#endif // INCLUDED_SVX_PARSECONTEXT_HXX
 
 
 
diff --git a/include/svx/ShapeTypeHandler.hxx b/include/svx/ShapeTypeHandler.hxx
index fac44c596eba..2f5ff09a66d5 100644
--- a/include/svx/ShapeTypeHandler.hxx
+++ b/include/svx/ShapeTypeHandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_SHAPE_TYPE_HANDLER_HXX
-#define _SVX_ACCESSIBILITY_SHAPE_TYPE_HANDLER_HXX
+#ifndef INCLUDED_SVX_SHAPETYPEHANDLER_HXX
+#define INCLUDED_SVX_SHAPETYPEHANDLER_HXX
 
 #include <svx/AccessibleShapeTreeInfo.hxx>
 #include <svx/AccessibleShapeInfo.hxx>
diff --git a/include/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx
index 59a7c59168e3..f60532001112 100644
--- a/include/svx/SmartTagCtl.hxx
+++ b/include/svx/SmartTagCtl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_SMARTTAGSCONTROL_HXX
-#define _SVX_SMARTTAGSCONTROL_HXX
+#ifndef INCLUDED_SVX_SMARTTAGCTL_HXX
+#define INCLUDED_SVX_SMARTTAGCTL_HXX
 
 #include <tools/link.hxx>
 #include <sfx2/mnuitem.hxx>
diff --git a/include/svx/SmartTagItem.hxx b/include/svx/SmartTagItem.hxx
index 8b4364b979a8..b011eb511b3f 100644
--- a/include/svx/SmartTagItem.hxx
+++ b/include/svx/SmartTagItem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SMARTTAGITEM_HXX
-#define _SVX_SMARTTAGITEM_HXX
+#ifndef INCLUDED_SVX_SMARTTAGITEM_HXX
+#define INCLUDED_SVX_SMARTTAGITEM_HXX
 
 #include <svl/poolitem.hxx>
 #include <com/sun/star/uno/Reference.hxx>
@@ -81,7 +81,7 @@ public:
     const OUString GetRangeText() const { return maRangeText; }
 };
 
-#endif // #ifndef _SVX_SMARTTAGITEM_HXX
+#endif // INCLUDED_SVX_SMARTTAGITEM_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx
index 42563fd1a8ad..4b82f2b2b9cd 100644
--- a/include/svx/SmartTagMgr.hxx
+++ b/include/svx/SmartTagMgr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SMARTTAGMGR_HXX
-#define _SMARTTAGMGR_HXX
+#ifndef INCLUDED_SVX_SMARTTAGMGR_HXX
+#define INCLUDED_SVX_SMARTTAGMGR_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/include/svx/SpellDialogChildWindow.hxx b/include/svx/SpellDialogChildWindow.hxx
index 0b401e3b4b30..0039162ae8ef 100644
--- a/include/svx/SpellDialogChildWindow.hxx
+++ b/include/svx/SpellDialogChildWindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SPELL_DIALOG_CHILD_WINDOW_HXX
-#define SVX_SPELL_DIALOG_CHILD_WINDOW_HXX
+#ifndef INCLUDED_SVX_SPELLDIALOGCHILDWINDOW_HXX
+#define INCLUDED_SVX_SPELLDIALOGCHILDWINDOW_HXX
 
 #include <sfx2/childwin.hxx>
 #include <editeng/SpellPortions.hxx>
diff --git a/include/svx/SvxColorChildWindow.hxx b/include/svx/SvxColorChildWindow.hxx
index 3430652406cc..6c179964a79c 100644
--- a/include/svx/SvxColorChildWindow.hxx
+++ b/include/svx/SvxColorChildWindow.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_COLORCHILDWINDOW_HXX
-#define _SVX_COLORCHILDWINDOW_HXX
+#ifndef INCLUDED_SVX_SVXCOLORCHILDWINDOW_HXX
+#define INCLUDED_SVX_SVXCOLORCHILDWINDOW_HXX
 
 #include <sfx2/childwin.hxx>
 #include "svx/svxdllapi.h"
@@ -35,6 +35,6 @@ class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow
 };
 
 
-#endif // _SVX_COLORCHILDWINDOW_HXX
+#endif // INCLUDED_SVX_SVXCOLORCHILDWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index d50b9b24c15a..a6bab43f3d9e 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_COLORVALUESET_HXX
-#define _SVX_COLORVALUESET_HXX
+#ifndef INCLUDED_SVX_SVXCOLORVALUESET_HXX
+#define INCLUDED_SVX_SVXCOLORVALUESET_HXX
 
 #include <svtools/valueset.hxx>
 #include "svx/svxdllapi.h"
@@ -49,7 +49,7 @@ public:
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SVX_COLORVALUESET_HXX
+#endif // INCLUDED_SVX_SVXCOLORVALUESET_HXX
 
 // eof
 
diff --git a/include/svx/SvxShapeTypes.hxx b/include/svx/SvxShapeTypes.hxx
index 4821603938ed..474d8cdf86d8 100644
--- a/include/svx/SvxShapeTypes.hxx
+++ b/include/svx/SvxShapeTypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
-#define _SVX_ACCESSIBILITY_SVX_SHAPE_TYPES_HXX
+#ifndef INCLUDED_SVX_SVXSHAPETYPES_HXX
+#define INCLUDED_SVX_SVXSHAPETYPES_HXX
 
 #include <svx/ShapeTypeHandler.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/include/svx/UnoNamespaceMap.hxx b/include/svx/UnoNamespaceMap.hxx
index be9d7788bbc1..add83d382fb2 100644
--- a/include/svx/UnoNamespaceMap.hxx
+++ b/include/svx/UnoNamespaceMap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNONAMESPACEMAP_HXX_
-#define _SVX_UNONAMESPACEMAP_HXX_
+#ifndef INCLUDED_SVX_UNONAMESPACEMAP_HXX
+#define INCLUDED_SVX_UNONAMESPACEMAP_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include "svx/svxdllapi.h"
@@ -31,6 +31,6 @@ SVX_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uno::XInterface >
 
 }
 
-#endif // _SVX_UNONAMESPACEMAP_HXX_
+#endif // INCLUDED_SVX_UNONAMESPACEMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/XPropertyEntry.hxx b/include/svx/XPropertyEntry.hxx
index 9b5647657f77..1f6c43c6e7b3 100644
--- a/include/svx/XPropertyEntry.hxx
+++ b/include/svx/XPropertyEntry.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XPROPERTYENTRY_HXX
-#define _XPROPERTYENTRY_HXX
+#ifndef INCLUDED_SVX_XPROPERTYENTRY_HXX
+#define INCLUDED_SVX_XPROPERTYENTRY_HXX
 
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
@@ -45,6 +45,6 @@ public:
     const Bitmap& GetUiBitmap() const { return maUiBitmap; }
 };
 
-#endif // _XPROPERTYENTRY_HXX
+#endif // INCLUDED_SVX_XPROPERTYENTRY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/XPropertyTable.hxx b/include/svx/XPropertyTable.hxx
index 0722434963f9..0ec503eb341a 100644
--- a/include/svx/XPropertyTable.hxx
+++ b/include/svx/XPropertyTable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XPROPERTYTABLE_HXX
-#define _SVX_XPROPERTYTABLE_HXX
+#ifndef INCLUDED_SVX_XPROPERTYTABLE_HXX
+#define INCLUDED_SVX_XPROPERTYTABLE_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index f936dbfc2d6e..017bbc2d63bd 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_ALGITEM_HXX
-#define _SVX_ALGITEM_HXX
+#ifndef INCLUDED_SVX_ALGITEM_HXX
+#define INCLUDED_SVX_ALGITEM_HXX
 
 #include <svx/svxids.hrc>
 #include <svl/poolitem.hxx>
diff --git a/include/svx/anchorid.hxx b/include/svx/anchorid.hxx
index f532b34b3fb2..ab4e1bb0e69e 100644
--- a/include/svx/anchorid.hxx
+++ b/include/svx/anchorid.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_ANCHORID_HXX
-#define _SVX_ANCHORID_HXX
+#ifndef INCLUDED_SVX_ANCHORID_HXX
+#define INCLUDED_SVX_ANCHORID_HXX
 
 
 enum SvxAnchorIds
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 247beaafc7d2..0e6a7903adbc 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _BMPMASK_HXX_
-#define _BMPMASK_HXX_
+#ifndef INCLUDED_SVX_BMPMASK_HXX
+#define INCLUDED_SVX_BMPMASK_HXX
 
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/dockwin.hxx>
@@ -176,6 +176,6 @@ private:
     SVX_DLLPRIVATE void SetAccessibleNames (void);
 };
 
-#endif // _BMPMASK_HXX_
+#endif // INCLUDED_SVX_BMPMASK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/camera3d.hxx b/include/svx/camera3d.hxx
index 96a5526b4501..878c043d03d5 100644
--- a/include/svx/camera3d.hxx
+++ b/include/svx/camera3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CAMERA3D_HXX
-#define _CAMERA3D_HXX
+#ifndef INCLUDED_SVX_CAMERA3D_HXX
+#define INCLUDED_SVX_CAMERA3D_HXX
 
 #include <svx/viewpt3d.hxx>
 #include "svx/svxdllapi.h"
@@ -73,6 +73,6 @@ class SVX_DLLPUBLIC Camera3D : public Viewport3D
     bool IsAutoAdjustProjection() const { return bAutoAdjustProjection; }
 };
 
-#endif      // _CAMERA3D_HXX
+#endif // INCLUDED_SVX_CAMERA3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 0c41d63020c0..d8ecdafda04e 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_CHARMAP_HXX
-#define _SVX_CHARMAP_HXX
+#ifndef INCLUDED_SVX_CHARMAP_HXX
+#define INCLUDED_SVX_CHARMAP_HXX
 
 #include <vcl/ctrl.hxx>
 #include <vcl/metric.hxx>
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index 5a3069eb6a65..5d00482f26d9 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CHARTHELPER_HXX
-#define CHARTHELPER_HXX
+#ifndef INCLUDED_SVX_CHARTHELPER_HXX
+#define INCLUDED_SVX_CHARTHELPER_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -62,6 +62,6 @@ public:
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //CHARTHELPER_HXX
+#endif // INCLUDED_SVX_CHARTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx
index 8d9488fb6efe..60833bbccf72 100644
--- a/include/svx/checklbx.hxx
+++ b/include/svx/checklbx.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_CHECKLBX_HXX
-#define _SVX_CHECKLBX_HXX
+#ifndef INCLUDED_SVX_CHECKLBX_HXX
+#define INCLUDED_SVX_CHECKLBX_HXX
 
 #include <svtools/treelistbox.hxx>
 #include <svtools/svlbitm.hxx>
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 8ea5c4627f3b..e95fcc5571b1 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_CHRTITEM_HXX
-#define _SVX_CHRTITEM_HXX
+#ifndef INCLUDED_SVX_CHRTITEM_HXX
+#define INCLUDED_SVX_CHRTITEM_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
@@ -331,6 +331,6 @@ public:
     void SetValue(double fNewVal) { fVal = fNewVal; }
 };
 
-#endif   // _SVX_CHRTITEM_HXX
+#endif // INCLUDED_SVX_CHRTITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 465436367fad..d867150fd16d 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_CLIPBOARDCTL_HXX_
-#define _SVX_CLIPBOARDCTL_HXX_
+#ifndef INCLUDED_SVX_CLIPBOARDCTL_HXX
+#define INCLUDED_SVX_CLIPBOARDCTL_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/ctrlitem.hxx>
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index 2debc5e0747d..dbef771f8085 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_CLIPFMTITEM_HXX
-#define _SVX_CLIPFMTITEM_HXX
+#ifndef INCLUDED_SVX_CLIPFMTITEM_HXX
+#define INCLUDED_SVX_CLIPFMTITEM_HXX
 
 #include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index cd0fa07d2748..41005d669d88 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_COLRCTRL_HXX
-#define _SVX_COLRCTRL_HXX
+#ifndef INCLUDED_SVX_COLRCTRL_HXX
+#define INCLUDED_SVX_COLRCTRL_HXX
 
 #include <sfx2/dockwin.hxx>
 #include <sfx2/childwin.hxx>
diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx
index e53f46bd7170..6fccf9e63bed 100644
--- a/include/svx/compressgraphicdialog.hxx
+++ b/include/svx/compressgraphicdialog.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _COMPRESS_GRAPHIC_DIALOG_HXX
-#define _COMPRESS_GRAPHIC_DIALOG_HXX
+#ifndef INCLUDED_SVX_COMPRESSGRAPHICDIALOG_HXX
+#define INCLUDED_SVX_COMPRESSGRAPHICDIALOG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx
index 945746d28a7f..ba345008b1ea 100644
--- a/include/svx/connctrl.hxx
+++ b/include/svx/connctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_CONNCTRL_HXX
-#define _SVX_CONNCTRL_HXX
+#ifndef INCLUDED_SVX_CONNCTRL_HXX
+#define INCLUDED_SVX_CONNCTRL_HXX
 
 #include <vcl/ctrl.hxx>
 #include "svx/svxdllapi.h"
@@ -62,6 +62,6 @@ public:
 };
 
 
-#endif // _SVX_CONNCTRL_HXX
+#endif // INCLUDED_SVX_CONNCTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx
index 2ba38f1e9e31..2798387cdfc4 100644
--- a/include/svx/contdlg.hxx
+++ b/include/svx/contdlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONTDLG_HXX_
-#define _CONTDLG_HXX_
+#ifndef INCLUDED_SVX_CONTDLG_HXX
+#define INCLUDED_SVX_CONTDLG_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/ctrlitem.hxx>
@@ -43,7 +43,7 @@ class SVX_DLLPUBLIC SvxContourDlgChildWindow : public SfxChildWindow
 };
 
 #ifndef _REDUCED_ContourDlg_HXX_
-#define _REDUCED_CONTDLG_HXX_
+#define _REDUCED INCLUDED_SVX_CONTDLG_HXX
 
 class SvxSuperContourDlg;
 
@@ -92,7 +92,7 @@ public:
                                             const sal_uIntPtr nFlags = 0L );
 };
 
-#endif // _REDUCED_CONTDLG_HXX_
-#endif // _CONTDLG_HXX_
+#endif // _REDUCED INCLUDED_SVX_CONTDLG_HXX
+#endif // INCLUDED_SVX_CONTDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx
index b4dfaf0b419b..c8cd4e2ab217 100644
--- a/include/svx/ctredlin.hxx
+++ b/include/svx/ctredlin.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_CTREDLIN_HXX
-#define _SVX_CTREDLIN_HXX
+#ifndef INCLUDED_SVX_CTREDLIN_HXX
+#define INCLUDED_SVX_CTREDLIN_HXX
 
 #include <svtools/headbar.hxx>
 #include <svtools/simptabl.hxx>
@@ -386,6 +386,6 @@ public:
 };
 
 
-#endif // _SVX_CTREDLIN_HXX
+#endif // INCLUDED_SVX_CTREDLIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/cube3d.hxx b/include/svx/cube3d.hxx
index 942f96c83175..88bb43971241 100644
--- a/include/svx/cube3d.hxx
+++ b/include/svx/cube3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_CUBE3D_HXX
-#define _E3D_CUBE3D_HXX
+#ifndef INCLUDED_SVX_CUBE3D_HXX
+#define INCLUDED_SVX_CUBE3D_HXX
 
 #include <svx/obj3d.hxx>
 #include "svx/svxdllapi.h"
@@ -83,6 +83,6 @@ public:
     virtual OUString TakeObjNamePlural() const;
 };
 
-#endif          // _E3D_CUBE3D_HXX
+#endif // INCLUDED_SVX_CUBE3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dataaccessdescriptor.hxx b/include/svx/dataaccessdescriptor.hxx
index bb9212612a12..5489c7224dd8 100644
--- a/include/svx/dataaccessdescriptor.hxx
+++ b/include/svx/dataaccessdescriptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DATACCESSDESCRIPTOR_HXX_
-#define _SVX_DATACCESSDESCRIPTOR_HXX_
+#ifndef INCLUDED_SVX_DATAACCESSDESCRIPTOR_HXX
+#define INCLUDED_SVX_DATAACCESSDESCRIPTOR_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -130,7 +130,7 @@ namespace svx
 }   // namespace svx
 //........................................................................
 
-#endif // _SVX_DATACCESSDESCRIPTOR_HXX_
+#endif // INCLUDED_SVX_DATAACCESSDESCRIPTOR_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/databaselocationinput.hxx b/include/svx/databaselocationinput.hxx
index 288dd3cfd57a..b33d508f3ca3 100644
--- a/include/svx/databaselocationinput.hxx
+++ b/include/svx/databaselocationinput.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_DATABASELOCATIONINPUT_HXX
-#define SVX_DATABASELOCATIONINPUT_HXX
+#ifndef INCLUDED_SVX_DATABASELOCATIONINPUT_HXX
+#define INCLUDED_SVX_DATABASELOCATIONINPUT_HXX
 
 #include "svx/svxdllapi.h"
 #include "com/sun/star/uno/XComponentContext.hpp"
@@ -82,6 +82,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SVX_DATABASELOCATIONINPUT_HXX
+#endif // INCLUDED_SVX_DATABASELOCATIONINPUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/databaseregistrationui.hxx b/include/svx/databaseregistrationui.hxx
index c3efaa524359..ff499a94efaa 100644
--- a/include/svx/databaseregistrationui.hxx
+++ b/include/svx/databaseregistrationui.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_DATABASE_REGISTRATION_UI_HXX
-#define SVX_DATABASE_REGISTRATION_UI_HXX
+#ifndef INCLUDED_SVX_DATABASEREGISTRATIONUI_HXX
+#define INCLUDED_SVX_DATABASEREGISTRATIONUI_HXX
 
 #include "svx/svxdllapi.h"
 #include <tools/solar.h>
@@ -42,6 +42,6 @@ namespace svx
 }   // namespace svx
 //........................................................................
 
-#endif // SVX_DATABASE_REGISTRATION_UI_HXX
+#endif // INCLUDED_SVX_DATABASEREGISTRATIONUI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx
index 278352572c46..37576af61535 100644
--- a/include/svx/dbaexchange.hxx
+++ b/include/svx/dbaexchange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DBAEXCHANGE_HXX_
-#define _SVX_DBAEXCHANGE_HXX_
+#ifndef INCLUDED_SVX_DBAEXCHANGE_HXX
+#define INCLUDED_SVX_DBAEXCHANGE_HXX
 
 #include <svtools/transfer.hxx>
 #include <comphelper/stl_types.hxx>
@@ -285,6 +285,6 @@ namespace svx
 }   // namespace svx
 //........................................................................
 
-#endif // _SVX_DBAEXCHANGE_HXX_
+#endif // INCLUDED_SVX_DBAEXCHANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx
index 9be3bfbf0da2..74148d594785 100644
--- a/include/svx/dbaobjectex.hxx
+++ b/include/svx/dbaobjectex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_DBAOBJECTEX_HXX
-#define SVX_DBAOBJECTEX_HXX
+#ifndef INCLUDED_SVX_DBAOBJECTEX_HXX
+#define INCLUDED_SVX_DBAOBJECTEX_HXX
 
 #include <svtools/transfer.hxx>
 #include <comphelper/stl_types.hxx>
@@ -73,6 +73,6 @@ namespace svx
 }   // namespace svx
 //........................................................................
 
-#endif // SVX_DBAOBJECTEX_HXX
+#endif // INCLUDED_SVX_DBAOBJECTEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dbcharsethelper.hxx b/include/svx/dbcharsethelper.hxx
index 318d35a54f69..c3abe9cd8079 100644
--- a/include/svx/dbcharsethelper.hxx
+++ b/include/svx/dbcharsethelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_DBCHARSETHELPER_HXX
-#define SVX_DBCHARSETHELPER_HXX
+#ifndef INCLUDED_SVX_DBCHARSETHELPER_HXX
+#define INCLUDED_SVX_DBCHARSETHELPER_HXX
 #include "svx/svxdllapi.h"
 #include "svx/dbtoolsclient.hxx"
 
diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx
index e927a27af7b2..ee4b6a4d07eb 100644
--- a/include/svx/dbtoolsclient.hxx
+++ b/include/svx/dbtoolsclient.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_DBTOOLSCLIENT_HXX
-#define SVX_DBTOOLSCLIENT_HXX
+#ifndef INCLUDED_SVX_DBTOOLSCLIENT_HXX
+#define INCLUDED_SVX_DBTOOLSCLIENT_HXX
 
 #include <connectivity/virtualdbtools.hxx>
 #include <osl/mutex.hxx>
@@ -198,7 +198,7 @@ namespace svxform
 }   // namespace svxform
 //........................................................................
 
-#endif // SVX_DBTOOLSCLIENT_HXX
+#endif // INCLUDED_SVX_DBTOOLSCLIENT_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/def3d.hxx b/include/svx/def3d.hxx
index c96d7f5b9729..5225d0c9a140 100644
--- a/include/svx/def3d.hxx
+++ b/include/svx/def3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DEF3D_HXX
-#define _SVX_DEF3D_HXX
+#ifndef INCLUDED_SVX_DEF3D_HXX
+#define INCLUDED_SVX_DEF3D_HXX
 
 #include <math.h>
 #include <tools/solar.h>
diff --git a/include/svx/deflt3d.hxx b/include/svx/deflt3d.hxx
index a5db1345fc05..31e7f21b0b2a 100644
--- a/include/svx/deflt3d.hxx
+++ b/include/svx/deflt3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_DEFLT3D_HXX
-#define _E3D_DEFLT3D_HXX
+#ifndef INCLUDED_SVX_DEFLT3D_HXX
+#define INCLUDED_SVX_DEFLT3D_HXX
 
 #include <basegfx/point/b3dpoint.hxx>
 #include <basegfx/vector/b3dvector.hxx>
@@ -124,6 +124,6 @@ public:
     void SetDefaultExtrudeCloseBack(const sal_Bool bNew) { bDefaultExtrudeCloseBack = bNew; }
 };
 
-#endif          // _E3D_DEFLT3D_HXX
+#endif // INCLUDED_SVX_DEFLT3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index 020f05a77d4b..9cda612d7cca 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_DIALCONTROL_HXX
-#define SVX_DIALCONTROL_HXX
+#ifndef INCLUDED_SVX_DIALCONTROL_HXX
+#define INCLUDED_SVX_DIALCONTROL_HXX
 
 #include <memory>
 #include <vcl/ctrl.hxx>
diff --git a/include/svx/dialmgr.hxx b/include/svx/dialmgr.hxx
index ba2941da2298..bb6442ce5121 100644
--- a/include/svx/dialmgr.hxx
+++ b/include/svx/dialmgr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_DIALMGR_HXX
-#define _SVX_DIALMGR_HXX
+#ifndef INCLUDED_SVX_DIALMGR_HXX
+#define INCLUDED_SVX_DIALMGR_HXX
 
 #include <tools/resid.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx
index cc45a444c99c..d38df09933a8 100644
--- a/include/svx/dlgctl3d.hxx
+++ b/include/svx/dlgctl3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DLGCTL3D_HXX
-#define _SVX_DLGCTL3D_HXX
+#ifndef INCLUDED_SVX_DLGCTL3D_HXX
+#define INCLUDED_SVX_DLGCTL3D_HXX
 
 #include <vcl/ctrl.hxx>
 #include <vcl/scrbar.hxx>
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 64b92ae9531a..677bc999c40c 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_DLG_CTRL_HXX
-#define _SVX_DLG_CTRL_HXX
+#ifndef INCLUDED_SVX_DLGCTRL_HXX
+#define INCLUDED_SVX_DLGCTRL_HXX
 
 #include <svtools/ctrlbox.hxx>
 #include <sfx2/tabdlg.hxx>
@@ -447,6 +447,6 @@ public:
     virtual void    Paint( const Rectangle& rRect );
 };
 
-#endif // _SVX_DLG_CTRL_HXX
+#endif // INCLUDED_SVX_DLGCTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx
index 859d4c764c79..1e751d142a6f 100644
--- a/include/svx/dlgutil.hxx
+++ b/include/svx/dlgutil.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_DLGUTIL_HXX
-#define _SVX_DLGUTIL_HXX
+#ifndef INCLUDED_SVX_DLGUTIL_HXX
+#define INCLUDED_SVX_DLGUTIL_HXX
 
 #include <svtools/unitconv.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/drawitem.hxx b/include/svx/drawitem.hxx
index 16447dce67cc..1445d9abdead 100644
--- a/include/svx/drawitem.hxx
+++ b/include/svx/drawitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_DRAWITEM_HXX
-#define _SVX_DRAWITEM_HXX
+#ifndef INCLUDED_SVX_DRAWITEM_HXX
+#define INCLUDED_SVX_DRAWITEM_HXX
 
 #include <svl/poolitem.hxx>
 #include <svx/xtable.hxx>
diff --git a/include/svx/dstribut_enum.hxx b/include/svx/dstribut_enum.hxx
index 58d798311d3f..b183d844c19e 100644
--- a/include/svx/dstribut_enum.hxx
+++ b/include/svx/dstribut_enum.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_DSTRIBUT_ENUM_HXX
-#define _SVX_DSTRIBUT_ENUM_HXX
+#ifndef INCLUDED_SVX_DSTRIBUT_ENUM_HXX
+#define INCLUDED_SVX_DSTRIBUT_ENUM_HXX
 
 enum SvxDistributeHorizontal
 {
@@ -37,6 +37,6 @@ enum SvxDistributeVertical
     SvxDistributeVerticalBottom
 };
 
-#endif // _SVX_DSTRIBUT_ENUM_HXX
+#endif // INCLUDED_SVX_DSTRIBUT_ENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx
index dfd722cd8347..2a08a59a7726 100644
--- a/include/svx/e3ditem.hxx
+++ b/include/svx/e3ditem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVXE3DITEM_HXX
-#define _SVXE3DITEM_HXX
+#ifndef INCLUDED_SVX_E3DITEM_HXX
+#define INCLUDED_SVX_E3DITEM_HXX
 
 #include <svl/poolitem.hxx>
 #include <basegfx/vector/b3dvector.hxx>
diff --git a/include/svx/e3dsceneupdater.hxx b/include/svx/e3dsceneupdater.hxx
index a0223fbf9ed4..039617a52905 100644
--- a/include/svx/e3dsceneupdater.hxx
+++ b/include/svx/e3dsceneupdater.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_SCENEUPDATER_HXX
-#define _E3D_SCENEUPDATER_HXX
+#ifndef INCLUDED_SVX_E3DSCENEUPDATER_HXX
+#define INCLUDED_SVX_E3DSCENEUPDATER_HXX
 
 #include <svx/svxdllapi.h>
 
@@ -63,6 +63,6 @@ public:
     ~E3DModifySceneSnapRectUpdater();
 };
 
-#endif          // _E3D_SCENEUPDATER_HXX
+#endif // INCLUDED_SVX_E3DSCENEUPDATER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx
index af919ca077ea..c780dae8cd7b 100644
--- a/include/svx/e3dundo.hxx
+++ b/include/svx/e3dundo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_UNDO_HXX
-#define _E3D_UNDO_HXX
+#ifndef INCLUDED_SVX_E3DUNDO_HXX
+#define INCLUDED_SVX_E3DUNDO_HXX
 
 #include <svx/svdundo.hxx>
 #include <svx/scene3d.hxx>
@@ -107,6 +107,6 @@ class SVX_DLLPUBLIC E3dAttributesUndoAction : public SdrUndoAction
         virtual void Repeat();
 };
 
-#endif          // _E3D_CUBE3D_HXX
+#endif // INCLUDED_SVX_E3DUNDO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/extedit.hxx b/include/svx/extedit.hxx
index a2580edae11c..dc0c48917d06 100644
--- a/include/svx/extedit.hxx
+++ b/include/svx/extedit.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _EXTEDIT_HXX
-#define _EXTEDIT_HXX
+#ifndef INCLUDED_SVX_EXTEDIT_HXX
+#define INCLUDED_SVX_EXTEDIT_HXX
 
 #include <svtools/grfmgr.hxx>
 #include <osl/file.hxx>
diff --git a/include/svx/extrud3d.hxx b/include/svx/extrud3d.hxx
index fc94e8c23b8b..9b7a0ef4fd79 100644
--- a/include/svx/extrud3d.hxx
+++ b/include/svx/extrud3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_EXTRUD3D_HXX
-#define _E3D_EXTRUD3D_HXX
+#ifndef INCLUDED_SVX_EXTRUD3D_HXX
+#define INCLUDED_SVX_EXTRUD3D_HXX
 
 #include <svx/obj3d.hxx>
 #include "svx/svxdllapi.h"
@@ -97,6 +97,6 @@ public:
     virtual SdrAttrObj* GetBreakObj();
 };
 
-#endif          // _E3D_EXTRUD3D_HXX
+#endif // INCLUDED_SVX_EXTRUD3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx
index 0cb9e829db45..3d34481b9697 100644
--- a/include/svx/extrusionbar.hxx
+++ b/include/svx/extrusionbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_EXTRUSION_BAR_HXX
-#define _SVX_EXTRUSION_BAR_HXX
+#ifndef INCLUDED_SVX_EXTRUSIONBAR_HXX
+#define INCLUDED_SVX_EXTRUSIONBAR_HXX
 
 #include <sfx2/shell.hxx>
 #include <sfx2/module.hxx>
@@ -50,6 +50,6 @@ public:
 
 }
 
-#endif          // _SVX_EXTRUSION_BAR_HXX
+#endif // INCLUDED_SVX_EXTRUSIONBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/extrusioncolorcontrol.hxx b/include/svx/extrusioncolorcontrol.hxx
index 1c2538832788..b62439c67e42 100644
--- a/include/svx/extrusioncolorcontrol.hxx
+++ b/include/svx/extrusioncolorcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_EXTRUSIONCOLORCONTROL_HXX
-#define _SVX_EXTRUSIONCOLORCONTROL_HXX
+#ifndef INCLUDED_SVX_EXTRUSIONCOLORCONTROL_HXX
+#define INCLUDED_SVX_EXTRUSIONCOLORCONTROL_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include "svx/svxdllapi.h"
@@ -45,6 +45,6 @@ public:
 
 }
 
-#endif      // _SVX_EXTRUSIONCOLORCONTROL_HXX
+#endif // INCLUDED_SVX_EXTRUSIONCOLORCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/f3dchild.hxx b/include/svx/f3dchild.hxx
index 8b0446d1cd83..650ffc3244b9 100644
--- a/include/svx/f3dchild.hxx
+++ b/include/svx/f3dchild.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SVX_F3DCHILD_HXX
-#define _SVX_F3DCHILD_HXX
+#ifndef INCLUDED_SVX_F3DCHILD_HXX
+#define INCLUDED_SVX_F3DCHILD_HXX
 
 
 #include <sfx2/childwin.hxx>
@@ -39,6 +39,6 @@ class SVX_DLLPUBLIC Svx3DChildWindow : public SfxChildWindow
     SFX_DECL_CHILDWINDOW_WITHID(Svx3DChildWindow);
 };
 
-#endif      // _SVX_F3DCHILD_HXX
+#endif // INCLUDED_SVX_F3DCHILD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx
index 73d531b6ac66..926f6b83f4a7 100644
--- a/include/svx/fillctrl.hxx
+++ b/include/svx/fillctrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILLCTRL_HXX
-#define _FILLCTRL_HXX
+#ifndef INCLUDED_SVX_FILLCTRL_HXX
+#define INCLUDED_SVX_FILLCTRL_HXX
 
 #include <svl/lstner.hxx>
 #include <sfx2/tbxctrl.hxx>
@@ -92,6 +92,6 @@ public:
     virtual void Resize();
 };
 
-#endif      // _FILLCTRL_HXX
+#endif // INCLUDED_SVX_FILLCTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/flagsdef.hxx b/include/svx/flagsdef.hxx
index 1603ee558584..4868d7618e49 100644
--- a/include/svx/flagsdef.hxx
+++ b/include/svx/flagsdef.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FLAGSDEF_HXX
-#define _SVX_FLAGSDEF_HXX
+#ifndef INCLUDED_SVX_FLAGSDEF_HXX
+#define INCLUDED_SVX_FLAGSDEF_HXX
 
 // defines ---------------------------------------------------------------
 
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index 1809e715c3ad..9f9141b3652d 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FLOAT3D_HXX
-#define _SVX_FLOAT3D_HXX
+#ifndef INCLUDED_SVX_FLOAT3D_HXX
+#define INCLUDED_SVX_FLOAT3D_HXX
 
 #include <sfx2/ctrlitem.hxx>
 #include <vcl/fixed.hxx>
@@ -286,6 +286,6 @@ public:
     sal_Bool GetState() const { return bState; }
 };
 
-#endif      // _SVX_FLOAT3D_HXX
+#endif // INCLUDED_SVX_FLOAT3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmdmod.hxx b/include/svx/fmdmod.hxx
index b59eb65c7f59..0d13c7a00a56 100644
--- a/include/svx/fmdmod.hxx
+++ b/include/svx/fmdmod.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FMDMOD_HXX
-#define _SVX_FMDMOD_HXX
+#ifndef INCLUDED_SVX_FMDMOD_HXX
+#define INCLUDED_SVX_FMDMOD_HXX
 
 #include <svx/unomod.hxx>
 #include "svx/svxdllapi.h"
@@ -35,6 +35,6 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
 };
 
-#endif // _SVX_FMDMOD_HXX
+#endif // INCLUDED_SVX_FMDMOD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmdpage.hxx b/include/svx/fmdpage.hxx
index 50b99f8116a6..1d24a824abd3 100644
--- a/include/svx/fmdpage.hxx
+++ b/include/svx/fmdpage.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FMDPAGE_HXX
-#define _SVX_FMDPAGE_HXX
+#ifndef INCLUDED_SVX_FMDPAGE_HXX
+#define INCLUDED_SVX_FMDPAGE_HXX
 
 #include <com/sun/star/form/XFormsSupplier2.hpp>
 #include <svx/unopage.hxx>
@@ -62,6 +62,6 @@ public:
     virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
 };
 
-#endif // _SVX_FMDPAGE_HXX
+#endif // INCLUDED_SVX_FMDPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmglob.hxx b/include/svx/fmglob.hxx
index 71909d43e8a9..88943f4c61ae 100644
--- a/include/svx/fmglob.hxx
+++ b/include/svx/fmglob.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FMGLOB_HXX
-#define _SVX_FMGLOB_HXX
+#ifndef INCLUDED_SVX_FMGLOB_HXX
+#define INCLUDED_SVX_FMGLOB_HXX
 
 #include <tools/solar.h>
 #include <svx/svdobj.hxx>
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index b0d225ccef24..2f361a87fd3f 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FMGRIDCL_HXX
-#define _SVX_FMGRIDCL_HXX
+#ifndef INCLUDED_SVX_FMGRIDCL_HXX
+#define INCLUDED_SVX_FMGRIDCL_HXX
 
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -201,6 +201,6 @@ protected:
     sal_Bool isColumnSelected(sal_uInt16 nColumnId,DbGridColumn* _pColumn);
 };
 
-#endif // _SVX_FMGRIDCL_HXX
+#endif // INCLUDED_SVX_FMGRIDCL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx
index b159c289fec1..73be8713e48b 100644
--- a/include/svx/fmgridif.hxx
+++ b/include/svx/fmgridif.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FMGRIDIF_HXX
-#define _SVX_FMGRIDIF_HXX
+#ifndef INCLUDED_SVX_FMGRIDIF_HXX
+#define INCLUDED_SVX_FMGRIDIF_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/fmmodel.hxx b/include/svx/fmmodel.hxx
index 0d0fe0bc443c..1d3640ab06e8 100644
--- a/include/svx/fmmodel.hxx
+++ b/include/svx/fmmodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FMMODEL_HXX
-#define _SVX_FMMODEL_HXX
+#ifndef INCLUDED_SVX_FMMODEL_HXX
+#define INCLUDED_SVX_FMMODEL_HXX
 
 #include <svx/svdmodel.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/fmobjfac.hxx b/include/svx/fmobjfac.hxx
index 1686f891f357..052c069f64aa 100644
--- a/include/svx/fmobjfac.hxx
+++ b/include/svx/fmobjfac.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FMOBJFAC_HXX
-#define _SVX_FMOBJFAC_HXX
+#ifndef INCLUDED_SVX_FMOBJFAC_HXX
+#define INCLUDED_SVX_FMOBJFAC_HXX
 
 #include <tools/link.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index 93271d43b4cf..116ef242de56 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FMPAGE_HXX
-#define _SVX_FMPAGE_HXX
+#ifndef INCLUDED_SVX_FMPAGE_HXX
+#define INCLUDED_SVX_FMPAGE_HXX
 
 #include <svx/svdpage.hxx>
 #include <comphelper/uno3.hxx>
@@ -77,6 +77,6 @@ public:
                             const HelpEvent& rEvt );
 };
 
-#endif          // _SVX_FMPAGE_HXX
+#endif // INCLUDED_SVX_FMPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmsearch.hxx b/include/svx/fmsearch.hxx
index ab9b8442c231..a45c03936bd1 100644
--- a/include/svx/fmsearch.hxx
+++ b/include/svx/fmsearch.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FMSEARCH_HXX
-#define _FMSEARCH_HXX
+#ifndef INCLUDED_SVX_FMSEARCH_HXX
+#define INCLUDED_SVX_FMSEARCH_HXX
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <comphelper/stl_types.hxx>
@@ -73,6 +73,6 @@ struct FmSearchContext
     OUString                sFieldDisplayNames;     // if not empty : names to be displayed for the searchable fields (must have the same token count as strUsedFields !)
 };
 
-#endif // _FMSEARCH_HXX
+#endif // INCLUDED_SVX_FMSEARCH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index c6091aa4ba24..bf3b61c1b950 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FMSHELL_HXX
-#define _SVX_FMSHELL_HXX
+#ifndef INCLUDED_SVX_FMSHELL_HXX
+#define INCLUDED_SVX_FMSHELL_HXX
 
 // ***************************************************************************************************
 // ***************************************************************************************************
@@ -176,6 +176,6 @@ protected:
 // ***************************************************************************************************
 // ***************************************************************************************************
 
-#endif          // _SVX_FMSHELL_HXX
+#endif // INCLUDED_SVX_FMSHELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmsrccfg.hxx b/include/svx/fmsrccfg.hxx
index 8ad3d2edc569..c6b892f25d63 100644
--- a/include/svx/fmsrccfg.hxx
+++ b/include/svx/fmsrccfg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FMSRCCF_HXX_
-#define _FMSRCCF_HXX_
+#ifndef INCLUDED_SVX_FMSRCCFG_HXX
+#define INCLUDED_SVX_FMSRCCFG_HXX
 
 #include <unotools/configvaluecontainer.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
@@ -142,6 +142,6 @@ namespace svxform
 
 // ===================================================================================================
 
-#endif // _FMSRCCF_HXX_
+#endif // INCLUDED_SVX_FMSRCCFG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index ea32ce0757dc..7bc389ee8c5c 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FMSRCIMP_HXX
-#define _FMSRCIMP_HXX
+#ifndef INCLUDED_SVX_FMSRCIMP_HXX
+#define INCLUDED_SVX_FMSRCIMP_HXX
 
 #include <svx/fmtools.hxx>
 #include "svx/svxdllapi.h"
@@ -382,6 +382,6 @@ private:
     DECL_LINK(OnNewRecordCount, void*);
 };
 
-#endif // _FMSRCIMP_HXX
+#endif // INCLUDED_SVX_FMSRCIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index bd24488c73a8..ab72aed8a422 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FMTOOLS_HXX
-#define _SVX_FMTOOLS_HXX
+#ifndef INCLUDED_SVX_FMTOOLS_HXX
+#define INCLUDED_SVX_FMTOOLS_HXX
 
 #include "svx/svxdllapi.h"
 
@@ -220,6 +220,6 @@ typedef ::std::set  < ::com::sun::star::uno::Reference< ::com::sun::star::uno::X
                     , ::comphelper::OInterfaceCompare< ::com::sun::star::uno::XInterface >
                     > InterfaceBag;
 
-#endif // _SVX_FMTOOLS_HXX
+#endif // INCLUDED_SVX_FMTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fmview.hxx b/include/svx/fmview.hxx
index 07ce4c02c106..bacc20acddc2 100644
--- a/include/svx/fmview.hxx
+++ b/include/svx/fmview.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FMVIEW_HXX
-#define _SVX_FMVIEW_HXX
+#ifndef INCLUDED_SVX_FMVIEW_HXX
+#define INCLUDED_SVX_FMVIEW_HXX
 
 #include <svx/view3d.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/include/svx/fntctl.hxx b/include/svx/fntctl.hxx
index 08f9f798b066..4ec4acfb428e 100644
--- a/include/svx/fntctl.hxx
+++ b/include/svx/fntctl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FNTCTL_HXX
-#define _SVX_FNTCTL_HXX
+#ifndef INCLUDED_SVX_FNTCTL_HXX
+#define INCLUDED_SVX_FNTCTL_HXX
 
 #include <sfx2/mnuitem.hxx>
 #include <svl/lstner.hxx>
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index f4c62621f673..3cc64aef039e 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FNTCTRL_HXX
-#define _SVX_FNTCTRL_HXX
+#ifndef INCLUDED_SVX_FNTCTRL_HXX
+#define INCLUDED_SVX_FNTCTRL_HXX
 
 #include <vcl/window.hxx>
 #include <editeng/svxfont.hxx>
@@ -90,6 +90,6 @@ public:
     virtual Size GetOptimalSize() const;
 };
 
-#endif // #ifndef _SVX_FNTCTRL_HXX
+#endif // INCLUDED_SVX_FNTCTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fntszctl.hxx b/include/svx/fntszctl.hxx
index 117553e8e07b..94f32912cba1 100644
--- a/include/svx/fntszctl.hxx
+++ b/include/svx/fntszctl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FNTSZCTL_HXX
-#define _SVX_FNTSZCTL_HXX
+#ifndef INCLUDED_SVX_FNTSZCTL_HXX
+#define INCLUDED_SVX_FNTSZCTL_HXX
 
 #include <sfx2/mnuitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/fontlb.hxx b/include/svx/fontlb.hxx
index 3961f2843f82..13354fe2ef0c 100644
--- a/include/svx/fontlb.hxx
+++ b/include/svx/fontlb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FONTLB_HXX
-#define SVX_FONTLB_HXX
+#ifndef INCLUDED_SVX_FONTLB_HXX
+#define INCLUDED_SVX_FONTLB_HXX
 
 #include <svtools/svtabbx.hxx>
 #include <svtools/svlbitm.hxx>
diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx
index 81cc59b65943..57e34cc113ff 100644
--- a/include/svx/fontwork.hxx
+++ b/include/svx/fontwork.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_FONTWORK_HXX
-#define _SVX_FONTWORK_HXX
+#ifndef INCLUDED_SVX_FONTWORK_HXX
+#define INCLUDED_SVX_FONTWORK_HXX
 
 #include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
@@ -166,6 +166,6 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow
     void SetActive(bool bActivate = true);
 };
 
-#endif      // _SVX_FONTWORK_HXX
+#endif // INCLUDED_SVX_FONTWORK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx
index 8b7d04ef8c3a..41f07df3c83d 100644
--- a/include/svx/fontworkbar.hxx
+++ b/include/svx/fontworkbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FONTWORK_BAR_HXX
-#define _SVX_FONTWORK_BAR_HXX
+#ifndef INCLUDED_SVX_FONTWORKBAR_HXX
+#define INCLUDED_SVX_FONTWORKBAR_HXX
 
 #include <sfx2/shell.hxx>
 #include <sfx2/module.hxx>
@@ -50,6 +50,6 @@ public:
 
 }
 
-#endif          // _SVX_FONTWORK_BAR_HXX
+#endif // INCLUDED_SVX_FONTWORKBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx
index 24f5d5b20cbb..3ec4334ee972 100644
--- a/include/svx/fontworkgallery.hxx
+++ b/include/svx/fontworkgallery.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SVX_FONTWORK_GALLERY_DIALOG_HXX
-#define _SVX_FONTWORK_GALLERY_DIALOG_HXX
+#ifndef INCLUDED_SVX_FONTWORKGALLERY_HXX
+#define INCLUDED_SVX_FONTWORKGALLERY_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx
index e77a12f00ef4..e86a1588ec5c 100644
--- a/include/svx/formatpaintbrushctrl.hxx
+++ b/include/svx/formatpaintbrushctrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FORMATPAINTBRUSHCTRL_HXX
-#define _SVX_FORMATPAINTBRUSHCTRL_HXX
+#ifndef INCLUDED_SVX_FORMATPAINTBRUSHCTRL_HXX
+#define INCLUDED_SVX_FORMATPAINTBRUSHCTRL_HXX
 
 // header for class SfxToolBoxControl
 #include <sfx2/tbxctrl.hxx>
diff --git a/include/svx/framebordertype.hxx b/include/svx/framebordertype.hxx
index 18db6b901c0a..835b88cd1d27 100644
--- a/include/svx/framebordertype.hxx
+++ b/include/svx/framebordertype.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FRAMEBORDERTYPE_HXX
-#define SVX_FRAMEBORDERTYPE_HXX
+#ifndef INCLUDED_SVX_FRAMEBORDERTYPE_HXX
+#define INCLUDED_SVX_FRAMEBORDERTYPE_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/framelink.hxx b/include/svx/framelink.hxx
index a8a05076f471..6d610dc99b7a 100644
--- a/include/svx/framelink.hxx
+++ b/include/svx/framelink.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FRAMELINK_HXX
-#define SVX_FRAMELINK_HXX
+#ifndef INCLUDED_SVX_FRAMELINK_HXX
+#define INCLUDED_SVX_FRAMELINK_HXX
 
 #include <algorithm>
 #include <sal/types.h>
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index b0afbd4b4b30..03b7d972b7cd 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FRAMELINKARRAY_HXX
-#define SVX_FRAMELINKARRAY_HXX
+#ifndef INCLUDED_SVX_FRAMELINKARRAY_HXX
+#define INCLUDED_SVX_FRAMELINKARRAY_HXX
 
 #include <svx/framelink.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index 427c0df0f449..eb198c0de4bb 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FRMDIRLBOX_HXX
-#define _SVX_FRMDIRLBOX_HXX
+#ifndef INCLUDED_SVX_FRMDIRLBOX_HXX
+#define INCLUDED_SVX_FRMDIRLBOX_HXX
 
 #include <vcl/lstbox.hxx>
 #include <sfx2/itemconnect.hxx>
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 48b720856c86..10d3ef1bd796 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FRMSEL_HXX
-#define SVX_FRMSEL_HXX
+#ifndef INCLUDED_SVX_FRMSEL_HXX
+#define INCLUDED_SVX_FRMSEL_HXX
 
 #include <memory>
 #include <tools/color.hxx>
diff --git a/include/svx/galbrws.hxx b/include/svx/galbrws.hxx
index 2dffc16a8470..fcd9a3d9dff6 100644
--- a/include/svx/galbrws.hxx
+++ b/include/svx/galbrws.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GALBRWS_HXX_
-#define _SVX_GALBRWS_HXX_
+#ifndef INCLUDED_SVX_GALBRWS_HXX
+#define INCLUDED_SVX_GALBRWS_HXX
 
 #include <sfx2/ctrlitem.hxx>
 #include <sfx2/dockwin.hxx>
@@ -77,6 +77,6 @@ public:
     sal_Bool                KeyInput( const KeyEvent& rKEvt, Window* pWindow );
 };
 
-#endif // _SVX_GALBRWS_HXX_
+#endif // INCLUDED_SVX_GALBRWS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 31810169a2d4..cf9854a6bff3 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GALCTRL_HXX_
-#define _SVX_GALCTRL_HXX_
+#ifndef INCLUDED_SVX_GALCTRL_HXX
+#define INCLUDED_SVX_GALCTRL_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/graph.hxx>
@@ -162,6 +162,6 @@ public:
     virtual sal_Int32 GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnPos,const Point& _rPoint);
 };
 
-#endif // _SVX_GALCTRL_HXX_
+#endif // INCLUDED_SVX_GALCTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/gallery.hxx b/include/svx/gallery.hxx
index c26479a59fe9..de1ac04348ac 100644
--- a/include/svx/gallery.hxx
+++ b/include/svx/gallery.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GALLERY_HXX_
-#define _GALLERY_HXX_
+#ifndef INCLUDED_SVX_GALLERY_HXX
+#define INCLUDED_SVX_GALLERY_HXX
 
 #include <tools/solar.h>
 #include <tools/urlobj.hxx>
@@ -85,6 +85,6 @@ public:
     static sal_Bool                 EndLocking( sal_uIntPtr nThemeId );
 };
 
-#endif // _GALLERY_HXX_
+#endif // INCLUDED_SVX_GALLERY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index be886bc95840..e0c6fef1321c 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GALLERY1_HXX_
-#define _SVX_GALLERY1_HXX_
+#ifndef INCLUDED_SVX_GALLERY1_HXX
+#define INCLUDED_SVX_GALLERY1_HXX
 
 #include <rtl/ustring.hxx>
 #include <svl/brdcst.hxx>
@@ -148,6 +148,6 @@ public:
     sal_Bool                    IsMultiPath() const { return bMultiPath; }
 };
 
-#endif // _SVX_GALLERY1_HXX_
+#endif // INCLUDED_SVX_GALLERY1_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx
index f4098d0da9a8..2411cab6acc4 100644
--- a/include/svx/galleryitem.hxx
+++ b/include/svx/galleryitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_GALLERYITEMITEM_HXX
-#define _SVX_GALLERYITEMITEM_HXX
+#ifndef INCLUDED_SVX_GALLERYITEM_HXX
+#define INCLUDED_SVX_GALLERYITEM_HXX
 
 #include <svx/svxdllapi.h>
 #include <svl/poolitem.hxx>
diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx
index 7411f0c49aee..a9d020774e7b 100644
--- a/include/svx/galmisc.hxx
+++ b/include/svx/galmisc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GALMISC_HXX_
-#define _SVX_GALMISC_HXX_
+#ifndef INCLUDED_SVX_GALMISC_HXX
+#define INCLUDED_SVX_GALMISC_HXX
 
 #include <sot/storage.hxx>
 #include <tools/urlobj.hxx>
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 216a5b59c891..34e796fd5553 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GALTHEME_HXX_
-#define _SVX_GALTHEME_HXX_
+#ifndef INCLUDED_SVX_GALTHEME_HXX
+#define INCLUDED_SVX_GALTHEME_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/globl3d.hxx b/include/svx/globl3d.hxx
index d5d495153a7b..3d81b3370ddf 100644
--- a/include/svx/globl3d.hxx
+++ b/include/svx/globl3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_GLOBL3D_HXX
-#define _E3D_GLOBL3D_HXX
+#ifndef INCLUDED_SVX_GLOBL3D_HXX
+#define INCLUDED_SVX_GLOBL3D_HXX
 
 #include <tools/solar.h>
 
@@ -37,6 +37,6 @@ const sal_uInt16 E3D_LATHEOBJ_ID    = 7;
 const sal_uInt16 E3D_COMPOUNDOBJ_ID = 8;
 const sal_uInt16 E3D_POLYGONOBJ_ID  = 9;
 
-#endif      // _E3D_GLOBL3D_HXX
+#endif // INCLUDED_SVX_GLOBL3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx
index 10b050990d62..35f708c757ff 100644
--- a/include/svx/grafctrl.hxx
+++ b/include/svx/grafctrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GRAFCTRL_HXX
-#define _SVX_GRAFCTRL_HXX
+#ifndef INCLUDED_SVX_GRAFCTRL_HXX
+#define INCLUDED_SVX_GRAFCTRL_HXX
 
 #include <svl/lstner.hxx>
 #include <svl/intitem.hxx>
@@ -178,6 +178,6 @@ public:
     static void     GetGrafAttrState( SfxItemSet& rSet, SdrView& rView );
 };
 
-#endif // _SVX_GRAFCTRL_HXX
+#endif // INCLUDED_SVX_GRAFCTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 1d91aa3ddd7e..a46586febb1d 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _GRAPHCTL_HXX
-#define _GRAPHCTL_HXX
+#ifndef INCLUDED_SVX_GRAPHCTL_HXX
+#define INCLUDED_SVX_GRAPHCTL_HXX
 
 #include <vcl/ctrl.hxx>
 #include <vcl/graph.hxx>
@@ -155,6 +155,6 @@ public:
     virtual         ~GraphCtrlView() {};
 };
 
-#endif // _GRAPHCTL_HXX
+#endif // INCLUDED_SVX_GRAPHCTL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/graphichelper.hxx b/include/svx/graphichelper.hxx
index 650a300b6da6..b78ac7c2b8b9 100644
--- a/include/svx/graphichelper.hxx
+++ b/include/svx/graphichelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GRAPHICHELPER_HXX
-#define _GRAPHICHELPER_HXX
+#ifndef INCLUDED_SVX_GRAPHICHELPER_HXX
+#define INCLUDED_SVX_GRAPHICHELPER_HXX
 
 #include <vcl/graph.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/grfcrop.hxx b/include/svx/grfcrop.hxx
index 06836b2827cd..1612bd4d17a8 100644
--- a/include/svx/grfcrop.hxx
+++ b/include/svx/grfcrop.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_GRFCROP_HXX
-#define _SVX_GRFCROP_HXX
+#ifndef INCLUDED_SVX_GRFCROP_HXX
+#define INCLUDED_SVX_GRFCROP_HXX
 
 #include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/grfflt.hxx b/include/svx/grfflt.hxx
index 8557c121c648..3f2e8d94037a 100644
--- a/include/svx/grfflt.hxx
+++ b/include/svx/grfflt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GRFFLT_HXX
-#define _SVX_GRFFLT_HXX
+#ifndef INCLUDED_SVX_GRFFLT_HXX
+#define INCLUDED_SVX_GRFFLT_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 86ff77f3d425..73bb0846b165 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_GRIDCTRL_HXX
-#define _SVX_GRIDCTRL_HXX
+#ifndef INCLUDED_SVX_GRIDCTRL_HXX
+#define INCLUDED_SVX_GRIDCTRL_HXX
 
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdbc/XRowSetListener.hpp>
@@ -601,6 +601,6 @@ private:
 SV_IMPL_REF(DbGridRow);
 
 
-#endif // _SVX_GRIDCTRL_HXX
+#endif // INCLUDED_SVX_GRIDCTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 4a40479f2232..7cf0a8ee92c6 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_HDFT_HXX
-#define _SVX_HDFT_HXX
+#ifndef INCLUDED_SVX_HDFT_HXX
+#define INCLUDED_SVX_HDFT_HXX
 
 #include <sfx2/tabdlg.hxx>
 
diff --git a/include/svx/helperhittest3d.hxx b/include/svx/helperhittest3d.hxx
index 1c9ecd417732..72f6476dcce5 100644
--- a/include/svx/helperhittest3d.hxx
+++ b/include/svx/helperhittest3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_HELPERHITTEST_HXX
-#define INCLUDED_SVX_HELPERHITTEST_HXX
+#ifndef INCLUDED_SVX_HELPERHITTEST3D_HXX
+#define INCLUDED_SVX_HELPERHITTEST3D_HXX
 
 #include "svx/svxdllapi.h"
 #include <sal/types.h>
@@ -97,6 +97,6 @@ bool checkHitSingle3DObject(
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // INCLUDED_SVX_HELPERHITTEST_HXX
+#endif // INCLUDED_SVX_HELPERHITTEST3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index 70efc190c69e..cbded4108507 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_HLNKITEM_HXX
-#define _SVX_HLNKITEM_HXX
+#ifndef INCLUDED_SVX_HLNKITEM_HXX
+#define INCLUDED_SVX_HLNKITEM_HXX
 
 #include <rtl/ustring.hxx>
 #include <svl/poolitem.hxx>
diff --git a/include/svx/hyperdlg.hxx b/include/svx/hyperdlg.hxx
index b7215ce1b732..9f7e2fe8d469 100644
--- a/include/svx/hyperdlg.hxx
+++ b/include/svx/hyperdlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TAB_HYPERLINK_HXX
-#define _SVX_TAB_HYPERLINK_HXX
+#ifndef INCLUDED_SVX_HYPERDLG_HXX
+#define INCLUDED_SVX_HYPERDLG_HXX
 
 #include <sfx2/childwin.hxx>
 #include "svx/svxdllapi.h"
@@ -44,6 +44,6 @@ public:
     virtual sal_Bool    QueryClose();
 };
 
-#endif // _SVX_TAB_HYPERLINK_HXX
+#endif // INCLUDED_SVX_HYPERDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/ifaceids.hxx b/include/svx/ifaceids.hxx
index 20ab313de5e1..bdd4bd133621 100644
--- a/include/svx/ifaceids.hxx
+++ b/include/svx/ifaceids.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_IFACEIDS_HXX
-#define _SVX_IFACEIDS_HXX
+#ifndef INCLUDED_SVX_IFACEIDS_HXX
+#define INCLUDED_SVX_IFACEIDS_HXX
 
 // -----------------------------------------------------------------------
 
diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx
index 91e6966e7a35..508a63689a3f 100644
--- a/include/svx/insctrl.hxx
+++ b/include/svx/insctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_INSCTRL_HXX
-#define _SVX_INSCTRL_HXX
+#ifndef INCLUDED_SVX_INSCTRL_HXX
+#define INCLUDED_SVX_INSCTRL_HXX
 
 #include <sfx2/stbitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/ipolypolygoneditorcontroller.hxx b/include/svx/ipolypolygoneditorcontroller.hxx
index 870ebce0b922..3829586cbe66 100644
--- a/include/svx/ipolypolygoneditorcontroller.hxx
+++ b/include/svx/ipolypolygoneditorcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_IPOLYPOLYGONEDITORCONTROLLER_HXX
-#define _SDR_IPOLYPOLYGONEDITORCONTROLLER_HXX
+#ifndef INCLUDED_SVX_IPOLYPOLYGONEDITORCONTROLLER_HXX
+#define INCLUDED_SVX_IPOLYPOLYGONEDITORCONTROLLER_HXX
 
 #include "svx/svxdllapi.h"
 #include <svx/svdedtv.hxx>
@@ -67,6 +67,6 @@ protected:
     ~IPolyPolygonEditorController() {}
 };
 
-#endif //_SDR_IPOLYPOLYGONEDITORCONTROLLER_HXX
+#endif // INCLUDED_SVX_IPOLYPOLYGONEDITORCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index bae3ee662b24..e7cd2c90c38f 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_ITEMWIN_HXX
-#define _SVX_ITEMWIN_HXX
+#ifndef INCLUDED_SVX_ITEMWIN_HXX
+#define INCLUDED_SVX_ITEMWIN_HXX
 
 #include <vcl/bitmap.hxx>
 
@@ -172,6 +172,6 @@ private:
     void            ReleaseFocus_Impl();
 };
 
-#endif // #ifndef _SVX_ITEMWIN_HXX
+#endif // INCLUDED_SVX_ITEMWIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index e9319bcbdbc8..1149b42bb1ab 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_LANGBOX_HXX
-#define _SVX_LANGBOX_HXX
+#ifndef INCLUDED_SVX_LANGBOX_HXX
+#define INCLUDED_SVX_LANGBOX_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/include/svx/lathe3d.hxx b/include/svx/lathe3d.hxx
index e765a2d9776a..47bd56cd3085 100644
--- a/include/svx/lathe3d.hxx
+++ b/include/svx/lathe3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_LATHE3D_HXX
-#define _E3D_LATHE3D_HXX
+#ifndef INCLUDED_SVX_LATHE3D_HXX
+#define INCLUDED_SVX_LATHE3D_HXX
 
 #include <svx/obj3d.hxx>
 #include "svx/svxdllapi.h"
@@ -109,6 +109,6 @@ private:
     virtual SdrAttrObj* GetBreakObj();
 };
 
-#endif          // _E3D_LATHE3D_HXX
+#endif // INCLUDED_SVX_LATHE3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index b32c2a514adc..05766ce015d2 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_LAYCTRL_HXX
-#define _SVX_LAYCTRL_HXX
+#ifndef INCLUDED_SVX_LAYCTRL_HXX
+#define INCLUDED_SVX_LAYCTRL_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index d717b1e30344..0d70611f861e 100644
--- a/include/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_LBOXCTRL_HXX_
-#define _SVX_LBOXCTRL_HXX_
+#ifndef INCLUDED_SVX_LBOXCTRL_HXX
+#define INCLUDED_SVX_LBOXCTRL_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include <rtl/ustring.hxx>
diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx
index cf914c5fba3d..d15ce37a8116 100644
--- a/include/svx/linectrl.hxx
+++ b/include/svx/linectrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_LINECTRL_HXX
-#define _SVX_LINECTRL_HXX
+#ifndef INCLUDED_SVX_LINECTRL_HXX
+#define INCLUDED_SVX_LINECTRL_HXX
 
 
 #include <svtools/valueset.hxx>
diff --git a/include/svx/linkwarn.hxx b/include/svx/linkwarn.hxx
index d46ce4a0c1cc..af315f0d5adc 100644
--- a/include/svx/linkwarn.hxx
+++ b/include/svx/linkwarn.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SFX_LINKWARN_HXX
-#define _SFX_LINKWARN_HXX
+#ifndef INCLUDED_SVX_LINKWARN_HXX
+#define INCLUDED_SVX_LINKWARN_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
@@ -42,6 +42,6 @@ public:
     virtual ~SvxLinkWarningDialog();
 };
 
-#endif // #ifndef _SFX_LINKWARN_HXX
+#endif // INCLUDED_SVX_LINKWARN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx
index bfb925b5b7cc..3645b3346a21 100644
--- a/include/svx/measctrl.hxx
+++ b/include/svx/measctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_MEASCTRL_HXX
-#define _SVX_MEASCTRL_HXX
+#ifndef INCLUDED_SVX_MEASCTRL_HXX
+#define INCLUDED_SVX_MEASCTRL_HXX
 
 #include <vcl/ctrl.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/modctrl.hxx b/include/svx/modctrl.hxx
index 89ea37eefef3..cf3e3f596a33 100644
--- a/include/svx/modctrl.hxx
+++ b/include/svx/modctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_MODCTRL_HXX
-#define _SVX_MODCTRL_HXX
+#ifndef INCLUDED_SVX_MODCTRL_HXX
+#define INCLUDED_SVX_MODCTRL_HXX
 
 #include <tools/link.hxx>
 #include <sfx2/stbitem.hxx>
diff --git a/include/svx/msdffdef.hxx b/include/svx/msdffdef.hxx
index bbe61e944c12..513c83fd08e6 100644
--- a/include/svx/msdffdef.hxx
+++ b/include/svx/msdffdef.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _MSDFFDEF_HXX
-#define _MSDFFDEF_HXX
+#ifndef INCLUDED_SVX_MSDFFDEF_HXX
+#define INCLUDED_SVX_MSDFFDEF_HXX
 
 #include <sal/types.h>
 #include <tools/solar.h>
diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx
index 98fc98017a4b..d209d04d42d0 100644
--- a/include/svx/numfmtsh.hxx
+++ b/include/svx/numfmtsh.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_NUMFMTSH_HXX
-#define _SVX_NUMFMTSH_HXX
+#ifndef INCLUDED_SVX_NUMFMTSH_HXX
+#define INCLUDED_SVX_NUMFMTSH_HXX
 
 #include <i18nlangtag/lang.h>
 
diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx
index 7439ef14640c..9062444d33c2 100644
--- a/include/svx/numinf.hxx
+++ b/include/svx/numinf.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_NUMINF_HXX
-#define _SVX_NUMINF_HXX
+#ifndef INCLUDED_SVX_NUMINF_HXX
+#define INCLUDED_SVX_NUMINF_HXX
 
 #include <svl/itempool.hxx>
 #include <svx/numfmtsh.hxx>
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 6afc836e2c28..f0fa9f216a3b 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_NUMVSET_HXX
-#define _SVX_NUMVSET_HXX
+#ifndef INCLUDED_SVX_NUMVSET_HXX
+#define INCLUDED_SVX_NUMVSET_HXX
 
 #include <svtools/valueset.hxx>
 #include <limits.h>
diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx
index 8195ee3a88a6..4da42fa61851 100644
--- a/include/svx/obj3d.hxx
+++ b/include/svx/obj3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_OBJ3D_HXX
-#define _E3D_OBJ3D_HXX
+#ifndef INCLUDED_SVX_OBJ3D_HXX
+#define INCLUDED_SVX_OBJ3D_HXX
 
 #include <svx/svdoattr.hxx>
 #include <svx/svdobj.hxx>
@@ -314,6 +314,6 @@ public :
     bool IsAOrdNumRemapCandidate(E3dScene*& prScene) const;
 };
 
-#endif          // _E3D_OBJ3D_HXX
+#endif // INCLUDED_SVX_OBJ3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/objfac3d.hxx b/include/svx/objfac3d.hxx
index 6f8c67288e1f..35c5a678d4c9 100644
--- a/include/svx/objfac3d.hxx
+++ b/include/svx/objfac3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _OBJFAC3D_HXX
-#define _OBJFAC3D_HXX
+#ifndef INCLUDED_SVX_OBJFAC3D_HXX
+#define INCLUDED_SVX_OBJFAC3D_HXX
 
 #include "svx/svxdllapi.h"
 
@@ -45,6 +45,6 @@ public:
 
 
 
-#endif // _OBJFAC3D_HXX
+#endif // INCLUDED_SVX_OBJFAC3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx
index 61a0bb38950a..60092f54db2f 100644
--- a/include/svx/ofaitem.hxx
+++ b/include/svx/ofaitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _OFF_OFAITEM_HXX
-#define _OFF_OFAITEM_HXX
+#ifndef INCLUDED_SVX_OFAITEM_HXX
+#define INCLUDED_SVX_OFAITEM_HXX
 
 #include <svl/poolitem.hxx>
 #include <rtl/ref.hxx>
diff --git a/include/svx/optgenrl.hxx b/include/svx/optgenrl.hxx
index 54df8e21dbf2..137ba0f67eb8 100644
--- a/include/svx/optgenrl.hxx
+++ b/include/svx/optgenrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_OPTGENRL_HXX
-#define _SVX_OPTGENRL_HXX
+#ifndef INCLUDED_SVX_OPTGENRL_HXX
+#define INCLUDED_SVX_OPTGENRL_HXX
 
 // Defines for setting the focus of a Edit via a slot from external.
 #define UNKNOWN_EDIT    ((sal_uInt16)0)
@@ -37,6 +37,6 @@
 #define FAX_EDIT        ((sal_uInt16)14)
 #define EMAIL_EDIT      ((sal_uInt16)15)
 
-#endif // #ifndef _SVX_OPTGENRL_HXX
+#endif // INCLUDED_SVX_OPTGENRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index bc0b6e76e327..c0e8de809237 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_OPTGRID_HXX
-#define _SVX_OPTGRID_HXX
+#ifndef INCLUDED_SVX_OPTGRID_HXX
+#define INCLUDED_SVX_OPTGRID_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include <svl/eitem.hxx>
diff --git a/include/svx/orienthelper.hxx b/include/svx/orienthelper.hxx
index c012f1e4d8d0..9610c385d3f6 100644
--- a/include/svx/orienthelper.hxx
+++ b/include/svx/orienthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_ORIENTHELPER_HXX
-#define SVX_ORIENTHELPER_HXX
+#ifndef INCLUDED_SVX_ORIENTHELPER_HXX
+#define INCLUDED_SVX_ORIENTHELPER_HXX
 
 #include <memory>
 #include <vcl/window.hxx>
diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx
index 199c18d47bd7..cf40b0851655 100644
--- a/include/svx/pagectrl.hxx
+++ b/include/svx/pagectrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_PAGECTRL_HXX
-#define _SVX_PAGECTRL_HXX
+#ifndef INCLUDED_SVX_PAGECTRL_HXX
+#define INCLUDED_SVX_PAGECTRL_HXX
 
 #include <vcl/window.hxx>
 #include "svx/svxdllapi.h"
@@ -157,7 +157,7 @@ public:
     virtual Size GetOptimalSize() const;
 };
 
-#endif // #ifndef _SVX_PAGECTRL_HXX
+#endif // INCLUDED_SVX_PAGECTRL_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/pageitem.hxx b/include/svx/pageitem.hxx
index 416112743f3b..7ddb60f85f4c 100644
--- a/include/svx/pageitem.hxx
+++ b/include/svx/pageitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_PAGEITEM_HXX
-#define _SVX_PAGEITEM_HXX
+#ifndef INCLUDED_SVX_PAGEITEM_HXX
+#define INCLUDED_SVX_PAGEITEM_HXX
 
 #include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx
index e0855aee0e76..4a14d4e0c725 100644
--- a/include/svx/paraprev.hxx
+++ b/include/svx/paraprev.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_PARAPREV_HXX
-#define _SVX_PARAPREV_HXX
+#ifndef INCLUDED_SVX_PARAPREV_HXX
+#define INCLUDED_SVX_PARAPREV_HXX
 
 #include <vcl/window.hxx>
 #include <editeng/svxenum.hxx>
diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx
index 1009597dd77d..db8c99416e9e 100644
--- a/include/svx/passwd.hxx
+++ b/include/svx/passwd.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_PASSWD_HXX
-#define _SVX_PASSWD_HXX
+#ifndef INCLUDED_SVX_PASSWD_HXX
+#define INCLUDED_SVX_PASSWD_HXX
 
 #include <sfx2/basedlgs.hxx>
 
diff --git a/include/svx/pfiledlg.hxx b/include/svx/pfiledlg.hxx
index 6c3dba54a9eb..8ba8b89fd2a6 100644
--- a/include/svx/pfiledlg.hxx
+++ b/include/svx/pfiledlg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_PFILEDLG_HXX
-#define _SVX_PFILEDLG_HXX
+#ifndef INCLUDED_SVX_PFILEDLG_HXX
+#define INCLUDED_SVX_PFILEDLG_HXX
 
 #include <sfx2/filedlghelper.hxx>
 #include "svx/svxdllapi.h"
@@ -45,7 +45,7 @@ public:
     void                    SetContext( sfx2::FileDialogHelper::Context eNewContext );
 };
 
-#endif // _SVX_PFILEDLG_HXX
+#endif // INCLUDED_SVX_PFILEDLG_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/polygn3d.hxx b/include/svx/polygn3d.hxx
index 843eac5c288a..34897316a36d 100644
--- a/include/svx/polygn3d.hxx
+++ b/include/svx/polygn3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_POLYGON3D_HXX
-#define _E3D_POLYGON3D_HXX
+#ifndef INCLUDED_SVX_POLYGN3D_HXX
+#define INCLUDED_SVX_POLYGN3D_HXX
 
 #include <svx/obj3d.hxx>
 #include "svx/svxdllapi.h"
@@ -67,6 +67,6 @@ public:
     void SetLineOnly(sal_Bool bNew);
 };
 
-#endif          // _E3D_POLYGON3D_HXX
+#endif // INCLUDED_SVX_POLYGN3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/polypolygoneditor.hxx b/include/svx/polypolygoneditor.hxx
index 94fabbe4e292..e25a6068a64f 100644
--- a/include/svx/polypolygoneditor.hxx
+++ b/include/svx/polypolygoneditor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_POLYPOLYGONEDITOR_HXX_
-#define _SDR_POLYPOLYGONEDITOR_HXX_
+#ifndef INCLUDED_SVX_POLYPOLYGONEDITOR_HXX
+#define INCLUDED_SVX_POLYPOLYGONEDITOR_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/polysc3d.hxx b/include/svx/polysc3d.hxx
index e25a0bdb36b1..cb661ff1ecd2 100644
--- a/include/svx/polysc3d.hxx
+++ b/include/svx/polysc3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_POLYSC3D_HXX
-#define _E3D_POLYSC3D_HXX
+#ifndef INCLUDED_SVX_POLYSC3D_HXX
+#define INCLUDED_SVX_POLYSC3D_HXX
 
 #include <svx/svdpage.hxx>
 #include <svx/scene3d.hxx>
@@ -40,6 +40,6 @@ public:
     virtual E3dPolyScene* Clone() const;
 };
 
-#endif          // _E3D_POLYSC3D_HXX
+#endif // INCLUDED_SVX_POLYSC3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/postattr.hxx b/include/svx/postattr.hxx
index de11b545d505..de81ced18d0d 100644
--- a/include/svx/postattr.hxx
+++ b/include/svx/postattr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_POSTATTR_HXX
-#define _SVX_POSTATTR_HXX
+#ifndef INCLUDED_SVX_POSTATTR_HXX
+#define INCLUDED_SVX_POSTATTR_HXX
 
 #include <svl/stritem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/prtqry.hxx b/include/svx/prtqry.hxx
index 558301a3c978..a41886a80c9d 100644
--- a/include/svx/prtqry.hxx
+++ b/include/svx/prtqry.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_PRTQRY_HXX
-#define _SVX_PRTQRY_HXX
+#ifndef INCLUDED_SVX_PRTQRY_HXX
+#define INCLUDED_SVX_PRTQRY_HXX
 
 #include <vcl/msgbox.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx
index 4c0fa328ee5a..2238c0c983f8 100644
--- a/include/svx/pszctrl.hxx
+++ b/include/svx/pszctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_PSZCTRL_HXX
-#define _SVX_PSZCTRL_HXX
+#ifndef INCLUDED_SVX_PSZCTRL_HXX
+#define INCLUDED_SVX_PSZCTRL_HXX
 
 #include <sfx2/stbitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/rectenum.hxx b/include/svx/rectenum.hxx
index 4e6c5486f2b6..e3413f176061 100644
--- a/include/svx/rectenum.hxx
+++ b/include/svx/rectenum.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_RECTENUM_HXX
-#define _SVX_RECTENUM_HXX
+#ifndef INCLUDED_SVX_RECTENUM_HXX
+#define INCLUDED_SVX_RECTENUM_HXX
 
 // enum ------------------------------------------------------------------
 
diff --git a/include/svx/relfld.hxx b/include/svx/relfld.hxx
index c7765163d123..0346c22368f3 100644
--- a/include/svx/relfld.hxx
+++ b/include/svx/relfld.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_RELFLD_HXX
-#define _SVX_RELFLD_HXX
+#ifndef INCLUDED_SVX_RELFLD_HXX
+#define INCLUDED_SVX_RELFLD_HXX
 
 #include <vcl/field.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx
index 38e6e62a7a45..3913966c576e 100644
--- a/include/svx/rotmodit.hxx
+++ b/include/svx/rotmodit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ROTMODIT_HXX
-#define _SVX_ROTMODIT_HXX
+#ifndef INCLUDED_SVX_ROTMODIT_HXX
+#define INCLUDED_SVX_ROTMODIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index afd1127994c0..fd62e27e9caf 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SVX_RUBYDLG_HXX_
-#define _SVX_RUBYDLG_HXX_
+#ifndef INCLUDED_SVX_RUBYDIALOG_HXX
+#define INCLUDED_SVX_RUBYDIALOG_HXX
 
 #include <sfx2/childwin.hxx>
 #include <sfx2/basedlgs.hxx>
@@ -171,7 +171,7 @@ public:
     virtual void        Deactivate();
 };
 
-#endif // _SVX_RUBYDLG_HXX_
+#endif // INCLUDED_SVX_RUBYDIALOG_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 09d59f085434..e12cf2a4aa7a 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_RULER_HXX
-#define _SVX_RULER_HXX
+#ifndef INCLUDED_SVX_RULER_HXX
+#define INCLUDED_SVX_RULER_HXX
 
 #include <vcl/menu.hxx>
 #include <svtools/ruler.hxx>
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index 1120b09dabdf..91785c9b891d 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_RULRITEM_HXX
-#define _SVX_RULRITEM_HXX
+#ifndef INCLUDED_SVX_RULRITEM_HXX
+#define INCLUDED_SVX_RULRITEM_HXX
 
 #include <tools/gen.hxx>
 #include <svl/poolitem.hxx>
diff --git a/include/svx/scene3d.hxx b/include/svx/scene3d.hxx
index 2dd0faaffee6..1a2356241aa4 100644
--- a/include/svx/scene3d.hxx
+++ b/include/svx/scene3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_SCENE3D_HXX
-#define _E3D_SCENE3D_HXX
+#ifndef INCLUDED_SVX_SCENE3D_HXX
+#define INCLUDED_SVX_SCENE3D_HXX
 
 #include <svx/camera3d.hxx>
 #include <tools/b3dtrans.hxx>
@@ -234,6 +234,6 @@ public:
     virtual void BrkCreate(SdrDragStat& rStat);
 };
 
-#endif          // _E3D_SCENE3D_HXX
+#endif // INCLUDED_SVX_SCENE3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdangitm.hxx b/include/svx/sdangitm.hxx
index 1b5435067332..2d4cf6730fec 100644
--- a/include/svx/sdangitm.hxx
+++ b/include/svx/sdangitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDANGITM_HXX
-#define _SDANGITM_HXX
+#ifndef INCLUDED_SVX_SDANGITM_HXX
+#define INCLUDED_SVX_SDANGITM_HXX
 
 #include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx
index 67e97fb0c454..eb9413cff4be 100644
--- a/include/svx/sdasaitm.hxx
+++ b/include/svx/sdasaitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDASAITM_HXX
-#define _SDASAITM_HXX
+#ifndef INCLUDED_SVX_SDASAITM_HXX
+#define INCLUDED_SVX_SDASAITM_HXX
 
 #include <vector>
 
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 0f7164e80589..5ca6cc8e73d8 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDASITM_HXX
-#define _SDASITM_HXX
+#ifndef INCLUDED_SVX_SDASITM_HXX
+#define INCLUDED_SVX_SDASITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdooitm.hxx>
diff --git a/include/svx/sderitm.hxx b/include/svx/sderitm.hxx
index 20657ad5ee3f..a6a22ec90de4 100644
--- a/include/svx/sderitm.hxx
+++ b/include/svx/sderitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDERITM_HXX
-#define _SDERITM_HXX
+#ifndef INCLUDED_SVX_SDERITM_HXX
+#define INCLUDED_SVX_SDERITM_HXX
 
 #include <svx/sdmetitm.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdgcoitm.hxx b/include/svx/sdgcoitm.hxx
index 186c764d3d1b..4c239722b4b1 100644
--- a/include/svx/sdgcoitm.hxx
+++ b/include/svx/sdgcoitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDGCOITM_HXX
-#define _SDGCOITM_HXX
+#ifndef INCLUDED_SVX_SDGCOITM_HXX
+#define INCLUDED_SVX_SDGCOITM_HXX
 
 #include <svx/sdprcitm.hxx>
 #include <svx/svddef.hxx>
@@ -75,6 +75,6 @@ public:
     virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
-#endif // _SDGCOITM_HXX
+#endif // INCLUDED_SVX_SDGCOITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdgcpitm.hxx b/include/svx/sdgcpitm.hxx
index 48eea4733624..c995dc1d49be 100644
--- a/include/svx/sdgcpitm.hxx
+++ b/include/svx/sdgcpitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDGCPITM_HXX
-#define _SDGCPITM_HXX
+#ifndef INCLUDED_SVX_SDGCPITM_HXX
+#define INCLUDED_SVX_SDGCPITM_HXX
 
 #include <svx/grfcrop.hxx>
 #include <svx/svddef.hxx>
@@ -43,6 +43,6 @@ public:
     virtual sal_uInt16          GetVersion( sal_uInt16 nFileVersion ) const;
 };
 
-#endif // _SDGCPITM_HXX
+#endif // INCLUDED_SVX_SDGCPITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdggaitm.hxx b/include/svx/sdggaitm.hxx
index d7c44fe0918e..e0eda71592d8 100644
--- a/include/svx/sdggaitm.hxx
+++ b/include/svx/sdggaitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDGGAITM_HXX
-#define _SDGGAITM_HXX
+#ifndef INCLUDED_SVX_SDGGAITM_HXX
+#define INCLUDED_SVX_SDGGAITM_HXX
 
 #include <svl/intitem.hxx>
 #include <svx/svddef.hxx>
@@ -44,6 +44,6 @@ public:
     virtual bool            PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
 };
 
-#endif // _SDGGAITM_HXX
+#endif // INCLUDED_SVX_SDGGAITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdginitm.hxx b/include/svx/sdginitm.hxx
index 5b17ddef807d..719815ef6a41 100644
--- a/include/svx/sdginitm.hxx
+++ b/include/svx/sdginitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDGINITM_HXX
-#define _SDGINITM_HXX
+#ifndef INCLUDED_SVX_SDGINITM_HXX
+#define INCLUDED_SVX_SDGINITM_HXX
 
 #include <svx/sdooitm.hxx>
 #include <svx/svddef.hxx>
@@ -41,6 +41,6 @@ public:
     virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
-#endif // _SDGINITM_HXX
+#endif // INCLUDED_SVX_SDGINITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdgluitm.hxx b/include/svx/sdgluitm.hxx
index 2f2b21a83842..cb18609c016a 100644
--- a/include/svx/sdgluitm.hxx
+++ b/include/svx/sdgluitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDGLUITM_HXX
-#define _SDGLUITM_HXX
+#ifndef INCLUDED_SVX_SDGLUITM_HXX
+#define INCLUDED_SVX_SDGLUITM_HXX
 
 #include <svx/sdprcitm.hxx>
 #include <svx/svddef.hxx>
@@ -58,6 +58,6 @@ public:
     virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
-#endif // _SDGLUITM_HXX
+#endif // INCLUDED_SVX_SDGLUITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index b97178357244..5fe53cba62a7 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDGMOITM_HXX
-#define _SDGMOITM_HXX
+#ifndef INCLUDED_SVX_SDGMOITM_HXX
+#define INCLUDED_SVX_SDGMOITM_HXX
 
 #include <svtools/grfmgr.hxx>
 #include <svl/eitem.hxx>
@@ -51,6 +51,6 @@ public:
 
 };
 
-#endif // _SDGMOITM_HXX
+#endif // INCLUDED_SVX_SDGMOITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdgtritm.hxx b/include/svx/sdgtritm.hxx
index f09d5abbcba0..3ee5bd81035d 100644
--- a/include/svx/sdgtritm.hxx
+++ b/include/svx/sdgtritm.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDGTRITM_HXX
-#define _SDGTRITM_HXX
+#ifndef INCLUDED_SVX_SDGTRITM_HXX
+#define INCLUDED_SVX_SDGTRITM_HXX
 
 #include <svx/sdprcitm.hxx>
 #include <svx/svddef.hxx>
@@ -40,6 +40,6 @@ public:
     virtual SfxPoolItem*    Create( SvStream& rIn, sal_uInt16 nVer ) const;
 };
 
-#endif // _SDGTRITM_HXX
+#endif // INCLUDED_SVX_SDGTRITM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdmetitm.hxx b/include/svx/sdmetitm.hxx
index 9045dc91916d..93a046e58d7a 100644
--- a/include/svx/sdmetitm.hxx
+++ b/include/svx/sdmetitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDMETITM_HXX
-#define _SDMETITM_HXX
+#ifndef INCLUDED_SVX_SDMETITM_HXX
+#define INCLUDED_SVX_SDMETITM_HXX
 
 #include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/sdooitm.hxx b/include/svx/sdooitm.hxx
index ff6a1f9b0bfa..e093c944d4c4 100644
--- a/include/svx/sdooitm.hxx
+++ b/include/svx/sdooitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDOOITM_HXX
-#define _SDOOITM_HXX
+#ifndef INCLUDED_SVX_SDOOITM_HXX
+#define INCLUDED_SVX_SDOOITM_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/sdprcitm.hxx b/include/svx/sdprcitm.hxx
index 7e01de417185..b485afa024f7 100644
--- a/include/svx/sdprcitm.hxx
+++ b/include/svx/sdprcitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDPRCITM_HXX
-#define _SDPRCITM_HXX
+#ifndef INCLUDED_SVX_SDPRCITM_HXX
+#define INCLUDED_SVX_SDPRCITM_HXX
 
 #include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx
index 39fcf8ae04f1..971829978201 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ANIMATION_ANIMATIONSTATE_HXX
-#define _SDR_ANIMATION_ANIMATIONSTATE_HXX
+#ifndef INCLUDED_SVX_SDR_ANIMATION_ANIMATIONSTATE_HXX
+#define INCLUDED_SVX_SDR_ANIMATION_ANIMATIONSTATE_HXX
 
 #include <sal/types.h>
 #include <vector>
@@ -70,6 +70,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_ANIMATION_ANIMATIONSTATE_HXX
+#endif // INCLUDED_SVX_SDR_ANIMATION_ANIMATIONSTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/animation/objectanimator.hxx b/include/svx/sdr/animation/objectanimator.hxx
index 0c59afee92f5..c5d463763faf 100644
--- a/include/svx/sdr/animation/objectanimator.hxx
+++ b/include/svx/sdr/animation/objectanimator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ANIMATION_OBJECTANIMATOR_HXX
-#define _SDR_ANIMATION_OBJECTANIMATOR_HXX
+#ifndef INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX
+#define INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX
 
 #include <sal/types.h>
 #include <vector>
@@ -44,6 +44,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_ANIMATION_OBJECTANIMATOR_HXX
+#endif // INCLUDED_SVX_SDR_ANIMATION_OBJECTANIMATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx
index a2681b740eb1..d26ad67b4b90 100644
--- a/include/svx/sdr/animation/scheduler.hxx
+++ b/include/svx/sdr/animation/scheduler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ANIMATION_SCHEDULER_HXX
-#define _SDR_ANIMATION_SCHEDULER_HXX
+#ifndef INCLUDED_SVX_SDR_ANIMATION_SCHEDULER_HXX
+#define INCLUDED_SVX_SDR_ANIMATION_SCHEDULER_HXX
 
 #include <sal/types.h>
 #include <vcl/timer.hxx>
@@ -143,6 +143,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_ANIMATION_SCHEDULER_HXX
+#endif // INCLUDED_SVX_SDR_ANIMATION_SCHEDULER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrfilltextattribute.hxx b/include/svx/sdr/attribute/sdrfilltextattribute.hxx
index f64bac542a76..1125c8e236a0 100644
--- a/include/svx/sdr/attribute/sdrfilltextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrfilltextattribute.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
-#define _SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
+#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
+#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
 
 #include <sal/types.h>
 #include <drawinglayer/attribute/sdrfillattribute.hxx>
@@ -60,6 +60,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
+#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFILLTEXTATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrformtextattribute.hxx b/include/svx/sdr/attribute/sdrformtextattribute.hxx
index 5a406376dccd..025fba473334 100644
--- a/include/svx/sdr/attribute/sdrformtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrformtextattribute.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX
-#define _SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX
+#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX
+#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX
 
 #include <sal/types.h>
 #include <svx/xenum.hxx>
@@ -78,6 +78,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX
+#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
index 139fb0fd045e..d610ab41bb1a 100644
--- a/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
+++ b/include/svx/sdr/attribute/sdrformtextoutlineattribute.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
-#define _SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
+#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
+#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
 
 #include <sal/types.h>
 
@@ -69,6 +69,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
+#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRFORMTEXTOUTLINEATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
index 20c853915737..d7be38c7b279 100644
--- a/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrlinefillshadowtextattribute.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
-#define _SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
+#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
+#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
 
 #include <sal/types.h>
 #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx>
@@ -64,6 +64,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
+#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINEFILLSHADOWTEXTATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
index 4a82d683ec26..fae7b5203c98 100644
--- a/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrlineshadowtextattribute.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
-#define _SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
+#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
+#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
 
 #include <sal/types.h>
 #include <svx/sdr/attribute/sdrshadowtextattribute.hxx>
@@ -62,6 +62,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
+#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRLINESHADOWTEXTATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
index 0b82edc12241..81903b6c47b4 100644
--- a/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrshadowtextattribute.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
-#define _SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
+#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
+#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
 
 #include <sal/types.h>
 #include <drawinglayer/attribute/sdrshadowattribute.hxx>
@@ -59,6 +59,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
+#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRSHADOWTEXTATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/attribute/sdrtextattribute.hxx b/include/svx/sdr/attribute/sdrtextattribute.hxx
index ac85aebc8d46..2fd04ac5c264 100644
--- a/include/svx/sdr/attribute/sdrtextattribute.hxx
+++ b/include/svx/sdr/attribute/sdrtextattribute.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX
-#define _SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX
+#ifndef INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX
+#define INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX
 
 #include <sal/types.h>
 #include <svx/xenum.hxx>
@@ -117,6 +117,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX
+#endif // INCLUDED_SVX_SDR_ATTRIBUTE_SDRTEXTATTRIBUTE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/displayinfo.hxx b/include/svx/sdr/contact/displayinfo.hxx
index 6c4b85e6f989..e8ee93cb3246 100644
--- a/include/svx/sdr/contact/displayinfo.hxx
+++ b/include/svx/sdr/contact/displayinfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_DISPLAYINFO_HXX
-#define _SDR_CONTACT_DISPLAYINFO_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_DISPLAYINFO_HXX
+#define INCLUDED_SVX_SDR_CONTACT_DISPLAYINFO_HXX
 
 #include <svx/svdsob.hxx>
 #include <vcl/region.hxx>
@@ -102,6 +102,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_DISPLAYINFO_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_DISPLAYINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index 7188c89b39bd..650bc0c2756a 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_OBJECTCONTACT_HXX
-#define _SDR_CONTACT_OBJECTCONTACT_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX
+#define INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX
 
 #include <svx/sdr/animation/objectanimator.hxx>
 #include "svx/svxdllapi.h"
@@ -216,6 +216,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_OBJECTCONTACT_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
index 9c4a0bff1763..5971c940a79e 100644
--- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
+++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX
-#define _SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX
+#define INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX
 
 #include <svx/sdr/contact/objectcontact.hxx>
 #include "svx/svxdllapi.h"
@@ -140,6 +140,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFOBJLISTPAINTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/objectcontactofpageview.hxx b/include/svx/sdr/contact/objectcontactofpageview.hxx
index 8062da45de91..be94ea5eb678 100644
--- a/include/svx/sdr/contact/objectcontactofpageview.hxx
+++ b/include/svx/sdr/contact/objectcontactofpageview.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
-#define _SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
+#define INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
 
 #include <svx/sdr/contact/objectcontact.hxx>
 
@@ -139,6 +139,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_OBJECTCONTACTOFPAGEVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index 8e136e03afba..903d515ecfc8 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACT_HXX
-#define _SDR_CONTACT_VIEWCONTACT_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX
 
 #include <sal/types.h>
 #include "svx/svxdllapi.h"
@@ -163,6 +163,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACT_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3d.hxx b/include/svx/sdr/contact/viewcontactofe3d.hxx
index 02bdb36e53c0..cd09684932d1 100644
--- a/include/svx/sdr/contact/viewcontactofe3d.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3D_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFE3D_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include <drawinglayer/primitive3d/baseprimitive3d.hxx>
@@ -104,6 +104,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFE3D_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dcube.hxx b/include/svx/sdr/contact/viewcontactofe3dcube.hxx
index 8207fa558db0..3f46438b65e0 100644
--- a/include/svx/sdr/contact/viewcontactofe3dcube.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dcube.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
 
@@ -56,6 +56,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DCUBE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx
index 53d6b17913d2..c6fb95a3ee01 100644
--- a/include/svx/sdr/contact/viewcontactofe3dextrude.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dextrude.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
 
@@ -56,6 +56,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DEXTRUDE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx
index ad57b5588195..ec57695301d0 100644
--- a/include/svx/sdr/contact/viewcontactofe3dlathe.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dlathe.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
 
@@ -56,6 +56,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DLATHE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx
index 295d1c308697..40b3a8be8f22 100644
--- a/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dpolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
 
@@ -56,6 +56,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dscene.hxx b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
index bd5879fc0b9d..9fa4393abb62 100644
--- a/include/svx/sdr/contact/viewcontactofe3dscene.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dscene.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include <drawinglayer/primitive3d/baseprimitive3d.hxx>
@@ -109,6 +109,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSCENE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx
index dd245d7efa06..feb2b5e81b0f 100644
--- a/include/svx/sdr/contact/viewcontactofe3dsphere.hxx
+++ b/include/svx/sdr/contact/viewcontactofe3dsphere.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
 
 #include <svx/sdr/contact/viewcontactofe3d.hxx>
 
@@ -56,6 +56,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFE3DSPHERE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofgraphic.hxx b/include/svx/sdr/contact/viewcontactofgraphic.hxx
index 303ff79bd180..13fd07b274e8 100644
--- a/include/svx/sdr/contact/viewcontactofgraphic.hxx
+++ b/include/svx/sdr/contact/viewcontactofgraphic.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
 
 #include <sal/types.h>
 #include <svx/sdr/contact/viewcontactoftextobj.hxx>
@@ -81,6 +81,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGRAPHIC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofgroup.hxx b/include/svx/sdr/contact/viewcontactofgroup.hxx
index eb1c4a2517ce..47749d06de13 100644
--- a/include/svx/sdr/contact/viewcontactofgroup.hxx
+++ b/include/svx/sdr/contact/viewcontactofgroup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 
@@ -62,6 +62,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFGROUP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
index fc2df17d9e0a..ece81f73a8e4 100644
--- a/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
+++ b/include/svx/sdr/contact/viewcontactofmasterpagedescriptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
 
 #include <sal/types.h>
 #include <svx/sdr/contact/viewcontact.hxx>
@@ -72,6 +72,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFMASTERPAGEDESCRIPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofpageobj.hxx b/include/svx/sdr/contact/viewcontactofpageobj.hxx
index 30a53e5eb9ac..5169ba67f398 100644
--- a/include/svx/sdr/contact/viewcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofpageobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include "svx/svxdllapi.h"
@@ -63,6 +63,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFPAGEOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
index 19cc9976dbdf..967dabc76a1e 100644
--- a/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrcaptionobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCAPTIONOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx
index 27059b275437..6bf6f91bcea1 100644
--- a/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrcircobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRCIRCOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx
index 0ca7d4101b7b..a31a8b30ae98 100644
--- a/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdredgeobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactoftextobj.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDREDGEOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
index 83a32a17a9ec..fe37170178d8 100644
--- a/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrmeasureobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactoftextobj.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEASUREOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
index 3ad8580cf12e..f45858957d74 100644
--- a/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrmediaobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 #include "svx/svxdllapi.h"
@@ -78,6 +78,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRMEDIAOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrobj.hxx b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
index b628637cb707..ec1c399aac31 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX
 
 #include <sal/types.h>
 #include <svx/sdr/contact/viewcontact.hxx>
@@ -91,6 +91,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
index 8b4e06100a0c..0d5c79be4a60 100644
--- a/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrobjcustomshape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
 
 #include <svx/sdr/contact/viewcontactoftextobj.hxx>
 
@@ -60,6 +60,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROBJCUSTOMSHAPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
index fb97f3e49884..87e37d02659f 100644
--- a/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrole2obj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrrectobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -72,6 +72,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDROLE2OBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrpage.hxx b/include/svx/sdr/contact/viewcontactofsdrpage.hxx
index b194108541ac..b819aa80c9c6 100644
--- a/include/svx/sdr/contact/viewcontactofsdrpage.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
 
 #include <sal/types.h>
 #include <svx/sdr/contact/viewcontact.hxx>
@@ -298,6 +298,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx
index 19ef798b8aaf..0318cb240666 100644
--- a/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrpathobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactoftextobj.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRPATHOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
index 7d78befffe0e..d5d64cfbce99 100644
--- a/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofsdrrectobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactoftextobj.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFSDRRECTOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactoftextobj.hxx b/include/svx/sdr/contact/viewcontactoftextobj.hxx
index bb302ad8f9c0..8ec1dc44667f 100644
--- a/include/svx/sdr/contact/viewcontactoftextobj.hxx
+++ b/include/svx/sdr/contact/viewcontactoftextobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 
@@ -52,6 +52,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFTEXTOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofunocontrol.hxx b/include/svx/sdr/contact/viewcontactofunocontrol.hxx
index aeeb2d6183c0..0dab8315923f 100644
--- a/include/svx/sdr/contact/viewcontactofunocontrol.hxx
+++ b/include/svx/sdr/contact/viewcontactofunocontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
-#define SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
@@ -87,6 +87,6 @@ namespace sdr { namespace contact {
 } } // namespace sdr::contact
 //........................................................................
 
-#endif // SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFUNOCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewcontactofvirtobj.hxx b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
index 8e3719eae357..168bd0b32964 100644
--- a/include/svx/sdr/contact/viewcontactofvirtobj.hxx
+++ b/include/svx/sdr/contact/viewcontactofvirtobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWCONTACTOFVIRTOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 96c3918a4c42..6d67cd282163 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACT_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACT_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX
 
 #include <sal/types.h>
 
@@ -142,6 +142,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACT_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx
index f0fa2758b7f3..1165b93f8e69 100644
--- a/include/svx/sdr/contact/viewobjectcontactofe3d.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofe3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 #include <drawinglayer/primitive3d/baseprimitive3d.hxx>
@@ -69,6 +69,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
index d6d405f5ef95..8fd5c2e74d05 100644
--- a/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofe3dscene.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -49,6 +49,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFE3DSCENE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx
index e8200d6a429a..cb34c65045aa 100644
--- a/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofgraphic.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 
@@ -68,6 +68,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGRAPHIC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx
index fda5610e0568..ed68a5bfa616 100644
--- a/include/svx/sdr/contact/viewobjectcontactofgroup.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofgroup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 
@@ -49,6 +49,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFGROUP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
index f09bd03d86a9..62e2fe766f0b 100644
--- a/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofmasterpagedescriptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
 
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 
@@ -52,6 +52,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFMASTERPAGEDESCRIPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
index 420a464319d5..39f3a0047127 100644
--- a/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofpageobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 
@@ -58,6 +58,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFPAGEOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
index e1e24dab8442..1386d5b77727 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrmediaobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 #include <svx/sdr/contact/viewobjectcontact.hxx>
@@ -61,6 +61,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRMEDIAOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
index e0384426add3..3c995dfba3c9 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
 
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
index 6fe19c742481..7ca2d079704c 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrole2obj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 
@@ -49,6 +49,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDROLE2OBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
index 588554b7dd92..f2bddb9bbe39 100644
--- a/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofsdrpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
 
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 
@@ -233,6 +233,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFSDRPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
index a0077a3aa65e..dc99d95a6f3e 100644
--- a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
-#define SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
 
 #include <svx/sdr/contact/viewobjectcontactofsdrobj.hxx>
 
@@ -126,6 +126,6 @@ namespace sdr { namespace contact {
 } } // namespace sdr::contact
 //........................................................................
 
-#endif // SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTOFUNOCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index d7f16e1b60bd..5d7eebd1174e 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
-#define _SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
+#ifndef INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
+#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
 
 #include "svx/svxdllapi.h"
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
@@ -61,6 +61,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
+#endif // INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/event/eventhandler.hxx b/include/svx/sdr/event/eventhandler.hxx
index 91ac5491e5c6..66d8f7a07e71 100644
--- a/include/svx/sdr/event/eventhandler.hxx
+++ b/include/svx/sdr/event/eventhandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_EVENT_EVENTHANDLER_HXX
-#define _SDR_EVENT_EVENTHANDLER_HXX
+#ifndef INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX
+#define INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX
 
 #include <sal/types.h>
 
@@ -127,6 +127,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_EVENT_EVENTHANDLER_HXX
+#endif // INCLUDED_SVX_SDR_EVENT_EVENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
index ee9a4a66017c..e895bfb71c15 100644
--- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
+++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX
-#define _SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <vcl/bitmapex.hxx>
@@ -84,6 +84,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYANIMATEDBITMAPEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaybitmapex.hxx b/include/svx/sdr/overlay/overlaybitmapex.hxx
index bd841c6b4255..045c9645f8a0 100644
--- a/include/svx/sdr/overlay/overlaybitmapex.hxx
+++ b/include/svx/sdr/overlay/overlaybitmapex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYBITMAPEX_HXX
-#define _SDR_OVERLAY_OVERLAYBITMAPEX_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYBITMAPEX_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYBITMAPEX_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <vcl/bitmapex.hxx>
@@ -61,6 +61,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYBITMAPEX_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYBITMAPEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaycrosshair.hxx b/include/svx/sdr/overlay/overlaycrosshair.hxx
index 436705536819..b56fe2e9ded1 100644
--- a/include/svx/sdr/overlay/overlaycrosshair.hxx
+++ b/include/svx/sdr/overlay/overlaycrosshair.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
-#define _SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 
@@ -46,6 +46,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYCROSSHAIR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayhatchrect.hxx b/include/svx/sdr/overlay/overlayhatchrect.hxx
index 7f01c3537e42..e5395533ef57 100644
--- a/include/svx/sdr/overlay/overlayhatchrect.hxx
+++ b/include/svx/sdr/overlay/overlayhatchrect.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYHATCHRECT_HXX
-#define _SDR_OVERLAY_OVERLAYHATCHRECT_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <vcl/hatch.hxx>
@@ -66,6 +66,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHATCHRECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayhelpline.hxx b/include/svx/sdr/overlay/overlayhelpline.hxx
index 3ab10df10626..3b9e91587357 100644
--- a/include/svx/sdr/overlay/overlayhelpline.hxx
+++ b/include/svx/sdr/overlay/overlayhelpline.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYHELPLINE_HXX
-#define _SDR_OVERLAY_OVERLAYHELPLINE_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <svx/svdhlpln.hxx>
@@ -55,6 +55,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYHELPLINE_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYHELPLINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayline.hxx b/include/svx/sdr/overlay/overlayline.hxx
index 8b093fecbfb4..4794cf9d598a 100644
--- a/include/svx/sdr/overlay/overlayline.hxx
+++ b/include/svx/sdr/overlay/overlayline.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYLINE_HXX
-#define _SDR_OVERLAY_OVERLAYLINE_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 
@@ -54,6 +54,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYLINE_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYLINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaymanager.hxx b/include/svx/sdr/overlay/overlaymanager.hxx
index e2c23b5dc6df..324f92d31fdf 100644
--- a/include/svx/sdr/overlay/overlaymanager.hxx
+++ b/include/svx/sdr/overlay/overlaymanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYMANAGER_HXX
-#define _SDR_OVERLAY_OVERLAYMANAGER_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGER_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGER_HXX
 
 #include <boost/utility.hpp>
 #include <rtl/ref.hxx>
@@ -146,6 +146,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYMANAGER_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
index 7f6dbe05d9e6..d631a5915e37 100644
--- a/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
+++ b/include/svx/sdr/overlay/overlaymanagerbuffered.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
-#define _SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
 
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <basegfx/range/b2irange.hxx>
@@ -93,6 +93,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYMANAGERBUFFERED_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index 3b56c97556ed..59abd4036b35 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYOBJECT_HXX
-#define _SDR_OVERLAY_OVERLAYOBJECT_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECT_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECT_HXX
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/range/b2drange.hxx>
@@ -194,6 +194,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYOBJECT_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayobjectcell.hxx b/include/svx/sdr/overlay/overlayobjectcell.hxx
index 6707c0fc61eb..3ef85ddf05db 100644
--- a/include/svx/sdr/overlay/overlayobjectcell.hxx
+++ b/include/svx/sdr/overlay/overlayobjectcell.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYOBJECTCELL_HXX
-#define _SDR_OVERLAY_OVERLAYOBJECTCELL_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYLINE_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTCELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayobjectlist.hxx b/include/svx/sdr/overlay/overlayobjectlist.hxx
index ea75ace1e94a..8fb7239d9dd9 100644
--- a/include/svx/sdr/overlay/overlayobjectlist.hxx
+++ b/include/svx/sdr/overlay/overlayobjectlist.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYOBJECTLIST_HXX
-#define _SDR_OVERLAY_OVERLAYOBJECTLIST_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <sal/types.h>
@@ -73,6 +73,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYOBJECTLIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaypolypolygon.hxx b/include/svx/sdr/overlay/overlaypolypolygon.hxx
index a716aac43069..026a9608187f 100644
--- a/include/svx/sdr/overlay/overlaypolypolygon.hxx
+++ b/include/svx/sdr/overlay/overlaypolypolygon.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX
-#define _SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -56,6 +56,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPOLYPOLYGON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index a2e981c2c1a8..78cf4d97dcb2 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
-#define _SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayrectangle.hxx b/include/svx/sdr/overlay/overlayrectangle.hxx
index f5dc9d969e4d..efbe34441537 100644
--- a/include/svx/sdr/overlay/overlayrectangle.hxx
+++ b/include/svx/sdr/overlay/overlayrectangle.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDR_OVERLAY_OVERLAYRECTANGLE_HXX
-#define _SDR_OVERLAY_OVERLAYRECTANGLE_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <tools/gen.hxx>
@@ -82,7 +82,7 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYRECTANGLE_HXX
 
 // eof
 
diff --git a/include/svx/sdr/overlay/overlayrollingrectangle.hxx b/include/svx/sdr/overlay/overlayrollingrectangle.hxx
index 3a896aa3cdd8..8cedaf6c3565 100644
--- a/include/svx/sdr/overlay/overlayrollingrectangle.hxx
+++ b/include/svx/sdr/overlay/overlayrollingrectangle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYROOLINGRECTANGLE_HXX
-#define _SDR_OVERLAY_OVERLAYROOLINGRECTANGLE_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 
@@ -70,6 +70,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYROOLINGRECTANGLE_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYROLLINGRECTANGLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx
index e96b8fa3281d..34fe6b198692 100644
--- a/include/svx/sdr/overlay/overlayselection.hxx
+++ b/include/svx/sdr/overlay/overlayselection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYSELECTION_HXX
-#define _SDR_OVERLAY_OVERLAYSELECTION_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYSELECTION_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYSELECTION_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 #include <vcl/region.hxx>
@@ -82,6 +82,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYSELECTION_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYSELECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaytools.hxx b/include/svx/sdr/overlay/overlaytools.hxx
index 57bbcf72ebdb..f57d6a8a52bf 100644
--- a/include/svx/sdr/overlay/overlaytools.hxx
+++ b/include/svx/sdr/overlay/overlaytools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYTOOLS_HXX
-#define _SDR_OVERLAY_OVERLAYTOOLS_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_HXX
 
 #include <drawinglayer/primitive2d/primitivetools2d.hxx>
 #include <vcl/bitmapex.hxx>
@@ -262,6 +262,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYTOOLS_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/overlay/overlaytriangle.hxx b/include/svx/sdr/overlay/overlaytriangle.hxx
index b17e6be8a8c6..b463a27beb17 100644
--- a/include/svx/sdr/overlay/overlaytriangle.hxx
+++ b/include/svx/sdr/overlay/overlaytriangle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OVERLAY_OVERLAYTRIANGLE_HXX
-#define _SDR_OVERLAY_OVERLAYTRIANGLE_HXX
+#ifndef INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
+#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 
@@ -57,6 +57,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
+#endif // INCLUDED_SVX_SDR_OVERLAY_OVERLAYTRIANGLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/primitiveFactory2d.hxx b/include/svx/sdr/primitive2d/primitiveFactory2d.hxx
index d602d28d4f5c..dcbdc6b79589 100644
--- a/include/svx/sdr/primitive2d/primitiveFactory2d.hxx
+++ b/include/svx/sdr/primitive2d/primitiveFactory2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX
 
 #include <com/sun/star/graphic/XPrimitiveFactory2D.hpp>
 #include <cppuhelper/compbase1.hxx>
@@ -71,6 +71,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_PRIMITIVEFACTORY2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrattributecreator.hxx b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
index ae80a3aca8cb..498aee924579 100644
--- a/include/svx/sdr/primitive2d/sdrattributecreator.hxx
+++ b/include/svx/sdr/primitive2d/sdrattributecreator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX
 
 #include <sal/types.h>
 #include <svx/svxdllapi.h>
@@ -129,6 +129,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRATTRIBUTECREATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
index be8f010b00ba..de6d3b8b2de9 100644
--- a/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrcaptionprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -74,6 +74,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCAPTIONPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
index 3fa1c8e94204..2191aaf5ab4a 100644
--- a/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrconnectorprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx>
@@ -63,6 +63,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCONNECTORPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index b70b8e7057a9..2aa60d1a67b7 100644
--- a/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDCUSTOMSHAPEPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDCUSTOMSHAPEPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -84,6 +84,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDCUSTOMSHAPEPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRCUSTOMSHAPEPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
index cac426980dee..61ded2f6676a 100644
--- a/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
+++ b/include/svx/sdr/primitive2d/sdrdecompositiontools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 
@@ -75,6 +75,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRDECOMPOSITIONTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
index 8eaac61d5440..9b0850440415 100644
--- a/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrellipseprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -107,6 +107,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRELLIPSEPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
index 720048f5b63f..2eb0f53909d1 100644
--- a/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrgrafprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -71,6 +71,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRGRAFPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
index a8812caaa84d..1b06c42f8114 100644
--- a/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrmeasureprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <svx/sdr/attribute/sdrlineshadowtextattribute.hxx>
@@ -120,6 +120,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRMEASUREPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx
index 1df7187ac3b9..064614b4826f 100644
--- a/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrole2primitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -65,6 +65,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLE2PRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
index 29afa518d1d9..f760396bd862 100644
--- a/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrolecontentprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -75,6 +75,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDROLECONTENTPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
index 97b5f3733f7e..20b5fe9d1bc8 100644
--- a/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrpathprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -67,6 +67,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPATHPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx
index 885b9c945da5..f82c19df040d 100644
--- a/include/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/include/svx/sdr/primitive2d/sdrprimitivetools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_PRIMITIVETOOLS_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_PRIMITIVETOOLS_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
 
 #include <vcl/bitmapex.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
@@ -44,6 +44,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_PRIMITIVETOOLS_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRPRIMITIVETOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
index 9c747851a4b5..55590fa0b5ad 100644
--- a/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrrectangleprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -76,6 +76,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRRECTANGLEPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
index 95d51e710266..548e01de602e 100644
--- a/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
+++ b/include/svx/sdr/primitive2d/sdrtextprimitive2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
-#define INCLUDED_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -333,6 +333,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //INCLUDED_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SDRTEXTPRIMITIVE2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
index 42d5109d5c80..fee435c612fa 100644
--- a/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
+++ b/include/svx/sdr/primitive2d/svx_primitivetypes2d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_PRIMITIVE2D_PRIMITIVETYPES2D_HXX
-#define INCLUDED_SVX_PRIMITIVE2D_PRIMITIVETYPES2D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE2D_SVX_PRIMITIVETYPES2D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE2D_SVX_PRIMITIVETYPES2D_HXX
 
 #include <drawinglayer/primitive2d/drawinglayer_primitivetypes2d.hxx>
 
@@ -51,6 +51,6 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // INCLUDED_SVX_PRIMITIVE2D_PRIMITIVETYPES2D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE2D_SVX_PRIMITIVETYPES2D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx
index 1d730c054651..c41e6c35edaf 100644
--- a/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx
+++ b/include/svx/sdr/primitive3d/sdrattributecreator3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
-#define _SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
+#ifndef INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
+#define INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
 
 #include <sal/types.h>
 
@@ -50,6 +50,6 @@ namespace drawinglayer
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
+#endif // INCLUDED_SVX_SDR_PRIMITIVE3D_SDRATTRIBUTECREATOR3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/attributeproperties.hxx b/include/svx/sdr/properties/attributeproperties.hxx
index 9f3e4d9f9ad3..dbce394ebac3 100644
--- a/include/svx/sdr/properties/attributeproperties.hxx
+++ b/include/svx/sdr/properties/attributeproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
-#define _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
 
 #include <svl/lstner.hxx>
 #include <svl/stylesheetuser.hxx>
@@ -91,6 +91,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/captionproperties.hxx b/include/svx/sdr/properties/captionproperties.hxx
index 484d3139817c..764ad0e99038 100644
--- a/include/svx/sdr/properties/captionproperties.hxx
+++ b/include/svx/sdr/properties/captionproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
-#define _SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
 
 #include <svx/sdr/properties/rectangleproperties.hxx>
 
@@ -62,6 +62,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_CAPTIONPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/circleproperties.hxx b/include/svx/sdr/properties/circleproperties.hxx
index 3a5ddb910d42..c0304a9407b9 100644
--- a/include/svx/sdr/properties/circleproperties.hxx
+++ b/include/svx/sdr/properties/circleproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
-#define _SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
 
 #include <svx/sdr/properties/rectangleproperties.hxx>
 
@@ -62,6 +62,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_CIRCLEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/connectorproperties.hxx b/include/svx/sdr/properties/connectorproperties.hxx
index ae70c1d8b3d6..f05ef2846293 100644
--- a/include/svx/sdr/properties/connectorproperties.hxx
+++ b/include/svx/sdr/properties/connectorproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
-#define _SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
 
 #include <svx/sdr/properties/textproperties.hxx>
 
@@ -58,6 +58,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_CONNECTORPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/customshapeproperties.hxx b/include/svx/sdr/properties/customshapeproperties.hxx
index ae1e7a70451f..62a68bf2b6e8 100644
--- a/include/svx/sdr/properties/customshapeproperties.hxx
+++ b/include/svx/sdr/properties/customshapeproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
-#define _SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
 
 #include <svx/sdr/properties/textproperties.hxx>
 
@@ -81,6 +81,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_CUSTOMSHAPEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/defaultproperties.hxx b/include/svx/sdr/properties/defaultproperties.hxx
index 5b8b9f4f1c0e..297342587ca1 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_DEFAULTPROPERTIES_HXX
-#define _SDR_PROPERTIES_DEFAULTPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_DEFAULTPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_DEFAULTPROPERTIES_HXX
 
 #include <svx/sdr/properties/properties.hxx>
 #include "svx/svxdllapi.h"
@@ -99,6 +99,6 @@ namespace sdr
     } // end of namespace properties
 } // end of namespace sdr
 
-#endif //_SDR_PROPERTIES_DEFAULTPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_DEFAULTPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dcompoundproperties.hxx b/include/svx/sdr/properties/e3dcompoundproperties.hxx
index 9175042084aa..03389255bcad 100644
--- a/include/svx/sdr/properties/e3dcompoundproperties.hxx
+++ b/include/svx/sdr/properties/e3dcompoundproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX
-#define _SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX
 
 #include <svx/sdr/properties/e3dproperties.hxx>
 #include "svx/svxdllapi.h"
@@ -66,6 +66,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DCOMPOUNDPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dextrudeproperties.hxx b/include/svx/sdr/properties/e3dextrudeproperties.hxx
index ad7aa529a36c..4779af14c8be 100644
--- a/include/svx/sdr/properties/e3dextrudeproperties.hxx
+++ b/include/svx/sdr/properties/e3dextrudeproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
-#define _SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
 
 #include <svx/sdr/properties/e3dcompoundproperties.hxx>
 #include "svx/svxdllapi.h"
@@ -53,6 +53,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DEXTRUDEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dlatheproperties.hxx b/include/svx/sdr/properties/e3dlatheproperties.hxx
index 17855a6b0658..bdb3646f4c07 100644
--- a/include/svx/sdr/properties/e3dlatheproperties.hxx
+++ b/include/svx/sdr/properties/e3dlatheproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
-#define _SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
 
 #include <svx/sdr/properties/e3dcompoundproperties.hxx>
 #include "svx/svxdllapi.h"
@@ -53,6 +53,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DLATHEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dproperties.hxx b/include/svx/sdr/properties/e3dproperties.hxx
index 4bebaab05c2a..ed20ead0abe0 100644
--- a/include/svx/sdr/properties/e3dproperties.hxx
+++ b/include/svx/sdr/properties/e3dproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_E3DPROPERTIES_HXX
-#define _SDR_PROPERTIES_E3DPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_E3DPROPERTIES_HXX
 
 #include <svx/sdr/properties/attributeproperties.hxx>
 #include "svx/svxdllapi.h"
@@ -59,6 +59,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_PROPERTIES_E3DPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dsceneproperties.hxx b/include/svx/sdr/properties/e3dsceneproperties.hxx
index e52c483b14e6..437bdac87480 100644
--- a/include/svx/sdr/properties/e3dsceneproperties.hxx
+++ b/include/svx/sdr/properties/e3dsceneproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
-#define _SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
 
 #include <svx/sdr/properties/e3dproperties.hxx>
 
@@ -83,6 +83,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSCENEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/e3dsphereproperties.hxx b/include/svx/sdr/properties/e3dsphereproperties.hxx
index d99af2d38c85..058e9f6488f2 100644
--- a/include/svx/sdr/properties/e3dsphereproperties.hxx
+++ b/include/svx/sdr/properties/e3dsphereproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
-#define _SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
 
 #include <svx/sdr/properties/e3dcompoundproperties.hxx>
 
@@ -52,6 +52,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // _SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_E3DSPHEREPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/emptyproperties.hxx b/include/svx/sdr/properties/emptyproperties.hxx
index 102af739dcf6..1efdd400a078 100644
--- a/include/svx/sdr/properties/emptyproperties.hxx
+++ b/include/svx/sdr/properties/emptyproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_EMPTYPROPERTIES_HXX
-#define _SDR_PROPERTIES_EMPTYPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_EMPTYPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_EMPTYPROPERTIES_HXX
 
 #include <svx/sdr/properties/properties.hxx>
 #include "svx/svxdllapi.h"
@@ -91,6 +91,6 @@ namespace sdr
     } // end of namespace properties
 } // end of namespace sdr
 
-#endif //_SDR_PROPERTIES_EMPTYPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_EMPTYPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/graphicproperties.hxx b/include/svx/sdr/properties/graphicproperties.hxx
index e2a3562440af..36274a9c8980 100644
--- a/include/svx/sdr/properties/graphicproperties.hxx
+++ b/include/svx/sdr/properties/graphicproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
-#define _SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
 
 #include <svx/sdr/properties/rectangleproperties.hxx>
 
@@ -62,6 +62,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_GRAPHICPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/groupproperties.hxx b/include/svx/sdr/properties/groupproperties.hxx
index 3de8abf71ea2..31868f087b61 100644
--- a/include/svx/sdr/properties/groupproperties.hxx
+++ b/include/svx/sdr/properties/groupproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_GROUPPROPERTIES_HXX
-#define _SDR_PROPERTIES_GROUPPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX
 
 #include <svx/sdr/properties/defaultproperties.hxx>
 
@@ -116,6 +116,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_GROUPPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_GROUPPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/itemsettools.hxx b/include/svx/sdr/properties/itemsettools.hxx
index 8649ffb3c10d..3e6372fe1647 100644
--- a/include/svx/sdr/properties/itemsettools.hxx
+++ b/include/svx/sdr/properties/itemsettools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_ITEMSETTOOLS_HXX
-#define _SDR_PROPERTIES_ITEMSETTOOLS_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX
 
 #include <sal/types.h>
 
@@ -63,6 +63,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_ITEMSETTOOLS_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_ITEMSETTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/measureproperties.hxx b/include/svx/sdr/properties/measureproperties.hxx
index 22e42b80dac6..eba0baa00f82 100644
--- a/include/svx/sdr/properties/measureproperties.hxx
+++ b/include/svx/sdr/properties/measureproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_MEASUREPROPERTIES_HXX
-#define _SDR_PROPERTIES_MEASUREPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
 
 #include <svx/sdr/properties/textproperties.hxx>
 
@@ -62,6 +62,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_MEASUREPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/oleproperties.hxx b/include/svx/sdr/properties/oleproperties.hxx
index 184f840af272..0ca98a919857 100644
--- a/include/svx/sdr/properties/oleproperties.hxx
+++ b/include/svx/sdr/properties/oleproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_OLEPROPERTIES_HXX
-#define _SDR_PROPERTIES_OLEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX
 
 #include <svx/sdr/properties/rectangleproperties.hxx>
 
@@ -53,6 +53,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_OLEPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_OLEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/pageproperties.hxx b/include/svx/sdr/properties/pageproperties.hxx
index fe7c333cec71..f085e168fd86 100644
--- a/include/svx/sdr/properties/pageproperties.hxx
+++ b/include/svx/sdr/properties/pageproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_PAGEPROPERTIES_HXX
-#define _SDR_PROPERTIES_PAGEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX
 
 #include <svx/sdr/properties/emptyproperties.hxx>
 
@@ -68,6 +68,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_PAGEPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_PAGEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/properties.hxx b/include/svx/sdr/properties/properties.hxx
index 287cd5b93ef2..d8c59f4da660 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_PROPERTIES_HXX
-#define _SDR_PROPERTIES_PROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX
 
 #include <sal/types.h>
 #include "svx/svxdllapi.h"
@@ -188,6 +188,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_PROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_PROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/rectangleproperties.hxx b/include/svx/sdr/properties/rectangleproperties.hxx
index 6314f1b136ca..793f53ef545e 100644
--- a/include/svx/sdr/properties/rectangleproperties.hxx
+++ b/include/svx/sdr/properties/rectangleproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX
-#define _SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX
 
 #include <svx/sdr/properties/textproperties.hxx>
 #include "svx/svxdllapi.h"
@@ -56,6 +56,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_RECTANGLEPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/properties/textproperties.hxx b/include/svx/sdr/properties/textproperties.hxx
index 456b104e60ec..54c143808ca0 100644
--- a/include/svx/sdr/properties/textproperties.hxx
+++ b/include/svx/sdr/properties/textproperties.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PROPERTIES_TEXTPROPERTIES_HXX
-#define _SDR_PROPERTIES_TEXTPROPERTIES_HXX
+#ifndef INCLUDED_SVX_SDR_PROPERTIES_TEXTPROPERTIES_HXX
+#define INCLUDED_SVX_SDR_PROPERTIES_TEXTPROPERTIES_HXX
 
 #include <svx/itextprovider.hxx>
 #include <svx/sdr/properties/attributeproperties.hxx>
@@ -88,6 +88,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PROPERTIES_TEXTPROPERTIES_HXX
+#endif // INCLUDED_SVX_SDR_PROPERTIES_TEXTPROPERTIES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx
index 2f4126c12efa..af613d882261 100644
--- a/include/svx/sdr/table/tablecontroller.hxx
+++ b/include/svx/sdr/table/tablecontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TABLECONTROLLER_HXX_
-#define _SVX_TABLECONTROLLER_HXX_
+#ifndef INCLUDED_SVX_SDR_TABLE_TABLECONTROLLER_HXX
+#define INCLUDED_SVX_SDR_TABLE_TABLECONTROLLER_HXX
 
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/table/XTable.hpp>
@@ -162,6 +162,6 @@ private:
 
 } }
 
-#endif // _SVX_TABLECONTROLLER_HXX_
+#endif // INCLUDED_SVX_SDR_TABLE_TABLECONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdr/table/tabledesign.hxx b/include/svx/sdr/table/tabledesign.hxx
index 8de846375f5b..b026edfb2abc 100644
--- a/include/svx/sdr/table/tabledesign.hxx
+++ b/include/svx/sdr/table/tabledesign.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_TABLE_DESIGN_HXX
-#define _SDR_TABLE_DESIGN_HXX
+#ifndef INCLUDED_SVX_SDR_TABLE_TABLEDESIGN_HXX
+#define INCLUDED_SVX_SDR_TABLE_TABLEDESIGN_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/sdrhittesthelper.hxx b/include/svx/sdrhittesthelper.hxx
index ad867f867cfa..006762016236 100644
--- a/include/svx/sdrhittesthelper.hxx
+++ b/include/svx/sdrhittesthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDRHITTESTHELPER_HXX
-#define _SDRHITTESTHELPER_HXX
+#ifndef INCLUDED_SVX_SDRHITTESTHELPER_HXX
+#define INCLUDED_SVX_SDRHITTESTHELPER_HXX
 
 #include "svx/svxdllapi.h"
 #include <tools/gen.hxx>
@@ -63,6 +63,6 @@ SVX_DLLPUBLIC bool ViewObjectContactPrimitiveHit(
 
 /////////////////////////////////////////////////////////////////////
 
-#endif //_SDRHITTESTHELPER_HXX
+#endif // INCLUDED_SVX_SDRHITTESTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx
index 1917a681bb69..6ffb8df0e251 100644
--- a/include/svx/sdrmasterpagedescriptor.hxx
+++ b/include/svx/sdrmasterpagedescriptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_MASTERPAGEDESCRIPTOR_HXX
-#define _SDR_MASTERPAGEDESCRIPTOR_HXX
+#ifndef INCLUDED_SVX_SDRMASTERPAGEDESCRIPTOR_HXX
+#define INCLUDED_SVX_SDRMASTERPAGEDESCRIPTOR_HXX
 
 #include <svx/sdrpageuser.hxx>
 #include <svx/svdsob.hxx>
@@ -89,6 +89,6 @@ namespace sdr
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_MASTERPAGEDESCRIPTOR_HXX
+#endif // INCLUDED_SVX_SDRMASTERPAGEDESCRIPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrobjectfilter.hxx b/include/svx/sdrobjectfilter.hxx
index 9741afb6f4cf..07cd21293d36 100644
--- a/include/svx/sdrobjectfilter.hxx
+++ b/include/svx/sdrobjectfilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SDROBJECTFILTER_HXX
-#define SDROBJECTFILTER_HXX
+#ifndef INCLUDED_SVX_SDROBJECTFILTER_HXX
+#define INCLUDED_SVX_SDROBJECTFILTER_HXX
 
 #include "svx/svxdllapi.h"
 
@@ -46,6 +46,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SDROBJECTFILTER_HXX
+#endif // INCLUDED_SVX_SDROBJECTFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrobjectuser.hxx b/include/svx/sdrobjectuser.hxx
index b1e0c7343066..fbaa278632af 100644
--- a/include/svx/sdrobjectuser.hxx
+++ b/include/svx/sdrobjectuser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_OBJECTUSER_HXX
-#define _SDR_OBJECTUSER_HXX
+#ifndef INCLUDED_SVX_SDROBJECTUSER_HXX
+#define INCLUDED_SVX_SDROBJECTUSER_HXX
 
 #include <vector>
 
@@ -51,6 +51,6 @@ namespace sdr
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_OBJECTUSER_HXX
+#endif // INCLUDED_SVX_SDROBJECTUSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrpageuser.hxx b/include/svx/sdrpageuser.hxx
index 39390fcf6247..d537861ced0b 100644
--- a/include/svx/sdrpageuser.hxx
+++ b/include/svx/sdrpageuser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_PAGEUSER_HXX
-#define _SDR_PAGEUSER_HXX
+#ifndef INCLUDED_SVX_SDRPAGEUSER_HXX
+#define INCLUDED_SVX_SDRPAGEUSER_HXX
 
 #include <vector>
 
@@ -51,6 +51,6 @@ namespace sdr
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_PAGEUSER_HXX
+#endif // INCLUDED_SVX_SDRPAGEUSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrpagewindow.hxx b/include/svx/sdrpagewindow.hxx
index 5446a14366b1..8ae8b9f06973 100644
--- a/include/svx/sdrpagewindow.hxx
+++ b/include/svx/sdrpagewindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDRPAGEWINDOW_HXX
-#define _SDRPAGEWINDOW_HXX
+#ifndef INCLUDED_SVX_SDRPAGEWINDOW_HXX
+#define INCLUDED_SVX_SDRPAGEWINDOW_HXX
 
 #include <com/sun/star/awt/XWindowListener.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
@@ -126,6 +126,6 @@ typedef ::std::vector< SdrPageWindow* > SdrPageWindowVector;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDRPAGEWINDOW_HXX
+#endif // INCLUDED_SVX_SDRPAGEWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index d1694ee051cb..026c560e0419 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDRPAINTWINDOW_HXX
-#define _SDRPAINTWINDOW_HXX
+#ifndef INCLUDED_SVX_SDRPAINTWINDOW_HXX
+#define INCLUDED_SVX_SDRPAINTWINDOW_HXX
 
 #include <rtl/ref.hxx>
 #include <vcl/virdev.hxx>
@@ -152,6 +152,6 @@ typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDRPAINTWINDOW_HXX
+#endif // INCLUDED_SVX_SDRPAINTWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdrundomanager.hxx b/include/svx/sdrundomanager.hxx
index 9c88f062b92b..f31553169ccd 100755
--- a/include/svx/sdrundomanager.hxx
+++ b/include/svx/sdrundomanager.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDR_UNDOMANAGER_HXX
-#define _SDR_UNDOMANAGER_HXX
+#ifndef INCLUDED_SVX_SDRUNDOMANAGER_HXX
+#define INCLUDED_SVX_SDRUNDOMANAGER_HXX
 
 #include "svx/svxdllapi.h"
 #include <sal/types.h>
@@ -65,7 +65,7 @@ public:
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SDR_UNDOMANAGER_HXX
+#endif // INCLUDED_SVX_SDRUNDOMANAGER_HXX
 // eof
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sdshcitm.hxx b/include/svx/sdshcitm.hxx
index f399a069ee61..63ea604698e0 100644
--- a/include/svx/sdshcitm.hxx
+++ b/include/svx/sdshcitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDSHCITM_HXX
-#define _SDSHCITM_HXX
+#ifndef INCLUDED_SVX_SDSHCITM_HXX
+#define INCLUDED_SVX_SDSHCITM_HXX
 
 #include <svx/xcolit.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdshitm.hxx b/include/svx/sdshitm.hxx
index 1adf14ca0402..f55e3bcc03fa 100644
--- a/include/svx/sdshitm.hxx
+++ b/include/svx/sdshitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDSHITM_HXX
-#define _SDSHITM_HXX
+#ifndef INCLUDED_SVX_SDSHITM_HXX
+#define INCLUDED_SVX_SDSHITM_HXX
 
 #include <svx/sdooitm.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdshtitm.hxx b/include/svx/sdshtitm.hxx
index cd9f99135b93..607f3bc2e5ad 100644
--- a/include/svx/sdshtitm.hxx
+++ b/include/svx/sdshtitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDSHTITM_HXX
-#define _SDSHTITM_HXX
+#ifndef INCLUDED_SVX_SDSHTITM_HXX
+#define INCLUDED_SVX_SDSHTITM_HXX
 
 #include <svx/sdprcitm.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdsxyitm.hxx b/include/svx/sdsxyitm.hxx
index 84f614c36b97..432fdbc50a77 100644
--- a/include/svx/sdsxyitm.hxx
+++ b/include/svx/sdsxyitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDSXYITM_HXX
-#define _SDSXYITM_HXX
+#ifndef INCLUDED_SVX_SDSXYITM_HXX
+#define INCLUDED_SVX_SDSXYITM_HXX
 
 #include <svx/sdmetitm.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtaaitm.hxx b/include/svx/sdtaaitm.hxx
index cf8b0d59f1ee..dd18729d80d2 100644
--- a/include/svx/sdtaaitm.hxx
+++ b/include/svx/sdtaaitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTAAITM_HXX
-#define _SDTAAITM_HXX
+#ifndef INCLUDED_SVX_SDTAAITM_HXX
+#define INCLUDED_SVX_SDTAAITM_HXX
 
 #include <svl/intitem.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtaditm.hxx b/include/svx/sdtaditm.hxx
index 687e906bf2f0..09ed2ef5018d 100644
--- a/include/svx/sdtaditm.hxx
+++ b/include/svx/sdtaditm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTADITM_HXX
-#define _SDTADITM_HXX
+#ifndef INCLUDED_SVX_SDTADITM_HXX
+#define INCLUDED_SVX_SDTADITM_HXX
 
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtagitm.hxx b/include/svx/sdtagitm.hxx
index eec63d750a7f..e576d48d60f9 100644
--- a/include/svx/sdtagitm.hxx
+++ b/include/svx/sdtagitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTAGITM_HXX
-#define _SDTAGITM_HXX
+#ifndef INCLUDED_SVX_SDTAGITM_HXX
+#define INCLUDED_SVX_SDTAGITM_HXX
 
 #include <svx/sdooitm.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtaiitm.hxx b/include/svx/sdtaiitm.hxx
index e9916e33baeb..a5396e9e3c74 100644
--- a/include/svx/sdtaiitm.hxx
+++ b/include/svx/sdtaiitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTAIITM_HXX
-#define _SDTAIITM_HXX
+#ifndef INCLUDED_SVX_SDTAIITM_HXX
+#define INCLUDED_SVX_SDTAIITM_HXX
 
 #include <svx/sdynitm.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtaitm.hxx b/include/svx/sdtaitm.hxx
index 82e002a95df2..20d16d757908 100644
--- a/include/svx/sdtaitm.hxx
+++ b/include/svx/sdtaitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTAITM_HXX
-#define _SDTAITM_HXX
+#ifndef INCLUDED_SVX_SDTAITM_HXX
+#define INCLUDED_SVX_SDTAITM_HXX
 
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtakitm.hxx b/include/svx/sdtakitm.hxx
index 057bfe522535..e3ccc9bdaa09 100644
--- a/include/svx/sdtakitm.hxx
+++ b/include/svx/sdtakitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SDTAKITM_HXX
-#define SDTAKITM_HXX
+#ifndef INCLUDED_SVX_SDTAKITM_HXX
+#define INCLUDED_SVX_SDTAKITM_HXX
 
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtayitm.hxx b/include/svx/sdtayitm.hxx
index c852087b83a7..c08be6d28df6 100644
--- a/include/svx/sdtayitm.hxx
+++ b/include/svx/sdtayitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTAYITM_HXX
-#define _SDTAYITM_HXX
+#ifndef INCLUDED_SVX_SDTAYITM_HXX
+#define INCLUDED_SVX_SDTAYITM_HXX
 
 #include <svl/intitem.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtcfitm.hxx b/include/svx/sdtcfitm.hxx
index 80cfeddfda56..96b89b33c667 100644
--- a/include/svx/sdtcfitm.hxx
+++ b/include/svx/sdtcfitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTCFITM_HXX
-#define _SDTCFITM_HXX
+#ifndef INCLUDED_SVX_SDTCFITM_HXX
+#define INCLUDED_SVX_SDTCFITM_HXX
 
 #include <svx/sdooitm.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtditm.hxx b/include/svx/sdtditm.hxx
index c33da1f406f3..01f2e3307d5a 100644
--- a/include/svx/sdtditm.hxx
+++ b/include/svx/sdtditm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SDTMITM_HXX
-#define SDTMITM_HXX
+#ifndef INCLUDED_SVX_SDTDITM_HXX
+#define INCLUDED_SVX_SDTDITM_HXX
 
 #include <svx/sdmetitm.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtfchim.hxx b/include/svx/sdtfchim.hxx
index 42874cbc6fb3..d77aaea8048b 100644
--- a/include/svx/sdtfchim.hxx
+++ b/include/svx/sdtfchim.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTFCHIM_HXX
-#define _SDTFCHIM_HXX
+#ifndef INCLUDED_SVX_SDTFCHIM_HXX
+#define INCLUDED_SVX_SDTFCHIM_HXX
 
 #include <svx/svddef.hxx>
 
diff --git a/include/svx/sdtfsitm.hxx b/include/svx/sdtfsitm.hxx
index 6d15c560e575..f01250b6350b 100644
--- a/include/svx/sdtfsitm.hxx
+++ b/include/svx/sdtfsitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTFSITM_HXX
-#define _SDTFSITM_HXX
+#ifndef INCLUDED_SVX_SDTFSITM_HXX
+#define INCLUDED_SVX_SDTFSITM_HXX
 
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx
index 6e6ddff28136..5be20e768e34 100644
--- a/include/svx/sdtmfitm.hxx
+++ b/include/svx/sdtmfitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDTMFITM_HXX
-#define _SDTMFITM_HXX
+#ifndef INCLUDED_SVX_SDTMFITM_HXX
+#define INCLUDED_SVX_SDTMFITM_HXX
 
 #include <svx/sdmetitm.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sdynitm.hxx b/include/svx/sdynitm.hxx
index 387c3c40f725..d9d1731a73e7 100644
--- a/include/svx/sdynitm.hxx
+++ b/include/svx/sdynitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SDYNITM_HXX
-#define _SDYNITM_HXX
+#ifndef INCLUDED_SVX_SDYNITM_HXX
+#define INCLUDED_SVX_SDYNITM_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/selctrl.hxx b/include/svx/selctrl.hxx
index eff2675eb5f1..b3081f112722 100644
--- a/include/svx/selctrl.hxx
+++ b/include/svx/selctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SELCTRL_HXX
-#define _SVX_SELCTRL_HXX
+#ifndef INCLUDED_SVX_SELCTRL_HXX
+#define INCLUDED_SVX_SELCTRL_HXX
 
 #include <vcl/image.hxx>
 #include <sfx2/stbitem.hxx>
diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx
index e65bbe4b5e74..d0636f25a31c 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SELECTIONCONTROLLER_HXX
-#define _SELECTIONCONTROLLER_HXX
+#ifndef INCLUDED_SVX_SELECTIONCONTROLLER_HXX
+#define INCLUDED_SVX_SELECTIONCONTROLLER_HXX
 
 #include "svx/svxdllapi.h"
 
@@ -74,6 +74,6 @@ public:
 
 }
 
-#endif //_SELECTIONCONTROLLER_HXX
+#endif // INCLUDED_SVX_SELECTIONCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/shapeproperty.hxx b/include/svx/shapeproperty.hxx
index d46b6278b749..06e45f9f3b22 100644
--- a/include/svx/shapeproperty.hxx
+++ b/include/svx/shapeproperty.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SHAPEPROPERTY_HXX
-#define SVX_SHAPEPROPERTY_HXX
+#ifndef INCLUDED_SVX_SHAPEPROPERTY_HXX
+#define INCLUDED_SVX_SHAPEPROPERTY_HXX
 
 //........................................................................
 namespace svx
@@ -46,6 +46,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SVX_SHAPEPROPERTY_HXX
+#endif // INCLUDED_SVX_SHAPEPROPERTY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index e16c23089658..ec2a07fb9bca 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_PROPERTYCHANGENOTIFIER_HXX
-#define SVX_PROPERTYCHANGENOTIFIER_HXX
+#ifndef INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX
+#define INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX
 
 #include "svx/svxdllapi.h"
 #include "svx/shapeproperty.hxx"
@@ -136,6 +136,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SVX_PROPERTYCHANGENOTIFIER_HXX
+#endif // INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sidebar/ColorControl.hxx b/include/svx/sidebar/ColorControl.hxx
index 56cac38b3c90..fbb5ec09f0a7 100644
--- a/include/svx/sidebar/ColorControl.hxx
+++ b/include/svx/sidebar/ColorControl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_COLORCONTROL_HXX
-#define SVX_COLORCONTROL_HXX
+#ifndef INCLUDED_SVX_SIDEBAR_COLORCONTROL_HXX
+#define INCLUDED_SVX_SIDEBAR_COLORCONTROL_HXX
 
 #include "svx/sidebar/PopupControl.hxx"
 
@@ -86,6 +86,6 @@ private:
 
 } } // end of namespace svx::sidebar
 
-#endif // SVX_COLORCONTROL_HXX
+#endif // INCLUDED_SVX_SIDEBAR_COLORCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/sidebar/ColorPopup.hxx b/include/svx/sidebar/ColorPopup.hxx
index 0d28abb14d3f..f126ad2fa1ad 100644
--- a/include/svx/sidebar/ColorPopup.hxx
+++ b/include/svx/sidebar/ColorPopup.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SIDEBAR_COLOR_POPUP_HXX_
-#define _SVX_SIDEBAR_COLOR_POPUP_HXX_
+#ifndef INCLUDED_SVX_SIDEBAR_COLORPOPUP_HXX
+#define INCLUDED_SVX_SIDEBAR_COLORPOPUP_HXX
 
 #include "svx/sidebar/Popup.hxx"
 
diff --git a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
index d3286a0b3374..d29af4dbe4b9 100644
--- a/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
+++ b/include/svx/sidebar/ContextChangeEventMultiplexer.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SIDEBAR_CONTEXT_CHANGE_EVENT_MULTIPLEXER_HXX_
-#define _SVX_SIDEBAR_CONTEXT_CHANGE_EVENT_MULTIPLEXER_HXX_
+#ifndef INCLUDED_SVX_SIDEBAR_CONTEXTCHANGEEVENTMULTIPLEXER_HXX
+#define INCLUDED_SVX_SIDEBAR_CONTEXTCHANGEEVENTMULTIPLEXER_HXX
 
 #include "svx/svxdllapi.h"
 #include <sfx2/sidebar/EnumContext.hxx>
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index 2fa82ee2d84d..5275ced74092 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef SIDEBAR_PANELLAYOUT_HXX
-#define SIDEBAR_PANELLAYOUT_HXX
+#ifndef INCLUDED_SVX_SIDEBAR_PANELLAYOUT_HXX
+#define INCLUDED_SVX_SIDEBAR_PANELLAYOUT_HXX
 
 #include <svx/svxdllapi.h>
 
diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx
index 0838940e7513..4e5cd84773ec 100644
--- a/include/svx/sidebar/Popup.hxx
+++ b/include/svx/sidebar/Popup.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SIDEBAR_POPUP_HXX_
-#define _SVX_SIDEBAR_POPUP_HXX_
+#ifndef INCLUDED_SVX_SIDEBAR_POPUP_HXX
+#define INCLUDED_SVX_SIDEBAR_POPUP_HXX
 
 #include "svx/svxdllapi.h"
 #include <rtl/ustring.hxx>
diff --git a/include/svx/sidebar/PopupContainer.hxx b/include/svx/sidebar/PopupContainer.hxx
index 4363c68c8339..a48cc142ef50 100644
--- a/include/svx/sidebar/PopupContainer.hxx
+++ b/include/svx/sidebar/PopupContainer.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SIDEBAR_POPUP_CONTAINER_HXX_
-#define _SVX_SIDEBAR_POPUP_CONTAINER_HXX_
+#ifndef INCLUDED_SVX_SIDEBAR_POPUPCONTAINER_HXX
+#define INCLUDED_SVX_SIDEBAR_POPUPCONTAINER_HXX
 
 #include "svx/svxdllapi.h"
 #include <vcl/floatwin.hxx>
diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx
index 17854993d71f..71491ee8fa5e 100644
--- a/include/svx/sidebar/PopupControl.hxx
+++ b/include/svx/sidebar/PopupControl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SIDEBAR_POPUP_CONTROL_HXX_
-#define _SVX_SIDEBAR_POPUP_CONTROL_HXX_
+#ifndef INCLUDED_SVX_SIDEBAR_POPUPCONTROL_HXX
+#define INCLUDED_SVX_SIDEBAR_POPUPCONTROL_HXX
 
 #include "svx/svxdllapi.h"
 #include <vcl/ctrl.hxx>
diff --git a/include/svx/sidebar/SelectionAnalyzer.hxx b/include/svx/sidebar/SelectionAnalyzer.hxx
index d0778fe9728c..78152889f5cc 100644
--- a/include/svx/sidebar/SelectionAnalyzer.hxx
+++ b/include/svx/sidebar/SelectionAnalyzer.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SIDEBAR_SELECTION_ANALYZER_HXX_
-#define _SVX_SIDEBAR_SELECTION_ANALYZER_HXX_
+#ifndef INCLUDED_SVX_SIDEBAR_SELECTIONANALYZER_HXX
+#define INCLUDED_SVX_SIDEBAR_SELECTIONANALYZER_HXX
 
 #include <sfx2/sidebar/EnumContext.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/sidebar/SelectionChangeHandler.hxx b/include/svx/sidebar/SelectionChangeHandler.hxx
index a49eb6e57392..20b8fceb6ac5 100644
--- a/include/svx/sidebar/SelectionChangeHandler.hxx
+++ b/include/svx/sidebar/SelectionChangeHandler.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SIDEBAR_SELECTION_CHANGE_HANDLER_HXX_
-#define _SVX_SIDEBAR_SELECTION_CHANGE_HANDLER_HXX_
+#ifndef INCLUDED_SVX_SIDEBAR_SELECTIONCHANGEHANDLER_HXX
+#define INCLUDED_SVX_SIDEBAR_SELECTIONCHANGEHANDLER_HXX
 
 #include "svx/svxdllapi.h"
 #include <sfx2/sidebar/EnumContext.hxx>
diff --git a/include/svx/sidebar/SidebarDialControl.hxx b/include/svx/sidebar/SidebarDialControl.hxx
index a175610a6b76..e3a32d450fee 100644
--- a/include/svx/sidebar/SidebarDialControl.hxx
+++ b/include/svx/sidebar/SidebarDialControl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SVX_SIDEBAR_DIAL_CONTROL_HXX
-#define SVX_SIDEBAR_DIAL_CONTROL_HXX
+#ifndef INCLUDED_SVX_SIDEBAR_SIDEBARDIALCONTROL_HXX
+#define INCLUDED_SVX_SIDEBAR_SIDEBARDIALCONTROL_HXX
 
 #include <svx/dialcontrol.hxx>
 
diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx
index d71314360c8a..3183732aafaa 100644
--- a/include/svx/sidebar/ValueSetWithTextControl.hxx
+++ b/include/svx/sidebar/ValueSetWithTextControl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SIDEBAR_VALUESETWITHTEXT_CONTROL_HXX_
-#define _SVX_SIDEBAR_VALUESETWITHTEXT_CONTROL_HXX_
+#ifndef INCLUDED_SVX_SIDEBAR_VALUESETWITHTEXTCONTROL_HXX
+#define INCLUDED_SVX_SIDEBAR_VALUESETWITHTEXTCONTROL_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/sphere3d.hxx b/include/svx/sphere3d.hxx
index 500705f923b8..8d0c0e81b34f 100644
--- a/include/svx/sphere3d.hxx
+++ b/include/svx/sphere3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_SPHERE3D_HXX
-#define _E3D_SPHERE3D_HXX
+#ifndef INCLUDED_SVX_SPHERE3D_HXX
+#define INCLUDED_SVX_SPHERE3D_HXX
 
 #include <svx/obj3d.hxx>
 #include "svx/svxdllapi.h"
@@ -72,6 +72,6 @@ public:
     virtual OUString TakeObjNamePlural() const;
 };
 
-#endif // _E3D_SPHERE3D_HXX
+#endif // INCLUDED_SVX_SPHERE3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
index 77a7c21a1e8b..ffee87117a33 100644
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SRCHDLG_HXX
-#define _SVX_SRCHDLG_HXX
+#ifndef INCLUDED_SVX_SRCHDLG_HXX
+#define INCLUDED_SVX_SRCHDLG_HXX
 
 #include <svtools/stdctrl.hxx>
 #include <vcl/combobox.hxx>
diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx
index 8f65c17a8781..7becdd02342a 100644
--- a/include/svx/stddlg.hxx
+++ b/include/svx/stddlg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_STDDLG_HXX
-#define _SVX_STDDLG_HXX
+#ifndef INCLUDED_SVX_STDDLG_HXX
+#define INCLUDED_SVX_STDDLG_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/strarray.hxx b/include/svx/strarray.hxx
index 9599ae3f3fc4..85a3960911bb 100644
--- a/include/svx/strarray.hxx
+++ b/include/svx/strarray.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_STRARRAY_HXX
-#define _SVX_STRARRAY_HXX
+#ifndef INCLUDED_SVX_STRARRAY_HXX
+#define INCLUDED_SVX_STRARRAY_HXX
 
 #include <tools/resary.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/subtoolboxcontrol.hxx b/include/svx/subtoolboxcontrol.hxx
index f3f1bb52cf04..74662e3419e0 100644
--- a/include/svx/subtoolboxcontrol.hxx
+++ b/include/svx/subtoolboxcontrol.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_SUBTOOLBOXCONTROL_HXX
-#define _SVX_SUBTOOLBOXCONTROL_HXX
+#ifndef INCLUDED_SVX_SUBTOOLBOXCONTROL_HXX
+#define INCLUDED_SVX_SUBTOOLBOXCONTROL_HXX
 
 #include "svx/svxdllapi.h"
 #include <sfx2/tbxctrl.hxx>
diff --git a/include/svx/svdattr.hxx b/include/svx/svdattr.hxx
index dbe29bb9a874..10368f09e880 100644
--- a/include/svx/svdattr.hxx
+++ b/include/svx/svdattr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDATTR_HXX
-#define _SVDATTR_HXX
+#ifndef INCLUDED_SVX_SVDATTR_HXX
+#define INCLUDED_SVX_SVDATTR_HXX
 
 #include <svl/solar.hrc>
 #include <tools/solar.h>
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index 9f14c12cdc78..a7681dff899d 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDCRTV_HXX
-#define _SVDCRTV_HXX
+#ifndef INCLUDED_SVX_SVDCRTV_HXX
+#define INCLUDED_SVX_SVDCRTV_HXX
 
 #include <svx/svddrgv.hxx>
 #include "svx/svxdllapi.h"
@@ -176,6 +176,6 @@ public:
     sal_Bool SetStyleSheet(SfxStyleSheet* pStyleSheet, sal_Bool bDontRemoveHardAttr);
 };
 
-#endif //_SVDCRTV_HXX
+#endif // INCLUDED_SVX_SVDCRTV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index dc6c351c5eeb..91a1fd0b4bb0 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDDEF_HXX
-#define _SVDDEF_HXX
+#ifndef INCLUDED_SVX_SVDDEF_HXX
+#define INCLUDED_SVX_SVDDEF_HXX
 
 #include <svx/xdef.hxx>
 
@@ -301,6 +301,6 @@
 
 #define SDRATTR_END                             SDRATTR_TABLE_LAST      /* 1357 */ /* 1333 V4+++*/ /* 1243 V4+++*/  /*1213*/ /*1085*/ /*1040*/ /*Pool V2: 1123,V1: 1065 */
 
-#endif // _SVDDEF_HXX
+#endif // INCLUDED_SVX_SVDDEF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index 82e3f114e28a..ee4e8c46ca00 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDDRAG_HXX
-#define _SVDDRAG_HXX
+#ifndef INCLUDED_SVX_SVDDRAG_HXX
+#define INCLUDED_SVX_SVDDRAG_HXX
 
 
 #include <tools/gen.hxx>
@@ -178,6 +178,6 @@ public:
     void TakeCreateRect(Rectangle& rRect) const;
 };
 
-#endif //_SVDDRAG_HXX
+#endif // INCLUDED_SVX_SVDDRAG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx
index ab03ba81f0cc..b0714829a620 100644
--- a/include/svx/svddrgmt.hxx
+++ b/include/svx/svddrgmt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDDRGMT_HXX
-#define _SVDDRGMT_HXX
+#ifndef INCLUDED_SVX_SVDDRGMT_HXX
+#define INCLUDED_SVX_SVDDRGMT_HXX
 
 #include <svx/svddrgv.hxx>
 #include "svx/svxdllapi.h"
@@ -299,6 +299,6 @@ public:
     virtual Pointer GetSdrDragPointer() const;
 };
 
-#endif //_SVDDRGMT_HXX
+#endif // INCLUDED_SVX_SVDDRGMT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svddrgv.hxx b/include/svx/svddrgv.hxx
index 26a0ddf5d0b1..fdecd82d4380 100644
--- a/include/svx/svddrgv.hxx
+++ b/include/svx/svddrgv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDDRGV_HXX
-#define _SVDDRGV_HXX
+#ifndef INCLUDED_SVX_SVDDRGV_HXX
+#define INCLUDED_SVX_SVDDRGV_HXX
 
 #include "svx/svxdllapi.h"
 #include <svx/svdxcgv.hxx>
@@ -279,6 +279,6 @@ public:
     virtual sal_Bool TakeDragLimit(SdrDragMode eMode, Rectangle& rRect) const;
 };
 
-#endif //_SVDDRGV_HXX
+#endif // INCLUDED_SVX_SVDDRGV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index 51b3d0f87977..07417f3e45b7 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDEDTV_HXX
-#define _SVDEDTV_HXX
+#ifndef INCLUDED_SVX_SVDEDTV_HXX
+#define INCLUDED_SVX_SVDEDTV_HXX
 
 #include <svx/svdmrkv.hxx>
 #include <svx/xpoly.hxx>
@@ -424,6 +424,6 @@ public:
     virtual void ModelHasChanged();
 };
 
-#endif //_SVDEDTV_HXX
+#endif // INCLUDED_SVX_SVDEDTV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index e84253b15c11..ce66f3f7d2d7 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDEDXV_HXX
-#define _SVDEDXV_HXX
+#ifndef INCLUDED_SVX_SVDEDXV_HXX
+#define INCLUDED_SVX_SVDEDXV_HXX
 
 #include <rtl/ref.hxx>
 #include "svx/svxdllapi.h"
@@ -282,6 +282,6 @@ protected:
 
 };
 
-#endif //_SVDEDXV_HXX
+#endif // INCLUDED_SVX_SVDEDXV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 11adda2d06f1..87406f76304d 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDETC_HXX
-#define _SVDETC_HXX
+#ifndef INCLUDED_SVX_SVDETC_HXX
+#define INCLUDED_SVX_SVDETC_HXX
 
 #include <rtl/ustring.hxx>
 #include <editeng/outliner.hxx>
@@ -258,6 +258,6 @@ SVX_DLLPUBLIC Color GetTextEditBackgroundColor(const SdrObjEditView& rView);
 
 /////////////////////////////////////////////////////////////////////
 
-#endif //_SVDETC_HXX
+#endif // INCLUDED_SVX_SVDETC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdfield.hxx b/include/svx/svdfield.hxx
index 9a4fbd8caf00..e9d8b698d8e3 100644
--- a/include/svx/svdfield.hxx
+++ b/include/svx/svdfield.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDFIELD_HXX
-#define _SVDFIELD_HXX
+#ifndef INCLUDED_SVX_SVDFIELD_HXX
+#define INCLUDED_SVX_SVDFIELD_HXX
 
 #include "svx/svxdllapi.h"
 
 void SVX_DLLPUBLIC SdrRegisterFieldClasses();
 
-#endif //_SVDFIELD_HXX
+#endif // INCLUDED_SVX_SVDFIELD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdglev.hxx b/include/svx/svdglev.hxx
index 5440afcd0557..189b61489ebe 100644
--- a/include/svx/svdglev.hxx
+++ b/include/svx/svdglev.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDGLEV_HXX
-#define _SVDGLEV_HXX
+#ifndef INCLUDED_SVX_SVDGLEV_HXX
+#define INCLUDED_SVX_SVDGLEV_HXX
 
 #include "svx/svxdllapi.h"
 #include <svx/svdpoev.hxx>
@@ -90,6 +90,6 @@ public:
     void AlignMarkedGluePoints(SdrHorAlign eHor, SdrVertAlign eVert);
 };
 
-#endif //_SVDGLEV_HXX
+#endif // INCLUDED_SVX_SVDGLEV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdglob.hxx b/include/svx/svdglob.hxx
index a028e9f5b65d..3a5e555f3e85 100644
--- a/include/svx/svdglob.hxx
+++ b/include/svx/svdglob.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDGLOB_HXX
-#define _SVDGLOB_HXX
+#ifndef INCLUDED_SVX_SVDGLOB_HXX
+#define INCLUDED_SVX_SVDGLOB_HXX
 
 #include <rtl/ustring.hxx>
 #include <sal/config.h>
@@ -42,6 +42,6 @@ SVX_DLLPUBLIC OUString ImpGetResStr(sal_uInt16 nResID);
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDGLOB_HXX
+#endif // INCLUDED_SVX_SVDGLOB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index f667f4f0d743..288bd9f794e6 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDGLUE_HXX
-#define _SVDGLUE_HXX
+#ifndef INCLUDED_SVX_SVDGLUE_HXX
+#define INCLUDED_SVX_SVDGLUE_HXX
 
 class Window;
 class OutputDevice;
@@ -142,6 +142,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDGLUE_HXX
+#endif // INCLUDED_SVX_SVDGLUE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index ce8dad2712f1..c59840776b1a 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDHDL_HXX
-#define _SVDHDL_HXX
+#ifndef INCLUDED_SVX_SVDHDL_HXX
+#define INCLUDED_SVX_SVDHDL_HXX
 
 #include <tools/gen.hxx>
 
@@ -548,6 +548,6 @@ protected:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDHDL_HXX
+#endif // INCLUDED_SVX_SVDHDL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx
index 1c011808cb47..897efd4f975e 100644
--- a/include/svx/svdhlpln.hxx
+++ b/include/svx/svdhlpln.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDHLPLN_HXX
-#define _SVDHLPLN_HXX
+#ifndef INCLUDED_SVX_SVDHLPLN_HXX
+#define INCLUDED_SVX_SVDHLPLN_HXX
 
 #include <sal/types.h>
 #include <tools/color.hxx>
@@ -102,6 +102,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDHLPLN_HXX
+#endif // INCLUDED_SVX_SVDHLPLN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svditer.hxx b/include/svx/svditer.hxx
index d58512138b79..6ca305e6e9da 100644
--- a/include/svx/svditer.hxx
+++ b/include/svx/svditer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDITER_HXX
-#define _SVDITER_HXX
+#ifndef INCLUDED_SVX_SVDITER_HXX
+#define INCLUDED_SVX_SVDITER_HXX
 
 #include <vector>
 
@@ -74,6 +74,6 @@ public:
     sal_uInt32 Count() { return maObjList.size(); }
 };
 
-#endif //_SVDITER_HXX
+#endif // INCLUDED_SVX_SVDITER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx
index 1f827e69e563..3d88d9d99be1 100644
--- a/include/svx/svdlayer.hxx
+++ b/include/svx/svdlayer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDLAYER_HXX
-#define _SVDLAYER_HXX
+#ifndef INCLUDED_SVX_SVDLAYER_HXX
+#define INCLUDED_SVX_SVDLAYER_HXX
 
 #include <tools/stream.hxx>
 #include <svx/svdsob.hxx>
@@ -166,6 +166,6 @@ bInherited:
     Model. Das Model selbst hat keinen Parent.
 */
 
-#endif //_SVDLAYER_HXX
+#endif // INCLUDED_SVX_SVDLAYER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx
index d6e2afb0c255..e43800885d36 100644
--- a/include/svx/svdmark.hxx
+++ b/include/svx/svdmark.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDMARK_HXX
-#define _SVDMARK_HXX
+#ifndef INCLUDED_SVX_SVDMARK_HXX
+#define INCLUDED_SVX_SVDMARK_HXX
 
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
@@ -293,6 +293,6 @@ namespace sdr
     };
 } // end of namespace sdr
 
-#endif //_SVDMARK_HXX
+#endif // INCLUDED_SVX_SVDMARK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 4e8b4e5c7d88..1516a08227ca 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDMODEL_HXX
-#define _SVDMODEL_HXX
+#ifndef INCLUDED_SVX_SVDMODEL_HXX
+#define INCLUDED_SVX_SVDMODEL_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/weakref.hxx>
@@ -683,7 +683,7 @@ typedef tools::WeakReference< SdrModel > SdrModelWeakRef;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDMODEL_HXX
+#endif // INCLUDED_SVX_SVDMODEL_HXX
 
 /* /////////////////////////////////////////////////////////////////////////////////////////////////
             +-----------+
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 52bdd8197ef5..e379f7e3efbe 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDMRKV_HXX
-#define _SVDMRKV_HXX
+#ifndef INCLUDED_SVX_SVDMRKV_HXX
+#define INCLUDED_SVX_SVDMRKV_HXX
 
 #include <svx/svdmark.hxx>
 #include <svx/svdhdl.hxx>
@@ -476,6 +476,6 @@ public:
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDMRKV_HXX
+#endif // INCLUDED_SVX_SVDMRKV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdoashp.hxx b/include/svx/svdoashp.hxx
index c1f051fd60ec..ea155a78f6d9 100644
--- a/include/svx/svdoashp.hxx
+++ b/include/svx/svdoashp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOASHP_HXX
-#define _SVDOASHP_HXX
+#ifndef INCLUDED_SVX_SVDOASHP_HXX
+#define INCLUDED_SVX_SVDOASHP_HXX
 
 #include <svx/svdobj.hxx>
 #include <svx/svdotext.hxx>
@@ -258,6 +258,6 @@ public:
     using SdrTextObj::NbcSetOutlinerParaObject;
 };
 
-#endif //_SVDOASHP_HXX
+#endif // INCLUDED_SVX_SVDOASHP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx
index c6c62d44cbda..fbd11a42e556 100644
--- a/include/svx/svdoattr.hxx
+++ b/include/svx/svdoattr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOATTR_HXX
-#define _SVDOATTR_HXX
+#ifndef INCLUDED_SVX_SVDOATTR_HXX
+#define INCLUDED_SVX_SVDOATTR_HXX
 
 #include <svx/xfillit0.hxx>
 #include <svx/xflasit.hxx>
@@ -78,6 +78,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDOATTR_HXX
+#endif // INCLUDED_SVX_SVDOATTR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index f92c843193c8..f1b3dbbad506 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOBJ_HXX
-#define _SVDOBJ_HXX
+#ifndef INCLUDED_SVX_SVDOBJ_HXX
+#define INCLUDED_SVX_SVDOBJ_HXX
 
 #include <memory>
 #include <typeinfo>
@@ -1113,6 +1113,6 @@ template< typename T > T* SdrObject::CloneHelper() const
     return pObj;
 }
 
-#endif //_SVDOBJ_HXX
+#endif // INCLUDED_SVX_SVDOBJ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx
index 3e1688f2996a..3f541029373d 100644
--- a/include/svx/svdocapt.hxx
+++ b/include/svx/svdocapt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDCAPT_HXX
-#define _SVDCAPT_HXX
+#ifndef INCLUDED_SVX_SVDOCAPT_HXX
+#define INCLUDED_SVX_SVDOCAPT_HXX
 
 #include <svx/svdorect.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/svdocirc.hxx b/include/svx/svdocirc.hxx
index 00db6e1f83a7..a24916098ad7 100644
--- a/include/svx/svdocirc.hxx
+++ b/include/svx/svdocirc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOCIRC_HXX
-#define _SVDOCIRC_HXX
+#ifndef INCLUDED_SVX_SVDOCIRC_HXX
+#define INCLUDED_SVX_SVDOCIRC_HXX
 
 #include <svx/svdorect.hxx>
 #include "svx/svxdllapi.h"
@@ -141,6 +141,6 @@ public:
 
 };
 
-#endif //_SVDOCIRC_HXX
+#endif // INCLUDED_SVX_SVDOCIRC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index b545615e3f0d..21083f059d09 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOEDGE_HXX
-#define _SVDOEDGE_HXX
+#ifndef INCLUDED_SVX_SVDOEDGE_HXX
+#define INCLUDED_SVX_SVDOEDGE_HXX
 
 #include <svx/svdotext.hxx>
 #include <svx/svdglue.hxx>
@@ -433,6 +433,6 @@ public:
 //
 //////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDOEDGE_HXX
+#endif // INCLUDED_SVX_SVDOEDGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index f6c7c924499c..3ae73980ba6f 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOGRAF_HXX
-#define _SVDOGRAF_HXX
+#ifndef INCLUDED_SVX_SVDOGRAF_HXX
+#define INCLUDED_SVX_SVDOGRAF_HXX
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <vcl/graph.hxx>
@@ -198,6 +198,6 @@ public:
     virtual SdrObject* getFullDragClone() const;
 };
 
-#endif //_SVDOGRAF_HXX
+#endif // INCLUDED_SVX_SVDOGRAF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdogrp.hxx b/include/svx/svdogrp.hxx
index 7d35fb2f34f3..76342de61873 100644
--- a/include/svx/svdogrp.hxx
+++ b/include/svx/svdogrp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOGRP_HXX
-#define _SVDOGRP_HXX
+#ifndef INCLUDED_SVX_SVDOGRP_HXX
+#define INCLUDED_SVX_SVDOGRP_HXX
 
 #include <svx/svdobj.hxx>
 #include "svx/svxdllapi.h"
@@ -110,6 +110,6 @@ public:
     virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
 };
 
-#endif //_SVDOGRP_HXX
+#endif // INCLUDED_SVX_SVDOGRP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 435ea2002f37..b46229200aaa 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOMEAS_HXX
-#define _SVDOMEAS_HXX
+#ifndef INCLUDED_SVX_SVDOMEAS_HXX
+#define INCLUDED_SVX_SVDOMEAS_HXX
 
 #include <svx/svdotext.hxx>
 #include "svx/svxdllapi.h"
@@ -205,6 +205,6 @@ public:
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDOMEAS_HXX
+#endif // INCLUDED_SVX_SVDOMEAS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx
index 61fa800faa63..fd50b3a619ec 100644
--- a/include/svx/svdomedia.hxx
+++ b/include/svx/svdomedia.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVDOMEDIA_HXX
-#define SVDOMEDIA_HXX
+#ifndef INCLUDED_SVX_SVDOMEDIA_HXX
+#define INCLUDED_SVX_SVDOMEDIA_HXX
 
 #include <svx/svdorect.hxx>
 #include <avmedia/mediaitem.hxx>
@@ -83,6 +83,6 @@ private:
         ::boost::scoped_ptr<Impl> m_pImpl;
 };
 
-#endif // SVDOMEDIA_HXX
+#endif // INCLUDED_SVX_SVDOMEDIA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdoole2.hxx b/include/svx/svdoole2.hxx
index 76c705adf9cf..78a62a70724f 100644
--- a/include/svx/svdoole2.hxx
+++ b/include/svx/svdoole2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOOLE2_HXX
-#define _SVDOOLE2_HXX
+#ifndef INCLUDED_SVX_SVDOOLE2_HXX
+#define INCLUDED_SVX_SVDOOLE2_HXX
 
 #include <svtools/embedhlp.hxx>
 #include <com/sun/star/uno/Reference.h>
@@ -190,6 +190,6 @@ public:
     virtual SdrObject* DoConvertToPolyObj(sal_Bool bBezier, bool bAddText) const;
 };
 
-#endif //_SVDOOLE2_HXX
+#endif // INCLUDED_SVX_SVDOOLE2_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx
index 7c93c6eca5c9..89572d687696 100644
--- a/include/svx/svdopage.hxx
+++ b/include/svx/svdopage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOPAGE_HXX
-#define _SVDOPAGE_HXX
+#ifndef INCLUDED_SVX_SVDOPAGE_HXX
+#define INCLUDED_SVX_SVDOPAGE_HXX
 
 #include <svx/svdobj.hxx>
 #include <svx/sdrpageuser.hxx>
@@ -65,6 +65,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDOPAGE_HXX
+#endif // INCLUDED_SVX_SVDOPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx
index 156da2c6a732..b83447ef635c 100644
--- a/include/svx/svdopath.hxx
+++ b/include/svx/svdopath.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOPATH_HXX
-#define _SVDOPATH_HXX
+#ifndef INCLUDED_SVX_SVDOPATH_HXX
+#define INCLUDED_SVX_SVDOPATH_HXX
 
 #include <svx/svdotext.hxx>
 #include <svx/xpoly.hxx>
@@ -188,6 +188,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDOPATH_HXX
+#endif // INCLUDED_SVX_SVDOPATH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdorect.hxx b/include/svx/svdorect.hxx
index f3119e02817b..82750820d9e8 100644
--- a/include/svx/svdorect.hxx
+++ b/include/svx/svdorect.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDORECT_HXX
-#define _SVDORECT_HXX
+#ifndef INCLUDED_SVX_SVDORECT_HXX
+#define INCLUDED_SVX_SVDORECT_HXX
 
 #include <svx/svdotext.hxx>
 #include "svx/svxdllapi.h"
@@ -121,6 +121,6 @@ public:
     virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint);
 };
 
-#endif //_SVDORECT_HXX
+#endif // INCLUDED_SVX_SVDORECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index 4b042cc0ca09..719a823a4780 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_SVDOTABLE_HXX
-#define _SVX_SVDOTABLE_HXX
+#ifndef INCLUDED_SVX_SVDOTABLE_HXX
+#define INCLUDED_SVX_SVDOTABLE_HXX
 
 #include <com/sun/star/text/WritingMode.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 6ac698e484a5..0e77b0ecb855 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOTEXT_HXX
-#define _SVDOTEXT_HXX
+#ifndef INCLUDED_SVX_SVDOTEXT_HXX
+#define INCLUDED_SVX_SVDOTEXT_HXX
 
 #include <vcl/field.hxx>
 #include <svx/itextprovider.hxx>
@@ -592,6 +592,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDOTEXT_HXX
+#endif // INCLUDED_SVX_SVDOTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdouno.hxx b/include/svx/svdouno.hxx
index b63cfc202757..d67172acdae8 100644
--- a/include/svx/svdouno.hxx
+++ b/include/svx/svdouno.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOUNO_HXX
-#define _SVDOUNO_HXX
+#ifndef INCLUDED_SVX_SVDOUNO_HXX
+#define INCLUDED_SVX_SVDOUNO_HXX
 
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/awt/XControl.hpp>
@@ -150,6 +150,6 @@ private:
 };
 
 
-#endif          // _SVDOUNO_HXX
+#endif // INCLUDED_SVX_SVDOUNO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx
index 3633264b5029..cbd1b6a1760a 100644
--- a/include/svx/svdoutl.hxx
+++ b/include/svx/svdoutl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOUTL_HXX
-#define _SVDOUTL_HXX
+#ifndef INCLUDED_SVX_SVDOUTL_HXX
+#define INCLUDED_SVX_SVDOUTL_HXX
 
 #include <editeng/outliner.hxx>
 #include "svx/svxdllapi.h"
@@ -47,6 +47,6 @@ public:
     virtual OUString CalcFieldValue(const SvxFieldItem& rField, sal_Int32 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor);
 };
 
-#endif //_SVDOUTL_HXX
+#endif // INCLUDED_SVX_SVDOUTL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdovirt.hxx b/include/svx/svdovirt.hxx
index 1102ae6cb88b..24250a7f42c0 100644
--- a/include/svx/svdovirt.hxx
+++ b/include/svx/svdovirt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDOVIRT_HXX
-#define _SVDOVIRT_HXX
+#ifndef INCLUDED_SVX_SVDOVIRT_HXX
+#define INCLUDED_SVX_SVDOVIRT_HXX
 
 #include <svx/svdobj.hxx>
 #include "svx/svxdllapi.h"
@@ -152,6 +152,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDOVIRT_HXX
+#endif // INCLUDED_SVX_SVDOVIRT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index c8dd083019a4..03205c52501b 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDPAGE_HXX
-#define _SVDPAGE_HXX
+#ifndef INCLUDED_SVX_SVDPAGE_HXX
+#define INCLUDED_SVX_SVDPAGE_HXX
 
 #include <svl/stylesheetuser.hxx>
 #include <vcl/bitmap.hxx>
@@ -600,6 +600,6 @@ public:
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDPAGE_HXX
+#endif // INCLUDED_SVX_SVDPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx
index a3fba13c8b21..8e63d3b060ee 100644
--- a/include/svx/svdpagv.hxx
+++ b/include/svx/svdpagv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDPAGV_HXX
-#define _SVDPAGV_HXX
+#ifndef INCLUDED_SVX_SVDPAGV_HXX
+#define INCLUDED_SVX_SVDPAGV_HXX
 
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <cppuhelper/implbase4.hxx>
@@ -264,6 +264,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDPAGV_HXX
+#endif // INCLUDED_SVX_SVDPAGV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index e383fd1eb218..c9075f2211be 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDPNTV_HXX
-#define _SVDPNTV_HXX
+#ifndef INCLUDED_SVX_SVDPNTV_HXX
+#define INCLUDED_SVX_SVDPNTV_HXX
 
 #include <svl/brdcst.hxx>
 #include <svl/lstner.hxx>
@@ -549,6 +549,6 @@ public:
     const SvtOptionsDrawinglayer& getOptionsDrawinglayer() const { return maDrawinglayerOpt; }
 };
 
-#endif //_SVDPNTV_HXX
+#endif // INCLUDED_SVX_SVDPNTV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx
index d4124e93224a..e09050bd3446 100644
--- a/include/svx/svdpoev.hxx
+++ b/include/svx/svdpoev.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDPOEV_HXX
-#define _SVDPOEV_HXX
+#ifndef INCLUDED_SVX_SVDPOEV_HXX
+#define INCLUDED_SVX_SVDPOEV_HXX
 
 #include "svx/svxdllapi.h"
 #include <svx/svdedtv.hxx>
@@ -80,6 +80,6 @@ public:
     void CheckPolyPossibilitiesHelper( SdrMark* pM, bool& b1stSmooth, bool& b1stSegm, bool& bCurve, bool& bSmoothFuz, bool& bSegmFuz, basegfx::B2VectorContinuity& eSmooth );
 };
 
-#endif //_SVDPOEV_HXX
+#endif // INCLUDED_SVX_SVDPOEV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx
index e90e6d89c5f9..d953a1d69c65 100644
--- a/include/svx/svdpool.hxx
+++ b/include/svx/svdpool.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDPOOL_HXX
-#define _SVDPOOL_HXX
+#ifndef INCLUDED_SVX_SVDPOOL_HXX
+#define INCLUDED_SVX_SVDPOOL_HXX
 
 #include <svx/xpool.hxx>
 #include <svx/svddef.hxx>
@@ -49,6 +49,6 @@ public:
     static void TakeItemName(sal_uInt16 nWhich, OUString& rItemName);
 };
 
-#endif // _SVDPOOL_HXX
+#endif // INCLUDED_SVX_SVDPOOL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdsnpv.hxx b/include/svx/svdsnpv.hxx
index 99cc6d25ae18..880d15e0f7af 100644
--- a/include/svx/svdsnpv.hxx
+++ b/include/svx/svdsnpv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDSNPV_HXX
-#define _SVDSNPV_HXX
+#ifndef INCLUDED_SVX_SVDSNPV_HXX
+#define INCLUDED_SVX_SVDSNPV_HXX
 
 #include <svx/svdpntv.hxx>
 #include <svx/svdhlpln.hxx>
@@ -309,6 +309,6 @@ public:
 //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDSNPV_HXX
+#endif // INCLUDED_SVX_SVDSNPV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdsob.hxx b/include/svx/svdsob.hxx
index 146731c996e8..a15eec3e8fce 100644
--- a/include/svx/svdsob.hxx
+++ b/include/svx/svdsob.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDSOB_HXX
-#define _SVDSOB_HXX
+#ifndef INCLUDED_SVX_SVDSOB_HXX
+#define INCLUDED_SVX_SVDSOB_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include <tools/stream.hxx>
@@ -112,6 +112,6 @@ inline SvStream& operator>>(SvStream& rIn, SetOfByte& rSet)
     return rIn;
 }
 
-#endif // _SVDSOB_HXX
+#endif // INCLUDED_SVX_SVDSOB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdtext.hxx b/include/svx/svdtext.hxx
index 810f701d55fc..f6c202ea0586 100644
--- a/include/svx/svdtext.hxx
+++ b/include/svx/svdtext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDTEXT_HXX
-#define _SVDTEXT_HXX
+#ifndef INCLUDED_SVX_SVDTEXT_HXX
+#define INCLUDED_SVX_SVDTEXT_HXX
 
 #include <sal/types.h>
 #include "svx/svxdllapi.h"
@@ -77,6 +77,6 @@ private:
     bool mbPortionInfoChecked;
 };
 
-#endif //_SVDTEXT_HXX
+#endif // INCLUDED_SVX_SVDTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx
index ad9698705ed8..da234a7971c1 100644
--- a/include/svx/svdtrans.hxx
+++ b/include/svx/svdtrans.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDTRANS_HXX
-#define _SVDTRANS_HXX
+#ifndef INCLUDED_SVX_SVDTRANS_HXX
+#define INCLUDED_SVX_SVDTRANS_HXX
 
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
@@ -297,6 +297,6 @@ public:
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDTRANS_HXX
+#endif // INCLUDED_SVX_SVDTRANS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdtypes.hxx b/include/svx/svdtypes.hxx
index 3bc1637aedec..1db3e7dcf836 100644
--- a/include/svx/svdtypes.hxx
+++ b/include/svx/svdtypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDTYPES_HXX
-#define _SVDTYPES_HXX
+#ifndef INCLUDED_SVX_SVDTYPES_HXX
+#define INCLUDED_SVX_SVDTYPES_HXX
 
 #include <tools/solar.h>
 
@@ -129,6 +129,6 @@ enum SdrRepeatFunc {SDRREPFUNC_OBJ_NONE,
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#endif //_SVDTYPES_HXX
+#endif // INCLUDED_SVX_SVDTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 3aba3914cb02..529359d528c1 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDUNDO_HXX
-#define _SVDUNDO_HXX
+#ifndef INCLUDED_SVX_SVDUNDO_HXX
+#define INCLUDED_SVX_SVDUNDO_HXX
 
 #include <svl/solar.hrc>
 #include <svl/undo.hxx>
@@ -775,6 +775,6 @@ public:
     virtual SdrUndoAction* CreateUndoPageChangeMasterPage(SdrPage& rChangedPage);
 };
 
-#endif //_SVDUNDO_HXX
+#endif // INCLUDED_SVX_SVDUNDO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index 187e26bb0f4b..7404e719b15e 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDVIEW_HXX
-#define _SVDVIEW_HXX
+#ifndef INCLUDED_SVX_SVDVIEW_HXX
+#define INCLUDED_SVX_SVDVIEW_HXX
 
 // HACK to avoid too deep includes and to have some
 // levels free in svdmark itself (MS compiler include depth limit)
@@ -256,7 +256,7 @@ public:
     virtual void onAccessibilityOptionsChanged();
 };
 
-#endif //_SVDVIEW_HXX
+#endif // INCLUDED_SVX_SVDVIEW_HXX
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 //
diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx
index 1ad9f9c773e6..7832affc6756 100644
--- a/include/svx/svdviter.hxx
+++ b/include/svx/svdviter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDVITER_HXX
-#define _SVDVITER_HXX
+#ifndef INCLUDED_SVX_SVDVITER_HXX
+#define INCLUDED_SVX_SVDVITER_HXX
 
 #include <tools/solar.h>
 #include <sal/types.h>
@@ -93,6 +93,6 @@ public:
     SdrView* NextView();
 };
 
-#endif //_SVDVITER_HXX
+#endif // INCLUDED_SVX_SVDVITER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index e391b0ce22f0..904713ed2176 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDXCGV_HXX
-#define _SVDXCGV_HXX
+#ifndef INCLUDED_SVX_SVDXCGV_HXX
+#define INCLUDED_SVX_SVDXCGV_HXX
 
 #include <svx/svdedxv.hxx>
 
@@ -115,6 +115,6 @@ public:
     sal_Bool            PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 );
 };
 
-#endif //_SVDXCGV_HXX
+#endif // INCLUDED_SVX_SVDXCGV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svx3ditems.hxx b/include/svx/svx3ditems.hxx
index bb8c4c26a19d..59554ec41cce 100644
--- a/include/svx/svx3ditems.hxx
+++ b/include/svx/svx3ditems.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX3DITEMS_HXX
-#define _SVX3DITEMS_HXX
+#ifndef INCLUDED_SVX_SVX3DITEMS_HXX
+#define INCLUDED_SVX_SVX3DITEMS_HXX
 
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
@@ -366,6 +366,6 @@ public:
     SVX_DLLPRIVATE virtual sal_uInt16 GetVersion(sal_uInt16 nFileFormatVersion) const;
 };
 
-#endif // _SVX3DITEMS_HXX
+#endif // INCLUDED_SVX_SVX3DITEMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxcommands.h b/include/svx/svxcommands.h
index 61cbd2ca8f26..129c0fbb2275 100644
--- a/include/svx/svxcommands.h
+++ b/include/svx/svxcommands.h
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef SVX_SVXCOMMANDS_HRC
-#define SVX_SVXCOMMANDS_HRC
+#ifndef INCLUDED_SVX_SVXCOMMANDS_H
+#define INCLUDED_SVX_SVXCOMMANDS_H
 
 #define CMD_SID_INET_DLG                            ".uno:InternetDialog"
 #define CMD_SID_OBJECT_ALIGN_CENTER                 ".uno:AlignCenter"
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 8b1a8f97aa4c..f1cd32346a17 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_DIALOG_HXX
-#define _SVX_DIALOG_HXX
+#ifndef INCLUDED_SVX_SVXDLG_HXX
+#define INCLUDED_SVX_SVXDLG_HXX
 
 #include <sfx2/sfxdlg.hxx>
 #include <editeng/edtdlg.hxx>
diff --git a/include/svx/svxdllapi.h b/include/svx/svxdllapi.h
index 0d6bf0a8fecb..2e802eddd899 100644
--- a/include/svx/svxdllapi.h
+++ b/include/svx/svxdllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVXDLLAPI_H
-#define INCLUDED_SVXDLLAPI_H
+#ifndef INCLUDED_SVX_SVXDLLAPI_H
+#define INCLUDED_SVX_SVXDLLAPI_H
 
 #include "sal/types.h"
 
@@ -29,6 +29,6 @@
 #endif
 #define SVX_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_SVXDLLAPI_H */
+#endif // INCLUDED_SVX_SVXDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/svxerr.hxx b/include/svx/svxerr.hxx
index 939bfecb71d4..80ec7a619077 100644
--- a/include/svx/svxerr.hxx
+++ b/include/svx/svxerr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVXERR_HXX
-#define _SVXERR_HXX
+#ifndef INCLUDED_SVX_SVXERR_HXX
+#define INCLUDED_SVX_SVXERR_HXX
 
 #include <tools/errcode.hxx>
 
diff --git a/include/svx/svxgrahicitem.hxx b/include/svx/svxgrahicitem.hxx
index d18c8f3b6af2..75391889b75d 100644
--- a/include/svx/svxgrahicitem.hxx
+++ b/include/svx/svxgrahicitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_GRAPHICITEM_HXX
-#define _SVX_GRAPHICITEM_HXX
+#ifndef INCLUDED_SVX_SVXGRAHICITEM_HXX
+#define INCLUDED_SVX_SVXGRAHICITEM_HXX
 
 
 #include <svl/poolitem.hxx>
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index 1414673f57a2..03477fe937d5 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVXSWFRAMEEXAMPLE_HXX
-#define _SVXSWFRAMEEXAMPLE_HXX
+#ifndef INCLUDED_SVX_SWFRAMEEXAMPLE_HXX
+#define INCLUDED_SVX_SWFRAMEEXAMPLE_HXX
 
 #include <vcl/window.hxx>
 #include <tools/color.hxx>
@@ -91,6 +91,6 @@ public:
 };
 
 
-#endif // _SVXSWFRAMEEXAMPLE_HXX
+#endif // INCLUDED_SVX_SWFRAMEEXAMPLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx
index 84ef1d244fba..22ac89e1231f 100644
--- a/include/svx/swframeposstrings.hxx
+++ b/include/svx/swframeposstrings.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVXSWFRAMEPOSSTRINGS_HXX
-#define _SVXSWFRAMEPOSSTRINGS_HXX
+#ifndef INCLUDED_SVX_SWFRAMEPOSSTRINGS_HXX
+#define INCLUDED_SVX_SWFRAMEPOSSTRINGS_HXX
 
 #include <rtl/ustring.hxx>
 #include <svx/svxdllapi.h>
diff --git a/include/svx/swframevalidation.hxx b/include/svx/swframevalidation.hxx
index 4296f8609ade..ee505292ea77 100644
--- a/include/svx/swframevalidation.hxx
+++ b/include/svx/swframevalidation.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVXSWFRAMEVALIDATION_HXX
-#define _SVXSWFRAMEVALIDATION_HXX
+#ifndef INCLUDED_SVX_SWFRAMEVALIDATION_HXX
+#define INCLUDED_SVX_SWFRAMEVALIDATION_HXX
 #include <sal/types.h>
 #include <tools/gen.hxx>
 #include <limits.h>
diff --git a/include/svx/sxallitm.hxx b/include/svx/sxallitm.hxx
index 7d6c66a870cd..730576529e04 100644
--- a/include/svx/sxallitm.hxx
+++ b/include/svx/sxallitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXALLITM_HXX
-#define _SXALLITM_HXX
+#ifndef INCLUDED_SVX_SXALLITM_HXX
+#define INCLUDED_SVX_SXALLITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx
index 66856eb33fb0..c1eacf718f5a 100644
--- a/include/svx/sxcaitm.hxx
+++ b/include/svx/sxcaitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXCAITM_HXX
-#define _SXCAITM_HXX
+#ifndef INCLUDED_SVX_SXCAITM_HXX
+#define INCLUDED_SVX_SXCAITM_HXX
 
 #include <svx/svddef.hxx>
 
diff --git a/include/svx/sxcecitm.hxx b/include/svx/sxcecitm.hxx
index eabbaeed1d9b..02b9fbf4dab7 100644
--- a/include/svx/sxcecitm.hxx
+++ b/include/svx/sxcecitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXCECITM_HXX
-#define _SXCECITM_HXX
+#ifndef INCLUDED_SVX_SXCECITM_HXX
+#define INCLUDED_SVX_SXCECITM_HXX
 
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sxcgitm.hxx b/include/svx/sxcgitm.hxx
index 51e8ea880da0..57c36be7c615 100644
--- a/include/svx/sxcgitm.hxx
+++ b/include/svx/sxcgitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXCGITM_HXX
-#define _SXCGITM_HXX
+#ifndef INCLUDED_SVX_SXCGITM_HXX
+#define INCLUDED_SVX_SXCGITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/sxciaitm.hxx b/include/svx/sxciaitm.hxx
index 16bb59d1c2eb..cb611d0ef35b 100644
--- a/include/svx/sxciaitm.hxx
+++ b/include/svx/sxciaitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXCIAITM_HXX
-#define _SXCIAITM_HXX
+#ifndef INCLUDED_SVX_SXCIAITM_HXX
+#define INCLUDED_SVX_SXCIAITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdangitm.hxx>
diff --git a/include/svx/sxcikitm.hxx b/include/svx/sxcikitm.hxx
index 436370e588b1..0643e298acbc 100644
--- a/include/svx/sxcikitm.hxx
+++ b/include/svx/sxcikitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXCIKITM_HXX
-#define _SXCIKITM_HXX
+#ifndef INCLUDED_SVX_SXCIKITM_HXX
+#define INCLUDED_SVX_SXCIKITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svl/eitem.hxx>
diff --git a/include/svx/sxcllitm.hxx b/include/svx/sxcllitm.hxx
index 04b9a5d75c03..9b674a4ef01a 100644
--- a/include/svx/sxcllitm.hxx
+++ b/include/svx/sxcllitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXCLLITM_HXX
-#define _SXCLLITM_HXX
+#ifndef INCLUDED_SVX_SXCLLITM_HXX
+#define INCLUDED_SVX_SXCLLITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdynitm.hxx>
diff --git a/include/svx/sxctitm.hxx b/include/svx/sxctitm.hxx
index ba8d01190b47..11b9b7780239 100644
--- a/include/svx/sxctitm.hxx
+++ b/include/svx/sxctitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXCTITM_HXX
-#define _SXCTITM_HXX
+#ifndef INCLUDED_SVX_SXCTITM_HXX
+#define INCLUDED_SVX_SXCTITM_HXX
 
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sxekitm.hxx b/include/svx/sxekitm.hxx
index 73bb20959fd9..9662224d22e6 100644
--- a/include/svx/sxekitm.hxx
+++ b/include/svx/sxekitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXEKITM_HXX
-#define _SXEKITM_HXX
+#ifndef INCLUDED_SVX_SXEKITM_HXX
+#define INCLUDED_SVX_SXEKITM_HXX
 
 #include <svl/eitem.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx
index 6a97f4f4df42..757f8a0bfebf 100644
--- a/include/svx/sxelditm.hxx
+++ b/include/svx/sxelditm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXELDITM_HXX
-#define _SXELDITM_HXX
+#ifndef INCLUDED_SVX_SXELDITM_HXX
+#define INCLUDED_SVX_SXELDITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/sxenditm.hxx b/include/svx/sxenditm.hxx
index cd9d09b89632..fec9503d7ed5 100644
--- a/include/svx/sxenditm.hxx
+++ b/include/svx/sxenditm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXENDITM_HXX
-#define _SXENDITM_HXX
+#ifndef INCLUDED_SVX_SXENDITM_HXX
+#define INCLUDED_SVX_SXENDITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/sxfiitm.hxx b/include/svx/sxfiitm.hxx
index 688f54bb65d5..5c83c01771a2 100644
--- a/include/svx/sxfiitm.hxx
+++ b/include/svx/sxfiitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SFXIITM_HXX
-#define _SFXIITM_HXX
+#ifndef INCLUDED_SVX_SXFIITM_HXX
+#define INCLUDED_SVX_SXFIITM_HXX
 
 #include <svl/poolitem.hxx>
 #include <tools/fract.hxx>
diff --git a/include/svx/sxlayitm.hxx b/include/svx/sxlayitm.hxx
index 9761ba6c736a..40a88891b495 100644
--- a/include/svx/sxlayitm.hxx
+++ b/include/svx/sxlayitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SYLAYITM_HXX
-#define _SYLAYITM_HXX
+#ifndef INCLUDED_SVX_SXLAYITM_HXX
+#define INCLUDED_SVX_SXLAYITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svl/stritem.hxx>
diff --git a/include/svx/sxlogitm.hxx b/include/svx/sxlogitm.hxx
index c295522fe8de..aeb65a257d00 100644
--- a/include/svx/sxlogitm.hxx
+++ b/include/svx/sxlogitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXLOGITM_HXX
-#define _SXLOGITM_HXX
+#ifndef INCLUDED_SVX_SXLOGITM_HXX
+#define INCLUDED_SVX_SXLOGITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/sxmbritm.hxx b/include/svx/sxmbritm.hxx
index fd32430c58c6..9ea61b2c3fd7 100644
--- a/include/svx/sxmbritm.hxx
+++ b/include/svx/sxmbritm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMBRITM_HXX
-#define _SXMBRITM_HXX
+#ifndef INCLUDED_SVX_SXMBRITM_HXX
+#define INCLUDED_SVX_SXMBRITM_HXX
 
 #include <svx/svddef.hxx>
 
diff --git a/include/svx/sxmfsitm.hxx b/include/svx/sxmfsitm.hxx
index d3c202fd744f..e192ebeb0a38 100644
--- a/include/svx/sxmfsitm.hxx
+++ b/include/svx/sxmfsitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMFSITM_HXX
-#define _SXMFSITM_HXX
+#ifndef INCLUDED_SVX_SXMFSITM_HXX
+#define INCLUDED_SVX_SXMFSITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svl/stritem.hxx>
diff --git a/include/svx/sxmkitm.hxx b/include/svx/sxmkitm.hxx
index 56fe21d7478a..607ba62cb834 100644
--- a/include/svx/sxmkitm.hxx
+++ b/include/svx/sxmkitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMKITM_HXX
-#define _SXMKITM_HXX
+#ifndef INCLUDED_SVX_SXMKITM_HXX
+#define INCLUDED_SVX_SXMKITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svl/eitem.hxx>
diff --git a/include/svx/sxmlhitm.hxx b/include/svx/sxmlhitm.hxx
index 29e46cd616c3..9d5168ec796c 100644
--- a/include/svx/sxmlhitm.hxx
+++ b/include/svx/sxmlhitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMLHITM_HXX
-#define _SXMLHITM_HXX
+#ifndef INCLUDED_SVX_SXMLHITM_HXX
+#define INCLUDED_SVX_SXMLHITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/sxmoitm.hxx b/include/svx/sxmoitm.hxx
index 7d3aa9453c9e..50538bbe412d 100644
--- a/include/svx/sxmoitm.hxx
+++ b/include/svx/sxmoitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMOITM_HXX
-#define _SXMOITM_HXX
+#ifndef INCLUDED_SVX_SXMOITM_HXX
+#define INCLUDED_SVX_SXMOITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/sxmovitm.hxx b/include/svx/sxmovitm.hxx
index 97fa1e1f71d4..7c377fc2fb44 100644
--- a/include/svx/sxmovitm.hxx
+++ b/include/svx/sxmovitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMOVITM_HXX
-#define _SXMOVITM_HXX
+#ifndef INCLUDED_SVX_SXMOVITM_HXX
+#define INCLUDED_SVX_SXMOVITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/sxmsitm.hxx b/include/svx/sxmsitm.hxx
index d353383577b6..789b8f952638 100644
--- a/include/svx/sxmsitm.hxx
+++ b/include/svx/sxmsitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMSITM_HXX
-#define _SXMSITM_HXX
+#ifndef INCLUDED_SVX_SXMSITM_HXX
+#define INCLUDED_SVX_SXMSITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sxsiitm.hxx>
diff --git a/include/svx/sxmspitm.hxx b/include/svx/sxmspitm.hxx
index 9f4116567b05..03d09bd402c0 100644
--- a/include/svx/sxmspitm.hxx
+++ b/include/svx/sxmspitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMSPITM_HXX
-#define _SXMSPITM_HXX
+#ifndef INCLUDED_SVX_SXMSPITM_HXX
+#define INCLUDED_SVX_SXMSPITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdynitm.hxx>
diff --git a/include/svx/sxmsuitm.hxx b/include/svx/sxmsuitm.hxx
index 97bbff691419..c16a51f77e7b 100644
--- a/include/svx/sxmsuitm.hxx
+++ b/include/svx/sxmsuitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMSUITM_HXX
-#define _SXMSUITM_HXX
+#ifndef INCLUDED_SVX_SXMSUITM_HXX
+#define INCLUDED_SVX_SXMSUITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdynitm.hxx>
diff --git a/include/svx/sxmtaitm.hxx b/include/svx/sxmtaitm.hxx
index 583c0b18c7a6..a3365b96f29c 100644
--- a/include/svx/sxmtaitm.hxx
+++ b/include/svx/sxmtaitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMTAITM_HXX
-#define _SXMTAITM_HXX
+#ifndef INCLUDED_SVX_SXMTAITM_HXX
+#define INCLUDED_SVX_SXMTAITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdynitm.hxx>
diff --git a/include/svx/sxmtfitm.hxx b/include/svx/sxmtfitm.hxx
index 4be65b5d72ae..002491310d8e 100644
--- a/include/svx/sxmtfitm.hxx
+++ b/include/svx/sxmtfitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMTFITM_HXX
-#define _SXMTFITM_HXX
+#ifndef INCLUDED_SVX_SXMTFITM_HXX
+#define INCLUDED_SVX_SXMTFITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdynitm.hxx>
diff --git a/include/svx/sxmtpitm.hxx b/include/svx/sxmtpitm.hxx
index bc4966228c8c..2bc0052e5331 100644
--- a/include/svx/sxmtpitm.hxx
+++ b/include/svx/sxmtpitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMTPITM_HXX
-#define _SXMTPITM_HXX
+#ifndef INCLUDED_SVX_SXMTPITM_HXX
+#define INCLUDED_SVX_SXMTPITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svl/eitem.hxx>
diff --git a/include/svx/sxmtritm.hxx b/include/svx/sxmtritm.hxx
index 3ad063eba082..a33135687622 100644
--- a/include/svx/sxmtritm.hxx
+++ b/include/svx/sxmtritm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMTRITM_HXX
-#define _SXMTRITM_HXX
+#ifndef INCLUDED_SVX_SXMTRITM_HXX
+#define INCLUDED_SVX_SXMTRITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdynitm.hxx>
diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx
index 24a07a252e7f..158019d935e6 100644
--- a/include/svx/sxmuitm.hxx
+++ b/include/svx/sxmuitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXMUITM_HXX
-#define _SXMUITM_HXX
+#ifndef INCLUDED_SVX_SXMUITM_HXX
+#define INCLUDED_SVX_SXMUITM_HXX
 
 #include <vcl/field.hxx>
 #include <svx/svddef.hxx>
diff --git a/include/svx/sxoneitm.hxx b/include/svx/sxoneitm.hxx
index cf85d629f508..08d183bc39ac 100644
--- a/include/svx/sxoneitm.hxx
+++ b/include/svx/sxoneitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXONEITM_HXX
-#define _SXONEITM_HXX
+#ifndef INCLUDED_SVX_SXONEITM_HXX
+#define INCLUDED_SVX_SXONEITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/sxonitm.hxx b/include/svx/sxonitm.hxx
index fd0da93b5a66..c709deaff94e 100644
--- a/include/svx/sxonitm.hxx
+++ b/include/svx/sxonitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXONITM_HXX
-#define _SXONITM_HXX
+#ifndef INCLUDED_SVX_SXONITM_HXX
+#define INCLUDED_SVX_SXONITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svl/stritem.hxx>
diff --git a/include/svx/sxopitm.hxx b/include/svx/sxopitm.hxx
index 4b2a3c02b7af..b12ab64670a6 100644
--- a/include/svx/sxopitm.hxx
+++ b/include/svx/sxopitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXOPITM_HXX
-#define _SXOPITM_HXX
+#ifndef INCLUDED_SVX_SXOPITM_HXX
+#define INCLUDED_SVX_SXOPITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdynitm.hxx>
diff --git a/include/svx/sxraitm.hxx b/include/svx/sxraitm.hxx
index 0f2277d2a32c..57a14d61c0e6 100644
--- a/include/svx/sxraitm.hxx
+++ b/include/svx/sxraitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXRAITM_HXX
-#define _SXRAITM_HXX
+#ifndef INCLUDED_SVX_SXRAITM_HXX
+#define INCLUDED_SVX_SXRAITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdangitm.hxx>
diff --git a/include/svx/sxreaitm.hxx b/include/svx/sxreaitm.hxx
index 62ff9f979289..686dc98ea797 100644
--- a/include/svx/sxreaitm.hxx
+++ b/include/svx/sxreaitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXREAITM_HXX
-#define _SXREAITM_HXX
+#ifndef INCLUDED_SVX_SXREAITM_HXX
+#define INCLUDED_SVX_SXREAITM_HXX
 
 #include <svx/svddef.hxx>
 
diff --git a/include/svx/sxreoitm.hxx b/include/svx/sxreoitm.hxx
index 8b5ce5ea2748..3b507c7b1ff3 100644
--- a/include/svx/sxreoitm.hxx
+++ b/include/svx/sxreoitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXREOITM_HXX
-#define _SXREOITM_HXX
+#ifndef INCLUDED_SVX_SXREOITM_HXX
+#define INCLUDED_SVX_SXREOITM_HXX
 
 #include <svx/svddef.hxx>
 
diff --git a/include/svx/sxroaitm.hxx b/include/svx/sxroaitm.hxx
index 644e18a98cef..25258b623a51 100644
--- a/include/svx/sxroaitm.hxx
+++ b/include/svx/sxroaitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXROAITM_HXX
-#define _SXROAITM_HXX
+#ifndef INCLUDED_SVX_SXROAITM_HXX
+#define INCLUDED_SVX_SXROAITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdangitm.hxx>
diff --git a/include/svx/sxrooitm.hxx b/include/svx/sxrooitm.hxx
index f2c1ffd7de3e..91d594821cec 100644
--- a/include/svx/sxrooitm.hxx
+++ b/include/svx/sxrooitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXROOITM_HXX
-#define _SXROOITM_HXX
+#ifndef INCLUDED_SVX_SXROOITM_HXX
+#define INCLUDED_SVX_SXROOITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdangitm.hxx>
diff --git a/include/svx/sxsaitm.hxx b/include/svx/sxsaitm.hxx
index 621adfcabf19..b86ca3349a71 100644
--- a/include/svx/sxsaitm.hxx
+++ b/include/svx/sxsaitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXSAITM_HXX
-#define _SXSAITM_HXX
+#ifndef INCLUDED_SVX_SXSAITM_HXX
+#define INCLUDED_SVX_SXSAITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdangitm.hxx>
diff --git a/include/svx/sxsalitm.hxx b/include/svx/sxsalitm.hxx
index 2d70e2ba480f..9ced5fe85c98 100644
--- a/include/svx/sxsalitm.hxx
+++ b/include/svx/sxsalitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXSALITM_HXX
-#define _SXSALITM_HXX
+#ifndef INCLUDED_SVX_SXSALITM_HXX
+#define INCLUDED_SVX_SXSALITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdangitm.hxx>
diff --git a/include/svx/sxsiitm.hxx b/include/svx/sxsiitm.hxx
index e2a0052eff67..2906c8d46a7b 100644
--- a/include/svx/sxsiitm.hxx
+++ b/include/svx/sxsiitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXSIITM_HXX
-#define _SXSIITM_HXX
+#ifndef INCLUDED_SVX_SXSIITM_HXX
+#define INCLUDED_SVX_SXSIITM_HXX
 
 #include <svx/sxfiitm.hxx>
 
diff --git a/include/svx/sxsoitm.hxx b/include/svx/sxsoitm.hxx
index cf7b1ae84c57..17745902fa1a 100644
--- a/include/svx/sxsoitm.hxx
+++ b/include/svx/sxsoitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXSOITM_HXX
-#define _SXSOITM_HXX
+#ifndef INCLUDED_SVX_SXSOITM_HXX
+#define INCLUDED_SVX_SXSOITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdangitm.hxx>
diff --git a/include/svx/sxtraitm.hxx b/include/svx/sxtraitm.hxx
index fb60bc54f53e..d46faa1f6249 100644
--- a/include/svx/sxtraitm.hxx
+++ b/include/svx/sxtraitm.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SXTRAITM_HXX
-#define _SXTRAITM_HXX
+#ifndef INCLUDED_SVX_SXTRAITM_HXX
+#define INCLUDED_SVX_SXTRAITM_HXX
 
 #include <svx/svddef.hxx>
 #include <svx/sdmetitm.hxx>
diff --git a/include/svx/tabarea.hxx b/include/svx/tabarea.hxx
index aa49d2a5fe94..ccbfbb0cef19 100644
--- a/include/svx/tabarea.hxx
+++ b/include/svx/tabarea.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_TAB_AREA_HXX
-#define _SVX_TAB_AREA_HXX
+#ifndef INCLUDED_SVX_TABAREA_HXX
+#define INCLUDED_SVX_TABAREA_HXX
 
 // enum ------------------------------------------------------------------
 
@@ -47,6 +47,6 @@ typedef sal_uInt16 ChangeType; // auch in tab_line.hxx (mitpflegen !!!)
 #define CT_CHANGED              ( (ChangeType) 0x0002 )
 #define CT_SAVED                ( (ChangeType) 0x0004 )
 
-#endif // _SVX_TAB_AREA_HXX
+#endif // INCLUDED_SVX_TABAREA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/tabline.hxx b/include/svx/tabline.hxx
index aa415988e197..653ce1976385 100644
--- a/include/svx/tabline.hxx
+++ b/include/svx/tabline.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_TAB_LINE_HXX
-#define _SVX_TAB_LINE_HXX
+#ifndef INCLUDED_SVX_TABLINE_HXX
+#define INCLUDED_SVX_TABLINE_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/group.hxx>
@@ -48,6 +48,6 @@ class SdrObject;
 #define SVX_SYMBOLTYPE_BRUSHITEM  (-1)  //Symbol ist als Graphic im Item enthalten:
 #define SVX_SYMBOLTYPE_UNKNOWN  (-100) //unbekannt/nicht initialisiert
 
-#endif // _SVX_TAB_LINE_HXX
+#endif // INCLUDED_SVX_TABLINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index fee072642bab..be9fa564fdf4 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_TBCONTRL_HXX
-#define _SVX_TBCONTRL_HXX
+#ifndef INCLUDED_SVX_TBCONTRL_HXX
+#define INCLUDED_SVX_TBCONTRL_HXX
 
 /*--------------------------------------------------------------*\
 
@@ -384,6 +384,6 @@ public:
                                               const SfxPoolItem* pState );
 };
 
-#endif // #ifndef _SVX_TBCONTRL_HXX
+#endif // INCLUDED_SVX_TBCONTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/tbxalign.hxx b/include/svx/tbxalign.hxx
index e41a07813404..6f0b12ea965f 100644
--- a/include/svx/tbxalign.hxx
+++ b/include/svx/tbxalign.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TBXALIGN_HXX
-#define _TBXALIGN_HXX
+#ifndef INCLUDED_SVX_TBXALIGN_HXX
+#define INCLUDED_SVX_TBXALIGN_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/tbxcolor.hxx b/include/svx/tbxcolor.hxx
index e0a1d27f1aec..1e26d8b22949 100644
--- a/include/svx/tbxcolor.hxx
+++ b/include/svx/tbxcolor.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_TBXCOLOR_HXX
-#define _SVX_TBXCOLOR_HXX
+#ifndef INCLUDED_SVX_TBXCOLOR_HXX
+#define INCLUDED_SVX_TBXCOLOR_HXX
 
 #include <com/sun/star/frame/XLayoutManager.hpp>
 #include "svx/svxdllapi.h"
@@ -59,6 +59,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // #ifndef _SVX_TBXCOLOR_HXX
+#endif // INCLUDED_SVX_TBXCOLOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/tbxcolorupdate.hxx b/include/svx/tbxcolorupdate.hxx
index 3c9c100bbc2b..8f73740a688a 100644
--- a/include/svx/tbxcolorupdate.hxx
+++ b/include/svx/tbxcolorupdate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_TBXCOLORUPDATE_HXX
-#define SVX_TBXCOLORUPDATE_HXX
+#ifndef INCLUDED_SVX_TBXCOLORUPDATE_HXX
+#define INCLUDED_SVX_TBXCOLORUPDATE_HXX
 
 #include <svx/svxdllapi.h>
 
@@ -64,6 +64,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SVX_TBXCOLORUPDATE_HXX
+#endif // INCLUDED_SVX_TBXCOLORUPDATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index 07cf3a57c5ae..fc2b19902190 100644
--- a/include/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TBXCTL_HXX
-#define _TBXCTL_HXX
+#ifndef INCLUDED_SVX_TBXCTL_HXX
+#define INCLUDED_SVX_TBXCTL_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx
index 66fde8a2cb79..de5035688e9f 100644
--- a/include/svx/tbxcustomshapes.hxx
+++ b/include/svx/tbxcustomshapes.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_TBXCUSTOMSHAPES_HXX
-#define _SVX_TBXCUSTOMSHAPES_HXX
+#ifndef INCLUDED_SVX_TBXCUSTOMSHAPES_HXX
+#define INCLUDED_SVX_TBXCUSTOMSHAPES_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/tbxdraw.hxx b/include/svx/tbxdraw.hxx
index f905cc657406..c38ee71abcb4 100644
--- a/include/svx/tbxdraw.hxx
+++ b/include/svx/tbxdraw.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _TBXDRAW_HXX
-#define _TBXDRAW_HXX
+#ifndef INCLUDED_SVX_TBXDRAW_HXX
+#define INCLUDED_SVX_TBXDRAW_HXX
 
 #include <sfx2/tbxctrl.hxx>
 
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index e0c0e392322b..b45a31d2b0df 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_TXENCBOX_HXX
-#define _SVX_TXENCBOX_HXX
+#ifndef INCLUDED_SVX_TXENCBOX_HXX
+#define INCLUDED_SVX_TXENCBOX_HXX
 
 #include <vcl/lstbox.hxx>
 #include <rtl/textenc.h>
diff --git a/include/svx/txenctab.hxx b/include/svx/txenctab.hxx
index f69f7f4640fb..6b5e88805089 100644
--- a/include/svx/txenctab.hxx
+++ b/include/svx/txenctab.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_TXENCTAB_HXX
-#define _SVX_TXENCTAB_HXX
+#ifndef INCLUDED_SVX_TXENCTAB_HXX
+#define INCLUDED_SVX_TXENCTAB_HXX
 
 #include <rtl/textenc.h>
 #include <rtl/ustring.hxx>
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index e4adc1fef2c8..dd65b1cac9ed 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_SUBSETMAP_HXX
-#define _SVX_SUBSETMAP_HXX
+#ifndef INCLUDED_SVX_UCSUBSET_HXX
+#define INCLUDED_SVX_UCSUBSET_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index 3b404d4e7422..cc581a691044 100644
--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOAPI_HXX_
-#define _SVX_UNOAPI_HXX_
+#ifndef INCLUDED_SVX_UNOAPI_HXX
+#define INCLUDED_SVX_UNOAPI_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/drawing/XShape.hpp>
@@ -89,6 +89,6 @@ SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
 SVX_DLLPUBLIC SAL_WARN_UNUSED_RESULT OUString
     SvxUnogetInternalNameForItem(const sal_Int16 nWhich, const OUString& rApiName) throw();
 
-#endif // _SVX_UNOAPI_HXX_
+#endif // INCLUDED_SVX_UNOAPI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/unofill.hxx b/include/svx/unofill.hxx
index 523905a1d97a..12b7a1ff092d 100644
--- a/include/svx/unofill.hxx
+++ b/include/svx/unofill.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOFILL_HXX_
-#define _SVX_UNOFILL_HXX_
+#ifndef INCLUDED_SVX_UNOFILL_HXX
+#define INCLUDED_SVX_UNOFILL_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include "svx/svxdllapi.h"
@@ -32,6 +32,6 @@ SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterfac
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxUnoMarkerTable_createInstance( SdrModel* pModel );
 SVX_DLLPUBLIC ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxUnoDashTable_createInstance( SdrModel* pModel );
 
-#endif // _SVX_UNOFILL_HXX_
+#endif // INCLUDED_SVX_UNOFILL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/unomaster.hxx b/include/svx/unomaster.hxx
index c0f32d0f1346..72cc9edbfa33 100644
--- a/include/svx/unomaster.hxx
+++ b/include/svx/unomaster.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOMASTER_HXX
-#define _SVX_UNOMASTER_HXX
+#ifndef INCLUDED_SVX_UNOMASTER_HXX
+#define INCLUDED_SVX_UNOMASTER_HXX
 
 #include <com/sun/star/uno/Type.h>
 #include <com/sun/star/uno/Any.h>
diff --git a/include/svx/unomid.hxx b/include/svx/unomid.hxx
index cf4c4f4e02c1..5fc2831c1822 100644
--- a/include/svx/unomid.hxx
+++ b/include/svx/unomid.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_UNOMID_HXX
-#define _SVX_UNOMID_HXX
+#ifndef INCLUDED_SVX_UNOMID_HXX
+#define INCLUDED_SVX_UNOMID_HXX
 
 //AdjustItem
 #define MID_PARA_ADJUST         0
diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx
index fe648ea4419f..7ae0409344f1 100644
--- a/include/svx/unomod.hxx
+++ b/include/svx/unomod.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_UNOMOD_HXX
-#define SVX_UNOMOD_HXX
+#ifndef INCLUDED_SVX_UNOMOD_HXX
+#define INCLUDED_SVX_UNOMOD_HXX
 
 #include <com/sun/star/document/EventObject.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx
index fcf203fa47e8..9a960720febb 100644
--- a/include/svx/unomodel.hxx
+++ b/include/svx/unomodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_UNOMODEL_HXX
-#define SVX_UNOMODEL_HXX
+#ifndef INCLUDED_SVX_UNOMODEL_HXX
+#define INCLUDED_SVX_UNOMODEL_HXX
 
 #include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 40684a4e4ecb..b2cf8e83c35f 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_UNOWPAGE_HXX
-#define _SVX_UNOWPAGE_HXX
+#ifndef INCLUDED_SVX_UNOPAGE_HXX
+#define INCLUDED_SVX_UNOPAGE_HXX
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx
index 7db02b2a85dd..4c4ae856c0b6 100644
--- a/include/svx/unopool.hxx
+++ b/include/svx/unopool.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOPOOL_HXX_
-#define _SVX_UNOPOOL_HXX_
+#ifndef INCLUDED_SVX_UNOPOOL_HXX
+#define INCLUDED_SVX_UNOPOOL_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/propertysethelper.hxx>
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index 36745933cc51..40fd47ebe1b3 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_UNOPROV_HXX
-#define SVX_UNOPROV_HXX
+#ifndef INCLUDED_SVX_UNOPROV_HXX
+#define INCLUDED_SVX_UNOPROV_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 23cbf8811a3a..e3d1fd60ae95 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOSHAPE_HXX
-#define _SVX_UNOSHAPE_HXX
+#ifndef INCLUDED_SVX_UNOSHAPE_HXX
+#define INCLUDED_SVX_UNOSHAPE_HXX
 
 #include <com/sun/star/document/XActionLockable.hpp>
 #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
diff --git a/include/svx/unoshcol.hxx b/include/svx/unoshcol.hxx
index 7db908c88a92..96a2530c9384 100644
--- a/include/svx/unoshcol.hxx
+++ b/include/svx/unoshcol.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_UNOSHGRP_HXX
-#define _SVX_UNOSHGRP_HXX
+#ifndef INCLUDED_SVX_UNOSHCOL_HXX
+#define INCLUDED_SVX_UNOSHCOL_HXX
 
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/drawing/XShapes.hpp>
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 3c35b391481a..7a44c7479a59 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOSHPRP_HXX
-#define _SVX_UNOSHPRP_HXX
+#ifndef INCLUDED_SVX_UNOSHPRP_HXX
+#define INCLUDED_SVX_UNOSHPRP_HXX
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
diff --git a/include/svx/unoshtxt.hxx b/include/svx/unoshtxt.hxx
index cefc7012a0fd..7fdb2278986a 100644
--- a/include/svx/unoshtxt.hxx
+++ b/include/svx/unoshtxt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_UNOSHTXT_HXX
-#define SVX_UNOSHTXT_HXX
+#ifndef INCLUDED_SVX_UNOSHTXT_HXX
+#define INCLUDED_SVX_UNOSHTXT_HXX
 
 #include <memory>
 #include <editeng/unoedsrc.hxx>
diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx
index f705be2ff882..1dbea53aa061 100644
--- a/include/svx/verttexttbxctrl.hxx
+++ b/include/svx/verttexttbxctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_VERT_TEXT_TBXCTRL_HXX
-#define _SVX_VERT_TEXT_TBXCTRL_HXX
+#ifndef INCLUDED_SVX_VERTTEXTTBXCTRL_HXX
+#define INCLUDED_SVX_VERTTEXTTBXCTRL_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 70da2bc7b515..a489eb28dfb5 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_VIEW3D_HXX
-#define _E3D_VIEW3D_HXX
+#ifndef INCLUDED_SVX_VIEW3D_HXX
+#define INCLUDED_SVX_VIEW3D_HXX
 
 #include <svx/svdview.hxx>
 #include <svx/def3d.hxx>
@@ -256,6 +256,6 @@ public:
     void Set3DAttributes(const SfxItemSet& rAttr, E3dScene* pInScene = NULL, sal_Bool bOnly3DAttr=sal_False);
 };
 
-#endif // _E3D_VIEW3D_HXX
+#endif // INCLUDED_SVX_VIEW3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx
index c7509ea7c1d1..1050f1e92dcc 100644
--- a/include/svx/viewlayoutitem.hxx
+++ b/include/svx/viewlayoutitem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_VIEWLAYOUTITEM_HXX
-#define _SVX_VIEWLAYOUTITEM_HXX
+#ifndef INCLUDED_SVX_VIEWLAYOUTITEM_HXX
+#define INCLUDED_SVX_VIEWLAYOUTITEM_HXX
 
 #include <svl/intitem.hxx>
 #include <svx/svxids.hrc>
diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx
index 6b00ae2fa186..5c774c3a77b5 100644
--- a/include/svx/viewpt3d.hxx
+++ b/include/svx/viewpt3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _VIEWPT3D_HXX
-#define _VIEWPT3D_HXX
+#ifndef INCLUDED_SVX_VIEWPT3D_HXX
+#define INCLUDED_SVX_VIEWPT3D_HXX
 
 #include "svx/svxdllapi.h"
 #include <basegfx/matrix/b3dhommatrix.hxx>
@@ -111,6 +111,6 @@ class SVX_DLLPUBLIC Viewport3D
     const basegfx::B3DPoint&    GetViewPoint();
 };
 
-#endif      // _VIEWPT3D_HXX
+#endif // INCLUDED_SVX_VIEWPT3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/wrapfield.hxx b/include/svx/wrapfield.hxx
index c8fa94ece3ce..ae4b0a5976c3 100644
--- a/include/svx/wrapfield.hxx
+++ b/include/svx/wrapfield.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_WRAPFIELD_HXX
-#define SVX_WRAPFIELD_HXX
+#ifndef INCLUDED_SVX_WRAPFIELD_HXX
+#define INCLUDED_SVX_WRAPFIELD_HXX
 
 #include <vcl/field.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xattr.hxx b/include/svx/xattr.hxx
index d3d1a1b6e057..f8c7d6d34719 100644
--- a/include/svx/xattr.hxx
+++ b/include/svx/xattr.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XATTR_HXX
-#define _XATTR_HXX
+#ifndef INCLUDED_SVX_XATTR_HXX
+#define INCLUDED_SVX_XATTR_HXX
 
 #include <svx/xit.hxx>
 #include <svx/xcolit.hxx>
@@ -33,6 +33,6 @@
 #include <svx/xlinjoit.hxx>
 #include <svx/xlncapit.hxx>
 
-#endif      // _XATTR_HXX
+#endif // INCLUDED_SVX_XATTR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xbitmap.hxx b/include/svx/xbitmap.hxx
index 959ceafdbd72..0f3002220ae0 100644
--- a/include/svx/xbitmap.hxx
+++ b/include/svx/xbitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XBITMAP_HXX
-#define _SVX_XBITMAP_HXX
+#ifndef INCLUDED_SVX_XBITMAP_HXX
+#define INCLUDED_SVX_XBITMAP_HXX
 
 #include <tools/color.hxx>
 #include <vcl/bitmap.hxx>
diff --git a/include/svx/xbtmpit.hxx b/include/svx/xbtmpit.hxx
index 7422714decdf..700fc4414348 100644
--- a/include/svx/xbtmpit.hxx
+++ b/include/svx/xbtmpit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XBTMPIT_HXX
-#define _SVX_XBTMPIT_HXX
+#ifndef INCLUDED_SVX_XBTMPIT_HXX
+#define INCLUDED_SVX_XBTMPIT_HXX
 
 #include <svx/svxdllapi.h>
 #include <svx/xit.hxx>
diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx
index 451432c386ac..a569a24cca62 100644
--- a/include/svx/xcolit.hxx
+++ b/include/svx/xcolit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XCOLORITEM_HXX
-#define _SVX_XCOLORITEM_HXX
+#ifndef INCLUDED_SVX_XCOLIT_HXX
+#define INCLUDED_SVX_XCOLIT_HXX
 
 #include <tools/color.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xdash.hxx b/include/svx/xdash.hxx
index a55d3b83fa67..8117607c52b5 100644
--- a/include/svx/xdash.hxx
+++ b/include/svx/xdash.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XDASH_HXX
-#define _SVX_XDASH_HXX
+#ifndef INCLUDED_SVX_XDASH_HXX
+#define INCLUDED_SVX_XDASH_HXX
 
 //-------------
 // class XDash
diff --git a/include/svx/xdef.hxx b/include/svx/xdef.hxx
index 3ec26ea15758..7fd5dbab0096 100644
--- a/include/svx/xdef.hxx
+++ b/include/svx/xdef.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XDEF_HXX
-#define _XDEF_HXX
+#ifndef INCLUDED_SVX_XDEF_HXX
+#define INCLUDED_SVX_XDEF_HXX
 
 
 /*************************************************************************
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index ba4bc41f12ec..c405c4b14927 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XENUM_HXX
-#define _XENUM_HXX
+#ifndef INCLUDED_SVX_XENUM_HXX
+#define INCLUDED_SVX_XENUM_HXX
 
 enum XLineStyle         { XLINE_NONE, XLINE_SOLID, XLINE_DASH };
 enum XDashStyle         { XDASH_RECT, XDASH_ROUND, XDASH_RECTRELATIVE,
@@ -35,6 +35,6 @@ enum XFormTextShadow    { XFTSHADOW_NONE, XFTSHADOW_NORMAL, XFTSHADOW_SLANT};
 enum XBitmapType        { XBITMAP_IMPORT, XBITMAP_8X8 };
 
 
-#endif      // _XENUM_HXX
+#endif // INCLUDED_SVX_XENUM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xexch.hxx b/include/svx/xexch.hxx
index bd0034d972a2..520408a5fe15 100644
--- a/include/svx/xexch.hxx
+++ b/include/svx/xexch.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XEXCH_HXX
-#define _SVX_XEXCH_HXX
+#ifndef INCLUDED_SVX_XEXCH_HXX
+#define INCLUDED_SVX_XEXCH_HXX
 
 
 #include <tools/stream.hxx>
@@ -54,6 +54,6 @@ public:
     XFillAttrSetItem*   GetXFillAttrSetItem() { return pXFillAttrSetItem; }
 };
 
-#endif                  // _SVX_XEXCH_HXX
+#endif // INCLUDED_SVX_XEXCH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xfillit.hxx b/include/svx/xfillit.hxx
index b0270a9d3aa9..bd4fa2d703de 100644
--- a/include/svx/xfillit.hxx
+++ b/include/svx/xfillit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FILLITEM_HXX
-#define _SVX_FILLITEM_HXX
+#ifndef INCLUDED_SVX_XFILLIT_HXX
+#define INCLUDED_SVX_XFILLIT_HXX
 
 #include <vcl/bitmap.hxx>
 #include <svx/xcolit.hxx>
diff --git a/include/svx/xfillit0.hxx b/include/svx/xfillit0.hxx
index 596d9c9ae8b4..1c1bd7073aaa 100644
--- a/include/svx/xfillit0.hxx
+++ b/include/svx/xfillit0.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_XFILLIT0_HXX
-#define SVX_XFILLIT0_HXX
+#ifndef INCLUDED_SVX_XFILLIT0_HXX
+#define INCLUDED_SVX_XFILLIT0_HXX
 
 #include <svl/eitem.hxx>
 
diff --git a/include/svx/xflasit.hxx b/include/svx/xflasit.hxx
index 44c95e08eabf..06e697bcdce7 100644
--- a/include/svx/xflasit.hxx
+++ b/include/svx/xflasit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLASIT_HXX
-#define _SVX_XFLASIT_HXX
+#ifndef INCLUDED_SVX_XFLASIT_HXX
+#define INCLUDED_SVX_XFLASIT_HXX
 
 #include <svl/poolitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflbckit.hxx b/include/svx/xflbckit.hxx
index 85bd4dabad17..31fa9d4e9d2e 100644
--- a/include/svx/xflbckit.hxx
+++ b/include/svx/xflbckit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLBCKIT_HXX
-#define _SVX_XFLBCKIT_HXX
+#ifndef INCLUDED_SVX_XFLBCKIT_HXX
+#define INCLUDED_SVX_XFLBCKIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflbmpit.hxx b/include/svx/xflbmpit.hxx
index ffd7bb81d772..016bd64011bf 100644
--- a/include/svx/xflbmpit.hxx
+++ b/include/svx/xflbmpit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLBMPIT_HXX
-#define _SVX_XFLBMPIT_HXX
+#ifndef INCLUDED_SVX_XFLBMPIT_HXX
+#define INCLUDED_SVX_XFLBMPIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/rectenum.hxx"
diff --git a/include/svx/xflbmsli.hxx b/include/svx/xflbmsli.hxx
index 5ed01b015d99..fccc7dc5b952 100644
--- a/include/svx/xflbmsli.hxx
+++ b/include/svx/xflbmsli.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLBMSLI_HXX
-#define _SVX_XFLBMSLI_HXX
+#ifndef INCLUDED_SVX_XFLBMSLI_HXX
+#define INCLUDED_SVX_XFLBMSLI_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflbmsxy.hxx b/include/svx/xflbmsxy.hxx
index 0042e5ad57cd..f59f7a78f3ed 100644
--- a/include/svx/xflbmsxy.hxx
+++ b/include/svx/xflbmsxy.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLBMSXY_HXX
-#define _SVX_XFLBMSXY_HXX
+#ifndef INCLUDED_SVX_XFLBMSXY_HXX
+#define INCLUDED_SVX_XFLBMSXY_HXX
 
 #include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflbmtit.hxx b/include/svx/xflbmtit.hxx
index c5517d0c6759..8713861f8a68 100644
--- a/include/svx/xflbmtit.hxx
+++ b/include/svx/xflbmtit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLBMTIT_HXX
-#define _SVX_XFLBMTIT_HXX
+#ifndef INCLUDED_SVX_XFLBMTIT_HXX
+#define INCLUDED_SVX_XFLBMTIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflboxy.hxx b/include/svx/xflboxy.hxx
index 5304484d3892..f04a122bca73 100644
--- a/include/svx/xflboxy.hxx
+++ b/include/svx/xflboxy.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLBOXY_HXX
-#define _SVX_XFLBOXY_HXX
+#ifndef INCLUDED_SVX_XFLBOXY_HXX
+#define INCLUDED_SVX_XFLBOXY_HXX
 
 #include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflbstit.hxx b/include/svx/xflbstit.hxx
index ca14d6a341d8..f751e00ccd92 100644
--- a/include/svx/xflbstit.hxx
+++ b/include/svx/xflbstit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLBSTIT_HXX
-#define _SVX_XFLBSTIT_HXX
+#ifndef INCLUDED_SVX_XFLBSTIT_HXX
+#define INCLUDED_SVX_XFLBSTIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflbtoxy.hxx b/include/svx/xflbtoxy.hxx
index e02345abdd37..c670cf012be0 100644
--- a/include/svx/xflbtoxy.hxx
+++ b/include/svx/xflbtoxy.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLBTOXY_HXX
-#define _SVX_XFLBTOXY_HXX
+#ifndef INCLUDED_SVX_XFLBTOXY_HXX
+#define INCLUDED_SVX_XFLBTOXY_HXX
 
 #include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflclit.hxx b/include/svx/xflclit.hxx
index ebe3e6f718f3..b9e8aec7b350 100644
--- a/include/svx/xflclit.hxx
+++ b/include/svx/xflclit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLCLIT_HXX
-#define _SVX_XFLCLIT_HXX
+#ifndef INCLUDED_SVX_XFLCLIT_HXX
+#define INCLUDED_SVX_XFLCLIT_HXX
 
 #include <svx/xcolit.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflftrit.hxx b/include/svx/xflftrit.hxx
index 4f95d51ee788..b9bf6c67b47d 100644
--- a/include/svx/xflftrit.hxx
+++ b/include/svx/xflftrit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLFTRIT_HXX
-#define _SVX_XFLFTRIT_HXX
+#ifndef INCLUDED_SVX_XFLFTRIT_HXX
+#define INCLUDED_SVX_XFLFTRIT_HXX
 
 #include <svx/xflgrit.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xflgrit.hxx b/include/svx/xflgrit.hxx
index 1c2401f03dda..5417b07bfe91 100644
--- a/include/svx/xflgrit.hxx
+++ b/include/svx/xflgrit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLGRIT_HXX
-#define _SVX_XFLGRIT_HXX
+#ifndef INCLUDED_SVX_XFLGRIT_HXX
+#define INCLUDED_SVX_XFLGRIT_HXX
 
 #include <svx/xit.hxx>
 #include <svx/xgrad.hxx>
diff --git a/include/svx/xflhtit.hxx b/include/svx/xflhtit.hxx
index 6c104aac8907..78c2abdabebe 100644
--- a/include/svx/xflhtit.hxx
+++ b/include/svx/xflhtit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLHTIT_HXX
-#define _SVX_XFLHTIT_HXX
+#ifndef INCLUDED_SVX_XFLHTIT_HXX
+#define INCLUDED_SVX_XFLHTIT_HXX
 
 #include <svx/xit.hxx>
 #include <svx/xhatch.hxx>
diff --git a/include/svx/xfltrit.hxx b/include/svx/xfltrit.hxx
index 52f475c31845..8883c52cc6e7 100644
--- a/include/svx/xfltrit.hxx
+++ b/include/svx/xfltrit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFLTRIT_HXX
-#define _SVX_XFLTRIT_HXX
+#ifndef INCLUDED_SVX_XFLTRIT_HXX
+#define INCLUDED_SVX_XFLTRIT_HXX
 
 #include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xftadit.hxx b/include/svx/xftadit.hxx
index 0f52f64d3c05..4de5cae79034 100644
--- a/include/svx/xftadit.hxx
+++ b/include/svx/xftadit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFTADIT_HXX
-#define _SVX_XFTADIT_HXX
+#ifndef INCLUDED_SVX_XFTADIT_HXX
+#define INCLUDED_SVX_XFTADIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xftdiit.hxx b/include/svx/xftdiit.hxx
index 0260e29687f9..be59693a836b 100644
--- a/include/svx/xftdiit.hxx
+++ b/include/svx/xftdiit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFTDIIT_HXX
-#define _SVX_XFTDIIT_HXX
+#ifndef INCLUDED_SVX_XFTDIIT_HXX
+#define INCLUDED_SVX_XFTDIIT_HXX
 
 #include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xftmrit.hxx b/include/svx/xftmrit.hxx
index 815049e3bb7c..c3b24cf071a4 100644
--- a/include/svx/xftmrit.hxx
+++ b/include/svx/xftmrit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFTMRIT_HXX
-#define _SVX_XFTMRIT_HXX
+#ifndef INCLUDED_SVX_XFTMRIT_HXX
+#define INCLUDED_SVX_XFTMRIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xftouit.hxx b/include/svx/xftouit.hxx
index f010fbe93fcc..847d7f430e6b 100644
--- a/include/svx/xftouit.hxx
+++ b/include/svx/xftouit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFTOUIT_HXX
-#define _SVX_XFTOUIT_HXX
+#ifndef INCLUDED_SVX_XFTOUIT_HXX
+#define INCLUDED_SVX_XFTOUIT_HXX
 
 #include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xftshcit.hxx b/include/svx/xftshcit.hxx
index 4246c6e5c212..f844e560fa54 100644
--- a/include/svx/xftshcit.hxx
+++ b/include/svx/xftshcit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFTSHCLIT_HXX
-#define _SVX_XFTSHCLIT_HXX
+#ifndef INCLUDED_SVX_XFTSHCIT_HXX
+#define INCLUDED_SVX_XFTSHCIT_HXX
 
 #include <svx/xcolit.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xftshit.hxx b/include/svx/xftshit.hxx
index 360da47536d8..a94ecd54c381 100644
--- a/include/svx/xftshit.hxx
+++ b/include/svx/xftshit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFTSHIT_HXX
-#define _SVX_XFTSHIT_HXX
+#ifndef INCLUDED_SVX_XFTSHIT_HXX
+#define INCLUDED_SVX_XFTSHIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xftshtit.hxx b/include/svx/xftshtit.hxx
index e87e4a4f3cc5..ce29ab294aa7 100644
--- a/include/svx/xftshtit.hxx
+++ b/include/svx/xftshtit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFTSHTIT_HXX
-#define _SVX_XFTSHTIT_HXX
+#ifndef INCLUDED_SVX_XFTSHTIT_HXX
+#define INCLUDED_SVX_XFTSHTIT_HXX
 
 #include <svl/intitem.hxx>
 
diff --git a/include/svx/xftshxy.hxx b/include/svx/xftshxy.hxx
index eb6ffb6020cc..43ed4a0a2386 100644
--- a/include/svx/xftshxy.hxx
+++ b/include/svx/xftshxy.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFTSHXY_HXX
-#define _SVX_XFTSHXY_HXX
+#ifndef INCLUDED_SVX_XFTSHXY_HXX
+#define INCLUDED_SVX_XFTSHXY_HXX
 
 #include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xftstit.hxx b/include/svx/xftstit.hxx
index 2a53b26b41c1..68d00ef51f64 100644
--- a/include/svx/xftstit.hxx
+++ b/include/svx/xftstit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XFTSTIT_HXX
-#define _SVX_XFTSTIT_HXX
+#ifndef INCLUDED_SVX_XFTSTIT_HXX
+#define INCLUDED_SVX_XFTSTIT_HXX
 
 #include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xgrad.hxx b/include/svx/xgrad.hxx
index ba97db142e7d..9f031d306f0b 100644
--- a/include/svx/xgrad.hxx
+++ b/include/svx/xgrad.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX__XGRADIENT_HXX
-#define _SVX__XGRADIENT_HXX
+#ifndef INCLUDED_SVX_XGRAD_HXX
+#define INCLUDED_SVX_XGRAD_HXX
 
 #include <svx/xenum.hxx>
 #include <tools/color.hxx>
diff --git a/include/svx/xgrscit.hxx b/include/svx/xgrscit.hxx
index 491a7d41d502..b20432cf9d7d 100644
--- a/include/svx/xgrscit.hxx
+++ b/include/svx/xgrscit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XGRSCIT_HXX
-#define _SVX_XGRSCIT_HXX
+#ifndef INCLUDED_SVX_XGRSCIT_HXX
+#define INCLUDED_SVX_XGRSCIT_HXX
 
 #include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xhatch.hxx b/include/svx/xhatch.hxx
index 9db4a6a0364b..792ab31cf091 100644
--- a/include/svx/xhatch.hxx
+++ b/include/svx/xhatch.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XHATCH_HXX
-#define _SVX_XHATCH_HXX
+#ifndef INCLUDED_SVX_XHATCH_HXX
+#define INCLUDED_SVX_XHATCH_HXX
 
 #include <svx/xenum.hxx>
 #include <tools/color.hxx>
diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx
index 3c366a20e441..72194327c126 100644
--- a/include/svx/xit.hxx
+++ b/include/svx/xit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XIT_HXX
-#define _SVX_XIT_HXX
+#ifndef INCLUDED_SVX_XIT_HXX
+#define INCLUDED_SVX_XIT_HXX
 
 #include <svl/stritem.hxx>
 #include <svx/xtable.hxx>
diff --git a/include/svx/xlineit.hxx b/include/svx/xlineit.hxx
index f32193330b90..0f364c20a31a 100644
--- a/include/svx/xlineit.hxx
+++ b/include/svx/xlineit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLINIIT_HXX
-#define _SVX_XLINIIT_HXX
+#ifndef INCLUDED_SVX_XLINEIT_HXX
+#define INCLUDED_SVX_XLINEIT_HXX
 
 #include <svx/xit.hxx>
 #include <svx/xcolit.hxx>
diff --git a/include/svx/xlineit0.hxx b/include/svx/xlineit0.hxx
index 18fef85b45c7..9c9563e50a5a 100644
--- a/include/svx/xlineit0.hxx
+++ b/include/svx/xlineit0.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLINEIT0_HXX
-#define _SVX_XLINEIT0_HXX
+#ifndef INCLUDED_SVX_XLINEIT0_HXX
+#define INCLUDED_SVX_XLINEIT0_HXX
 
 #include <svx/xenum.hxx>
 #include <svl/eitem.hxx>
diff --git a/include/svx/xlinjoit.hxx b/include/svx/xlinjoit.hxx
index 40030551e3c9..f2980446af72 100644
--- a/include/svx/xlinjoit.hxx
+++ b/include/svx/xlinjoit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLINJOIT_HXX
-#define _SVX_XLINJOIT_HXX
+#ifndef INCLUDED_SVX_XLINJOIT_HXX
+#define INCLUDED_SVX_XLINJOIT_HXX
 
 #include <svl/eitem.hxx>
 #include <svx/xenum.hxx>
@@ -50,6 +50,6 @@ public:
     com::sun::star::drawing::LineJoint GetValue() const { return (com::sun::star::drawing::LineJoint) SfxEnumItem::GetValue(); }
 };
 
-#endif // _SVX_XLINJOIT_HXX
+#endif // INCLUDED_SVX_XLINJOIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xlnasit.hxx b/include/svx/xlnasit.hxx
index 3eea09f6ba02..f587c6ec6458 100644
--- a/include/svx/xlnasit.hxx
+++ b/include/svx/xlnasit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNASIT_HXX
-#define _SVX_XLNASIT_HXX
+#ifndef INCLUDED_SVX_XLNASIT_HXX
+#define INCLUDED_SVX_XLNASIT_HXX
 
 
 #include <svl/poolitem.hxx>
diff --git a/include/svx/xlncapit.hxx b/include/svx/xlncapit.hxx
index 16b011b53104..a2c14af45cab 100644
--- a/include/svx/xlncapit.hxx
+++ b/include/svx/xlncapit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNCAPIT_HXX
-#define _SVX_XLNCAPIT_HXX
+#ifndef INCLUDED_SVX_XLNCAPIT_HXX
+#define INCLUDED_SVX_XLNCAPIT_HXX
 
 #include <svx/svxdllapi.h>
 #include <svl/eitem.hxx>
@@ -50,6 +50,6 @@ public:
     com::sun::star::drawing::LineCap GetValue() const;
 };
 
-#endif // _SVX_XLNCAPIT_HXX
+#endif // INCLUDED_SVX_XLNCAPIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xlnclit.hxx b/include/svx/xlnclit.hxx
index 153b2aabd20e..6addb6a623ba 100644
--- a/include/svx/xlnclit.hxx
+++ b/include/svx/xlnclit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNCLIT_HXX
-#define _SVX_XLNCLIT_HXX
+#ifndef INCLUDED_SVX_XLNCLIT_HXX
+#define INCLUDED_SVX_XLNCLIT_HXX
 
 #include <svx/xcolit.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xlndsit.hxx b/include/svx/xlndsit.hxx
index 369b0f60fa45..7ca61d029b32 100644
--- a/include/svx/xlndsit.hxx
+++ b/include/svx/xlndsit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNDSIT_HXX
-#define _SVX_XLNDSIT_HXX
+#ifndef INCLUDED_SVX_XLNDSIT_HXX
+#define INCLUDED_SVX_XLNDSIT_HXX
 
 #include <svx/xit.hxx>
 
diff --git a/include/svx/xlnedcit.hxx b/include/svx/xlnedcit.hxx
index d06deb80a219..a903b992d154 100644
--- a/include/svx/xlnedcit.hxx
+++ b/include/svx/xlnedcit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNEDCIT_HXX
-#define _SVX_XLNEDCIT_HXX
+#ifndef INCLUDED_SVX_XLNEDCIT_HXX
+#define INCLUDED_SVX_XLNEDCIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xlnedit.hxx b/include/svx/xlnedit.hxx
index 793a20e89f78..e903e6a30e9f 100644
--- a/include/svx/xlnedit.hxx
+++ b/include/svx/xlnedit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNEDIT_HXX
-#define _SVX_XLNEDIT_HXX
+#ifndef INCLUDED_SVX_XLNEDIT_HXX
+#define INCLUDED_SVX_XLNEDIT_HXX
 
 #include <svx/xit.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xlnedwit.hxx b/include/svx/xlnedwit.hxx
index e960ea24f8c5..ca733645fcbd 100644
--- a/include/svx/xlnedwit.hxx
+++ b/include/svx/xlnedwit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNEDWIT_HXX
-#define _SVX_XLNEDWIT_HXX
+#ifndef INCLUDED_SVX_XLNEDWIT_HXX
+#define INCLUDED_SVX_XLNEDWIT_HXX
 
 #include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xlnstcit.hxx b/include/svx/xlnstcit.hxx
index 241eb668a05e..3020ab288095 100644
--- a/include/svx/xlnstcit.hxx
+++ b/include/svx/xlnstcit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNSTCIT_HXX
-#define _SVX_XLNSTCIT_HXX
+#ifndef INCLUDED_SVX_XLNSTCIT_HXX
+#define INCLUDED_SVX_XLNSTCIT_HXX
 
 #include <svl/eitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xlnstit.hxx b/include/svx/xlnstit.hxx
index 1633be1b8136..cdcd8544e2b9 100644
--- a/include/svx/xlnstit.hxx
+++ b/include/svx/xlnstit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNSTIT_HXX
-#define _SVX_XLNSTIT_HXX
+#ifndef INCLUDED_SVX_XLNSTIT_HXX
+#define INCLUDED_SVX_XLNSTIT_HXX
 
 #include <svx/xit.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xlnstwit.hxx b/include/svx/xlnstwit.hxx
index 776b97519fcd..7ea27c4e86f9 100644
--- a/include/svx/xlnstwit.hxx
+++ b/include/svx/xlnstwit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNSTWIT_HXX
-#define _SVX_XLNSTWIT_HXX
+#ifndef INCLUDED_SVX_XLNSTWIT_HXX
+#define INCLUDED_SVX_XLNSTWIT_HXX
 
 #include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xlntrit.hxx b/include/svx/xlntrit.hxx
index 8cb0e705ba87..a67d975b3303 100644
--- a/include/svx/xlntrit.hxx
+++ b/include/svx/xlntrit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNTRIT_HXX
-#define _SVX_XLNTRIT_HXX
+#ifndef INCLUDED_SVX_XLNTRIT_HXX
+#define INCLUDED_SVX_XLNTRIT_HXX
 
 #include <svl/intitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xlnwtit.hxx b/include/svx/xlnwtit.hxx
index d8d60ad9022b..fd76aec15a52 100644
--- a/include/svx/xlnwtit.hxx
+++ b/include/svx/xlnwtit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XLNWTIT_HXX
-#define _SVX_XLNWTIT_HXX
+#ifndef INCLUDED_SVX_XLNWTIT_HXX
+#define INCLUDED_SVX_XLNWTIT_HXX
 
 #include <svl/metitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx
index d4e69b3dd812..d3ada2e4d3cb 100644
--- a/include/svx/xmleohlp.hxx
+++ b/include/svx/xmleohlp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLEOHLP_HXX
-#define _XMLEOHLP_HXX
+#ifndef INCLUDED_SVX_XMLEOHLP_HXX
+#define INCLUDED_SVX_XMLEOHLP_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>
diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx
index 466ee5d76ac3..64de636dc1bb 100644
--- a/include/svx/xmlexchg.hxx
+++ b/include/svx/xmlexchg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XMLEXCHG_HXX_
-#define _SVX_XMLEXCHG_HXX_
+#ifndef INCLUDED_SVX_XMLEXCHG_HXX
+#define INCLUDED_SVX_XMLEXCHG_HXX
 
 #include <rtl/ustring.hxx>
 #include <svtools/transfer.hxx>
@@ -89,6 +89,6 @@ namespace svx
 }   // namespace svx
 //........................................................................
 
-#endif // _SVX_XMLEXCHG_HXX_
+#endif // INCLUDED_SVX_XMLEXCHG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx
index 29884f6f32fe..81775c5a11a9 100644
--- a/include/svx/xmlgrhlp.hxx
+++ b/include/svx/xmlgrhlp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLGRHLP_HXX
-#define _XMLGRHLP_HXX
+#ifndef INCLUDED_SVX_XMLGRHLP_HXX
+#define INCLUDED_SVX_XMLGRHLP_HXX
 
 #include <cppuhelper/compbase2.hxx>
 #include <osl/mutex.hxx>
diff --git a/include/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx
index 8fd46b07c22f..9255ea802b36 100644
--- a/include/svx/xmlsecctrl.hxx
+++ b/include/svx/xmlsecctrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLSECURITY_STBCONTRL_HXX
-#define _XMLSECURITY_STBCONTRL_HXX
+#ifndef INCLUDED_SVX_XMLSECCTRL_HXX
+#define INCLUDED_SVX_XMLSECCTRL_HXX
 
 #include <sfx2/stbitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/xoutbmp.hxx b/include/svx/xoutbmp.hxx
index bccf758e199a..1e3df5c2296a 100644
--- a/include/svx/xoutbmp.hxx
+++ b/include/svx/xoutbmp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XOUTBMP_HXX
-#define _XOUTBMP_HXX
+#ifndef INCLUDED_SVX_XOUTBMP_HXX
+#define INCLUDED_SVX_XOUTBMP_HXX
 
 #include <vcl/graph.hxx>
 #include <com/sun/star/uno/Sequence.h>
@@ -69,6 +69,6 @@ public:
 
 SVX_DLLPUBLIC sal_Bool DitherBitmap( Bitmap& rBitmap );
 
-#endif // _XOUTBMP_HXX
+#endif // INCLUDED_SVX_XOUTBMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index 4eefabc54591..946fdc1a6e56 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XPOLY_HXX
-#define _XPOLY_HXX
+#ifndef INCLUDED_SVX_XPOLY_HXX
+#define INCLUDED_SVX_XPOLY_HXX
 
 #include <tools/solar.h>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
@@ -179,6 +179,6 @@ public:
      explicit XPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon);
 };
 
-#endif      // _XPOLY_HXX
+#endif // INCLUDED_SVX_XPOLY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index e7838d6e8faa..06a76d307d24 100644
--- a/include/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XPOOL_HXX
-#define _XPOOL_HXX
+#ifndef INCLUDED_SVX_XPOOL_HXX
+#define INCLUDED_SVX_XPOOL_HXX
 
 #include <svl/itempool.hxx>
 #include <svx/xdef.hxx>
@@ -49,6 +49,6 @@ protected:
     virtual ~XOutdevItemPool();
 };
 
-#endif      // _XPOOL_HXX
+#endif // INCLUDED_SVX_XPOOL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xsetit.hxx b/include/svx/xsetit.hxx
index c5f59d2fb1ae..69d4e226f388 100644
--- a/include/svx/xsetit.hxx
+++ b/include/svx/xsetit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XSETITEM_HXX
-#define _SVX_XSETITEM_HXX
+#ifndef INCLUDED_SVX_XSETIT_HXX
+#define INCLUDED_SVX_XSETIT_HXX
 
 #include <svx/xit.hxx>
 #include <svl/metitem.hxx>
diff --git a/include/svx/xsflclit.hxx b/include/svx/xsflclit.hxx
index a73332d6df5f..35b1219689a8 100644
--- a/include/svx/xsflclit.hxx
+++ b/include/svx/xsflclit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XSFLCLIT_HXX
-#define _SVX_XSFLCLIT_HXX
+#ifndef INCLUDED_SVX_XSFLCLIT_HXX
+#define INCLUDED_SVX_XSFLCLIT_HXX
 
 #include <svx/xcolit.hxx>
 
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index baea5fb4cef7..5e26206adc00 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XTABLE_HXX
-#define _XTABLE_HXX
+#ifndef INCLUDED_SVX_XTABLE_HXX
+#define INCLUDED_SVX_XTABLE_HXX
 
 #include <rtl/ref.hxx>
 #include <rtl/ustring.hxx>
@@ -432,6 +432,6 @@ inline XBitmapListRef XPropertyList::AsBitmapList() { return XBitmapListRef( sta
 inline XLineEndListRef XPropertyList::AsLineEndList() { return XLineEndListRef( static_cast<XLineEndList *> (this) ); }
 inline XGradientListRef XPropertyList::AsGradientList() { return XGradientListRef( static_cast<XGradientList *> (this) ); }
 
-#endif // _XTABLE_HXX
+#endif // INCLUDED_SVX_XTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svx/xtextit.hxx b/include/svx/xtextit.hxx
index e0d76b00ec16..a3cd2a9b8f3c 100644
--- a/include/svx/xtextit.hxx
+++ b/include/svx/xtextit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XTEXTITEM_HXX
-#define _SVX_XTEXTITEM_HXX
+#ifndef INCLUDED_SVX_XTEXTIT_HXX
+#define INCLUDED_SVX_XTEXTIT_HXX
 
 #include <svx/xenum.hxx>
 #include <svl/metitem.hxx>
diff --git a/include/svx/xtextit0.hxx b/include/svx/xtextit0.hxx
index 9e4478f2eec6..4cb547421ce7 100644
--- a/include/svx/xtextit0.hxx
+++ b/include/svx/xtextit0.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TEXTIT0_HXX
-#define _SVX_TEXTIT0_HXX
+#ifndef INCLUDED_SVX_XTEXTIT0_HXX
+#define INCLUDED_SVX_XTEXTIT0_HXX
 
 #include <svx/xenum.hxx>
 #include <svl/eitem.hxx>
diff --git a/include/svx/zoom_def.hxx b/include/svx/zoom_def.hxx
index e71f12f36995..d618b770604e 100644
--- a/include/svx/zoom_def.hxx
+++ b/include/svx/zoom_def.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ZOOM_DEF_HXX
-#define _SVX_ZOOM_DEF_HXX
+#ifndef INCLUDED_SVX_ZOOM_DEF_HXX
+#define INCLUDED_SVX_ZOOM_DEF_HXX
 
 #define ZOOMBTN_OPTIMAL     ((sal_uInt16)0x0001)
 #define ZOOMBTN_PAGEWIDTH   ((sal_uInt16)0x0002)
diff --git a/include/svx/zoomctrl.hxx b/include/svx/zoomctrl.hxx
index c09acf1d5901..46fab4c0d7bb 100644
--- a/include/svx/zoomctrl.hxx
+++ b/include/svx/zoomctrl.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_ZOOMCTRL_HXX
-#define _SVX_ZOOMCTRL_HXX
+#ifndef INCLUDED_SVX_ZOOMCTRL_HXX
+#define INCLUDED_SVX_ZOOMCTRL_HXX
 
 #include <sfx2/stbitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx
index f6be6ed760d5..91e94759d123 100644
--- a/include/svx/zoomsliderctrl.hxx
+++ b/include/svx/zoomsliderctrl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ZOOMSLIDER_STBCONTRL_HXX
-#define _ZOOMSLIDER_STBCONTRL_HXX
+#ifndef INCLUDED_SVX_ZOOMSLIDERCTRL_HXX
+#define INCLUDED_SVX_ZOOMSLIDERCTRL_HXX
 
 #include <sfx2/stbitem.hxx>
 #include "svx/svxdllapi.h"
diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx
index d3b726cba6b8..bdcef14f2ddc 100644
--- a/include/svx/zoomslideritem.hxx
+++ b/include/svx/zoomslideritem.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SVX_ZOOMSLIDERITEM_HXX
-#define _SVX_ZOOMSLIDERITEM_HXX
+#ifndef INCLUDED_SVX_ZOOMSLIDERITEM_HXX
+#define INCLUDED_SVX_ZOOMSLIDERITEM_HXX
 
 #include <svl/intitem.hxx>
 #include <svx/svxids.hrc>
author	Thomas Arnhold <thomas@arnhold.org>	2013-10-23 19:08:11 +0200
committer	Thomas Arnhold <thomas@arnhold.org>	2013-10-23 23:22:28 +0200
commit	027ac563630d06aa52801f6b1d601132b96db236 (patch)
tree	68ff74f758551158d7680aebb67a581f75f36a5b /include/svx
parent	7921e92cf9853cadb592318c04c302816216035f (diff)