fixincludeguards.sh: ucb

Change-Id: I6a5994003cef7ed1672002933a5240160cff559d

104 files changed, 246 insertions, 246 deletions

diff --git a/ucb/source/cacher/cachedcontentresultset.hxx b/ucb/source/cacher/cachedcontentresultset.hxx
index 20d979820a38..7d0d69ba2841 100644
--- a/ucb/source/cacher/cachedcontentresultset.hxx
+++ b/ucb/source/cacher/cachedcontentresultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CACHED_CONTENT_RESULTSET_HXX
-#define _CACHED_CONTENT_RESULTSET_HXX
+#ifndef INCLUDED_UCB_SOURCE_CACHER_CACHEDCONTENTRESULTSET_HXX
+#define INCLUDED_UCB_SOURCE_CACHER_CACHEDCONTENTRESULTSET_HXX
 
 #include <contentresultsetwrapper.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/ucb/source/cacher/cachedcontentresultsetstub.hxx b/ucb/source/cacher/cachedcontentresultsetstub.hxx
index 6924634e06d4..18aa30a869c0 100644
--- a/ucb/source/cacher/cachedcontentresultsetstub.hxx
+++ b/ucb/source/cacher/cachedcontentresultsetstub.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CACHED_CONTENT_RESULTSET_STUB_HXX
-#define _CACHED_CONTENT_RESULTSET_STUB_HXX
+#ifndef INCLUDED_UCB_SOURCE_CACHER_CACHEDCONTENTRESULTSETSTUB_HXX
+#define INCLUDED_UCB_SOURCE_CACHER_CACHEDCONTENTRESULTSETSTUB_HXX
 
 #include <contentresultsetwrapper.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
diff --git a/ucb/source/cacher/cacheddynamicresultset.hxx b/ucb/source/cacher/cacheddynamicresultset.hxx
index cb400fb7a204..af9b60770d22 100644
--- a/ucb/source/cacher/cacheddynamicresultset.hxx
+++ b/ucb/source/cacher/cacheddynamicresultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CACHED_DYNAMIC_RESULTSET_HXX
-#define _CACHED_DYNAMIC_RESULTSET_HXX
+#ifndef INCLUDED_UCB_SOURCE_CACHER_CACHEDDYNAMICRESULTSET_HXX
+#define INCLUDED_UCB_SOURCE_CACHER_CACHEDDYNAMICRESULTSET_HXX
 
 #include <dynamicresultsetwrapper.hxx>
 #include <com/sun/star/ucb/XContentIdentifierMapping.hpp>
diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.hxx b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
index 26e6fe9906b1..efadea37fa5f 100644
--- a/ucb/source/cacher/cacheddynamicresultsetstub.hxx
+++ b/ucb/source/cacher/cacheddynamicresultsetstub.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CACHED_DYNAMIC_RESULTSET_STUB_HXX
-#define _CACHED_DYNAMIC_RESULTSET_STUB_HXX
+#ifndef INCLUDED_UCB_SOURCE_CACHER_CACHEDDYNAMICRESULTSETSTUB_HXX
+#define INCLUDED_UCB_SOURCE_CACHER_CACHEDDYNAMICRESULTSETSTUB_HXX
 
 #include <dynamicresultsetwrapper.hxx>
 #include <com/sun/star/ucb/XCachedDynamicResultSetStubFactory.hpp>
diff --git a/ucb/source/cacher/contentresultsetwrapper.hxx b/ucb/source/cacher/contentresultsetwrapper.hxx
index 7041cd5cb1b0..23accd81d4b2 100644
--- a/ucb/source/cacher/contentresultsetwrapper.hxx
+++ b/ucb/source/cacher/contentresultsetwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONTENT_RESULTSET_WRAPPER_HXX
-#define _CONTENT_RESULTSET_WRAPPER_HXX
+#ifndef INCLUDED_UCB_SOURCE_CACHER_CONTENTRESULTSETWRAPPER_HXX
+#define INCLUDED_UCB_SOURCE_CACHER_CONTENTRESULTSETWRAPPER_HXX
 
 #include <rtl/ustring.hxx>
 #include <ucbhelper/macros.hxx>
diff --git a/ucb/source/cacher/dynamicresultsetwrapper.hxx b/ucb/source/cacher/dynamicresultsetwrapper.hxx
index 245c9ff64443..798a545340f3 100644
--- a/ucb/source/cacher/dynamicresultsetwrapper.hxx
+++ b/ucb/source/cacher/dynamicresultsetwrapper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DYNAMIC_RESULTSET_WRAPPER_HXX
-#define _DYNAMIC_RESULTSET_WRAPPER_HXX
+#ifndef INCLUDED_UCB_SOURCE_CACHER_DYNAMICRESULTSETWRAPPER_HXX
+#define INCLUDED_UCB_SOURCE_CACHER_DYNAMICRESULTSETWRAPPER_HXX
 
 #include <osl/mutex.hxx>
 #include <osl/conditn.hxx>
diff --git a/ucb/source/core/cmdenv.hxx b/ucb/source/core/cmdenv.hxx
index 92b6fc58644e..4bdcca132a77 100644
--- a/ucb/source/core/cmdenv.hxx
+++ b/ucb/source/core/cmdenv.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CMDENV_HXX
-#define INCLUDED_CMDENV_HXX
+#ifndef INCLUDED_UCB_SOURCE_CORE_CMDENV_HXX
+#define INCLUDED_UCB_SOURCE_CORE_CMDENV_HXX
 
 #include "cppuhelper/implbase3.hxx"
 
@@ -91,6 +91,6 @@ private:
 
 } // namespace ucb_cmdenv
 
-#endif // INCLUDED_CMDENV_HXX
+#endif // INCLUDED_UCB_SOURCE_CORE_CMDENV_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/identify.hxx b/ucb/source/core/identify.hxx
index 87c335b93c2f..91b985544af7 100644
--- a/ucb/source/core/identify.hxx
+++ b/ucb/source/core/identify.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _IDENTIFY_HXX
-#define _IDENTIFY_HXX
+#ifndef INCLUDED_UCB_SOURCE_CORE_IDENTIFY_HXX
+#define INCLUDED_UCB_SOURCE_CORE_IDENTIFY_HXX
 
 #include <com/sun/star/ucb/XContentIdentifier.hpp>
 #include <rtl/ustrbuf.hxx>
@@ -43,6 +43,6 @@ private:
     OUString m_aProviderScheme;
 };
 
-#endif /* !_IDENTIFY_HXX */
+#endif // INCLUDED_UCB_SOURCE_CORE_IDENTIFY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/providermap.hxx b/ucb/source/core/providermap.hxx
index 8057f73bad8e..243ad0d12317 100644
--- a/ucb/source/core/providermap.hxx
+++ b/ucb/source/core/providermap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCB_PROVIDERMAP_HXX_
-#define _UCB_PROVIDERMAP_HXX_
+#ifndef INCLUDED_UCB_SOURCE_CORE_PROVIDERMAP_HXX
+#define INCLUDED_UCB_SOURCE_CORE_PROVIDERMAP_HXX
 
 #include <list>
 #include <com/sun/star/uno/Reference.h>
@@ -65,6 +65,6 @@ typedef std::list< ProviderListEntry_Impl > ProviderList_Impl;
 
 typedef ucb_impl::RegexpMap< ProviderList_Impl > ProviderMap_Impl;
 
-#endif // _UCB_PROVIDERMAP_HXX_
+#endif // INCLUDED_UCB_SOURCE_CORE_PROVIDERMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/provprox.hxx b/ucb/source/core/provprox.hxx
index c0a88c936dca..eafe22ab86a7 100644
--- a/ucb/source/core/provprox.hxx
+++ b/ucb/source/core/provprox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PROVPROX_HXX
-#define _PROVPROX_HXX
+#ifndef INCLUDED_UCB_SOURCE_CORE_PROVPROX_HXX
+#define INCLUDED_UCB_SOURCE_CORE_PROVPROX_HXX
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -176,6 +176,6 @@ public:
                ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
-#endif /* !_PROVPROX_HXX */
+#endif // INCLUDED_UCB_SOURCE_CORE_PROVPROX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/ucb.hxx b/ucb/source/core/ucb.hxx
index ffa25c232d02..1cb32e9de8df 100644
--- a/ucb/source/core/ucb.hxx
+++ b/ucb/source/core/ucb.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCB_HXX
-#define _UCB_HXX
+#ifndef INCLUDED_UCB_SOURCE_CORE_UCB_HXX
+#define INCLUDED_UCB_SOURCE_CORE_UCB_HXX
 
 
 #include <com/sun/star/ucb/CheckinArgument.hpp>
@@ -231,6 +231,6 @@ private:
     sal_Int32 m_nCommandId;
 };
 
-#endif /* !_UCB_HXX */
+#endif // INCLUDED_UCB_SOURCE_CORE_UCB_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/ucbcmds.hxx b/ucb/source/core/ucbcmds.hxx
index 3926f80506eb..89a7d6104519 100644
--- a/ucb/source/core/ucbcmds.hxx
+++ b/ucb/source/core/ucbcmds.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBCMDS_HXX
-#define _UCBCMDS_HXX
+#ifndef INCLUDED_UCB_SOURCE_CORE_UCBCMDS_HXX
+#define INCLUDED_UCB_SOURCE_CORE_UCBCMDS_HXX
 
 
 
@@ -35,6 +35,6 @@
 #define CHECKIN_NAME            "checkin"
 #define CHECKIN_HANDLE          1026
 
-#endif /* !_UCBCMDS_HXX */
+#endif // INCLUDED_UCB_SOURCE_CORE_UCBCMDS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/ucbprops.hxx b/ucb/source/core/ucbprops.hxx
index baefddacc63c..d0c146114d61 100644
--- a/ucb/source/core/ucbprops.hxx
+++ b/ucb/source/core/ucbprops.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBPROPS_HXX
-#define _UCBPROPS_HXX
+#ifndef INCLUDED_UCB_SOURCE_CORE_UCBPROPS_HXX
+#define INCLUDED_UCB_SOURCE_CORE_UCBPROPS_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -85,6 +85,6 @@ public:
         throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
 };
 
-#endif /* !_UCBPROPS_HXX */
+#endif // INCLUDED_UCB_SOURCE_CORE_UCBPROPS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/core/ucbstore.hxx b/ucb/source/core/ucbstore.hxx
index b662ac571f3d..83f27d8a2fc0 100644
--- a/ucb/source/core/ucbstore.hxx
+++ b/ucb/source/core/ucbstore.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCBSTORE_HXX
-#define _UCBSTORE_HXX
+#ifndef INCLUDED_UCB_SOURCE_CORE_UCBSTORE_HXX
+#define INCLUDED_UCB_SOURCE_CORE_UCBSTORE_HXX
 
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -339,6 +339,6 @@ public:
     const OUString& getFullKey();
 };
 
-#endif /* !_UCBSTORE_HXX */
+#endif // INCLUDED_UCB_SOURCE_CORE_UCBSTORE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/inc/regexp.hxx b/ucb/source/inc/regexp.hxx
index 39c5f5b00813..e04120b47c56 100644
--- a/ucb/source/inc/regexp.hxx
+++ b/ucb/source/inc/regexp.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCB_REGEXP_HXX_
-#define _UCB_REGEXP_HXX_
+#ifndef INCLUDED_UCB_SOURCE_INC_REGEXP_HXX
+#define INCLUDED_UCB_SOURCE_INC_REGEXP_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -72,6 +72,6 @@ inline bool Regexp::operator ==(Regexp const & rOther) const
 
 }
 
-#endif // _UCB_REGEXP_HXX_
+#endif // INCLUDED_UCB_SOURCE_INC_REGEXP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/inc/regexpmap.hxx b/ucb/source/inc/regexpmap.hxx
index f677e0bd7306..d1c68391d873 100644
--- a/ucb/source/inc/regexpmap.hxx
+++ b/ucb/source/inc/regexpmap.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _UCB_REGEXPMAP_HXX_
-#define _UCB_REGEXPMAP_HXX_
+#ifndef INCLUDED_UCB_SOURCE_INC_REGEXPMAP_HXX
+#define INCLUDED_UCB_SOURCE_INC_REGEXPMAP_HXX
 
 #include "sal/config.h"
 
@@ -660,6 +660,6 @@ inline bool operator !=(ucb_impl::RegexpMapConstIter< Val > const & rIter1,
     return !rIter1.equals(rIter2);
 }
 
-#endif // _UCB_REGEXPMAP_HXX_
+#endif // INCLUDED_UCB_SOURCE_INC_REGEXPMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index b458f5c84b5f..659defc3ae97 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SORTDYNRES_HXX
-#define _SORTDYNRES_HXX
+#ifndef INCLUDED_UCB_SOURCE_SORTER_SORTDYNRES_HXX
+#define INCLUDED_UCB_SOURCE_SORTER_SORTDYNRES_HXX
 
 #include <com/sun/star/ucb/NumberedSortingInfo.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index 61b99d799744..3ed794ebbdc4 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SORTRESULT_HXX
-#define _SORTRESULT_HXX
+#ifndef INCLUDED_UCB_SOURCE_SORTER_SORTRESULT_HXX
+#define INCLUDED_UCB_SOURCE_SORTER_SORTRESULT_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
diff --git a/ucb/source/ucp/cmis/auth_provider.hxx b/ucb/source/ucp/cmis/auth_provider.hxx
index f62f7bf7e906..f36d9a7b67ea 100644
--- a/ucb/source/ucp/cmis/auth_provider.hxx
+++ b/ucb/source/ucp/cmis/auth_provider.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef AUTH_PROVIDER_HXX
-#define AUTH_PROVIDER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_AUTH_PROVIDER_HXX
 
 #include <libcmis/libcmis.hxx>
 
diff --git a/ucb/source/ucp/cmis/certvalidation_handler.hxx b/ucb/source/ucp/cmis/certvalidation_handler.hxx
index 94cdb4cb5cba..b501ecd54c37 100644
--- a/ucb/source/ucp/cmis/certvalidation_handler.hxx
+++ b/ucb/source/ucp/cmis/certvalidation_handler.hxx
@@ -9,8 +9,8 @@
  * This file incorporates work covered by the following license notice:
  *
  */
-#ifndef CERTVALIDATION_HANDLER_HXX
-#define CERTVALIDATION_HANDLER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_CERTVALIDATION_HANDLER_HXX
 
 #include <libcmis/libcmis.hxx>
 
diff --git a/ucb/source/ucp/cmis/children_provider.hxx b/ucb/source/ucp/cmis/children_provider.hxx
index c7da32ac5ca6..1473318e2567 100644
--- a/ucb/source/ucp/cmis/children_provider.hxx
+++ b/ucb/source/ucp/cmis/children_provider.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef CHILDREN_PROVIDER_HXX
-#define CHILDREN_PROVIDER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CHILDREN_PROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_CHILDREN_PROVIDER_HXX
 
 #include <list>
 
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index a87add7fa23f..e596842f7fc3 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CMIS_CONTENT_HXX
-#define CMIS_CONTENT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_CONTENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_CONTENT_HXX
 
 #include "cmis_url.hxx"
 #include "children_provider.hxx"
diff --git a/ucb/source/ucp/cmis/cmis_datasupplier.hxx b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
index 52535a15607a..d90f24d0e08d 100644
--- a/ucb/source/ucp/cmis/cmis_datasupplier.hxx
+++ b/ucb/source/ucp/cmis/cmis_datasupplier.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CMIS_DATASUPPLIER_HXX
-#define CMIS_DATASUPPLIER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_DATASUPPLIER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_DATASUPPLIER_HXX
 
 #include <vector>
 
diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx
index 9d33e0096d97..b0e7fecce969 100644
--- a/ucb/source/ucp/cmis/cmis_provider.hxx
+++ b/ucb/source/ucp/cmis/cmis_provider.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CMIS_PROVIDER_HXX
-#define CMIS_PROVIDER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_PROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_PROVIDER_HXX
 
 #include <com/sun/star/beans/Property.hpp>
 #include <ucbhelper/providerhelper.hxx>
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 2f2bcf8f10ff..e2ca6fa85a65 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CMIS_REPO_CONTENT_HXX
-#define CMIS_REPO_CONTENT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_REPO_CONTENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_REPO_CONTENT_HXX
 
 #include "cmis_url.hxx"
 #include "children_provider.hxx"
diff --git a/ucb/source/ucp/cmis/cmis_resultset.hxx b/ucb/source/ucp/cmis/cmis_resultset.hxx
index 020cb057d564..f739b7a34194 100644
--- a/ucb/source/ucp/cmis/cmis_resultset.hxx
+++ b/ucb/source/ucp/cmis/cmis_resultset.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef CMIS_RESULTSET_HXX
-#define CMIS_RESULTSET_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_RESULTSET_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_RESULTSET_HXX
 
 #include <ucbhelper/resultsethelper.hxx>
 
diff --git a/ucb/source/ucp/cmis/cmis_strings.hxx b/ucb/source/ucp/cmis/cmis_strings.hxx
index f478548c8269..b2af8f877d7d 100644
--- a/ucb/source/ucp/cmis/cmis_strings.hxx
+++ b/ucb/source/ucp/cmis/cmis_strings.hxx
@@ -10,8 +10,8 @@
  *
  */
 
-#ifndef CMIS_STRINGS_HXX
-#define CMIS_STRINGS_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_STRINGS_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_STRINGS_HXX
 
 #define CMIS_TYPE_STRING      "String"
 #define CMIS_TYPE_INTEGER     "Integer"
diff --git a/ucb/source/ucp/cmis/cmis_url.hxx b/ucb/source/ucp/cmis/cmis_url.hxx
index 54c51ce87af4..3ad7a5d53b24 100644
--- a/ucb/source/ucp/cmis/cmis_url.hxx
+++ b/ucb/source/ucp/cmis/cmis_url.hxx
@@ -6,8 +6,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-#ifndef CMIS_URL_HXX
-#define CMIS_URL_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_URL_HXX
+#define INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_URL_HXX
 
 #include <map>
 #include <string>
diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx
index 57fdd5cbb843..40594f211465 100644
--- a/ucb/source/ucp/ext/ucpext_content.hxx
+++ b/ucb/source/ucp/ext/ucpext_content.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UCB_UCPEXT_CONTENT_HXX
-#define UCB_UCPEXT_CONTENT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_CONTENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_CONTENT_HXX
 
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -142,6 +142,6 @@ namespace ucb { namespace ucp { namespace ext
 } } }   // namespace ucb::ucp::ext
 
 
-#endif  // UCB_UCPEXT_CONTENT_HXX
+#endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_CONTENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
index 8a7c54f373fa..c277a1cc6bf2 100644
--- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx
+++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UCB_UCPEXT_DATA_SUPPLIER_HXX
-#define UCB_UCPEXT_DATA_SUPPLIER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_DATASUPPLIER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_DATASUPPLIER_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultset.hxx>
@@ -76,6 +76,6 @@ namespace ucb { namespace ucp { namespace ext
 } } }   // namespace ucp::ext
 
 
-#endif  // UCB_UCPEXT_DATA_SUPPLIER_HXX
+#endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_DATASUPPLIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx
index 9e339f29891c..1b0ae3358555 100644
--- a/ucb/source/ucp/ext/ucpext_provider.hxx
+++ b/ucb/source/ucp/ext/ucpext_provider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UCB_UCPEXT_CONTENT_PROVIDER_HXX
-#define UCB_UCPEXT_CONTENT_PROVIDER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_PROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_PROVIDER_HXX
 
 #include <ucbhelper/providerhelper.hxx>
 
@@ -58,6 +58,6 @@ namespace ucb { namespace ucp { namespace ext
 } } }   // namespace ucb::ucp::ext
 
 
-#endif  // UCB_UCPEXT_CONTENT_PROVIDER_HXX
+#endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_PROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx
index 2b1521183224..61501d3dbf23 100644
--- a/ucb/source/ucp/ext/ucpext_resultset.hxx
+++ b/ucb/source/ucp/ext/ucpext_resultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UCB_UCPEXT_RESULT_SET_HXX
-#define UCB_UCPEXT_RESULT_SET_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_RESULTSET_HXX
+#define INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_RESULTSET_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultsethelper.hxx>
@@ -56,6 +56,6 @@ namespace ucb { namespace ucp { namespace ext
 } } }   // namespace ucp::ext
 
 
-#endif  // UCB_UCPEXT_RESULT_SET_HXX
+#endif // INCLUDED_UCB_SOURCE_UCP_EXT_UCPEXT_RESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/file/bc.hxx b/ucb/source/ucp/file/bc.hxx
index 2cdc7737a12f..01e54b350b38 100644
--- a/ucb/source/ucp/file/bc.hxx
+++ b/ucb/source/ucp/file/bc.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _BC_HXX_
-#define _BC_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_BC_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_BC_HXX
 
 #include "osl/mutex.hxx"
 #include "rtl/ustring.hxx"
diff --git a/ucb/source/ucp/file/filcmd.hxx b/ucb/source/ucp/file/filcmd.hxx
index 4aaca8c52e36..6863f8dde465 100644
--- a/ucb/source/ucp/file/filcmd.hxx
+++ b/ucb/source/ucp/file/filcmd.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 _FILCMD_HXX_
-#define _FILCMD_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILCMD_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILCMD_HXX
 
 #include <rtl/ustring.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/ucb/source/ucp/file/filerror.hxx b/ucb/source/ucp/file/filerror.hxx
index b3d973cc0f88..ab95fa79f6f4 100644
--- a/ucb/source/ucp/file/filerror.hxx
+++ b/ucb/source/ucp/file/filerror.hxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _FILERROR_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILERROR_HXX
 
 namespace fileaccess {
 
diff --git a/ucb/source/ucp/file/filglob.hxx b/ucb/source/ucp/file/filglob.hxx
index ebf569adad40..025db753cde4 100644
--- a/ucb/source/ucp/file/filglob.hxx
+++ b/ucb/source/ucp/file/filglob.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 _FILGLOB_HXX_
-#define _FILGLOB_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILGLOB_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILGLOB_HXX
 
 #include <rtl/ustring.hxx>
 #include <osl/file.hxx>
diff --git a/ucb/source/ucp/file/filid.hxx b/ucb/source/ucp/file/filid.hxx
index a36d9408e4f0..0be43e92f0b9 100644
--- a/ucb/source/ucp/file/filid.hxx
+++ b/ucb/source/ucp/file/filid.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 _FILID_HXX_
-#define _FILID_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILID_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILID_HXX
 
 #include <rtl/ustring.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/ucb/source/ucp/file/filinl.hxx b/ucb/source/ucp/file/filinl.hxx
index b2234c897096..9dad70fff0a2 100644
--- a/ucb/source/ucp/file/filinl.hxx
+++ b/ucb/source/ucp/file/filinl.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 _FILINL_HXX_
-#define _FILINL_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILINL_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILINL_HXX
 
 inline const sal_Bool& SAL_CALL shell::MyProperty::IsNative() const
 {
diff --git a/ucb/source/ucp/file/filinpstr.hxx b/ucb/source/ucp/file/filinpstr.hxx
index 0a5faf424042..da99a448043d 100644
--- a/ucb/source/ucp/file/filinpstr.hxx
+++ b/ucb/source/ucp/file/filinpstr.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 _FILINPSTR_HXX_
-#define _FILINPSTR_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILINPSTR_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILINPSTR_HXX
 
 #include <rtl/ustring.hxx>
 #include <cppuhelper/weak.hxx>
diff --git a/ucb/source/ucp/file/filinsreq.hxx b/ucb/source/ucp/file/filinsreq.hxx
index 0d5f57fc9cb8..fced106b042f 100644
--- a/ucb/source/ucp/file/filinsreq.hxx
+++ b/ucb/source/ucp/file/filinsreq.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _FILINSREQ_HXX_
-#define _FILINSREQ_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILINSREQ_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILINSREQ_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/uno/XInterface.hpp>
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 12b301c0f744..dd4f690506c5 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.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 _FILNOT_HXX_
-#define _FILNOT_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILNOT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILNOT_HXX
 
 #include <boost/unordered_map.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
diff --git a/ucb/source/ucp/file/filprp.hxx b/ucb/source/ucp/file/filprp.hxx
index c241dfb745cb..29f29b865b83 100644
--- a/ucb/source/ucp/file/filprp.hxx
+++ b/ucb/source/ucp/file/filprp.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 _FILPRP_HXX_
-#define _FILPRP_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILPRP_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILPRP_HXX
 
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
diff --git a/ucb/source/ucp/file/filrec.hxx b/ucb/source/ucp/file/filrec.hxx
index 5a565c13cb41..29fe74b8d2c8 100644
--- a/ucb/source/ucp/file/filrec.hxx
+++ b/ucb/source/ucp/file/filrec.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FILREC_HXX_
-#define _FILREC_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILREC_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILREC_HXX
 
 #include <osl/file.hxx>
 
@@ -74,6 +74,6 @@ public:
 };
 
 } // namespace fileaccess
-#endif  // _FILREC_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_FILE_FILREC_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/file/filrow.hxx b/ucb/source/ucp/file/filrow.hxx
index 543df3c4dd5e..4ded72637f49 100644
--- a/ucb/source/ucp/file/filrow.hxx
+++ b/ucb/source/ucp/file/filrow.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 _FILROW_HXX_
-#define _FILROW_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILROW_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILROW_HXX
 
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/script/XTypeConverter.hpp>
diff --git a/ucb/source/ucp/file/filrset.hxx b/ucb/source/ucp/file/filrset.hxx
index 6c13b33300cb..0dcb2ff1908e 100644
--- a/ucb/source/ucp/file/filrset.hxx
+++ b/ucb/source/ucp/file/filrset.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 _FILRSET_HXX_
-#define _FILRSET_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILRSET_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILRSET_HXX
 
 #include <vector>
 #include <osl/file.hxx>
diff --git a/ucb/source/ucp/file/filstr.hxx b/ucb/source/ucp/file/filstr.hxx
index 43b4add4bc42..ccfd3ae0ee7b 100644
--- a/ucb/source/ucp/file/filstr.hxx
+++ b/ucb/source/ucp/file/filstr.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 _FILSTR_HXX_
-#define _FILSTR_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILSTR_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILSTR_HXX
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index f68a276a80de..a08c1c84ef08 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.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 _FILTASK_HXX_
-#define _FILTASK_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILTASK_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_FILTASK_HXX
 #endif
 
 #include <boost/unordered_map.hpp>
diff --git a/ucb/source/ucp/file/prov.hxx b/ucb/source/ucp/file/prov.hxx
index e4a0a8eeaca9..280e6ea44845 100644
--- a/ucb/source/ucp/file/prov.hxx
+++ b/ucb/source/ucp/file/prov.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PROV_HXX_
-#define _PROV_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_PROV_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_PROV_HXX
 
 #include <cppuhelper/weak.hxx>
 
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index dd84d29eca38..b86ad9b97c07 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -18,8 +18,8 @@
  */
 
 
-#ifndef _SHELL_HXX_
-#define _SHELL_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_SHELL_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FILE_SHELL_HXX
 
 
 #include <cppuhelper/weak.hxx>
diff --git a/ucb/source/ucp/ftp/ftpcfunc.hxx b/ucb/source/ucp/ftp/ftpcfunc.hxx
index 127d04b1a0b8..c20ef0b13f35 100644
--- a/ucb/source/ucp/ftp/ftpcfunc.hxx
+++ b/ucb/source/ucp/ftp/ftpcfunc.hxx
@@ -22,8 +22,8 @@
  **************************************************************************
 
  *************************************************************************/
-#ifndef _FTP_FTPCFUNC_HXX_
-#define _FTP_FTPCFUNC_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPCFUNC_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPCFUNC_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/ucb/source/ucp/ftp/ftpcontent.hxx b/ucb/source/ucp/ftp/ftpcontent.hxx
index 88ce630ff8ef..265771ba1e3c 100644
--- a/ucb/source/ucp/ftp/ftpcontent.hxx
+++ b/ucb/source/ucp/ftp/ftpcontent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FTP_FTPCONTENT_HXX
-#define _FTP_FTPCONTENT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENT_HXX
 
 #include <ucbhelper/contenthelper.hxx>
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
index e4736b8c0243..6ec021c23347 100644
--- a/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentidentifier.hxx
@@ -22,8 +22,8 @@
  **************************************************************************
 
  *************************************************************************/
-#ifndef _FTP_FTPCONTENTIDENTIFIER_HXX_
-#define _FTP_FTPCONTENTIDENTIFIER_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTIDENTIFIER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTIDENTIFIER_HXX
 
 #include <vector>
 #include "curl.hxx"
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index cb4caa972af1..d700e855a049 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FTP_FTPCONTENTPROVIDER_HXX_
-#define _FTP_FTPCONTENTPROVIDER_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTPROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPCONTENTPROVIDER_HXX
 
 #include <vector>
 #include <osl/mutex.hxx>
diff --git a/ucb/source/ucp/ftp/ftpdirp.hxx b/ucb/source/ucp/ftp/ftpdirp.hxx
index 13d507475b37..8c94f4017878 100644
--- a/ucb/source/ucp/ftp/ftpdirp.hxx
+++ b/ucb/source/ucp/ftp/ftpdirp.hxx
@@ -22,8 +22,8 @@
  **************************************************************************
 
  *************************************************************************/
-#ifndef _FTP_FTPDIRP_HXX_
-#define _FTP_FTPDIRP_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPDIRP_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPDIRP_HXX
 
 #include <osl/time.h>
 #include <rtl/ustring.hxx>
diff --git a/ucb/source/ucp/ftp/ftpdynresultset.hxx b/ucb/source/ucp/ftp/ftpdynresultset.hxx
index 37e9dbf18559..01942a73a439 100644
--- a/ucb/source/ucp/ftp/ftpdynresultset.hxx
+++ b/ucb/source/ucp/ftp/ftpdynresultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FTP_FTPDYNRESULTSET_HXX
-#define _FTP_FTPDYNRESULTSET_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPDYNRESULTSET_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPDYNRESULTSET_HXX
 
 #include "rtl/ref.hxx"
 #include "ucbhelper/resultsethelper.hxx"
diff --git a/ucb/source/ucp/ftp/ftpintreq.hxx b/ucb/source/ucp/ftp/ftpintreq.hxx
index c0fafd4d3bec..28198c7de0ba 100644
--- a/ucb/source/ucp/ftp/ftpintreq.hxx
+++ b/ucb/source/ucp/ftp/ftpintreq.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FTP_FTPINTREQ_HXX
-#define _FTP_FTPINTREQ_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPINTREQ_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPINTREQ_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <ucbhelper/macros.hxx>
diff --git a/ucb/source/ucp/ftp/ftploaderthread.hxx b/ucb/source/ucp/ftp/ftploaderthread.hxx
index db1aa78ef9e9..701c973baa00 100644
--- a/ucb/source/ucp/ftp/ftploaderthread.hxx
+++ b/ucb/source/ucp/ftp/ftploaderthread.hxx
@@ -23,8 +23,8 @@
 
  *************************************************************************/
 
-#ifndef _FTP_FTPLOADERTHREAD_HXX_
-#define _FTP_FTPLOADERTHREAD_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPLOADERTHREAD_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPLOADERTHREAD_HXX
 
 #include <osl/thread.h>
 #include "curl.hxx"
diff --git a/ucb/source/ucp/ftp/ftpresultsetI.hxx b/ucb/source/ucp/ftp/ftpresultsetI.hxx
index 584738c7a8e0..6437debb9bf5 100644
--- a/ucb/source/ucp/ftp/ftpresultsetI.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetI.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 _FTP_FTPRESULTSETI_HXX_
-#define _FTP_FTPRESULTSETI_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPRESULTSETI_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPRESULTSETI_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/ucb/XContentProvider.hpp>
diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.hxx b/ucb/source/ucp/ftp/ftpresultsetbase.hxx
index 292d2defa446..68e7db9d6e22 100644
--- a/ucb/source/ucp/ftp/ftpresultsetbase.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetbase.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 _FTP_FTPRESULTSETBASE_HXX_
-#define _FTP_FTPRESULTSETBASE_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPRESULTSETBASE_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPRESULTSETBASE_HXX
 
 #include <vector>
 #include <cppuhelper/weak.hxx>
diff --git a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
index 86ae1e028589..a87c71ecf66b 100644
--- a/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
+++ b/ucb/source/ucp/ftp/ftpresultsetfactory.hxx
@@ -22,8 +22,8 @@
  **************************************************************************
 
  *************************************************************************/
-#ifndef _FTP_FTPRESULTSETFACTORY_HXX_
-#define _FTP_FTPRESULTSETFACTORY_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPRESULTSETFACTORY_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPRESULTSETFACTORY_HXX
 
 #include "ftpresultsetbase.hxx"
 
diff --git a/ucb/source/ucp/ftp/ftpstrcont.hxx b/ucb/source/ucp/ftp/ftpstrcont.hxx
index 2c6666088887..6d9e581d24a0 100644
--- a/ucb/source/ucp/ftp/ftpstrcont.hxx
+++ b/ucb/source/ucp/ftp/ftpstrcont.hxx
@@ -22,8 +22,8 @@
  **************************************************************************
 
  *************************************************************************/
-#ifndef _FTP_STRCONT_HXX_
-#define _FTP_STRCONT_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPSTRCONT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPSTRCONT_HXX
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
diff --git a/ucb/source/ucp/ftp/ftpurl.hxx b/ucb/source/ucp/ftp/ftpurl.hxx
index 42d141540d02..2a49e3d5b181 100644
--- a/ucb/source/ucp/ftp/ftpurl.hxx
+++ b/ucb/source/ucp/ftp/ftpurl.hxx
@@ -23,8 +23,8 @@
 
  *************************************************************************/
 
-#ifndef _FTP_FTPURL_HXX_
-#define _FTP_FTPURL_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_FTPURL_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_FTPURL_HXX
 
 #include "curl.hxx"
 #include <curl/easy.h>
diff --git a/ucb/source/ucp/ftp/test_activedatasink.hxx b/ucb/source/ucp/ftp/test_activedatasink.hxx
index c7549216d304..7d9a90f9679a 100644
--- a/ucb/source/ucp/ftp/test_activedatasink.hxx
+++ b/ucb/source/ucp/ftp/test_activedatasink.hxx
@@ -22,8 +22,8 @@
  **************************************************************************
 
  *************************************************************************/
-#ifndef _TEST_ACTIVEDATASINK_HXX_
-#define _TEST_ACTIVEDATASINK_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_TEST_ACTIVEDATASINK_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_TEST_ACTIVEDATASINK_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/ucb/source/ucp/ftp/test_multiservicefac.hxx b/ucb/source/ucp/ftp/test_multiservicefac.hxx
index c767ba824a1d..4bb98fee66f9 100644
--- a/ucb/source/ucp/ftp/test_multiservicefac.hxx
+++ b/ucb/source/ucp/ftp/test_multiservicefac.hxx
@@ -22,8 +22,8 @@
  **************************************************************************
 
  *************************************************************************/
-#ifndef _TEST_MULTISERVICEFAC_HXX_
-#define _TEST_MULTISERVICEFAC_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_FTP_TEST_MULTISERVICEFAC_HXX
+#define INCLUDED_UCB_SOURCE_UCP_FTP_TEST_MULTISERVICEFAC_HXX
 
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/queryinterface.hxx>
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index fe4e4494afc9..c48a95cca98e 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GIO_CONTENT_HXX
-#define GIO_CONTENT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GIO_GIO_CONTENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GIO_GIO_CONTENT_HXX
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/io/XOutputStream.hpp>
diff --git a/ucb/source/ucp/gio/gio_datasupplier.hxx b/ucb/source/ucp/gio/gio_datasupplier.hxx
index e6a242f75328..c610ed1996c1 100644
--- a/ucb/source/ucp/gio/gio_datasupplier.hxx
+++ b/ucb/source/ucp/gio/gio_datasupplier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GIO_DATASUPPLIER_HXX
-#define GIO_DATASUPPLIER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GIO_GIO_DATASUPPLIER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GIO_GIO_DATASUPPLIER_HXX
 
 #include <ucbhelper/resultset.hxx>
 #include "gio_content.hxx"
diff --git a/ucb/source/ucp/gio/gio_inputstream.hxx b/ucb/source/ucp/gio/gio_inputstream.hxx
index e20f53dbede0..d469787e1898 100644
--- a/ucb/source/ucp/gio/gio_inputstream.hxx
+++ b/ucb/source/ucp/gio/gio_inputstream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GIO_INPUTSTREAM_HXX
-#define GIO_INPUTSTREAM_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GIO_GIO_INPUTSTREAM_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GIO_GIO_INPUTSTREAM_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/ucb/source/ucp/gio/gio_mount.hxx b/ucb/source/ucp/gio/gio_mount.hxx
index 7347249753b2..1781b7bd1079 100644
--- a/ucb/source/ucp/gio/gio_mount.hxx
+++ b/ucb/source/ucp/gio/gio_mount.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GIO_MOUNT_HXX
-#define GIO_MOUNT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GIO_GIO_MOUNT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GIO_GIO_MOUNT_HXX
 
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <gio/gio.h>
diff --git a/ucb/source/ucp/gio/gio_outputstream.hxx b/ucb/source/ucp/gio/gio_outputstream.hxx
index bc420d499dfe..6dc44175b084 100644
--- a/ucb/source/ucp/gio/gio_outputstream.hxx
+++ b/ucb/source/ucp/gio/gio_outputstream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GIO_OUTPUTSTREAM_HXX
-#define GIO_OUTPUTSTREAM_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GIO_GIO_OUTPUTSTREAM_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GIO_GIO_OUTPUTSTREAM_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx
index b0fa13bfa74f..569ba113f181 100644
--- a/ucb/source/ucp/gio/gio_provider.hxx
+++ b/ucb/source/ucp/gio/gio_provider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GIO_PROVIDER_HXX
-#define GIO_PROVIDER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GIO_GIO_PROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GIO_GIO_PROVIDER_HXX
 
 #include <com/sun/star/beans/Property.hpp>
 #include <ucbhelper/providerhelper.hxx>
diff --git a/ucb/source/ucp/gio/gio_resultset.hxx b/ucb/source/ucp/gio/gio_resultset.hxx
index 6517c8da7241..1b1d15000698 100644
--- a/ucb/source/ucp/gio/gio_resultset.hxx
+++ b/ucb/source/ucp/gio/gio_resultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GIO_RESULTSET_HXX
-#define GIO_RESULTSET_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GIO_GIO_RESULTSET_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GIO_GIO_RESULTSET_HXX
 
 #include <ucbhelper/resultsethelper.hxx>
 #include "gio_content.hxx"
diff --git a/ucb/source/ucp/gio/gio_seekable.hxx b/ucb/source/ucp/gio/gio_seekable.hxx
index 4ef6e381dd5c..5e7a3c45533a 100644
--- a/ucb/source/ucp/gio/gio_seekable.hxx
+++ b/ucb/source/ucp/gio/gio_seekable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef GIO_SEEKABLE_HXX
-#define GIO_SEEKABLE_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GIO_GIO_SEEKABLE_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GIO_GIO_SEEKABLE_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
diff --git a/ucb/source/ucp/gvfs/gvfs_content.hxx b/ucb/source/ucp/gvfs/gvfs_content.hxx
index 133cb21113d9..7f1b4561ef6f 100644
--- a/ucb/source/ucp/gvfs/gvfs_content.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_content.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 _GVFS_UCP_CONTENT_HXX
-#define _GVFS_UCP_CONTENT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_CONTENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_CONTENT_HXX
 
 #include <memory>
 #include <list>
diff --git a/ucb/source/ucp/gvfs/gvfs_directory.hxx b/ucb/source/ucp/gvfs/gvfs_directory.hxx
index 4d296df7f487..0be70dca343d 100644
--- a/ucb/source/ucp/gvfs/gvfs_directory.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_directory.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 _GVFS_UCP_RESULTSET_HXX
-#define _GVFS_UCP_RESULTSET_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_DIRECTORY_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_DIRECTORY_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultset.hxx>
diff --git a/ucb/source/ucp/gvfs/gvfs_provider.hxx b/ucb/source/ucp/gvfs/gvfs_provider.hxx
index a03fb33c9977..05d6682c452e 100644
--- a/ucb/source/ucp/gvfs/gvfs_provider.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_provider.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 _PROVIDER_HXX_
-#define _PROVIDER_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_PROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_PROVIDER_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/beans/Property.hpp>
@@ -73,6 +73,6 @@ public:
 
 } /* namespace gvfs */
 
-#endif /* _PROVIDER_HXX_ */
+#endif // INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_PROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/gvfs/gvfs_stream.hxx b/ucb/source/ucp/gvfs/gvfs_stream.hxx
index cc62f1bd8f71..e58143471132 100644
--- a/ucb/source/ucp/gvfs/gvfs_stream.hxx
+++ b/ucb/source/ucp/gvfs/gvfs_stream.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 _GVFSSTREAM_HXX_
-#define _GVFSSTREAM_HXX_
+#ifndef INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_STREAM_HXX
+#define INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_STREAM_HXX
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
@@ -154,6 +154,6 @@ public:
 };
 
 } // namespace gvfs
-#endif // _GVFSSTREAM_HXX_
+#endif // INCLUDED_UCB_SOURCE_UCP_GVFS_GVFS_STREAM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/hierarchy/dynamicresultset.hxx b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
index c1d681bcd922..3c3cd014c6ae 100644
--- a/ucb/source/ucp/hierarchy/dynamicresultset.hxx
+++ b/ucb/source/ucp/hierarchy/dynamicresultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DYNAMICRESULTSET_HXX
-#define _DYNAMICRESULTSET_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_HIERARCHY_DYNAMICRESULTSET_HXX
+#define INCLUDED_UCB_SOURCE_UCP_HIERARCHY_DYNAMICRESULTSET_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultsethelper.hxx>
@@ -44,6 +44,6 @@ public:
 
 }
 
-#endif /* !_DYNAMICRESULTSET_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_HIERARCHY_DYNAMICRESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index b370fea853ca..0219a67f094f 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HIERARCHYCONTENT_HXX
-#define _HIERARCHYCONTENT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYCONTENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYCONTENT_HXX
 
 #include <list>
 #include <rtl/ref.hxx>
@@ -308,6 +308,6 @@ public:
 
 } // namespace hierarchy_ucp
 
-#endif /* !_HIERARCHYCONTENT_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYCONTENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/hierarchy/hierarchydata.hxx b/ucb/source/ucp/hierarchy/hierarchydata.hxx
index 08f30cc959b7..13e668c08368 100644
--- a/ucb/source/ucp/hierarchy/hierarchydata.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HIERARCHYDATA_HXX
-#define _HIERARCHYDATA_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYDATA_HXX
+#define INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYDATA_HXX
 
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
@@ -139,6 +139,6 @@ public:
 
 } // namespace hierarchy_ucp
 
-#endif /* !_HIERARCHYDATA_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
index dfd3105d8ea5..35901df4e021 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasource.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HIERARCHYDATASOURCE_HXX
-#define _HIERARCHYDATASOURCE_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYDATASOURCE_HXX
+#define INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYDATASOURCE_HXX
 
 #include <osl/mutex.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
@@ -135,6 +135,6 @@ private:
 
 } // namespace hierarchy_ucp
 
-#endif /* !_HIERARCHYDATASOURCE_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYDATASOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
index f402c3e34cfb..7b6e56694d10 100644
--- a/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HIERARCHYDATASUPPLIER_HXX
-#define _HIERARCHYDATASUPPLIER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYDATASUPPLIER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYDATASUPPLIER_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/ucb/OpenMode.hpp>
@@ -71,6 +71,6 @@ public:
 
 } // namespace hierarchy_ucp
 
-#endif /* !_HIERARCHYDATASUPPLIER_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYDATASUPPLIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 3ef4222ed7aa..4f176f820e0c 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HIERARCHYPROVIDER_HXX
-#define _HIERARCHYPROVIDER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYPROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYPROVIDER_HXX
 
 #include <boost/unordered_map.hpp>
 #include <ucbhelper/providerhelper.hxx>
@@ -164,6 +164,6 @@ public:
 
 } // namespace hierarchy_ucp
 
-#endif /* !_HIERARCHYPROVIDER_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/hierarchy/hierarchyuri.hxx b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
index e13f9d9dddf6..d5489fb09e66 100644
--- a/ucb/source/ucp/hierarchy/hierarchyuri.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyuri.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _HIERARCHYURI_HXX
-#define _HIERARCHYURI_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYURI_HXX
+#define INCLUDED_UCB_SOURCE_UCP_HIERARCHY_HIERARCHYURI_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/ucb/source/ucp/inc/urihelper.hxx b/ucb/source/ucp/inc/urihelper.hxx
index 3ad45439c489..2a2b403615e7 100644
--- a/ucb/source/ucp/inc/urihelper.hxx
+++ b/ucb/source/ucp/inc/urihelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_URIHELPER_HXX
-#define INCLUDED_URIHELPER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_INC_URIHELPER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_INC_URIHELPER_HXX
 
 #include "rtl/ustring.hxx"
 #include "rtl/ustrbuf.hxx"
@@ -112,6 +112,6 @@ namespace ucb_impl { namespace urihelper {
 
 } } // namespace
 
-#endif /* !INCLUDED_URIHELPER_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_INC_URIHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/package/pkgcontent.hxx b/ucb/source/ucp/package/pkgcontent.hxx
index b303e8541001..4c70bf55eb2a 100644
--- a/ucb/source/ucp/package/pkgcontent.hxx
+++ b/ucb/source/ucp/package/pkgcontent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PKGCONTENT_HXX
-#define _PKGCONTENT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGCONTENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGCONTENT_HXX
 
 #include <list>
 #include <rtl/ref.hxx>
diff --git a/ucb/source/ucp/package/pkgdatasupplier.hxx b/ucb/source/ucp/package/pkgdatasupplier.hxx
index e185755a95bc..bb43819a0822 100644
--- a/ucb/source/ucp/package/pkgdatasupplier.hxx
+++ b/ucb/source/ucp/package/pkgdatasupplier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PKGDATASUPPLIER_HXX
-#define _PKGDATASUPPLIER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGDATASUPPLIER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGDATASUPPLIER_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultset.hxx>
diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx
index 8837d9b59cf0..bbe5431c4a6d 100644
--- a/ucb/source/ucp/package/pkgprovider.hxx
+++ b/ucb/source/ucp/package/pkgprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PKGPROVIDER_HXX
-#define _PKGPROVIDER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGPROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGPROVIDER_HXX
 
 #include <ucbhelper/providerhelper.hxx>
 #include "pkguri.hxx"
diff --git a/ucb/source/ucp/package/pkgresultset.hxx b/ucb/source/ucp/package/pkgresultset.hxx
index ceb926f5a5d0..25946fb1217d 100644
--- a/ucb/source/ucp/package/pkgresultset.hxx
+++ b/ucb/source/ucp/package/pkgresultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PKGRESULTSET_HXX
-#define _PKGRESULTSET_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGRESULTSET_HXX
+#define INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGRESULTSET_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultsethelper.hxx>
diff --git a/ucb/source/ucp/package/pkguri.hxx b/ucb/source/ucp/package/pkguri.hxx
index 7a9f00870686..f33b566c78f6 100644
--- a/ucb/source/ucp/package/pkguri.hxx
+++ b/ucb/source/ucp/package/pkguri.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PKGURI_HXX
-#define _PKGURI_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGURI_HXX
+#define INCLUDED_UCB_SOURCE_UCP_PACKAGE_PKGURI_HXX
 
 #include <rtl/ustring.hxx>
 
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 73fccef6c924..ba969830cf0f 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_CONTENT_HXX
-#define INCLUDED_TDOC_CONTENT_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_CONTENT_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_CONTENT_HXX
 
 #include <ucbhelper/contenthelper.hxx>
 #include <com/sun/star/task/DocumentPasswordRequest.hpp>
@@ -340,6 +340,6 @@ public:
 
 } // namespace tdoc_ucp
 
-#endif /* !INCLUDED_TDOC_CONTENT_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_CONTENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
index 706286ac94ca..cff9224b172d 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_DATASUPPLIER_HXX
-#define INCLUDED_TDOC_DATASUPPLIER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_DATASUPPLIER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_DATASUPPLIER_HXX
 
 #include <rtl/ref.hxx>
 #include <com/sun/star/ucb/OpenMode.hpp>
@@ -70,6 +70,6 @@ public:
 
 } // namespace tdoc_ucp
 
-#endif /* !INCLUDED_TDOC_DATASUPPLIER_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_DATASUPPLIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
index 469bb49e833b..36c5756a5016 100644
--- a/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_docmgr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_DOCMGR_HXX
-#define INCLUDED_TDOC_DOCMGR_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_DOCMGR_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_DOCMGR_HXX
 
 #include <map>
 
@@ -191,6 +191,6 @@ namespace tdoc_ucp {
 
 } // namespace tdoc_ucp
 
-#endif /* !INCLUDED_TDOC_DOCMGR_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_DOCMGR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
index 57a81d6547b6..633f0805036f 100644
--- a/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_documentcontentfactory.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_DOCUMENTCONTENTFACTORY_HXX
-#define INCLUDED_TDOC_DOCUMENTCONTENTFACTORY_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_DOCUMENTCONTENTFACTORY_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_DOCUMENTCONTENTFACTORY_HXX
 
 #include "com/sun/star/lang/XServiceInfo.hpp"
 #include "com/sun/star/lang/XSingleServiceFactory.hpp"
@@ -75,6 +75,6 @@ private:
 
 } // namespace tdoc_ucp
 
-#endif /* !INCLUDED_TDOC_DOCUMENTCONTENTFACTORY_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_DOCUMENTCONTENTFACTORY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
index 1757a72fdef1..4a10ee2f6811 100644
--- a/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_passwordrequest.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_PASSWORDREQUEST_HXX
-#define INCLUDED_TDOC_PASSWORDREQUEST_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_PASSWORDREQUEST_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_PASSWORDREQUEST_HXX
 
 #include "com/sun/star/task/PasswordRequestMode.hpp"
 #include "com/sun/star/task/XInteractionPassword.hpp"
@@ -88,6 +88,6 @@ namespace tdoc_ucp {
 
 } // namespace tdoc_ucp
 
-#endif /* !INCLUDED_TDOC_PASSWORDREQUEST_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_PASSWORDREQUEST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 8eae66190eab..963d912e705b 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_PROVIDER_HXX
-#define INCLUDED_TDOC_PROVIDER_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_PROVIDER_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_PROVIDER_HXX
 
 #include "rtl/ref.hxx"
 #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp>
@@ -157,6 +157,6 @@ private:
 
 } // namespace tdoc_ucp
 
-#endif /* !INCLUDED_TDOC_PROVIDER_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_PROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/tdoc/tdoc_resultset.hxx b/ucb/source/ucp/tdoc/tdoc_resultset.hxx
index 284694b31295..8dffd9d0cfc1 100644
--- a/ucb/source/ucp/tdoc/tdoc_resultset.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_resultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_RESULTSET_HXX
-#define INCLUDED_TDOC_RESULTSET_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_RESULTSET_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_RESULTSET_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultsethelper.hxx>
@@ -45,6 +45,6 @@ public:
 
 }
 
-#endif /* !INCLUDED_TDOC_RESULTSET_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_RESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
index 72e67572116a..f44e4245a56e 100644
--- a/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_stgelems.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_STGELEMS_HXX
-#define INCLUDED_TDOC_STGELEMS_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_STGELEMS_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_STGELEMS_HXX
 
 #include <memory>
 
@@ -531,6 +531,6 @@ private:
 
 } // namespace tdoc_ucp
 
-#endif /* !INCLUDED_TDOC_STGELEMS_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_STGELEMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/tdoc/tdoc_storage.hxx b/ucb/source/ucp/tdoc/tdoc_storage.hxx
index f10ada71f0cf..f9bdd5e5d00a 100644
--- a/ucb/source/ucp/tdoc/tdoc_storage.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_storage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_STORAGE_HXX
-#define INCLUDED_TDOC_STORAGE_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_STORAGE_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_STORAGE_HXX
 
 #include <map>
 
@@ -161,6 +161,6 @@ namespace tdoc_ucp {
 
 } // namespace tdoc_ucp
 
-#endif /* !INCLUDED_TDOC_STORAGE_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_STORAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/tdoc/tdoc_uri.hxx b/ucb/source/ucp/tdoc/tdoc_uri.hxx
index 330e1df96249..7f2ce9a8cc90 100644
--- a/ucb/source/ucp/tdoc/tdoc_uri.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_uri.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_TDOC_URI_HXX
-#define INCLUDED_TDOC_URI_HXX
+#ifndef INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_URI_HXX
+#define INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_URI_HXX
 
 #include "rtl/ustring.hxx"
 
@@ -120,6 +120,6 @@ inline sal_Bool Uri::isFolder() const
 
 } // namespace tdoc_ucp
 
-#endif /* !INCLUDED_TDOC_URI_HXX */
+#endif // INCLUDED_UCB_SOURCE_UCP_TDOC_TDOC_URI_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/workben/cachemap/cachemapobject1.hxx b/ucb/workben/cachemap/cachemapobject1.hxx
index d459421cfc95..32b95ecbe261 100644
--- a/ucb/workben/cachemap/cachemapobject1.hxx
+++ b/ucb/workben/cachemap/cachemapobject1.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UCB_CACHEMAPOBJECT1_HXX
-#define INCLUDED_UCB_CACHEMAPOBJECT1_HXX
+#ifndef INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECT1_HXX
+#define INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECT1_HXX
 
 #include "osl/interlck.h"
 #include "osl/mutex.hxx"
@@ -87,6 +87,6 @@ private:
 
 } }
 
-#endif // INCLUDED_UCB_CACHEMAPOBJECT1_HXX
+#endif // INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECT1_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/workben/cachemap/cachemapobject2.hxx b/ucb/workben/cachemap/cachemapobject2.hxx
index 6f3b4c67cc85..a4a42c593882 100644
--- a/ucb/workben/cachemap/cachemapobject2.hxx
+++ b/ucb/workben/cachemap/cachemapobject2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UCB_CACHEMAPOBJECT2_HXX
-#define INCLUDED_UCB_CACHEMAPOBJECT2_HXX
+#ifndef INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECT2_HXX
+#define INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECT2_HXX
 
 #include "cppuhelper/weak.hxx"
 
@@ -29,6 +29,6 @@ class Object2: public cppu::OWeakObject
 
 } }
 
-#endif // INCLUDED_UCB_CACHEMAPOBJECT2_HXX
+#endif // INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECT2_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/workben/cachemap/cachemapobject3.hxx b/ucb/workben/cachemap/cachemapobject3.hxx
index 6ef220ddadf8..e7a88c486a21 100644
--- a/ucb/workben/cachemap/cachemapobject3.hxx
+++ b/ucb/workben/cachemap/cachemapobject3.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UCB_CACHEMAPOBJECT3_HXX
-#define INCLUDED_UCB_CACHEMAPOBJECT3_HXX
+#ifndef INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECT3_HXX
+#define INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECT3_HXX
 
 #include "osl/interlck.h"
 #include "osl/mutex.hxx"
@@ -86,6 +86,6 @@ private:
 
 } }
 
-#endif // INCLUDED_UCB_CACHEMAPOBJECT3_HXX
+#endif // INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECT3_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
index b43de572c833..f57705497ba4 100644
--- a/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
+++ b/ucb/workben/cachemap/cachemapobjectcontainer2.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UCB_CACHEMAPOBJECTCONTAINER2_HXX
-#define INCLUDED_UCB_CACHEMAPOBJECTCONTAINER2_HXX
+#ifndef INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECTCONTAINER2_HXX
+#define INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECTCONTAINER2_HXX
 
 #include "cppuhelper/weakref.hxx"
 #include "osl/mutex.hxx"
@@ -59,6 +59,6 @@ private:
 
 } }
 
-#endif // INCLUDED_UCB_CACHEMAPOBJECTCONTAINER2_HXX
+#endif // INCLUDED_UCB_WORKBEN_CACHEMAP_CACHEMAPOBJECTCONTAINER2_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/workben/ucb/srcharg.hxx b/ucb/workben/ucb/srcharg.hxx
index da485ee6f987..0b2bbcf5b0e1 100644
--- a/ucb/workben/ucb/srcharg.hxx
+++ b/ucb/workben/ucb/srcharg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef UCBDEMO_SRCHARG_HXX
-#define UCBDEMO_SRCHARG_HXX
+#ifndef INCLUDED_UCB_WORKBEN_UCB_SRCHARG_HXX
+#define INCLUDED_UCB_WORKBEN_UCB_SRCHARG_HXX
 
 class String;
 namespace com { namespace sun { namespace star { namespace ucb {
@@ -29,6 +29,6 @@ namespace com { namespace sun { namespace star { namespace ucb {
 bool parseSearchArgument(String const & rInput,
                          com::sun::star::ucb::SearchInfo & rInfo);
 
-#endif // UCBDEMO_SRCHARG_HXX
+#endif // INCLUDED_UCB_WORKBEN_UCB_SRCHARG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */