16 files changed, 45 insertions, 45 deletions
diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx
index 0f4606a74a06..b3fcfb0ce3f6 100644
--- a/connectivity/source/inc/hsqldb/HCatalog.hxx
+++ b/connectivity/source/inc/hsqldb/HCatalog.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 CONNECTIVITY_HSQLDB_CATALOG_HXX
-#define CONNECTIVITY_HSQLDB_CATALOG_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX
 
 #include "connectivity/sdbcx/VCatalog.hxx"
 #include "connectivity/StdTypeDefs.hxx"
@@ -60,6 +60,6 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_HSQLDB_CATALOG_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx
index b98f429a366a..e5187ce51c4d 100644
--- a/connectivity/source/inc/hsqldb/HColumns.hxx
+++ b/connectivity/source/inc/hsqldb/HColumns.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 CONNECTIVITY_HSQLDB_COLUMN_HXX
-#define CONNECTIVITY_HSQLDB_COLUMN_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCOLUMNS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCOLUMNS_HXX
 #include "connectivity/TColumnsHelper.hxx"
 #include "connectivity/sdbcx/VColumn.hxx"
 
@@ -58,6 +58,6 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_HSQLDB_COLUMN_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCOLUMNS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx
index 6714d33eeb11..e8c4a076136b 100644
--- a/connectivity/source/inc/hsqldb/HConnection.hxx
+++ b/connectivity/source/inc/hsqldb/HConnection.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_HSQLDB_CONNECTION_HXX
-#define CONNECTIVITY_HSQLDB_CONNECTION_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCONNECTION_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCONNECTION_HXX
 
 #include "connectivity/ConnectionWrapper.hxx"
 #include <com/sun/star/util/XFlushable.hpp>
@@ -144,6 +144,6 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_HSQLDB_CONNECTION_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCONNECTION_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx
index 0b0fac3d0867..3768e1e736c7 100644
--- a/connectivity/source/inc/hsqldb/HDriver.hxx
+++ b/connectivity/source/inc/hsqldb/HDriver.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 CONNECTIVITY_HSQLDB_DRIVER_HXX
-#define CONNECTIVITY_HSQLDB_DRIVER_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HDRIVER_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HDRIVER_HXX
 
 #include <com/sun/star/sdbc/XDriver.hpp>
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
@@ -131,6 +131,6 @@ namespace connectivity
 
 }   // namespace connectivity
 
-#endif // CONNECTIVITY_HSQLDB_DRIVER_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HDRIVER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.h b/connectivity/source/inc/hsqldb/HStorageAccess.h
index f0217c82ab65..27139abd619d 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.h
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.h
@@ -21,8 +21,8 @@
 #include <jni.h>
 /* Header for class com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess */
 
-#ifndef _Included_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
-#define _Included_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_H
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/connectivity/source/inc/hsqldb/HStorageAccess.hxx b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
index b4522bffd819..b1e6b85de136 100644
--- a/connectivity/source/inc/hsqldb/HStorageAccess.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageAccess.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX
-#define CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX
 
 #include "hsqldb/HStorageAccess.h"
 
@@ -32,6 +32,6 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject obj_this,jstrin
 void write_to_storage_stream_from_buffer( JNIEnv* env, jobject obj_this, jstring name, jstring key, jbyteArray buffer, jint off, jint len, ::connectivity::hsqldb::DataLogFile* logger = 0 );
 void write_to_storage_stream( JNIEnv* env, jobject obj_this, jstring name, jstring key, jint v, ::connectivity::hsqldb::DataLogFile* logger = 0 );
 
-#endif // CONNECTIVITY_HSQLDB_STORAGEACCESS_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEACCESS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HStorageMap.hxx b/connectivity/source/inc/hsqldb/HStorageMap.hxx
index 197ef9f6ee02..746d691cef1c 100644
--- a/connectivity/source/inc/hsqldb/HStorageMap.hxx
+++ b/connectivity/source/inc/hsqldb/HStorageMap.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 CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
-#define CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEMAP_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEMAP_HXX
 
 #include <sal/config.h>
 
@@ -83,6 +83,6 @@ namespace connectivity
 }   // namespace connectivity
 
 
-#endif // CONNECTIVI_HSQLDB_HSTORAGEMAP_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HSTORAGEMAP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index 30794b5c5d07..13423e7dc128 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_HSQLDB_TABLE_HXX
-#define CONNECTIVITY_HSQLDB_TABLE_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLE_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLE_HXX
 
 #include "connectivity/TTableHelper.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -116,6 +116,6 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_HSQLDB_TABLE_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLE_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx
index 2858e90de959..f7c428854f4c 100644
--- a/connectivity/source/inc/hsqldb/HTables.hxx
+++ b/connectivity/source/inc/hsqldb/HTables.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 CONNECTIVITY_HSQLDB_TABLES_HXX
-#define CONNECTIVITY_HSQLDB_TABLES_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLES_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLES_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -66,6 +66,6 @@ namespace connectivity
         };
     }
 }
-#endif // CONNECTIVITY_HSQLDB_TABLES_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLES_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HTools.hxx b/connectivity/source/inc/hsqldb/HTools.hxx
index bedef9122870..fcb91741fc6d 100644
--- a/connectivity/source/inc/hsqldb/HTools.hxx
+++ b/connectivity/source/inc/hsqldb/HTools.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_HTOOLS_HXX
-#define CONNECTIVITY_HTOOLS_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTOOLS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTOOLS_HXX
 
 #include <rtl/ustrbuf.hxx>
 
@@ -51,6 +51,6 @@ namespace connectivity { namespace hsqldb
 } } // namespace connectivity::hsqldb
 
 
-#endif // CONNECTIVITY_HTOOLS_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTOOLS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx
index 971e8e465769..1f3b64791fb9 100644
--- a/connectivity/source/inc/hsqldb/HUser.hxx
+++ b/connectivity/source/inc/hsqldb/HUser.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_HSQLDB_USER_HXX_
-#define _CONNECTIVITY_HSQLDB_USER_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSER_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSER_HXX
 
 #include "connectivity/sdbcx/VUser.hxx"
 #include "com/sun/star/sdbc/XConnection.hpp"
@@ -70,6 +70,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_HSQLDB_USER_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSER_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx
index 486f67eb4222..901ac9be6b1f 100644
--- a/connectivity/source/inc/hsqldb/HUsers.hxx
+++ b/connectivity/source/inc/hsqldb/HUsers.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _CONNECTIVITY_HSQLDB_USERS_HXX_
-#define _CONNECTIVITY_HSQLDB_USERS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSERS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSERS_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include "com/sun/star/sdbc/XConnection.hpp"
@@ -50,6 +50,6 @@ namespace connectivity
     }
 }
 
-#endif // _CONNECTIVITY_HSQLDB_USERS_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSERS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx
index 2bb3cfbfe2ea..49698d46da93 100644
--- a/connectivity/source/inc/hsqldb/HView.hxx
+++ b/connectivity/source/inc/hsqldb/HView.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef CONNECTIVITY_HVIEW_HXX
-#define CONNECTIVITY_HVIEW_HXX
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEW_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEW_HXX
 
 #include "connectivity/sdbcx/VView.hxx"
 
@@ -80,6 +80,6 @@ namespace connectivity { namespace hsqldb
 } } // namespace connectivity::hsqldb
 
 
-#endif // CONNECTIVITY_HVIEW_HXX
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEW_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx
index 1ac2a61d4798..7a1c042657a9 100644
--- a/connectivity/source/inc/hsqldb/HViews.hxx
+++ b/connectivity/source/inc/hsqldb/HViews.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 _CONNECTIVITY_HSQLDB_VIEWS_HXX_
-#define _CONNECTIVITY_HSQLDB_VIEWS_HXX_
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEWS_HXX
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEWS_HXX
 
 #include "connectivity/sdbcx/VCollection.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -51,6 +51,6 @@ namespace connectivity
         };
     }
 }
-#endif // _CONNECTIVITY_HSQLDB_VIEWS_HXX_
+#endif // INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEWS_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/inc/hsqldb/StorageFileAccess.h b/connectivity/source/inc/hsqldb/StorageFileAccess.h
index 4bcbd2f30214..b75c835f872f 100644
--- a/connectivity/source/inc/hsqldb/StorageFileAccess.h
+++ b/connectivity/source/inc/hsqldb/StorageFileAccess.h
@@ -21,8 +21,8 @@
 #include <jni.h>
 /* Header for class com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess */
 
-#ifndef _Included_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
-#define _Included_com_sun_star_sdbcx_comp_hsqldb_StorageFileAccess
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGEFILEACCESS_H
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
index 31cc5c70de28..8ca0ce3cec03 100644
--- a/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
+++ b/connectivity/source/inc/hsqldb/StorageNativeInputStream.h
@@ -21,8 +21,8 @@
 #include <jni.h>
 /* Header for class com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream */
 
-#ifndef _Included_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
-#define _Included_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream
+#ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
+#define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_STORAGENATIVEINPUTSTREAM_H
 #ifdef __cplusplus
 extern "C" {
 #endif