fixincludeguards.sh: include/{toolkit,tools}

Change-Id: I5572c320431222be2405f8c2dc8adeafe4f3828b

63 files changed, 183 insertions, 183 deletions

diff --git a/include/toolkit/awt/animatedimagespeer.hxx b/include/toolkit/awt/animatedimagespeer.hxx
index 9e22d41a948b..9ba8608e3e61 100644
--- a/include/toolkit/awt/animatedimagespeer.hxx
+++ b/include/toolkit/awt/animatedimagespeer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_ANIMATEDIMAGEPEER_HXX
-#define TOOLKIT_ANIMATEDIMAGEPEER_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
+#define INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
 
 #include "toolkit/awt/vclxwindow.hxx"
 
@@ -94,6 +94,6 @@ namespace toolkit
 } // namespace toolkit
 //......................................................................................................................
 
-#endif // TOOLKIT_ANIMATEDIMAGEPEER_HXX
+#endif // INCLUDED_TOOLKIT_AWT_ANIMATEDIMAGESPEER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/scrollabledialog.hxx b/include/toolkit/awt/scrollabledialog.hxx
index 29651938806f..b340efd49e1e 100644
--- a/include/toolkit/awt/scrollabledialog.hxx
+++ b/include/toolkit/awt/scrollabledialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
-#define TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
+#define INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/scrbar.hxx>
@@ -78,6 +78,6 @@ namespace toolkit
 } // namespacetoolkit
 //........................................................................
 
-#endif // TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
+#endif // INCLUDED_TOOLKIT_AWT_SCROLLABLEDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index 379dbb5b7c8a..e1b7ff0198b4 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
-#define _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/accessibility/XAccessible.hpp>
@@ -150,6 +150,6 @@ private:
 ---------------------------------------------------------- */
 
 
-#endif // _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxbitmap.hxx b/include/toolkit/awt/vclxbitmap.hxx
index bec83977b21b..6509e75ac512 100644
--- a/include/toolkit/awt/vclxbitmap.hxx
+++ b/include/toolkit/awt/vclxbitmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXBITMAP_HXX_
-#define _TOOLKIT_AWT_VCLXBITMAP_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX
 
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/awt/XDisplayBitmap.hpp>
@@ -75,6 +75,6 @@ public:
 
 
 
-#endif // _TOOLKIT_AWT_VCLXBITMAP_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXBITMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxcontainer.hxx b/include/toolkit/awt/vclxcontainer.hxx
index 0b4b0be97127..3f72f81cd1a8 100644
--- a/include/toolkit/awt/vclxcontainer.hxx
+++ b/include/toolkit/awt/vclxcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXCONTAINER_HXX_
-#define _TOOLKIT_AWT_VCLXCONTAINER_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX
 
 
 #include <com/sun/star/awt/XVclContainer.hpp>
@@ -71,6 +71,6 @@ public:
 
 
 
-#endif // _TOOLKIT_AWT_VCLXCONTAINER_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 5e3167ca42f1..7945c6777ccd 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXDEVICE_HXX_
-#define _TOOLKIT_AWT_VCLXDEVICE_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/awt/XDevice.hpp>
@@ -113,6 +113,6 @@ public:
 
 
 
-#endif // _TOOLKIT_AWT_VCLXDEVICE_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXDEVICE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index 71591113857c..679c61f3bc65 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXFONT_HXX_
-#define _TOOLKIT_AWT_VCLXFONT_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/awt/XFont2.hpp>
@@ -84,6 +84,6 @@ public:
 
 
 
-#endif // _TOOLKIT_AWT_VCLXFONT_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXFONT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxgraphics.hxx b/include/toolkit/awt/vclxgraphics.hxx
index 979ed88f8c44..9a1636fe10e9 100644
--- a/include/toolkit/awt/vclxgraphics.hxx
+++ b/include/toolkit/awt/vclxgraphics.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXGRAPHICS_HXX_
-#define _TOOLKIT_AWT_VCLXGRAPHICS_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX
 
 
 #include <com/sun/star/awt/XGraphics2.hpp>
@@ -135,6 +135,6 @@ public:
     virtual void SAL_CALL drawImage( ::sal_Int32 nX, ::sal_Int32 nY, ::sal_Int32 nWidth, ::sal_Int32 nHeight, ::sal_Int16 nStyle, const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& aGraphic ) throw (::com::sun::star::uno::RuntimeException);
 };
 
-#endif // _TOOLKIT_AWT_VCLXGRAPHICS_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXGRAPHICS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxmenu.hxx b/include/toolkit/awt/vclxmenu.hxx
index 77b0cfef221b..fa9d012a3245 100644
--- a/include/toolkit/awt/vclxmenu.hxx
+++ b/include/toolkit/awt/vclxmenu.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXMENU_HXX_
-#define _TOOLKIT_AWT_VCLXMENU_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX
 
 #include <toolkit/dllapi.h>
 #include <toolkit/helper/listenermultiplexer.hxx>
@@ -157,6 +157,6 @@ public:
     VCLXPopupMenu( PopupMenu* pPopMenu );
 };
 
-#endif // _TOOLKIT_AWT_VCLXMENU_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXMENU_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxpointer.hxx b/include/toolkit/awt/vclxpointer.hxx
index a608e430817f..55ea37760f4f 100644
--- a/include/toolkit/awt/vclxpointer.hxx
+++ b/include/toolkit/awt/vclxpointer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXPOINTER_HXX_
-#define _TOOLKIT_AWT_VCLXPOINTER_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX
 
 
 #include <com/sun/star/awt/XPointer.hpp>
@@ -73,6 +73,6 @@ public:
 
 
 
-#endif // _TOOLKIT_AWT_VCLXPOINTER_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXPOINTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx
index 1d7aa05b0a1a..70b01b2b4b30 100644
--- a/include/toolkit/awt/vclxprinter.hxx
+++ b/include/toolkit/awt/vclxprinter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXPRINTER_HXX_
-#define _TOOLKIT_AWT_VCLXPRINTER_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX
 
 
 #include <com/sun/star/awt/XPrinterPropertySet.hpp>
@@ -185,6 +185,6 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException);
 };
 
-#endif // _TOOLKIT_AWT_VCLXPRINTER_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXPRINTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxregion.hxx b/include/toolkit/awt/vclxregion.hxx
index 806396e0c51b..eeaa93ce20d0 100644
--- a/include/toolkit/awt/vclxregion.hxx
+++ b/include/toolkit/awt/vclxregion.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXREGION_HXX_
-#define _TOOLKIT_AWT_VCLXREGION_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX
 
 
 #include <com/sun/star/awt/XRegion.hpp>
@@ -84,6 +84,6 @@ public:
 
 
 
-#endif // _TOOLKIT_AWT_VCLXREGION_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXREGION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxspinbutton.hxx b/include/toolkit/awt/vclxspinbutton.hxx
index f1abf21f77f2..59e7a872d465 100644
--- a/include/toolkit/awt/vclxspinbutton.hxx
+++ b/include/toolkit/awt/vclxspinbutton.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 TOOLKIT_AWT_VCLXSPINBUTTON_HXX
-#define TOOLKIT_AWT_VCLXSPINBUTTON_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
@@ -88,6 +88,6 @@ namespace toolkit
 } // namespacetoolkit
 //........................................................................
 
-#endif // TOOLKIT_INC_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
+#endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_VCLXSPINBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxsystemdependentwindow.hxx b/include/toolkit/awt/vclxsystemdependentwindow.hxx
index ebb4d2408942..a7726df3f560 100644
--- a/include/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/include/toolkit/awt/vclxsystemdependentwindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX_
-#define _TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX
 
 
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
@@ -55,6 +55,6 @@ public:
 
 
 
-#endif // _TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXSYSTEMDEPENDENTWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxtabpagecontainer.hxx b/include/toolkit/awt/vclxtabpagecontainer.hxx
index af55ed3d6ab4..142d728d9c36 100644
--- a/include/toolkit/awt/vclxtabpagecontainer.hxx
+++ b/include/toolkit/awt/vclxtabpagecontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX_
-#define _TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/beans/PropertyValues.hpp>
@@ -76,6 +76,6 @@ private:
     TabPageListenerMultiplexer m_aTabPageListeners;
     ::std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::awt::tab::XTabPage > > m_aTabPages;
 };
-#endif // _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxtabpagemodel.hxx b/include/toolkit/awt/vclxtabpagemodel.hxx
index 091c5592a765..f65688f00d41 100644
--- a/include/toolkit/awt/vclxtabpagemodel.hxx
+++ b/include/toolkit/awt/vclxtabpagemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_
-#define _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/beans/PropertyValues.hpp>
@@ -68,6 +68,6 @@ public:
 protected:
     ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
 };
-#endif // _TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXTABPAGEMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxtoolkit.hxx b/include/toolkit/awt/vclxtoolkit.hxx
index 9393f10a010a..cea90cfea9d6 100644
--- a/include/toolkit/awt/vclxtoolkit.hxx
+++ b/include/toolkit/awt/vclxtoolkit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXTOOLKIT_HXX_
-#define _TOOLKIT_AWT_VCLXTOOLKIT_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXTOOLKIT_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXTOOLKIT_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/awt/XToolkitExperimental.hpp>
@@ -201,6 +201,6 @@ public:
 
 };
 
-#endif // _TOOLKIT_AWT_VCLXTOOLKIT_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXTOOLKIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxtopwindow.hxx b/include/toolkit/awt/vclxtopwindow.hxx
index 95a742572b94..2bd608010077 100644
--- a/include/toolkit/awt/vclxtopwindow.hxx
+++ b/include/toolkit/awt/vclxtopwindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXTOPWINDOW_HXX_
-#define _TOOLKIT_AWT_VCLXTOPWINDOW_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX
 
 #include <com/sun/star/awt/XSystemDependentWindowPeer.hpp>
 #include <com/sun/star/awt/XTopWindow2.hpp>
@@ -109,6 +109,6 @@ public:
 
 
 
-#endif // _TOOLKIT_AWT_VCLXTOPWINDOW_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXTOPWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx
index 620fd8c82c6d..21cf84212150 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
-#define _TOOLKIT_AWT_VCLXWINDOW_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
 
 #include <toolkit/dllapi.h>
 #include <toolkit/awt/vclxdevice.hxx>
@@ -230,6 +230,6 @@ public:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XStyleSettings > SAL_CALL getStyleSettings() throw (::com::sun::star::uno::RuntimeException);
 };
 
-#endif // _TOOLKIT_AWT_VCLXWINDOW_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx
index f774e64fb3ef..8dc573496abd 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_VCLXWINDOWS_HXX_
-#define _TOOLKIT_AWT_VCLXWINDOWS_HXX_
+#ifndef INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
+#define INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
 
 #include <toolkit/dllapi.h>
 
@@ -1239,6 +1239,6 @@ public:
                         ~VCLXToolBox();
 };
 
-#endif // _TOOLKIT_AWT_VCLXWINDOWS_HXX_
+#endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/xsimpleanimation.hxx b/include/toolkit/awt/xsimpleanimation.hxx
index 3ab8499d63fc..786b4fa6e902 100644
--- a/include/toolkit/awt/xsimpleanimation.hxx
+++ b/include/toolkit/awt/xsimpleanimation.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 TOOLKIT_AWT_XSIMPLEANIMATION_HXX
-#define TOOLKIT_AWT_XSIMPLEANIMATION_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
+#define INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
@@ -65,6 +65,6 @@ namespace toolkit
 } // namespacetoolkit
 //........................................................................
 
-#endif // TOOLKIT_INC_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
+#endif // TOOLKIT_INC_ INCLUDED_TOOLKIT_AWT_XSIMPLEANIMATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/awt/xthrobber.hxx b/include/toolkit/awt/xthrobber.hxx
index 2c8ad5d0817e..e1b19c7b2b3f 100644
--- a/include/toolkit/awt/xthrobber.hxx
+++ b/include/toolkit/awt/xthrobber.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 TOOLKIT_AWT_XTHROBBER_HXX
-#define TOOLKIT_AWT_XTHROBBER_HXX
+#ifndef INCLUDED_TOOLKIT_AWT_XTHROBBER_HXX
+#define INCLUDED_TOOLKIT_AWT_XTHROBBER_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
 #include <toolkit/helper/listenermultiplexer.hxx>
@@ -68,6 +68,6 @@ namespace toolkit
 } // namespacetoolkit
 //........................................................................
 
-#endif // TOOLKIT_AWT_XTHROBBER_HXX
+#endif // INCLUDED_TOOLKIT_AWT_XTHROBBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx b/include/toolkit/controls/accessiblecontrolcontext.hxx
index dedc5bcd842d..e9184e65ef34 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_ACCESSIBLE_CONTROL_CONTEXT_HXX
-#define TOOLKIT_ACCESSIBLE_CONTROL_CONTEXT_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX
 
 #include <comphelper/accessiblecomponenthelper.hxx>
 #include <comphelper/accimplaccess.hxx>
@@ -124,6 +124,6 @@ namespace toolkit
 }   // namespace toolkit
 //........................................................................
 
-#endif // TOOLKIT_ACCESSIBLE_CONTROL_CONTEXT_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_ACCESSIBLECONTROLCONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/animatedimages.hxx b/include/toolkit/controls/animatedimages.hxx
index dd0757a3e5a1..d85ca32fc595 100644
--- a/include/toolkit/controls/animatedimages.hxx
+++ b/include/toolkit/controls/animatedimages.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_ANIMATEDIMAGES_HXX
-#define TOOLKIT_ANIMATEDIMAGES_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
 
 #include "toolkit/controls/unocontrolbase.hxx"
 #include "toolkit/controls/unocontrolmodel.hxx"
@@ -133,6 +133,6 @@ namespace toolkit
 } // namespace toolkit
 //......................................................................................................................
 
-#endif // TOOLKIT_ANIMATEDIMAGES_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_ANIMATEDIMAGES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index e84ddd1f0380..ce9949a0b7b8 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_CONTROL_MODEL_CONTAINERBASE_HXX
-#define TOOLKIT_CONTROL_MODEL_CONTAINERBASE_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_CONTROLMODELCONTAINERBASE_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_CONTROLMODELCONTAINERBASE_HXX
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XContainer.hpp>
diff --git a/include/toolkit/controls/dialogcontrol.hxx b/include/toolkit/controls/dialogcontrol.hxx
index cb044cf7068c..fdf2ce08b73b 100644
--- a/include/toolkit/controls/dialogcontrol.hxx
+++ b/include/toolkit/controls/dialogcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_DIALOG_CONTROL_HXX
-#define TOOLKIT_DIALOG_CONTROL_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX
 
 #include <toolkit/controls/controlmodelcontainerbase.hxx>
 #include <com/sun/star/awt/UnoControlDialog.hpp>
@@ -331,6 +331,6 @@ public:
 DECLIMPL_SERVICEINFO_DERIVED( UnoFrameControl, ControlContainerBase, szServiceName_UnoPageControl )
 };
 
-#endif // TOOLKIT_DIALOG_CONTROL_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_DIALOGCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/formattedcontrol.hxx b/include/toolkit/controls/formattedcontrol.hxx
index ff5c5de51618..94b60aecf137 100644
--- a/include/toolkit/controls/formattedcontrol.hxx
+++ b/include/toolkit/controls/formattedcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_FORMATTED_CONTROL_HXX
-#define TOOLKIT_FORMATTED_CONTROL_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX
 
 #include <toolkit/controls/unocontrols.hxx>
 #include <toolkit/controls/unocontrolmodel.hxx>
@@ -119,6 +119,6 @@ namespace toolkit
 }   // namespace toolkit
 //........................................................................
 
-#endif // TOOLKIT_FORMATTED_CONTROL_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_FORMATTEDCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/geometrycontrolmodel.hxx b/include/toolkit/controls/geometrycontrolmodel.hxx
index 03898a1a2e0b..861c98fae82d 100644
--- a/include/toolkit/controls/geometrycontrolmodel.hxx
+++ b/include/toolkit/controls/geometrycontrolmodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_
-#define _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX
 
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/uno3.hxx>
@@ -257,6 +257,6 @@ namespace com { namespace sun { namespace star {
 // }    // namespace toolkit
 //........................................................................
 
-#endif // _TOOLKIT_HELPERS_GEOMETRYCONTROLMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_GEOMETRYCONTROLMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/roadmapcontrol.hxx b/include/toolkit/controls/roadmapcontrol.hxx
index bb7d39a6ea0d..20be6e9a0af7 100644
--- a/include/toolkit/controls/roadmapcontrol.hxx
+++ b/include/toolkit/controls/roadmapcontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_ROADMAP_CONTROL_HXX
-#define TOOLKIT_ROADMAP_CONTROL_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX
 
 
 #include <toolkit/controls/unocontrols.hxx>
@@ -188,6 +188,6 @@ namespace toolkit
 
 
 
-#endif // _TOOLKIT_ROADMAP_CONTROL_HXX
+#endif // _ INCLUDED_TOOLKIT_CONTROLS_ROADMAPCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/roadmapentry.hxx b/include/toolkit/controls/roadmapentry.hxx
index d6a7a25be877..da66948d11e6 100644
--- a/include/toolkit/controls/roadmapentry.hxx
+++ b/include/toolkit/controls/roadmapentry.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 _TOOLKIT_ROADMAPENTRY_HXX_
-#define _TOOLKIT_ROADMAPENTRY_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_ROADMAPENTRY_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_ROADMAPENTRY_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/include/toolkit/controls/spinningprogress.hxx b/include/toolkit/controls/spinningprogress.hxx
index 819749e0f28e..bfa2f43fdd1f 100644
--- a/include/toolkit/controls/spinningprogress.hxx
+++ b/include/toolkit/controls/spinningprogress.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_SPINNINGPROGRESS_HXX
-#define TOOLKIT_SPINNINGPROGRESS_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_SPINNINGPROGRESS_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_SPINNINGPROGRESS_HXX
 
 #include "toolkit/controls/animatedimages.hxx"
 
@@ -57,6 +57,6 @@ namespace toolkit
 } // namespace toolkit
 //......................................................................................................................
 
-#endif // TOOLKIT_SPINNINGPROGRESS_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_SPINNINGPROGRESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/stdtabcontroller.hxx b/include/toolkit/controls/stdtabcontroller.hxx
index dd54c9521b47..9c790c9d5af2 100644
--- a/include/toolkit/controls/stdtabcontroller.hxx
+++ b/include/toolkit/controls/stdtabcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX_
-#define _TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLER_HXX
 
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/include/toolkit/controls/stdtabcontrollermodel.hxx b/include/toolkit/controls/stdtabcontrollermodel.hxx
index 06134170e556..dc34e43dedbb 100644
--- a/include/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/include/toolkit/controls/stdtabcontrollermodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX_
-#define _TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_STDTABCONTROLLERMODEL_HXX
 
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/include/toolkit/controls/tabpagecontainer.hxx b/include/toolkit/controls/tabpagecontainer.hxx
index 1e384524e2dd..502ff9f97a19 100644
--- a/include/toolkit/controls/tabpagecontainer.hxx
+++ b/include/toolkit/controls/tabpagecontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_TABPAGE_CONTAINER_HXX
-#define TOOLKIT_TABPAGE_CONTAINER_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TABPAGECONTAINER_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TABPAGECONTAINER_HXX
 
 #include <com/sun/star/awt/tab/XTabPageContainer.hpp>
 #include <com/sun/star/awt/tab/XTabPageContainerModel.hpp>
@@ -129,6 +129,6 @@ private:
     TabPageListenerMultiplexer  m_aTabPageListeners;
 };
 
-#endif // _TOOLKIT_TABPAGE_CONTAINER_HXX
+#endif // _ INCLUDED_TOOLKIT_CONTROLS_TABPAGECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tabpagemodel.hxx b/include/toolkit/controls/tabpagemodel.hxx
index 63684751fe4d..6457ca31bed4 100644
--- a/include/toolkit/controls/tabpagemodel.hxx
+++ b/include/toolkit/controls/tabpagemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_TABPAGE_MODEL_HXX
-#define TOOLKIT_TABPAGE_MODEL_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX
 
 #include <toolkit/controls/controlmodelcontainerbase.hxx>
 #include <com/sun/star/awt/tab/XTabPageModel.hpp>
@@ -84,6 +84,6 @@ public:
     DECLIMPL_SERVICEINFO( UnoControlTabPage, szServiceName_UnoControlTabPage)
 };
 
-#endif // TOOLKIT_TABPAGE_MODEL_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TABPAGEMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tkscrollbar.hxx b/include/toolkit/controls/tkscrollbar.hxx
index b6e59119b2f1..a91f1d7a65a8 100644
--- a/include/toolkit/controls/tkscrollbar.hxx
+++ b/include/toolkit/controls/tkscrollbar.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 TOOLKIT_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
-#define TOOLKIT_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
 
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/helper/servicenames.hxx>
@@ -113,6 +113,6 @@ namespace toolkit
 } // namespacetoolkit
 //........................................................................
 
-#endif // TOOLKIT_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TKSCROLLBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tksimpleanimation.hxx b/include/toolkit/controls/tksimpleanimation.hxx
index 8604097567c3..1936e6622251 100644
--- a/include/toolkit/controls/tksimpleanimation.hxx
+++ b/include/toolkit/controls/tksimpleanimation.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 TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
-#define TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
 
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/helper/servicenames.hxx>
@@ -90,6 +90,6 @@ namespace toolkit
 } // namespacetoolkit
 //........................................................................
 
-#endif // TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TKSIMPLEANIMATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tkspinbutton.hxx b/include/toolkit/controls/tkspinbutton.hxx
index ff134d292a98..cc39df9be606 100644
--- a/include/toolkit/controls/tkspinbutton.hxx
+++ b/include/toolkit/controls/tkspinbutton.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 TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
-#define TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
 
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/helper/servicenames.hxx>
@@ -116,6 +116,6 @@ namespace toolkit
 } // namespacetoolkit
 //........................................................................
 
-#endif // TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TKSPINBUTTON_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/tkthrobber.hxx b/include/toolkit/controls/tkthrobber.hxx
index 24868600aaaf..b32246a27857 100644
--- a/include/toolkit/controls/tkthrobber.hxx
+++ b/include/toolkit/controls/tkthrobber.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 TOOLKIT_CONTROLS_TKTHROBBER_HXX
-#define TOOLKIT_CONTROLS_TKTHROBBER_HXX
+#ifndef INCLUDED_TOOLKIT_CONTROLS_TKTHROBBER_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_TKTHROBBER_HXX
 
 #include <toolkit/controls/unocontrolmodel.hxx>
 #include <toolkit/helper/servicenames.hxx>
@@ -98,6 +98,6 @@ namespace toolkit
 } // namespacetoolkit
 //........................................................................
 
-#endif // TOOLKIT_CONTROLS_TKTHROBBER_HXX
+#endif // INCLUDED_TOOLKIT_CONTROLS_TKTHROBBER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx
index 15aa918abb45..d32ba99362b5 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_CONTROLS_UNOCONTROL_HXX_
-#define _TOOLKIT_CONTROLS_UNOCONTROL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/awt/XControl.hpp>
@@ -232,6 +232,6 @@ private:
 
 
 
-#endif // _TOOLKIT_CONTROLS_UNOCONTROL_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx
index 9319040d59be..c097ffc26f1c 100644
--- a/include/toolkit/controls/unocontrolbase.hxx
+++ b/include/toolkit/controls/unocontrolbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_UNOCONTROLBASE_HXX_
-#define _TOOLKIT_AWT_UNOCONTROLBASE_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX
 
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -63,6 +63,6 @@ protected:
 
 
 
-#endif // _TOOLKIT_AWT_UNOCONTROLBASE_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrolcontainer.hxx b/include/toolkit/controls/unocontrolcontainer.hxx
index d4595459dfaf..9d1327fc6334 100644
--- a/include/toolkit/controls/unocontrolcontainer.hxx
+++ b/include/toolkit/controls/unocontrolcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX_
-#define _TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX
 
 
 #include <com/sun/star/awt/XControlContainer.hpp>
@@ -155,6 +155,6 @@ private:
 
 
 
-#endif // _TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx
index bd5802c3993b..609d9bd1a74a 100644
--- a/include/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/include/toolkit/controls/unocontrolcontainermodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX_
-#define _TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX
 
 
 #include <toolkit/controls/unocontrolmodel.hxx>
@@ -54,6 +54,6 @@ public:
 
 
 
-#endif // _TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLCONTAINERMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx
index 63e052604ea8..e7cf04405635 100644
--- a/include/toolkit/controls/unocontrolmodel.hxx
+++ b/include/toolkit/controls/unocontrolmodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_AWT_UNOCONTROLMODEL_HXX_
-#define _TOOLKIT_AWT_UNOCONTROLMODEL_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX
 
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -181,6 +181,6 @@ public:
         ImplRegisterProperties( aIds ); \
     } while (0)
 
-#endif // _TOOLKIT_AWT_UNOCONTROLMODEL_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx
index 1397cad19758..71f3e76f8e80 100644
--- a/include/toolkit/controls/unocontrols.hxx
+++ b/include/toolkit/controls/unocontrols.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_UNOCONTROLS_HXX_
-#define _TOOLKIT_HELPER_UNOCONTROLS_HXX_
+#ifndef INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX
+#define INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/awt/XTextComponent.hpp>
@@ -1512,6 +1512,6 @@ public:
 
 
 
-#endif // _TOOLKIT_HELPER_UNOCONTROLS_HXX_
+#endif // INCLUDED_TOOLKIT_CONTROLS_UNOCONTROLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/dllapi.h b/include/toolkit/dllapi.h
index bf5615cb3547..4309dcbb2fa3 100644
--- a/include/toolkit/dllapi.h
+++ b/include/toolkit/dllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_DLLAPI_H
-#define TOOLKIT_DLLAPI_H
+#ifndef INCLUDED_TOOLKIT_DLLAPI_H
+#define INCLUDED_TOOLKIT_DLLAPI_H
 
 #include "sal/config.h"
 #include "sal/types.h"
diff --git a/include/toolkit/helper/accessibilityclient.hxx b/include/toolkit/helper/accessibilityclient.hxx
index 02e44e6c47e8..73572154f579 100644
--- a/include/toolkit/helper/accessibilityclient.hxx
+++ b/include/toolkit/helper/accessibilityclient.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_HELPER_ACCESSIBILITY_CLIENT_HXX
-#define TOOLKIT_HELPER_ACCESSIBILITY_CLIENT_HXX
+#ifndef INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX
+#define INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX
 
 #include <toolkit/helper/accessiblefactory.hxx>
 
@@ -61,6 +61,6 @@ namespace toolkit
 }   // namespace toolkit
 //........................................................................
 
-#endif // TOOLKIT_HELPER_ACCESSIBILITY_CLIENT_HXX
+#endif // INCLUDED_TOOLKIT_HELPER_ACCESSIBILITYCLIENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/accessiblefactory.hxx b/include/toolkit/helper/accessiblefactory.hxx
index 66117a6bdbba..0c90cd82be20 100644
--- a/include/toolkit/helper/accessiblefactory.hxx
+++ b/include/toolkit/helper/accessiblefactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX
-#define TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX
+#ifndef INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX
+#define INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX
 
 #include <com/sun/star/uno/Reference.hxx>
 
@@ -129,6 +129,6 @@ namespace toolkit
 }   // namespace toolkit
 //........................................................................
 
-#endif // TOOLKIT_HELPER_ACCESSIBLE_FACTORY_HXX
+#endif // INCLUDED_TOOLKIT_HELPER_ACCESSIBLEFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/convert.hxx b/include/toolkit/helper/convert.hxx
index 27ad9aa17a0e..8040c8d0e91d 100644
--- a/include/toolkit/helper/convert.hxx
+++ b/include/toolkit/helper/convert.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_CONVERT_HXX_
-#define _TOOLKIT_HELPER_CONVERT_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_CONVERT_HXX
+#define INCLUDED_TOOLKIT_HELPER_CONVERT_HXX
 
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/awt/Size.hpp>
@@ -56,6 +56,6 @@ inline ::Rectangle VCLRectangle( const ::com::sun::star::awt::Rectangle& rAWTRec
     return ::Rectangle( ::Point( rAWTRect.X, rAWTRect.Y ), ::Size( rAWTRect.Width, rAWTRect.Height ) );
 }
 
-#endif  // _TOOLKIT_HELPER_CONVERT_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_CONVERT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/emptyfontdescriptor.hxx b/include/toolkit/helper/emptyfontdescriptor.hxx
index 3110d8195f5a..d075b3910fff 100644
--- a/include/toolkit/helper/emptyfontdescriptor.hxx
+++ b/include/toolkit/helper/emptyfontdescriptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX_
-#define _TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX
+#define INCLUDED_TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX
 
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
@@ -44,6 +44,6 @@ public:
 
 
 
-#endif // _TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_EMPTYFONTDESCRIPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/externallock.hxx b/include/toolkit/helper/externallock.hxx
index 5b0421d558e2..f00f1edbbbf8 100644
--- a/include/toolkit/helper/externallock.hxx
+++ b/include/toolkit/helper/externallock.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 _TOOLKIT_HELPER_EXTERNALLOCK_HXX_
-#define _TOOLKIT_HELPER_EXTERNALLOCK_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX
+#define INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX
 
 #include <toolkit/dllapi.h>
 #include <comphelper/accessiblecontexthelper.hxx>
@@ -33,6 +33,6 @@ public:
     virtual void release();
 };
 
-#endif  // _TOOLKIT_HELPER_EXTERNALLOCK_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_EXTERNALLOCK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/formpdfexport.hxx b/include/toolkit/helper/formpdfexport.hxx
index 9e88d71f5b3f..eff8dfc92aa3 100644
--- a/include/toolkit/helper/formpdfexport.hxx
+++ b/include/toolkit/helper/formpdfexport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
-#define _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
+#ifndef INCLUDED_TOOLKIT_HELPER_FORMPDFEXPORT_HXX
+#define INCLUDED_TOOLKIT_HELPER_FORMPDFEXPORT_HXX
 
 #include <toolkit/dllapi.h>
 
@@ -50,6 +50,6 @@ namespace toolkitform
 } // namespace toolkitform
 //........................................................................
 
-#endif // _TOOLKIT_HELPER_FORM_FORMPDFEXPORT_HXX
+#endif // INCLUDED_TOOLKIT_HELPER_FORMPDFEXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/imagealign.hxx b/include/toolkit/helper/imagealign.hxx
index f6f2ac5e3860..ad4ba0134d49 100644
--- a/include/toolkit/helper/imagealign.hxx
+++ b/include/toolkit/helper/imagealign.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TOOLKIT_INC_TOOLKIT_HELPER_IMAGEALIGN_HXX
-#define TOOLKIT_INC_TOOLKIT_HELPER_IMAGEALIGN_HXX
+#ifndef INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX
+#define INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX
 
 #include <sal/types.h>
 #include <vcl/button.hxx>
@@ -48,6 +48,6 @@ namespace toolkit
 } // namespace toolkit
 //........................................................................
 
-#endif // TOOLKIT_INC_TOOLKIT_HELPER_IMAGEALIGN_HXX
+#endif // INCLUDED_TOOLKIT_HELPER_IMAGEALIGN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/listenermultiplexer.hxx b/include/toolkit/helper/listenermultiplexer.hxx
index 538abc95783c..d3586460c817 100644
--- a/include/toolkit/helper/listenermultiplexer.hxx
+++ b/include/toolkit/helper/listenermultiplexer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
-#define _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX
+#define INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/lang/XEventListener.hpp>
@@ -263,6 +263,6 @@ DECL_LISTENERMULTIPLEXER_START_DLLPUB( TabPageListenerMultiplexer, ::com::sun::s
     void SAL_CALL tabPageActivated( const ::com::sun::star::awt::tab::TabPageActivatedEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException);
 DECL_LISTENERMULTIPLEXER_END
 
-#endif // _TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_LISTENERMULTIPLEXER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/macros.hxx b/include/toolkit/helper/macros.hxx
index 435bc0b5f1e1..984e080475fc 100644
--- a/include/toolkit/helper/macros.hxx
+++ b/include/toolkit/helper/macros.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_MACROS_HXX_
-#define _TOOLKIT_HELPER_MACROS_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_MACROS_HXX
+#define INCLUDED_TOOLKIT_HELPER_MACROS_HXX
 
 #include <string.h>
 
@@ -300,6 +300,6 @@ IMPL_LISTENERMULTIPLEXER_LISTENERMETHOD_BODY( ClassName, InterfaceName, MethodNa
 
 
 
-#endif // _TOOLKIT_HELPER_MACROS_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_MACROS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/mutexandbroadcasthelper.hxx b/include/toolkit/helper/mutexandbroadcasthelper.hxx
index f887e018452d..4cc98e6a9304 100644
--- a/include/toolkit/helper/mutexandbroadcasthelper.hxx
+++ b/include/toolkit/helper/mutexandbroadcasthelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX_
-#define _TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_MUTEXANDBROADCASTHELPER_HXX
 
 #include <cppuhelper/interfacecontainer.h>
 
diff --git a/include/toolkit/helper/mutexhelper.hxx b/include/toolkit/helper/mutexhelper.hxx
index 85f98635ab73..1f7a107ec4bf 100644
--- a/include/toolkit/helper/mutexhelper.hxx
+++ b/include/toolkit/helper/mutexhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_MUTEXHELPER_HXX_
-#define _TOOLKIT_HELPER_MUTEXHELPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX
 
 #include <osl/mutex.hxx>
 
@@ -39,6 +39,6 @@ public:
 
 
 
-#endif // _TOOLKIT_HELPER_MUTEXHELPER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_MUTEXHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/property.hxx b/include/toolkit/helper/property.hxx
index 74bdff1ab32c..c9feef42dcb6 100644
--- a/include/toolkit/helper/property.hxx
+++ b/include/toolkit/helper/property.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_PROPERTY_HXX_
-#define _TOOLKIT_HELPER_PROPERTY_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
+#define INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
 
 #include <toolkit/dllapi.h>
 
@@ -248,7 +248,7 @@ sal_Bool                            CompareProperties( const ::com::sun::star::u
 
 
 
-#endif // _TOOLKIT_HELPER_PROPERTY_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_PROPERTY_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/servicenames.hxx b/include/toolkit/helper/servicenames.hxx
index fffdc16d0a6f..0f2b9e3c56e5 100644
--- a/include/toolkit/helper/servicenames.hxx
+++ b/include/toolkit/helper/servicenames.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_SERVICENAMES_HXX_
-#define _TOOLKIT_HELPER_SERVICENAMES_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX
+#define INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX
 
 #include <sal/types.h>
 #include <tools/solar.h>
@@ -109,6 +109,6 @@ extern const sal_Char szServiceName_UnoControlTabPageContainer[];
 
 // ExtUnoWrapper:
 extern const char szServiceName_ImageProducer[], szServiceName2_ImageProducer[];
-#endif // _TOOLKIT_HELPER_SERVICENAMES_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_SERVICENAMES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/tkresmgr.hxx b/include/toolkit/helper/tkresmgr.hxx
index 8e9c07dc7aa1..6e8a170bf7c9 100644
--- a/include/toolkit/helper/tkresmgr.hxx
+++ b/include/toolkit/helper/tkresmgr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_TKRESMGR_HXX_
-#define _TOOLKIT_HELPER_TKRESMGR_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
+#define INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
 
 #include <rtl/ustring.hxx>
 #include <vcl/image.hxx>
@@ -63,6 +63,6 @@ public:
 };
 
 
-#endif // _TOOLKIT_HELPER_TKRESMGR_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_TKRESMGR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/unopropertyarrayhelper.hxx b/include/toolkit/helper/unopropertyarrayhelper.hxx
index b46dcfe9bc99..4a531b72cf17 100644
--- a/include/toolkit/helper/unopropertyarrayhelper.hxx
+++ b/include/toolkit/helper/unopropertyarrayhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_
-#define _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX
 
 #include <toolkit/dllapi.h>
 #include <cppuhelper/propshlp.hxx>
@@ -53,6 +53,6 @@ public:
 
 
 
-#endif // _TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_UNOPROPERTYARRAYHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/unowrapper.hxx b/include/toolkit/helper/unowrapper.hxx
index a0b82f4c175d..cbae08cb4489 100644
--- a/include/toolkit/helper/unowrapper.hxx
+++ b/include/toolkit/helper/unowrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_UNOWRAPPER_HXX_
-#define _TOOLKIT_HELPER_UNOWRAPPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_UNOWRAPPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_UNOWRAPPER_HXX
 
 #include <com/sun/star/awt/XToolkit.hpp>
 #include <com/sun/star/awt/XGraphics.hpp>
@@ -81,6 +81,6 @@ private:
     virtual ~UnoWrapper();
 };
 
-#endif // _TOOLKIT_HELPER_UNOWRAPPER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_UNOWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx
index e6155ef66f7e..a6467b84a2bd 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#define _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
+#ifndef INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX
+#define INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX
 
 #include <toolkit/dllapi.h>
 #include <com/sun/star/uno/Reference.h>
@@ -150,6 +150,6 @@ public:
 };
 
 
-#endif  // _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
+#endif // INCLUDED_TOOLKIT_HELPER_VCLUNOHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */