fixincludeguards.sh: svx

Change-Id: I885bbc431322ee233f8e67ec2bb5701af909046c
author: Thomas Arnhold <thomas@arnhold.org> 2013-10-28 03:41:20 +0100
committer: Thomas Arnhold <thomas@arnhold.org> 2013-10-28 15:16:19 +0100
commit: a4fc939e82b100490d69a61440e2d18a8652e813 (patch)
tree: cf452d1fac9591f7175fc194c36b99f2e7a8a694 /svx
parent: 88e78c12cf6388d35194fdc286eaa513ae245240 (diff)
136 files changed, 324 insertions, 324 deletions
diff --git a/svx/inc/GalleryControl.hxx b/svx/inc/GalleryControl.hxx
index 6a889912ff9a..2ca49d824039 100644
--- a/svx/inc/GalleryControl.hxx
+++ b/svx/inc/GalleryControl.hxx
@@ -15,8 +15,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_GALLERY_CONTROL_HXX
-#define SVX_SIDEBAR_GALLERY_CONTROL_HXX
+#ifndef INCLUDED_SVX_INC_GALLERYCONTROL_HXX
+#define INCLUDED_SVX_INC_GALLERYCONTROL_HXX
 
 #include <vcl/window.hxx>
 #include <vcl/graph.hxx>
diff --git a/svx/inc/dialdll.hxx b/svx/inc/dialdll.hxx
index e9bb69d1bc4d..70acf4e8a93b 100644
--- a/svx/inc/dialdll.hxx
+++ b/svx/inc/dialdll.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_DIALDLL_HXX
-#define _SVX_DIALDLL_HXX
+#ifndef INCLUDED_SVX_INC_DIALDLL_HXX
+#define INCLUDED_SVX_INC_DIALDLL_HXX
 
 // class SvxDialogDll ----------------------------------------------------
 
diff --git a/svx/inc/dragmt3d.hxx b/svx/inc/dragmt3d.hxx
index 2189ca34f135..a31189540b94 100644
--- a/svx/inc/dragmt3d.hxx
+++ b/svx/inc/dragmt3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _E3D_DRAGMT3D_HXX
-#define _E3D_DRAGMT3D_HXX
+#ifndef INCLUDED_SVX_INC_DRAGMT3D_HXX
+#define INCLUDED_SVX_INC_DRAGMT3D_HXX
 
 #include <svx/svddrgmt.hxx>
 #include <svx/view3d.hxx>
@@ -140,6 +140,6 @@ public:
 };
 
 
-#endif          // _E3D_DRAGMT3D_HXX
+#endif // INCLUDED_SVX_INC_DRAGMT3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/extrusiondepthdialog.hxx b/svx/inc/extrusiondepthdialog.hxx
index 50ff00e2ecc4..30765b9838a3 100644
--- a/svx/inc/extrusiondepthdialog.hxx
+++ b/svx/inc/extrusiondepthdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_EXTRUSIONDEPTHDIALOG_HXX
-#define _SVX_EXTRUSIONDEPTHDIALOG_HXX
+#ifndef INCLUDED_SVX_INC_EXTRUSIONDEPTHDIALOG_HXX
+#define INCLUDED_SVX_INC_EXTRUSIONDEPTHDIALOG_HXX
 
 #include "svx/svxdllapi.h"
 
@@ -46,6 +46,6 @@ public:
 
 }
 
-#endif      // _SVX_EXTRUSIONDEPTHDIALOG_HXX
+#endif // INCLUDED_SVX_INC_EXTRUSIONDEPTHDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index 3ae7a57633ac..cd499d60bf4b 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GALBRWS2_HXX_
-#define _SVX_GALBRWS2_HXX_
+#ifndef INCLUDED_SVX_INC_GALBRWS2_HXX
+#define INCLUDED_SVX_INC_GALBRWS2_HXX
 
 #include <vcl/lstbox.hxx>
 #include <vcl/button.hxx>
diff --git a/svx/inc/galobj.hxx b/svx/inc/galobj.hxx
index c846fef7267e..d7e38dc3e939 100644
--- a/svx/inc/galobj.hxx
+++ b/svx/inc/galobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GALOBJ_HXX_
-#define _SVX_GALOBJ_HXX_
+#ifndef INCLUDED_SVX_INC_GALOBJ_HXX
+#define INCLUDED_SVX_INC_GALOBJ_HXX
 
 #include <tools/urlobj.hxx>
 #include <vcl/graph.hxx>
diff --git a/svx/inc/sidebar/PanelFactory.hxx b/svx/inc/sidebar/PanelFactory.hxx
index a5fea79c3d49..7dcfffe69d38 100644
--- a/svx/inc/sidebar/PanelFactory.hxx
+++ b/svx/inc/sidebar/PanelFactory.hxx
@@ -15,8 +15,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_PANEL_FACTORY_HXX
-#define SVX_SIDEBAR_PANEL_FACTORY_HXX
+#ifndef INCLUDED_SVX_INC_SIDEBAR_PANELFACTORY_HXX
+#define INCLUDED_SVX_INC_SIDEBAR_PANELFACTORY_HXX
 
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
diff --git a/svx/inc/svdibrow.hxx b/svx/inc/svdibrow.hxx
index cffdabbdecbf..c43ba3c91971 100644
--- a/svx/inc/svdibrow.hxx
+++ b/svx/inc/svdibrow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDIBROW_HXX
-#define _SVDIBROW_HXX
+#ifndef INCLUDED_SVX_INC_SVDIBROW_HXX
+#define INCLUDED_SVX_INC_SVDIBROW_HXX
 
 #include <svtools/brwbox.hxx>
 #include <vcl/edit.hxx>
@@ -131,7 +131,7 @@ public:
     void ForceUndirty() { if (bDirty) Undirty(); }
 };
 
-#endif //_SVDIBROW_HXX
+#endif // INCLUDED_SVX_INC_SVDIBROW_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/tbunocontroller.hxx b/svx/inc/tbunocontroller.hxx
index 71bfaa7f5f08..82e48c5c51c7 100644
--- a/svx/inc/tbunocontroller.hxx
+++ b/svx/inc/tbunocontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __TBUNOCONTROLLER_HXX_
-#define __TBUNOCONTROLLER_HXX_
+#ifndef INCLUDED_SVX_INC_TBUNOCONTROLLER_HXX
+#define INCLUDED_SVX_INC_TBUNOCONTROLLER_HXX
 
 #include <svtools/toolboxcontroller.hxx>
 #include <com/sun/star/awt/FontDescriptor.hpp>
@@ -79,6 +79,6 @@ class FontHeightToolBoxControl : public svt::ToolboxController,
 
 }
 
-#endif // __TBUNOCONTROLLER_HXX_
+#endif // INCLUDED_SVX_INC_TBUNOCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/tbunosearchcontrollers.hxx b/svx/inc/tbunosearchcontrollers.hxx
index 55f078bdfcf3..5f33b603cd4a 100644
--- a/svx/inc/tbunosearchcontrollers.hxx
+++ b/svx/inc/tbunosearchcontrollers.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __TBUNOSEARCHCONTROLLERS_HXX_
-#define __TBUNOSEARCHCONTROLLERS_HXX_
+#ifndef INCLUDED_SVX_INC_TBUNOSEARCHCONTROLLERS_HXX
+#define INCLUDED_SVX_INC_TBUNOSEARCHCONTROLLERS_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/DispatchDescriptor.hpp>
@@ -353,6 +353,6 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL FindbarDispatcher_createIns
 
 }
 
-#endif // __TBUNOSEARCHCONTROLLERS_HXX_
+#endif // INCLUDED_SVX_INC_TBUNOSEARCHCONTROLLERS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/inc/unomlstr.hxx b/svx/inc/unomlstr.hxx
index 62b5c7b01f5a..ecb9fc9edd0c 100644
--- a/svx/inc/unomlstr.hxx
+++ b/svx/inc/unomlstr.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_UNOMLSTR_HXX
-#define _SVX_UNOMLSTR_HXX
+#ifndef INCLUDED_SVX_INC_UNOMLSTR_HXX
+#define INCLUDED_SVX_INC_UNOMLSTR_HXX
 
 #include <com/sun/star/util/XModifyListener.hpp>
 
diff --git a/svx/inc/xpolyimp.hxx b/svx/inc/xpolyimp.hxx
index f3b06ef77fe4..3ed0b106e14a 100644
--- a/svx/inc/xpolyimp.hxx
+++ b/svx/inc/xpolyimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XPOLYIMP_HXX
-#define _XPOLYIMP_HXX
+#ifndef INCLUDED_SVX_INC_XPOLYIMP_HXX
+#define INCLUDED_SVX_INC_XPOLYIMP_HXX
 
 #include <svx/xpoly.hxx>
 #include <vector>
@@ -76,6 +76,6 @@ public:
 
 
 
-#endif      // _XPOLYIMP_HXX
+#endif // INCLUDED_SVX_INC_XPOLYIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.hxx b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
index 3e1052bd8993..c10feb32e3aa 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.hxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBLEEMPTYEDITSOURCE_HXX
-#define _SVX_ACCESSIBLEEMPTYEDITSOURCE_HXX
+#ifndef INCLUDED_SVX_SOURCE_ACCESSIBILITY_ACCESSIBLEEMPTYEDITSOURCE_HXX
+#define INCLUDED_SVX_SOURCE_ACCESSIBILITY_ACCESSIBLEEMPTYEDITSOURCE_HXX
 
 #include <svl/brdcst.hxx>
 #include <svl/lstner.hxx>
diff --git a/svx/source/accessibility/AccessibleTextEventQueue.hxx b/svx/source/accessibility/AccessibleTextEventQueue.hxx
index 3087b4df4508..ea0e4dbdc9f5 100644
--- a/svx/source/accessibility/AccessibleTextEventQueue.hxx
+++ b/svx/source/accessibility/AccessibleTextEventQueue.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TEXT_CHANGED_QUEUE_HXX
-#define _SVX_TEXT_CHANGED_QUEUE_HXX
+#ifndef INCLUDED_SVX_SOURCE_ACCESSIBILITY_ACCESSIBLETEXTEVENTQUEUE_HXX
+#define INCLUDED_SVX_SOURCE_ACCESSIBILITY_ACCESSIBLETEXTEVENTQUEUE_HXX
 
 #include <memory>
 #include <list>
@@ -87,6 +87,6 @@ namespace accessibility
 
 } // end of namespace accessibility
 
-#endif /* _SVX_TEXT_CHANGED_QUEUE_HXX */
+#endif // INCLUDED_SVX_SOURCE_ACCESSIBILITY_ACCESSIBLETEXTEVENTQUEUE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index 9273c42b669e..c5d3c0739194 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_CHILDREN_MANAGER_IMPL_HXX
+#ifndef INCLUDED_SVX_SOURCE_ACCESSIBILITY_CHILDRENMANAGERIMPL_HXX
 
 #include <svx/IAccessibleViewForwarderListener.hxx>
 #include <svx/IAccessibleParent.hxx>
diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx
index e629b0e12cd0..8c59cccc451d 100644
--- a/svx/source/customshapes/EnhancedCustomShape3d.hxx
+++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCEDCUSTOMSHAPE3D_HXX
-#define _ENHANCEDCUSTOMSHAPE3D_HXX
+#ifndef INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPE3D_HXX
+#define INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPE3D_HXX
 
 #include <vector>
 #include <com/sun/star/drawing/ProjectionMode.hpp>
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
index c65b05e14743..ae90045a1f87 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCED_CUSTOMSHAPE_ENGINE_HXX
-#define _ENHANCED_CUSTOMSHAPE_ENGINE_HXX
+#ifndef INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEENGINE_HXX
+#define INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEENGINE_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/RuntimeException.hpp>
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
index c5603babd4d2..68e13d4e6060 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCEDCUSTOMSHAPEFONTWORK_HXX
-#define _ENHANCEDCUSTOMSHAPEFONTWORK_HXX
+#ifndef INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEFONTWORK_HXX
+#define INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEFONTWORK_HXX
 
 #include <com/sun/star/i18n/XBreakIterator.hpp>
 
diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
index 534f6072ae4a..a0d19b841784 100644
--- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
+++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _ENHANCED_CUSTOMSHAPE_HANDLE_HXX
-#define _ENHANCED_CUSTOMSHAPE_HANDLE_HXX
+#ifndef INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEHANDLE_HXX
+#define INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEHANDLE_HXX
 
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx
index d15e38064ede..c66a5ed7d7cf 100644
--- a/svx/source/dialog/contimp.hxx
+++ b/svx/source/dialog/contimp.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 _CONTIMP_HXX_
-#define _CONTIMP_HXX_
+#ifndef INCLUDED_SVX_SOURCE_DIALOG_CONTIMP_HXX
+#define INCLUDED_SVX_SOURCE_DIALOG_CONTIMP_HXX
 
 #include <svx/contdlg.hxx>
 #include "contwnd.hxx"
@@ -101,6 +101,6 @@ public:
 };
 
 
-#endif // _CONTIMP_HXX_
+#endif // INCLUDED_SVX_SOURCE_DIALOG_CONTIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/contwnd.hxx b/svx/source/dialog/contwnd.hxx
index 5ab4e706430b..0dcb7094c0f1 100644
--- a/svx/source/dialog/contwnd.hxx
+++ b/svx/source/dialog/contwnd.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONTWND_HXX
-#define _CONTWND_HXX
+#ifndef INCLUDED_SVX_SOURCE_DIALOG_CONTWND_HXX
+#define INCLUDED_SVX_SOURCE_DIALOG_CONTWND_HXX
 
 #include <tools/poly.hxx>
 #include <svx/graphctl.hxx>
diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx
index 2956faf4f45a..5b380620a878 100644
--- a/svx/source/dialog/dlgunit.hxx
+++ b/svx/source/dialog/dlgunit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DLG_DLGUNIT_HXX
-#define _SVX_DLG_DLGUNIT_HXX
+#ifndef INCLUDED_SVX_SOURCE_DIALOG_DLGUNIT_HXX
+#define INCLUDED_SVX_SOURCE_DIALOG_DLGUNIT_HXX
 
 #include <svx/svdtrans.hxx>
 
@@ -37,6 +37,6 @@ inline OUString GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode
     return aVal.makeStringAndClear();
 }
 
-#endif // _SVX_DLG_DLGUNIT_HXX
+#endif // INCLUDED_SVX_SOURCE_DIALOG_DLGUNIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx
index d0a78405eb36..035d6d1834eb 100644
--- a/svx/source/dialog/imapimp.hxx
+++ b/svx/source/dialog/imapimp.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _IMAPIMP_HXX_
-#define _IMAPIMP_HXX_
+#ifndef INCLUDED_SVX_SOURCE_DIALOG_IMAPIMP_HXX
+#define INCLUDED_SVX_SOURCE_DIALOG_IMAPIMP_HXX
 
 // ---------------
 // - IMapOwnData -
diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx
index 267614a35a04..065eb06c23c9 100644
--- a/svx/source/dialog/imapwnd.hxx
+++ b/svx/source/dialog/imapwnd.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 _IMAPWND_HXX
-#define _IMAPWND_HXX
+#ifndef INCLUDED_SVX_SOURCE_DIALOG_IMAPWND_HXX
+#define INCLUDED_SVX_SOURCE_DIALOG_IMAPWND_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
diff --git a/svx/source/dialog/rlrcitem.hxx b/svx/source/dialog/rlrcitem.hxx
index 0be998d79b78..3aa9eca807b5 100644
--- a/svx/source/dialog/rlrcitem.hxx
+++ b/svx/source/dialog/rlrcitem.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_RLRCITEM_HXX
-#define _SVX_RLRCITEM_HXX
+#ifndef INCLUDED_SVX_SOURCE_DIALOG_RLRCITEM_HXX
+#define INCLUDED_SVX_SOURCE_DIALOG_RLRCITEM_HXX
 
 #include <sfx2/ctrlitem.hxx>
 
diff --git a/svx/source/dialog/srchctrl.hxx b/svx/source/dialog/srchctrl.hxx
index 7567e9fd3e34..91f8386f8f71 100644
--- a/svx/source/dialog/srchctrl.hxx
+++ b/svx/source/dialog/srchctrl.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_SRCHCTRL_HXX
-#define _SVX_SRCHCTRL_HXX
+#ifndef INCLUDED_SVX_SOURCE_DIALOG_SRCHCTRL_HXX
+#define INCLUDED_SVX_SOURCE_DIALOG_SRCHCTRL_HXX
 
 #include <sfx2/ctrlitem.hxx>
 // class SvxSearchFamilyController ---------------------------------------
diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx
index c14f26b9aad6..6226ba1acf04 100644
--- a/svx/source/engine3d/helperminimaldepth3d.hxx
+++ b/svx/source/engine3d/helperminimaldepth3d.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SVX_HELPERMINIMALDEPTH_HXX
-#define INCLUDED_SVX_HELPERMINIMALDEPTH_HXX
+#ifndef INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX
+#define INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX
 
 #include <sal/types.h>
 
@@ -46,6 +46,6 @@ double getMinimalDepthInViewCoordinates(const E3dCompoundObject& rObject);
 
 //////////////////////////////////////////////////////////////////////////////
 
-#endif // INCLUDED_SVX_HELPERMINIMALDEPTH_HXX
+#endif // INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/GallerySplitter.hxx b/svx/source/gallery2/GallerySplitter.hxx
index cdb127776508..caa80e0c9313 100644
--- a/svx/source/gallery2/GallerySplitter.hxx
+++ b/svx/source/gallery2/GallerySplitter.hxx
@@ -15,8 +15,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_GALLERY_SPLITTER_HXX
-#define SVX_GALLERY_SPLITTER_HXX
+#ifndef INCLUDED_SVX_SOURCE_GALLERY2_GALLERYSPLITTER_HXX
+#define INCLUDED_SVX_SOURCE_GALLERY2_GALLERYSPLITTER_HXX
 
 #include <vcl/split.hxx>
 #include <boost/function.hpp>
diff --git a/svx/source/inc/AccessibleFrameSelector.hxx b/svx/source/inc/AccessibleFrameSelector.hxx
index 70d5c3e1296b..d42c34b08d28 100644
--- a/svx/source/inc/AccessibleFrameSelector.hxx
+++ b/svx/source/inc/AccessibleFrameSelector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_ACCESSIBLEFRAMESELECTOR_HXX
-#define SVX_ACCESSIBLEFRAMESELECTOR_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_ACCESSIBLEFRAMESELECTOR_HXX
+#define INCLUDED_SVX_SOURCE_INC_ACCESSIBLEFRAMESELECTOR_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
diff --git a/svx/source/inc/GraphCtlAccessibleContext.hxx b/svx/source/inc/GraphCtlAccessibleContext.hxx
index dd6e40d2675f..c1f7b94b9a3a 100644
--- a/svx/source/inc/GraphCtlAccessibleContext.hxx
+++ b/svx/source/inc/GraphCtlAccessibleContext.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SVXGRAPHACCESSIBLECONTEXT_HXX
-#define _SVXGRAPHACCESSIBLECONTEXT_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_GRAPHCTLACCESSIBLECONTEXT_HXX
+#define INCLUDED_SVX_SOURCE_INC_GRAPHCTLACCESSIBLECONTEXT_HXX
 
 #include <cppuhelper/compbase7.hxx>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/svx/source/inc/clonelist.hxx b/svx/source/inc/clonelist.hxx
index a8377458f552..c943b68d65d7 100644
--- a/svx/source/inc/clonelist.hxx
+++ b/svx/source/inc/clonelist.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 _CLONELIST_HXX_
-#define _CLONELIST_HXX_
+#ifndef INCLUDED_SVX_SOURCE_INC_CLONELIST_HXX
+#define INCLUDED_SVX_SOURCE_INC_CLONELIST_HXX
 
 #include <vector>
 
@@ -44,6 +44,6 @@ public:
     void CopyConnections() const;
 };
 
-#endif // _CLONELIST_HXX_
+#endif // INCLUDED_SVX_SOURCE_INC_CLONELIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/datalistener.hxx b/svx/source/inc/datalistener.hxx
index bb7bdd2ce6a9..3a4caae826f6 100644
--- a/svx/source/inc/datalistener.hxx
+++ b/svx/source/inc/datalistener.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_DATALISTENER_HXX
-#define _SVX_DATALISTENER_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_DATALISTENER_HXX
+#define INCLUDED_SVX_SOURCE_INC_DATALISTENER_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <com/sun/star/container/XContainerListener.hpp>
@@ -67,6 +67,6 @@ namespace svxform
 }   // namespace svxform
 //............................................................................
 
-#endif // #ifndef _SVX_DATALISTENER_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_DATALISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index af8c97642116..962d9363d329 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.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_DATANAVI_HXX
-#define _SVX_DATANAVI_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
+#define INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -589,6 +589,6 @@ namespace svxform
 }   // namespace svxform
 //............................................................................
 
-#endif // _SVX_DATANAVI_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_DATANAVI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/delayedevent.hxx b/svx/source/inc/delayedevent.hxx
index 2fc8463f3286..c2633af42954 100644
--- a/svx/source/inc/delayedevent.hxx
+++ b/svx/source/inc/delayedevent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_DELAYEDLINK_HXX
-#define SVX_DELAYEDLINK_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_DELAYEDEVENT_HXX
+#define INCLUDED_SVX_SOURCE_INC_DELAYEDEVENT_HXX
 
 #include <tools/link.hxx>
 
@@ -77,6 +77,6 @@ namespace svxform
 } // namespace svxform
 //........................................................................
 
-#endif // SVX_DELAYEDLINK_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_DELAYEDEVENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/docrecovery.hxx b/svx/source/inc/docrecovery.hxx
index 85da43f55bdb..02219e3e2878 100644
--- a/svx/source/inc/docrecovery.hxx
+++ b/svx/source/inc/docrecovery.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_DOCRECOVERY_HXX
-#define _SVX_DOCRECOVERY_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_DOCRECOVERY_HXX
+#define INCLUDED_SVX_SOURCE_INC_DOCRECOVERY_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx
index a71bacc0af3c..1c03f60021e7 100644
--- a/svx/source/inc/filtnav.hxx
+++ b/svx/source/inc/filtnav.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_FILTNAV_HXX
-#define _SVX_FILTNAV_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FILTNAV_HXX
+#define INCLUDED_SVX_SOURCE_INC_FILTNAV_HXX
 
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/runtime/XFormController.hpp>
@@ -352,6 +352,6 @@ public:
 }   // namespace svxform
 //........................................................................
 
-#endif // _SVX_FILTNAV_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FILTNAV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index 6cc7fd81743c..e7aff9331c75 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.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_FMPROPBRW_HXX
-#define SVX_FMPROPBRW_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMPROPBRW_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMPROPBRW_HXX
 
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/frame/XFrame2.hpp>
@@ -109,6 +109,6 @@ private:
     */
     void    impl_createPropertyBrowser_throw( FmFormShell* _pFormShell );
 };
-#endif //SVX_FMPROPBRW_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMPROPBRW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmcontrolbordermanager.hxx b/svx/source/inc/fmcontrolbordermanager.hxx
index a7caef5bbf8c..6d90b7541a09 100644
--- a/svx/source/inc/fmcontrolbordermanager.hxx
+++ b/svx/source/inc/fmcontrolbordermanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
-#define SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
 
 #include <com/sun/star/awt/VisualEffect.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
@@ -254,6 +254,6 @@ namespace svxform
 } // namespace svxform
 //........................................................................
 
-#endif // SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMCONTROLBORDERMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmcontrollayout.hxx b/svx/source/inc/fmcontrollayout.hxx
index 6cc152254c13..db2ad9a6b8cf 100644
--- a/svx/source/inc/fmcontrollayout.hxx
+++ b/svx/source/inc/fmcontrollayout.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
-#define SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 
@@ -77,6 +77,6 @@ namespace svxform
 } // namespace svxform
 //........................................................................
 
-#endif // SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMCONTROLLAYOUT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmdocumentclassification.hxx b/svx/source/inc/fmdocumentclassification.hxx
index 9558e2124ee3..471037188f71 100644
--- a/svx/source/inc/fmdocumentclassification.hxx
+++ b/svx/source/inc/fmdocumentclassification.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
-#define SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 
@@ -73,6 +73,6 @@ namespace svxform
 } // namespace svxform
 //........................................................................
 
-#endif // SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMDOCUMENTCLASSIFICATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx
index 9b1265026c74..e2c9a84e412a 100644
--- a/svx/source/inc/fmexch.hxx
+++ b/svx/source/inc/fmexch.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_FMEXCH_HXX
-#define _SVX_FMEXCH_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMEXCH_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMEXCH_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <svtools/transfer.hxx>
diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx
index c7c97da807de..319681604fa6 100644
--- a/svx/source/inc/fmexpl.hxx
+++ b/svx/source/inc/fmexpl.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_FMEXPL_HXX
-#define _SVX_FMEXPL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMEXPL_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMEXPL_HXX
 
 #include <svl/lstner.hxx>
 #include <svl/brdcst.hxx>
@@ -598,6 +598,6 @@ namespace svxform
 }   // namespace svxform
 //............................................................................
 
-#endif // _SVX_FMEXPL_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMEXPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmitems.hxx b/svx/source/inc/fmitems.hxx
index 4b7cfd4b5235..98ffc9c6fd96 100644
--- a/svx/source/inc/fmitems.hxx
+++ b/svx/source/inc/fmitems.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_FMITEMS_HXX
-#define _SVX_FMITEMS_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMITEMS_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMITEMS_HXX
 
 
 #include <svl/poolitem.hxx>
@@ -57,6 +57,6 @@ inline FmInterfaceItem& FmInterfaceItem::operator=( const FmInterfaceItem &rCpy
 
 
 
-#endif // _SVX_FMITEMS_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMITEMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmobj.hxx b/svx/source/inc/fmobj.hxx
index 5e77e56eb5d2..09b4218bb03e 100644
--- a/svx/source/inc/fmobj.hxx
+++ b/svx/source/inc/fmobj.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_FMOBJ_HXX
-#define _SVX_FMOBJ_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMOBJ_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMOBJ_HXX
 
 #include <svx/svdouno.hxx>
 #include <com/sun/star/container/XIndexContainer.hpp>
diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx
index 57a3ad0826e7..29dec86e43a4 100644
--- a/svx/source/inc/fmpgeimp.hxx
+++ b/svx/source/inc/fmpgeimp.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_FMUNOPGE_HXX
-#define _SVX_FMUNOPGE_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMPGEIMP_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMPGEIMP_HXX
 
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -152,6 +152,6 @@ private:
 };
 
 
-#endif // _SVX_FMUNOPGE_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMPGEIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmscriptingenv.hxx b/svx/source/inc/fmscriptingenv.hxx
index 2f098cf119e6..3fcf67ec9f7a 100644
--- a/svx/source/inc/fmscriptingenv.hxx
+++ b/svx/source/inc/fmscriptingenv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FMSCRIPTINGENV_HXX
-#define SVX_FMSCRIPTINGENV_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMSCRIPTINGENV_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMSCRIPTINGENV_HXX
 
 #include <com/sun/star/script/XEventAttacherManager.hpp>
 #include <rtl/ref.hxx>
@@ -85,6 +85,6 @@ namespace svxform
 } // namespace svxform
 //........................................................................
 
-#endif // SVX_FMSCRIPTINGENV_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMSCRIPTINGENV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmservs.hxx b/svx/source/inc/fmservs.hxx
index 4719360bab20..81812e73b7f6 100644
--- a/svx/source/inc/fmservs.hxx
+++ b/svx/source/inc/fmservs.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_FMSERVS_HXX
-#define _SVX_FMSERVS_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMSERVS_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMSERVS_HXX
 
 #include <svx/svxdllapi.h>
 
@@ -76,6 +76,6 @@ namespace svxform
     SVX_DLLPUBLIC void ImplSmartRegisterUnoServices();
 }   // namespace svxform
 
-#endif // _SVX_FMSERVS_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMSERVS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx
index 16e549e0761f..ff78efbb733e 100644
--- a/svx/source/inc/fmshimp.hxx
+++ b/svx/source/inc/fmshimp.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_FMSHIMP_HXX
-#define _SVX_FMSHIMP_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMSHIMP_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMSHIMP_HXX
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
@@ -588,6 +588,6 @@ public:
     SVX_DLLPRIVATE virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState);
 };
 
-#endif          // _SVX_FMSHIMP_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMSHIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmslotinvalidator.hxx b/svx/source/inc/fmslotinvalidator.hxx
index 172ac3ca9a76..bceead451450 100644
--- a/svx/source/inc/fmslotinvalidator.hxx
+++ b/svx/source/inc/fmslotinvalidator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX
-#define SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX
 
 #include <tools/solar.h>
 
@@ -45,7 +45,7 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMSLOTINVALIDATOR_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmtextcontroldialogs.hxx b/svx/source/inc/fmtextcontroldialogs.hxx
index 086e0a0f815f..2ceb6542d784 100644
--- a/svx/source/inc/fmtextcontroldialogs.hxx
+++ b/svx/source/inc/fmtextcontroldialogs.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SOURCE_FORM_FMTEXTCONTROLDIALOGS_HXX
-#define SVX_SOURCE_FORM_FMTEXTCONTROLDIALOGS_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLDIALOGS_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLDIALOGS_HXX
 
 #include <sfx2/sfxsids.hrc>
 #include <sfx2/tabdlg.hxx>
@@ -58,6 +58,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SVX_SOURCE_FORM_FMTEXTCONTROLDIALOGS_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLDIALOGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmtextcontrolfeature.hxx b/svx/source/inc/fmtextcontrolfeature.hxx
index 7d1db2f720f9..df17c5186b6b 100644
--- a/svx/source/inc/fmtextcontrolfeature.hxx
+++ b/svx/source/inc/fmtextcontrolfeature.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
-#define SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -91,6 +91,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLFEATURE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx
index 20c3991fb7a1..8c7771dae967 100644
--- a/svx/source/inc/fmtextcontrolshell.hxx
+++ b/svx/source/inc/fmtextcontrolshell.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_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
-#define SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
 
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
@@ -215,6 +215,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMTEXTCONTROLSHELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx
index dc23e6437456..3a3a36924a72 100644
--- a/svx/source/inc/fmundo.hxx
+++ b/svx/source/inc/fmundo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FMUNDO_HXX
-#define _SVX_FMUNDO_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMUNDO_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMUNDO_HXX
 
 #include <svx/svdundo.hxx>
 #include <svx/svdouno.hxx>
@@ -211,6 +211,6 @@ public:
 };
 
 
-#endif  //_SVX_FMUNDO_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMUNDO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmurl.hxx b/svx/source/inc/fmurl.hxx
index c2c829611337..3182e4be0a46 100644
--- a/svx/source/inc/fmurl.hxx
+++ b/svx/source/inc/fmurl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_FMURL_HXX
-#define _SVX_FMURL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMURL_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 
 #define FMURL_FORM_POSITION                OUString( ".uno:FormController/positionForm" )
 #define FMURL_FORM_RECORDCOUNT             OUString( ".uno:FormController/RecordCount" )
@@ -48,6 +48,6 @@
 #define FMARG_ADDCOL_COLUMNTYPE            OUString( "ColumnType" )
 #define FMARG_ADDCOL_COLUMNPOS             OUString( "ColumnPosition" )
 
-#endif // _SVX_FMURL_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMURL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/fmvwimp.hxx b/svx/source/inc/fmvwimp.hxx
index eda11b107d3d..5133709d5d99 100644
--- a/svx/source/inc/fmvwimp.hxx
+++ b/svx/source/inc/fmvwimp.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_FMVWIMP_HXX
-#define _SVX_FMVWIMP_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX
+#define INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX
 
 #include "svx/svdmark.hxx"
 #include "fmdocumentclassification.hxx"
@@ -304,6 +304,6 @@ private:
 
 
 
-#endif // _SVX_FMVWIMP_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FMVWIMP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx
index db1a1ab24b05..e8a07dd5e07f 100644
--- a/svx/source/inc/formcontrolfactory.hxx
+++ b/svx/source/inc/formcontrolfactory.hxx
@@ -18,8 +18,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FORMCONTROLMANAGER_HXX
-#define SVX_FORMCONTROLMANAGER_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FORMCONTROLFACTORY_HXX
+#define INCLUDED_SVX_SOURCE_INC_FORMCONTROLFACTORY_HXX
 
 #include "fmdocumentclassification.hxx"
 
@@ -108,6 +108,6 @@ namespace svxform
 } // namespace svxform
 //........................................................................
 
-#endif // SVX_FORMCONTROLMANAGER_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FORMCONTROLFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 5506fd8fe2d9..61acc3448ba9 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.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_FMCTRLER_HXX
-#define _SVX_FMCTRLER_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX
+#define INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX
 
 #include "delayedevent.hxx"
 #include "formdispatchinterceptor.hxx"
@@ -575,6 +575,6 @@ namespace svxform
 
 }   // namespace svxform
 
-#endif  // _SVX_FMCTRLER_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FORMCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/formcontrolling.hxx b/svx/source/inc/formcontrolling.hxx
index 065a7c093921..b2f48cba54e9 100644
--- a/svx/source/inc/formcontrolling.hxx
+++ b/svx/source/inc/formcontrolling.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FORMCONTROLLING_HXX
-#define SVX_FORMCONTROLLING_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FORMCONTROLLING_HXX
+#define INCLUDED_SVX_SOURCE_INC_FORMCONTROLLING_HXX
 
 #include <com/sun/star/form/runtime/XFormController.hpp>
 #include <com/sun/star/form/XForm.hpp>
@@ -234,6 +234,6 @@ namespace svx
 }   // namespace svx
 //........................................................................
 
-#endif // SVX_FORMCONTROLLING_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FORMCONTROLLING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/formdispatchinterceptor.hxx b/svx/source/inc/formdispatchinterceptor.hxx
index e13997e3d9c1..5262cbd64f77 100644
--- a/svx/source/inc/formdispatchinterceptor.hxx
+++ b/svx/source/inc/formdispatchinterceptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FORMDISPATCHINTERCEPTOR_HXX
-#define SVX_FORMDISPATCHINTERCEPTOR_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FORMDISPATCHINTERCEPTOR_HXX
+#define INCLUDED_SVX_SOURCE_INC_FORMDISPATCHINTERCEPTOR_HXX
 
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
@@ -110,6 +110,6 @@ namespace svxform
 } // namespace svxform
 //........................................................................
 
-#endif // SVX_FORMDISPATCHINTERCEPTOR_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FORMDISPATCHINTERCEPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index 480ef9faab0b..75d419d8c2b9 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FMDISPATCH_HXX
-#define SVX_FMDISPATCH_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FORMFEATUREDISPATCHER_HXX
+#define INCLUDED_SVX_SOURCE_INC_FORMFEATUREDISPATCHER_HXX
 
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/svx/source/inc/formtoolbars.hxx b/svx/source/inc/formtoolbars.hxx
index ce8eb4aca371..379a6688354c 100644
--- a/svx/source/inc/formtoolbars.hxx
+++ b/svx/source/inc/formtoolbars.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SOURCE_INC_FORMTOOLBARS_HXX
-#define SVX_SOURCE_INC_FORMTOOLBARS_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FORMTOOLBARS_HXX
+#define INCLUDED_SVX_SOURCE_INC_FORMTOOLBARS_HXX
 
 #include "fmdocumentclassification.hxx"
 #include <com/sun/star/frame/XLayoutManager.hpp>
@@ -78,6 +78,6 @@ namespace svxform
 } // namespace svxform
 //........................................................................
 
-#endif // SVX_SOURCE_INC_FORMTOOLBARS_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_FORMTOOLBARS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 1b17756b79e0..c9372708fae0 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FRMSELIMPL_HXX
-#define SVX_FRMSELIMPL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_FRMSELIMPL_HXX
+#define INCLUDED_SVX_SOURCE_INC_FRMSELIMPL_HXX
 
 #include <vcl/virdev.hxx>
 #include <vcl/image.hxx>
diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx
index 566851ca9487..e8eed6f11a4b 100644
--- a/svx/source/inc/gridcell.hxx
+++ b/svx/source/inc/gridcell.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_GRIDCELL_HXX
-#define _SVX_GRIDCELL_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_GRIDCELL_HXX
+#define INCLUDED_SVX_SOURCE_INC_GRIDCELL_HXX
 
 #include <svx/gridctrl.hxx>
 
@@ -1141,6 +1141,6 @@ protected:
     DECL_LINK( OnCommit, void* );
 };
 
-#endif // _SVX_GRIDCELL_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_GRIDCELL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/gridcols.hxx b/svx/source/inc/gridcols.hxx
index 555e31ea99c3..96dfc57ea6ba 100644
--- a/svx/source/inc/gridcols.hxx
+++ b/svx/source/inc/gridcols.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_GRIDCOLS_HXX
-#define _SVX_GRIDCOLS_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_GRIDCOLS_HXX
+#define INCLUDED_SVX_SOURCE_INC_GRIDCOLS_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -49,6 +49,6 @@
 sal_Int32 getColumnTypeByModelName(const OUString& aModelName);
 
 
-#endif // _SVX_GRIDCOLS_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_GRIDCOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/recoveryui.hxx b/svx/source/inc/recoveryui.hxx
index d8454c9e4c35..38febbbbf433 100644
--- a/svx/source/inc/recoveryui.hxx
+++ b/svx/source/inc/recoveryui.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _RECOVERYUI_HXX
-#define _RECOVERYUI_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_RECOVERYUI_HXX
+#define INCLUDED_SVX_SOURCE_INC_RECOVERYUI_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/frame/XSynchronousDispatch.hpp>
@@ -134,6 +134,6 @@ class RecoveryUI : public ::cppu::WeakImplHelper2< css::lang::XServiceInfo
 
 } // namespace svx
 
-#endif // _RECOVERYUI_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_RECOVERYUI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/sdbdatacolumn.hxx b/svx/source/inc/sdbdatacolumn.hxx
index f1ee6eb5c03b..60c1300261f5 100644
--- a/svx/source/inc/sdbdatacolumn.hxx
+++ b/svx/source/inc/sdbdatacolumn.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_FORM_SDBDATACOLUMN_HXX
-#define SVX_FORM_SDBDATACOLUMN_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_SDBDATACOLUMN_HXX
+#define INCLUDED_SVX_SOURCE_INC_SDBDATACOLUMN_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
@@ -125,7 +125,7 @@ namespace svxform
         inline void updateNumericObject(const ::com::sun::star::uno::Any& x, sal_Int32 scale) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException );
     };
 
-#endif // SVX_FORM_SDBDATACOLUMN_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_SDBDATACOLUMN_HXX
 
 //..............................................................................
 }   // namespace svxform
diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx
index a7b85f154d7f..107edf7280b9 100644
--- a/svx/source/inc/sqlparserclient.hxx
+++ b/svx/source/inc/sqlparserclient.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SQLPARSERCLIENT_HXX
-#define SVX_SQLPARSERCLIENT_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX
+#define INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX
 
 #include "svx/dbtoolsclient.hxx"
 #include "svx/ParseContext.hxx"
@@ -66,7 +66,7 @@ namespace svxform
 }   // namespace svxform
 //........................................................................
 
-#endif // SVX_SQLPARSERCLIENT_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_SQLPARSERCLIENT_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/stringlistresource.hxx b/svx/source/inc/stringlistresource.hxx
index 1f8d33355d28..613c3f81966c 100644
--- a/svx/source/inc/stringlistresource.hxx
+++ b/svx/source/inc/stringlistresource.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_STRINGLISTRESOURCE_HXX
-#define SVX_STRINGLISTRESOURCE_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_STRINGLISTRESOURCE_HXX
+#define INCLUDED_SVX_SOURCE_INC_STRINGLISTRESOURCE_HXX
 
 #include <tools/rc.hxx>
 #include <svx/svxdllapi.h>
@@ -74,6 +74,6 @@ namespace svx
 } // namespace svx
 //........................................................................
 
-#endif // SVX_STRINGLISTRESOURCE_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_STRINGLISTRESOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/svdoutlinercache.hxx b/svx/source/inc/svdoutlinercache.hxx
index 8181dc39e320..6dbf7286c817 100644
--- a/svx/source/inc/svdoutlinercache.hxx
+++ b/svx/source/inc/svdoutlinercache.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_SDROUTLINER_HXX
-#define _SVX_SDROUTLINER_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_SVDOUTLINERCACHE_HXX
+#define INCLUDED_SVX_SOURCE_INC_SVDOUTLINERCACHE_HXX
 
 #include <sal/types.h>
 
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index e21942d33c9d..5adcbf9e6400 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SVXRECTACCESSIBLECONTEXT_HXX
-#define _SVXRECTACCESSIBLECONTEXT_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_SVXRECTCTACCESSIBLECONTEXT_HXX
+#define INCLUDED_SVX_SOURCE_INC_SVXRECTCTACCESSIBLECONTEXT_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleComponent.hpp>
diff --git a/svx/source/inc/tabwin.hxx b/svx/source/inc/tabwin.hxx
index 08723f91ca05..cc56869750db 100644
--- a/svx/source/inc/tabwin.hxx
+++ b/svx/source/inc/tabwin.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_TABWIN_HXX
-#define _SVX_TABWIN_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_TABWIN_HXX
+#define INCLUDED_SVX_SOURCE_INC_TABWIN_HXX
 
 #include <svtools/treelistbox.hxx>
 #include <vcl/floatwin.hxx>
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx
index d5023187dee2..d8c7e2e6fbb5 100644
--- a/svx/source/inc/tbxform.hxx
+++ b/svx/source/inc/tbxform.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_TBXFORM_HXX
-#define _SVX_TBXFORM_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_TBXFORM_HXX
+#define INCLUDED_SVX_SOURCE_INC_TBXFORM_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include <vcl/field.hxx>
diff --git a/svx/source/inc/treevisitor.hxx b/svx/source/inc/treevisitor.hxx
index ef603ed780bc..50e7d7a356a7 100644
--- a/svx/source/inc/treevisitor.hxx
+++ b/svx/source/inc/treevisitor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_TREE_VISITOR_HXX
-#define SVX_TREE_VISITOR_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_TREEVISITOR_HXX
+#define INCLUDED_SVX_SOURCE_INC_TREEVISITOR_HXX
 
 #include <stack>
 
@@ -99,6 +99,6 @@ bool TreeVisitor< ELEMENT, NODEINFO, PROCESSOR >::do_step()
     return false;
 }
 
-#endif // SVX_TREE_VISITOR_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_TREEVISITOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/typeconversionclient.hxx b/svx/source/inc/typeconversionclient.hxx
index 2c8652e0edeb..c21f2b1e06fa 100644
--- a/svx/source/inc/typeconversionclient.hxx
+++ b/svx/source/inc/typeconversionclient.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_TYPECONVERSION_CLIENT_HXX
-#define SVX_TYPECONVERSION_CLIENT_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_TYPECONVERSIONCLIENT_HXX
+#define INCLUDED_SVX_SOURCE_INC_TYPECONVERSIONCLIENT_HXX
 
 #include "svx/dbtoolsclient.hxx"
 
@@ -79,7 +79,7 @@ namespace svxform
 }   // namespace svxform
 //........................................................................
 
-#endif // SVX_TYPECONVERSION_CLIENT_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_TYPECONVERSIONCLIENT_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/unogalthemeprovider.hxx b/svx/source/inc/unogalthemeprovider.hxx
index 23c769b84d7a..8d1cd680c08f 100644
--- a/svx/source/inc/unogalthemeprovider.hxx
+++ b/svx/source/inc/unogalthemeprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOGALTHEMEPROVIDER_HXX
-#define _SVX_UNOGALTHEMEPROVIDER_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_UNOGALTHEMEPROVIDER_HXX
+#define INCLUDED_SVX_SOURCE_INC_UNOGALTHEMEPROVIDER_HXX
 
 #include <cppuhelper/implbase2.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/svx/source/inc/xfm_addcondition.hxx b/svx/source/inc/xfm_addcondition.hxx
index beaaf6b47db9..2e1d48f2d93f 100644
--- a/svx/source/inc/xfm_addcondition.hxx
+++ b/svx/source/inc/xfm_addcondition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
-#define SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
+#define INCLUDED_SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
 
 #include <com/sun/star/xforms/XModel.hpp>
 #include <svtools/genericunodialog.hxx>
@@ -78,6 +78,6 @@ namespace svxform
 } // namespace svxform
 //........................................................................
 
-#endif // SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
+#endif // INCLUDED_SVX_SOURCE_INC_XFM_ADDCONDITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/inc/xmlxtexp.hxx b/svx/source/inc/xmlxtexp.hxx
index 10bd4badda41..16f04e9c7fe0 100644
--- a/svx/source/inc/xmlxtexp.hxx
+++ b/svx/source/inc/xmlxtexp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XMLXTEXP_HXX
-#define _SVX_XMLXTEXP_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_XMLXTEXP_HXX
+#define INCLUDED_SVX_SOURCE_INC_XMLXTEXP_HXX
 
 #include "xmloff/xmlexp.hxx"
 
diff --git a/svx/source/inc/xmlxtimp.hxx b/svx/source/inc/xmlxtimp.hxx
index d1815531fdbe..294a477b19f2 100644
--- a/svx/source/inc/xmlxtimp.hxx
+++ b/svx/source/inc/xmlxtimp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_XMLXTIMP_HXX
-#define _SVX_XMLXTIMP_HXX
+#ifndef INCLUDED_SVX_SOURCE_INC_XMLXTIMP_HXX
+#define INCLUDED_SVX_SOURCE_INC_XMLXTIMP_HXX
 
 #include <xmloff/xmlimp.hxx>
 
diff --git a/svx/source/sdr/contact/sdrmediawindow.hxx b/svx/source/sdr/contact/sdrmediawindow.hxx
index a6eb099b94d2..e1d3087913d3 100644
--- a/svx/source/sdr/contact/sdrmediawindow.hxx
+++ b/svx/source/sdr/contact/sdrmediawindow.hxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_SDRMEDIAWIMNDOW_HXX
+#ifndef INCLUDED_SVX_SOURCE_SDR_CONTACT_SDRMEDIAWINDOW_HXX
 
 #include <avmedia/mediawindow.hxx>
 
diff --git a/svx/source/sidebar/EmptyPanel.hxx b/svx/source/sidebar/EmptyPanel.hxx
index 96a674bdd994..5457d4733ab5 100644
--- a/svx/source/sidebar/EmptyPanel.hxx
+++ b/svx/source/sidebar/EmptyPanel.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_DEBUG_EMPTY_PANEL_HXX
-#define SVX_SIDEBAR_DEBUG_EMPTY_PANEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_EMPTYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_EMPTYPANEL_HXX
 
 #include <vcl/window.hxx>
 #include <vcl/ctrl.hxx>
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index ccd15aadb0c3..80304f575387 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -15,8 +15,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_PROPERTYPANEL_AREAPAGE_HXX
-#define SVX_PROPERTYPANEL_AREAPAGE_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
 
 #include <svx/sidebar/ColorPopup.hxx>
 #include "AreaTransparencyGradientPopup.hxx"
@@ -187,6 +187,6 @@ private:
 
 
 
-#endif // SVX_PROPERTYPANEL_AREAPAGE_HXX
+#endif // INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX
 
 // eof
diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
index 7c11f6b535d6..a4c8f178abc2 100644
--- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
+++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx
@@ -15,8 +15,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_TRANSPARENCY_GRADIENT_POPUP_HXX_
-#define _SVX_SIDEBAR_TRANSPARENCY_GRADIENT_POPUP_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREATRANSPARENCYGRADIENTPOPUP_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREATRANSPARENCYGRADIENTPOPUP_HXX
 
 #include "svx/sidebar/Popup.hxx"
 
diff --git a/svx/source/sidebar/debug/ContextPanel.hxx b/svx/source/sidebar/debug/ContextPanel.hxx
index d7a91c2b6596..fd714cfd732c 100644
--- a/svx/source/sidebar/debug/ContextPanel.hxx
+++ b/svx/source/sidebar/debug/ContextPanel.hxx
@@ -15,8 +15,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_DEBUG_CONTEXT_PANEL_HXX
-#define SVX_SIDEBAR_DEBUG_CONTEXT_PANEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_DEBUG_CONTEXTPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_DEBUG_CONTEXTPANEL_HXX
 
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
 #include <vcl/window.hxx>
diff --git a/svx/source/sidebar/debug/NotYetImplementedPanel.hxx b/svx/source/sidebar/debug/NotYetImplementedPanel.hxx
index 575c810a147a..0afb6490b2f0 100644
--- a/svx/source/sidebar/debug/NotYetImplementedPanel.hxx
+++ b/svx/source/sidebar/debug/NotYetImplementedPanel.hxx
@@ -15,8 +15,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_DEBUG_NOT_YET_IMPLEMENTED_PANEL_HXX
-#define SVX_SIDEBAR_DEBUG_NOT_YET_IMPLEMENTED_PANEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_DEBUG_NOTYETIMPLEMENTEDPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_DEBUG_NOTYETIMPLEMENTEDPANEL_HXX
 
 #include <vcl/window.hxx>
 #include <vcl/fixed.hxx>
diff --git a/svx/source/sidebar/gallery/GalleryPanel.hxx b/svx/source/sidebar/gallery/GalleryPanel.hxx
index 8efb8512e650..d75f08050e33 100644
--- a/svx/source/sidebar/gallery/GalleryPanel.hxx
+++ b/svx/source/sidebar/gallery/GalleryPanel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SVX_SIDEBAR_GALLERY_PANEL_HXX
-#define SVX_SIDEBAR_GALLERY_PANEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_GALLERY_GALLERYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_GALLERY_GALLERYPANEL_HXX
 
 class GelleryPanel
 {
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index 6c9168c144a2..9a7852957f06 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -15,8 +15,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_PROPERTYPANEL_GRAPHICPAGE_HXX
-#define SVX_PROPERTYPANEL_GRAPHICPAGE_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_GRAPHIC_GRAPHICPROPERTYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_GRAPHIC_GRAPHICPROPERTYPANEL_HXX
 
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.hxx b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
index 2bdaa1196e36..25ff865bcce0 100644
--- a/svx/source/sidebar/insert/InsertPropertyPanel.hxx
+++ b/svx/source/sidebar/insert/InsertPropertyPanel.hxx
@@ -15,8 +15,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_INSERT_PROPERTY_PAGE_HXX
-#define SVX_SIDEBAR_INSERT_PROPERTY_PAGE_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_INSERT_INSERTPROPERTYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_INSERT_INSERTPROPERTYPANEL_HXX
 
 #include <vcl/ctrl.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index 0147234e809e..b19a61090cb2 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -15,8 +15,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_PROPERTYPANEL_LINEPAGE_HXX
-#define SVX_PROPERTYPANEL_LINEPAGE_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEPROPERTYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEPROPERTYPANEL_HXX
 
 #include <svx/xdash.hxx>
 #include <vcl/ctrl.hxx>
diff --git a/svx/source/sidebar/line/LineWidthPopup.hxx b/svx/source/sidebar/line/LineWidthPopup.hxx
index d9c3dff748e2..6fe415a3958c 100644
--- a/svx/source/sidebar/line/LineWidthPopup.hxx
+++ b/svx/source/sidebar/line/LineWidthPopup.hxx
@@ -15,8 +15,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_LINE_WIDTH_POPUP_HXX_
-#define _SVX_SIDEBAR_LINE_WIDTH_POPUP_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEWIDTHPOPUP_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEWIDTHPOPUP_HXX
 
 #include "svx/sidebar/Popup.hxx"
 
diff --git a/svx/source/sidebar/line/LineWidthValueSet.hxx b/svx/source/sidebar/line/LineWidthValueSet.hxx
index 20492e5ff992..d86b106b1cd5 100644
--- a/svx/source/sidebar/line/LineWidthValueSet.hxx
+++ b/svx/source/sidebar/line/LineWidthValueSet.hxx
@@ -15,8 +15,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_LINE_WIDTH_VALUE_SET_HXX
-#define SVX_SIDEBAR_LINE_WIDTH_VALUE_SET_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEWIDTHVALUESET_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEWIDTHVALUESET_HXX
 
 #include <svtools/valueset.hxx>
 #include <vcl/image.hxx>
@@ -48,6 +48,6 @@ protected:
 
 } } // end of namespace svx::sidebar
 
-#endif // SVX_SIDEBAR_LINE_WIDTH_VALUE_SET_HXX
+#endif // INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEWIDTHVALUESET_HXX
 
 // eof
diff --git a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx
index 9018b21e52e2..4e7b42848daf 100644
--- a/svx/source/sidebar/paragraph/ParaBulletsControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsControl.hxx
@@ -15,8 +15,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_BULLETS_CONTROL_HXX_
-#define _SVX_SIDEBAR_BULLETS_CONTROL_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARABULLETSCONTROL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARABULLETSCONTROL_HXX
 
 #include "svx/sidebar/PopupControl.hxx"
 #include "svx/sidebar/ValueSetWithTextControl.hxx"
diff --git a/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx b/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx
index c8b645b2bdf1..7af0182b262c 100644
--- a/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx
+++ b/svx/source/sidebar/paragraph/ParaBulletsPopup.hxx
@@ -15,8 +15,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_BULLETS_POPUP_HXX_
-#define _SVX_SIDEBAR_BULLETS_POPUP_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARABULLETSPOPUP_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARABULLETSPOPUP_HXX
 
 #include "svx/sidebar/Popup.hxx"
 
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index a841f8af1861..bd788e1ed256 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -15,8 +15,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_LINE_SPACING_CONTROL_HXX_
-#define _SVX_SIDEBAR_LINE_SPACING_CONTROL_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGCONTROL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGCONTROL_HXX
 
 #include "svx/sidebar/PopupControl.hxx"
 #include "svx/sidebar/ValueSetWithTextControl.hxx"
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx
index b040ac393b70..029a618f5b14 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx
@@ -15,8 +15,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_LINE_SPACING_POPUP_HXX_
-#define _SVX_SIDEBAR_LINE_SPACING_POPUP_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
 
 #include "svx/sidebar/Popup.hxx"
 
diff --git a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx
index 7096ab0b6f1b..136e91efdc79 100644
--- a/svx/source/sidebar/paragraph/ParaNumberingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaNumberingControl.hxx
@@ -15,8 +15,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_NUMBERING_CONTROL_HXX_
-#define _SVX_SIDEBAR_NUMBERING_CONTROL_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARANUMBERINGCONTROL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARANUMBERINGCONTROL_HXX
 
 
 #include "svx/sidebar/PopupControl.hxx"
diff --git a/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx b/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx
index b682ba66a7e5..d56398b208ec 100644
--- a/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx
+++ b/svx/source/sidebar/paragraph/ParaNumberingPopup.hxx
@@ -15,8 +15,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_NUMBERING_POPUP_HXX_
-#define _SVX_SIDEBAR_NUMBERING_POPUP_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARANUMBERINGPOPUP_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARANUMBERINGPOPUP_HXX
 
 #include "svx/sidebar/Popup.hxx"
 
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 52d1eb824872..c30d7fef6a22 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -15,8 +15,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_PARA_PROPERTY_PANEL_HXX
-#define SVX_SIDEBAR_PARA_PROPERTY_PANEL_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARAPROPERTYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARAPROPERTYPANEL_HXX
 
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 4c3b6623db2b..f7892827f3d1 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -15,8 +15,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_PROPERTYPANEL_POSIZEPAGE_HXX
-#define SVX_PROPERTYPANEL_POSIZEPAGE_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_POSSIZE_POSSIZEPROPERTYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_POSSIZE_POSSIZEPROPERTYPANEL_HXX
 
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
@@ -180,6 +180,6 @@ private:
 
 
 
-#endif // SVX_PROPERTYPANEL_POSIZEPAGE_HXX
+#endif // INCLUDED_SVX_SOURCE_SIDEBAR_POSSIZE_POSSIZEPROPERTYPANEL_HXX
 
 // eof
diff --git a/svx/source/sidebar/text/SvxSBFontNameBox.hxx b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
index 8c5fa2fbd18a..c7af9ed97338 100644
--- a/svx/source/sidebar/text/SvxSBFontNameBox.hxx
+++ b/svx/source/sidebar/text/SvxSBFontNameBox.hxx
@@ -15,8 +15,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_SB_FONT_NAME_BOX_HXX
-#define SVX_SIDEBAR_SB_FONT_NAME_BOX_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_SVXSBFONTNAMEBOX_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_SVXSBFONTNAMEBOX_HXX
 
 #include <sfx2/bindings.hxx>
 #include <svtools/ctrlbox.hxx>
diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
index b4372c53703b..cb5bfae6b24d 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx
@@ -15,8 +15,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_CHARACTER_SPACING_CONTROL_HXX_
-#define _SVX_SIDEBAR_CHARACTER_SPACING_CONTROL_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTCHARACTERSPACINGCONTROL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTCHARACTERSPACINGCONTROL_HXX
 
 #include "svx/sidebar/PopupControl.hxx"
 #include "svx/sidebar/ValueSetWithTextControl.hxx"
diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
index 5aa78dc7a6c8..44861508dee5 100644
--- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
+++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx
@@ -15,8 +15,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_CHARACTER_SPACING_POPUP_HXX_
-#define _SVX_SIDEBAR_CHARACTER_SPACING_POPUP_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTCHARACTERSPACINGPOPUP_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTCHARACTERSPACINGPOPUP_HXX
 
 #include "svx/sidebar/Popup.hxx"
 
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 342b9a970c5b..be7ab6ef3e5e 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -15,8 +15,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_TEXT_PROPERTY_PAGE_HXX
-#define SVX_SIDEBAR_TEXT_PROPERTY_PAGE_HXX
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTPROPERTYPANEL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTPROPERTYPANEL_HXX
 
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx
index 1eeb83492dda..05caf06b56f2 100644
--- a/svx/source/sidebar/text/TextUnderlineControl.hxx
+++ b/svx/source/sidebar/text/TextUnderlineControl.hxx
@@ -16,8 +16,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_SIDEBAR_UNDERLINE_CONTROL_HXX_
-#define _SVX_SIDEBAR_UNDERLINE_CONTROL_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINECONTROL_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINECONTROL_HXX
 
 #include "svx/sidebar/PopupControl.hxx"
 #include <sfx2/bindings.hxx>
diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx
index 966c6cef8947..626abf1be685 100644
--- a/svx/source/sidebar/text/TextUnderlinePopup.hxx
+++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx
@@ -15,8 +15,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_UNDERLINE_POPUP_HXX_
-#define _SVX_SIDEBAR_UNDERLINE_POPUP_HXX_
+#ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
+#define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
 
 #include "svx/sidebar/Popup.hxx"
 
diff --git a/svx/source/stbctrls/stbctrls.h b/svx/source/stbctrls/stbctrls.h
index 0b5e56d005d3..8266d97ef068 100644
--- a/svx/source/stbctrls/stbctrls.h
+++ b/svx/source/stbctrls/stbctrls.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_STBCTRLS_H
-#define _SVX_STBCTRLS_H
+#ifndef INCLUDED_SVX_SOURCE_STBCTRLS_STBCTRLS_H
+#define INCLUDED_SVX_SOURCE_STBCTRLS_STBCTRLS_H
 
 // defines ------------------------------------------------------------------
 
diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx
index 0d14a3e3025c..d5b29116fa10 100644
--- a/svx/source/svdraw/gradtrns.hxx
+++ b/svx/source/svdraw/gradtrns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _GRADTRANS_HXX
-#define _GRADTRANS_HXX
+#ifndef INCLUDED_SVX_SOURCE_SVDRAW_GRADTRNS_HXX
+#define INCLUDED_SVX_SOURCE_SVDRAW_GRADTRNS_HXX
 
 #include <svx/xgrad.hxx>
 #include <basegfx/point/b2dpoint.hxx>
@@ -51,6 +51,6 @@ public:
         GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst);
 };
 
-#endif // _GRADTRANS_HXX
+#endif // INCLUDED_SVX_SOURCE_SVDRAW_GRADTRNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdconv.hxx b/svx/source/svdraw/svdconv.hxx
index 9b271d4f523e..dc8fbac4102f 100644
--- a/svx/source/svdraw/svdconv.hxx
+++ b/svx/source/svdraw/svdconv.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _SVDCONV_HXX
-#define _SVDCONV_HXX
+#ifndef INCLUDED_SVX_SOURCE_SVDRAW_SVDCONV_HXX
+#define INCLUDED_SVX_SOURCE_SVDRAW_SVDCONV_HXX
 
 #include <sal/types.h>
 
@@ -28,6 +28,6 @@ inline sal_Int32 ImplTwipsToMM(sal_Int32 nVal) { return ((nVal * 127 + 36) / 72)
 template<>
 inline sal_Int64 ImplTwipsToMM(sal_Int64 nVal) { return ((nVal * 127 + 36) / 72); }
 
-#endif // _SVDCONV_HXX
+#endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDCONV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svddrgm1.hxx b/svx/source/svdraw/svddrgm1.hxx
index 00920ce5d434..2cb51d99e8e4 100644
--- a/svx/source/svdraw/svddrgm1.hxx
+++ b/svx/source/svdraw/svddrgm1.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDDRGM1_HXX
-#define _SVDDRGM1_HXX
+#ifndef INCLUDED_SVX_SOURCE_SVDRAW_SVDDRGM1_HXX
+#define INCLUDED_SVX_SOURCE_SVDRAW_SVDDRGM1_HXX
 
 #include <svx/xpoly.hxx>
 #include <svx/svdhdl.hxx>
@@ -260,6 +260,6 @@ public:
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-#endif //_SVDDRGM1_HXX
+#endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDDRGM1_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index 992aabe93643..c6c37d42ba56 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVDFMTF_HXX
-#define _SVDFMTF_HXX
+#ifndef INCLUDED_SVX_SOURCE_SVDRAW_SVDFMTF_HXX
+#define INCLUDED_SVX_SOURCE_SVDRAW_SVDFMTF_HXX
 
 #include <tools/contnr.hxx>
 #include <vcl/metaact.hxx>
@@ -166,6 +166,6 @@ public:
         SvdProgressInfo* pProgrInfo = 0);
 };
 
-#endif //_SVDFMTF_HXX
+#endif // INCLUDED_SVX_SOURCE_SVDRAW_SVDFMTF_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx
index 6938dc2acaab..db9710dae366 100644
--- a/svx/source/table/accessiblecell.hxx
+++ b/svx/source/table/accessiblecell.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_ACCESSIBILITY_ACCESSIBLE_CELL_HXX
-#define _SVX_ACCESSIBILITY_ACCESSIBLE_CELL_HXX
+#ifndef INCLUDED_SVX_SOURCE_TABLE_ACCESSIBLECELL_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_ACCESSIBLECELL_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp>
diff --git a/svx/source/table/cell.hxx b/svx/source/table/cell.hxx
index 34ce0c15d3e0..1b26b1cf9a80 100644
--- a/svx/source/table/cell.hxx
+++ b/svx/source/table/cell.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_CELL_HXX_
-#define _SVX_CELL_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_CELL_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_CELL_HXX
 
 #include <com/sun/star/table/XMergeableCell.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
diff --git a/svx/source/table/cellcursor.hxx b/svx/source/table/cellcursor.hxx
index b5535537a48a..b90937640758 100644
--- a/svx/source/table/cellcursor.hxx
+++ b/svx/source/table/cellcursor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_CELLCURSOR_HXX_
-#define _SVX_CELLCURSOR_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_CELLCURSOR_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_CELLCURSOR_HXX
 
 #include <com/sun/star/table/XMergeableCellRange.hpp>
 #include <com/sun/star/table/XCellCursor.hpp>
diff --git a/svx/source/table/cellrange.hxx b/svx/source/table/cellrange.hxx
index 72ba4e89dbfc..969c97a76c6e 100644
--- a/svx/source/table/cellrange.hxx
+++ b/svx/source/table/cellrange.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_CELLRANGE_HXX_
-#define _SVX_CELLRANGE_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_CELLRANGE_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_CELLRANGE_HXX
 
 #include <com/sun/star/table/XCellRange.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/svx/source/table/celltypes.hxx b/svx/source/table/celltypes.hxx
index ce5043d6b83a..a3e7dd373a5b 100644
--- a/svx/source/table/celltypes.hxx
+++ b/svx/source/table/celltypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_CELLTYPES_HXX_
-#define _SVX_CELLTYPES_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_CELLTYPES_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_CELLTYPES_HXX
 
 #include <rtl/ref.hxx>
 #include <vector>
diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx
index ed8540bac57c..a9c4fa049dd6 100644
--- a/svx/source/table/propertyset.hxx
+++ b/svx/source/table/propertyset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _COMPHELPER_PROPERTYSET_HXX_
-#define _COMPHELPER_PROPERTYSET_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_PROPERTYSET_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_PROPERTYSET_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx
index de135c68ca8f..e8379f6b5147 100644
--- a/svx/source/table/tablecolumn.hxx
+++ b/svx/source/table/tablecolumn.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TABLECOLUMN_HXX_
-#define _SVX_TABLECOLUMN_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLECOLUMN_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_TABLECOLUMN_HXX
 
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/container/XNamed.hpp>
diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx
index 0dd50afe48b8..ba6057adf4f0 100644
--- a/svx/source/table/tablecolumns.hxx
+++ b/svx/source/table/tablecolumns.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TABLECOLUMNS_HXX_
-#define _SVX_TABLECOLUMNS_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLECOLUMNS_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_TABLECOLUMNS_HXX
 
 #include <com/sun/star/table/XTableColumns.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx
index b9b745a89ba5..89d1c24716dc 100644
--- a/svx/source/table/tablehandles.hxx
+++ b/svx/source/table/tablehandles.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TABLEHANDLES_HXX
-#define _SVX_TABLEHANDLES_HXX
+#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLEHANDLES_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_TABLEHANDLES_HXX
 
 #include <svx/sdr/overlay/overlayobject.hxx>
 
diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx
index a9fbee974f59..1d3d4469e59e 100644
--- a/svx/source/table/tablelayouter.hxx
+++ b/svx/source/table/tablelayouter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TABLE_TABLELAYOUTER_HXX_
-#define _SVX_TABLE_TABLELAYOUTER_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLELAYOUTER_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_TABLELAYOUTER_HXX
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/text/WritingMode.hpp>
diff --git a/svx/source/table/tablemodel.hxx b/svx/source/table/tablemodel.hxx
index 77768a635aa3..290b6987cad2 100644
--- a/svx/source/table/tablemodel.hxx
+++ b/svx/source/table/tablemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TABLE_TABLEMODEL_HXX_
-#define _SVX_TABLE_TABLEMODEL_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLEMODEL_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_TABLEMODEL_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/util/XBroadcaster.hpp>
diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx
index d1fd8e1ca723..40252c8961e4 100644
--- a/svx/source/table/tablerow.hxx
+++ b/svx/source/table/tablerow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TABLEROW_HXX_
-#define _SVX_TABLEROW_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLEROW_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_TABLEROW_HXX
 
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/container/XNamed.hpp>
diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx
index 2a17c698c16f..784e5374d7ea 100644
--- a/svx/source/table/tablerows.hxx
+++ b/svx/source/table/tablerows.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TABLEROWS_HXX_
-#define _SVX_TABLEROWS_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLEROWS_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_TABLEROWS_HXX
 
 #include <com/sun/star/table/XTableRows.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx
index 2e32abab1f98..b692de271b4c 100644
--- a/svx/source/table/tableundo.hxx
+++ b/svx/source/table/tableundo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_TABLEUNDO_HXX_
-#define _SVX_TABLEUNDO_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TABLE_TABLEUNDO_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_TABLEUNDO_HXX
 
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/table/CellContentType.hpp>
diff --git a/svx/source/table/viewcontactoftableobj.hxx b/svx/source/table/viewcontactoftableobj.hxx
index c80efe5421bf..a3886339541d 100644
--- a/svx/source/table/viewcontactoftableobj.hxx
+++ b/svx/source/table/viewcontactoftableobj.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SDR_CONTACT_VIEWCONTACTOFTABLEOBJ_HXX
-#define _SDR_CONTACT_VIEWCONTACTOFTABLEOBJ_HXX
+#ifndef INCLUDED_SVX_SOURCE_TABLE_VIEWCONTACTOFTABLEOBJ_HXX
+#define INCLUDED_SVX_SOURCE_TABLE_VIEWCONTACTOFTABLEOBJ_HXX
 
 #include <svx/sdr/contact/viewcontactofsdrobj.hxx>
 
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index edd5adccda9e..0b6836483e14 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -20,8 +20,8 @@
 //========================================================================
 // class SvxColorWindow_Impl --------------------------------------------------
 //========================================================================
-#ifndef __SVX_COLORWINDOW_HXX_
-#define __SVX_COLORWINDOW_HXX_
+#ifndef INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX
+#define INCLUDED_SVX_SOURCE_TBXCTRLS_COLORWINDOW_HXX
 
 #include <sfx2/tbxctrl.hxx>
 #include <svtools/valueset.hxx>
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 9f5f5ff02c7b..b2cbf39f4ea1 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.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_EXTRUSION_CONTROLS_HXX
-#define _SVX_EXTRUSION_CONTROLS_HXX
+#ifndef INCLUDED_SVX_SOURCE_TBXCTRLS_EXTRUSIONCONTROLS_HXX
+#define INCLUDED_SVX_SOURCE_TBXCTRLS_EXTRUSIONCONTROLS_HXX
 
 #include "svx/svxdllapi.h"
 
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index 7d76e36974aa..268f8a91136c 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TEXTCONVERSIONDLGS_CHINESE_DICTIONARYDLG_HXX
-#define _TEXTCONVERSIONDLGS_CHINESE_DICTIONARYDLG_HXX
+#ifndef INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_DICTIONARYDIALOG_HXX
+#define INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_DICTIONARYDIALOG_HXX
 
 #include <vcl/dialog.hxx>
 // header for class FixedLine
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
index c2553a98fc44..f7fa906dadad 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TEXTCONVERSIONDLGS_CHINESE_TRANSLATION_UNODIALOG_HXX
-#define _TEXTCONVERSIONDLGS_CHINESE_TRANSLATION_UNODIALOG_HXX
+#ifndef INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_TRANSLATION_UNODIALOG_HXX
+#define INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_TRANSLATION_UNODIALOG_HXX
 
 #include <cppuhelper/component.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
index d9ff8b97d10d..76dd970b9aae 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TEXTCONVERSIONDLGS_CHINESE_TRANSLATIONDLG_HXX
-#define _TEXTCONVERSIONDLGS_CHINESE_TRANSLATIONDLG_HXX
+#ifndef INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_TRANSLATIONDIALOG_HXX
+#define INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_TRANSLATIONDIALOG_HXX
 
 #include <vcl/dialog.hxx>
 // header for class FixedLine
diff --git a/svx/source/unodialogs/textconversiondlgs/resid.hxx b/svx/source/unodialogs/textconversiondlgs/resid.hxx
index 1d64dca857dc..389f4342de1b 100644
--- a/svx/source/unodialogs/textconversiondlgs/resid.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/resid.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 _TEXTCONVERSIONDLGS_RESID_HXX
-#define _TEXTCONVERSIONDLGS_RESID_HXX
+#ifndef INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_RESID_HXX
+#define INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_RESID_HXX
 
 #include <tools/resid.hxx>
 
diff --git a/svx/source/unodraw/UnoGraphicExporter.hxx b/svx/source/unodraw/UnoGraphicExporter.hxx
index db9e8f719624..864ad2158e67 100644
--- a/svx/source/unodraw/UnoGraphicExporter.hxx
+++ b/svx/source/unodraw/UnoGraphicExporter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOGRAPHICEXPORTER_HXX_
-#define _SVX_UNOGRAPHICEXPORTER_HXX_
+#ifndef INCLUDED_SVX_SOURCE_UNODRAW_UNOGRAPHICEXPORTER_HXX
+#define INCLUDED_SVX_SOURCE_UNODRAW_UNOGRAPHICEXPORTER_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 
diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx
index 3aa0b21afbbe..c6140f6c9d3a 100644
--- a/svx/source/unodraw/UnoNameItemTable.hxx
+++ b/svx/source/unodraw/UnoNameItemTable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNONAMEITEMTABLE_HXX_
-#define _SVX_UNONAMEITEMTABLE_HXX_
+#ifndef INCLUDED_SVX_SOURCE_UNODRAW_UNONAMEITEMTABLE_HXX
+#define INCLUDED_SVX_SOURCE_UNODRAW_UNONAMEITEMTABLE_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
@@ -80,6 +80,6 @@ public:
     virtual sal_Bool SAL_CALL hasElements(  ) throw( com::sun::star::uno::RuntimeException);
 };
 
-#endif // _SVX_UNONAMEITEMTABLE_HXX_
+#endif // INCLUDED_SVX_SOURCE_UNODRAW_UNONAMEITEMTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/shapeimpl.hxx b/svx/source/unodraw/shapeimpl.hxx
index 750c622f2800..9be6beb08904 100644
--- a/svx/source/unodraw/shapeimpl.hxx
+++ b/svx/source/unodraw/shapeimpl.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_SHAPEIMPL_HXX
-#define _SVX_SHAPEIMPL_HXX
+#ifndef INCLUDED_SVX_SOURCE_UNODRAW_SHAPEIMPL_HXX
+#define INCLUDED_SVX_SOURCE_UNODRAW_SHAPEIMPL_HXX
 
 #include <svx/unoshape.hxx>
 
diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx
index 7977e780298a..13259843295e 100644
--- a/svx/source/unogallery/unogalitem.hxx
+++ b/svx/source/unogallery/unogalitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOGALITEM_HXX
-#define _SVX_UNOGALITEM_HXX
+#ifndef INCLUDED_SVX_SOURCE_UNOGALLERY_UNOGALITEM_HXX
+#define INCLUDED_SVX_SOURCE_UNOGALLERY_UNOGALITEM_HXX
 
 #include <svx/unomodel.hxx>
 #include <comphelper/servicehelper.hxx>
diff --git a/svx/source/unogallery/unogaltheme.hxx b/svx/source/unogallery/unogaltheme.hxx
index 0dc1a1c964e6..c2d06898528b 100644
--- a/svx/source/unogallery/unogaltheme.hxx
+++ b/svx/source/unogallery/unogaltheme.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SVX_UNOGALTHEME_HXX
-#define _SVX_UNOGALTHEME_HXX
+#ifndef INCLUDED_SVX_SOURCE_UNOGALLERY_UNOGALTHEME_HXX
+#define INCLUDED_SVX_SOURCE_UNOGALLERY_UNOGALTHEME_HXX
 
 #include <list>
 
diff --git a/svx/workben/msview/xmlconfig.hxx b/svx/workben/msview/xmlconfig.hxx
index 8250bf3e3753..4ae10e005b7a 100644
--- a/svx/workben/msview/xmlconfig.hxx
+++ b/svx/workben/msview/xmlconfig.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _XMLCONFIG_HXX_
-#define _XMLCONFIG_HXX_
+#ifndef INCLUDED_SVX_WORKBEN_MSVIEW_XMLCONFIG_HXX
+#define INCLUDED_SVX_WORKBEN_MSVIEW_XMLCONFIG_HXX
 
 #include <map>
 #include <list>
author	Thomas Arnhold <thomas@arnhold.org>	2013-10-28 03:41:20 +0100
committer	Thomas Arnhold <thomas@arnhold.org>	2013-10-28 15:16:19 +0100
commit	a4fc939e82b100490d69a61440e2d18a8652e813 (patch)
tree	cf452d1fac9591f7175fc194c36b99f2e7a8a694 /svx
parent	88e78c12cf6388d35194fdc286eaa513ae245240 (diff)