fixincludeguards.sh: dbaccess

Change-Id: Iadd4326d58a5df5761a0ed5ce7fd5fb01fb87d11

317 files changed, 925 insertions, 925 deletions

diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx
index 2fae48bf178b..c02ced39a820 100644
--- a/dbaccess/source/core/api/BookmarkSet.hxx
+++ b/dbaccess/source/core/api/BookmarkSet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_CORE_API_BOOKMARKSET_HXX
-#define DBACCESS_CORE_API_BOOKMARKSET_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_BOOKMARKSET_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_BOOKMARKSET_HXX
 
 #include "CacheSet.hxx"
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
@@ -59,6 +59,6 @@ namespace dbaccess
         virtual void SAL_CALL moveToCurrentRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
     };
 }
-#endif // DBACCESS_CORE_API_BOOKMARKSET_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_BOOKMARKSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/CIndexes.hxx b/dbaccess/source/core/api/CIndexes.hxx
index 25c58152f511..87c44cf7465e 100644
--- a/dbaccess/source/core/api/CIndexes.hxx
+++ b/dbaccess/source/core/api/CIndexes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_INDEXES_HXX_
-#define DBACCESS_INDEXES_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_CINDEXES_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_CINDEXES_HXX
 
 #include "connectivity/TIndexes.hxx"
 
@@ -45,6 +45,6 @@ namespace dbaccess
     };
 }
 
-#endif // DBACCESS_INDEXES_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_CINDEXES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx b/dbaccess/source/core/api/CRowSetColumn.hxx
index c51579c86099..d76600a76086 100644
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.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 DBACCESS_CORE_API_CROWSETCOLUMN_HXX
-#define DBACCESS_CORE_API_CROWSETCOLUMN_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_CROWSETCOLUMN_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_CROWSETCOLUMN_HXX
 
 #include "RowSetRow.hxx"
 #include <connectivity/CommonTools.hxx>
@@ -47,6 +47,6 @@ namespace dbaccess
 
 }
 
-#endif // DBACCESS_CORE_API_CROWSETCOLUMN_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_CROWSETCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.hxx b/dbaccess/source/core/api/CRowSetDataColumn.hxx
index bd87766d707e..e0dc49acce0e 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.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 DBACCESS_CORE_API_CROWSETDATACOLUMN_HXX
-#define DBACCESS_CORE_API_CROWSETDATACOLUMN_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_CROWSETDATACOLUMN_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_CROWSETDATACOLUMN_HXX
 
 #include "datacolumn.hxx"
 #include "RowSetRow.hxx"
diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx
index b3ecc1a30879..5247f61085c9 100644
--- a/dbaccess/source/core/api/CacheSet.hxx
+++ b/dbaccess/source/core/api/CacheSet.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 DBACCESS_CORE_API_CACHESET_HXX
-#define DBACCESS_CORE_API_CACHESET_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_CACHESET_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_CACHESET_HXX
 
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
@@ -145,6 +145,6 @@ namespace dbaccess
         virtual sal_Bool last_checked( sal_Bool i_bFetchRow);
     };
 }
-#endif //DBACCESS_CORE_API_CACHESET_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_CACHESET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx
index 8ad3edfee7c1..b372b271dc4a 100644
--- a/dbaccess/source/core/api/HelperCollections.hxx
+++ b/dbaccess/source/core/api/HelperCollections.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 DBA_HELPERCOLLECTIONS_HXX
-#define DBA_HELPERCOLLECTIONS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_HELPERCOLLECTIONS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_HELPERCOLLECTIONS_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include <connectivity/dbtools.hxx>
@@ -105,6 +105,6 @@ namespace dbaccess
         }
     };
 }
-#endif // DBA_HELPERCOLLECTIONS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_HELPERCOLLECTIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx
index 571add7c163d..a4eaf49927c0 100644
--- a/dbaccess/source/core/api/KeySet.hxx
+++ b/dbaccess/source/core/api/KeySet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_CORE_API_KEYSET_HXX
-#define DBACCESS_CORE_API_KEYSET_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_KEYSET_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_KEYSET_HXX
 
 #include "CacheSet.hxx"
 
@@ -233,6 +233,6 @@ namespace dbaccess
         virtual sal_Bool last_checked( sal_Bool i_bFetchRow);
     };
 }
-#endif // DBACCESS_CORE_API_KEYSET_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_KEYSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx
index 83608360d418..5a8356aaab2d 100644
--- a/dbaccess/source/core/api/OptimisticSet.hxx
+++ b/dbaccess/source/core/api/OptimisticSet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_CORE_API_OPTIMISTICSET_HXX
-#define DBACCESS_CORE_API_OPTIMISTICSET_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_OPTIMISTICSET_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_OPTIMISTICSET_HXX
 
 #include "KeySet.hxx"
 #include <cppuhelper/implbase1.hxx>
@@ -82,6 +82,6 @@ namespace dbaccess
         const ::std::map<sal_Int32,sal_Int32>& getJoinedKeyColumns() const { return m_aJoinedKeyColumns; }
     };
 }
-#endif // DBACCESS_CORE_API_OPTIMISTICSET_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_OPTIMISTICSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/PrivateRow.hxx b/dbaccess/source/core/api/PrivateRow.hxx
index 2068dfff8af8..79da7b7e3daf 100644
--- a/dbaccess/source/core/api/PrivateRow.hxx
+++ b/dbaccess/source/core/api/PrivateRow.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 PRIVATE_ROW_HXX
-#define PRIVATE_ROW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_PRIVATEROW_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_PRIVATEROW_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -55,6 +55,6 @@ namespace dbaccess
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( ::sal_Int32 columnIndex ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
     };
 } // dbaccess
-#endif // PRIVATE_ROW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_PRIVATEROW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 1ae22058b42b..ac0e81045b9c 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_CORE_API_ROWSET_HXX
-#define DBACCESS_CORE_API_ROWSET_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSET_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSET_HXX
 
 #include "apitools.hxx"
 #include "RowSetBase.hxx"
@@ -531,6 +531,6 @@ namespace dbaccess
     };
 
 }
-#endif // DBACCESS_CORE_API_ROWSET_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/RowSetBase.hxx b/dbaccess/source/core/api/RowSetBase.hxx
index 780e000d00b0..2aee618c6976 100644
--- a/dbaccess/source/core/api/RowSetBase.hxx
+++ b/dbaccess/source/core/api/RowSetBase.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 DBACCESS_CORE_API_ROWSETBASE_HXX
-#define DBACCESS_CORE_API_ROWSETBASE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETBASE_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETBASE_HXX
 
 #include <cppuhelper/implbase10.hxx>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
@@ -408,6 +408,6 @@ namespace dbaccess
 
 } // end of namespace
 
-#endif // DBACCESS_CORE_API_ROWSETBASE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index 67e8757d89d1..d1e263da3b66 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.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 DBACCESS_CORE_API_ROWSETCACHE_HXX
-#define DBACCESS_CORE_API_ROWSETCACHE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHE_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHE_HXX
 
 #include <connectivity/CommonTools.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.hxx b/dbaccess/source/core/api/RowSetCacheIterator.hxx
index 48b1fcc4dbe7..11d0d8f203ab 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.hxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.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 DBACCESS_ROWSETCACHEITERATOR_HXX
-#define DBACCESS_ROWSETCACHEITERATOR_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX
 
 #include "RowSetRow.hxx"
 #include <comphelper/stl_types.hxx>
@@ -75,6 +75,6 @@ namespace dbaccess
         ORowSetCacheMap::iterator getIter() const { return m_aIter; }
     };
 }
-#endif // DBACCESS_ROWSETCACHEITERATOR_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHEITERATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index 80a2dacd1edc..aca6a3558e03 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.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 DBACCESS_CORE_API_ROWSETROW_HXX
-#define DBACCESS_CORE_API_ROWSETROW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETROW_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETROW_HXX
 
 #include <rtl/ref.hxx>
 #include <connectivity/CommonTools.hxx>
@@ -84,6 +84,6 @@ namespace dbaccess
         }
     };
 }
-#endif // DBACCESS_CORE_API_ROWSETROW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETROW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/StaticSet.hxx b/dbaccess/source/core/api/StaticSet.hxx
index 07f986f34062..d12028139104 100644
--- a/dbaccess/source/core/api/StaticSet.hxx
+++ b/dbaccess/source/core/api/StaticSet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_CORE_API_STATICSET_HXX
-#define DBACCESS_CORE_API_STATICSET_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_STATICSET_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_STATICSET_HXX
 
 #include "CacheSet.hxx"
 
@@ -79,6 +79,6 @@ namespace dbaccess
         virtual void SAL_CALL moveToCurrentRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
     };
 }
-#endif //DBACCESS_CORE_API_STATICSET_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_STATICSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx
index 815158b393eb..d9cc3e581f11 100644
--- a/dbaccess/source/core/api/WrappedResultSet.hxx
+++ b/dbaccess/source/core/api/WrappedResultSet.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_CORE_API_WRAPPEDRESULTSET_HXX
-#define DBACCESS_CORE_API_WRAPPEDRESULTSET_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_WRAPPEDRESULTSET_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_WRAPPEDRESULTSET_HXX
 
 #include "CacheSet.hxx"
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
@@ -62,6 +62,6 @@ namespace dbaccess
         virtual void SAL_CALL moveToCurrentRow(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
     };
 }
-#endif // DBACCESS_CORE_API_WRAPPEDRESULTSET_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_WRAPPEDRESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/datacolumn.hxx b/dbaccess/source/core/api/datacolumn.hxx
index 60c52ce36320..6250d2ff8f95 100644
--- a/dbaccess/source/core/api/datacolumn.hxx
+++ b/dbaccess/source/core/api/datacolumn.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBACORE_DATACOLUMN_HXX_
-#define _DBACORE_DATACOLUMN_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_DATACOLUMN_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_DATACOLUMN_HXX
 
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/dbaccess/source/core/api/query.hxx b/dbaccess/source/core/api/query.hxx
index cb96412d748a..65c34b964714 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREAPI_QUERY_HXX_
-#define _DBA_COREAPI_QUERY_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_QUERY_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_QUERY_HXX
 
 #include "querydescriptor.hxx"
 #include <cppuhelper/implbase3.hxx>
@@ -151,6 +151,6 @@ private:
 
 }   // namespace dbaccess
 
-#endif // _DBA_COREAPI_QUERY_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_QUERY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/querydescriptor.hxx b/dbaccess/source/core/api/querydescriptor.hxx
index 27c8d0d35c41..b6418ef30740 100644
--- a/dbaccess/source/core/api/querydescriptor.hxx
+++ b/dbaccess/source/core/api/querydescriptor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREAPI_QUERYDESCRIPTOR_HXX_
-#define _DBA_COREAPI_QUERYDESCRIPTOR_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_QUERYDESCRIPTOR_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_QUERYDESCRIPTOR_HXX
 
 #include <cppuhelper/implbase3.hxx>
 #include <comphelper/proparrhlp.hxx>
@@ -140,6 +140,6 @@ public:
 };
 }   // namespace dbaccess
 
-#endif // _DBA_COREAPI_QUERYDESCRIPTOR_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_QUERYDESCRIPTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/resultset.hxx b/dbaccess/source/core/api/resultset.hxx
index c43dc763e9b5..98923a516ebf 100644
--- a/dbaccess/source/core/api/resultset.hxx
+++ b/dbaccess/source/core/api/resultset.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 _DBA_COREAPI_RESULTSET_HXX_
-#define _DBA_COREAPI_RESULTSET_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_API_RESULTSET_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_API_RESULTSET_HXX
 
 #include "column.hxx"
 #include <connectivity/warningscontainer.hxx>
@@ -226,6 +226,6 @@ namespace dbaccess
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
     };
 }
-#endif // _DBA_COREAPI_RESULTSET_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_API_RESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
index 67d203e241d2..9398959465b0 100644
--- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
+++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBA_COREDATAACESS_COMPONENTDEFINITION_HXX
-#define DBA_COREDATAACESS_COMPONENTDEFINITION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMPONENTDEFINITION_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMPONENTDEFINITION_HXX
 
 #include "commandbase.hxx"
 #include <comphelper/propertycontainer.hxx>
@@ -166,6 +166,6 @@ private:
 
 }   // namespace dbaccess
 
-#endif // DBA_COREDATAACESS_COMPONENTDEFINITION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMPONENTDEFINITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index 16544bd0528f..02d07656bbce 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREDATAACCESS_MODELIMPL_HXX_
-#define _DBA_COREDATAACCESS_MODELIMPL_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MODELIMPL_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MODELIMPL_HXX
 
 #include "apitools.hxx"
 #include "bookmarkcontainer.hxx"
diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx
index b4e28f465292..7699b64fe5af 100644
--- a/dbaccess/source/core/dataaccess/SharedConnection.hxx
+++ b/dbaccess/source/core/dataaccess/SharedConnection.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 DBA_CORE_SHARED_CONNECTION_HXX
-#define DBA_CORE_SHARED_CONNECTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_SHAREDCONNECTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_SHAREDCONNECTION_HXX
 
 #include "connectivity/ConnectionWrapper.hxx"
 #include <cppuhelper/component.hxx>
@@ -127,6 +127,6 @@ namespace dbaccess
 
 }   // namespace dbaccess
 
-#endif // DBA_CORE_SHARED_CONNECTION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_SHAREDCONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
index 68999a7c7c0d..bdd412ec67aa 100644
--- a/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_BOOKMARKCONTAINER_HXX_
-#define _DBA_CORE_BOOKMARKCONTAINER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
 
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase6.hxx>
@@ -161,6 +161,6 @@ inline  sal_Bool OBookmarkContainer::checkExistence(const OUString& _rName)
 
 }   // namespace dbaccess
 
-#endif // _DBA_CORE_BOOKMARKCONTAINER_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_BOOKMARKCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/commandcontainer.hxx b/dbaccess/source/core/dataaccess/commandcontainer.hxx
index 3603e315855b..0294dbce4146 100644
--- a/dbaccess/source/core/dataaccess/commandcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/commandcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_
-#define _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMMANDCONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMMANDCONTAINER_HXX
 
 #include "definitioncontainer.hxx"
 
@@ -68,6 +68,6 @@ protected:
 
 }   // namespace dbaccess
 
-#endif // _DBA_COREDATAACCESS_COMMANDCONTAINER_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMMANDCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx
index f6afbee01e70..05280d314420 100644
--- a/dbaccess/source/core/dataaccess/commanddefinition.hxx
+++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_
-#define _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMMANDDEFINITION_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMMANDDEFINITION_HXX
 
 #include "commandbase.hxx"
 #include "apitools.hxx"
@@ -145,6 +145,6 @@ private:
 
 }   // namespace dbaccess
 
-#endif // _DBA_COREDATAACESS_COMMANDDEFINITION_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMMANDDEFINITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx
index 4ae80154e501..0d66be3bab03 100644
--- a/dbaccess/source/core/dataaccess/connection.hxx
+++ b/dbaccess/source/core/dataaccess/connection.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 _DBA_CORE_CONNECTION_HXX_
-#define _DBA_CORE_CONNECTION_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_CONNECTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_CONNECTION_HXX
 
 #include "apitools.hxx"
 #include "querycontainer.hxx"
@@ -227,6 +227,6 @@ private:
 
 }   // namespace dbaccess
 
-#endif // _DBA_CORE_CONNECTION_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_CONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/databasecontext.hxx b/dbaccess/source/core/dataaccess/databasecontext.hxx
index 635006d2c688..459b91802b07 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.hxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREDATAACCESS_DATABASECONTEXT_HXX_
-#define _DBA_COREDATAACCESS_DATABASECONTEXT_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
 
 #include "ModelImpl.hxx"
 
@@ -186,6 +186,6 @@ private:
 
 }   // namespace dbaccess
 
-#endif // _DBA_COREDATAACCESS_DATABASECONTEXT_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASECONTEXT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx
index ad3eeeccc87f..5c216d9f96ce 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.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 _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_
-#define _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEDOCUMENT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEDOCUMENT_HXX
 
 #include "ModelImpl.hxx"
 #include "documenteventnotifier.hxx"
@@ -688,6 +688,6 @@ private:
 };
 
 }   // namespace dbaccess
-#endif // _DBA_COREDATAACCESS_DATABASEDOCUMENT_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEDOCUMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.hxx b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
index 48677cff541a..4ebd5e87d889 100644
--- a/dbaccess/source/core/dataaccess/databaseregistrations.hxx
+++ b/dbaccess/source/core/dataaccess/databaseregistrations.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef OOO_DATASOURCEREGISTRATIONS_HXX
-#define OOO_DATASOURCEREGISTRATIONS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEREGISTRATIONS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEREGISTRATIONS_HXX
 
 #include <com/sun/star/uno/XAggregation.hpp>
 
@@ -30,6 +30,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // OOO_DATASOURCEREGISTRATIONS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEREGISTRATIONS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/datasource.hxx b/dbaccess/source/core/dataaccess/datasource.hxx
index 676f64352f82..a9f766db8246 100644
--- a/dbaccess/source/core/dataaccess/datasource.hxx
+++ b/dbaccess/source/core/dataaccess/datasource.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREDATAACCESS_DATASOURCE_HXX_
-#define _DBA_COREDATAACCESS_DATASOURCE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATASOURCE_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATASOURCE_HXX
 
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx
index 23aa71d3fc49..1b8064fe6c42 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.hxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_
-#define _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTCONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTCONTAINER_HXX
 
 #include "definitioncontainer.hxx"
 #include <cppuhelper/implbase5.hxx>
@@ -130,6 +130,6 @@ protected:
 
 }   // namespace dbaccess
 
-#endif // _DBA_COREDATAACCESS_DOCUMENTCONTAINER_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index 2f57ed3a032d..778edd299848 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_
-#define _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTDEFINITION_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTDEFINITION_HXX
 
 #include <cppuhelper/propshlp.hxx>
 #include <cppuhelper/implbase4.hxx>
@@ -368,6 +368,6 @@ private:
 
 }   // namespace dbaccess
 
-#endif // _DBA_COREDATAACCESS_DOCUMENTDEFINITION_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTDEFINITION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
index 984dfa60c453..9670cb4ed320 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_DOCUMENTEVENTEXECUTOR_HXX
-#define DBACCESS_DOCUMENTEVENTEXECUTOR_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTEXECUTOR_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTEXECUTOR_HXX
 
 #include <com/sun/star/document/XDocumentEventListener.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
@@ -55,6 +55,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // DBACCESS_DOCUMENTEVENTEXECUTOR_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTEXECUTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
index f6a69b2036a9..4a132eb8a15c 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.hxx
@@ -18,8 +18,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_DOCUMENTEVENTNOTIFIER_HXX
-#define DBACCESS_DOCUMENTEVENTNOTIFIER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTNOTIFIER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTNOTIFIER_HXX
 
 #include <com/sun/star/document/XEventListener.hpp>
 #include <com/sun/star/document/XDocumentEventListener.hpp>
@@ -126,6 +126,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // DBACCESS_DOCUMENTEVENTNOTIFIER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTNOTIFIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/documentevents.hxx b/dbaccess/source/core/dataaccess/documentevents.hxx
index 1b19a0fbcf3d..3e87abeb21a6 100644
--- a/dbaccess/source/core/dataaccess/documentevents.hxx
+++ b/dbaccess/source/core/dataaccess/documentevents.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_DOCUMENTEVENTS_HXX
-#define DBACCESS_DOCUMENTEVENTS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTS_HXX
 
 #include <com/sun/star/container/XNameReplace.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -72,6 +72,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // DBACCESS_DOCUMENTEVENTS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DOCUMENTEVENTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/intercept.hxx b/dbaccess/source/core/dataaccess/intercept.hxx
index 0bacec5a7aee..6499e9653a21 100644
--- a/dbaccess/source/core/dataaccess/intercept.hxx
+++ b/dbaccess/source/core/dataaccess/intercept.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBA_INTERCEPT_HXX
-#define DBA_INTERCEPT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_INTERCEPT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_INTERCEPT_HXX
 
 #include <osl/mutex.hxx>
 #include <cppuhelper/implbase4.hxx>
@@ -154,6 +154,6 @@ private:
 
 }   // namespace dbaccess
 
-#endif //DBA_INTERCEPT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_INTERCEPT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
index d5a8b2bb770a..ac74834be31c 100644
--- a/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
+++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBA_DATASUPPLIER_HXX
-#define DBA_DATASUPPLIER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MYUCP_DATASUPPLIER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MYUCP_DATASUPPLIER_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultset.hxx>
@@ -63,6 +63,6 @@ public:
 
 }
 
-#endif // DBA_DATASUPPLIER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MYUCP_DATASUPPLIER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/dataaccess/myucp_resultset.hxx b/dbaccess/source/core/dataaccess/myucp_resultset.hxx
index 09ff945dc650..d15f70c04801 100644
--- a/dbaccess/source/core/dataaccess/myucp_resultset.hxx
+++ b/dbaccess/source/core/dataaccess/myucp_resultset.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBA_UCPRESULTSET_HXX
-#define DBA_UCPRESULTSET_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MYUCP_RESULTSET_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MYUCP_RESULTSET_HXX
 
 #include <rtl/ref.hxx>
 #include <ucbhelper/resultsethelper.hxx>
@@ -50,6 +50,6 @@ public:
 
 }
 
-#endif // DBA_UCPRESULTSET_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_MYUCP_RESULTSET_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx
index 7ccdc646a0ee..5967ba676b9f 100644
--- a/dbaccess/source/core/inc/ContainerMediator.hxx
+++ b/dbaccess/source/core/inc/ContainerMediator.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 DBA_CONTAINERMEDIATOR_HXX
-#define DBA_CONTAINERMEDIATOR_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTAINERMEDIATOR_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTAINERMEDIATOR_HXX
 
 #include <com/sun/star/container/XContainerListener.hpp>
 #include <com/sun/star/container/XContainer.hpp>
@@ -81,6 +81,6 @@ namespace dbaccess
 
 }   // namespace dbaccess
 
-#endif // DBA_CONTAINERMEDIATOR_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTAINERMEDIATOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx
index 654d455022ba..26cdd3d22f05 100644
--- a/dbaccess/source/core/inc/ContentHelper.hxx
+++ b/dbaccess/source/core/inc/ContentHelper.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 DBA_CONTENTHELPER_HXX
-#define DBA_CONTENTHELPER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTENTHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTENTHELPER_HXX
 
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/ucb/XCommandProcessor.hpp>
@@ -193,6 +193,6 @@ namespace dbaccess
 
 }   // namespace dbaccess
 
-#endif // DBA_CONTENTHELPER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTENTHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx
index c22ad531f2fd..c19dc81c6e67 100644
--- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx
+++ b/dbaccess/source/core/inc/DatabaseDataProvider.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 DBA_DATABASEDATAPROVIDER_HXX_INCLUDED
-#define DBA_DATABASEDATAPROVIDER_HXX_INCLUDED
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DATABASEDATAPROVIDER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DATABASEDATAPROVIDER_HXX
 
 #include "sal/config.h"
 
@@ -266,6 +266,6 @@ private:
 
 } // namespace dbaccess
 
-#endif // DBA_DATABASEDATAPROVIDER_HXX_INCLUDED
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_DATABASEDATAPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index f1edd5ff2ee9..f6203ae79452 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.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 DBACCESS_CORE_FILTERED_CONTAINER_HXX
-#define DBACCESS_CORE_FILTERED_CONTAINER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_FILTEREDCONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_FILTEREDCONTAINER_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -131,6 +131,6 @@ namespace dbaccess
     };
 } // namespace
 
-#endif // DBACCESS_CORE_FILTERED_CONTAINER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_FILTEREDCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx
index ebe44ff43d23..9b5b2bf666ea 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.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 DBA_PROPERTYSETFORWARD_HXX
-#define DBA_PROPERTYSETFORWARD_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_PROPERTYFORWARD_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_PROPERTYFORWARD_HXX
 
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -67,6 +67,6 @@ namespace dbaccess
 
 }   // namespace dbaccess
 
-#endif // DBA_PROPERTYSETFORWARD_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_PROPERTYFORWARD_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/RefreshListener.hxx b/dbaccess/source/core/inc/RefreshListener.hxx
index 11390b1cd0de..c2a1b05eb26c 100644
--- a/dbaccess/source/core/inc/RefreshListener.hxx
+++ b/dbaccess/source/core/inc/RefreshListener.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBA_CORE_REFRESHLISTENER_HXX
-#define DBA_CORE_REFRESHLISTENER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_REFRESHLISTENER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_REFRESHLISTENER_HXX
 
 #include <com/sun/star/uno/Reference.h>
 
@@ -43,6 +43,6 @@ namespace dbaccess
 
 }   // namespace dbaccess
 
-#endif // DBA_CORE_REFRESHLISTENER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_REFRESHLISTENER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx b/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
index 7031b4d3d0ad..f2d2da1a14f6 100644
--- a/dbaccess/source/core/inc/SingleSelectQueryComposer.hxx
+++ b/dbaccess/source/core/inc/SingleSelectQueryComposer.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 DBACCESS_CORE_API_SINGLESELECTQUERYCOMPOSER_HXX
-#define DBACCESS_CORE_API_SINGLESELECTQUERYCOMPOSER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_SINGLESELECTQUERYCOMPOSER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_SINGLESELECTQUERYCOMPOSER_HXX
 
 #include <com/sun/star/sdb/XParametersSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@@ -259,6 +259,6 @@ namespace dbaccess
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getParameters(  ) throw(::com::sun::star::uno::RuntimeException);
     };
 }
-#endif // DBACCESS_CORE_API_SINGLESELECTQUERYCOMPOSER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_SINGLESELECTQUERYCOMPOSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx
index 5dd54a5f268e..664312a4a7e5 100644
--- a/dbaccess/source/core/inc/TableDeco.hxx
+++ b/dbaccess/source/core/inc/TableDeco.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_TABLEDECORATOR_HXX_
-#define _DBA_CORE_TABLEDECORATOR_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLEDECO_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLEDECO_HXX
 
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
@@ -167,6 +167,6 @@ namespace dbaccess
         using ODataSettings::getFastPropertyValue;
     };
 }
-#endif // _DBA_CORE_TABLEDECORATOR_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLEDECO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/View.hxx b/dbaccess/source/core/inc/View.hxx
index 34282aee65f7..faf4221cb300 100644
--- a/dbaccess/source/core/inc/View.hxx
+++ b/dbaccess/source/core/inc/View.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_VIEW_HXX
-#define DBACCESS_VIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_VIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_VIEW_HXX
 
 #include "connectivity/sdbcx/VView.hxx"
 
@@ -69,6 +69,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // DBACCESS_VIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_VIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/callablestatement.hxx b/dbaccess/source/core/inc/callablestatement.hxx
index 1e4ef26b63df..f221e610de66 100644
--- a/dbaccess/source/core/inc/callablestatement.hxx
+++ b/dbaccess/source/core/inc/callablestatement.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 _DBA_COREAPI_CALLABLESTATEMENT_HXX_
-#define _DBA_COREAPI_CALLABLESTATEMENT_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CALLABLESTATEMENT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CALLABLESTATEMENT_HXX
 
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XOutParameters.hpp>
@@ -77,6 +77,6 @@ namespace dbaccess
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
     };
 }
-#endif // _DBA_COREAPI_CALLABLESTATEMENT_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CALLABLESTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx
index 7772a75b201b..74b3fcd8d1ed 100644
--- a/dbaccess/source/core/inc/column.hxx
+++ b/dbaccess/source/core/inc/column.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_COREAPI_COLUMN_HXX_
-#define _DBA_COREAPI_COLUMN_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_COLUMN_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_COLUMN_HXX
 
 #include "columnsettings.hxx"
 
@@ -244,6 +244,6 @@ namespace dbaccess
         using OColumns_BASE::setParent;
     };
 }
-#endif // _DBA_COREAPI_COLUMN_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_COLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/columnsettings.hxx b/dbaccess/source/core/inc/columnsettings.hxx
index 4dd6d2c42e5e..aa4a9cd35c14 100644
--- a/dbaccess/source/core/inc/columnsettings.hxx
+++ b/dbaccess/source/core/inc/columnsettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef COLUMNSETTINGS_HXX
-#define COLUMNSETTINGS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_COLUMNSETTINGS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_COLUMNSETTINGS_HXX
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 
@@ -94,6 +94,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // COLUMNSETTINGS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_COLUMNSETTINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/commandbase.hxx b/dbaccess/source/core/inc/commandbase.hxx
index 1859fdd36c09..7b0460f4b5a9 100644
--- a/dbaccess/source/core/inc/commandbase.hxx
+++ b/dbaccess/source/core/inc/commandbase.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_COMMANDBASE_HXX_
-#define _DBA_CORE_COMMANDBASE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_COMMANDBASE_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_COMMANDBASE_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -48,6 +48,6 @@ protected:
 
 }   // namespace dbaccess
 
-#endif // _DBA_CORE_COMMANDBASE_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_COMMANDBASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/composertools.hxx b/dbaccess/source/core/inc/composertools.hxx
index 3a8da65f426e..ec41e8b5e389 100644
--- a/dbaccess/source/core/inc/composertools.hxx
+++ b/dbaccess/source/core/inc/composertools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
-#define DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
 
 #include <rtl/ustrbuf.hxx>
 
@@ -115,6 +115,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_COMPOSERTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx
index 808dcf1c4fe5..42876699cc84 100644
--- a/dbaccess/source/core/inc/containerapprove.hxx
+++ b/dbaccess/source/core/inc/containerapprove.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_CONTAINERAPPROVE_HXX
-#define DBACCESS_CONTAINERAPPROVE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTAINERAPPROVE_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTAINERAPPROVE_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 
@@ -60,6 +60,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // DBACCESS_CONTAINERAPPROVE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTAINERAPPROVE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx
index 8b3c784a7165..4db3848417fe 100644
--- a/dbaccess/source/core/inc/core_resource.hxx
+++ b/dbaccess/source/core/inc/core_resource.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_RESOURCE_HXX_
-#define _DBA_CORE_RESOURCE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX
 
 #include <rtl/ustring.hxx>
 #include <osl/mutex.hxx>
@@ -107,6 +107,6 @@ namespace dbaccess
     };
 }
 
-#endif // _DBA_CORE_RESOURCE_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_CORE_RESOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx
index 422f717e0826..4741e664cb8b 100644
--- a/dbaccess/source/core/inc/datasettings.hxx
+++ b/dbaccess/source/core/inc/datasettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_DATASETTINGS_HXX_
-#define _DBA_CORE_DATASETTINGS_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DATASETTINGS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DATASETTINGS_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/Property.hpp>
@@ -77,6 +77,6 @@ protected:
 
 }   // namespace dbaccess
 
-#endif // _DBA_CORE_DATASETTINGS_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_DATASETTINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx
index 41429c1c18f6..5d184e0189d8 100644
--- a/dbaccess/source/core/inc/definitioncolumn.hxx
+++ b/dbaccess/source/core/inc/definitioncolumn.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 _DBACORE_DEFINITIONCOLUMN_HXX_
-#define _DBACORE_DEFINITIONCOLUMN_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCOLUMN_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCOLUMN_HXX
 
 #include "apitools.hxx"
 #include "column.hxx"
@@ -293,6 +293,6 @@ namespace dbaccess
         virtual ::cppu::IPropertyArrayHelper* createArrayHelper(sal_Int32 nId) const;
     };
 }
-#endif // _DBACORE_DEFINITIONCOLUMN_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx
index 6df65543f4f5..02f6c81c3a33 100644
--- a/dbaccess/source/core/inc/definitioncontainer.hxx
+++ b/dbaccess/source/core/inc/definitioncontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_DEFINITIONCONTAINER_HXX_
-#define _DBA_CORE_DEFINITIONCONTAINER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCONTAINER_HXX
 
 #include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/implbase7.hxx>
@@ -320,6 +320,6 @@ private:
 
 }   // namespace dbaccess
 
-#endif // _DBA_CORE_DEFINITIONCONTAINER_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/module_dba.hxx b/dbaccess/source/core/inc/module_dba.hxx
index cd5ae08dee85..c79b53c8c60a 100644
--- a/dbaccess/source/core/inc/module_dba.hxx
+++ b/dbaccess/source/core/inc/module_dba.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_MODULE_DBA_HXX
-#define DBACCESS_MODULE_DBA_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
 
 #include <unotools/componentresmodule.hxx>
 
@@ -29,6 +29,6 @@ namespace dba
 
 } // namespace sdbtools
 
-#endif // DBACCESS_MODULE_DBA_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_MODULE_DBA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/object.hxx b/dbaccess/source/core/inc/object.hxx
index 69aa43d20fa7..a6f08560941b 100644
--- a/dbaccess/source/core/inc/object.hxx
+++ b/dbaccess/source/core/inc/object.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_OBJECT_HXX_
-#define _DBA_OBJECT_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_OBJECT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_OBJECT_HXX
 
 enum ObjectType
 {
@@ -28,6 +28,6 @@ enum ObjectType
     dbaReport
 };
 
-#endif // _DBA_OBJECT_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_OBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/objectnameapproval.hxx b/dbaccess/source/core/inc/objectnameapproval.hxx
index f137b187de69..b6446d2aa444 100644
--- a/dbaccess/source/core/inc/objectnameapproval.hxx
+++ b/dbaccess/source/core/inc/objectnameapproval.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_OBJECTNAMEAPPROVAL_HXX
-#define DBACCESS_OBJECTNAMEAPPROVAL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_OBJECTNAMEAPPROVAL_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_OBJECTNAMEAPPROVAL_HXX
 
 #include "containerapprove.hxx"
 
@@ -72,6 +72,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // DBACCESS_OBJECTNAMEAPPROVAL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_OBJECTNAMEAPPROVAL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx
index 06d8ac0f0a38..1d9b9c09fa56 100644
--- a/dbaccess/source/core/inc/preparedstatement.hxx
+++ b/dbaccess/source/core/inc/preparedstatement.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 _DBA_COREAPI_PREPAREDSTATEMENT_HXX_
-#define _DBA_COREAPI_PREPAREDSTATEMENT_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_PREPAREDSTATEMENT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_PREPAREDSTATEMENT_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
@@ -103,6 +103,6 @@ namespace dbaccess
         virtual void SAL_CALL clearParameters(  ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException);
     };
 }
-#endif // _DBA_COREAPI_PREPAREDSTATEMENT_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_PREPAREDSTATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx
index 2ba79a9ee57b..7b4f63ede29d 100644
--- a/dbaccess/source/core/inc/querycomposer.hxx
+++ b/dbaccess/source/core/inc/querycomposer.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 DBACCESS_CORE_API_QUERYCOMPOSER_HXX
-#define DBACCESS_CORE_API_QUERYCOMPOSER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCOMPOSER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCOMPOSER_HXX
 
 #include <connectivity/CommonTools.hxx>
 #include <com/sun/star/sdb/XSQLQueryComposer.hpp>
@@ -94,6 +94,6 @@ namespace dbaccess
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getParameters(  ) throw(::com::sun::star::uno::RuntimeException);
     };
 }
-#endif // DBACCESS_CORE_API_QUERYCOMPOSER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCOMPOSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx
index fa37b08d9204..06586c56b929 100644
--- a/dbaccess/source/core/inc/querycontainer.hxx
+++ b/dbaccess/source/core/inc/querycontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_QUERYCONTAINER_HXX_
-#define _DBA_CORE_QUERYCONTAINER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCONTAINER_HXX
 
 #include <cppuhelper/implbase5.hxx>
 #include <comphelper/stl_types.hxx>
@@ -171,6 +171,6 @@ namespace dbaccess
     };
 }   // namespace dbaccess
 
-#endif // _DBA_CORE_QUERYCONTAINER_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
index 5811e3653873..02f737a7ab1c 100644
--- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
+++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_DBDOCRECOVERY_HXX
-#define DBACCESS_DBDOCRECOVERY_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_RECOVERY_DBDOCRECOVERY_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_RECOVERY_DBDOCRECOVERY_HXX
 
 #include <dbaccess/dbaccessdllapi.h>
 
@@ -71,6 +71,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // DBACCESS_DBDOCRECOVERY_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_RECOVERY_DBDOCRECOVERY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx
index 2bbd99d823bc..3508062d7c08 100644
--- a/dbaccess/source/core/inc/sdbcoretools.hxx
+++ b/dbaccess/source/core/inc/sdbcoretools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACORE_SDBCORETOOLS_HXX
-#define DBACORE_SDBCORETOOLS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_SDBCORETOOLS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_SDBCORETOOLS_HXX
 
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -62,6 +62,6 @@ namespace dbaccess
 
 }   // namespace dbaccess
 
-#endif // DBACORE_SDBCORETOOLS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_SDBCORETOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/statement.hxx b/dbaccess/source/core/inc/statement.hxx
index 936ab36de93c..364633cc12a5 100644
--- a/dbaccess/source/core/inc/statement.hxx
+++ b/dbaccess/source/core/inc/statement.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 _DBA_COREAPI_STATEMENT_HXX_
-#define _DBA_COREAPI_STATEMENT_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_STATEMENT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_STATEMENT_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdbc/XStatement.hpp>
@@ -180,6 +180,6 @@ private:
     bool            impl_ensureComposer_nothrow() const;
 };
 
-#endif // _DBA_COREAPI_STATEMENT_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_STATEMENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx
index 7dc6bfcd75d9..eec2e209d842 100644
--- a/dbaccess/source/core/inc/table.hxx
+++ b/dbaccess/source/core/inc/table.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_TABLE_HXX_
-#define _DBA_CORE_TABLE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLE_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLE_HXX
 
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
@@ -148,6 +148,6 @@ namespace dbaccess
         using OTable_Base::getFastPropertyValue;
     };
 }
-#endif // _DBA_CORE_TABLE_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx
index ffba84a0bb72..32fa409237b1 100644
--- a/dbaccess/source/core/inc/tablecontainer.hxx
+++ b/dbaccess/source/core/inc/tablecontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_TABLECONTAINER_HXX_
-#define _DBA_CORE_TABLECONTAINER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLECONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLECONTAINER_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/stl_types.hxx>
@@ -99,6 +99,6 @@ namespace dbaccess
         virtual ~OTableContainer();
     };
 }
-#endif // _DBA_CORE_TABLECONTAINER_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLECONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/userinformation.hxx b/dbaccess/source/core/inc/userinformation.hxx
index b01184df73b7..74e8d2cd3ab2 100644
--- a/dbaccess/source/core/inc/userinformation.hxx
+++ b/dbaccess/source/core/inc/userinformation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_USERINFORMATION_HXX_
-#define _DBA_CORE_USERINFORMATION_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_USERINFORMATION_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_USERINFORMATION_HXX
 
 #include <com/sun/star/lang/Locale.hpp>
 
@@ -34,6 +34,6 @@ public:
     ::com::sun::star::lang::Locale      getUserLanguage() const { return m_aUserLocale; }
 };
 
-#endif // _DBA_CORE_USERINFORMATION_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_USERINFORMATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/veto.hxx b/dbaccess/source/core/inc/veto.hxx
index a418b102f301..c330aa8816c9 100644
--- a/dbaccess/source/core/inc/veto.hxx
+++ b/dbaccess/source/core/inc/veto.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_VETO_HXX
-#define DBACCESS_VETO_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_VETO_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_VETO_HXX
 
 #include <com/sun/star/util/XVeto.hpp>
 
@@ -55,6 +55,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // DBACCESS_VETO_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_VETO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx
index 6c0aede10bb9..b41caaaf1e78 100644
--- a/dbaccess/source/core/inc/viewcontainer.hxx
+++ b/dbaccess/source/core/inc/viewcontainer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBA_CORE_VIEWCONTAINER_HXX_
-#define _DBA_CORE_VIEWCONTAINER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_VIEWCONTAINER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_INC_VIEWCONTAINER_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <comphelper/stl_types.hxx>
@@ -98,6 +98,6 @@ namespace dbaccess
         bool m_bInElementRemoved;
     };
 }
-#endif // _DBA_CORE_VIEWCONTAINER_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_INC_VIEWCONTAINER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/settingsimport.hxx b/dbaccess/source/core/recovery/settingsimport.hxx
index 832bd516a93c..2443c663df27 100644
--- a/dbaccess/source/core/recovery/settingsimport.hxx
+++ b/dbaccess/source/core/recovery/settingsimport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SETTINGSIMPORT_HXX
-#define SETTINGSIMPORT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SETTINGSIMPORT_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SETTINGSIMPORT_HXX
 
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
 
@@ -165,6 +165,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // SETTINGSIMPORT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SETTINGSIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx
index 64b051969df9..87597b298f67 100644
--- a/dbaccess/source/core/recovery/storagestream.hxx
+++ b/dbaccess/source/core/recovery/storagestream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef STORAGESTREAM_HXX
-#define STORAGESTREAM_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGESTREAM_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGESTREAM_HXX
 
 #include <dbaccess/dbaccessdllapi.h>
 
@@ -90,6 +90,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // STORAGESTREAM_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGESTREAM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx
index 289031cb20a8..a63c5e12e66b 100644
--- a/dbaccess/source/core/recovery/storagetextstream.hxx
+++ b/dbaccess/source/core/recovery/storagetextstream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef STORAGETEXTSTREAM_HXX
-#define STORAGETEXTSTREAM_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGETEXTSTREAM_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGETEXTSTREAM_HXX
 
 #include "storagestream.hxx"
 
@@ -48,6 +48,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // STORAGETEXTSTREAM_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGETEXTSTREAM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx
index 435246a634f0..b53b5c83e5d2 100644
--- a/dbaccess/source/core/recovery/storagexmlstream.hxx
+++ b/dbaccess/source/core/recovery/storagexmlstream.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef STORAGEXMLSTREAM_HXX
-#define STORAGEXMLSTREAM_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGEXMLSTREAM_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGEXMLSTREAM_HXX
 
 #include "storagestream.hxx"
 
@@ -89,6 +89,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // STORAGEXMLSTREAM_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGEXMLSTREAM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx
index bbe02b9f1105..e39a119de748 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.hxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SUBCOMPONENTLOADER_HXX
-#define SUBCOMPONENTLOADER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTLOADER_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTLOADER_HXX
 
 #include <dbaccess/dbaccessdllapi.h>
 
@@ -70,6 +70,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // SUBCOMPONENTLOADER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTLOADER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/subcomponentrecovery.hxx b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
index 81146f7d5f04..788149dfd312 100644
--- a/dbaccess/source/core/recovery/subcomponentrecovery.hxx
+++ b/dbaccess/source/core/recovery/subcomponentrecovery.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SUBCOMPONENTRECOVERY_HXX
-#define SUBCOMPONENTRECOVERY_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTRECOVERY_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTRECOVERY_HXX
 
 #include "subcomponents.hxx"
 
@@ -112,6 +112,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // SUBCOMPONENTRECOVERY_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTRECOVERY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx
index 0afd22ceaf41..f0a3a53f8ed3 100644
--- a/dbaccess/source/core/recovery/subcomponents.hxx
+++ b/dbaccess/source/core/recovery/subcomponents.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef SUBCOMPONENTS_HXX
-#define SUBCOMPONENTS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTS_HXX
+#define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTS_HXX
 
 #include <dbaccess/dbaccessdllapi.h>
 
@@ -69,6 +69,6 @@ namespace dbaccess
 
 } // namespace dbaccess
 
-#endif // SUBCOMPONENTS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_module.hxx b/dbaccess/source/ext/macromigration/dbmm_module.hxx
index bc725a09c8d4..ff171823703f 100644
--- a/dbaccess/source/ext/macromigration/dbmm_module.hxx
+++ b/dbaccess/source/ext/macromigration/dbmm_module.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_MACROMIGRATION_MODULE_HXX
-#define DBACCESS_MACROMIGRATION_MODULE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX
 
 #include <unotools/componentresmodule.hxx>
 
@@ -29,6 +29,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_MACROMIGRATION_MODULE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_MODULE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/dbmm_types.hxx b/dbaccess/source/ext/macromigration/dbmm_types.hxx
index dec92b2b3814..5d5f0b8bf9e1 100644
--- a/dbaccess/source/ext/macromigration/dbmm_types.hxx
+++ b/dbaccess/source/ext/macromigration/dbmm_types.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_DBMM_TYPES_HXX
-#define DBACCESS_DBMM_TYPES_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_TYPES_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_TYPES_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -48,6 +48,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_DBMM_TYPES_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DBMM_TYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx
index b67d95676823..0282e4f592ef 100644
--- a/dbaccess/source/ext/macromigration/docinteraction.hxx
+++ b/dbaccess/source/ext/macromigration/docinteraction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_DOCERRORHANDLING_HXX
-#define DBACCESS_DOCERRORHANDLING_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DOCINTERACTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DOCINTERACTION_HXX
 
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -75,6 +75,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_DOCERRORHANDLING_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_DOCINTERACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
index b8090606d12c..c5c112249982 100644
--- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_MACROMIGRATIONDIALOG_HXX
-#define DBACCESS_MACROMIGRATIONDIALOG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONDIALOG_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONDIALOG_HXX
 
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
 
@@ -74,6 +74,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_MACROMIGRATIONDIALOG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.hxx b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
index 082c49d733ad..8e36d4909c56 100644
--- a/dbaccess/source/ext/macromigration/macromigrationpages.hxx
+++ b/dbaccess/source/ext/macromigration/macromigrationpages.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_MACROMIGRATIONPAGES_HXX
-#define DBACCESS_MACROMIGRATIONPAGES_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONPAGES_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONPAGES_HXX
 
 #include "migrationprogress.hxx"
 #include "rangeprogressbar.hxx"
@@ -156,6 +156,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_MACROMIGRATIONPAGES_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MACROMIGRATIONPAGES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx
index c4428939a283..1396162e3f79 100644
--- a/dbaccess/source/ext/macromigration/migrationengine.hxx
+++ b/dbaccess/source/ext/macromigration/migrationengine.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_MIGRATIONENGINE_HXX
-#define DBACCESS_MIGRATIONENGINE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONENGINE_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONENGINE_HXX
 
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
 
@@ -75,6 +75,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_MIGRATIONENGINE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONENGINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx
index 1c5b175d2d5f..e5067ec82599 100644
--- a/dbaccess/source/ext/macromigration/migrationerror.hxx
+++ b/dbaccess/source/ext/macromigration/migrationerror.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_MIGRATIONERROR_HXX
-#define DBACCESS_MIGRATIONERROR_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONERROR_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONERROR_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 
@@ -154,6 +154,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_MIGRATIONERROR_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONERROR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx
index 498739f2de6b..958e5df77818 100644
--- a/dbaccess/source/ext/macromigration/migrationlog.hxx
+++ b/dbaccess/source/ext/macromigration/migrationlog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_MIGRATIONLOG_HXX
-#define DBACCESS_MIGRATIONLOG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONLOG_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONLOG_HXX
 
 #include "dbmm_types.hxx"
 
@@ -106,6 +106,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_MIGRATIONLOG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONLOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/migrationprogress.hxx b/dbaccess/source/ext/macromigration/migrationprogress.hxx
index 804f2c24cb8d..55087bfc7756 100644
--- a/dbaccess/source/ext/macromigration/migrationprogress.hxx
+++ b/dbaccess/source/ext/macromigration/migrationprogress.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_MIGRATIONPROGRESS_HXX
-#define DBACCESS_MIGRATIONPROGRESS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONPROGRESS_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONPROGRESS_HXX
 
 namespace dbmm
 {
@@ -41,6 +41,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_MIGRATIONPROGRESS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_MIGRATIONPROGRESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx
index f060d1147d59..80d2e2825065 100644
--- a/dbaccess/source/ext/macromigration/progresscapture.hxx
+++ b/dbaccess/source/ext/macromigration/progresscapture.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_PROGRESSCAPTURE_HXX
-#define DBACCESS_PROGRESSCAPTURE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_PROGRESSCAPTURE_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_PROGRESSCAPTURE_HXX
 
 #include <com/sun/star/task/XStatusIndicator.hpp>
 
@@ -60,6 +60,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_PROGRESSCAPTURE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_PROGRESSCAPTURE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx
index 5155d06d8563..39a6456170e9 100644
--- a/dbaccess/source/ext/macromigration/progressmixer.hxx
+++ b/dbaccess/source/ext/macromigration/progressmixer.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_PROGRESSMIXER_HXX
-#define DBACCESS_PROGRESSMIXER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_PROGRESSMIXER_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_PROGRESSMIXER_HXX
 
 #include <sal/types.h>
 
@@ -82,6 +82,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_PROGRESSMIXER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_PROGRESSMIXER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
index 5e5614a7f498..90ef55cc4c3a 100644
--- a/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
+++ b/dbaccess/source/ext/macromigration/rangeprogressbar.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_RANGEPROGRESSBAR_HXX
-#define DBACCESS_RANGEPROGRESSBAR_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_RANGEPROGRESSBAR_HXX
+#define INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_RANGEPROGRESSBAR_HXX
 
 #include <vcl/prgsbar.hxx>
 
@@ -79,6 +79,6 @@ namespace dbmm
 
 } // namespace dbmm
 
-#endif // DBACCESS_RANGEPROGRESSBAR_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_EXT_MACROMIGRATION_RANGEPROGRESSBAR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx
index f55a25f2de73..d6f592a4391c 100644
--- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx
+++ b/dbaccess/source/filter/xml/xmlAutoStyle.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 DBA_XMLAUTOSTYLE_HXX
-#define DBA_XMLAUTOSTYLE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLAUTOSTYLE_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLAUTOSTYLE_HXX
 #include <xmloff/maptype.hxx>
 #include <xmloff/xmlaustp.hxx>
 #include <xmloff/xmltypes.hxx>
@@ -44,6 +44,6 @@ namespace dbaxml
         virtual ~OXMLAutoStylePoolP();
     };
 } // dbaxml
-#endif // DBA_XMLAUTOSTYLE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLAUTOSTYLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx
index e19c8a5b6ef1..f8631f200303 100644
--- a/dbaccess/source/filter/xml/xmlColumn.hxx
+++ b/dbaccess/source/filter/xml/xmlColumn.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 DBA_XMLCOLUMN_HXX
-#define DBA_XMLCOLUMN_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCOLUMN_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCOLUMN_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -53,6 +53,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLCOLUMN_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCOLUMN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx
index a0cb924a8ae0..3ac21b30850c 100644
--- a/dbaccess/source/filter/xml/xmlComponent.hxx
+++ b/dbaccess/source/filter/xml/xmlComponent.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 DBA_XMLCOMPONENT_HXX
-#define DBA_XMLCOMPONENT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCOMPONENT_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCOMPONENT_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -46,6 +46,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLCOMPONENT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCOMPONENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx
index 4666cc442dd8..cedbe2c35227 100644
--- a/dbaccess/source/filter/xml/xmlConnectionData.hxx
+++ b/dbaccess/source/filter/xml/xmlConnectionData.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 DBA_XMLCONNECTIONDATA_HXX_INCLUDED
-#define DBA_XMLCONNECTIONDATA_HXX_INCLUDED
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCONNECTIONDATA_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCONNECTIONDATA_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -43,6 +43,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLCONNECTIONDATA_HXX_INCLUDED
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCONNECTIONDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx
index 6b3267068cb3..ea4365fedc61 100644
--- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx
+++ b/dbaccess/source/filter/xml/xmlConnectionResource.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 DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED
-#define DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCONNECTIONRESOURCE_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCONNECTIONRESOURCE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -37,6 +37,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCONNECTIONRESOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx
index 715ef33199b8..f4a243792aaa 100644
--- a/dbaccess/source/filter/xml/xmlDataSource.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSource.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 DBA_XMLDATASOURCE_HXX
-#define DBA_XMLDATASOURCE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCE_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -49,6 +49,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLDATASOURCE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
index 875cc612af56..ed7bbf9d0b32 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.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 DBA_XMLDATASOURCEINFO_HXX
-#define DBA_XMLDATASOURCEINFO_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCEINFO_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCEINFO_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
@@ -37,6 +37,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLDATASOURCEINFO_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCEINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
index 3180ffb93e64..97dce4e9ae0f 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.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 DBA_XMLDATASOURCESETTING_HXX
-#define DBA_XMLDATASOURCESETTING_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCESETTING_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCESETTING_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -60,6 +60,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLDATASOURCESETTING_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCESETTING_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
index 57b024ccbcf2..b9b737ec13e5 100644
--- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx
+++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.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 DBA_XMLDATASOURCESETTINGS_HXX
-#define DBA_XMLDATASOURCESETTINGS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCESETTINGS_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCESETTINGS_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
@@ -38,6 +38,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLDATASOURCESETTINGS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCESETTINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx
index ed75204e8efa..6c64608bea12 100644
--- a/dbaccess/source/filter/xml/xmlDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlDatabase.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 DBA_XMLDATABASE_HXX
-#define DBA_XMLDATABASE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATABASE_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATABASE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
@@ -41,6 +41,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLDATABASE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATABASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
index ca01556f2867..c842844f4284 100644
--- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx
+++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.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 DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED
-#define DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATABASEDESCRIPTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATABASEDESCRIPTION_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -43,6 +43,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATABASEDESCRIPTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx
index f39a6e4e1b07..427c26fd4b02 100644
--- a/dbaccess/source/filter/xml/xmlDocuments.hxx
+++ b/dbaccess/source/filter/xml/xmlDocuments.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 DBA_XMLDOCUMENTS_HXX
-#define DBA_XMLDOCUMENTS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDOCUMENTS_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDOCUMENTS_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "xmlEnums.hxx"
@@ -60,6 +60,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLDOCUMENTS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDOCUMENTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx
index e9181a302813..ce548aed8bb7 100644
--- a/dbaccess/source/filter/xml/xmlEnums.hxx
+++ b/dbaccess/source/filter/xml/xmlEnums.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 DBA_XMLENUMS_HXX
-#define DBA_XMLENUMS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLENUMS_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLENUMS_HXX
 
 #define PROGRESS_BAR_STEP 20
 
@@ -159,6 +159,6 @@ namespace dbaxml
         XML_TOK_DEFAULT_CELL_STYLE_NAME
     };
 } // namespace dbaxml
-#endif // DBA_XMLENUMS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLENUMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx
index 9ece717ee050..a436016916de 100644
--- a/dbaccess/source/filter/xml/xmlExport.hxx
+++ b/dbaccess/source/filter/xml/xmlExport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBA_XMLEXPORT_HXX
-#define DBA_XMLEXPORT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLEXPORT_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLEXPORT_HXX
 
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/document/XFilter.hpp>
@@ -188,6 +188,6 @@ public:
 };
 
 } // dbaxml
-#endif // DBA_XMLEXPORT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLEXPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx
index 85c270462115..e303ea63f253 100644
--- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.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 DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED
-#define DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLFILEBASEDDATABASE_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLFILEBASEDDATABASE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -37,6 +37,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLFILEBASEDDATABASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx
index 738d6ca2e734..36114dd372f9 100644
--- a/dbaccess/source/filter/xml/xmlHelper.hxx
+++ b/dbaccess/source/filter/xml/xmlHelper.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 DBA_XMLHELPER_HXX
-#define DBA_XMLHELPER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLHELPER_HXX
 
 #include <xmloff/xmlprmap.hxx>
 #include <xmloff/contextid.hxx>
@@ -56,6 +56,6 @@ namespace dbaxml
         static UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper();
     };
 } // dbaxml
-#endif // DBA_XMLHELPER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
index 2fdb30a99ed1..bffa5a35a597 100644
--- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx
+++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.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 DBA_XMLHIERARCHYCOLLECTION_HXX
-#define DBA_XMLHIERARCHYCOLLECTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLHIERARCHYCOLLECTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLHIERARCHYCOLLECTION_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "xmlEnums.hxx"
@@ -61,6 +61,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLHIERARCHYCOLLECTION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLHIERARCHYCOLLECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx
index 4371f81e584f..fd1722fa495f 100644
--- a/dbaccess/source/filter/xml/xmlLogin.hxx
+++ b/dbaccess/source/filter/xml/xmlLogin.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 DBA_XMLLOGIN_HXX
-#define DBA_XMLLOGIN_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLLOGIN_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLLOGIN_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
@@ -37,6 +37,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLLOGIN_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLLOGIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx
index 1ce7082522ac..f53d9845758f 100644
--- a/dbaccess/source/filter/xml/xmlQuery.hxx
+++ b/dbaccess/source/filter/xml/xmlQuery.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 DBA_XMLQUERY_HXX
-#define DBA_XMLQUERY_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLQUERY_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLQUERY_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include "xmlTable.hxx"
@@ -48,6 +48,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLQUERY_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLQUERY_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx
index 0162ad431481..15a96c932f85 100644
--- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx
+++ b/dbaccess/source/filter/xml/xmlServerDatabase.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 DBA_XMLSERVERDATABASE_HXX_INCLUDED
-#define DBA_XMLSERVERDATABASE_HXX_INCLUDED
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSERVERDATABASE_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSERVERDATABASE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -37,6 +37,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLSERVERDATABASE_HXX_INCLUDED
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSERVERDATABASE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx
index b56658c14882..a9fee3bb17a6 100644
--- a/dbaccess/source/filter/xml/xmlStyleImport.hxx
+++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBA_XMLSTYLEIMPORT_HXX
-#define DBA_XMLSTYLEIMPORT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSTYLEIMPORT_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSTYLEIMPORT_HXX
 
 #include <rtl/ustring.hxx>
 #include <xmloff/xmlimp.hxx>
@@ -120,6 +120,6 @@ namespace dbaxml
         sal_Int32 GetIndex(const sal_Int16 nContextID);
     };
 } // dbaxml
-#endif // DBA_XMLSTYLEIMPORT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSTYLEIMPORT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx
index 6ece20cbe8c0..c5149d527a2c 100644
--- a/dbaccess/source/filter/xml/xmlTable.hxx
+++ b/dbaccess/source/filter/xml/xmlTable.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 DBA_XMLTABLE_HXX
-#define DBA_XMLTABLE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLTABLE_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLTABLE_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -71,6 +71,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLTABLE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx
index 66ef7bc832b5..9d347de44a35 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.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 DBA_XMLTABLEFILTERLIST_HXX
-#define DBA_XMLTABLEFILTERLIST_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLTABLEFILTERLIST_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLTABLEFILTERLIST_HXX
 
 #include <xmloff/xmlictxt.hxx>
 #include <vector>
@@ -64,6 +64,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLTABLEFILTERLIST_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLTABLEFILTERLIST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx
index 1c7e90f53693..1eeca337e59c 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.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 DBA_XMLTABLEFILTERPATTERN_HXX
-#define DBA_XMLTABLEFILTERPATTERN_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLTABLEFILTERPATTERN_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLTABLEFILTERPATTERN_HXX
 
 #include <xmloff/xmlictxt.hxx>
 
@@ -41,6 +41,6 @@ namespace dbaxml
     };
 } // namespace dbaxml
 
-#endif // DBA_XMLTABLEFILTERPATTERN_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLTABLEFILTERPATTERN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx
index 0f125776bba5..e61a69f8aa02 100644
--- a/dbaccess/source/filter/xml/xmlfilter.hxx
+++ b/dbaccess/source/filter/xml/xmlfilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBA_XMLFILTER_HXX
-#define DBA_XMLFILTER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLFILTER_HXX
+#define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLFILTER_HXX
 
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/document/XFilter.hpp>
@@ -158,6 +158,6 @@ public:
 };
 
 } // dbaxml
-#endif // DBA_XMLFILTER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/OAuthenticationContinuation.hxx b/dbaccess/source/inc/OAuthenticationContinuation.hxx
index 1b3ad7f0b11c..50b44b13598d 100644
--- a/dbaccess/source/inc/OAuthenticationContinuation.hxx
+++ b/dbaccess/source/inc/OAuthenticationContinuation.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBACCESS_OAUTHENTICATIONCONTINUATION_HXX_
-#define _DBACCESS_OAUTHENTICATIONCONTINUATION_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_INC_OAUTHENTICATIONCONTINUATION_HXX
+#define INCLUDED_DBACCESS_SOURCE_INC_OAUTHENTICATIONCONTINUATION_HXX
 
 #include "dbadllapi.hxx"
 
@@ -65,6 +65,6 @@ public:
 
 }   // namespace dbaccess
 
-#endif // _DBACCESS_OAUTHENTICATIONCONTINUATION_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_INC_OAUTHENTICATIONCONTINUATION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx
index dc41135a2d96..fd32e6a2b0fc 100644
--- a/dbaccess/source/inc/apitools.hxx
+++ b/dbaccess/source/inc/apitools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBASHARED_APITOOLS_HXX_
-#define _DBASHARED_APITOOLS_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX
+#define INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX
 
 #include <cppuhelper/component.hxx>
 #include <osl/mutex.hxx>
@@ -358,6 +358,6 @@ public:
     }                                                                             \
     _rGuard.reset();
 
-#endif // _DBASHARED_APITOOLS_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_INC_APITOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx
index 5f3b1ab2fd12..350afe497a8e 100644
--- a/dbaccess/source/inc/dbu_reghelper.hxx
+++ b/dbaccess/source/inc/dbu_reghelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBU_REGHELPER_HXX_
-#define _DBU_REGHELPER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_INC_DBU_REGHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_INC_DBU_REGHELPER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
@@ -36,6 +36,6 @@ namespace dbaui
 
 }
 
-#endif // _DBU_REGHELPER_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_INC_DBU_REGHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx
index f5fe334265e2..f21f449839f3 100644
--- a/dbaccess/source/inc/dsntypes.hxx
+++ b/dbaccess/source/inc/dsntypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBACCESS_DSNTYPES_HXX_
-#define _DBACCESS_DSNTYPES_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX
+#define INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX
 
 #include <comphelper/stl_types.hxx>
 #include "dbadllapi.hxx"
@@ -216,6 +216,6 @@ protected:
 
 }   // namespace dbaccess
 
-#endif // _DBACCESS_DSNTYPES_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_INC_DSNTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx
index 5fc701731aa7..a65c0557081c 100644
--- a/dbaccess/source/inc/flt_reghelper.hxx
+++ b/dbaccess/source/inc/flt_reghelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FLT_REGHELPER_HXX_
-#define _FLT_REGHELPER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_INC_FLT_REGHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_INC_FLT_REGHELPER_HXX
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/registry/XRegistryKey.hpp>
@@ -36,6 +36,6 @@ namespace dbaxml
 
 }
 
-#endif // _FLT_REGHELPER_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_INC_FLT_REGHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
index 668b61c23933..b6cc94f16b88 100644
--- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiondependent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX
-#define DBACCESS_CONNECTION_DEPENDENT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONDEPENDENT_HXX
+#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONDEPENDENT_HXX
 
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -133,6 +133,6 @@ namespace sdbtools
 
 } // namespace sdbtools
 
-#endif // DBACCESS_CONNECTION_DEPENDENT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONDEPENDENT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx
index 7d8250e80d25..789ae58bbb54 100644
--- a/dbaccess/source/sdbtools/connection/connectiontools.hxx
+++ b/dbaccess/source/sdbtools/connection/connectiontools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_CONNECTIONTOOLS_HXX
-#define DBACCESS_CONNECTIONTOOLS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONTOOLS_HXX
+#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONTOOLS_HXX
 
 #include "module_sdbt.hxx"
 
@@ -87,6 +87,6 @@ namespace sdbtools
 
 } // namespace sdbtools
 
-#endif // DBACCESS_CONNECTIONTOOLS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_CONNECTIONTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
index 53fb07e0da93..aad50b9e1002 100644
--- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
+++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_DATASOURCEMETADATA_HXX
-#define DBACCESS_DATASOURCEMETADATA_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_DATASOURCEMETADATA_HXX
+#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_DATASOURCEMETADATA_HXX
 
 #include "connectiondependent.hxx"
 
@@ -71,6 +71,6 @@ namespace sdbtools
 
 } // namespace sdbtools
 
-#endif // DBACCESS_DATASOURCEMETADATA_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_DATASOURCEMETADATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx
index a696ba467090..09292fd220ef 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.hxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_SOURCE_SDBTOOLS_INC_OBJECTNAMES_HXX
-#define DBACCESS_SOURCE_SDBTOOLS_INC_OBJECTNAMES_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_OBJECTNAMES_HXX
+#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_OBJECTNAMES_HXX
 
 #include "connectiondependent.hxx"
 
@@ -77,6 +77,6 @@ namespace sdbtools
 
 } // namespace sdbtools
 
-#endif // DBACCESS_SOURCE_SDBTOOLS_INC_OBJECTNAMES_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_OBJECTNAMES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx
index 73412de8bf1b..ec6ed99cf8fd 100644
--- a/dbaccess/source/sdbtools/connection/tablename.hxx
+++ b/dbaccess/source/sdbtools/connection/tablename.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX
-#define DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX
+#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX
 
 #include "connectiondependent.hxx"
 
@@ -83,6 +83,6 @@ namespace sdbtools
 
 } // namespace sdbtools
 
-#endif // DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx
index 8d242032771a..467b98963e3e 100644
--- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx
+++ b/dbaccess/source/sdbtools/inc/module_sdbt.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_MODULE_SDBT_HXX
-#define DBACCESS_MODULE_SDBT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX
+#define INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX
 
 #include <unotools/componentresmodule.hxx>
 
@@ -29,6 +29,6 @@ namespace sdbtools
 
 } // namespace sdbtools
 
-#endif // DBACCESS_MODULE_SDBT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_SDBTOOLS_INC_MODULE_SDBT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index 39e5dcec416a..5fb954c55d94 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_APPCONTROLLER_HXX
-#define DBAUI_APPCONTROLLER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPCONTROLLER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_APPCONTROLLER_HXX
 
 #include "IApplicationController.hxx"
 #include "AppElementType.hxx"
@@ -560,6 +560,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // DBAUI_APPCONTROLLER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 40d6426eb416..b5e8d16a4913 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.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 DBAUI_APPDETAILPAGEHELPER_HXX
-#define DBAUI_APPDETAILPAGEHELPER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILPAGEHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILPAGEHELPER_HXX
 
 #include <vector>
 
@@ -357,6 +357,6 @@ namespace dbaui
         void DataChanged( const DataChangedEvent& rDCEvt );
     };
 }
-#endif // DBAUI_APPDETAILPAGEHELPER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILPAGEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppDetailView.hxx b/dbaccess/source/ui/app/AppDetailView.hxx
index 94a8f3ff75f4..4f399a81f1a0 100644
--- a/dbaccess/source/ui/app/AppDetailView.hxx
+++ b/dbaccess/source/ui/app/AppDetailView.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 DBAUI_APPDETAILVIEW_HXX
-#define DBAUI_APPDETAILVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX
 
 #include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -364,6 +364,6 @@ namespace dbaui
         void                impl_fillTaskPaneData( ElementType _eType, TaskPaneData& _rData ) const;
     };
 }
-#endif // DBAUI_APPDETAILVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPDETAILVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppIconControl.hxx b/dbaccess/source/ui/app/AppIconControl.hxx
index 1ca4b4dae1d7..c0c90bd4e76c 100644
--- a/dbaccess/source/ui/app/AppIconControl.hxx
+++ b/dbaccess/source/ui/app/AppIconControl.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 DBAUI_APPICONCONTROL_HXX
-#define DBAUI_APPICONCONTROL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPICONCONTROL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_APPICONCONTROL_HXX
 
 #include <svtools/ivctrl.hxx>
 #include <svtools/transfer.hxx>
@@ -44,6 +44,6 @@ namespace dbaui
         virtual sal_Int8    ExecuteDrop( const ExecuteDropEvent& _rEvt );
     };
 }
-#endif // DBAUI_APPICONCONTROL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPICONCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx b/dbaccess/source/ui/app/AppSwapWindow.hxx
index 1e8dd8849eb8..bdc15154b231 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.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 DBAUI_APPSWAPWINDOW_HXX
-#define DBAUI_APPSWAPWINDOW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPSWAPWINDOW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_APPSWAPWINDOW_HXX
 
 #include "IClipBoardTest.hxx"
 #include <vcl/lstbox.hxx>
@@ -87,6 +87,6 @@ namespace dbaui
         bool onContainerSelected( ElementType _eType );
     };
 } // namespace dbaui
-#endif // DBAUI_APPSWAPWINDOW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPSWAPWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 7213b27f0f5a..b10bb91e90f2 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.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 DBAUI_TITLE_WINDOW_HXX
-#define DBAUI_TITLE_WINDOW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPTITLEWINDOW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_APPTITLEWINDOW_HXX
 
 #include <vcl/fixed.hxx>
 
@@ -68,6 +68,6 @@ namespace dbaui
         long GetWidthPixel() const;
     };
 } // namespace dbaui
-#endif // DBAUI_TITLE_WINDOW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPTITLEWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/AppView.hxx b/dbaccess/source/ui/app/AppView.hxx
index 3f0da9dc6a38..0e4b48d058a1 100644
--- a/dbaccess/source/ui/app/AppView.hxx
+++ b/dbaccess/source/ui/app/AppView.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 DBAUI_APPVIEW_HXX
-#define DBAUI_APPVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_APPVIEW_HXX
 
 #include <dbaccess/dataview.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -295,6 +295,6 @@ namespace dbaui
         SvTreeListEntry* getEntry( const Point& _aPosPixel ) const;
     };
 }
-#endif // DBAUI_APPVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_APPVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/IApplicationController.hxx b/dbaccess/source/ui/app/IApplicationController.hxx
index 8789b7437dac..47de9268cc07 100644
--- a/dbaccess/source/ui/app/IApplicationController.hxx
+++ b/dbaccess/source/ui/app/IApplicationController.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBA30D_IAPPLICATIONCONTROLLER_HXX
-#define DBA30D_IAPPLICATIONCONTROLLER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_IAPPLICATIONCONTROLLER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_IAPPLICATIONCONTROLLER_HXX
 
 #include <dbaccess/IController.hxx>
 #include "AppElementType.hxx"
@@ -85,6 +85,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBA30D_IAPPLICATIONCONTROLLER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_IAPPLICATIONCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/app/subcomponentmanager.hxx b/dbaccess/source/ui/app/subcomponentmanager.hxx
index f7c3df9a77b4..112983ac99c3 100644
--- a/dbaccess/source/ui/app/subcomponentmanager.hxx
+++ b/dbaccess/source/ui/app/subcomponentmanager.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_SUBCOMPONENTMANAGER_HXX
-#define DBACCESS_SUBCOMPONENTMANAGER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_SUBCOMPONENTMANAGER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_APP_SUBCOMPONENTMANAGER_HXX
 
 #include "AppElementType.hxx"
 
@@ -118,6 +118,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_SUBCOMPONENTMANAGER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_APP_SUBCOMPONENTMANAGER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dbtreemodel.hxx b/dbaccess/source/ui/browser/dbtreemodel.hxx
index 843eb0be4433..e188bbdd6bc7 100644
--- a/dbaccess/source/ui/browser/dbtreemodel.hxx
+++ b/dbaccess/source/ui/browser/dbtreemodel.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_DBTREEMODEL_HXX
-#define DBAUI_DBTREEMODEL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEMODEL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEMODEL_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include "unodatbr.hxx"
@@ -56,6 +56,6 @@ namespace dbaui
     };
 }
 
-#endif // DBAUI_DBTREEMODEL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
index 3e4649e178fd..47e4f89eea8a 100644
--- a/dbaccess/source/ui/browser/dbtreeview.hxx
+++ b/dbaccess/source/ui/browser/dbtreeview.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_UI_DBTREEVIEW_HXX
-#define DBACCESS_UI_DBTREEVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEVIEW_HXX
 
 #include <vcl/window.hxx>
 
@@ -59,6 +59,6 @@ namespace dbaui
     };
 }
 
-#endif // DBACCESS_UI_DBTREEVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_BROWSER_DBTREEVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index eec5eddec541..f478d14b9bed 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_CONNECTIONHELPER_HXX
-#define DBAUI_CONNECTIONHELPER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONHELPER_HXX
 
 #include "adminpages.hxx"
 #include <ucbhelper/content.hxx>
@@ -97,6 +97,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // DBAUI_CONNECTIONHELPER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 040477107d9f..d09dca9d161f 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_CONNECTIONPAGE_HXX
-#define DBAUI_CONNECTIONPAGE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONPAGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONPAGE_HXX
 
 #include "ConnectionHelper.hxx"
 #include "adminpages.hxx"
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 108fdd6c30ec..08eb1fdcbea9 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_CONNECTIONPAGESETUP_HXX
-#define DBAUI_CONNECTIONPAGESETUP_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONPAGESETUP_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_CONNECTIONPAGESETUP_HXX
 #include "ConnectionHelper.hxx"
 
 #include "adminpages.hxx"
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index f34eaa56e65e..aa6f58f50024 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_DBSETUPCONNECTIONPAGES_HXX
-#define DBAUI_DBSETUPCONNECTIONPAGES_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DBSETUPCONNECTIONPAGES_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DBSETUPCONNECTIONPAGES_HXX
 
 #include "ConnectionPageSetup.hxx"
 
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index ca8325b009c4..d8b91e323e91 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_DBADMINIMPL_HXX_
-#define _DBAUI_DBADMINIMPL_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DBADMINIMPL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DBADMINIMPL_HXX
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -169,6 +169,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_DBADMINIMPL_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_DBADMINIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index 21854d52a8a8..3854bd61616e 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.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 DBAUI_DRIVERSETTINGS_HXX
-#define DBAUI_DRIVERSETTINGS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX
 
 #include "dsntypes.hxx"
 #include <svl/poolitem.hxx>
@@ -94,6 +94,6 @@ namespace dbaui
     };
 }
 
-#endif // DBAUI_DRIVERSETTINGS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index ff280023ce4a..8defb64b3118 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_TEXTCONNECTIONHELPER_HXX
-#define DBAUI_TEXTCONNECTIONHELPER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_TEXTCONNECTIONHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_TEXTCONNECTIONHELPER_HXX
 
 #include "ConnectionPageSetup.hxx"
 #include "adminpages.hxx"
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index ad48c761a305..347a11033765 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.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 DBAUI_USERADMIN_HXX
-#define DBAUI_USERADMIN_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_USERADMIN_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_USERADMIN_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
@@ -80,6 +80,6 @@ public:
     virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList);
 };
 }
-#endif // DBAUI_USERADMIN_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_USERADMIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx
index aafa8c9bd7c9..95b729cde6cc 100644
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_ADMINCONTROLS_HXX
-#define DBACCESS_ADMINCONTROLS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_ADMINCONTROLS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADMINCONTROLS_HXX
 
 #include "adminpages.hxx"
 
@@ -66,6 +66,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_ADMINCONTROLS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_ADMINCONTROLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 51920b8af890..c7e551957455 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_ADMINPAGES_HXX_
-#define _DBAUI_ADMINPAGES_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_ADMINPAGES_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADMINPAGES_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include "dsntypes.hxx"
@@ -269,6 +269,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_ADMINPAGES_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_ADMINPAGES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/adodatalinks.hxx b/dbaccess/source/ui/dlg/adodatalinks.hxx
index e5de6c289a28..11a0da006e61 100644
--- a/dbaccess/source/ui/dlg/adodatalinks.hxx
+++ b/dbaccess/source/ui/dlg/adodatalinks.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_ADO_DATALINK_HXX_
-#define _DBAUI_ADO_DATALINK_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_ADODATALINKS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADODATALINKS_HXX
 
 #include <osl/module.h>
 #include "commontypes.hxx"
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index b042389196f0..02fb4565e535 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_ADVANCEDSETTINGS_HXX
-#define DBACCESS_ADVANCEDSETTINGS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_ADVANCEDSETTINGS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADVANCEDSETTINGS_HXX
 
 #include "adminpages.hxx"
 #include "dsmeta.hxx"
@@ -134,6 +134,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_ADVANCEDSETTINGS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_ADVANCEDSETTINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx
index 1dfb2a559c41..74cb0627e723 100644
--- a/dbaccess/source/ui/dlg/dbfindex.hxx
+++ b/dbaccess/source/ui/dlg/dbfindex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_DBFINDEX_HXX_
-#define _DBAUI_DBFINDEX_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DBFINDEX_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DBFINDEX_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
@@ -129,6 +129,6 @@ public:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_DBFINDEX_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_DBFINDEX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dsnItem.hxx b/dbaccess/source/ui/dlg/dsnItem.hxx
index 8f1b636f8f3f..0f425cd0898d 100644
--- a/dbaccess/source/ui/dlg/dsnItem.hxx
+++ b/dbaccess/source/ui/dlg/dsnItem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_DSNITEM_HXX_
-#define _DBAUI_DSNITEM_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DSNITEM_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DSNITEM_HXX
 
 #include <svl/poolitem.hxx>
 
@@ -47,6 +47,6 @@ namespace dbaui
     };
 }   // namespace dbaui
 
-#endif // _DBAUI_DSNITEM_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_DSNITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index 171fa415c84d..338eb34c915d 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_DSSELECT_HXX_
-#define _DBAUI_DSSELECT_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DSSELECT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_DSSELECT_HXX
 
 #include "dsntypes.hxx"
 #include "odbcconfig.hxx"
@@ -75,6 +75,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_DSSELECT_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_DSSELECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/finteraction.hxx b/dbaccess/source/ui/dlg/finteraction.hxx
index 1df4220745d2..eeee142fea79 100644
--- a/dbaccess/source/ui/dlg/finteraction.hxx
+++ b/dbaccess/source/ui/dlg/finteraction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_FILEPICKER_INTERACTION_HXX
-#define DBAUI_FILEPICKER_INTERACTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_FINTERACTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_FINTERACTION_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -53,6 +53,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // DBAUI_FILEPICKER_INTERACTION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_FINTERACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 0def8c1cf4a2..50a4e10a367b 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_GENERALPAGE_HXX_
-#define _DBAUI_GENERALPAGE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_GENERALPAGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_GENERALPAGE_HXX
 
 #include "adminpages.hxx"
 #include "opendoccontrols.hxx"
@@ -194,6 +194,6 @@ namespace dbaui
     };
 
 }   // namespace dbaui
-#endif // _DBAUI_GENERALPAGE_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_GENERALPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index 8db6771e6bfa..5e77ae418e3d 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_ODBC_CONFIG_HXX_
-#define _DBAUI_ODBC_CONFIG_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_ODBCCONFIG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_ODBCCONFIG_HXX
 
 #include "commontypes.hxx"
 
@@ -118,6 +118,6 @@ public:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_ODBC_CONFIG_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_ODBCCONFIG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/optionalboolitem.hxx b/dbaccess/source/ui/dlg/optionalboolitem.hxx
index ebe466342e46..d341da2f1954 100644
--- a/dbaccess/source/ui/dlg/optionalboolitem.hxx
+++ b/dbaccess/source/ui/dlg/optionalboolitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_OPTIONALBOOLITEM_HXX
-#define DBACCESS_OPTIONALBOOLITEM_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_OPTIONALBOOLITEM_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_OPTIONALBOOLITEM_HXX
 
 #include <svl/poolitem.hxx>
 
@@ -51,6 +51,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_OPTIONALBOOLITEM_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_OPTIONALBOOLITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 876e6078ac14..7095a9b338a2 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_TABLESPAGE_HXX_
-#define _DBAUI_TABLESPAGE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_TABLESPAGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_DLG_TABLESPAGE_HXX
 
 #include "adminpages.hxx"
 #include <com/sun/star/i18n/XCollator.hpp>
@@ -99,6 +99,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_TABLESPAGE_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_DLG_TABLESPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/AppElementType.hxx b/dbaccess/source/ui/inc/AppElementType.hxx
index e0983cf1dbd5..85c46ebdea00 100644
--- a/dbaccess/source/ui/inc/AppElementType.hxx
+++ b/dbaccess/source/ui/inc/AppElementType.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 DBAUI_APPELEMENTTYPE_HXX
-#define DBAUI_APPELEMENTTYPE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_APPELEMENTTYPE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_APPELEMENTTYPE_HXX
 
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
 
@@ -50,6 +50,6 @@ namespace dbaui
     };
 
 } // namespace dbaui
-#endif // DBAUI_APPELEMENTTYPE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_APPELEMENTTYPE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx
index 35e32a133197..21c8ee6e0039 100644
--- a/dbaccess/source/ui/inc/CollectionView.hxx
+++ b/dbaccess/source/ui/inc/CollectionView.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_COLLECTIONVIEW_HXX
-#define DBAUI_COLLECTIONVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_COLLECTIONVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_COLLECTIONVIEW_HXX
 
 #include <svtools/fileview.hxx>
 #include <vcl/button.hxx>
@@ -69,6 +69,6 @@ namespace dbaui
     };
 }   // namespace dbaui
 
-#endif //DBAUI_COLLECTIONVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_COLLECTIONVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/ColumnControlWindow.hxx b/dbaccess/source/ui/inc/ColumnControlWindow.hxx
index 9fa065133e3c..ff7e4f2e3d24 100644
--- a/dbaccess/source/ui/inc/ColumnControlWindow.hxx
+++ b/dbaccess/source/ui/inc/ColumnControlWindow.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 DBAUI_COLUMNCONTROLWINDOW_HXX
-#define DBAUI_COLUMNCONTROLWINDOW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_COLUMNCONTROLWINDOW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_COLUMNCONTROLWINDOW_HXX
 
 #include "FieldDescControl.hxx"
 #include "TypeInfo.hxx"
@@ -65,6 +65,6 @@ namespace dbaui
         TOTypeInfoSP getDefaultTyp() const;
     };
 }   // namespace dbaui
-#endif // DBAUI_COLUMNCONTROLWINDOW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_COLUMNCONTROLWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/ConnectionLine.hxx b/dbaccess/source/ui/inc/ConnectionLine.hxx
index 5ef9406feaae..c3dc21cb3b03 100644
--- a/dbaccess/source/ui/inc/ConnectionLine.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLine.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 DBAUI_CONNECTIONLINE_HXX
-#define DBAUI_CONNECTIONLINE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINE_HXX
 
 #include <tools/gen.hxx>
 #include "ConnectionLineData.hxx"
@@ -93,6 +93,6 @@ namespace dbaui
     };
 
 }
-#endif // DBAUI_CONNECTIONLINE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx b/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
index 8b532c2933b1..3d40a1895a49 100644
--- a/dbaccess/source/ui/inc/ConnectionLineAccess.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineAccess.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 DBACCESS_CONNECTIONLINEACCESS_HXX
-#define DBACCESS_CONNECTIONLINEACCESS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEACCESS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEACCESS_HXX
 
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <cppuhelper/implbase2.hxx>
@@ -96,6 +96,6 @@ namespace dbaui
         virtual ::com::sun::star::accessibility::AccessibleRelation SAL_CALL getRelationByType( sal_Int16 aRelationType ) throw (::com::sun::star::uno::RuntimeException);
     };
 }
-#endif // DBACCESS_CONNECTIONLINEACCESS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/ConnectionLineData.hxx b/dbaccess/source/ui/inc/ConnectionLineData.hxx
index 628d0c42c8f7..4feb939e48c7 100644
--- a/dbaccess/source/ui/inc/ConnectionLineData.hxx
+++ b/dbaccess/source/ui/inc/ConnectionLineData.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 DBAUI_CONNECTIONLINEDATA_HXX
-#define DBAUI_CONNECTIONLINEDATA_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEDATA_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEDATA_HXX
 
 #include "QEnumTypes.hxx"
 #include <vector>
@@ -81,6 +81,6 @@ namespace dbaui
     typedef ::rtl::Reference< OConnectionLineData >     OConnectionLineDataRef;
     typedef ::std::vector< OConnectionLineDataRef > OConnectionLineDataVec;
 }
-#endif // DBAUI_CONNECTIONLINEDATA_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CONNECTIONLINEDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index 9684c4d6852e..5b1f4ab6756b 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.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 DBAUI_DATABASEEXPORT_HXX
-#define DBAUI_DATABASEEXPORT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DEXPORT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DEXPORT_HXX
 
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
diff --git a/dbaccess/source/ui/inc/FieldControls.hxx b/dbaccess/source/ui/inc/FieldControls.hxx
index 344274f24a99..5ea415bd6df6 100644
--- a/dbaccess/source/ui/inc/FieldControls.hxx
+++ b/dbaccess/source/ui/inc/FieldControls.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 DBAUI_FIELDCONTROLS_HXX
-#define DBAUI_FIELDCONTROLS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDCONTROLS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDCONTROLS_HXX
 
 #include <vcl/field.hxx>
 #include <vcl/lstbox.hxx>
@@ -170,6 +170,6 @@ namespace dbaui
         m_strHelpText = ModuleRes(nHelpId);
     }
 }
-#endif // DBAUI_FIELDCONTROLS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDCONTROLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index ce8a04acd36c..b4156de98e8a 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.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 DBAUI_FIELDDESCRIPTIONCONTROL_HXX
-#define DBAUI_FIELDDESCRIPTIONCONTROL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCCONTROL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCCONTROL_HXX
 
 #include <vcl/tabpage.hxx>
 #include "QEnumTypes.hxx"
diff --git a/dbaccess/source/ui/inc/FieldDescriptions.hxx b/dbaccess/source/ui/inc/FieldDescriptions.hxx
index 56c5c1a1ec4a..75342e81d783 100644
--- a/dbaccess/source/ui/inc/FieldDescriptions.hxx
+++ b/dbaccess/source/ui/inc/FieldDescriptions.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 DBAUI_FIELDDESCRIPTIONS_HXX
-#define DBAUI_FIELDDESCRIPTIONS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCRIPTIONS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCRIPTIONS_HXX
 
 #include "QEnumTypes.hxx"
 #include <editeng/svxenum.hxx>
@@ -110,7 +110,7 @@ namespace dbaui
         sal_Bool                    IsNullable()            const;
     };
 }
-#endif // DBAUI_FIELDDESCRIPTIONS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_FIELDDESCRIPTIONS_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/GeneralUndo.hxx b/dbaccess/source/ui/inc/GeneralUndo.hxx
index af4b6232cd5f..f5e4090e495e 100644
--- a/dbaccess/source/ui/inc/GeneralUndo.hxx
+++ b/dbaccess/source/ui/inc/GeneralUndo.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 DBAUI_GENERALUNDO_HXX
-#define DBAUI_GENERALUNDO_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_GENERALUNDO_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_GENERALUNDO_HXX
 
 #include <svl/undo.hxx>
 #include "moduledbu.hxx"
@@ -41,6 +41,6 @@ namespace dbaui
         virtual OUString GetComment() const { return m_strComment; }
     };
 }
-#endif // DBAUI_GENERALUNDO_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_GENERALUNDO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/HtmlReader.hxx b/dbaccess/source/ui/inc/HtmlReader.hxx
index 6bb100a3ff39..0c9a056200c5 100644
--- a/dbaccess/source/ui/inc/HtmlReader.hxx
+++ b/dbaccess/source/ui/inc/HtmlReader.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 DBAUI_HTMLREADER_HXX
-#define DBAUI_HTMLREADER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_HTMLREADER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_HTMLREADER_HXX
 
 #include "DExport.hxx"
 #include <svtools/parhtml.hxx>
diff --git a/dbaccess/source/ui/inc/IClipBoardTest.hxx b/dbaccess/source/ui/inc/IClipBoardTest.hxx
index ac3279064987..cbb6f130e54c 100644
--- a/dbaccess/source/ui/inc/IClipBoardTest.hxx
+++ b/dbaccess/source/ui/inc/IClipBoardTest.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 DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
-#define DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_ICLIPBOARDTEST_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_ICLIPBOARDTEST_HXX
 #include <sal/types.h>
 
 namespace dbaui
@@ -39,6 +39,6 @@ namespace dbaui
         ~IClipboardTest() {}
     };
 }
-#endif // DBACCESS_TABLEDESIGN_ICLIPBOARDTEST_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_ICLIPBOARDTEST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/IItemSetHelper.hxx b/dbaccess/source/ui/inc/IItemSetHelper.hxx
index 537814713b95..b752b485011c 100644
--- a/dbaccess/source/ui/inc/IItemSetHelper.hxx
+++ b/dbaccess/source/ui/inc/IItemSetHelper.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_ITEMSETHELPER_HXX
-#define DBAUI_ITEMSETHELPER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_IITEMSETHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_IITEMSETHELPER_HXX
 
 #include <sal/types.h>
 #include <comphelper/uno3.hxx>
@@ -69,6 +69,6 @@ namespace dbaui
         ~IDatabaseSettingsDialog() {}
     };
 }
-#endif // DBAUI_ITEMSETHELPER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_IITEMSETHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/IUpdateHelper.hxx b/dbaccess/source/ui/inc/IUpdateHelper.hxx
index c3036cd3dfee..c23a9dbd930e 100644
--- a/dbaccess/source/ui/inc/IUpdateHelper.hxx
+++ b/dbaccess/source/ui/inc/IUpdateHelper.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 DBAUI_IUPDATEHELPER_HXX
-#define DBAUI_IUPDATEHELPER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_IUPDATEHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_IUPDATEHELPER_HXX
 
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
@@ -43,6 +43,6 @@ namespace dbaui
     };
 }
 
-#endif // DBAUI_IUPDATEHELPER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_IUPDATEHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/JAccess.hxx b/dbaccess/source/ui/inc/JAccess.hxx
index 0c73e722d489..8ad15552fdee 100644
--- a/dbaccess/source/ui/inc/JAccess.hxx
+++ b/dbaccess/source/ui/inc/JAccess.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 DBACCESS_JACCESS_HXX
-#define DBACCESS_JACCESS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_JACCESS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_JACCESS_HXX
 
 #include <toolkit/awt/vclxaccessiblecomponent.hxx>
 #include <cppuhelper/implbase1.hxx>
@@ -75,6 +75,6 @@ namespace dbaui
         void clearTableView();
     };
 }
-#endif // DBACCESS_JACCESS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/JoinController.hxx b/dbaccess/source/ui/inc/JoinController.hxx
index 14d95335997b..60feee1fcca5 100644
--- a/dbaccess/source/ui/inc/JoinController.hxx
+++ b/dbaccess/source/ui/inc/JoinController.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 DBAUI_JOINCONTROLLER_HXX
-#define DBAUI_JOINCONTROLLER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_JOINCONTROLLER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_JOINCONTROLLER_HXX
 
 #include "singledoccontroller.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -153,6 +153,6 @@ namespace dbaui
         AddTableDialogContext&  impl_getDialogContext() const;
     };
 }
-#endif // DBAUI_JOINCONTROLLER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JOINCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/JoinDesignView.hxx b/dbaccess/source/ui/inc/JoinDesignView.hxx
index eafb6dfd5eda..a38f6a3bc605 100644
--- a/dbaccess/source/ui/inc/JoinDesignView.hxx
+++ b/dbaccess/source/ui/inc/JoinDesignView.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_JOINDESIGNVIEW_HXX
-#define DBAUI_JOINDESIGNVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX
 
 #include <dbaccess/dataview.hxx>
 #include <vector>
@@ -66,7 +66,7 @@ namespace dbaui
         DECL_LINK( SplitHdl, void* );
     };
 }
-#endif // DBAUI_JOINDESIGNVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_JOINDESIGNVIEW_HXX
 
 
 
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx
index 31b823e01f7b..2bf549a507e3 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.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 DBAUI_JOINEXCHANGE_HXX
-#define DBAUI_JOINEXCHANGE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_JOINEXCHANGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_JOINEXCHANGE_HXX
 
 #include "dbexchange.hxx"
 #include "TableWindowListBox.hxx"
diff --git a/dbaccess/source/ui/inc/JoinTableView.hxx b/dbaccess/source/ui/inc/JoinTableView.hxx
index 045e43508c7b..95cf9fbb15f4 100644
--- a/dbaccess/source/ui/inc/JoinTableView.hxx
+++ b/dbaccess/source/ui/inc/JoinTableView.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 DBAUI_JOINTABLEVIEW_HXX
-#define DBAUI_JOINTABLEVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_JOINTABLEVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_JOINTABLEVIEW_HXX
 
 #include <vcl/window.hxx>
 #include <vcl/timer.hxx>
diff --git a/dbaccess/source/ui/inc/LimitBox.hxx b/dbaccess/source/ui/inc/LimitBox.hxx
index 3958402417ad..c5d1a25dbaf9 100644
--- a/dbaccess/source/ui/inc/LimitBox.hxx
+++ b/dbaccess/source/ui/inc/LimitBox.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef LIMIT_BOX_HXX
-#define LIMIT_BOX_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_LIMITBOX_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_LIMITBOX_HXX
 
 #include <vcl/field.hxx>
 #include <rtl/ustring.hxx>
@@ -39,6 +39,6 @@ class LimitBox: public NumericBox
 
 } ///dbaui namespace
 
-#endif ///LIMIT_BOX_HXX
+#endif /// INCLUDED_DBACCESS_SOURCE_UI_INC_LIMITBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/QEnumTypes.hxx b/dbaccess/source/ui/inc/QEnumTypes.hxx
index 75f20245f762..e81302e2ca90 100644
--- a/dbaccess/source/ui/inc/QEnumTypes.hxx
+++ b/dbaccess/source/ui/inc/QEnumTypes.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 DBAUI_ENUMTYPES_HXX
-#define DBAUI_ENUMTYPES_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QENUMTYPES_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QENUMTYPES_HXX
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/inc/QueryDesignView.hxx b/dbaccess/source/ui/inc/QueryDesignView.hxx
index cea979f3428a..e006fe8dea7b 100644
--- a/dbaccess/source/ui/inc/QueryDesignView.hxx
+++ b/dbaccess/source/ui/inc/QueryDesignView.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 DBAUI_QUERYDESIGNVIEW_HXX
-#define DBAUI_QUERYDESIGNVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYDESIGNVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYDESIGNVIEW_HXX
 
 #include "queryview.hxx"
 #include <vcl/split.hxx>
@@ -156,6 +156,6 @@ namespace dbaui
         using OQueryView::SaveTabWinUIConfig;
     };
 }
-#endif // DBAUI_QUERYDESIGNVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYDESIGNVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx
index f6ba4523bbc3..766947b1459e 100644
--- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx
+++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef QUERYPROPERTIESDIALOG_HXX
-#define QUERYPROPERTIESDIALOG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYPROPERTIESDIALOG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYPROPERTIESDIALOG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
@@ -57,6 +57,6 @@ inline sal_Int64 QueryPropertiesDialog::getLimit() const
 
 } ///dbaui namespace
 
-#endif ///QUERYPROPERTIESDIALOG_HXX
+#endif /// INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYPROPERTIESDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/QueryTableView.hxx b/dbaccess/source/ui/inc/QueryTableView.hxx
index 3d6b48eb0634..dad7da620ab6 100644
--- a/dbaccess/source/ui/inc/QueryTableView.hxx
+++ b/dbaccess/source/ui/inc/QueryTableView.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 DBAUI_QUERYTABLEVIEW_HXX
-#define DBAUI_QUERYTABLEVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYTABLEVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYTABLEVIEW_HXX
 
 #include "JoinTableView.hxx"
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/dbaccess/source/ui/inc/QueryTextView.hxx b/dbaccess/source/ui/inc/QueryTextView.hxx
index 973c011199e0..38ed95537780 100644
--- a/dbaccess/source/ui/inc/QueryTextView.hxx
+++ b/dbaccess/source/ui/inc/QueryTextView.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 DBAUI_QUERYVIEW_TEXT_HXX
-#define DBAUI_QUERYVIEW_TEXT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYTEXTVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYTEXTVIEW_HXX
 
 #include "queryview.hxx"
 #include "querycontainerwindow.hxx"
@@ -58,7 +58,7 @@ namespace dbaui
         virtual void Resize();
     };
 }
-#endif // DBAUI_QUERYVIEW_TEXT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYTEXTVIEW_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/QueryViewSwitch.hxx b/dbaccess/source/ui/inc/QueryViewSwitch.hxx
index cc07843424c2..3f012b9bc527 100644
--- a/dbaccess/source/ui/inc/QueryViewSwitch.hxx
+++ b/dbaccess/source/ui/inc/QueryViewSwitch.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 DBAUI_QUERYVIEWSWITCH_HXX
-#define DBAUI_QUERYVIEWSWITCH_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYVIEWSWITCH_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYVIEWSWITCH_HXX
 
 #include "queryview.hxx"
 
@@ -92,6 +92,6 @@ namespace dbaui
         bool    impl_postViewSwitch( const bool i_bGraphicalDesign, const bool i_bSuccess );
     };
 }
-#endif // DBAUI_QUERYVIEWSWITCH_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYVIEWSWITCH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/RTableConnectionData.hxx b/dbaccess/source/ui/inc/RTableConnectionData.hxx
index 2e20e8bc0052..b7e261ffefe5 100644
--- a/dbaccess/source/ui/inc/RTableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/RTableConnectionData.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 DBAUI_RTABLECONNECTIONDATA_HXX
-#define DBAUI_RTABLECONNECTIONDATA_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RTABLECONNECTIONDATA_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_RTABLECONNECTIONDATA_HXX
 
 #include "TableConnectionData.hxx"
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -84,6 +84,6 @@ namespace dbaui
     };
 }
 
-#endif // DBAUI_RTABLECONNECTIONDATA_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RTABLECONNECTIONDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/RefFunctor.hxx b/dbaccess/source/ui/inc/RefFunctor.hxx
index fa9c69e6dd26..5ac012cde334 100644
--- a/dbaccess/source/ui/inc/RefFunctor.hxx
+++ b/dbaccess/source/ui/inc/RefFunctor.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_REFFUNCTOR_HXX
-#define DBAUI_REFFUNCTOR_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_REFFUNCTOR_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_REFFUNCTOR_HXX
 
 #include <rtl/ref.hxx>
 #ifndef INCLUDED_FUNCTIONAL
@@ -40,6 +40,6 @@ namespace dbaui
         }
     };
 } // namespace dbaui
-#endif //DBAUI_REFFUNCTOR_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_REFFUNCTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/RelControliFace.hxx b/dbaccess/source/ui/inc/RelControliFace.hxx
index 86354ea8b841..7a602556ba9b 100644
--- a/dbaccess/source/ui/inc/RelControliFace.hxx
+++ b/dbaccess/source/ui/inc/RelControliFace.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 DBAUI_RELCONTROLIFACE_HXX
-#define DBAUI_RELCONTROLIFACE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RELCONTROLIFACE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_RELCONTROLIFACE_HXX
 
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include "TableConnectionData.hxx"
@@ -47,6 +47,6 @@ namespace dbaui
         virtual void notifyConnectionChange() = 0;
     };
 }
-#endif // DBAUI_RELCONTROLIFACE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELCONTROLIFACE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx
index 72db44fdb8d4..3a585e42238d 100644
--- a/dbaccess/source/ui/inc/RelationControl.hxx
+++ b/dbaccess/source/ui/inc/RelationControl.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 DBAUI_RELATIONCONTROL_HXX
-#define DBAUI_RELATIONCONTROL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HXX
 
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
@@ -88,6 +88,6 @@ namespace dbaui
         IRelationControlInterface* getContainer() const { return m_pParentDialog; }
     };
 }
-#endif // DBAUI_RELATIONCONTROL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/RelationController.hxx b/dbaccess/source/ui/inc/RelationController.hxx
index b62620f3f1b5..43f98bef5767 100644
--- a/dbaccess/source/ui/inc/RelationController.hxx
+++ b/dbaccess/source/ui/inc/RelationController.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 DBAUI_RELATIONCONTROLLER_HXX
-#define DBAUI_RELATIONCONTROLLER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROLLER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROLLER_HXX
 
 #include "JoinController.hxx"
 #include "RelationDesignView.hxx"
@@ -79,6 +79,6 @@ namespace dbaui
         DECL_LINK( OnThreadFinished, void* );
     };
 }
-#endif // DBAUI_RELATIONCONTROLLER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/RelationDesignView.hxx b/dbaccess/source/ui/inc/RelationDesignView.hxx
index 7c6dc92102dd..a9ad6778aa70 100644
--- a/dbaccess/source/ui/inc/RelationDesignView.hxx
+++ b/dbaccess/source/ui/inc/RelationDesignView.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_RELATIONDESIGNVIEW_HXX
-#define DBAUI_RELATIONDESIGNVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDESIGNVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDESIGNVIEW_HXX
 
 #include "JoinDesignView.hxx"
 #include <vector>
@@ -45,7 +45,7 @@ namespace dbaui
         virtual void GetFocus();
     };
 }
-#endif // DBAUI_RELATIONDESIGNVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDESIGNVIEW_HXX
 
 
 
diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx
index 0aef7b3effc4..0c7decdb679d 100644
--- a/dbaccess/source/ui/inc/RelationDlg.hxx
+++ b/dbaccess/source/ui/inc/RelationDlg.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 DBAUI_RELATIONDIALOG_HXX
-#define DBAUI_RELATIONDIALOG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX
 
 #include <vcl/dialog.hxx>
 
@@ -96,6 +96,6 @@ namespace dbaui
         DECL_LINK( OKClickHdl, Button* );
     };
 }
-#endif // DBAUI_RELATIONDIALOG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/RelationTableView.hxx b/dbaccess/source/ui/inc/RelationTableView.hxx
index c783b46c78a1..7d2f58feb128 100644
--- a/dbaccess/source/ui/inc/RelationTableView.hxx
+++ b/dbaccess/source/ui/inc/RelationTableView.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 DBAUI_RELATION_TABLEVIEW_HXX
-#define DBAUI_RELATION_TABLEVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONTABLEVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_RELATIONTABLEVIEW_HXX
 
 #include "JoinTableView.hxx"
 #include <comphelper/containermultiplexer.hxx>
diff --git a/dbaccess/source/ui/inc/RtfReader.hxx b/dbaccess/source/ui/inc/RtfReader.hxx
index ac008a1063b7..33b6018ffc21 100644
--- a/dbaccess/source/ui/inc/RtfReader.hxx
+++ b/dbaccess/source/ui/inc/RtfReader.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 DBAUI_RTFREADER_HXX
-#define DBAUI_RTFREADER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_RTFREADER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_RTFREADER_HXX
 
 #include <vector>
 #include <svtools/parrtf.hxx>
diff --git a/dbaccess/source/ui/inc/ScrollHelper.hxx b/dbaccess/source/ui/inc/ScrollHelper.hxx
index 947e7fe96ff5..9a8dc1086cdf 100644
--- a/dbaccess/source/ui/inc/ScrollHelper.hxx
+++ b/dbaccess/source/ui/inc/ScrollHelper.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 DBAUI_SCROLLHELPER_HXX
-#define DBAUI_SCROLLHELPER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_SCROLLHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_SCROLLHELPER_HXX
 
 #include <tools/link.hxx>
 #include <tools/gen.hxx>
@@ -63,6 +63,6 @@ namespace dbaui
         void scroll(const Point& _rPoint, const Size& _rOutputSize);
     };
 }
-#endif // DBAUI_SCROLLHELPER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_SCROLLHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/SqlNameEdit.hxx b/dbaccess/source/ui/inc/SqlNameEdit.hxx
index 8cf281cc3cb5..635842b71521 100644
--- a/dbaccess/source/ui/inc/SqlNameEdit.hxx
+++ b/dbaccess/source/ui/inc/SqlNameEdit.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 DBAUI_SQLNAMEEDIT_HXX
-#define DBAUI_SQLNAMEEDIT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_SQLNAMEEDIT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_SQLNAMEEDIT_HXX
 
 #include <vcl/edit.hxx>
 #include <vcl/combobox.hxx>
@@ -94,6 +94,6 @@ namespace dbaui
     };
 
 }
-#endif // DBAUI_SQLNAMEEDIT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_SQLNAMEEDIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableConnection.hxx b/dbaccess/source/ui/inc/TableConnection.hxx
index 818edec6049b..8e899fc6d7ad 100644
--- a/dbaccess/source/ui/inc/TableConnection.hxx
+++ b/dbaccess/source/ui/inc/TableConnection.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 DBAUI_TABLECONNECTION_HXX
-#define DBAUI_TABLECONNECTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONNECTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONNECTION_HXX
 
 #include <vector>
 #include <tools/debug.hxx>
diff --git a/dbaccess/source/ui/inc/TableConnectionData.hxx b/dbaccess/source/ui/inc/TableConnectionData.hxx
index 877f659a3d36..3beb08590174 100644
--- a/dbaccess/source/ui/inc/TableConnectionData.hxx
+++ b/dbaccess/source/ui/inc/TableConnectionData.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 DBAUI_TABLECONNECTIONDATA_HXX
-#define DBAUI_TABLECONNECTIONDATA_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONNECTIONDATA_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONNECTIONDATA_HXX
 
 #include "ConnectionLineData.hxx"
 #include "TableWindowData.hxx"
diff --git a/dbaccess/source/ui/inc/TableController.hxx b/dbaccess/source/ui/inc/TableController.hxx
index 4933cfb2ceda..5f6445c8e4f2 100644
--- a/dbaccess/source/ui/inc/TableController.hxx
+++ b/dbaccess/source/ui/inc/TableController.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 DBUI_TABLECONTROLLER_HXX
-#define DBUI_TABLECONTROLLER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONTROLLER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONTROLLER_HXX
 
 #include "singledoccontroller.hxx"
 #include "moduledbu.hxx"
@@ -140,7 +140,7 @@ namespace dbaui
         virtual void impl_initialize();
     };
 }
-#endif // DBUI_TABLECONTROLLER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECONTROLLER_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx
index 31ca3de9c0f3..c89a7052ce18 100644
--- a/dbaccess/source/ui/inc/TableCopyHelper.hxx
+++ b/dbaccess/source/ui/inc/TableCopyHelper.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 DBUI_TABLECOPYHELPER_HXX
-#define DBUI_TABLECOPYHELPER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECOPYHELPER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECOPYHELPER_HXX
 
 #include "AppElementType.hxx"
 #include "commontypes.hxx"
@@ -182,6 +182,6 @@ namespace dbaui
 
     };
 }   // namespace dbaui
-#endif // DBUI_TABLECOPYHELPER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLECOPYHELPER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableDesignControl.hxx b/dbaccess/source/ui/inc/TableDesignControl.hxx
index b444fe53b499..979075eaab9a 100644
--- a/dbaccess/source/ui/inc/TableDesignControl.hxx
+++ b/dbaccess/source/ui/inc/TableDesignControl.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 DBAUI_TABLEDESIGNCONTROL_HXX
-#define DBAUI_TABLEDESIGNCONTROL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNCONTROL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNCONTROL_HXX
 
 #include <svtools/tabbar.hxx>
 #include <svtools/editbrowsebox.hxx>
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index 92744e76cbca..a54d2ddf7b6e 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.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 DBAUI_TABLEDESIGNHELPBAR_HXX
-#define DBAUI_TABLEDESIGNHELPBAR_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNHELPBAR_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNHELPBAR_HXX
 
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
diff --git a/dbaccess/source/ui/inc/TableDesignView.hxx b/dbaccess/source/ui/inc/TableDesignView.hxx
index f23d6b3156bb..bd98b672e7f8 100644
--- a/dbaccess/source/ui/inc/TableDesignView.hxx
+++ b/dbaccess/source/ui/inc/TableDesignView.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 DBAUI_TABLEDESIGNVIEW_HXX
-#define DBAUI_TABLEDESIGNVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNVIEW_HXX
 
 #include <dbaccess/dataview.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -104,6 +104,6 @@ namespace dbaui
         void reSync(); // resync window data with realdata
     };
 }
-#endif // DBAUI_TABLEDESIGNVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableFieldDescription.hxx b/dbaccess/source/ui/inc/TableFieldDescription.hxx
index 8b9e8e473a69..110d5c64accd 100644
--- a/dbaccess/source/ui/inc/TableFieldDescription.hxx
+++ b/dbaccess/source/ui/inc/TableFieldDescription.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 DBAUI_TABLEFIELDDESC_HXX
-#define DBAUI_TABLEFIELDDESC_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEFIELDDESCRIPTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEFIELDDESCRIPTION_HXX
 
 #include <vector>
 
diff --git a/dbaccess/source/ui/inc/TableGrantCtrl.hxx b/dbaccess/source/ui/inc/TableGrantCtrl.hxx
index da236d9570ca..13aea774be4d 100644
--- a/dbaccess/source/ui/inc/TableGrantCtrl.hxx
+++ b/dbaccess/source/ui/inc/TableGrantCtrl.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 DBAUI_TABLEGRANTCONTROL_HXX
-#define DBAUI_TABLEGRANTCONTROL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEGRANTCTRL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEGRANTCTRL_HXX
 
 #include <svtools/editbrowsebox.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@@ -102,6 +102,6 @@ private:
 
 }
 
-#endif // DBAUI_TABLEGRANTCONTROL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEGRANTCTRL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableRow.hxx b/dbaccess/source/ui/inc/TableRow.hxx
index 2afebaf303f0..b762b8d255dd 100644
--- a/dbaccess/source/ui/inc/TableRow.hxx
+++ b/dbaccess/source/ui/inc/TableRow.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 DBAUI_TABLEROW_HXX
-#define DBAUI_TABLEROW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROW_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <tools/stream.hxx>
@@ -74,6 +74,6 @@ namespace dbaui
         friend SvStream& operator>>( SvStream& rStr, OTableRow& _rRow );
     };
 }
-#endif // DBAUI_TABLEROW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx
index 1679a587d888..0f034744115c 100644
--- a/dbaccess/source/ui/inc/TableRowExchange.hxx
+++ b/dbaccess/source/ui/inc/TableRowExchange.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 DBAUI_TABLEROW_EXCHANGE_HXX
-#define DBAUI_TABLEROW_EXCHANGE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROWEXCHANGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROWEXCHANGE_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <cppuhelper/implbase2.hxx>
@@ -39,6 +39,6 @@ namespace dbaui
         virtual void        ObjectReleased();
     };
 }
-#endif // DBAUI_TABLEROW_EXCHANGE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEROWEXCHANGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx b/dbaccess/source/ui/inc/TableWindow.hxx
index d61d733637ca..d822cf9df9cd 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.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 DBAUI_TABLEWINDOW_HXX
-#define DBAUI_TABLEWINDOW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOW_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -192,6 +192,6 @@ namespace dbaui
         void clearListBox();
     };
 }
-#endif //DBAUI_TABLEWINDOW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableWindowAccess.hxx b/dbaccess/source/ui/inc/TableWindowAccess.hxx
index b3ace55ca53a..87d0b9682d3e 100644
--- a/dbaccess/source/ui/inc/TableWindowAccess.hxx
+++ b/dbaccess/source/ui/inc/TableWindowAccess.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 DBACCESS_TABLEWINDOWACCESS_HXX
-#define DBACCESS_TABLEWINDOWACCESS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWACCESS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWACCESS_HXX
 
 #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <cppuhelper/implbase2.hxx>
@@ -107,6 +107,6 @@ namespace dbaui
         }
     };
 }
-#endif // DBACCESS_TABLEWINDOWACCESS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableWindowData.hxx b/dbaccess/source/ui/inc/TableWindowData.hxx
index a971611387ad..ea9c00b98b8a 100644
--- a/dbaccess/source/ui/inc/TableWindowData.hxx
+++ b/dbaccess/source/ui/inc/TableWindowData.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 DBAUI_TABLEWINDOWDATA_HXX
-#define DBAUI_TABLEWINDOWDATA_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWDATA_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWDATA_HXX
 
 #include <tools/gen.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -92,6 +92,6 @@ namespace dbaui
 
     typedef ::std::vector< ::boost::shared_ptr<OTableWindowData> >      TTableWindowData;
 }
-#endif // DBAUI_TABLEWINDOWDATA_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index 16c415601baa..a4425e33d3cb 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.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 DBAUI_TABLEWINDOWLISTBOX_HXX
-#define DBAUI_TABLEWINDOWLISTBOX_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
 
 #include <svtools/treelistbox.hxx>
 #include "callbacks.hxx"
@@ -94,7 +94,7 @@ namespace dbaui
         using SvTreeListBox::ExecuteDrop;
     };
 }
-#endif // DBAUI_TABLEWINDOWLISTBOX_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
 
 
 
diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx b/dbaccess/source/ui/inc/TableWindowTitle.hxx
index 8d5fe9e2590a..f2bc0647570e 100644
--- a/dbaccess/source/ui/inc/TableWindowTitle.hxx
+++ b/dbaccess/source/ui/inc/TableWindowTitle.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 DBAUI_TABLEWINDOWTITLE_HXX
-#define DBAUI_TABLEWINDOWTITLE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWTITLE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWTITLE_HXX
 
 #include <vcl/fixed.hxx>
 
@@ -45,6 +45,6 @@ namespace dbaui
         virtual void StateChanged( StateChangedType nStateChange );
     };
 }
-#endif // DBAUI_TABLEWINDOWTITLE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWTITLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index 4c32b7d38426..14c4ec6348bc 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_TABLESSINGLEDLG_HXX_
-#define _DBAUI_TABLESSINGLEDLG_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLESSINGLEDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLESSINGLEDLG_HXX
 
 #include <sfx2/basedlgs.hxx>
 #include "IItemSetHelper.hxx"
@@ -72,6 +72,6 @@ class ODbDataSourceAdministrationHelper;
 
 }   // namespace dbaui
 
-#endif // _DBAUI_TABLESSINGLEDLG_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLESSINGLEDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TokenWriter.hxx b/dbaccess/source/ui/inc/TokenWriter.hxx
index 14f7b814b7e2..32d9538b2696 100644
--- a/dbaccess/source/ui/inc/TokenWriter.hxx
+++ b/dbaccess/source/ui/inc/TokenWriter.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 DBAUI_TOKENWRITER_HXX
-#define DBAUI_TOKENWRITER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TOKENWRITER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TOKENWRITER_HXX
 
 #include "DExport.hxx"
 #include "moduledbu.hxx"
@@ -225,6 +225,6 @@ namespace dbaui
     };
 
 }
-#endif // DBAUI_TOKENWRITER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TOKENWRITER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/TypeInfo.hxx b/dbaccess/source/ui/inc/TypeInfo.hxx
index f81ab55be1c9..0c88e41de504 100644
--- a/dbaccess/source/ui/inc/TypeInfo.hxx
+++ b/dbaccess/source/ui/inc/TypeInfo.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 DBAUI_TYPEINFO_HXX
-#define DBAUI_TYPEINFO_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TYPEINFO_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TYPEINFO_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -126,6 +126,6 @@ const sal_uInt16 TYPE_BIT       = 31;
                                sal_Bool& _brForceToType);
 }
 
-#endif // DBAUI_TYPEINFO_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TYPEINFO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx
index 479accd6bdad..bb048335c292 100644
--- a/dbaccess/source/ui/inc/UITools.hxx
+++ b/dbaccess/source/ui/inc/UITools.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 DBAUI_TOOLS_HXX
-#define DBAUI_TOOLS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_UITOOLS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_UITOOLS_HXX
 
 #include <connectivity/dbexception.hxx>
 #include <comphelper/stl_types.hxx>
@@ -413,6 +413,6 @@ namespace dbaui
     void AppendConfigToken( OUString& _rURL, sal_Bool _bQuestionMark );
 
 }
-#endif // DBAUI_TOOLS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_UITOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index da672145631e..e6eb3b592d31 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_USERADMINDLG_HXX
-#define DBAUI_USERADMINDLG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_USERADMINDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_USERADMINDLG_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include "dsntypes.hxx"
@@ -78,6 +78,6 @@ namespace dbaui
     };
 }   // namespace dbaui
 
-#endif // DBAUI_USERADMINDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_USERADMINDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/VertSplitView.hxx b/dbaccess/source/ui/inc/VertSplitView.hxx
index e537982e0f5c..4ad543bcf6b2 100644
--- a/dbaccess/source/ui/inc/VertSplitView.hxx
+++ b/dbaccess/source/ui/inc/VertSplitView.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 DBAUI_VERTSPLITVIEW_HXX
-#define DBAUI_VERTSPLITVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_VERTSPLITVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_VERTSPLITVIEW_HXX
 
 #include <vcl/window.hxx>
 
@@ -47,6 +47,6 @@ namespace dbaui
         virtual void Resize();
     };
 }
-#endif // DBAUI_VERTSPLITVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_VERTSPLITVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index 547e28bab107..010f4e9ca897 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.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 DBAUI_WIZARD_CPAGE_HXX
-#define DBAUI_WIZARD_CPAGE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_WCPAGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_WCPAGE_HXX
 
 #include "WTabPage.hxx"
 
@@ -90,6 +90,6 @@ namespace dbaui
         void setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName );
     };
 }
-#endif // DBAUI_WIZARD_CPAGE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WCPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx
index d9cec96724b6..6944c190a117 100644
--- a/dbaccess/source/ui/inc/WColumnSelect.hxx
+++ b/dbaccess/source/ui/inc/WColumnSelect.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 DBAUI_WIZ_COLUMNSELECT_HXX
-#define DBAUI_WIZ_COLUMNSELECT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_WCOLUMNSELECT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_WCOLUMNSELECT_HXX
 
 #include "WTabPage.hxx"
 #include "WCopyTable.hxx"
@@ -84,6 +84,6 @@ namespace dbaui
         virtual ~OWizColumnSelect();
     };
 }
-#endif // DBAUI_WIZ_COLUMNSELECT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WCOLUMNSELECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index 0c6024bc1ebc..8fd29912eccd 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_WIZ_COPYTABLEDIALOG_HXX
-#define DBAUI_WIZ_COPYTABLEDIALOG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_WCOPYTABLE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_WCOPYTABLE_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -411,6 +411,6 @@ namespace dbaui
     };
 }
 
-#endif // DBAUI_WIZ_COPYTABLEDIALOG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WCOPYTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx
index fc57159cf6f7..7fa9b77d2497 100644
--- a/dbaccess/source/ui/inc/WExtendPages.hxx
+++ b/dbaccess/source/ui/inc/WExtendPages.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 DBAUI_WIZ_EXTENDPAGES_HXX
-#define DBAUI_WIZ_EXTENDPAGES_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_WEXTENDPAGES_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_WEXTENDPAGES_HXX
 
 #include "WTypeSelect.hxx"
 
@@ -64,6 +64,6 @@ namespace dbaui
         OWizNormalExtend(Window* pParent);
     };
 }
-#endif // DBAUI_WIZ_EXTENDPAGES_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WEXTENDPAGES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index a715b8b3f6fa..d244843ce978 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.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 DBAUI_WIZ_NAMEMATCHING_HXX
-#define DBAUI_WIZ_NAMEMATCHING_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_WNAMEMATCH_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_WNAMEMATCH_HXX
 
 #include "WTabPage.hxx"
 #include "marktree.hxx"
@@ -80,6 +80,6 @@ namespace dbaui
 
     };
 }
-#endif // DBAUI_WIZ_NAMEMATCHING_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WNAMEMATCH_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx
index c1739dc84a44..2a634d45173b 100644
--- a/dbaccess/source/ui/inc/WTabPage.hxx
+++ b/dbaccess/source/ui/inc/WTabPage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_WIZ_TABBPAGE_HXX
-#define DBAUI_WIZ_TABBPAGE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_WTABPAGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_WTABPAGE_HXX
 
 #include <vcl/tabpage.hxx>
 
@@ -42,6 +42,6 @@ namespace dbaui
         sal_Bool            IsFirstTime() const { return m_bFirstTime; }
     };
 }
-#endif // DBAUI_WIZ_TABBPAGE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WTABPAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index 0af76d72dcd0..d4aaf989988b 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.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 DBAUI_WIZ_TYPESELECT_HXX
-#define DBAUI_WIZ_TYPESELECT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_WTYPESELECT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_WTYPESELECT_HXX
 
 #include "FieldDescControl.hxx"
 #include "TypeInfo.hxx"
@@ -120,6 +120,6 @@ namespace dbaui
 
     typedef OWizTypeSelect* (*TypeSelectionPageFactory)( Window*, SvStream& );
 }
-#endif // DBAUI_WIZ_TYPESELECT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WTYPESELECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index 0ebc17b23247..f4b8b703b5bf 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.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 DBAUI_QYDLGTAB_HXX
-#define DBAUI_QYDLGTAB_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_ADTABDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_ADTABDLG_HXX
 
 #include <vcl/dialog.hxx>
 
@@ -111,6 +111,6 @@ namespace dbaui
         void impl_switchTo( ObjectList _eList );
     };
 }
-#endif // DBAUI_QYDLGTAB_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_ADTABDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index 1504f1c9c630..a8b49759d818 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_ADVANCEDSETTINGSDLG_HXX
-#define DBACCESS_ADVANCEDSETTINGSDLG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_ADVANCEDSETTINGSDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_ADVANCEDSETTINGSDLG_HXX
 
 #include "IItemSetHelper.hxx"
 #include "moduledbu.hxx"
@@ -73,6 +73,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_ADVANCEDSETTINGSDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_ADVANCEDSETTINGSDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/asyncmodaldialog.hxx b/dbaccess/source/ui/inc/asyncmodaldialog.hxx
index 0906116796f9..4311ad0161ce 100644
--- a/dbaccess/source/ui/inc/asyncmodaldialog.hxx
+++ b/dbaccess/source/ui/inc/asyncmodaldialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_ASYNCMODALDIALOG_HXX
-#define DBACCESS_ASYNCMODALDIALOG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_ASYNCMODALDIALOG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_ASYNCMODALDIALOG_HXX
 
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 
@@ -45,6 +45,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_ASYNCMODALDIALOG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_ASYNCMODALDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/browserids.hxx b/dbaccess/source/ui/inc/browserids.hxx
index c3d929e1b1fb..65369ec7d514 100644
--- a/dbaccess/source/ui/inc/browserids.hxx
+++ b/dbaccess/source/ui/inc/browserids.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 DBACCESS_UI_BROWSER_ID_HXX
-#define DBACCESS_UI_BROWSER_ID_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_BROWSERIDS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_BROWSERIDS_HXX
 
 #include <svx/svxids.hrc>
 #include "dbaccess_slotid.hrc"
@@ -107,6 +107,6 @@
 #define ID_QUERY_ZOOM_OUT                   SID_ZOOM_OUT
 
 
-#endif // DBACCESS_UI_BROWSER_ID_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_BROWSERIDS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/brwctrlr.hxx b/dbaccess/source/ui/inc/brwctrlr.hxx
index 27c500fa1a53..dfbb41becad7 100644
--- a/dbaccess/source/ui/inc/brwctrlr.hxx
+++ b/dbaccess/source/ui/inc/brwctrlr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBA_BWRCTRLR_HXX
-#define _SBA_BWRCTRLR_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_BRWCTRLR_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_BRWCTRLR_HXX
 
 #include <dbaccess/genericcontroller.hxx>
 #include "moduledbu.hxx"
@@ -346,6 +346,6 @@ namespace dbaui
     };
 }
 
-#endif // _SBA_BWRCTRLR_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_BRWCTRLR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/brwview.hxx b/dbaccess/source/ui/inc/brwview.hxx
index 7bca0a3224ee..b0f54cb41942 100644
--- a/dbaccess/source/ui/inc/brwview.hxx
+++ b/dbaccess/source/ui/inc/brwview.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBX_BRWVIEW_HXX
-#define _SBX_BRWVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_BRWVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_BRWVIEW_HXX
 
 #include <vcl/window.hxx>
 
@@ -100,6 +100,6 @@ namespace dbaui
         ~BrowserViewStatusDisplay( );
     };
 }
-#endif // _SBX_BRWVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_BRWVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx
index ff3f99cffa89..a49e3136ba6e 100644
--- a/dbaccess/source/ui/inc/callbacks.hxx
+++ b/dbaccess/source/ui/inc/callbacks.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBACCESS_UI_CALLBACKS_HXX_
-#define _DBACCESS_UI_CALLBACKS_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_CALLBACKS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_CALLBACKS_HXX
 
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
@@ -112,6 +112,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBACCESS_UI_CALLBACKS_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CALLBACKS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx
index 0f2efdec9479..1a22ee6c6162 100644
--- a/dbaccess/source/ui/inc/charsetlistbox.hxx
+++ b/dbaccess/source/ui/inc/charsetlistbox.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CHARSETLISTBOX_HXX
-#define CHARSETLISTBOX_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_CHARSETLISTBOX_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_CHARSETLISTBOX_HXX
 
 #include "charsets.hxx"
 
@@ -45,6 +45,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // CHARSETLISTBOX_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CHARSETLISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/charsets.hxx b/dbaccess/source/ui/inc/charsets.hxx
index 34edadc05548..f39841a6d562 100644
--- a/dbaccess/source/ui/inc/charsets.hxx
+++ b/dbaccess/source/ui/inc/charsets.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_CHARSETS_HXX_
-#define _DBAUI_CHARSETS_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_CHARSETS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_CHARSETS_HXX
 
 #include <connectivity/dbcharset.hxx>
 #include <rtl/ustring.hxx>
@@ -119,6 +119,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_CHARSETS_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CHARSETS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/commontypes.hxx b/dbaccess/source/ui/inc/commontypes.hxx
index f89f56972e97..0292f33f1aab 100644
--- a/dbaccess/source/ui/inc/commontypes.hxx
+++ b/dbaccess/source/ui/inc/commontypes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_COMMON_TYPES_HXX_
-#define _DBAUI_COMMON_TYPES_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_COMMONTYPES_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_COMMONTYPES_HXX
 
 #include <comphelper/stl_types.hxx>
 #include <unotools/sharedunocomponent.hxx>
@@ -40,6 +40,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_COMMON_TYPES_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_COMMONTYPES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index 14abf5862256..b3bb08775846 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_CURLEDIT_HXX_
-#define _DBAUI_CURLEDIT_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_CURLEDIT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_CURLEDIT_HXX
 
 #include <vcl/edit.hxx>
 #include <vcl/fixed.hxx>
@@ -68,6 +68,6 @@ public:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_CURLEDIT_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_CURLEDIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/databaseobjectview.hxx b/dbaccess/source/ui/inc/databaseobjectview.hxx
index fa92f260e081..ffddd7ad2ba0 100644
--- a/dbaccess/source/ui/inc/databaseobjectview.hxx
+++ b/dbaccess/source/ui/inc/databaseobjectview.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_DATABASE_OBJECT_VIEW_HXX
-#define DBACCESS_DATABASE_OBJECT_VIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DATABASEOBJECTVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DATABASEOBJECTVIEW_HXX
 
 #include <rtl/ustring.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -237,6 +237,6 @@ namespace dbaui
     };
 }   // namespace dbaui
 
-#endif // DBACCESS_DATABASE_OBJECT_VIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DATABASEOBJECTVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/datasourceconnector.hxx b/dbaccess/source/ui/inc/datasourceconnector.hxx
index fd7d86661281..084d9594e633 100644
--- a/dbaccess/source/ui/inc/datasourceconnector.hxx
+++ b/dbaccess/source/ui/inc/datasourceconnector.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_DATASOURCECONNECTOR_HXX_
-#define _DBAUI_DATASOURCECONNECTOR_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DATASOURCECONNECTOR_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DATASOURCECONNECTOR_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
@@ -76,6 +76,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_DATASOURCECONNECTOR_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DATASOURCECONNECTOR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 9e7a591eb248..58ac05d2feff 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_DBADMIN_HXX_
-#define _DBAUI_DBADMIN_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBADMIN_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBADMIN_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include "dsntypes.hxx"
@@ -125,6 +125,6 @@ private:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_DBADMIN_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DBADMIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx
index 92a2beb957c2..f1942130be10 100644
--- a/dbaccess/source/ui/inc/dbexchange.hxx
+++ b/dbaccess/source/ui/inc/dbexchange.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 DBAUI_DBEXCHANGE_HXX
-#define DBAUI_DBEXCHANGE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBEXCHANGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBEXCHANGE_HXX
 
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/util/XNumberFormatter.hpp>
@@ -79,7 +79,7 @@ namespace dbaui
     };
 }
 
-#endif //  DBAUI_DBEXCHANGE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DBEXCHANGE_HXX
 
 
 
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 2b03cce4618c..a6cd82afee5c 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.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 DBAUI_DBTREELISTBOX_HXX
-#define DBAUI_DBTREELISTBOX_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBTREELISTBOX_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBTREELISTBOX_HXX
 
 #include "ScrollHelper.hxx"
 #include "moduledbu.hxx"
@@ -148,6 +148,6 @@ namespace dbaui
     };
 }
 
-#endif // DBAUI_DBTREELISTBOX_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DBTREELISTBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbwiz.hxx b/dbaccess/source/ui/inc/dbwiz.hxx
index 2949a0f810ae..b67895307fa4 100644
--- a/dbaccess/source/ui/inc/dbwiz.hxx
+++ b/dbaccess/source/ui/inc/dbwiz.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_DBWIZ_HXX
-#define DBAUI_DBWIZ_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZ_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZ_HXX
 
 #include <sfx2/tabdlg.hxx>
 #include "dsntypes.hxx"
@@ -123,6 +123,6 @@ private:
 
 }   // namespace dbaui
 
-#endif // DBAUI_DBWIZ_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DBWIZ_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index 82157a97e57d..594690f0f7f1 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX
-#define DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX
 
 #include "objectnamecheck.hxx"
 
@@ -122,6 +122,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DEFAULTOBJECTNAMECHECK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx
index abbe61255316..c252f3764d87 100644
--- a/dbaccess/source/ui/inc/directsql.hxx
+++ b/dbaccess/source/ui/inc/directsql.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBACCESS_UI_DIRECTSQL_HXX_
-#define _DBACCESS_UI_DIRECTSQL_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DIRECTSQL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DIRECTSQL_HXX
 
 #include <vcl/dialog.hxx>
 #include <svtools/editsyntaxhighlighter.hxx>
@@ -122,6 +122,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBACCESS_UI_DIRECTSQL_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DIRECTSQL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx
index ad3e6b2ac547..df3a120cc894 100644
--- a/dbaccess/source/ui/inc/dlgattr.hxx
+++ b/dbaccess/source/ui/inc/dlgattr.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 DBAUI_SBATTRDLG_HXX
-#define DBAUI_SBATTRDLG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DLGATTR_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DLGATTR_HXX
 
 #include "dlgattr.hrc"
 
@@ -43,6 +43,6 @@ namespace dbaui
     };
 }   // namespace dbaui
 
-#endif//DBAUI_SBATTRDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DLGATTR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx
index f0202a730612..6707591ca3f7 100644
--- a/dbaccess/source/ui/inc/dlgsave.hxx
+++ b/dbaccess/source/ui/inc/dlgsave.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_DLGSAVE_HXX
-#define DBAUI_DLGSAVE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSAVE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSAVE_HXX
 
 #include "apitools.hxx"
 #include <vcl/dialog.hxx>
@@ -78,7 +78,7 @@ namespace dbaui
     };
 }
 
-#endif // DBAUI_DLGSAVE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSAVE_HXX
 
 
 
diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx
index 73f91b09a24c..ddfcbaadacd5 100644
--- a/dbaccess/source/ui/inc/dlgsize.hxx
+++ b/dbaccess/source/ui/inc/dlgsize.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 _DBAUI_DLGSIZE_HXX
-#define _DBAUI_DLGSIZE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSIZE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSIZE_HXX
 
 #include <vcl/dialog.hxx>
 
@@ -54,6 +54,6 @@ namespace dbaui
     };
 }   // namespace dbaui
 
-#endif // _DBAUI_DLGSIZE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DLGSIZE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dsitems.hxx b/dbaccess/source/ui/inc/dsitems.hxx
index 1de1555e531c..8a6b19e633c3 100644
--- a/dbaccess/source/ui/inc/dsitems.hxx
+++ b/dbaccess/source/ui/inc/dsitems.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_DATASOURCEITEMS_HXX_
-#define _DBAUI_DATASOURCEITEMS_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DSITEMS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DSITEMS_HXX
 
 typedef sal_Int32   ItemID;
 
@@ -92,6 +92,6 @@ typedef sal_Int32   ItemID;
 #define DSID_FIRST_ITEM_ID  DSID_NAME
 #define DSID_LAST_ITEM_ID   DSID_RESPECTRESULTSETTYPE
 
-#endif // _DBAUI_DATASOURCEITEMS_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DSITEMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx b/dbaccess/source/ui/inc/dsmeta.hxx
index 249dcd5cccf2..f9027da2a1ae 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_DSMETA_HXX
-#define DBACCESS_DSMETA_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_DSMETA_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_DSMETA_HXX
 
 #include "dsntypes.hxx"
 #include "dsitems.hxx"
@@ -118,6 +118,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_DSMETA_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_DSMETA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/exsrcbrw.hxx b/dbaccess/source/ui/inc/exsrcbrw.hxx
index 817e077fd982..b637cba2d344 100644
--- a/dbaccess/source/ui/inc/exsrcbrw.hxx
+++ b/dbaccess/source/ui/inc/exsrcbrw.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBA_EXTCTRLR_HXX
-#define _SBA_EXTCTRLR_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_EXSRCBRW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_EXSRCBRW_HXX
 
 #include "brwctrlr.hxx"
 
@@ -99,6 +99,6 @@ namespace dbaui
     };
 }
 
-#endif // _SBA_EXTCTRLR_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_EXSRCBRW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/formadapter.hxx b/dbaccess/source/ui/inc/formadapter.hxx
index 88f694e07c76..1622b465ccfa 100644
--- a/dbaccess/source/ui/inc/formadapter.hxx
+++ b/dbaccess/source/ui/inc/formadapter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBA_FORMADAPTER_HXX
-#define _SBA_FORMADAPTER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_FORMADAPTER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_FORMADAPTER_HXX
 
 #include "sbamultiplex.hxx"
 
@@ -433,6 +433,6 @@ namespace dbaui
         void StartListening();
     };
 }
-#endif // _SBA_FORMADAPTER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_FORMADAPTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/imageprovider.hxx b/dbaccess/source/ui/inc/imageprovider.hxx
index 294ec5b2f9cf..089385903d3f 100644
--- a/dbaccess/source/ui/inc/imageprovider.hxx
+++ b/dbaccess/source/ui/inc/imageprovider.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_IMAGEPROVIDER_HXX
-#define DBACCESS_IMAGEPROVIDER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_IMAGEPROVIDER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_IMAGEPROVIDER_HXX
 
 #include <vcl/image.hxx>
 
@@ -136,6 +136,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_IMAGEPROVIDER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_IMAGEPROVIDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/indexcollection.hxx b/dbaccess/source/ui/inc/indexcollection.hxx
index 3bc8024475b8..8a96641261d4 100644
--- a/dbaccess/source/ui/inc/indexcollection.hxx
+++ b/dbaccess/source/ui/inc/indexcollection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_INDEXCOLLECTION_HXX_
-#define _DBAUI_INDEXCOLLECTION_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXCOLLECTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXCOLLECTION_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/SQLException.hpp>
@@ -98,6 +98,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_INDEXCOLLECTION_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXCOLLECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index fd845760c591..7c8f8fde197b 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_INDEXDIALOG_HXX_
-#define _DBAUI_INDEXDIALOG_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXDIALOG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXDIALOG_HXX
 
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
@@ -163,6 +163,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_INDEXDIALOG_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/indexes.hxx b/dbaccess/source/ui/inc/indexes.hxx
index 4dde86de41a3..398653bf8adb 100644
--- a/dbaccess/source/ui/inc/indexes.hxx
+++ b/dbaccess/source/ui/inc/indexes.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_INDEXES_HXX_
-#define _DBAUI_INDEXES_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXES_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXES_HXX
 
 #include <comphelper/stl_types.hxx>
 
@@ -80,6 +80,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_INDEXES_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/indexfieldscontrol.hxx b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
index 685b7a73fe25..2d5fb7101f5a 100644
--- a/dbaccess/source/ui/inc/indexfieldscontrol.hxx
+++ b/dbaccess/source/ui/inc/indexfieldscontrol.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_INDEXFIELDSCONTROL_HXX_
-#define _DBAUI_INDEXFIELDSCONTROL_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX
 
 #include "moduledbu.hxx"
 #include <svtools/editbrowsebox.hxx>
@@ -92,6 +92,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_INDEXFIELDSCONTROL_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_INDEXFIELDSCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/linkeddocuments.hxx b/dbaccess/source/ui/inc/linkeddocuments.hxx
index fa94425987ed..f7594ba64a44 100644
--- a/dbaccess/source/ui/inc/linkeddocuments.hxx
+++ b/dbaccess/source/ui/inc/linkeddocuments.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_LINKEDDOCUMENTS_HXX_
-#define _DBAUI_LINKEDDOCUMENTS_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_LINKEDDOCUMENTS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_LINKEDDOCUMENTS_HXX
 
 #include "AppElementType.hxx"
 
@@ -118,6 +118,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_LINKEDDOCUMENTS_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_LINKEDDOCUMENTS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/listviewitems.hxx b/dbaccess/source/ui/inc/listviewitems.hxx
index 470695926a62..4675fc298477 100644
--- a/dbaccess/source/ui/inc/listviewitems.hxx
+++ b/dbaccess/source/ui/inc/listviewitems.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_LISTVIEWITEMS_HXX_
-#define _DBAUI_LISTVIEWITEMS_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_LISTVIEWITEMS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_LISTVIEWITEMS_HXX
 
 #include <svtools/svlbitm.hxx>
 
@@ -51,6 +51,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_LISTVIEWITEMS_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_LISTVIEWITEMS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/localresaccess.hxx b/dbaccess/source/ui/inc/localresaccess.hxx
index 5d5e10b51fe0..0a0d9b08d753 100644
--- a/dbaccess/source/ui/inc/localresaccess.hxx
+++ b/dbaccess/source/ui/inc/localresaccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_LOCALRESACCESS_HXX_
-#define _DBAUI_LOCALRESACCESS_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_LOCALRESACCESS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_LOCALRESACCESS_HXX
 
 #include <svtools/localresaccess.hxx>
 #include "moduledbu.hxx"
@@ -42,6 +42,6 @@ public:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_LOCALRESACCESS_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_LOCALRESACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx
index 1c6f19811f0d..fe7ea60f6a58 100644
--- a/dbaccess/source/ui/inc/marktree.hxx
+++ b/dbaccess/source/ui/inc/marktree.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_MARKTREE_HXX_
-#define _DBAUI_MARKTREE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_MARKTREE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_MARKTREE_HXX
 
 #include "dbtreelistbox.hxx"
 
@@ -62,6 +62,6 @@ private:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_MARKTREE_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_MARKTREE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/moduledbu.hxx b/dbaccess/source/ui/inc/moduledbu.hxx
index 49e09e73511a..b90efca15a3b 100644
--- a/dbaccess/source/ui/inc/moduledbu.hxx
+++ b/dbaccess/source/ui/inc/moduledbu.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_MODULE_DBU_HXX_
-#define _DBAUI_MODULE_DBU_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX
 
 #include <osl/mutex.hxx>
 #include <tools/resid.hxx>
@@ -81,6 +81,6 @@ public:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_MODULE_DBU_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_MODULEDBU_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/objectnamecheck.hxx b/dbaccess/source/ui/inc/objectnamecheck.hxx
index 858d26de40b2..602b822c476a 100644
--- a/dbaccess/source/ui/inc/objectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/objectnamecheck.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX
-#define DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX
 
 #include <rtl/ustring.hxx>
 
@@ -55,6 +55,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_OBJECTNAMECHECK_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx
index 9ebba29e4855..657f6e62b1cc 100644
--- a/dbaccess/source/ui/inc/opendoccontrols.hxx
+++ b/dbaccess/source/ui/inc/opendoccontrols.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX
-#define DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/lstbox.hxx>
@@ -73,6 +73,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_OPENDOCCONTROLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx
index b19b84b17f92..c5de4a17f128 100644
--- a/dbaccess/source/ui/inc/paramdialog.hxx
+++ b/dbaccess/source/ui/inc/paramdialog.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_PARAMDIALOG_HXX_
-#define _DBAUI_PARAMDIALOG_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_PARAMDIALOG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_PARAMDIALOG_HXX
 
 #include "commontypes.hxx"
 
@@ -105,6 +105,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_PARAMDIALOG_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_PARAMDIALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/propertysetitem.hxx b/dbaccess/source/ui/inc/propertysetitem.hxx
index f10d46f1901a..47bd22169e76 100644
--- a/dbaccess/source/ui/inc/propertysetitem.hxx
+++ b/dbaccess/source/ui/inc/propertysetitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_PROPERTYSETITEM_HXX_
-#define _DBAUI_PROPERTYSETITEM_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSETITEM_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSETITEM_HXX
 
 #include <svl/poolitem.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -49,6 +49,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_PROPERTYSETITEM_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSETITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/propertystorage.hxx b/dbaccess/source/ui/inc/propertystorage.hxx
index 3bf8350961ff..f9b33e8af7aa 100644
--- a/dbaccess/source/ui/inc/propertystorage.hxx
+++ b/dbaccess/source/ui/inc/propertystorage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef PROPERTYSTORAGE_HXX
-#define PROPERTYSTORAGE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSTORAGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSTORAGE_HXX
 
 #include <com/sun/star/uno/Any.hxx>
 
@@ -73,6 +73,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // PROPERTYSTORAGE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_PROPERTYSTORAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/querycontainerwindow.hxx b/dbaccess/source/ui/inc/querycontainerwindow.hxx
index d1126b4d3309..45f5feeed90c 100644
--- a/dbaccess/source/ui/inc/querycontainerwindow.hxx
+++ b/dbaccess/source/ui/inc/querycontainerwindow.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_QUERYCONTAINERWINDOW_HXX
-#define DBAUI_QUERYCONTAINERWINDOW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYCONTAINERWINDOW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYCONTAINERWINDOW_HXX
 
 #include <vcl/window.hxx>
 #include <vcl/split.hxx>
@@ -103,6 +103,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // DBAUI_QUERYCONTAINERWINDOW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYCONTAINERWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index df22cc2b84e8..5b90d403faf5 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_QUERYCONTROLLER_HXX
-#define DBAUI_QUERYCONTROLLER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYCONTROLLER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYCONTROLLER_HXX
 
 #include "JoinController.hxx"
 #include "JoinTableView.hxx"
@@ -242,6 +242,6 @@ namespace dbaui
         using OQueryController_PBase::getFastPropertyValue;
     };
 }
-#endif // DBAUI_QUERYCONTROLLER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx
index 48d07e98cb69..ab9a49d9f7ea 100644
--- a/dbaccess/source/ui/inc/queryfilter.hxx
+++ b/dbaccess/source/ui/inc/queryfilter.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_QUERYFILTER_HXX
-#define DBAUI_QUERYFILTER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYFILTER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYFILTER_HXX
 
 #include <vcl/dialog.hxx>
 
@@ -128,6 +128,6 @@ namespace dbaui
 
 }
 
-#endif // DBAUI_QUERYFILTER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYFILTER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx
index 98a20f084403..8a99708bcfdf 100644
--- a/dbaccess/source/ui/inc/queryorder.hxx
+++ b/dbaccess/source/ui/inc/queryorder.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 DBAUI_QUERYORDER_HXX
-#define DBAUI_QUERYORDER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYORDER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYORDER_HXX
 
 #include <vcl/dialog.hxx>
 
@@ -103,6 +103,6 @@ namespace dbaui
         void            impl_initializeOrderList_nothrow();
     };
 }
-#endif // DBAUI_QUERYORDER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYORDER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/queryview.hxx b/dbaccess/source/ui/inc/queryview.hxx
index 0cdaf25b04f2..c4b261f0318b 100644
--- a/dbaccess/source/ui/inc/queryview.hxx
+++ b/dbaccess/source/ui/inc/queryview.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 DBAUI_QUERYVIEW_HXX
-#define DBAUI_QUERYVIEW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYVIEW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYVIEW_HXX
 
 #include "JoinDesignView.hxx"
 
@@ -46,6 +46,6 @@ namespace dbaui
         virtual OUString getStatement() = 0;
     };
 }
-#endif // DBAUI_QUERYVIEW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_QUERYVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index da1898f02faa..2d482a3e13f5 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBA_GRID_HXX
-#define _SBA_GRID_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_SBAGRID_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_SBAGRID_HXX
 
 #include <svx/fmgridcl.hxx>
 
@@ -323,6 +323,6 @@ namespace dbaui
         using FmGridControl::MouseButtonDown;
     };
 }
-#endif // _SBA_GRID_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_SBAGRID_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/sbamultiplex.hxx b/dbaccess/source/ui/inc/sbamultiplex.hxx
index 8e9c4fbf295f..e4ee39090fe7 100644
--- a/dbaccess/source/ui/inc/sbamultiplex.hxx
+++ b/dbaccess/source/ui/inc/sbamultiplex.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBA_MULTIPLEX_HXX
-#define _SBA_MULTIPLEX_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_SBAMULTIPLEX_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_SBAMULTIPLEX_HXX
 
 #include <com/sun/star/beans/XVetoableChangeListener.hpp>
 #include <com/sun/star/form/XUpdateListener.hpp>
diff --git a/dbaccess/source/ui/inc/singledoccontroller.hxx b/dbaccess/source/ui/inc/singledoccontroller.hxx
index eaa51b7b4c44..6e106a2c7805 100644
--- a/dbaccess/source/ui/inc/singledoccontroller.hxx
+++ b/dbaccess/source/ui/inc/singledoccontroller.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_SINGLEDOCCONTROLLER_HXX
-#define DBAUI_SINGLEDOCCONTROLLER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_SINGLEDOCCONTROLLER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_SINGLEDOCCONTROLLER_HXX
 
 #include <dbaccess/dbsubcomponentcontroller.hxx>
 
@@ -75,6 +75,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // DBAUI_SINGLEDOCCONTROLLER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_SINGLEDOCCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx
index 3e0e39330c1f..7e8be24c32a4 100644
--- a/dbaccess/source/ui/inc/sqledit.hxx
+++ b/dbaccess/source/ui/inc/sqledit.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 DBAUI_SQLEDIT_HXX
-#define DBAUI_SQLEDIT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_SQLEDIT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_SQLEDIT_HXX
 
 #include "sal/config.h"
 
@@ -88,7 +88,7 @@ namespace dbaui
     };
 }
 
-#endif // DBAUI_SQLEDIT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_SQLEDIT_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index a1926e9250f5..02e45f73a8d7 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_SQLMESSAGE_HXX_
-#define _DBAUI_SQLMESSAGE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_SQLMESSAGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_SQLMESSAGE_HXX
 
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
@@ -125,6 +125,6 @@ public:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_SQLMESSAGE_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_SQLMESSAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/stringlistitem.hxx b/dbaccess/source/ui/inc/stringlistitem.hxx
index e1e34e76dd26..f8edbc8ae67a 100644
--- a/dbaccess/source/ui/inc/stringlistitem.hxx
+++ b/dbaccess/source/ui/inc/stringlistitem.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_STRINGLISTITEM_HXX_
-#define _DBAUI_STRINGLISTITEM_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_STRINGLISTITEM_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_STRINGLISTITEM_HXX
 
 #include <svl/poolitem.hxx>
 
@@ -48,6 +48,6 @@ public:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_STRINGLISTITEM_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_STRINGLISTITEM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/tabletree.hxx b/dbaccess/source/ui/inc/tabletree.hxx
index d57344c0ae1f..10f295992987 100644
--- a/dbaccess/source/ui/inc/tabletree.hxx
+++ b/dbaccess/source/ui/inc/tabletree.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_TABLETREE_HXX_
-#define _DBAUI_TABLETREE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLETREE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLETREE_HXX
 
 #include "marktree.hxx"
 
@@ -178,6 +178,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_TABLETREE_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TABLETREE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx
index ff9b6243fb12..c9d84764b681 100644
--- a/dbaccess/source/ui/inc/textconnectionsettings.hxx
+++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef TEXTCONNECTIONSETTINGS_HXX
-#define TEXTCONNECTIONSETTINGS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TEXTCONNECTIONSETTINGS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TEXTCONNECTIONSETTINGS_HXX
 
 #include "propertystorage.hxx"
 
@@ -59,6 +59,6 @@ namespace dbaui
 
 } // namespace dbaui
 
-#endif // TEXTCONNECTIONSETTINGS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TEXTCONNECTIONSETTINGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/toolboxcontroller.hxx b/dbaccess/source/ui/inc/toolboxcontroller.hxx
index e28715dd2a9b..4e6882d28c97 100644
--- a/dbaccess/source/ui/inc/toolboxcontroller.hxx
+++ b/dbaccess/source/ui/inc/toolboxcontroller.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 DBACCESS_TOOLBOXCONTROLLER_HXX
-#define DBACCESS_TOOLBOXCONTROLLER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
 
 #include <svtools/toolboxcontroller.hxx>
 #include <comphelper/stl_types.hxx>
@@ -59,6 +59,6 @@ namespace dbaui
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > SAL_CALL createPopupWindow() throw (::com::sun::star::uno::RuntimeException);
     };
 } // dbaui
-#endif //DBACCESS_TOOLBOXCONTROLLER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_TOOLBOXCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/undosqledit.hxx b/dbaccess/source/ui/inc/undosqledit.hxx
index 0878a7d378b2..2cb768c497a2 100644
--- a/dbaccess/source/ui/inc/undosqledit.hxx
+++ b/dbaccess/source/ui/inc/undosqledit.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 DBAUI_UNDOSQLEDIT_HXX
-#define DBAUI_UNDOSQLEDIT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_UNDOSQLEDIT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_UNDOSQLEDIT_HXX
 
 #include "GeneralUndo.hxx"
 #include "dbu_control.hrc"
@@ -42,6 +42,6 @@ namespace dbaui
         void SetOriginalText(const OUString& strText) { m_strNextText =strText; }
     };
 }
-#endif // DBAUI_UNDOSQLEDIT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_UNDOSQLEDIT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 44487a5db7d4..6751cbeafab1 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SBA_UNODATBR_HXX_
-#define _SBA_UNODATBR_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_UNODATBR_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_UNODATBR_HXX
 
 #include "brwctrlr.hxx"
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -477,6 +477,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _SBA_UNODATBR_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_UNODATBR_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx
index 0a88aa53bfaa..93998ddb7260 100644
--- a/dbaccess/source/ui/inc/unosqlmessage.hxx
+++ b/dbaccess/source/ui/inc/unosqlmessage.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_UNOSQLMESSAGE_HXX_
-#define _DBAUI_UNOSQLMESSAGE_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_UNOSQLMESSAGE_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_INC_UNOSQLMESSAGE_HXX
 
 #include <svtools/genericunodialog.hxx>
 #include "moduledbu.hxx"
@@ -74,6 +74,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_UNOSQLMESSAGE_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_UNOSQLMESSAGE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx b/dbaccess/source/ui/misc/UpdateHelperImpl.hxx
index 6e4dcb34d160..30747964f870 100644
--- a/dbaccess/source/ui/misc/UpdateHelperImpl.hxx
+++ b/dbaccess/source/ui/misc/UpdateHelperImpl.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 DBAUI_UPDATEHELPERIMPL_HXX
-#define DBAUI_UPDATEHELPERIMPL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_MISC_UPDATEHELPERIMPL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_MISC_UPDATEHELPERIMPL_HXX
 
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
@@ -128,6 +128,6 @@ namespace dbaui
     };
 }
 
-#endif // DBAUI_UPDATEHELPERIMPL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_MISC_UPDATEHELPERIMPL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx
index 352f309486b2..7c411bf74899 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.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 DBAUI_QUERYTABLECONNECTION_HXX
-#define DBAUI_QUERYTABLECONNECTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTION_HXX
 
 #include "TableConnection.hxx"
 #include "QTableConnectionData.hxx"
@@ -44,6 +44,6 @@ namespace dbaui
 
     };
 }
-#endif // DBAUI_QUERYTABLECONNECTION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index 94be02c2c50c..2ccf4f43aa76 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.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 DBAUI_QTABLECONNECTIONDATA_HXX
-#define DBAUI_QTABLECONNECTIONDATA_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTIONDATA_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTIONDATA_HXX
 
 #include "TableConnectionData.hxx"
 #include "TableFieldDescription.hxx"
@@ -77,6 +77,6 @@ namespace dbaui
     };
 
 }
-#endif // DBAUI_QTABLECONNECTIONDATA_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTIONDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index d97069f08701..ad5595ceefb9 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.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 DBAUI_QUERY_TABLEWINDOW_HXX
-#define DBAUI_QUERY_TABLEWINDOW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOW_HXX
 
 #include "TableWindow.hxx"
 #include "QTableWindowData.hxx"
@@ -78,6 +78,6 @@ namespace dbaui
                                     bool _bPrimaryKey);
     };
 }
-#endif // DBAUI_QUERY_TABLEWINDOW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx
index 2386be48b500..83875fcd3ed7 100644
--- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindowData.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 DBAUI_QUERY_TABLEWINDOWDATA_HXX
-#define DBAUI_QUERY_TABLEWINDOWDATA_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOWDATA_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOWDATA_HXX
 
 #include "TableWindowData.hxx"
 #include <vector>
@@ -37,7 +37,7 @@ namespace dbaui
         void SetAliasName(const OUString& rNewAlias) { SetWinName(rNewAlias); }
     };
 }
-#endif // DBAUI_QUERY_TABLEWINDOWDATA_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOWDATA_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx
index 9977e7ff2d77..d1ca8dea6d8f 100644
--- a/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.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 DBAUI_QUERYADDTABCONNUNDOACTION_HXX
-#define DBAUI_QUERYADDTABCONNUNDOACTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYADDTABCONNUNDOACTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYADDTABCONNUNDOACTION_HXX
 
 #include "QueryTabConnUndoAction.hxx"
 
@@ -46,6 +46,6 @@ namespace dbaui
         virtual void Redo();
     };
 }
-#endif // DBAUI_QUERYADDTABCONNUNDOACTION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYADDTABCONNUNDOACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index 61c2f42b88cf..884d81a0c9e4 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.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 DBAUI_QUERYDESIGNFIELDUNDOACT_HXX
-#define DBAUI_QUERYDESIGNFIELDUNDOACT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNFIELDUNDOACT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNFIELDUNDOACT_HXX
 
 #include "GeneralUndo.hxx"
 #include "dbu_qry.hrc"
@@ -137,6 +137,6 @@ namespace dbaui
         OTabFieldMovedUndoAct(OSelectionBrowseBox* pSelBrwBox) : OTabFieldUndoAct(pSelBrwBox, STR_QUERY_UNDO_TABFIELDMOVED) { }
     };
 }
-#endif // DBAUI_QUERYDESIGNFIELDUNDOACT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNFIELDUNDOACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
index 911c7c2cee09..d74ce27e9fc7 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.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 DBAUI_QUERYDESIGNUNDOACTION_HXX
-#define DBAUI_QUERYDESIGNUNDOACTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNUNDOACTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNUNDOACTION_HXX
 
 #include "GeneralUndo.hxx"
 
@@ -34,6 +34,6 @@ namespace dbaui
         OQueryDesignUndoAction(OJoinTableView* pOwner, sal_uInt16 nCommentID) : OCommentUndoAction(nCommentID), m_pOwner(pOwner) { }
     };
 }
-#endif // DBAUI_QUERYDESIGNUNDOACTION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNUNDOACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
index 15bbc2ae27bc..a64e0936d163 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.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 DBAUI_OQUERYMOVETABWINUNDOACT_HXX
-#define DBAUI_OQUERYMOVETABWINUNDOACT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYMOVETABWINUNDOACT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYMOVETABWINUNDOACT_HXX
 
 #include "QueryDesignUndoAction.hxx"
 #include "dbu_qry.hrc"
@@ -50,6 +50,6 @@ namespace dbaui
     {
     }
 }
-#endif // DBAUI_OQUERYMOVETABWINUNDOACT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYMOVETABWINUNDOACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
index c6ada503e71a..ebb4fbd2c27d 100644
--- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.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 DBAUI_QUERYSIZETABWINUNDOACT_HXX
-#define DBAUI_QUERYSIZETABWINUNDOACT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYSIZETABWINUNDOACT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYSIZETABWINUNDOACT_HXX
 
 #include "QueryDesignUndoAction.hxx"
 #include "dbu_qry.hrc"
@@ -68,6 +68,6 @@ namespace dbaui
     }
 }
 
-#endif //DBAUI_QUERYSIZETABWINUNDOACT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYSIZETABWINUNDOACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
index cdb1c197b8ea..5afbc1c7aa90 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.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 DBAUI_QUERYTABCONNUNDOACTION_HXX
-#define DBAUI_QUERYTABCONNUNDOACTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABCONNUNDOACTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABCONNUNDOACTION_HXX
 
 #include "QueryDesignUndoAction.hxx"
 
@@ -44,7 +44,7 @@ namespace dbaui
         void SetOwnership(sal_Bool bTakeIt) { m_bOwnerOfConn = bTakeIt; }
     };
 }
-#endif // DBAUI_QUERYTABCONNUNDOACTION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABCONNUNDOACTION_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx
index 57a6777e96b8..e3c00daa7808 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_QUERYTABWINSHOWUNDOACT_HXX
-#define DBAUI_QUERYTABWINSHOWUNDOACT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABWINSHOWUNDOACT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABWINSHOWUNDOACT_HXX
 
 #include "QueryTabWinUndoAct.hxx"
 
@@ -48,6 +48,6 @@ namespace dbaui
         virtual void    Redo();
     };
 }
-#endif // DBAUI_QUERYTABWINSHOWUNDOACT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABWINSHOWUNDOACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
index 7ea2f86064d3..77436e770004 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.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 DBAUI_QUERYTABWINUNDOACT_HXX
-#define DBAUI_QUERYTABWINUNDOACT_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABWINUNDOACT_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABWINUNDOACT_HXX
 
 #include "QueryDesignUndoAction.hxx"
 #include <vector>
@@ -64,6 +64,6 @@ namespace dbaui
     };
 
 }
-#endif // DBAUI_QUERYTABWINUNDOACT_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYTABWINUNDOACT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index c41a78d02433..4265d82c47dd 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.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 DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX
-#define DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_SELECTIONBROWSEBOX_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_SELECTIONBROWSEBOX_HXX
 
 #include <svtools/editbrowsebox.hxx>
 #include "TableFieldDescription.hxx"
@@ -324,6 +324,6 @@ namespace dbaui
         using ::svt::EditBrowseBox::MouseButtonUp;
     };
 }
-#endif // DBAUI_QUERYDESIGN_OSELECTIONBROWSEBOX_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_SELECTIONBROWSEBOX_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx
index b08d1f33505f..483a37caf6e4 100644
--- a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx
+++ b/dbaccess/source/ui/querydesign/TableFieldInfo.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 DBAUI_TABLEFIELDINFO_HXX
-#define DBAUI_TABLEFIELDINFO_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_TABLEFIELDINFO_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_TABLEFIELDINFO_HXX
 
 #include "QEnumTypes.hxx"
 #include <sal/types.h>
@@ -40,7 +40,7 @@ namespace dbaui
         inline void             SetDataType(sal_Int32 eTyp) { m_eDataType = eTyp; }
     };
 }
-#endif // DBAUI_TABLEFIELDINFO_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_TABLEFIELDINFO_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
index 701b5070f8e3..f688e7012a99 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _LIMITBOXCONTROLLER_HXX_
-#define _LIMITBOXCONTROLLER_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_LIMITBOXCONTROLLER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_LIMITBOXCONTROLLER_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <svtools/toolboxcontroller.hxx>
@@ -64,6 +64,6 @@ class LimitBoxController: public svt::ToolboxController,
 
 } ///dbaui namespace
 
-#endif /// _LIMITBOXCONTROLLER_HXX_
+#endif /// INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_LIMITBOXCONTROLLER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index 9854728a5798..eadd1b3b7ecf 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.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 DBAUI_QUERYDLG_HXX
-#define DBAUI_QUERYDLG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDLG_HXX
 #include <vcl/dialog.hxx>
 
 #include <vcl/button.hxx>
@@ -91,7 +91,7 @@ namespace dbaui
         virtual void notifyConnectionChange();
     };
 }
-#endif // DBAUI_QUERYDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDLG_HXX
 
 
 
diff --git a/dbaccess/source/ui/relationdesign/RTableConnection.hxx b/dbaccess/source/ui/relationdesign/RTableConnection.hxx
index f8d83d80f192..f51016694596 100644
--- a/dbaccess/source/ui/relationdesign/RTableConnection.hxx
+++ b/dbaccess/source/ui/relationdesign/RTableConnection.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 DBAUI_RTABLECONNECTION_HXX
-#define DBAUI_RTABLECONNECTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_RELATIONDESIGN_RTABLECONNECTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_RELATIONDESIGN_RTABLECONNECTION_HXX
 
 #include "TableConnection.hxx"
 #include "RTableConnectionData.hxx"
@@ -39,6 +39,6 @@ namespace dbaui
         using OTableConnection::Draw;
     };
 }
-#endif // DBAUI_RTABLECONNECTION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_RELATIONDESIGN_RTABLECONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/relationdesign/RTableWindow.hxx b/dbaccess/source/ui/relationdesign/RTableWindow.hxx
index 067945473b10..a4652145abe4 100644
--- a/dbaccess/source/ui/relationdesign/RTableWindow.hxx
+++ b/dbaccess/source/ui/relationdesign/RTableWindow.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 DBAUI_RELTABLEWINDOW_HXX
-#define DBAUI_RELTABLEWINDOW_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_RELATIONDESIGN_RTABLEWINDOW_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_RELATIONDESIGN_RTABLEWINDOW_HXX
 
 #include "TableWindow.hxx"
 
@@ -36,7 +36,7 @@ namespace dbaui
         virtual OUString GetName() const { return GetComposedName(); }
     };
 }
-#endif //DBAUI_RELTABLEWINDOW_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_RELATIONDESIGN_RTABLEWINDOW_HXX
 
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
index 12ca4041d8e8..545e89aa132d 100644
--- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx
+++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.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 DBAUI_TABLEFIELDDESCGENPAGE_HXX
-#define DBAUI_TABLEFIELDDESCGENPAGE_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_FIELDDESCGENWIN_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_FIELDDESCGENWIN_HXX
 
 #include <vcl/tabpage.hxx>
 #include "IClipBoardTest.hxx"
@@ -71,6 +71,6 @@ namespace dbaui
         inline OTableFieldControl*  getFieldControl() const { return m_pFieldControl; }
     };
 }
-#endif // DBAUI_TABLEFIELDDESCGENPAGE_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_FIELDDESCGENWIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.hxx b/dbaccess/source/ui/tabledesign/TEditControl.hxx
index dc2dc0c0ca26..34d696645593 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.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 DBAUI_TABLEEDITORCONTROL_HXX
-#define DBAUI_TABLEEDITORCONTROL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TEDITCONTROL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TEDITCONTROL_HXX
 
 #include "TableDesignControl.hxx"
 #include "TableDesignView.hxx"
@@ -210,6 +210,6 @@ namespace dbaui
         void resetType();
     };
 }
-#endif // DBAUI_TABLEEDITORCONTROL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TEDITCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx b/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
index bfd525b25af0..08e7d9230a48 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.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 DBAUI_TABLEFIELDCONTROL_HXX
-#define DBAUI_TABLEFIELDCONTROL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDCONTROL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDCONTROL_HXX
 
 #include "FieldDescControl.hxx"
 
@@ -55,6 +55,6 @@ namespace dbaui
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getConnection();
     };
 }
-#endif // DBAUI_TABLEFIELDCONTROL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
index 3e7693b1eff4..94223eab9e10 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.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 DBAUI_TABLEFIELDDESCRIPTION_HXX
-#define DBAUI_TABLEFIELDDESCRIPTION_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDDESCWIN_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDDESCWIN_HXX
 
 #include <vcl/tabpage.hxx>
 #include "FieldDescGenWin.hxx"
@@ -93,6 +93,6 @@ namespace dbaui
 
     };
 }
-#endif // DBAUI_TABLEFIELDDESCRIPTION_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEFIELDDESCWIN_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/tabledesign/TableUndo.hxx b/dbaccess/source/ui/tabledesign/TableUndo.hxx
index 41fa42ebc2fb..29f498481829 100644
--- a/dbaccess/source/ui/tabledesign/TableUndo.hxx
+++ b/dbaccess/source/ui/tabledesign/TableUndo.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 DBAUI_TABLEUNDO_HXX
-#define DBAUI_TABLEUNDO_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEUNDO_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEUNDO_HXX
 
 #include "GeneralUndo.hxx"
 #include <tools/multisel.hxx>
@@ -147,6 +147,6 @@ namespace dbaui
         virtual ~OPrimKeyUndoAct();
     };
 }
-#endif // DBAUI_TABLEUNDO_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_TABLEDESIGN_TABLEUNDO_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx
index c66fd9e07866..f924e9fe5be2 100644
--- a/dbaccess/source/ui/uno/ColumnControl.hxx
+++ b/dbaccess/source/ui/uno/ColumnControl.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 DBAUI_COLUMNCONTROL_HXX
-#define DBAUI_COLUMNCONTROL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNCONTROL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNCONTROL_HXX
 
 #include <toolkit/controls/unocontrol.hxx>
 #include "apitools.hxx"
@@ -42,6 +42,6 @@ namespace dbaui
     };
 }   // namespace dbaui
 
-#endif // DBAUI_COLUMNCONTROL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNCONTROL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx
index 9601f47776ff..bcbe5d5a11df 100644
--- a/dbaccess/source/ui/uno/ColumnModel.hxx
+++ b/dbaccess/source/ui/uno/ColumnModel.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 DBAUI_COLUMNMODEL_HXX
-#define DBAUI_COLUMNMODEL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNMODEL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNMODEL_HXX
 
 #include <com/sun/star/awt/XControlModel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -94,6 +94,6 @@ public:
 };
 
 }   // namespace dbaui
-#endif // DBAUI_COLUMNMODEL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNMODEL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/ColumnPeer.hxx b/dbaccess/source/ui/uno/ColumnPeer.hxx
index 529bff711973..ca8b9e35935b 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.hxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.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 DBAUI_COLUMNPEER_HXX
-#define DBAUI_COLUMNPEER_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNPEER_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNPEER_HXX
 
 #include <toolkit/awt/vclxwindow.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -44,6 +44,6 @@ namespace dbaui
         virtual ::com::sun::star::uno::Any SAL_CALL getProperty( const OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
     };
 }   // namespace dbaui
-#endif //DBAUI_COLUMNPEER_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNPEER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
index 4fbaad0c6c5c..39a3fa68bc10 100644
--- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
+++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_DBTYPEWIZDLGSETUP_HXX
-#define DBAUI_DBTYPEWIZDLGSETUP_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLGSETUP_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_DBTYPEWIZDLGSETUP_HXX
 
 #ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx
index aca42953941b..0e78b271d924 100644
--- a/dbaccess/source/ui/uno/TableFilterDlg.hxx
+++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_TABLEFILTERDLG_HXX
-#define _DBAUI_TABLEFILTERDLG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_TABLEFILTERDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_TABLEFILTERDLG_HXX
 
 #ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
@@ -62,6 +62,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_TABLEFILTERDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_TABLEFILTERDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
index 090b13df240f..edd0c4b048f5 100644
--- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx
+++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_USERSETTINGSDLG_HXX
-#define _DBAUI_USERSETTINGSDLG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_USERSETTINGSDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_USERSETTINGSDLG_HXX
 
 #ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
@@ -62,6 +62,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_USERSETTINGSDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_USERSETTINGSDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx
index dd200c72ba13..32ddcdc07a2c 100644
--- a/dbaccess/source/ui/uno/admindlg.hxx
+++ b/dbaccess/source/ui/uno/admindlg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_ADMINDLG_HXX
-#define _DBAUI_ADMINDLG_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_ADMINDLG_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_ADMINDLG_HXX
 
 #ifndef _DBAUI_UNOADMIN_
 #include "unoadmin.hxx"
@@ -62,6 +62,6 @@ protected:
 
 }   // namespace dbaui
 
-#endif // _DBAUI_ADMINDLG_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_ADMINDLG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx
index 7a8d82bd6c63..9909e66ea0cb 100644
--- a/dbaccess/source/ui/uno/composerdialogs.hxx
+++ b/dbaccess/source/ui/uno/composerdialogs.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX
-#define DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX
 
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
@@ -123,6 +123,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_COMPOSERDIALOGS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx
index 0a6ffd88cd25..41254bebe77a 100644
--- a/dbaccess/source/ui/uno/dbinteraction.hxx
+++ b/dbaccess/source/ui/uno/dbinteraction.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _DBAUI_INTERACTION_HXX_
-#define _DBAUI_INTERACTION_HXX_
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_DBINTERACTION_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_DBINTERACTION_HXX
 
 #include <cppuhelper/implbase2.hxx>
 
@@ -165,6 +165,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // _DBAUI_INTERACTION_HXX_
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_DBINTERACTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx
index b9fce9f9aeb8..0d1353e45cf8 100644
--- a/dbaccess/source/ui/uno/unoDirectSql.hxx
+++ b/dbaccess/source/ui/uno/unoDirectSql.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef DBAUI_UNODIRECTSQL_HXX
-#define DBAUI_UNODIRECTSQL_HXX
+#ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_UNODIRECTSQL_HXX
+#define INCLUDED_DBACCESS_SOURCE_UI_UNO_UNODIRECTSQL_HXX
 
 #include <svtools/genericunodialog.hxx>
 #include "apitools.hxx"
@@ -62,6 +62,6 @@ namespace dbaui
 
 }   // namespace dbaui
 
-#endif // DBAUI_UNODIRECTSQL_HXX
+#endif // INCLUDED_DBACCESS_SOURCE_UI_UNO_UNODIRECTSQL_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */