fixincludeguards.sh: framework

Change-Id: Ia6f3cb21977095df45a176db2bf68f508c70191c
author: Thomas Arnhold <thomas@arnhold.org> 2013-11-05 02:25:45 +0100
committer: Thomas Arnhold <thomas@arnhold.org> 2013-11-05 09:28:53 +0100
commit: 15b5412fad3e6363debb33de583843ca7c9c7299 (patch)
tree: 5cbe55b56abd8f0b0fd546d7a75755469cb454ac /framework
parent: a2502692cd2da8665719b1769eacbf334f7c0293 (diff)
203 files changed, 582 insertions, 582 deletions
diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h
index ef52d0ca4577..6fdc4de405e8 100644
--- a/framework/inc/acceleratorconst.h
+++ b/framework/inc/acceleratorconst.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRAMEWORK_ACCELERATORCONST_H_
-#define _FRAMEWORK_ACCELERATORCONST_H_
+#ifndef INCLUDED_FRAMEWORK_INC_ACCELERATORCONST_H
+#define INCLUDED_FRAMEWORK_INC_ACCELERATORCONST_H
 
 #include <general.h>
 
@@ -61,6 +61,6 @@ namespace framework{
 
 } // namespace framework
 
-#endif // _FRAMEWORK_ACCELERATORCONST_H_
+#endif // INCLUDED_FRAMEWORK_INC_ACCELERATORCONST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx
index 853a433567bc..ffedcd629dba 100644
--- a/framework/inc/classes/actiontriggercontainer.hxx
+++ b/framework/inc/classes/actiontriggercontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_ACTIONTRIGGERCONTAINER_HXX_
-#define __FRAMEWORK_CLASSES_ACTIONTRIGGERCONTAINER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERCONTAINER_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERCONTAINER_HXX
 
 #include <helper/propertysetcontainer.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -68,6 +68,6 @@ class FWE_DLLPUBLIC ActionTriggerContainer :    public PropertySetContainer,
 
 }
 
-#endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERCONTAINER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 042c311971ca..f70f123dee8c 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX_
-#define __FRAMEWORK_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <cppuhelper/propshlp.hxx>
@@ -120,6 +120,6 @@ class ActionTriggerPropertySet :  public ThreadHelpBase                       ,
 
 }
 
-#endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERPROPERTYSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 8788d43ecb1b..b19d7aa7221d 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_ACTIONTRIGGERSEPARATORPROPERTYSET_HXX_
-#define __FRAMEWORK_CLASSES_ACTIONTRIGGERSEPARATORPROPERTYSET_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERSEPARATORPROPERTYSET_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERSEPARATORPROPERTYSET_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <cppuhelper/propshlp.hxx>
@@ -105,6 +105,6 @@ class ActionTriggerSeparatorPropertySet :   public ThreadHelpBase
 
 }
 
-#endif // __FRAMEWORK_CLASSES_ACTIONTRIGGERSEPARATORPROPERTYSET_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_ACTIONTRIGGERSEPARATORPROPERTYSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index a7e4745daf1d..500387aecb7b 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_
-#define __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_CHECKEDITERATOR_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_CHECKEDITERATOR_HXX
 
 #include <sal/types.h>
 
@@ -307,6 +307,6 @@ class CheckedIterator
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_CLASSES_CHECKEDITERATOR_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_CHECKEDITERATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx
index 372fc9a13a0d..340940395164 100644
--- a/framework/inc/classes/converter.hxx
+++ b/framework/inc/classes/converter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_CONVERTER_HXX_
-#define __FRAMEWORK_CLASSES_CONVERTER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX
 
 #include <general.h>
 #include <stdtypes.h>
@@ -46,6 +46,6 @@ class FWI_DLLPUBLIC Converter
 
 }       // namespace framework
 
-#endif  // #ifndef __FRAMEWORK_CLASSES_CONVERTER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 7bc73132f1e6..3c5e14d5ba93 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -24,8 +24,8 @@
       => CheckedIterator will be obsolete!
  */
 
-#ifndef __FRAMEWORK_CLASSES_FILTERCACHE_HXX_
-#define __FRAMEWORK_CLASSES_FILTERCACHE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
 
 #include <classes/filtercachedata.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -327,6 +327,6 @@ class FilterCache   :   private ThreadHelpBase
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_CLASSES_FILTERCACHE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index d585e49ef574..7559f3c09478 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_FILTERCACHEDATA_HXX_
-#define __FRAMEWORK_CLASSES_FILTERCACHEDATA_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
@@ -677,6 +677,6 @@ class FilterCFGAccess : public ::utl::ConfigItem
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_CLASSES_FILTERCACHEDATA_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FILTERCACHEDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index f388cfae4daf..a53a007a9185 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_FRAMECONTAINER_HXX_
-#define __FRAMEWORK_CLASSES_FRAMECONTAINER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FRAMECONTAINER_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_FRAMECONTAINER_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
@@ -106,6 +106,6 @@ class FrameContainer : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_CLASSES_FRAMECONTAINER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_FRAMECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx
index 0fb1e84ed99a..fb13d23f362d 100644
--- a/framework/inc/classes/fwkresid.hxx
+++ b/framework/inc/classes/fwkresid.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_FWKRESID_HXX_
-#define __FRAMEWORK_CLASSES_FWKRESID_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_FWKRESID_HXX
 
 #include <tools/resid.hxx>
 #include <framework/fwedllapi.h>
diff --git a/framework/inc/classes/fwktabwindow.hxx b/framework/inc/classes/fwktabwindow.hxx
index 3a60e3c11245..915ffa581974 100644
--- a/framework/inc/classes/fwktabwindow.hxx
+++ b/framework/inc/classes/fwktabwindow.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 FRAMEWORK_TABWINDOW_HXX
-#define FRAMEWORK_TABWINDOW_HXX
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWKTABWINDOW_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_FWKTABWINDOW_HXX
 
 #include <general.h>
 
diff --git a/framework/inc/classes/fwlresid.hxx b/framework/inc/classes/fwlresid.hxx
index f3b27cb56ef2..11a0ac702af3 100644
--- a/framework/inc/classes/fwlresid.hxx
+++ b/framework/inc/classes/fwlresid.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_FwlResId_HXX_
-#define __FRAMEWORK_CLASSES_FwlResId_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_FWLRESID_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_FWLRESID_HXX
 
 #include <tools/resid.hxx>
 
diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx
index 16fdce231988..3316e3e0e37a 100644
--- a/framework/inc/classes/imagewrapper.hxx
+++ b/framework/inc/classes/imagewrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_IMAGEWRAPPER_HXX_
-#define __FRAMEWORK_CLASSES_IMAGEWRAPPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_IMAGEWRAPPER_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_IMAGEWRAPPER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <com/sun/star/awt/XBitmap.hpp>
@@ -60,6 +60,6 @@ class FWE_DLLPUBLIC ImageWrapper : public ThreadHelpBase
 
 }
 
-#endif // __FRAMEWORK_CLASSES_IMAGEWRAPPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_IMAGEWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/menumanager.hxx b/framework/inc/classes/menumanager.hxx
index f849c28b11f9..d7d22eea72af 100644
--- a/framework/inc/classes/menumanager.hxx
+++ b/framework/inc/classes/menumanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_MENUMANAGER_HXX_
-#define __FRAMEWORK_CLASSES_MENUMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_MENUMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_MENUMANAGER_HXX
 
 #include <vector>
 
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index 7ae333e414d9..3bdd389cc7d9 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_PROPERTYSETHELPER_HXX_
-#define __FRAMEWORK_CLASSES_PROPERTYSETHELPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_PROPERTYSETHELPER_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_PROPERTYSETHELPER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <threadhelp/transactionbase.hxx>
@@ -228,6 +228,6 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_CLASSES_PROPERTYSETHELPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_PROPERTYSETHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index 86227cc3f9cc..a2e356b57e08 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_PROTOCOLHANDLERCACHE_HXX_
-#define __FRAMEWORK_CLASSES_PROTOCOLHANDLERCACHE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX
 
 #include <general.h>
 #include <stdtypes.h>
@@ -162,6 +162,6 @@ class FWI_DLLPUBLIC HandlerCFGAccess : public ::utl::ConfigItem
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_CLASSES_PROTOCOLHANDLERCACHE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx
index 44bca4ed7efb..1d0c70402c8a 100644
--- a/framework/inc/classes/rootactiontriggercontainer.hxx
+++ b/framework/inc/classes/rootactiontriggercontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX_
-#define __FRAMEWORK_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX
 
 #include <helper/propertysetcontainer.hxx>
 #include <vcl/menu.hxx>
@@ -113,6 +113,6 @@ class FWE_DLLPUBLIC RootActionTriggerContainer :  public PropertySetContainer,
 
 }
 
-#endif // __FRAMEWORK_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_ROOTACTIONTRIGGERCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index 88496284b108..cf0b5d70f2e1 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_TASKCREATOR_HXX_
-#define __FRAMEWORK_CLASSES_TASKCREATOR_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_TASKCREATOR_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_TASKCREATOR_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -67,6 +67,6 @@ class TaskCreator : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_CLASSES_TASKCREATOR_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_TASKCREATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
index 028aff44ce5d..088dd18eb043 100644
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CLASSES_WILDCARD_HXX_
-#define __FRAMEWORK_CLASSES_WILDCARD_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
+#define INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -102,6 +102,6 @@ class Wildcard
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_CLASSES_WILDCARD_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_CLASSES_WILDCARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 5e143cc4a4b4..ef116c98ad9c 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_CLOSEDISPATCHER_HXX_
-#define __FRAMEWORK_DISPATCH_CLOSEDISPATCHER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_CLOSEDISPATCHER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_CLOSEDISPATCHER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -300,6 +300,6 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_DISPATCH_CLOSEDISPATCHER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_CLOSEDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index dd1741806ebc..25469dde661b 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX_
-#define __FRAMEWORK_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -74,6 +74,6 @@ class DispatchInformationProvider : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx
index fb2a17ae3173..741930a3d31b 100644
--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_DISPATCHPROVIDER_HXX_
-#define __FRAMEWORK_DISPATCH_DISPATCHPROVIDER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHPROVIDER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHPROVIDER_HXX
 
 #include <services/frame.hxx>
 
@@ -131,6 +131,6 @@ class DispatchProvider  :   // baseclasses
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_DISPATCH_DISPATCHPROVIDER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index d8ed89023c6d..529256b83672 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_INTERCEPTIONHELPER_HXX_
-#define __FRAMEWORK_HELPER_INTERCEPTIONHELPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX
 
 #include <services/frame.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -288,6 +288,6 @@ class InterceptionHelper : // order of base classes is important for right initi
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_HELPER_INTERCEPTIONHELPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx
index 023bee71d5be..98d25caac6b5 100644
--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_MAILTODISPATCHER_HXX_
-#define __FRAMEWORK_DISPATCH_MAILTODISPATCHER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX
 
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
@@ -107,6 +107,6 @@ class MailToDispatcher : // baseclasses
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_DISPATCH_MAILTODISPATCHER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 39cce8372a2c..21f1da739b25 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_MENUDISPATCHER_HXX_
-#define __FRAMEWORK_DISPATCH_MENUDISPATCHER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_MENUDISPATCHER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_MENUDISPATCHER_HXX
 
 #include <classes/taskcreator.hxx>
 #include <services/frame.hxx>
@@ -260,6 +260,6 @@ class MenuDispatcher   :        // baseclasses
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_DISPATCH_MENUDISPATCHER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_MENUDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 3b1482277205..a607677ef0a2 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HANDLER_OXT_HANDLER_HXX_
-#define __FRAMEWORK_HANDLER_OXT_HANDLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <threadhelp/resetableguard.hxx>
@@ -126,6 +126,6 @@ class Oxt_Handler  :    // baseclasses
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_HANDLER_OXT_HANDLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index 8402313066b0..6fafe87b8f42 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_POPUPMENUDISPATCHER_HXX_
-#define __FRAMEWORK_DISPATCH_POPUPMENUDISPATCHER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX
 
 #include <services/frame.hxx>
 #include <macros/xinterface.hxx>
@@ -152,6 +152,6 @@ class PopupMenuDispatcher :     // baseclasses
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_DISPATCH_POPUPMENUDISPATCHER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx
index a3d939595f8d..81c87d72f01b 100644
--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_SERVICEHANDLER_HXX_
-#define __FRAMEWORK_DISPATCH_SERVICEHANDLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX
 
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
@@ -110,6 +110,6 @@ class ServiceHandler : // baseclasses
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_DISPATCH_SERVICEHANDLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index d1596c354ffe..c6e2395530fa 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_STARTMODULEDISPATCHER_HXX_
-#define __FRAMEWORK_DISPATCH_STARTMODULEDISPATCHER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_STARTMODULEDISPATCHER_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_STARTMODULEDISPATCHER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -174,6 +174,6 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_DISPATCH_STARTMODULEDISPATCHER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_STARTMODULEDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx
index 445ecf287cc5..f1c5c510af60 100644
--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_SYSTEMEXEC_HXX_
-#define __FRAMEWORK_DISPATCH_SYSTEMEXEC_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX
+#define INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX
 
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
@@ -108,6 +108,6 @@ class SystemExec :     // baseclasses
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_DISPATCH_SYSTEMEXEC_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h
index d4e994ecf425..4b43e2897295 100644
--- a/framework/inc/dispatchcommands.h
+++ b/framework/inc/dispatchcommands.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCHCOMMANDS_H_
-#define __FRAMEWORK_DISPATCHCOMMANDS_H_
+#ifndef INCLUDED_FRAMEWORK_INC_DISPATCHCOMMANDS_H
+#define INCLUDED_FRAMEWORK_INC_DISPATCHCOMMANDS_H
 
 #include <macros/generic.hxx>
 
@@ -30,6 +30,6 @@ namespace framework{
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_DISPATCHCOMMANDS_H_
+#endif // INCLUDED_FRAMEWORK_INC_DISPATCHCOMMANDS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/fwidllapi.h b/framework/inc/fwidllapi.h
index 933e34f14276..e594dc273f4c 100644
--- a/framework/inc/fwidllapi.h
+++ b/framework/inc/fwidllapi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FWIDLLAPI_H
-#define INCLUDED_FWIDLLAPI_H
+#ifndef INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H
+#define INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H
 
 #include "sal/types.h"
 
@@ -29,6 +29,6 @@
 #endif
 #define FWI_DLLPRIVATE SAL_DLLPRIVATE
 
-#endif /* INCLUDED_FWIDLLAPI_H */
+#endif // INCLUDED_FRAMEWORK_INC_FWIDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/fwkdllapi.h b/framework/inc/fwkdllapi.h
index c43b370e6193..2a12d592ddea 100644
--- a/framework/inc/fwkdllapi.h
+++ b/framework/inc/fwkdllapi.h
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_FWKDLLAPI_H
-#define INCLUDED_FWKDLLAPI_H
+#ifndef INCLUDED_FRAMEWORK_INC_FWKDLLAPI_H
+#define INCLUDED_FRAMEWORK_INC_FWKDLLAPI_H
 
 #include "sal/types.h"
 
 #include <fwidllapi.h>
 
-#endif /* INCLUDED_FWKDLLAPI_H */
+#endif // INCLUDED_FRAMEWORK_INC_FWKDLLAPI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/general.h b/framework/inc/general.h
index 57e24101aca7..1fe4955a39d5 100644
--- a/framework/inc/general.h
+++ b/framework/inc/general.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_GENERAL_H_
-#define __FRAMEWORK_GENERAL_H_
+#ifndef INCLUDED_FRAMEWORK_INC_GENERAL_H
+#define INCLUDED_FRAMEWORK_INC_GENERAL_H
 
 #include <macros/generic.hxx>
 
@@ -29,6 +29,6 @@
 
 #include <rtl/ustring.hxx>
 
-#endif // #ifndef __FRAMEWORK_GENERAL_H_
+#endif // INCLUDED_FRAMEWORK_INC_GENERAL_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index 951e2b0824ca..81a57cf197eb 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX_
-#define __FRAMEWORK_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX
 
 #include <classes/framecontainer.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -85,6 +85,6 @@ class DockingAreaDefaultAcceptor    :   private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/ilayoutnotifications.hxx b/framework/inc/helper/ilayoutnotifications.hxx
index f5497d47e3dd..0063386db2cc 100644
--- a/framework/inc/helper/ilayoutnotifications.hxx
+++ b/framework/inc/helper/ilayoutnotifications.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_
-#define __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_ILAYOUTNOTIFICATIONS_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_ILAYOUTNOTIFICATIONS_HXX
 
 namespace framework
 {
@@ -41,6 +41,6 @@ class ILayoutNotifications
 
 }
 
-#endif // __FRAMEWORK_LAYOUTMANAGER_ILAYOUTNOTIFICATIONS_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_ILAYOUTNOTIFICATIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 672f67fa620d..6689b3301566 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __MISC_HELPER_HXX_
-#define __MISC_HELPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_MISCHELPER_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_MISCHELPER_HXX
 
 #include <com/sun/star/linguistic2/XLanguageGuessing.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -289,6 +289,6 @@ class WeakDocumentEventListener : public ::cppu::WeakImplHelper1<com::sun::star:
 
 } // namespace framework
 
-#endif // __MISC_HELPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_MISCHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/networkdomain.hxx b/framework/inc/helper/networkdomain.hxx
index 037fbc83190e..08d1ce4fc364 100644
--- a/framework/inc/helper/networkdomain.hxx
+++ b/framework/inc/helper/networkdomain.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_NETWORKDOMAIN_HXX_
-#define __FRAMEWORK_HELPER_NETWORKDOMAIN_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_NETWORKDOMAIN_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_NETWORKDOMAIN_HXX
 
 #include <rtl/ustring.hxx>
 #include <fwidllapi.h>
@@ -35,6 +35,6 @@ class FWI_DLLPUBLIC NetworkDomain
 
 }
 
-#endif // __FRAMEWORK_HELPER_NETWORKDOMAIN_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_NETWORKDOMAIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 696fd22ed16f..2347942d7865 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_OCOMPONENTACCESS_HXX_
-#define __FRAMEWORK_HELPER_OCOMPONENTACCESS_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -237,6 +237,6 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_HELPER_OCOMPONENTACCESS_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index e3acf507d094..59d31b204391 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_OCOMPONENTENUMERATION_HXX_
-#define __FRAMEWORK_HELPER_OCOMPONENTENUMERATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -222,6 +222,6 @@ class OComponentEnumeration :   public ThreadHelpBase               ,
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_HELPER_OCOMPONENTENUMERATION_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index acc318b732a4..0ab0c3032dc6 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_OFRAMES_HXX_
-#define __FRAMEWORK_HELPER_OFRAMES_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_OFRAMES_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_OFRAMES_HXX
 
 #include <classes/framecontainer.hxx>
 #include <threadhelp/threadhelpbase.hxx>
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index 9e4a20741f14..bc042f7b7d25 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_PERSISTENTWINDOWSTATE_HXX_
-#define __FRAMEWORK_HELPER_PERSISTENTWINDOWSTATE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -186,6 +186,6 @@ class PersistentWindowState :   // baseclasses (order necessary for right initia
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_HELPER_PERSISTENTWINDOWSTATE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx
index a4297f9a7275..dfe4cc6bd6c5 100644
--- a/framework/inc/helper/propertysetcontainer.hxx
+++ b/framework/inc/helper/propertysetcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_PROPERTYSETCONTAINER_HXX_
-#define __FRAMEWORK_HELPER_PROPERTYSETCONTAINER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_PROPERTYSETCONTAINER_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_PROPERTYSETCONTAINER_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx
index a02019592f14..73c62ab11245 100644
--- a/framework/inc/helper/shareablemutex.hxx
+++ b/framework/inc/helper/shareablemutex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_SHAREABLEMUTEX_HXX_
-#define __FRAMEWORK_HELPER_SHAREABLEMUTEX_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_SHAREABLEMUTEX_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_SHAREABLEMUTEX_HXX
 
 #include <osl/interlck.h>
 #include <osl/mutex.hxx>
@@ -84,6 +84,6 @@ class ShareGuard
 
 }
 
-#endif // #ifndef __FRAMEWORK_HELPER_SHAREABLEMUTEX_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_SHAREABLEMUTEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index e014edd1cfb5..88bac3b1709d 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_STATUSINDICATOR_HXX_
-#define __FRAMEWORK_HELPER_STATUSINDICATOR_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX
 
 //_______________________________________________
 // include files of own module
@@ -119,6 +119,6 @@ class StatusIndicator : private ThreadHelpBase                  // Order of base
 
 } // namespace framework
 
-#endif // __FRAMEWORK_HELPER_STATUSINDICATOR_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 49f4d0fb1344..79ae934d5398 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_STATUSINDICATORFACTORY_HXX_
-#define __FRAMEWORK_HELPER_STATUSINDICATORFACTORY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATORFACTORY_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATORFACTORY_HXX
 
 // Attention: stl headers must(!) be included at first. Otherwise it can make trouble
 // with solaris headers ...
@@ -309,6 +309,6 @@ class StatusIndicatorFactory : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_HELPER_STATUSINDICATORFACTORY_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATORFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index 72d02b7ac88e..53c75608a270 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_TAGWINDOWASMODIFIED_HXX_
-#define __FRAMEWORK_HELPER_TAGWINDOWASMODIFIED_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_TAGWINDOWASMODIFIED_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_TAGWINDOWASMODIFIED_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -116,6 +116,6 @@ class TagWindowAsModified :   // baseclasses (order necessary for right initiali
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_HELPER_TAGWINDOWASMODIFIED_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_TAGWINDOWASMODIFIED_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index 0a7eadfea62b..68890d9c1827 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_
-#define __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_TITLEBARUPDATE_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_TITLEBARUPDATE_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -170,6 +170,6 @@ class TitleBarUpdate : // baseclasses (order necessary for right initialization!
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_HELPER_TITLEBARUPDATE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_TITLEBARUPDATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index 244c24c0b418..cf3aeff9288b 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_
-#define __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_UIELEMENTWRAPPERBASE_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_UIELEMENTWRAPPERBASE_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -113,6 +113,6 @@ class UIElementWrapperBase : protected ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_HELPER_UIELEMENTWRAPPERBASE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_UIELEMENTWRAPPERBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index 3126b13a3c6e..9db9aa6119e3 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_VCLSTATUSINDICATOR_HXX_
-#define __FRAMEWORK_HELPER_VCLSTATUSINDICATOR_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_VCLSTATUSINDICATOR_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_VCLSTATUSINDICATOR_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -106,6 +106,6 @@ class VCLStatusIndicator : private ThreadHelpBase, // must be the first real bas
 
 } // namespace framework
 
-#endif // __FRAMEWORK_HELPER_VCLSTATUSINDICATOR_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_VCLSTATUSINDICATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx
index 29d0fa7d5014..846b67b41a29 100644
--- a/framework/inc/helper/wakeupthread.hxx
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_HELPER_WAKEUPTHREAD_HXX_
-#define __FRAMEWORK_HELPER_WAKEUPTHREAD_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
+#define INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
 
 //_______________________________________________
 // include files of own module
@@ -80,6 +80,6 @@ class WakeUpThread : public ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_HELPER_WAKEUPTHREAD_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx
index 9a5353486b2b..ed0fa1176aef 100644
--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_INTERACTION_QUIETINTERACTION_HXX_
-#define __FRAMEWORK_INTERACTION_QUIETINTERACTION_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_INTERACTION_QUIETINTERACTION_HXX
+#define INCLUDED_FRAMEWORK_INC_INTERACTION_QUIETINTERACTION_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index 90ed3222055c..2a713c60d333 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CONFIG_CONFIGACCESS_HXX_
-#define __FRAMEWORK_CONFIG_CONFIGACCESS_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <general.h>
@@ -94,6 +94,6 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_CONFIG_CONFIGACCESS_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index 6d22c79be635..2fee208358b4 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_JOBS_HELPONSTARTUP_HXX_
-#define __FRAMEWORK_JOBS_HELPONSTARTUP_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_HELPONSTARTUP_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_HELPONSTARTUP_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -210,6 +210,6 @@ class HelpOnStartup : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_JOBS_HELPONSTARTUP_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_HELPONSTARTUP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 199482e14847..c3cac37ad8f3 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_JOBS_JOB_HXX_
-#define __FRAMEWORK_JOBS_JOB_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOB_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_JOB_HXX
 
 #include <jobs/jobresult.hxx>
 #include <jobs/jobdata.hxx>
@@ -220,6 +220,6 @@ class Job : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_JOBS_JOB_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_JOB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index ea903f1b8837..aa8332de3b62 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_JOBS_JOBCONST_HXX_
-#define __FRAMEWORK_JOBS_JOBCONST_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBCONST_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_JOBCONST_HXX
 
 #include <stdtypes.h>
 #include <general.h>
@@ -50,6 +50,6 @@ class FWI_DLLPUBLIC JobConst
 
 } // namespace framework
 
-#endif // __FRAMEWORK_JOBS_JOBCONST_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_JOBCONST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 21ebda963cde..a2df2b108554 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_JOBS_JOBDATA_HXX_
-#define __FRAMEWORK_JOBS_JOBDATA_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBDATA_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_JOBDATA_HXX
 
 #include <jobs/configaccess.hxx>
 #include <jobs/jobresult.hxx>
@@ -267,6 +267,6 @@ class JobData : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_JOBS_JOBDATA_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_JOBDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobdispatch.hxx b/framework/inc/jobs/jobdispatch.hxx
index 82b3277123c3..164df05daae3 100644
--- a/framework/inc/jobs/jobdispatch.hxx
+++ b/framework/inc/jobs/jobdispatch.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_JOBS_JOBDISPATCH_HXX_
-#define __FRAMEWORK_JOBS_JOBDISPATCH_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBDISPATCH_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_JOBDISPATCH_HXX
 
 #include <jobs/configaccess.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -135,6 +135,6 @@ class JobDispatch : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_JOBS_JOBDISPATCH_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_JOBDISPATCH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobexecutor.hxx b/framework/inc/jobs/jobexecutor.hxx
index 7e072dcbc2a6..d4ed3c3b750a 100644
--- a/framework/inc/jobs/jobexecutor.hxx
+++ b/framework/inc/jobs/jobexecutor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_JOBS_JOBEXECUTOR_HXX_
-#define __FRAMEWORK_JOBS_JOBEXECUTOR_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBEXECUTOR_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_JOBEXECUTOR_HXX
 
 #include <jobs/configaccess.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -110,6 +110,6 @@ class JobExecutor : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_JOBS_JOBEXECUTOR_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_JOBEXECUTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index a8da02289747..8c54a19f72f1 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_JOBS_JOBRESULT_HXX_
-#define __FRAMEWORK_JOBS_JOBRESULT_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBRESULT_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_JOBRESULT_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <stdtypes.h>
@@ -124,6 +124,6 @@ class JobResult : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_JOBS_JOBRESULT_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_JOBRESULT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 4faf21b7fff9..2839280d721e 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_JOBS_JOBURL_HXX_
-#define __FRAMEWORK_JOBS_JOBURL_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBURL_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_JOBURL_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <stdtypes.h>
@@ -153,6 +153,6 @@ class JobURL : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_JOBS_JOBURL_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_JOBURL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index a54fbcbb7231..fea236fe8378 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_JOBS_SHELLJOB_HXX_
-#define __FRAMEWORK_JOBS_SHELLJOB_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_JOBS_SHELLJOB_HXX
+#define INCLUDED_FRAMEWORK_INC_JOBS_SHELLJOB_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -147,6 +147,6 @@ class ShellJob : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_JOBS_SHELLJOB_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_JOBS_SHELLJOB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx
index 71898af42c6b..c313783bcadc 100644
--- a/framework/inc/macros/generic.hxx
+++ b/framework/inc/macros/generic.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_MACROS_GENERIC_HXX_
-#define __FRAMEWORK_MACROS_GENERIC_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_MACROS_GENERIC_HXX
+#define INCLUDED_FRAMEWORK_INC_MACROS_GENERIC_HXX
 
 #include <rtl/ustring.hxx>
 #include <rtl/textenc.h>
@@ -37,6 +37,6 @@ ________________________________________________________________________________
 #define DECLARE_ASCII( SASCIIVALUE )                                                                            \
     OUString( SASCIIVALUE )
 
-#endif  //  #ifndef __FRAMEWORK_MACROS_GENERIC_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_MACROS_GENERIC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index 5ebf00d8bd34..74b54203e023 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_MACROS_REGISTRATION_HXX_
-#define __FRAMEWORK_MACROS_REGISTRATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX
+#define INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX
 
 
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
@@ -90,6 +90,6 @@ ________________________________________________________________________________
 
 //}     //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_MACROS_REGISTRATION_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index c6d537567e8c..c126696613d7 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
-#define __FRAMEWORK_MACROS_XINTERFACE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_MACROS_XINTERFACE_HXX
+#define INCLUDED_FRAMEWORK_INC_MACROS_XINTERFACE_HXX
 
 #include <com/sun/star/uno/RuntimeException.hpp>
 
@@ -682,6 +682,6 @@ ________________________________________________________________________________
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_MACROS_XINTERFACE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_MACROS_XINTERFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx
index 3032af5ab474..727a9c7e69e8 100644
--- a/framework/inc/macros/xserviceinfo.hxx
+++ b/framework/inc/macros/xserviceinfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_
-#define __FRAMEWORK_MACROS_XSERVICEINFO_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_MACROS_XSERVICEINFO_HXX
+#define INCLUDED_FRAMEWORK_INC_MACROS_XSERVICEINFO_HXX
 
 #include <general.h>
 
@@ -238,6 +238,6 @@ ________________________________________________________________________________
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_MACROS_XSERVICEINFO_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_MACROS_XSERVICEINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index 85648a75bb99..30d30d32af7e 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
-#define __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_MACROS_XTYPEPROVIDER_HXX
+#define INCLUDED_FRAMEWORK_INC_MACROS_XTYPEPROVIDER_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -716,6 +716,6 @@ ________________________________________________________________________________
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_MACROS_XTYPEPROVIDER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_MACROS_XTYPEPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index b75ea6f28e64..f38420c6f5aa 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_PROPERTIES_H_
-#define __FRAMEWORK_PROPERTIES_H_
+#ifndef INCLUDED_FRAMEWORK_INC_PROPERTIES_H
+#define INCLUDED_FRAMEWORK_INC_PROPERTIES_H
 
 #include <macros/generic.hxx>
 #include <general.h>
@@ -294,6 +294,6 @@ class PropHelper
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_PROPERTIES_H_
+#endif // INCLUDED_FRAMEWORK_INC_PROPERTIES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h
index ee393b44789e..672d03087023 100644
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
@@ -19,8 +19,8 @@
 
 /*TODO outline this implementation :-) */
 
-#ifndef __FRAMEWORK_PROTOCOLS_H_
-#define __FRAMEWORK_PROTOCOLS_H_
+#ifndef INCLUDED_FRAMEWORK_INC_PROTOCOLS_H
+#define INCLUDED_FRAMEWORK_INC_PROTOCOLS_H
 
 #include <rtl/ustring.hxx>
 
@@ -171,6 +171,6 @@ class ProtocolCheck
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_PROTOCOLS_H_
+#endif // INCLUDED_FRAMEWORK_INC_PROTOCOLS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 26f60cb93d68..24f38d238145 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_QUERIES_H_
-#define __FRAMEWORK_QUERIES_H_
+#ifndef INCLUDED_FRAMEWORK_INC_QUERIES_H
+#define INCLUDED_FRAMEWORK_INC_QUERIES_H
 
 #include <general.h>
 
@@ -364,6 +364,6 @@ class QueryAnalyzer
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_QUERIES_H_
+#endif // INCLUDED_FRAMEWORK_INC_QUERIES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx
index af2944dbecd4..7d5e6e9f18c8 100644
--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_RECORDING_DISPATCHRECORDER_HXX_
-#define __FRAMEWORK_RECORDING_DISPATCHRECORDER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDER_HXX
+#define INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDER_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index 408f993f75a4..9fbf14093cd4 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_RECORDING_DISPATCHRECORDERSUPPLIER_HXX_
-#define __FRAMEWORK_RECORDING_DISPATCHRECORDERSUPPLIER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDERSUPPLIER_HXX
+#define INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDERSUPPLIER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -98,6 +98,6 @@ class DispatchRecorderSupplier  :   // baseclasses
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_RECORDING_DISPATCHRECORDERSUPPLIER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDERSUPPLIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services.h b/framework/inc/services.h
index b10888984c08..167d8ac61d22 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_H_
-#define __FRAMEWORK_SERVICES_H_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_H
+#define INCLUDED_FRAMEWORK_INC_SERVICES_H
 
 #include <macros/generic.hxx>
 
@@ -108,6 +108,6 @@ namespace framework{
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_SERVICES_H_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/ContextChangeEventMultiplexer.hxx b/framework/inc/services/ContextChangeEventMultiplexer.hxx
index 3b70772a6225..1d7e2b150973 100644
--- a/framework/inc/services/ContextChangeEventMultiplexer.hxx
+++ b/framework/inc/services/ContextChangeEventMultiplexer.hxx
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef __FRAMEWORK_SERVICES_CONTEXT_CHANGE_EVENT_MULTIPLEXER_HXX_
-#define __FRAMEWORK_SERVICES_CONTEXT_CHANGE_EVENT_MULTIPLEXER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_CONTEXTCHANGEEVENTMULTIPLEXER_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_CONTEXTCHANGEEVENTMULTIPLEXER_HXX
 
 #include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
 
diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx
index 77a99cb586a3..d960b2e4efeb 100644
--- a/framework/inc/services/autorecovery.hxx
+++ b/framework/inc/services/autorecovery.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_AUTORECOVERY_HXX_
-#define __FRAMEWORK_SERVICES_AUTORECOVERY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_AUTORECOVERY_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_AUTORECOVERY_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -1043,6 +1043,6 @@ class AutoRecovery  : // attention! Must be the first base class to guarentee ri
 
 } // namespace framework
 
-#endif // __FRAMEWORK_SERVICES_AUTORECOVERY_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_AUTORECOVERY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index 6f23f78fdbec..47a08754c36c 100644
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_CONTENTHANDLERFACTORY_HXX_
-#define __FRAMEWORK_SERVICES_CONTENTHANDLERFACTORY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_CONTENTHANDLERFACTORY_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_CONTENTHANDLERFACTORY_HXX
 
 #include <classes/filtercache.hxx>
 #include <macros/generic.hxx>
@@ -166,6 +166,6 @@ class ContentHandlerFactory :   // interfaces
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_SERVICES_CONTENTHANDLERFACTORY_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_CONTENTHANDLERFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index e26b61d61309..65b992587d10 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_DESKTOP_HXX_
-#define __FRAMEWORK_SERVICES_DESKTOP_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_DESKTOP_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_DESKTOP_HXX
 
 #include <classes/framecontainer.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -482,6 +482,6 @@ class Desktop   :   // base classes
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_SERVICES_DESKTOP_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_DESKTOP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index 83fc396165a5..eb045730fec0 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_DISPATCHHELPER_HXX_
-#define __FRAMEWORK_SERVICES_DISPATCHHELPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_DISPATCHHELPER_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_DISPATCHHELPER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
diff --git a/framework/inc/services/frame.hxx b/framework/inc/services/frame.hxx
index 9ada54393013..ebd400191348 100644
--- a/framework/inc/services/frame.hxx
+++ b/framework/inc/services/frame.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_FRAME_HXX_
-#define __FRAMEWORK_SERVICES_FRAME_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_FRAME_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_FRAME_HXX
 
 #include <classes/framecontainer.hxx>
 #include <classes/propertysethelper.hxx>
@@ -445,6 +445,6 @@ class Frame :   // interfaces
 
 }       // namespace framework
 
-#endif  // #ifndef __FRAMEWORK_SERVICES_FRAME_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_FRAME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index c52892c523a5..853e4495a134 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_
-#define __FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
@@ -335,6 +335,6 @@ namespace framework
 
 } // namespace framework
 
-#endif // __FRAMEWORK_SERVICES_LAYOUTMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/licensedlg.hxx b/framework/inc/services/licensedlg.hxx
index a67b4932539e..ccd5bb4a5159 100644
--- a/framework/inc/services/licensedlg.hxx
+++ b/framework/inc/services/licensedlg.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 __LICENSEDLG_HXX__
-#define __LICENSEDLG_HXX__
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LICENSEDLG_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_LICENSEDLG_HXX
 
 #include <sal/types.h>
 #include <rtl/string.hxx>
diff --git a/framework/inc/services/logindialog.hxx b/framework/inc/services/logindialog.hxx
index c3b52dda640b..f69337716b6c 100644
--- a/framework/inc/services/logindialog.hxx
+++ b/framework/inc/services/logindialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_LOGINDIALOG_LOGINDIALOG_HXX_
-#define __FRAMEWORK_LOGINDIALOG_LOGINDIALOG_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LOGINDIALOG_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_LOGINDIALOG_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -745,6 +745,6 @@ class LoginDialog   :   public css::lang::XTypeProvider     ,
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_LOGINDIALOG_LOGINDIALOG_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_LOGINDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index 42e13ab2a820..1dbed47461a8 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_MEDIATYPEDETECTIONHELPER_HXX_
-#define __FRAMEWORK_SERVICES_MEDIATYPEDETECTIONHELPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_MEDIATYPEDETECTIONHELPER_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_MEDIATYPEDETECTIONHELPER_HXX
 
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
@@ -125,6 +125,6 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper2< ::com::sun::
 
 }       // namespace framework
 
-#endif  // #ifndef __FRAMEWORK_SERVICES_MEDIATYPEDETECTIONHELPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_MEDIATYPEDETECTIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/modulemanager.hxx b/framework/inc/services/modulemanager.hxx
index f7c280b63f5e..a2dae04f4950 100644
--- a/framework/inc/services/modulemanager.hxx
+++ b/framework/inc/services/modulemanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_MODULEMANAGER_HXX_
-#define __FRAMEWORK_SERVICES_MODULEMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_MODULEMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_MODULEMANAGER_HXX
 
 #include "sal/config.h"
 
@@ -204,6 +204,6 @@ class ModuleManager:
 
 } // namespace framework
 
-#endif // __FRAMEWORK_SERVICES_MODULEMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_MODULEMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/pathsettings.hxx b/framework/inc/services/pathsettings.hxx
index 2f5b65155470..34e65f5858eb 100644
--- a/framework/inc/services/pathsettings.hxx
+++ b/framework/inc/services/pathsettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_PATHSETTINGS_HXX_
-#define __FRAMEWORK_SERVICES_PATHSETTINGS_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_PATHSETTINGS_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_PATHSETTINGS_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -425,6 +425,6 @@ class PathSettings : // base classes
 
 } // namespace framework
 
-#endif // __FRAMEWORK_SERVICES_PATHSETTINGS_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_PATHSETTINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/sessionlistener.hxx b/framework/inc/services/sessionlistener.hxx
index a41d6be3fcda..42f0fb7c4d6d 100644
--- a/framework/inc/services/sessionlistener.hxx
+++ b/framework/inc/services/sessionlistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_SESSIONLISTENER_HXX_
-#define __FRAMEWORK_SERVICES_SESSIONLISTENER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_SESSIONLISTENER_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_SESSIONLISTENER_HXX
 
 #include <classes/filtercache.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -152,6 +152,6 @@ class SessionListener :
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_SERVICES_SESSIONLISTENER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_SESSIONLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx
index 5eec7a5f6f5a..f7a8fe39f499 100644
--- a/framework/inc/services/substitutepathvars.hxx
+++ b/framework/inc/services/substitutepathvars.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_SUBSTPATHVARS_HXX_
-#define __FRAMEWORK_SERVICES_SUBSTPATHVARS_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_SUBSTITUTEPATHVARS_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_SUBSTITUTEPATHVARS_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
@@ -287,6 +287,6 @@ class SubstitutePathVariables : private ThreadHelpBase, // Struct for right init
 
 }
 
-#endif // __FRAMEWORK_SERVICES_SUBSTPATHVARS_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_SUBSTITUTEPATHVARS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/tabwindowservice.hxx b/framework/inc/services/tabwindowservice.hxx
index efd97b8a8140..88366c565eb7 100644
--- a/framework/inc/services/tabwindowservice.hxx
+++ b/framework/inc/services/tabwindowservice.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_TABWINDOWSERVICE_HXX_
-#define __FRAMEWORK_SERVICES_TABWINDOWSERVICE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_TABWINDOWSERVICE_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_TABWINDOWSERVICE_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
@@ -189,6 +189,6 @@ class TabWindowService :  public css::lang::XTypeProvider
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_SERVICES_TABWINDOWSERVICE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_TABWINDOWSERVICE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/taskcreatorsrv.hxx b/framework/inc/services/taskcreatorsrv.hxx
index 9286d71ee966..4fc9642e59d2 100644
--- a/framework/inc/services/taskcreatorsrv.hxx
+++ b/framework/inc/services/taskcreatorsrv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_TASKCREATORSRV_HXX_
-#define __FRAMEWORK_SERVICES_TASKCREATORSRV_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_TASKCREATORSRV_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_TASKCREATORSRV_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/xinterface.hxx>
@@ -143,6 +143,6 @@ class TaskCreatorService : // attention! Must be the first base class to guarent
 
 } // namespace framework
 
-#endif // __FRAMEWORK_SERVICES_TASKCREATORSRV_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_TASKCREATORSRV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx
index e5c838228c3c..877a99531806 100644
--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_URIABBREVIATION_HXX_
-#define __FRAMEWORK_SERVICES_URIABBREVIATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_URIABBREVIATION_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_URIABBREVIATION_HXX
 
 #include <macros/xinterface.hxx>
 #include <macros/xtypeprovider.hxx>
@@ -55,6 +55,6 @@ private:
 
 } //    namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_SERVICES_URIABBREVIATION_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_URIABBREVIATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/services/urltransformer.hxx b/framework/inc/services/urltransformer.hxx
index 028075178c1b..f39275f7f427 100644
--- a/framework/inc/services/urltransformer.hxx
+++ b/framework/inc/services/urltransformer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_URLTRANSFORMER_HXX_
-#define __FRAMEWORK_SERVICES_URLTRANSFORMER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_SERVICES_URLTRANSFORMER_HXX
+#define INCLUDED_FRAMEWORK_INC_SERVICES_URLTRANSFORMER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -187,6 +187,6 @@ class URLTransformer    :   public ::cppu::WeakImplHelper2< ::com::sun::star::ut
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_SERVICES_URLTRANSFORMER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_SERVICES_URLTRANSFORMER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index fe227a8a118a..7a5f08f18628 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_STDTYPES_H_
-#define __FRAMEWORK_STDTYPES_H_
+#ifndef INCLUDED_FRAMEWORK_INC_STDTYPES_H
+#define INCLUDED_FRAMEWORK_INC_STDTYPES_H
 
 #include <vector>
 #include <queue>
@@ -175,6 +175,6 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<  OUString
 
 }       // namespace framework
 
-#endif  // #ifndef __FRAMEWORK_STDTYPES_H_
+#endif // INCLUDED_FRAMEWORK_INC_STDTYPES_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 47846eae0fb0..bbf0ecea0279 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_TABWIN_TABWINDOW_HXX_
-#define __FRAMEWORK_TABWIN_TABWINDOW_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_TABWIN_TABWINDOW_HXX
+#define INCLUDED_FRAMEWORK_INC_TABWIN_TABWINDOW_HXX
 
 #include <stdtypes.h>
 #include <threadhelp/threadhelpbase.hxx>
@@ -175,6 +175,6 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
 
 }
 
-#endif // __FRAMEWORK_TABWIN_TABWINDOW_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_TABWIN_TABWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx
index df66e495e065..93a4a59630da 100644
--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_TABWIN_TABWINFACTORY_HXX_
-#define __FRAMEWORK_TABWIN_TABWINFACTORY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_TABWIN_TABWINFACTORY_HXX
+#define INCLUDED_FRAMEWORK_INC_TABWIN_TABWINFACTORY_HXX
 
 #include <stdtypes.h>
 #include <threadhelp/threadhelpbase.hxx>
@@ -62,6 +62,6 @@ class TabWinFactory :  protected ThreadHelpBase
 
 }
 
-#endif // __FRAMEWORK_TABWIN_TABWINFACTORY_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_TABWIN_TABWINFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index 3e0aaec8cfbe..8198fbb5cd38 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_TARGETS_H_
-#define __FRAMEWORK_TARGETS_H_
+#ifndef INCLUDED_FRAMEWORK_INC_TARGETS_H
+#define INCLUDED_FRAMEWORK_INC_TARGETS_H
 
 #include <macros/generic.hxx>
 
@@ -48,6 +48,6 @@ namespace framework{
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_TARGETS_H_
+#endif // INCLUDED_FRAMEWORK_INC_TARGETS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx
index cfc5a2efbd8b..6261bab716e9 100644
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_FAIRRWLOCK_HXX_
-#define __FRAMEWORK_THREADHELP_FAIRRWLOCK_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_FAIRRWLOCK_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_FAIRRWLOCK_HXX
 
 #include <threadhelp/inoncopyable.h>
 #include <threadhelp/irwlock.h>
@@ -237,6 +237,6 @@ class FairRWLock : public  IRWLock
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_FAIRRWLOCK_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_FAIRRWLOCK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index 3fae0332c50f..643e68adb07d 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_GATE_HXX_
-#define __FRAMEWORK_THREADHELP_GATE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX
 
 #include <threadhelp/inoncopyable.h>
 #include <threadhelp/igate.h>
@@ -214,6 +214,6 @@ class Gate : public  IGate
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_GATE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h
index baac691de978..1d2b2fba4c47 100644
--- a/framework/inc/threadhelp/igate.h
+++ b/framework/inc/threadhelp/igate.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_IGATE_H_
-#define __FRAMEWORK_THREADHELP_IGATE_H_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_IGATE_H
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_IGATE_H
 
 #include <osl/time.h>
 
@@ -52,6 +52,6 @@ class IGate
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_IGATE_H_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_IGATE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h
index 681280f8d618..98f263b2bb9a 100644
--- a/framework/inc/threadhelp/inoncopyable.h
+++ b/framework/inc/threadhelp/inoncopyable.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_INONCOPYABLE_H_
-#define __FRAMEWORK_THREADHELP_INONCOPYABLE_H_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_INONCOPYABLE_H
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_INONCOPYABLE_H
 
 namespace framework{
 
@@ -42,6 +42,6 @@ class INonCopyable
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_INONCOPYABLE_H_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_INONCOPYABLE_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/irwlock.h b/framework/inc/threadhelp/irwlock.h
index 2330ddc5152b..20a97f104ea3 100644
--- a/framework/inc/threadhelp/irwlock.h
+++ b/framework/inc/threadhelp/irwlock.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_IRWLOCK_H_
-#define __FRAMEWORK_THREADHELP_IRWLOCK_H_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_IRWLOCK_H
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_IRWLOCK_H
 
 namespace framework{
 
@@ -66,6 +66,6 @@ class IRWLock
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_IRWLOCK_H_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_IRWLOCK_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h
index 9f6740f104c2..979ca8c197c1 100644
--- a/framework/inc/threadhelp/itransactionmanager.h
+++ b/framework/inc/threadhelp/itransactionmanager.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_ITRANSACTIONMANAGER_H_
-#define __FRAMEWORK_THREADHELP_ITRANSACTIONMANAGER_H_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_ITRANSACTIONMANAGER_H
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_ITRANSACTIONMANAGER_H
 
 #include <general.h>
 #include <com/sun/star/uno/RuntimeException.hpp>
@@ -128,6 +128,6 @@ class ITransactionManager
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_ITRANSACTIONMANAGER_H_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_ITRANSACTIONMANAGER_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index 72f2d2271ae0..b5ca773c1f62 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_LOCKHELPER_HXX_
-#define __FRAMEWORK_THREADHELP_LOCKHELPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_LOCKHELPER_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_LOCKHELPER_HXX
 
 #include <threadhelp/inoncopyable.h>
 #include <framework/imutex.hxx>
@@ -108,6 +108,6 @@ class FWI_DLLPUBLIC LockHelper : public  IMutex
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_LOCKHELPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_LOCKHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx
index eaa1d5ac33b2..2db89a63f629 100644
--- a/framework/inc/threadhelp/readguard.hxx
+++ b/framework/inc/threadhelp/readguard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_
-#define __FRAMEWORK_THREADHELP_READGUARD_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_READGUARD_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_READGUARD_HXX
 
 #include <threadhelp/inoncopyable.h>
 #include <threadhelp/irwlock.h>
@@ -167,6 +167,6 @@ class ReadGuard : private INonCopyable
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_READGUARD_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_READGUARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx
index e6787a723037..fcb287a33c40 100644
--- a/framework/inc/threadhelp/resetableguard.hxx
+++ b/framework/inc/threadhelp/resetableguard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
-#define __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_RESETABLEGUARD_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_RESETABLEGUARD_HXX
 
 #include <threadhelp/inoncopyable.h>
 #include <framework/imutex.hxx>
@@ -163,6 +163,6 @@ class ResetableGuard : private INonCopyable
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_RESETABLEGUARD_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_RESETABLEGUARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx
index b13959880a91..b769d65b0dc7 100644
--- a/framework/inc/threadhelp/threadhelpbase.hxx
+++ b/framework/inc/threadhelp/threadhelpbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
-#define __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_THREADHELPBASE_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_THREADHELPBASE_HXX
 
 #include <threadhelp/lockhelper.hxx>
 
@@ -61,6 +61,6 @@ struct ThreadHelpBase
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_THREADHELPBASE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_THREADHELPBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index 7a71f5bbbed8..a36f4aa2b264 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_H_
-#define __FRAMEWORK_THREADHELP_TRANSACTIONBASE_H_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONBASE_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONBASE_HXX
 
 #include <threadhelp/transactionmanager.hxx>
 
@@ -50,6 +50,6 @@ struct TransactionBase
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONBASE_H_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 8716488efe36..fae6b9d7e191 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_
-#define __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONGUARD_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONGUARD_HXX
 
 #include <threadhelp/inoncopyable.h>
 #include <threadhelp/itransactionmanager.h>
@@ -153,6 +153,6 @@ class TransactionGuard : private INonCopyable
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONGUARD_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONGUARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index 4c3b609782a2..4f029aa5fd00 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_TRANSACTIONMANAGER_HXX_
-#define __FRAMEWORK_THREADHELP_TRANSACTIONMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX
 
 #include <threadhelp/inoncopyable.h>
 #include <threadhelp/itransactionmanager.h>
@@ -85,6 +85,6 @@ class FWI_DLLPUBLIC TransactionManager : public  ITransactionManager
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_TRANSACTIONMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_TRANSACTIONMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx
index 8e653cbcd660..696b4780ffa4 100644
--- a/framework/inc/threadhelp/writeguard.hxx
+++ b/framework/inc/threadhelp/writeguard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
-#define __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_WRITEGUARD_HXX
+#define INCLUDED_FRAMEWORK_INC_THREADHELP_WRITEGUARD_HXX
 
 #include <threadhelp/inoncopyable.h>
 #include <threadhelp/irwlock.h>
@@ -226,6 +226,6 @@ class WriteGuard : private INonCopyable
 
 }       //  namespace framework
 
-#endif  //  #ifndef __FRAMEWORK_THREADHELP_WRITEGUARD_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_THREADHELP_WRITEGUARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx
index 7d1980885b95..7e738ec75ea5 100644
--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONFIGURATION_GLOBALSETTINGS_HXX_
-#define __FRAMEWORK_UICONFIGURATION_GLOBALSETTINGS_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx
index 49044c420ab2..db757d3b2380 100644
--- a/framework/inc/uiconfiguration/graphicnameaccess.hxx
+++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONFIGURATION_GRAPHICNAMEACCESS_HXX_
-#define __FRAMEWORK_UICONFIGURATION_GRAPHICNAMEACCESS_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GRAPHICNAMEACCESS_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GRAPHICNAMEACCESS_HXX
 
 #include <stdtypes.h>
 
@@ -58,6 +58,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UICONFIGURATION_GRAPHICNAMEACCESS_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GRAPHICNAMEACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx
index 10ce0fcfef36..eb08bca59073 100644
--- a/framework/inc/uiconfiguration/imagemanager.hxx
+++ b/framework/inc/uiconfiguration/imagemanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONFIGURATION_IMAGEMANAGER_HXX_
-#define __FRAMEWORK_UICONFIGURATION_IMAGEMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX
 
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
@@ -104,6 +104,6 @@ namespace framework
    };
 }
 
-#endif // __FRAMEWORK_UICONFIGURATION_IMAGEMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGEMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/imagetype.hxx b/framework/inc/uiconfiguration/imagetype.hxx
index f1f9c86945d8..46b61ad8fca0 100644
--- a/framework/inc/uiconfiguration/imagetype.hxx
+++ b/framework/inc/uiconfiguration/imagetype.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_
-#define __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGETYPE_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGETYPE_HXX
 
 #include <boost/unordered_map.hpp>
 #include <rtl/ustring.hxx>
@@ -44,6 +44,6 @@ typedef boost::unordered_map< OUString,
 
 }
 
-#endif // __FRAMEWORK_UICONFIGURATION_IMAGETYPE_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UICONFIGURATION_IMAGETYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
index 07525562ee18..6a34a12b26b1 100644
--- a/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
+++ b/framework/inc/uiconfiguration/moduleuicfgsupplier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONFIGURATION_MODULEUICFGSUPPLIER_HXX_
-#define __FRAMEWORK_UICONFIGURATION_MODULEUICFGSUPPLIER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEUICFGSUPPLIER_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEUICFGSUPPLIER_HXX
 
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
@@ -96,6 +96,6 @@ namespace framework
    };
 }
 
-#endif // __FRAMEWORK_UICONFIGURATION_MODULEUICFGSUPPLIER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEUICFGSUPPLIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
index 9973ddbd1293..aa17474544c0 100644
--- a/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONFIGURATION_MODULEUICONFIGMANAGER_HXX_
-#define __FRAMEWORK_UICONFIGURATION_MODULEUICONFIGMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEUICONFIGURATIONMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEUICONFIGURATIONMANAGER_HXX
 
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
@@ -198,6 +198,6 @@ namespace framework
    };
 }
 
-#endif // __FRAMEWORK_UICONFIGURATION_MODULEUICONFIGMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEUICONFIGURATIONMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/uicategorydescription.hxx b/framework/inc/uiconfiguration/uicategorydescription.hxx
index 87104b61b9c6..e3b9d6a8519a 100644
--- a/framework/inc/uiconfiguration/uicategorydescription.hxx
+++ b/framework/inc/uiconfiguration/uicategorydescription.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_UICOMMANDCATEGORY_HXX_
-#define __FRAMEWORK_UIELEMENT_UICOMMANDCATEGORY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_UICATEGORYDESCRIPTION_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_UICATEGORYDESCRIPTION_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
diff --git a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
index c7ad5fa86126..b8cb148046f6 100644
--- a/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
+++ b/framework/inc/uiconfiguration/uiconfigurationmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONFIGURATION_UICONFIGMANAGER_HXX_
-#define __FRAMEWORK_UICONFIGURATION_UICONFIGMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_UICONFIGURATIONMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_UICONFIGURATIONMANAGER_HXX
 
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
@@ -176,6 +176,6 @@ namespace framework
    };
 }
 
-#endif // __FRAMEWORK_UICONFIGURATION_UICONFIGMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UICONFIGURATION_UICONFIGURATIONMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uiconfiguration/windowstateconfiguration.hxx b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
index 7a379c3a0904..092d7a5368f1 100644
--- a/framework/inc/uiconfiguration/windowstateconfiguration.hxx
+++ b/framework/inc/uiconfiguration/windowstateconfiguration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONFIGURATION_WINDOWSTATECONFIGURATION_HXX_
-#define __FRAMEWORK_UICONFIGURATION_WINDOWSTATECONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_WINDOWSTATECONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_WINDOWSTATECONFIGURATION_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx
index 53384bb92428..1d2f67627fbc 100644
--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_ADDONSTOOLBARMANAGER_HXX_
-#define __FRAMEWORK_UIELEMENT_ADDONSTOOLBARMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARMANAGER_HXX
 
 #include <uielement/toolbarmanager.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -73,6 +73,6 @@ class AddonsToolBarManager : public ToolBarManager
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_ADDONSTOOLBARMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/addonstoolbarwrapper.hxx b/framework/inc/uielement/addonstoolbarwrapper.hxx
index c5a8173444d5..b2681aaaaa8f 100644
--- a/framework/inc/uielement/addonstoolbarwrapper.hxx
+++ b/framework/inc/uielement/addonstoolbarwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX_
-#define __FRAMEWORK_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX
 
 #include <helper/uielementwrapperbase.hxx>
 
@@ -57,6 +57,6 @@ class AddonsToolBarWrapper : public UIElementWrapperBase
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx
index 368062dff5a8..c65443b66e9a 100644
--- a/framework/inc/uielement/buttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/buttontoolbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
@@ -95,6 +95,6 @@ class ButtonToolbarController : public ::com::sun::star::frame::XStatusListener,
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_BUTTONTOOLBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
index 442dcd968803..cd577f8badb6 100644
--- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -83,6 +83,6 @@ class ComboboxToolbarController : public IComboBoxListener,
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx
index db0fb1c97287..8b7d6f78a656 100644
--- a/framework/inc/uielement/commandinfo.hxx
+++ b/framework/inc/uielement/commandinfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_COMMANDINFO_HXX_
-#define __FRAMEWORK_UIELEMENT_COMMANDINFO_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_COMMANDINFO_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_COMMANDINFO_HXX
 
 #include <macros/generic.hxx>
 #include <stdtypes.h>
@@ -48,6 +48,6 @@ typedef BaseHash< CommandInfo > CommandToInfoMap;
 
 } // namespace framework
 
-#endif // __FRAMEWORK_UIELEMENT_COMMANDINFO_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_COMMANDINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/complextoolbarcontroller.hxx b/framework/inc/uielement/complextoolbarcontroller.hxx
index 9bb3848ef362..e35d4ead08b6 100644
--- a/framework/inc/uielement/complextoolbarcontroller.hxx
+++ b/framework/inc/uielement/complextoolbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
@@ -96,6 +96,6 @@ class ComplexToolbarController : public svt::ToolboxController
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_COMPLEXTOOLBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx
index aa40cb10fd5f..a103cf38b3bc 100644
--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_
-#define __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -109,6 +109,6 @@ class FWI_DLLPUBLIC ConstItemContainer : public ::cppu::WeakImplHelper4<
 
 }
 
-#endif // #ifndef __FRAMEWORK_UIELEMENT_CONSTITEMCONTAINER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/controlmenucontroller.hxx b/framework/inc/uielement/controlmenucontroller.hxx
index 9b86a6257a62..14f601e79eb1 100644
--- a/framework/inc/uielement/controlmenucontroller.hxx
+++ b/framework/inc/uielement/controlmenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_CONTROLMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_CONTROLMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_CONTROLMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_CONTROLMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
@@ -93,6 +93,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_CONTROLMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_CONTROLMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
index 5886de1c3793..da4472cf9b68 100644
--- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
+++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -79,6 +79,6 @@ class DropdownToolbarController : public IListBoxListener,
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx
index c231d0d6b091..5e43474d30fd 100644
--- a/framework/inc/uielement/edittoolbarcontroller.hxx
+++ b/framework/inc/uielement/edittoolbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_EDITTOOLBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_EDITTOOLBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_EDITTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_EDITTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -80,6 +80,6 @@ class EditToolbarController : public IEditListener,
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_EDITTOOLBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_EDITTOOLBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx
index df8c922fa725..526900a48650 100644
--- a/framework/inc/uielement/fontmenucontroller.hxx
+++ b/framework/inc/uielement/fontmenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_FONTMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_FONTMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
@@ -72,6 +72,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_FONTMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx
index c4d43aee3a4d..86d8082d3337 100644
--- a/framework/inc/uielement/fontsizemenucontroller.hxx
+++ b/framework/inc/uielement/fontsizemenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
@@ -74,6 +74,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/footermenucontroller.hxx b/framework/inc/uielement/footermenucontroller.hxx
index 4eeb25073b92..11ddd28ca4f7 100644
--- a/framework/inc/uielement/footermenucontroller.hxx
+++ b/framework/inc/uielement/footermenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_FOOTERMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_FOOTERMENUCONTROLLER_HXX
 
 #include <uielement/headermenucontroller.hxx>
 
@@ -43,6 +43,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_FOOTERMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_FOOTERMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/genericstatusbarcontroller.hxx b/framework/inc/uielement/genericstatusbarcontroller.hxx
index ff3bc80d7254..ea8461fca6a8 100644
--- a/framework/inc/uielement/genericstatusbarcontroller.hxx
+++ b/framework/inc/uielement/genericstatusbarcontroller.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 __FRAMEWORK_UIELEMENT_GENERICSTATUSBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_GENERICSTATUSBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICSTATUSBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICSTATUSBARCONTROLLER_HXX
 
 #include <svtools/statusbarcontroller.hxx>
 
diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx
index 7ece0f1c6dbf..8a385bda9789 100644
--- a/framework/inc/uielement/generictoolbarcontroller.hxx
+++ b/framework/inc/uielement/generictoolbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX
 
 #include <svtools/toolboxcontroller.hxx>
 #include <memory>
@@ -85,6 +85,6 @@ class MenuToolbarController : public GenericToolbarController
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_GENERICTOOLBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx
index 4d7ae54ae861..4bb93c880fd2 100644
--- a/framework/inc/uielement/headermenucontroller.hxx
+++ b/framework/inc/uielement/headermenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_HEADERMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_HEADERMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_HEADERMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_HEADERMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
@@ -70,6 +70,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_HEADERMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_HEADERMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
index 751351577bc3..fc9a33c9cb62 100644
--- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -55,6 +55,6 @@ class ImageButtonToolbarController : public ComplexToolbarController
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 2951a42591ba..33b680bfd604 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HXX_
-#define __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ITEMCONTAINER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_ITEMCONTAINER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -95,6 +95,6 @@ class FWI_DLLPUBLIC ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun
 
 }
 
-#endif // #ifndef __FRAMEWORK_UIELEMENT_ITEMCONTAINER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_ITEMCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx
index 38ada6c17f36..3ac2480e2fb1 100644
--- a/framework/inc/uielement/langselectionmenucontroller.hxx
+++ b/framework/inc/uielement/langselectionmenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_LANGUAGESELECTIONMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_LANGUAGESELECTIONMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
@@ -94,6 +94,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_LANGUAGESELECTIONMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/langselectionstatusbarcontroller.hxx b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
index 0f7a77d888a7..659396ec0aaa 100644
--- a/framework/inc/uielement/langselectionstatusbarcontroller.hxx
+++ b/framework/inc/uielement/langselectionstatusbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_LANGSELECTIONSTATUSBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_LANGSELECTIONSTATUSBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONSTATUSBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONSTATUSBARCONTROLLER_HXX
 
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
@@ -78,6 +78,6 @@ class LangSelectionStatusbarController : public svt::StatusbarController
 
 } // framework namespace
 
-#endif // __FRAMEWORK_UIELEMENT_LANGSELECTIONSTATUSBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONSTATUSBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx
index e516f80caca2..6762e57ddd55 100644
--- a/framework/inc/uielement/macrosmenucontroller.hxx
+++ b/framework/inc/uielement/macrosmenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_MACROSMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_MACROSMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_MACROSMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_MACROSMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
@@ -77,6 +77,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_MACROSMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_MACROSMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx
index becb86cfcb7e..ce61dda63f7c 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_MENUBARMANAGER_HXX_
-#define __FRAMEWORK_UIELEMENT_MENUBARMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARMANAGER_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx
index de352898771b..e658d902a7d4 100644
--- a/framework/inc/uielement/menubarmerger.hxx
+++ b/framework/inc/uielement/menubarmerger.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_MENUBARMERGER_HXX_
-#define __FRAMEWORK_UIELEMENT_MENUBARMERGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARMERGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARMERGER_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 
@@ -113,6 +113,6 @@ class MenuBarMerger
 
 } // namespace framework
 
-#endif // __FRAMEWORK_UIELEMENT_MENUBARMERGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARMERGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index 2b3d31e363d8..8e60b2c3e945 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_MENUBARWRAPPER_HXX_
-#define __FRAMEWORK_UIELEMENT_MENUBARWRAPPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARWRAPPER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARWRAPPER_HXX
 
 #include <helper/uiconfigelementwrapperbase.hxx>
 #include <uielement/menubarmanager.hxx>
@@ -85,6 +85,6 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
 
 } // namespace framework
 
-#endif // __FRAMEWORK_UIELEMENT_MENUBARWRAPPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_MENUBARWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx
index afacc16ded58..153fcd11661e 100644
--- a/framework/inc/uielement/newmenucontroller.hxx
+++ b/framework/inc/uielement/newmenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_NEWMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_NEWMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_NEWMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_NEWMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
@@ -113,6 +113,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_NEWMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_NEWMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/objectmenucontroller.hxx b/framework/inc/uielement/objectmenucontroller.hxx
index f10014e4340c..3203f326ce8a 100644
--- a/framework/inc/uielement/objectmenucontroller.hxx
+++ b/framework/inc/uielement/objectmenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_OBJECTMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_OBJECTMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_OBJECTMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_OBJECTMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
@@ -64,6 +64,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_OBJECTMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_OBJECTMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/popuptoolbarcontroller.hxx b/framework/inc/uielement/popuptoolbarcontroller.hxx
index 56f32513dc59..d329b9ddb325 100644
--- a/framework/inc/uielement/popuptoolbarcontroller.hxx
+++ b/framework/inc/uielement/popuptoolbarcontroller.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 __FRAMEWORK_UIELEMENT_POPUPMENU_TOOLBARCONTROLLER_HXX__
-#define __FRAMEWORK_UIELEMENT_POPUPMENU_TOOLBARCONTROLLER_HXX__
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_POPUPTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_POPUPTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/awt/XPopupMenu.hpp>
 #include <com/sun/star/frame/XPopupMenuController.hpp>
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index bc16aeecd946..92e43fc57220 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_
-#define _FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_PROGRESSBARWRAPPER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_PROGRESSBARWRAPPER_HXX
 
 #include <helper/uielementwrapperbase.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -82,6 +82,6 @@ class ProgressBarWrapper : public UIElementWrapperBase
 
 }       //  namespace framework
 
-#endif // _FRAMEWORK_UIELEMENT_PROGRESSBARWRAPPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_PROGRESSBARWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/recentfilesmenucontroller.hxx b/framework/inc/uielement/recentfilesmenucontroller.hxx
index 1fb90a40e1af..39d5fb479974 100644
--- a/framework/inc/uielement/recentfilesmenucontroller.hxx
+++ b/framework/inc/uielement/recentfilesmenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <svtools/popupmenucontrollerbase.hxx>
@@ -78,6 +78,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_RECENTFILESMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 2c5d95465715..533a09af3db7 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_
-#define __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -138,6 +138,6 @@ class RootItemContainer :   protected ThreadHelpBase
 
 }
 
-#endif // #ifndef __FRAMEWORK_UIELEMENT_ROOTITEMCONTAINER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
index d54b26541241..7312ac2d34db 100644
--- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
+++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -103,6 +103,6 @@ class SpinfieldToolbarController : public ISpinfieldListener,
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/statusbar.hxx b/framework/inc/uielement/statusbar.hxx
index 7a820842ca9c..8773a1f4034d 100644
--- a/framework/inc/uielement/statusbar.hxx
+++ b/framework/inc/uielement/statusbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_STATUSBAR_HXX_
-#define __FRAMEWORK_UIELEMENT_STATUSBAR_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBAR_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBAR_HXX
 
 #include <uielement/statusbarmanager.hxx>
 
@@ -51,6 +51,6 @@ class FrameworkStatusBar : public StatusBar
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_STATUSBAR_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/statusbaritem.hxx b/framework/inc/uielement/statusbaritem.hxx
index e26d4a70f9d2..25b56208ec25 100644
--- a/framework/inc/uielement/statusbaritem.hxx
+++ b/framework/inc/uielement/statusbaritem.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 __FRAMEWORK_UIELEMENT_STATUSBARITEM_HXX_
-#define __FRAMEWORK_UIELEMENT_STATUSBARITEM_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARITEM_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARITEM_HXX
 
 #include <com/sun/star/ui/XStatusbarItem.hpp>
 #include <cppuhelper/compbase1.hxx>
diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx
index 35a01a5b3764..6163936c31b7 100644
--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_STATUSBARMANAGER_HXX_
-#define __FRAMEWORK_UIELEMENT_STATUSBARMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -118,6 +118,6 @@ class StatusBarManager : public ThreadHelpBase,
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_STATUSBARMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx
index 7852fdacab40..9fff10744f8a 100644
--- a/framework/inc/uielement/statusbarmerger.hxx
+++ b/framework/inc/uielement/statusbarmerger.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 __FRAMEWORK_UIELEMENT_STATUSBARMERGER_HXX_
-#define __FRAMEWORK_UIELEMENT_STATUSBARMERGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMERGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMERGER_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <rtl/ustring.hxx>
diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx
index 034ce0772afb..4705c37e0fcd 100644
--- a/framework/inc/uielement/statusbarwrapper.hxx
+++ b/framework/inc/uielement/statusbarwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_STATUSBARWRAPPER_HXX_
-#define __FRAMEWORK_UIELEMENT_STATUSBARWRAPPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARWRAPPER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARWRAPPER_HXX
 
 #include <helper/uiconfigelementwrapperbase.hxx>
 #include <uielement/statusbarmanager.hxx>
@@ -56,6 +56,6 @@ class StatusBarWrapper : public UIConfigElementWrapperBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_UIELEMENT_STATUSBARWRAPPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index 28aa0f4cc187..4e0ed92aaf92 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX_
-#define __FRAMEWORK_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -61,6 +61,6 @@ class StatusIndicatorInterfaceWrapper :   public ::cppu::WeakImplHelper1< ::com:
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
index ab8e6b4c13c6..58d94bcbc36a 100644
--- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
+++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX
 
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
@@ -72,6 +72,6 @@ class ToggleButtonToolbarController : public ComplexToolbarController
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx
index 7ad772de9803..7542b2950206 100644
--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_
-#define __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -220,6 +220,6 @@ class ToolBarManager : public ToolbarManager_Base,
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_TOOLBARMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx
index bf3280d04ba5..87c51bc5df6a 100644
--- a/framework/inc/uielement/toolbarmerger.hxx
+++ b/framework/inc/uielement/toolbarmerger.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_TOOLBARMERGER_HXX_
-#define __FRAMEWORK_UIELEMENT_TOOLBARMERGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMERGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMERGER_HXX
 
 #include <uielement/comboboxtoolbarcontroller.hxx>
 #include <uielement/imagebuttontoolbarcontroller.hxx>
@@ -150,6 +150,6 @@ class ToolBarMerger
 
 } // namespace framework
 
-#endif // __FRAMEWORK_UIELEMENT_TOOLBARMERGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMERGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx
index 638170f29455..124e7d63d6a6 100644
--- a/framework/inc/uielement/toolbarsmenucontroller.hxx
+++ b/framework/inc/uielement/toolbarsmenucontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX_
-#define __FRAMEWORK_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX
 
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
@@ -105,6 +105,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index 6b4134534c0d..c4041a8c93a8 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_TOOLBARWRAPPER_HXX_
-#define __FRAMEWORK_UIELEMENT_TOOLBARWRAPPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARWRAPPER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARWRAPPER_HXX
 
 #include <helper/uiconfigelementwrapperbase.hxx>
 
@@ -80,6 +80,6 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener,
 
 }
 
-#endif // __FRAMEWORK_UIELEMENT_TOOLBARWRAPPER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARWRAPPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx
index c11387ef38ef..08a25181fb3d 100644
--- a/framework/inc/uielement/uicommanddescription.hxx
+++ b/framework/inc/uielement/uicommanddescription.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_UICOMMANDDESCRPTION_HXX_
-#define __FRAMEWORK_UIELEMENT_UICOMMANDDESCRPTION_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_UICOMMANDDESCRIPTION_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_UICOMMANDDESCRIPTION_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
diff --git a/framework/inc/uielement/uielement.hxx b/framework/inc/uielement/uielement.hxx
index 8b8d7be08d39..49ddd1bf9842 100644
--- a/framework/inc/uielement/uielement.hxx
+++ b/framework/inc/uielement/uielement.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_LAYOUTMANAGER_UIELEMENT_HXX_
-#define __FRAMEWORK_LAYOUTMANAGER_UIELEMENT_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_UIELEMENT_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_UIELEMENT_HXX
 
 #include <com/sun/star/ui/XUIElement.hpp>
 #include <com/sun/star/ui/DockingArea.hpp>
@@ -118,6 +118,6 @@ typedef std::vector< UIElement > UIElementVector;
 
 } // namespace framework
 
-#endif // __FRAMEWORK_LAYOUTMANAGER_UIELEMENT_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_UIELEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uielement/uielementtypenames.hxx b/framework/inc/uielement/uielementtypenames.hxx
index cb6e046c8dee..cd5617a8afef 100644
--- a/framework/inc/uielement/uielementtypenames.hxx
+++ b/framework/inc/uielement/uielementtypenames.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIELEMENT_UIELEMENTTYPENAMES_HXX_
-#define __FRAMEWORK_UIELEMENT_UIELEMENTTYPENAMES_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_UIELEMENTTYPENAMES_HXX
+#define INCLUDED_FRAMEWORK_INC_UIELEMENT_UIELEMENTTYPENAMES_HXX
 
 #define UIELEMENTTYPE_MENUBAR_NAME          "menubar"
 #define UIELEMENTTYPE_POPUPMENU_NAME        "popupmenu"
@@ -28,6 +28,6 @@
 #define UIELEMENTTYPE_PROGRESSBAR_NAME      "progressbar"
 #define UIELEMENTTYPE_TOOLPANEL_NAME        "toolpanel"
 
-#endif // __FRAMEWORK_UIELEMENT_UIELEMENTTYPENAMES_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_UIELEMENTTYPENAMES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/addonstoolboxfactory.hxx b/framework/inc/uifactory/addonstoolboxfactory.hxx
index 920a4ed490fd..e6583e0f8cde 100644
--- a/framework/inc/uifactory/addonstoolboxfactory.hxx
+++ b/framework/inc/uifactory/addonstoolboxfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX_
-#define __FRAMEWORK_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX
+#define INCLUDED_FRAMEWORK_INC_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX
 
 #include <stdtypes.h>
 #include <threadhelp/threadhelpbase.hxx>
@@ -66,6 +66,6 @@ class AddonsToolBoxFactory :  protected ThreadHelpBase
 
 }
 
-#endif // __FRAMEWORK_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_ADDONSTOOLBOXFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index eacb8da5bc6d..4b013312e631 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIFACTORY_FACTORYCONFIGURATION_HXX_
-#define __FRAMEWORK_UIFACTORY_FACTORYCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
 #include <macros/xinterface.hxx>
@@ -105,6 +105,6 @@ private:
 };
 
 } // namespace framework
-#endif // __FRAMEWORK_UIFACTORY_FACTORYCONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx
index c0930ca72db2..ff03a96f3c17 100644
--- a/framework/inc/uifactory/menubarfactory.hxx
+++ b/framework/inc/uifactory/menubarfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIFACTORY_MENUBARFACTORY_HXX_
-#define __FRAMEWORK_UIFACTORY_MENUBARFACTORY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_MENUBARFACTORY_HXX
+#define INCLUDED_FRAMEWORK_INC_UIFACTORY_MENUBARFACTORY_HXX
 
 #include <stdtypes.h>
 #include <threadhelp/threadhelpbase.hxx>
@@ -70,6 +70,6 @@ namespace framework
     };
 }
 
-#endif // __FRAMEWORK_UIFACTORY_MENUBARFACTORY_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_MENUBARFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/statusbarfactory.hxx b/framework/inc/uifactory/statusbarfactory.hxx
index 382d56bcf9e1..3bbfbf456368 100644
--- a/framework/inc/uifactory/statusbarfactory.hxx
+++ b/framework/inc/uifactory/statusbarfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIFACTORY_STATUSBARFACTORY_HXX_
-#define __FRAMEWORK_UIFACTORY_STATUSBARFACTORY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_STATUSBARFACTORY_HXX
+#define INCLUDED_FRAMEWORK_INC_UIFACTORY_STATUSBARFACTORY_HXX
 
 #include <stdtypes.h>
 
@@ -46,6 +46,6 @@ class StatusBarFactory :  public MenuBarFactory
 
 }
 
-#endif // __FRAMEWORK_UIFACTORY_STATUSBARFACTORY_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_STATUSBARFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/toolboxfactory.hxx b/framework/inc/uifactory/toolboxfactory.hxx
index db166b228d9a..deccecb170b4 100644
--- a/framework/inc/uifactory/toolboxfactory.hxx
+++ b/framework/inc/uifactory/toolboxfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIFACTORY_TOOLBOXFACTORY_HXX_
-#define __FRAMEWORK_UIFACTORY_TOOLBOXFACTORY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_TOOLBOXFACTORY_HXX
+#define INCLUDED_FRAMEWORK_INC_UIFACTORY_TOOLBOXFACTORY_HXX
 
 #include <stdtypes.h>
 #include <macros/xserviceinfo.hxx>
diff --git a/framework/inc/uifactory/uicontrollerfactory.hxx b/framework/inc/uifactory/uicontrollerfactory.hxx
index fd5dfac5ab1a..08af3f43b0e2 100644
--- a/framework/inc/uifactory/uicontrollerfactory.hxx
+++ b/framework/inc/uifactory/uicontrollerfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONTROLLERFACTORY_HXX_
-#define __FRAMEWORK_UICONTROLLERFACTORY_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_UICONTROLLERFACTORY_HXX
+#define INCLUDED_FRAMEWORK_INC_UIFACTORY_UICONTROLLERFACTORY_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <macros/generic.hxx>
@@ -96,6 +96,6 @@ class StatusbarControllerFactory :  public UIControllerFactory
 
 }
 
-#endif // __FRAMEWORK_UICONTROLLERFACTORY_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_UICONTROLLERFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/uielementfactorymanager.hxx b/framework/inc/uifactory/uielementfactorymanager.hxx
index fd4e73df6d67..5e5f56352fad 100644
--- a/framework/inc/uifactory/uielementfactorymanager.hxx
+++ b/framework/inc/uifactory/uielementfactorymanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX_
-#define __FRAMEWORK_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
@@ -128,6 +128,6 @@ class UIElementFactoryManager :  private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_UIELEMENTFACTORYMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/uifactory/windowcontentfactorymanager.hxx b/framework/inc/uifactory/windowcontentfactorymanager.hxx
index b187a985248a..a92303e585b3 100644
--- a/framework/inc/uifactory/windowcontentfactorymanager.hxx
+++ b/framework/inc/uifactory/windowcontentfactorymanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UIFACTORY_WINDOWCONTENTFACTORYMANAGER_HXX_
-#define __FRAMEWORK_UIFACTORY_WINDOWCONTENTFACTORYMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_WINDOWCONTENTFACTORYMANAGER_HXX
+#define INCLUDED_FRAMEWORK_INC_UIFACTORY_WINDOWCONTENTFACTORYMANAGER_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
@@ -69,6 +69,6 @@ class WindowContentFactoryManager : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_UIFACTORY_WINDOWCONTENTFACTORYMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_UIFACTORY_WINDOWCONTENTFACTORYMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index e3c915f8edc8..ecf9b9aec551 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_
-#define _FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONREADER_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONREADER_HXX
 
 #include <accelerators/acceleratorcache.hxx>
 #include <accelerators/keymapping.hxx>
@@ -189,6 +189,6 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // _FRAMEWORK_XML_ACCELERATORCONFIGURATIONREADER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONREADER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index ac51454b213c..e0119b729b63 100644
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_
-#define _FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONWRITER_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONWRITER_HXX
 
 #include <accelerators/acceleratorcache.hxx>
 #include <accelerators/keymapping.hxx>
@@ -98,6 +98,6 @@ class AcceleratorConfigurationWriter : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // _FRAMEWORK_XML_ACCELERATORCONFIGURATIONWRITER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONWRITER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx
index ce85a1563881..a2919a965236 100644
--- a/framework/inc/xml/imagesconfiguration.hxx
+++ b/framework/inc/xml/imagesconfiguration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
-#define FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_IMAGESCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_IMAGESCONFIGURATION_HXX
 
 #include <framework/fwedllapi.h>
 #include <tools/stream.hxx>
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index fdc9f4cca025..9476fe8135a1 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
-#define FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_IMAGESDOCUMENTHANDLER_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_IMAGESDOCUMENTHANDLER_HXX
 
 #include <framework/fwedllapi.h>
 
diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx
index a35634eb36d9..c5ed3f41174d 100644
--- a/framework/inc/xml/menudocumenthandler.hxx
+++ b/framework/inc/xml/menudocumenthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_XML_MENUDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_XML_MENUDOCUMENTHANDLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_MENUDOCUMENTHANDLER_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_MENUDOCUMENTHANDLER_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
@@ -281,6 +281,6 @@ class FWE_DLLPUBLIC OWriteMenuDocumentHandler
 
 } // namespace framework
 
-#endif  // #ifndef __FRAMEWORK_XML_MENUDOCUMENTHANDLER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_XML_MENUDOCUMENTHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx
index 1ceb01bfd4ec..8ae0d73ffbb1 100644
--- a/framework/inc/xml/saxnamespacefilter.hxx
+++ b/framework/inc/xml/saxnamespacefilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_SERVICES_SAXNAMESPACEFILTER_HXX_
-#define __FRAMEWORK_SERVICES_SAXNAMESPACEFILTER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_SAXNAMESPACEFILTER_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_SAXNAMESPACEFILTER_HXX
 
 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>
 #include <threadhelp/threadhelpbase.hxx>
@@ -94,6 +94,6 @@ class FWE_DLLPUBLIC SaxNamespaceFilter : public ThreadHelpBase, // Struct for ri
 
 }
 
-#endif // __FRAMEWORK_SERVICES_SAXNAMESPACEFILTER_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_XML_SAXNAMESPACEFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index e1ac3b919915..3bde59109a8b 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_STATUSBARDOCUMENTHANDLER_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_STATUSBARDOCUMENTHANDLER_HXX
 
 #include <framework/statusbarconfiguration.hxx>
 
diff --git a/framework/inc/xml/toolboxconfigurationdefines.hxx b/framework/inc/xml/toolboxconfigurationdefines.hxx
index acd8e02c27bf..6f26715dd35e 100644
--- a/framework/inc/xml/toolboxconfigurationdefines.hxx
+++ b/framework/inc/xml/toolboxconfigurationdefines.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 __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
-#define __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_TOOLBOXCONFIGURATIONDEFINES_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_TOOLBOXCONFIGURATIONDEFINES_HXX
 
 #define XMLNS_TOOLBAR               "http://openoffice.org/2001/toolbar"
 #define XMLNS_XLINK                 "http://www.w3.org/1999/xlink"
@@ -69,6 +69,6 @@
 #define ATTRIBUTE_ITEMSTYLE_DROPDOWNONLY    "dropdownonly"
 #define ATTRIBUTE_ITEMSTYLE_IMAGE    "image"
 
-#endif // __FRAMEWORK_XML_TOOLBOXCONFIGURATIONDEFINES_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_XML_TOOLBOXCONFIGURATIONDEFINES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 3e7364f471e6..414a11119c4a 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_
-#define __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_TOOLBOXDOCUMENTHANDLER_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_TOOLBOXDOCUMENTHANDLER_HXX
 
 #include <framework/toolboxconfiguration.hxx>
 
diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx
index 8d19790507d4..a1081ed7868c 100644
--- a/framework/inc/xml/xmlnamespaces.hxx
+++ b/framework/inc/xml/xmlnamespaces.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_XML_XMLNAMESPACES_HXX_
-#define __FRAMEWORK_XML_XMLNAMESPACES_HXX_
+#ifndef INCLUDED_FRAMEWORK_INC_XML_XMLNAMESPACES_HXX
+#define INCLUDED_FRAMEWORK_INC_XML_XMLNAMESPACES_HXX
 
 #include <com/sun/star/xml/sax/SAXException.hpp>
 
@@ -56,6 +56,6 @@ class FWE_DLLPUBLIC XMLNamespaces
 
 }
 
-#endif // __FRAMEWORK_XML_XMLNAMESPACES_HXX_
+#endif // INCLUDED_FRAMEWORK_INC_XML_XMLNAMESPACES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index dbaf0fdafc51..63986d98a41f 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_ACCELERATORS_ACCELERATORCACHE_HXX_
-#define __FRAMEWORK_ACCELERATORS_ACCELERATORCACHE_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCACHE_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCACHE_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 #include <general.h>
@@ -166,6 +166,6 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
 
 } // namespace framework
 
-#endif // __FRAMEWORK_ACCELERATORS_ACCELERATORCACHE_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCACHE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 24eb8633ab80..aa7e0dea9829 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_ACCELERATORS_ACCELERATORCONFIGURATION_HXX_
-#define __FRAMEWORK_ACCELERATORS_ACCELERATORCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCONFIGURATION_HXX
 
 #include <accelerators/istoragelistener.hxx>
 #include <accelerators/presethandler.hxx>
@@ -447,6 +447,6 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase,
 
 } // namespace framework
 
-#endif // __FRAMEWORK_ACCELERATORS_ACCELERATORCONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCONFIGURATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
index ce1416f0a154..fdf40459f585 100644
--- a/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/documentacceleratorconfiguration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX_
-#define __FRAMEWORK_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX
 
 #include <accelerators/acceleratorconfiguration.hxx>
 #include <accelerators/istoragelistener.hxx>
@@ -106,6 +106,6 @@ class DocumentAcceleratorConfiguration : public DocumentAcceleratorConfiguration
 
 } // namespace framework
 
-#endif // __FRAMEWORK_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_DOCUMENTACCELERATORCONFIGURATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
index df2e0fbfb8de..b78c528f1e58 100644
--- a/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/globalacceleratorconfiguration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX_
-#define __FRAMEWORK_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX
 
 #include <accelerators/acceleratorconfiguration.hxx>
 #include <accelerators/presethandler.hxx>
@@ -90,6 +90,6 @@ class GlobalAcceleratorConfiguration : GlobalAcceleratorConfiguration_BASE
 
 } // namespace framework
 
-#endif // __FRAMEWORK_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_GLOBALACCELERATORCONFIGURATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx
index a6355067185f..9d84c26d1338 100644
--- a/framework/source/inc/accelerators/istoragelistener.hxx
+++ b/framework/source/inc/accelerators/istoragelistener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_ACCELERATORS_ISTORAGELISTENER_HXX_
-#define __FRAMEWORK_ACCELERATORS_ISTORAGELISTENER_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ISTORAGELISTENER_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ISTORAGELISTENER_HXX
 
 #include <general.h>
 #include <stdtypes.h>
@@ -48,6 +48,6 @@ class IStorageListener
 
 } // namespace framework
 
-#endif // __FRAMEWORK_ACCELERATORS_ISTORAGELISTENER_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ISTORAGELISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index 4563d60bf39a..8d8ef71a04a8 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_ACCELERATORS_KEYMAPPING_HXX_
-#define __FRAMEWORK_ACCELERATORS_KEYMAPPING_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_KEYMAPPING_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_KEYMAPPING_HXX
 
 #include <general.h>
 #include <stdtypes.h>
@@ -142,6 +142,6 @@ class KeyMapping
 
 } // namespace framework
 
-#endif // __FRAMEWORK_ACCELERATORS_KEYMAPPING_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_KEYMAPPING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
index aebba355e4ff..c85d8268e096 100644
--- a/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/moduleacceleratorconfiguration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX_
-#define __FRAMEWORK_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX
 
 #include <accelerators/acceleratorconfiguration.hxx>
 #include <accelerators/presethandler.hxx>
@@ -100,6 +100,6 @@ class ModuleAcceleratorConfiguration : ModuleAcceleratorConfiguration_BASE
 
 } // namespace framework
 
-#endif // __FRAMEWORK_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_MODULEACCELERATORCONFIGURATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 08d2ecd8a30b..e7d67bb717ba 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_ACCELERATORS_PRESETHANDLER_HXX_
-#define __FRAMEWORK_ACCELERATORS_PRESETHANDLER_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_PRESETHANDLER_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_PRESETHANDLER_HXX
 
 #include <accelerators/storageholder.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -506,6 +506,6 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
 
 } // namespace framework
 
-#endif // __FRAMEWORK_ACCELERATORS_PRESETHANDLER_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_PRESETHANDLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 1c51cdf786aa..13bef973296a 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_ACCELERATORS_STORAGEHOLDER_HXX_
-#define __FRAMEWORK_ACCELERATORS_STORAGEHOLDER_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_STORAGEHOLDER_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_STORAGEHOLDER_HXX
 
 #include <accelerators/istoragelistener.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -214,6 +214,6 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
 
 } // namespace framework
 
-#endif // __FRAMEWORK_ACCELERATORS_STORAGEHOLDER_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_STORAGEHOLDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/constant/containerquery.hxx b/framework/source/inc/constant/containerquery.hxx
index 1467f9b05977..889e542f1a4b 100644
--- a/framework/source/inc/constant/containerquery.hxx
+++ b/framework/source/inc/constant/containerquery.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_H_
-#define __FRAMEWORK_CONSTANT_CONTAINERQUERY_H_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_CONSTANT_CONTAINERQUERY_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_CONSTANT_CONTAINERQUERY_HXX
 
 #include <sal/types.h>
 
@@ -36,6 +36,6 @@ struct ContainerQuery
     } // namespace constant
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_CONSTANT_CONTAINERQUERY_H_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_CONSTANT_CONTAINERQUERY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 51e06de59be0..a87ea8c010e2 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_LOADDISPATCHER_HXX_
-#define __FRAMEWORK_DISPATCH_LOADDISPATCHER_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_DISPATCH_LOADDISPATCHER_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_DISPATCH_LOADDISPATCHER_HXX
 
 #include <loadenv/loadenv.hxx>
 
@@ -131,6 +131,6 @@ class LoadDispatcher : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_DISPATCH_LOADDISPATCHER_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_DISPATCH_LOADDISPATCHER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 64fc5e41a1d9..425d869ffd79 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_DISPATCH_WINDOWCOMMANDDISPATCH_HXX_
-#define __FRAMEWORK_DISPATCH_WINDOWCOMMANDDISPATCH_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_DISPATCH_WINDOWCOMMANDDISPATCH_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_DISPATCH_WINDOWCOMMANDDISPATCH_HXX
 
 #include <threadhelp/threadhelpbase.hxx>
 
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index a6f453de330b..91d8325023f6 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_LOADENV_ACTIONLOCKGUARD_HXX_
-#define __FRAMEWORK_LOADENV_ACTIONLOCKGUARD_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_ACTIONLOCKGUARD_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_ACTIONLOCKGUARD_HXX
 
 
 #include <threadhelp/threadhelpbase.hxx>
@@ -182,6 +182,6 @@ class ActionLockGuard : private ThreadHelpBase
 
 } // namespace framework
 
-#endif // __FRAMEWORK_LOADENV_ACTIONLOCKGUARD_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_ACTIONLOCKGUARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index 9fa81d21142b..dee4f0b435de 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.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 __FRAMEWORK_LOADENV_LOADENV_HXX_
-#define __FRAMEWORK_LOADENV_LOADENV_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENV_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENV_HXX
 
 
 #include <loadenv/loadenvexception.hxx>
@@ -590,6 +590,6 @@ private:
 
 } // namespace framework
 
-#endif // __FRAMEWORK_LOADENV_LOADENV_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx
index aedb6b3beae3..23d8c2e6446d 100644
--- a/framework/source/inc/loadenv/loadenvexception.hxx
+++ b/framework/source/inc/loadenv/loadenvexception.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_LOADENV_LOADENVEXCEPTION_HXX_
-#define __FRAMEWORK_LOADENV_LOADENVEXCEPTION_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENVEXCEPTION_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENVEXCEPTION_HXX
 
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Exception.hpp>
@@ -103,6 +103,6 @@ class LoadEnvException
 
 } // namespace framework
 
-#endif // __FRAMEWORK_LOADENV_LOADENVEXCEPTION_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENVEXCEPTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index 4adea994479a..fc54bd0378b7 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_TARGETHELPER_HXX_
-#define __FRAMEWORK_TARGETHELPER_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_TARGETHELPER_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_TARGETHELPER_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -104,6 +104,6 @@ class TargetHelper
 
 } // namespace framework
 
-#endif // #ifndef __FRAMEWORK_TARGETHELPER_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_TARGETHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/pattern/configuration.hxx b/framework/source/inc/pattern/configuration.hxx
index 1e780aee32c6..a89315364e08 100644
--- a/framework/source/inc/pattern/configuration.hxx
+++ b/framework/source/inc/pattern/configuration.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_PATTERN_CONFIGURATION_HXX_
-#define __FRAMEWORK_PATTERN_CONFIGURATION_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_CONFIGURATION_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_CONFIGURATION_HXX
 
 #include <services.h>
 #include <general.h>
@@ -144,6 +144,6 @@ class ConfigurationHelper
     } // namespace pattern
 } // namespace framework
 
-#endif // __FRAMEWORK_PATTERN_CONFIGURATION_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_CONFIGURATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 02c48e438a4d..7035eb034c59 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_PATTERN_FRAME_HXX_
-#define __FRAMEWORK_PATTERN_FRAME_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_FRAME_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_FRAME_HXX
 
 #include <general.h>
 
@@ -104,6 +104,6 @@ inline sal_Bool closeIt(const css::uno::Reference< css::uno::XInterface >& xReso
     } // namespace pattern
 } // namespace framework
 
-#endif // __FRAMEWORK_PATTERN_FRAME_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_FRAME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index b332c6794a2a..3cca5061f4f5 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_PATTERN_WINDOW_HXX_
-#define __FRAMEWORK_PATTERN_WINDOW_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_WINDOW_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_WINDOW_HXX
 
 #include <general.h>
 
@@ -127,6 +127,6 @@ static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xW
 
 } // namespace framework
 
-#endif // __FRAMEWORK_PATTERN_WINDOW_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_WINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx
index d124c08b017a..50deaea0799a 100644
--- a/framework/source/layoutmanager/helpers.hxx
+++ b/framework/source/layoutmanager/helpers.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_LAYOUTMANAGER_HELPERS_HXX_
-#define __FRAMEWORK_LAYOUTMANAGER_HELPERS_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_HELPERS_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_HELPERS_HXX
 
 #include <macros/generic.hxx>
 #include <stdtypes.h>
@@ -74,6 +74,6 @@ void impl_addWindowListeners( const ::com::sun::star::uno::Reference< ::com::sun
 
 }
 
-#endif // __FRAMEWORK_LAYOUTMANAGER_HELPERS_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_HELPERS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index c1716f30e07a..7c475f246db0 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX_
-#define __FRAMEWORK_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
@@ -328,6 +328,6 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
 
 } // namespace framework
 
-#endif // __FRAMEWORK_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX_
+#endif // INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_TOOLBARLAYOUTMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx
index c8fd726fc776..d406d79966a3 100644
--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_
-#define __FRAMEWORK_UICONFIGURATION_IMAGEMANAGERIMPL_HXX_
+#ifndef INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX
+#define INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX
 
 /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble
                with solaris headers ...
author	Thomas Arnhold <thomas@arnhold.org>	2013-11-05 02:25:45 +0100
committer	Thomas Arnhold <thomas@arnhold.org>	2013-11-05 09:28:53 +0100
commit	15b5412fad3e6363debb33de583843ca7c9c7299 (patch)
tree	5cbe55b56abd8f0b0fd546d7a75755469cb454ac /framework
parent	a2502692cd2da8665719b1769eacbf334f7c0293 (diff)