loplugin:includeform: connectivity

Change-Id: I06596fac09f0568b8bab2e2e235a2b88bcd3fc7a
author: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:43:41 +0200
committer: Stephan Bergmann <sbergman@redhat.com> 2017-10-23 22:46:11 +0200
commit: 25fd3077e85c37ff4077b924ff9a26012d808199 (patch)
tree: 57d4f25a972e9223664a5989024c80deb569df49 /connectivity/source
parent: 74067098bbf225138fad5d2c208b6e1fc71fa9a9 (diff)
298 files changed, 731 insertions, 731 deletions
diff --git a/connectivity/source/commontools/AutoRetrievingBase.cxx b/connectivity/source/commontools/AutoRetrievingBase.cxx
index f64d4417ad1d..e4f10831f12c 100644
--- a/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "AutoRetrievingBase.hxx"
+#include <AutoRetrievingBase.hxx>
 
 #include <osl/diagnose.h>
 
diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx
index 3bfef6fd3d03..0deb62f38a6f 100644
--- a/connectivity/source/commontools/CommonTools.cxx
+++ b/connectivity/source/commontools/CommonTools.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <comphelper/extract.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/java/JavaVirtualMachine.hpp>
 #if HAVE_FEATURE_JAVA
diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx
index 435a0cc21d19..e51339378526 100644
--- a/connectivity/source/commontools/DateConversion.cxx
+++ b/connectivity/source/commontools/DateConversion.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/extract.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/numbers.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index afc1a8bce50c..224e96c91924 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "ParameterSubstitution.hxx"
-#include "FDatabaseMetaDataResultSet.hxx"
-#include "FDatabaseMetaDataResultSetMetaData.hxx"
+#include <ParameterSubstitution.hxx>
+#include <FDatabaseMetaDataResultSet.hxx>
+#include <FDatabaseMetaDataResultSetMetaData.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
@@ -38,8 +38,8 @@
 #include <cppuhelper/implementationentry.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
-#include "TConnection.hxx"
+#include <strings.hrc>
+#include <TConnection.hxx>
 
 using namespace connectivity;
 using namespace dbtools;
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index bfa88bd36c8d..812009d423ab 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "FDatabaseMetaDataResultSetMetaData.hxx"
+#include <FDatabaseMetaDataResultSetMetaData.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ProcedureResult.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx
index c44b8f34b808..dfec360b23e5 100644
--- a/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -16,7 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "ParameterSubstitution.hxx"
+#include <ParameterSubstitution.hxx>
 #include <connectivity/sqlparse.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx
index a45f4d9a5b5e..2b3fa75b324c 100644
--- a/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/connectivity/source/commontools/RowFunctionParser.cxx
@@ -29,7 +29,7 @@
 #define BOOST_SPIRIT_DEBUG
 #endif
 #include <boost/spirit/include/classic_core.hpp>
-#include "RowFunctionParser.hxx"
+#include <RowFunctionParser.hxx>
 #include <rtl/ustring.hxx>
 #include <tools/fract.hxx>
 
diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx
index 1b13ea4a2d62..2f347da63946 100644
--- a/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/connectivity/source/commontools/TColumnsHelper.cxx
@@ -28,7 +28,7 @@
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <connectivity/TTableHelper.hxx>
 #include <comphelper/property.hxx>
 
diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx
index 15bcf67f4929..62b14f11f6a0 100644
--- a/connectivity/source/commontools/TConnection.cxx
+++ b/connectivity/source/commontools/TConnection.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 599f031dbc95..18ac991a0024 100644
--- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TDatabaseMetaDataBase.hxx"
-#include "RowFunctionParser.hxx"
+#include <TDatabaseMetaDataBase.hxx>
+#include <RowFunctionParser.hxx>
 
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/evtlistenerhlp.hxx>
 #include <com/sun/star/lang/XComponent.hpp>
-#include "resource/sharedresources.hxx"
-#include "strings.hrc"
+#include <resource/sharedresources.hxx>
+#include <strings.hrc>
 #include <connectivity/dbexception.hxx>
 #include <sal/macros.h>
 
diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx
index 539687696c0a..2b5be27e337a 100644
--- a/connectivity/source/commontools/TIndex.cxx
+++ b/connectivity/source/commontools/TIndex.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <connectivity/TTableHelper.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace connectivity;
 using namespace connectivity::sdbcx;
diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx
index 2d83fa7b2908..6038be6262b2 100644
--- a/connectivity/source/commontools/TIndexColumns.cxx
+++ b/connectivity/source/commontools/TIndexColumns.cxx
@@ -26,7 +26,7 @@
 #include <comphelper/property.hxx>
 #include <connectivity/TIndex.hxx>
 #include <connectivity/TTableHelper.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace connectivity;
 using namespace connectivity::sdbcx;
diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx
index 8ff2257731a2..85e90bd94ddc 100644
--- a/connectivity/source/commontools/TIndexes.cxx
+++ b/connectivity/source/commontools/TIndexes.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/sdbc/IndexType.hpp>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/TTableHelper.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/extract.hxx>
 #include <rtl/ustrbuf.hxx>
 using namespace connectivity;
diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx
index 815e025602bb..7720adcc0a19 100644
--- a/connectivity/source/commontools/TKey.cxx
+++ b/connectivity/source/commontools/TKey.cxx
@@ -21,7 +21,7 @@
 #include <connectivity/TKeyColumns.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <connectivity/TTableHelper.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx
index 5e6dca1c3f5d..21f5b8a82fc8 100644
--- a/connectivity/source/commontools/TKeyColumns.cxx
+++ b/connectivity/source/commontools/TKeyColumns.cxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <comphelper/extract.hxx>
 #include <comphelper/property.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <connectivity/TTableHelper.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx
index e9834d080387..c7419c47c7cf 100644
--- a/connectivity/source/commontools/TKeys.cxx
+++ b/connectivity/source/commontools/TKeys.cxx
@@ -26,7 +26,7 @@
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 2d5e142d8eb2..02a51bd39b05 100644
--- a/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TPrivilegesResultSet.hxx"
+#include <TPrivilegesResultSet.hxx>
 
 using namespace connectivity;
 
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index d2317c838bff..adddb809d536 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TSkipDeletedSet.hxx"
+#include <TSkipDeletedSet.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <algorithm>
diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx
index 10326a551be5..748350121c66 100644
--- a/connectivity/source/commontools/TSortIndex.cxx
+++ b/connectivity/source/commontools/TSortIndex.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TSortIndex.hxx"
+#include <TSortIndex.hxx>
 #include <algorithm>
 #include <iterator>
 #include <o3tl/functional.hxx>
diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx
index 25492b36c43c..f00e7e50323a 100644
--- a/connectivity/source/commontools/TTableHelper.cxx
+++ b/connectivity/source/commontools/TTableHelper.cxx
@@ -34,7 +34,7 @@
 #include <connectivity/dbtools.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <unotools/sharedunocomponent.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 #include <o3tl/functional.hxx>
 
diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx
index e9cdce9c7ca4..da88206cc7d8 100644
--- a/connectivity/source/commontools/dbexception.cxx
+++ b/connectivity/source/commontools/dbexception.cxx
@@ -25,9 +25,9 @@
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/sdb/SQLErrorEvent.hpp>
-#include "TConnection.hxx"
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <TConnection.hxx>
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 
 namespace dbtools
 {
diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx
index 27acbe743234..50abe346fba2 100644
--- a/connectivity/source/commontools/dbmetadata.cxx
+++ b/connectivity/source/commontools/dbmetadata.cxx
@@ -21,8 +21,8 @@
 #include <connectivity/dbmetadata.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/DriversConfig.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index 08770018bbfd..547aea048041 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <connectivity/CommonTools.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <connectivity/ParameterCont.hxx>
 
 #include <com/sun/star/awt/XWindow.hpp>
@@ -79,8 +79,8 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 #include <cppuhelper/implbase.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 #include <connectivity/OSubComponent.hxx>
 
 #include <algorithm>
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index be98ee4ea918..942d9ac60278 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -22,8 +22,8 @@
 #include <connectivity/dbcharset.hxx>
 #include <connectivity/SQLStatementHelper.hxx>
 #include <unotools/confignode.hxx>
-#include "resource/sharedresources.hxx"
-#include "strings.hrc"
+#include <resource/sharedresources.hxx>
+#include <strings.hrc>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
@@ -38,7 +38,7 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx
index 5894872625fa..cb534c01ad5b 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -20,7 +20,7 @@
 #include <connectivity/filtermanager.hxx>
 
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <osl/diagnose.h>
 #include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx
index 716e5e6941f7..9934bdb39aad 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -30,7 +30,7 @@
 
 #include <connectivity/dbtools.hxx>
 #include <connectivity/filtermanager.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 #include <tools/diagnose_ex.h>
 
diff --git a/connectivity/source/commontools/propertyids.cxx b/connectivity/source/commontools/propertyids.cxx
index e88fb5098def..90c6beeede6a 100644
--- a/connectivity/source/commontools/propertyids.cxx
+++ b/connectivity/source/commontools/propertyids.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "propertyids.hxx"
+#include <propertyids.hxx>
 
 namespace dbtools
 {
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index 4703f1ff7f07..78bae9c6a7c8 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "calc/CCatalog.hxx"
-#include "calc/CConnection.hxx"
-#include "calc/CTables.hxx"
+#include <calc/CCatalog.hxx>
+#include <calc/CConnection.hxx>
+#include <calc/CTables.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index e82aafc6df23..f3dc9f2ee733 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "calc/CConnection.hxx"
-#include "calc/CDatabaseMetaData.hxx"
-#include "calc/CCatalog.hxx"
-#include "calc/CDriver.hxx"
-#include "resource/sharedresources.hxx"
+#include <calc/CConnection.hxx>
+#include <calc/CDatabaseMetaData.hxx>
+#include <calc/CCatalog.hxx>
+#include <calc/CDriver.hxx>
+#include <resource/sharedresources.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
 #include <tools/urlobj.hxx>
-#include "component/CPreparedStatement.hxx"
-#include "component/CStatement.hxx"
+#include <component/CPreparedStatement.hxx>
+#include <component/CStatement.hxx>
 #include <unotools/pathoptions.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace connectivity::calc;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 4f44dce752ed..828376f63986 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "calc/CDatabaseMetaData.hxx"
-#include "calc/CConnection.hxx"
+#include <calc/CDatabaseMetaData.hxx>
+#include <calc/CConnection.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
@@ -32,7 +32,7 @@
 #include <com/sun/star/sheet/XCellRangeAddressable.hpp>
 #include <com/sun/star/sheet/XDatabaseRanges.hpp>
 #include <com/sun/star/sheet/XDatabaseRange.hpp>
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <FDatabaseMetaDataResultSet.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/types.hxx>
 
diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx
index 67247c1e789d..6bfae82bcada 100644
--- a/connectivity/source/drivers/calc/CDriver.cxx
+++ b/connectivity/source/drivers/calc/CDriver.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "calc/CDriver.hxx"
-#include "calc/CConnection.hxx"
+#include <calc/CDriver.hxx>
+#include <calc/CConnection.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
-#include "resource/sharedresources.hxx"
+#include <resource/sharedresources.hxx>
 #include <comphelper/processfactory.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace connectivity::calc;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index 16a0ef5fc4d6..39993d6a4059 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "calc/CTable.hxx"
+#include <calc/CTable.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -35,8 +35,8 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <svl/converter.hxx>
-#include "calc/CConnection.hxx"
-#include "component/CColumns.hxx"
+#include <calc/CConnection.hxx>
+#include <component/CColumns.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/thread.h>
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 04d38c1265af..9c74fd8bc77f 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -20,11 +20,11 @@
 #include <sal/config.h>
 
 #include <calc/CConnection.hxx>
-#include "calc/CTables.hxx"
-#include "calc/CTable.hxx"
-#include "file/FCatalog.hxx"
-#include "file/FConnection.hxx"
-#include "calc/CCatalog.hxx"
+#include <calc/CTables.hxx>
+#include <calc/CTable.hxx>
+#include <file/FCatalog.hxx>
+#include <file/FConnection.hxx>
+#include <calc/CCatalog.hxx>
 #include <comphelper/types.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/calc/Cservices.cxx b/connectivity/source/drivers/calc/Cservices.cxx
index 2d56355be1d9..d1f1e5adebcf 100644
--- a/connectivity/source/drivers/calc/Cservices.cxx
+++ b/connectivity/source/drivers/calc/Cservices.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "calc/CDriver.hxx"
+#include <calc/CDriver.hxx>
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::calc;
diff --git a/connectivity/source/drivers/component/CColumns.cxx b/connectivity/source/drivers/component/CColumns.cxx
index 68dcba53d9f4..7eb63af23cba 100644
--- a/connectivity/source/drivers/component/CColumns.cxx
+++ b/connectivity/source/drivers/component/CColumns.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "component/CColumns.hxx"
-#include "file/FTable.hxx"
+#include <component/CColumns.hxx>
+#include <file/FTable.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 
 using namespace connectivity::component;
diff --git a/connectivity/source/drivers/component/CDatabaseMetaData.cxx b/connectivity/source/drivers/component/CDatabaseMetaData.cxx
index e0389598f2c9..dca201015cb0 100644
--- a/connectivity/source/drivers/component/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/component/CDatabaseMetaData.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "component/CDatabaseMetaData.hxx"
-#include "file/FConnection.hxx"
+#include <component/CDatabaseMetaData.hxx>
+#include <file/FConnection.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
@@ -26,7 +26,7 @@
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <FDatabaseMetaDataResultSet.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/types.hxx>
 
diff --git a/connectivity/source/drivers/component/CPreparedStatement.cxx b/connectivity/source/drivers/component/CPreparedStatement.cxx
index a2b1161fb7cb..bc3af3e8c9b8 100644
--- a/connectivity/source/drivers/component/CPreparedStatement.cxx
+++ b/connectivity/source/drivers/component/CPreparedStatement.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "component/CPreparedStatement.hxx"
-#include "component/CResultSet.hxx"
+#include <component/CPreparedStatement.hxx>
+#include <component/CResultSet.hxx>
 
 using namespace connectivity::component;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/component/CResultSet.cxx b/connectivity/source/drivers/component/CResultSet.cxx
index be5cfb6b904d..d760285810d3 100644
--- a/connectivity/source/drivers/component/CResultSet.cxx
+++ b/connectivity/source/drivers/component/CResultSet.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
-#include "component/CResultSet.hxx"
+#include <component/CResultSet.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/component/CStatement.cxx b/connectivity/source/drivers/component/CStatement.cxx
index a83ff8587e20..8adfefae83f4 100644
--- a/connectivity/source/drivers/component/CStatement.cxx
+++ b/connectivity/source/drivers/component/CStatement.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "component/CStatement.hxx"
-#include "component/CResultSet.hxx"
+#include <component/CStatement.hxx>
+#include <component/CResultSet.hxx>
 
 using namespace connectivity::component;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/component/CTable.cxx b/connectivity/source/drivers/component/CTable.cxx
index c1a5e29b20fe..20f2ad4b7104 100644
--- a/connectivity/source/drivers/component/CTable.cxx
+++ b/connectivity/source/drivers/component/CTable.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "component/CTable.hxx"
+#include <component/CTable.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -35,7 +35,7 @@
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <svl/converter.hxx>
-#include "component/CColumns.hxx"
+#include <component/CColumns.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/thread.h>
diff --git a/connectivity/source/drivers/dbase/DCatalog.cxx b/connectivity/source/drivers/dbase/DCatalog.cxx
index 0c107885edb5..e320b620bdf1 100644
--- a/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DCatalog.hxx"
-#include "dbase/DConnection.hxx"
-#include "dbase/DTables.hxx"
+#include <dbase/DCatalog.hxx>
+#include <dbase/DConnection.hxx>
+#include <dbase/DTables.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx
index c4730d75b6a8..1ffc95fbcfb1 100644
--- a/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/connectivity/source/drivers/dbase/DColumns.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DColumns.hxx"
-#include "dbase/DTable.hxx"
+#include <dbase/DColumns.hxx>
+#include <dbase/DTable.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <comphelper/property.hxx>
diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx
index 0a56d952e49b..c9881aed6f92 100644
--- a/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/connectivity/source/drivers/dbase/DConnection.cxx
@@ -18,13 +18,13 @@
  */
 
 
-#include "dbase/DConnection.hxx"
-#include "dbase/DDatabaseMetaData.hxx"
-#include "dbase/DCatalog.hxx"
-#include "dbase/DDriver.hxx"
+#include <dbase/DConnection.hxx>
+#include <dbase/DDatabaseMetaData.hxx>
+#include <dbase/DCatalog.hxx>
+#include <dbase/DDriver.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include "dbase/DPreparedStatement.hxx"
-#include "dbase/DStatement.hxx"
+#include <dbase/DPreparedStatement.hxx>
+#include <dbase/DStatement.hxx>
 #include <connectivity/dbexception.hxx>
 
 using namespace connectivity::dbase;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index 1ab8289ffe59..7e6f71c9a860 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DDatabaseMetaData.hxx"
+#include <dbase/DDatabaseMetaData.hxx>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
@@ -26,9 +26,9 @@
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <FDatabaseMetaDataResultSet.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include "dbase/DIndex.hxx"
+#include <dbase/DIndex.hxx>
 #include <connectivity/FValue.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx
index d99efd817622..9dbcdddd3e21 100644
--- a/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/connectivity/source/drivers/dbase/DDriver.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DDriver.hxx"
-#include "dbase/DConnection.hxx"
+#include <dbase/DDriver.hxx>
+#include <dbase/DConnection.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <comphelper/processfactory.hxx>
 
 using namespace connectivity::dbase;
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index 0c80d1c82a59..e4f53723bcc9 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DIndex.hxx"
-#include "dbase/DIndexColumns.hxx"
+#include <dbase/DIndex.hxx>
+#include <dbase/DIndexColumns.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <comphelper/sequence.hxx>
-#include "dbase/DTable.hxx"
-#include "dbase/DIndexIter.hxx"
+#include <dbase/DTable.hxx>
+#include <dbase/DIndexIter.hxx>
 #include <osl/file.hxx>
 #include <tools/config.hxx>
 #include <connectivity/CommonTools.hxx>
@@ -35,8 +35,8 @@
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "dbase/DResultSet.hxx"
-#include "strings.hrc"
+#include <dbase/DResultSet.hxx>
+#include <strings.hrc>
 #include <unotools/sharedunocomponent.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 9a586b162edd..5d144bf6f8d6 100644
--- a/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DIndexColumns.hxx"
-#include "dbase/DTable.hxx"
+#include <dbase/DIndexColumns.hxx>
+#include <dbase/DTable.hxx>
 #include <connectivity/sdbcx/VIndexColumn.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
diff --git a/connectivity/source/drivers/dbase/DIndexIter.cxx b/connectivity/source/drivers/dbase/DIndexIter.cxx
index 3f072f8172d1..48ddf65459eb 100644
--- a/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DIndexIter.hxx"
+#include <dbase/DIndexIter.hxx>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
 
 using namespace ::com::sun::star::sdb;
diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx
index aa772d66b5ab..ee6a12f1906d 100644
--- a/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DIndexes.hxx"
-#include "dbase/DIndex.hxx"
+#include <dbase/DIndexes.hxx>
+#include <dbase/DIndex.hxx>
 #include <connectivity/dbexception.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <comphelper/types.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index 8aff710eaee8..60e7a6a7f3ef 100644
--- a/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/connectivity/source/drivers/dbase/DPreparedStatement.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DPreparedStatement.hxx"
-#include "dbase/DResultSet.hxx"
+#include <dbase/DPreparedStatement.hxx>
+#include <dbase/DResultSet.hxx>
 
 using namespace connectivity::dbase;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx
index 0f544ed70cca..40e38e5d2973 100644
--- a/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -18,15 +18,15 @@
  */
 
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
-#include "dbase/DResultSet.hxx"
+#include <dbase/DResultSet.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "dbase/DIndex.hxx"
-#include "dbase/DIndexIter.hxx"
+#include <dbase/DIndex.hxx>
+#include <dbase/DIndexIter.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/dbase/DStatement.cxx b/connectivity/source/drivers/dbase/DStatement.cxx
index e0eea49f36eb..096878e3e245 100644
--- a/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/connectivity/source/drivers/dbase/DStatement.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DStatement.hxx"
-#include "dbase/DResultSet.hxx"
+#include <dbase/DStatement.hxx>
+#include <dbase/DResultSet.hxx>
 
 using namespace connectivity::dbase;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 48e03e90f9b8..10372b44a13c 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -17,19 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DTable.hxx"
+#include <dbase/DTable.hxx>
 #include <com/sun/star/container/ElementExistException.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <svl/converter.hxx>
-#include "dbase/DConnection.hxx"
-#include "dbase/DColumns.hxx"
+#include <dbase/DConnection.hxx>
+#include <dbase/DColumns.hxx>
 #include <osl/thread.h>
 #include <tools/config.hxx>
-#include "dbase/DIndex.hxx"
-#include "dbase/DIndexes.hxx"
+#include <dbase/DIndex.hxx>
+#include <dbase/DIndexes.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
 #include <svl/zforlist.hxx>
@@ -50,7 +50,7 @@
 #include <connectivity/dbtools.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbconversion.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <rtl/strbuf.hxx>
 
 #include <algorithm>
diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx
index 57e7abbd9878..90f62bdc526f 100644
--- a/connectivity/source/drivers/dbase/DTables.cxx
+++ b/connectivity/source/drivers/dbase/DTables.cxx
@@ -20,19 +20,19 @@
 #include <sal/config.h>
 
 #include <dbase/DConnection.hxx>
-#include "dbase/DTables.hxx"
-#include "dbase/DTable.hxx"
+#include <dbase/DTables.hxx>
+#include <dbase/DTable.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
-#include "file/FCatalog.hxx"
-#include "file/FConnection.hxx"
+#include <file/FCatalog.hxx>
+#include <file/FConnection.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include "dbase/DCatalog.hxx"
+#include <dbase/DCatalog.hxx>
 #include <comphelper/types.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <connectivity/dbexception.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/dbase/Dservices.cxx b/connectivity/source/drivers/dbase/Dservices.cxx
index 3028eec3b6aa..da3636b03953 100644
--- a/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/connectivity/source/drivers/dbase/Dservices.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/DDriver.hxx"
+#include <dbase/DDriver.hxx>
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::dbase;
diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx
index 4e718419e38a..07f424c07d8b 100644
--- a/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dbase/dindexnode.hxx"
+#include <dbase/dindexnode.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <osl/thread.h>
-#include "dbase/DIndex.hxx"
+#include <dbase/DIndex.hxx>
 #include <tools/debug.hxx>
 #include <tools/stream.hxx>
 
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index 7142128b1203..3156985020ae 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/warningscontainer.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <osl/module.h>
 #include "EApi.h"
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
index 52ef3b0eed16..debe47ac7460 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NDATABASEMETADATA_HXX
 
 #include "NConnection.hxx"
-#include "TDatabaseMetaDataBase.hxx"
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <TDatabaseMetaDataBase.hxx>
+#include <FDatabaseMetaDataResultSet.hxx>
 
 
 namespace connectivity
diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx
index 2b661ac21663..921ad6e6427b 100644
--- a/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -29,8 +29,8 @@
 #include <com/sun/star/ucb/XCommandEnvironment.hpp>
 #include <ucbhelper/content.hxx>
 #include <signal.h>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 
 using namespace osl;
 using namespace connectivity::evoab;
diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index aca19f300e72..1f4f04a63150 100644
--- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -22,12 +22,12 @@
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include "propertyids.hxx"
+#include <propertyids.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
 
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace connectivity::evoab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx
index 6fc4365e0f21..e4e9dd37e9f4 100644
--- a/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -21,9 +21,9 @@
 #include "NDatabaseMetaData.hxx"
 #include "NConnection.hxx"
 #include "NResultSet.hxx"
-#include "propertyids.hxx"
-#include "strings.hrc"
-#include "TSortIndex.hxx"
+#include <propertyids.hxx>
+#include <strings.hrc>
+#include <TSortIndex.hxx>
 #include <algorithm>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index 5f7f297bb8ca..7dcf3146055b 100644
--- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -21,7 +21,7 @@
 #include "NDatabaseMetaData.hxx"
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace connectivity::evoab;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index 095d2abf7038..17643d55f045 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -25,12 +25,12 @@
 #include <com/sun/star/sdbc/FetchDirection.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <cppuhelper/typeprovider.hxx>
-#include "propertyids.hxx"
+#include <propertyids.hxx>
 #include "NStatement.hxx"
 #include "NConnection.hxx"
 #include "NDatabaseMetaData.hxx"
 #include "NResultSet.hxx"
-#include "sqlbison.hxx"
+#include <sqlbison.hxx>
 #include <strings.hrc>
 #include <connectivity/dbexception.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index 7779673b255f..65938fe47c9f 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -40,7 +40,7 @@
 #include <comphelper/propertycontainer.hxx>
 
 #include "EApi.h"
-#include <NConnection.hxx>
+#include "NConnection.hxx"
 
 #include <list>
 
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index 1a839caa4c0b..f76f886521e9 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/FCatalog.hxx"
-#include "file/FConnection.hxx"
-#include "file/FTables.hxx"
+#include <file/FCatalog.hxx>
+#include <file/FConnection.hxx>
+#include <file/FTables.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx
index a380dc8e6f5f..e3fc8f21b455 100644
--- a/connectivity/source/drivers/file/FColumns.cxx
+++ b/connectivity/source/drivers/file/FColumns.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/FColumns.hxx"
+#include <file/FColumns.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include "file/FTable.hxx"
+#include <file/FTable.hxx>
 #include <comphelper/property.hxx>
 
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx
index 84a56e529225..378bd2d9cd0a 100644
--- a/connectivity/source/drivers/file/FConnection.cxx
+++ b/connectivity/source/drivers/file/FConnection.cxx
@@ -21,11 +21,11 @@
 
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include "file/FConnection.hxx"
-#include "file/FDatabaseMetaData.hxx"
-#include "file/FDriver.hxx"
-#include "file/FStatement.hxx"
-#include "file/FPreparedStatement.hxx"
+#include <file/FConnection.hxx>
+#include <file/FDatabaseMetaData.hxx>
+#include <file/FDriver.hxx>
+#include <file/FStatement.hxx>
+#include <file/FPreparedStatement.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
@@ -33,14 +33,14 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <com/sun/star/ucb/XContentIdentifier.hpp>
 #include <tools/urlobj.hxx>
-#include "file/FCatalog.hxx"
+#include <file/FCatalog.hxx>
 #include <unotools/pathoptions.hxx>
 #include <ucbhelper/content.hxx>
 #include <connectivity/dbcharset.hxx>
 #include <connectivity/dbexception.hxx>
 #include <osl/thread.h>
 #include <osl/nlsupport.h>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace connectivity::file;
 using namespace dbtools;
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index 8ba8cbac269d..ac20080d1994 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/FDatabaseMetaData.hxx"
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <file/FDatabaseMetaData.hxx>
+#include <FDatabaseMetaDataResultSet.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
@@ -28,8 +28,8 @@
 #include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <tools/urlobj.hxx>
-#include "file/FDriver.hxx"
-#include "file/FTable.hxx"
+#include <file/FDriver.hxx>
+#include <file/FTable.hxx>
 #include <comphelper/processfactory.hxx>
 #include <ucbhelper/content.hxx>
 
diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx
index c5cfac4c16e8..c0e0a77bc645 100644
--- a/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/connectivity/source/drivers/file/FDateFunctions.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "file/FDateFunctions.hxx"
+#include <file/FDateFunctions.hxx>
 #include <tools/date.hxx>
 #include <tools/time.hxx>
 #include <tools/datetime.hxx>
diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx
index 2fc1f1d7b1f3..33a1f447d07e 100644
--- a/connectivity/source/drivers/file/FDriver.cxx
+++ b/connectivity/source/drivers/file/FDriver.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/FDriver.hxx"
-#include "file/FConnection.hxx"
-#include "file/fcode.hxx"
+#include <file/FDriver.hxx>
+#include <file/FConnection.hxx>
+#include <file/fcode.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/types.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 
 
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/file/FNoException.cxx b/connectivity/source/drivers/file/FNoException.cxx
index f692fac5016e..c165874c6417 100644
--- a/connectivity/source/drivers/file/FNoException.cxx
+++ b/connectivity/source/drivers/file/FNoException.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/FCatalog.hxx"
-#include "file/fcomp.hxx"
-#include "file/fanalyzer.hxx"
-#include "file/FResultSet.hxx"
-#include "file/FPreparedStatement.hxx"
+#include <file/FCatalog.hxx>
+#include <file/fcomp.hxx>
+#include <file/fanalyzer.hxx>
+#include <file/FResultSet.hxx>
+#include <file/FPreparedStatement.hxx>
 #include <connectivity/FValue.hxx>
 #include <tools/debug.hxx>
-#include "TKeyValue.hxx"
+#include <TKeyValue.hxx>
 
 using namespace connectivity;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/file/FNumericFunctions.cxx b/connectivity/source/drivers/file/FNumericFunctions.cxx
index 6bafc9641496..059a6e374cda 100644
--- a/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/connectivity/source/drivers/file/FNumericFunctions.cxx
@@ -19,7 +19,7 @@
 
 
 #include <cmath>
-#include "file/FNumericFunctions.hxx"
+#include <file/FNumericFunctions.hxx>
 #include <rtl/math.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx
index d1d126bc8f7c..ead7a912252d 100644
--- a/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -20,9 +20,9 @@
 
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <osl/diagnose.h>
-#include "file/FPreparedStatement.hxx"
+#include <file/FPreparedStatement.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include "file/FResultSetMetaData.hxx"
+#include <file/FResultSetMetaData.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
@@ -33,7 +33,7 @@
 #include <connectivity/PColumn.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace connectivity;
 using namespace comphelper;
diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx
index 32425cf69d51..4dd438bf6660 100644
--- a/connectivity/source/drivers/file/FResultSet.cxx
+++ b/connectivity/source/drivers/file/FResultSet.cxx
@@ -22,9 +22,9 @@
 #include <iostream>
 #endif
 #include <connectivity/sdbcx/VColumn.hxx>
-#include "file/FResultSet.hxx"
-#include "sqlbison.hxx"
-#include "file/FResultSetMetaData.hxx"
+#include <file/FResultSet.hxx>
+#include <sqlbison.hxx>
+#include <file/FResultSetMetaData.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <comphelper/property.hxx>
@@ -46,8 +46,8 @@
 #include <comphelper/extract.hxx>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/types.hxx>
-#include "resource/sharedresources.hxx"
-#include "strings.hrc"
+#include <resource/sharedresources.hxx>
+#include <strings.hrc>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx
index 173bf318db78..32f45cd9b747 100644
--- a/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/FResultSetMetaData.hxx"
-#include "file/FTable.hxx"
+#include <file/FResultSetMetaData.hxx>
+#include <file/FTable.hxx>
 #include <comphelper/extract.hxx>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx
index e275e7d1aa19..93772f5e979a 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -18,11 +18,11 @@
  */
 
 #include <osl/diagnose.h>
-#include "file/FStatement.hxx"
-#include "file/FConnection.hxx"
-#include "sqlbison.hxx"
-#include "file/FDriver.hxx"
-#include "file/FResultSet.hxx"
+#include <file/FStatement.hxx>
+#include <file/FConnection.hxx>
+#include <sqlbison.hxx>
+#include <file/FDriver.hxx>
+#include <file/FResultSet.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/uno3.hxx>
 #include <osl/thread.h>
@@ -34,7 +34,7 @@
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <algorithm>
 
 namespace connectivity
diff --git a/connectivity/source/drivers/file/FStringFunctions.cxx b/connectivity/source/drivers/file/FStringFunctions.cxx
index be10a9ed8a6d..596196151327 100644
--- a/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "file/FStringFunctions.hxx"
+#include <file/FStringFunctions.hxx>
 #include <rtl/ustrbuf.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx
index d97707183cac..4a16a9af705e 100644
--- a/connectivity/source/drivers/file/FTable.cxx
+++ b/connectivity/source/drivers/file/FTable.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "file/FTable.hxx"
-#include "file/FColumns.hxx"
+#include <file/FTable.hxx>
+#include <file/FColumns.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <cppuhelper/typeprovider.hxx>
diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx
index 2722a1387ce9..9ccf5f35903e 100644
--- a/connectivity/source/drivers/file/FTables.cxx
+++ b/connectivity/source/drivers/file/FTables.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/FTables.hxx"
-#include "file/FTable.hxx"
+#include <file/FTables.hxx>
+#include <file/FTable.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
-#include "file/FCatalog.hxx"
-#include "file/FConnection.hxx"
+#include <file/FCatalog.hxx>
+#include <file/FConnection.hxx>
 
 using namespace connectivity;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx
index 2e457d5e222e..74a433d0adbe 100644
--- a/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/connectivity/source/drivers/file/fanalyzer.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/fanalyzer.hxx"
+#include <file/fanalyzer.hxx>
 #include <connectivity/sqlparse.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/extract.hxx>
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/dbexception.hxx>
-#include "file/FConnection.hxx"
-#include "strings.hrc"
+#include <file/FConnection.hxx>
+#include <strings.hrc>
 
 using namespace ::connectivity;
 using namespace ::connectivity::file;
diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx
index 6e3e29450fef..b14b0f233186 100644
--- a/connectivity/source/drivers/file/fcode.cxx
+++ b/connectivity/source/drivers/file/fcode.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/fcode.hxx"
+#include <file/fcode.hxx>
 #include <osl/diagnose.h>
 #include <connectivity/sqlparse.hxx>
-#include "sqlbison.hxx"
+#include <sqlbison.hxx>
 #include <i18nlangtag/mslangid.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
 #include <comphelper/types.hxx>
 
diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx
index 1953fb5303a6..3d7695caad29 100644
--- a/connectivity/source/drivers/file/fcomp.cxx
+++ b/connectivity/source/drivers/file/fcomp.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/fcomp.hxx"
+#include <file/fcomp.hxx>
 #include <tools/debug.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <connectivity/sqlparse.hxx>
-#include "file/fanalyzer.hxx"
+#include <file/fanalyzer.hxx>
 #include <com/sun/star/sdbc/XColumnLocate.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Date.hpp>
@@ -29,12 +29,12 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
-#include "file/FStringFunctions.hxx"
-#include "file/FDateFunctions.hxx"
-#include "file/FNumericFunctions.hxx"
-#include "file/FConnection.hxx"
-#include "sqlbison.hxx"
-#include "strings.hrc"
+#include <file/FStringFunctions.hxx>
+#include <file/FDateFunctions.hxx>
+#include <file/FNumericFunctions.hxx>
+#include <file/FConnection.hxx>
+#include <sqlbison.hxx>
+#include <strings.hrc>
 
 using namespace connectivity;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/file/quotedstring.cxx b/connectivity/source/drivers/file/quotedstring.cxx
index 3652f2d6c59c..f654c709ec64 100644
--- a/connectivity/source/drivers/file/quotedstring.cxx
+++ b/connectivity/source/drivers/file/quotedstring.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "file/quotedstring.hxx"
+#include <file/quotedstring.hxx>
 #include <rtl/ustrbuf.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/drivers/firebird/Column.cxx b/connectivity/source/drivers/firebird/Column.cxx
index 78ea2534e1fc..f5da82718b5a 100644
--- a/connectivity/source/drivers/firebird/Column.cxx
+++ b/connectivity/source/drivers/firebird/Column.cxx
@@ -10,7 +10,7 @@
 #include "Columns.hxx"
 #include "Column.hxx"
 
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace connectivity;
 using namespace connectivity::firebird;
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index 58b5a635ea7b..0db1a86a619d 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -24,8 +24,8 @@
 
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include "propertyids.hxx"
-#include "TConnection.hxx"
+#include <propertyids.hxx>
+#include <TConnection.hxx>
 
 using namespace ::connectivity::firebird;
 
diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx
index e16d3089a0a0..1cb343750748 100644
--- a/connectivity/source/drivers/firebird/Table.cxx
+++ b/connectivity/source/drivers/firebird/Table.cxx
@@ -12,7 +12,7 @@
 #include "Keys.hxx"
 #include "Table.hxx"
 
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx
index 48313c60805b..f1423763ab16 100644
--- a/connectivity/source/drivers/firebird/Tables.cxx
+++ b/connectivity/source/drivers/firebird/Tables.cxx
@@ -11,7 +11,7 @@
 #include "Tables.hxx"
 #include "Catalog.hxx"
 
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 #include <connectivity/dbtools.hxx>
 
diff --git a/connectivity/source/drivers/flat/ECatalog.cxx b/connectivity/source/drivers/flat/ECatalog.cxx
index f2d3e7cd23bc..3d24b1915ad6 100644
--- a/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/connectivity/source/drivers/flat/ECatalog.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "flat/ECatalog.hxx"
+#include <flat/ECatalog.hxx>
 
-#include "flat/EConnection.hxx"
-#include "flat/ETables.hxx"
+#include <flat/EConnection.hxx>
+#include <flat/ETables.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx
index 00cdfd623b13..e00e9b275443 100644
--- a/connectivity/source/drivers/flat/EColumns.cxx
+++ b/connectivity/source/drivers/flat/EColumns.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "flat/EColumns.hxx"
-#include "flat/ETable.hxx"
+#include <flat/EColumns.hxx>
+#include <flat/ETable.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 
 using namespace connectivity::flat;
diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx
index dcd6e689b19f..1ee3d2a23129 100644
--- a/connectivity/source/drivers/flat/EConnection.cxx
+++ b/connectivity/source/drivers/flat/EConnection.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "flat/EConnection.hxx"
-#include "flat/EDatabaseMetaData.hxx"
-#include "flat/ECatalog.hxx"
-#include "flat/EDriver.hxx"
+#include <flat/EConnection.hxx>
+#include <flat/EDatabaseMetaData.hxx>
+#include <flat/ECatalog.hxx>
+#include <flat/EDriver.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
-#include "flat/EPreparedStatement.hxx"
-#include "flat/EStatement.hxx"
+#include <flat/EPreparedStatement.hxx>
+#include <flat/EStatement.hxx>
 #include <comphelper/extract.hxx>
 #include <connectivity/dbexception.hxx>
 
diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index a1a80ff0d14d..b9c65817fd04 100644
--- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "flat/EDatabaseMetaData.hxx"
+#include <flat/EDatabaseMetaData.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <FDatabaseMetaDataResultSet.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <comphelper/types.hxx>
 
diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx
index 7f5c66f6b262..d4bde3ba363f 100644
--- a/connectivity/source/drivers/flat/EDriver.cxx
+++ b/connectivity/source/drivers/flat/EDriver.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "flat/EDriver.hxx"
-#include "flat/EConnection.hxx"
+#include <flat/EDriver.hxx>
+#include <flat/EConnection.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/sequence.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 #include <comphelper/processfactory.hxx>
 
 
diff --git a/connectivity/source/drivers/flat/EPreparedStatement.cxx b/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 2a51abb390d8..64a0b3a1c3bb 100644
--- a/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/connectivity/source/drivers/flat/EPreparedStatement.cxx
@@ -18,8 +18,8 @@
  */
 
 
-#include "flat/EPreparedStatement.hxx"
-#include "flat/EResultSet.hxx"
+#include <flat/EPreparedStatement.hxx>
+#include <flat/EResultSet.hxx>
 
 using namespace connectivity::flat;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx
index 890868c86026..8c1e155641ba 100644
--- a/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/connectivity/source/drivers/flat/EResultSet.cxx
@@ -19,7 +19,7 @@
 
 #include <com/sun/star/sdbcx/CompareBookmark.hpp>
 #include <com/sun/star/sdbcx/XDeleteRows.hpp>
-#include "flat/EResultSet.hxx"
+#include <flat/EResultSet.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/sequence.hxx>
 #include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/flat/EStatement.cxx b/connectivity/source/drivers/flat/EStatement.cxx
index 6f7acf300106..7774639052b3 100644
--- a/connectivity/source/drivers/flat/EStatement.cxx
+++ b/connectivity/source/drivers/flat/EStatement.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "flat/EStatement.hxx"
-#include "flat/EResultSet.hxx"
+#include <flat/EStatement.hxx>
+#include <flat/EResultSet.hxx>
 
 using namespace connectivity::flat;
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index b261ad3b9164..29a4db8b449c 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "flat/ETable.hxx"
+#include <flat/ETable.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <svl/converter.hxx>
-#include "flat/EConnection.hxx"
-#include "flat/EColumns.hxx"
+#include <flat/EConnection.hxx>
+#include <flat/EColumns.hxx>
 #include <osl/thread.h>
 #include <svl/zforlist.hxx>
 #include <rtl/math.hxx>
@@ -34,14 +34,14 @@
 #include <comphelper/sequence.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
-#include "flat/EDriver.hxx"
+#include <flat/EDriver.hxx>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/NumberFormatter.hpp>
 #include <com/sun/star/util/NumberFormatsSupplier.hpp>
 #include <unotools/configmgr.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <connectivity/dbconversion.hxx>
-#include "file/quotedstring.hxx"
+#include <file/quotedstring.hxx>
 #include <unotools/syslocale.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/flat/ETables.cxx b/connectivity/source/drivers/flat/ETables.cxx
index 5c9782caf24d..ebdaaa634703 100644
--- a/connectivity/source/drivers/flat/ETables.cxx
+++ b/connectivity/source/drivers/flat/ETables.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "flat/ETables.hxx"
-#include "flat/ETable.hxx"
+#include <flat/ETables.hxx>
+#include <flat/ETable.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
-#include "file/FCatalog.hxx"
-#include "file/FConnection.hxx"
+#include <file/FCatalog.hxx>
+#include <file/FConnection.hxx>
 #include <comphelper/types.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/drivers/flat/Eservices.cxx b/connectivity/source/drivers/flat/Eservices.cxx
index 04919d6f402c..5cd3092a329d 100644
--- a/connectivity/source/drivers/flat/Eservices.cxx
+++ b/connectivity/source/drivers/flat/Eservices.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "flat/EDriver.hxx"
+#include <flat/EDriver.hxx>
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::flat;
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 2864042b80e2..303abfcb6b05 100644
--- a/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hsqldb/HCatalog.hxx"
-#include "hsqldb/HUsers.hxx"
-#include "hsqldb/HTables.hxx"
-#include "hsqldb/HViews.hxx"
+#include <hsqldb/HCatalog.hxx>
+#include <hsqldb/HUsers.hxx>
+#include <hsqldb/HTables.hxx>
+#include <hsqldb/HViews.hxx>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx
index 2aae09029ad9..b5a893188db7 100644
--- a/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hsqldb/HColumns.hxx"
-#include "TConnection.hxx"
+#include <hsqldb/HColumns.hxx>
+#include <TConnection.hxx>
 
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx
index 056b888d1fea..acd4471dc600 100644
--- a/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -18,9 +18,9 @@
  */
 
 
-#include "hsqldb/HConnection.hxx"
-#include "hsqldb/HTools.hxx"
-#include "bitmaps.hlst"
+#include <hsqldb/HConnection.hxx>
+#include <hsqldb/HTools.hxx>
+#include <bitmaps.hlst>
 
 #include <connectivity/dbtools.hxx>
 
@@ -40,8 +40,8 @@
 #include <rtl/ustrbuf.hxx>
 #include <tools/diagnose_ex.h>
 
-#include "resource/sharedresources.hxx"
-#include "strings.hrc"
+#include <resource/sharedresources.hxx>
+#include <strings.hrc>
 
 using ::com::sun::star::util::XFlushListener;
 using ::com::sun::star::lang::EventObject;
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx
index c1a90263286d..215de60a03e0 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -19,8 +19,8 @@
 
 #include <config_folders.h>
 
-#include "hsqldb/HDriver.hxx"
-#include "hsqldb/HConnection.hxx"
+#include <hsqldb/HDriver.hxx>
+#include <hsqldb/HConnection.hxx>
 #include <osl/diagnose.h>
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -30,8 +30,8 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/embed/XTransactionBroadcaster.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
-#include "TConnection.hxx"
-#include "hsqldb/HStorageMap.hxx"
+#include <TConnection.hxx>
+#include <hsqldb/HStorageMap.hxx>
 #include <jvmfwk/framework.hxx>
 #include <com/sun/star/reflection/XProxyFactory.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
@@ -39,7 +39,7 @@
 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
 #include "HTerminateListener.hxx"
-#include "hsqldb/HCatalog.hxx"
+#include <hsqldb/HCatalog.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/file.h>
 #include <osl/process.h>
@@ -50,8 +50,8 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/ucbstreamhelper.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 #include <i18nlangtag/languagetag.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index e8030b2c0b71..ac705e7df694 100644
--- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hsqldb/HStorageAccess.hxx"
+#include <hsqldb/HStorageAccess.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/io/XStream.hpp>
-#include "hsqldb/HStorageMap.hxx"
+#include <hsqldb/HStorageMap.hxx>
 #include "accesslog.hxx"
 #include <osl/diagnose.h>
 
diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index d93fbb363d8a..f82c1a671c51 100644
--- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hsqldb/HStorageMap.hxx"
+#include <hsqldb/HStorageMap.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/embed/XTransactionBroadcaster.hpp>
 #include <com/sun/star/embed/XTransactedObject.hpp>
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index b37206798150..1c5e091fa5ec 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <string.h>
-#include "hsqldb/HTable.hxx"
-#include "hsqldb/HTables.hxx"
+#include <hsqldb/HTable.hxx>
+#include <hsqldb/HTables.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
@@ -36,9 +36,9 @@
 #include <connectivity/TKeys.hxx>
 #include <connectivity/TIndexes.hxx>
 #include <connectivity/TColumnsHelper.hxx>
-#include "hsqldb/HCatalog.hxx"
-#include "hsqldb/HColumns.hxx"
-#include "TConnection.hxx"
+#include <hsqldb/HCatalog.hxx>
+#include <hsqldb/HColumns.hxx>
+#include <TConnection.hxx>
 
 #include <tools/diagnose_ex.h>
 
diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx
index bdf01be13a1b..c3b76a8355a9 100644
--- a/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hsqldb/HTables.hxx"
-#include "hsqldb/HViews.hxx"
-#include "hsqldb/HTable.hxx"
+#include <hsqldb/HTables.hxx>
+#include <hsqldb/HViews.hxx>
+#include <hsqldb/HTable.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
-#include "hsqldb/HCatalog.hxx"
+#include <hsqldb/HCatalog.hxx>
 #include <comphelper/extract.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <comphelper/types.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index c62b5d87def0..df325efb75e8 100644
--- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -19,7 +19,7 @@
 
 
 #include "HTerminateListener.hxx"
-#include "hsqldb/HDriver.hxx"
+#include <hsqldb/HDriver.hxx>
 
 
 namespace connectivity
diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx
index 9794aee76286..9a31ace4602b 100644
--- a/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hsqldb/HTools.hxx"
+#include <hsqldb/HTools.hxx>
 
 
 namespace connectivity { namespace hsqldb
diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx
index 55b636b48211..5fd38f739a51 100644
--- a/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hsqldb/HUser.hxx"
+#include <hsqldb/HUser.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
-#include "TConnection.hxx"
-#include "strings.hrc"
+#include <TConnection.hxx>
+#include <strings.hrc>
 
 using namespace connectivity;
 using namespace connectivity::hsqldb;
diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx
index 424cf0670d3d..7c99f53d2694 100644
--- a/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "hsqldb/HUsers.hxx"
-#include "hsqldb/HUser.hxx"
-#include "hsqldb/HTable.hxx"
+#include <hsqldb/HUsers.hxx>
+#include <hsqldb/HUser.hxx>
+#include <hsqldb/HTable.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx
index cd6d61f44b87..b54b48cfb204 100644
--- a/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/connectivity/source/drivers/hsqldb/HView.cxx
@@ -18,10 +18,10 @@
  */
 
 
-#include "hsqldb/HView.hxx"
-#include "hsqldb/HTools.hxx"
+#include <hsqldb/HView.hxx>
+#include <hsqldb/HTools.hxx>
 
-#include "propertyids.hxx"
+#include <propertyids.hxx>
 
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx
index 54de4ebe9940..e7ff80db0038 100644
--- a/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -18,22 +18,22 @@
  */
 
 
-#include "hsqldb/HTables.hxx"
-#include "hsqldb/HViews.hxx"
-#include "hsqldb/HView.hxx"
+#include <hsqldb/HTables.hxx>
+#include <hsqldb/HViews.hxx>
+#include <hsqldb/HView.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/sdbcx/CheckOption.hpp>
-#include "hsqldb/HCatalog.hxx"
+#include <hsqldb/HCatalog.hxx>
 #include <comphelper/extract.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <comphelper/types.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx
index fcbd064cebc3..5bec6c648ade 100644
--- a/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "hsqldb/HDriver.hxx"
+#include <hsqldb/HDriver.hxx>
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::hsqldb;
diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index 769cea7001df..76e506595817 100644
--- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include "hsqldb/HStorageMap.hxx"
+#include <hsqldb/HStorageMap.hxx>
 #include <osl/diagnose.h>
 
 
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index 70cb184b5cb6..2c738f15f37f 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -27,8 +27,8 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <comphelper/types.hxx>
-#include "hsqldb/HStorageAccess.hxx"
-#include "hsqldb/HStorageMap.hxx"
+#include <hsqldb/HStorageAccess.hxx>
+#include <hsqldb/HStorageMap.hxx>
 
 #include <jvmaccess/virtualmachine.hxx>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index ad551ccce06c..f16a30bd8a82 100644
--- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -34,8 +34,8 @@
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <comphelper/types.hxx>
-#include "hsqldb/HStorageAccess.hxx"
-#include "hsqldb/HStorageMap.hxx"
+#include <hsqldb/HStorageAccess.hxx>
+#include <hsqldb/HStorageMap.hxx>
 
 #include <jvmaccess/virtualmachine.hxx>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx
index 3e67b7f2398f..a45961ff8cae 100644
--- a/connectivity/source/drivers/jdbc/Array.cxx
+++ b/connectivity/source/drivers/jdbc/Array.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/Array.hxx"
-#include "java/tools.hxx"
-#include "java/sql/ResultSet.hxx"
+#include <java/sql/Array.hxx>
+#include <java/tools.hxx>
+#include <java/sql/ResultSet.hxx>
 
 using namespace connectivity;
 
diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx
index 191a2f9a37f0..5d9b6b9c9b84 100644
--- a/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/connectivity/source/drivers/jdbc/Blob.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/Blob.hxx"
-#include "java/tools.hxx"
-#include "java/io/InputStream.hxx"
+#include <java/sql/Blob.hxx>
+#include <java/tools.hxx>
+#include <java/io/InputStream.hxx>
 #include <connectivity/dbexception.hxx>
 
 #include <string.h>
diff --git a/connectivity/source/drivers/jdbc/Boolean.cxx b/connectivity/source/drivers/jdbc/Boolean.cxx
index 38b6342bd7fd..acd1e81ef821 100644
--- a/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/lang/Boolean.hxx"
+#include <java/lang/Boolean.hxx>
 using namespace connectivity;
 
 //************ Class: java.lang.Boolean
diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 8d431b77c851..49c5b0d88bad 100644
--- a/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/CallableStatement.hxx"
-#include "java/tools.hxx"
-#include "java/sql/Array.hxx"
-#include "java/sql/Clob.hxx"
-#include "java/sql/Blob.hxx"
-#include "java/sql/Connection.hxx"
-#include "java/sql/Ref.hxx"
-#include "java/sql/Timestamp.hxx"
+#include <java/sql/CallableStatement.hxx>
+#include <java/tools.hxx>
+#include <java/sql/Array.hxx>
+#include <java/sql/Clob.hxx>
+#include <java/sql/Blob.hxx>
+#include <java/sql/Connection.hxx>
+#include <java/sql/Ref.hxx>
+#include <java/sql/Timestamp.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/connectivity/source/drivers/jdbc/Class.cxx b/connectivity/source/drivers/jdbc/Class.cxx
index 27daf652115c..b41d2f596933 100644
--- a/connectivity/source/drivers/jdbc/Class.cxx
+++ b/connectivity/source/drivers/jdbc/Class.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/lang/Class.hxx"
-#include "java/tools.hxx"
+#include <java/lang/Class.hxx>
+#include <java/tools.hxx>
 #include <rtl/ustring.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx
index a12cce6d2f6c..7e6f77de410d 100644
--- a/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/connectivity/source/drivers/jdbc/Clob.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/Clob.hxx"
-#include "java/tools.hxx"
-#include "java/io/Reader.hxx"
+#include <java/sql/Clob.hxx>
+#include <java/tools.hxx>
+#include <java/io/Reader.hxx>
 #include <connectivity/dbexception.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index f91f11b923f2..3218c0dc2bdc 100644
--- a/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -18,7 +18,7 @@
  */
 
 
-#include "java/sql/ConnectionLog.hxx"
+#include <java/sql/ConnectionLog.hxx>
 
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
diff --git a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 5f1d1349fb26..7572c1db7bae 100644
--- a/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/ContextClassLoader.hxx"
-#include "java/lang/Object.hxx"
+#include <java/ContextClassLoader.hxx>
+#include <java/lang/Object.hxx>
 
 
 namespace connectivity { namespace jdbc
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index 30eccc2b0ca9..fb13acb5e534 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -18,16 +18,16 @@
  */
 
 #include <sal/macros.h>
-#include "java/sql/DatabaseMetaData.hxx"
-#include "java/sql/Connection.hxx"
-#include "java/sql/ResultSet.hxx"
-#include "java/tools.hxx"
-#include "java/lang/String.hxx"
+#include <java/sql/DatabaseMetaData.hxx>
+#include <java/sql/Connection.hxx>
+#include <java/sql/ResultSet.hxx>
+#include <java/tools.hxx>
+#include <java/lang/String.hxx>
 #include <connectivity/CommonTools.hxx>
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <FDatabaseMetaDataResultSet.hxx>
 #include <comphelper/types.hxx>
-#include "TPrivilegesResultSet.hxx"
-#include "strings.hxx"
+#include <TPrivilegesResultSet.hxx>
+#include <strings.hxx>
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx
index 3db5a56fea9b..72efea3c89c1 100644
--- a/connectivity/source/drivers/jdbc/Date.cxx
+++ b/connectivity/source/drivers/jdbc/Date.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/util/Date.hxx"
-#include "java/tools.hxx"
+#include <java/util/Date.hxx>
+#include <java/tools.hxx>
 using namespace connectivity;
 
 //************ Class: java.util.Date
diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 3147ad9a69a7..7b0017a03f21 100644
--- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/DriverPropertyInfo.hxx"
-#include "java/lang/Boolean.hxx"
-#include "java/tools.hxx"
-#include "java/lang/String.hxx"
+#include <java/sql/DriverPropertyInfo.hxx>
+#include <java/lang/Boolean.hxx>
+#include <java/tools.hxx>
+#include <java/lang/String.hxx>
 
 using namespace connectivity;
 using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/jdbc/Exception.cxx b/connectivity/source/drivers/jdbc/Exception.cxx
index 9789beb8783d..2fdef4ee8028 100644
--- a/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/connectivity/source/drivers/jdbc/Exception.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/lang/Exception.hxx"
+#include <java/lang/Exception.hxx>
 using namespace connectivity;
 
 //************ Class: java.lang.Exception
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index c92b71344b8e..6f8aa6c950f0 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
-#include "com/sun/star/io/BufferSizeExceededException.hpp"
-#include "java/io/InputStream.hxx"
-#include "java/tools.hxx"
+#include <com/sun/star/io/BufferSizeExceededException.hpp>
+#include <java/io/InputStream.hxx>
+#include <java/tools.hxx>
 
 #include <string.h>
 
diff --git a/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index acffce89b759..7cbcd64860bc 100644
--- a/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/math/BigDecimal.hxx"
-#include "java/tools.hxx"
+#include <java/math/BigDecimal.hxx>
+#include <java/tools.hxx>
 using namespace connectivity;
 
 //************ Class: java.lang.Boolean
diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx
index 60d974079b6a..9450872c9923 100644
--- a/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -19,31 +19,31 @@
 
 #include <sal/config.h>
 
-#include "java/sql/Connection.hxx"
-#include "java/lang/Class.hxx"
-#include "java/tools.hxx"
-#include "java/ContextClassLoader.hxx"
-#include "java/sql/DatabaseMetaData.hxx"
-#include "java/sql/JStatement.hxx"
-#include "java/sql/Driver.hxx"
-#include "java/sql/PreparedStatement.hxx"
-#include "java/sql/CallableStatement.hxx"
-#include "java/sql/SQLWarning.hxx"
+#include <java/sql/Connection.hxx>
+#include <java/lang/Class.hxx>
+#include <java/tools.hxx>
+#include <java/ContextClassLoader.hxx>
+#include <java/sql/DatabaseMetaData.hxx>
+#include <java/sql/JStatement.hxx>
+#include <java/sql/Driver.hxx>
+#include <java/sql/PreparedStatement.hxx>
+#include <java/sql/CallableStatement.hxx>
+#include <java/sql/SQLWarning.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <connectivity/sqlparse.hxx>
 #include <connectivity/dbexception.hxx>
-#include "java/util/Property.hxx"
-#include "java/LocalRef.hxx"
+#include <java/util/Property.hxx>
+#include <java/LocalRef.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <jvmaccess/classpath.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <jni.h>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <unotools/confignode.hxx>
-#include "strings.hxx"
+#include <strings.hxx>
 
 #include <vector>
 #include <memory>
diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx
index c05372db4942..ed912aad3398 100644
--- a/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -17,20 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/Driver.hxx"
-#include "java/lang/Object.hxx"
-#include "java/lang/Class.hxx"
-#include "java/sql/DriverPropertyInfo.hxx"
-#include "java/sql/Connection.hxx"
-#include "java/util/Property.hxx"
-#include "java/tools.hxx"
+#include <java/sql/Driver.hxx>
+#include <java/lang/Object.hxx>
+#include <java/lang/Class.hxx>
+#include <java/sql/DriverPropertyInfo.hxx>
+#include <java/sql/Connection.hxx>
+#include <java/util/Property.hxx>
+#include <java/tools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <jvmfwk/framework.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "strings.hxx"
+#include <strings.hxx>
 
 using namespace connectivity;
 using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx
index 6a66929c8fea..16fbd290c197 100644
--- a/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -18,25 +18,25 @@
  */
 
 
-#include "java/sql/JStatement.hxx"
-#include "java/sql/ResultSet.hxx"
-#include "java/sql/Connection.hxx"
-#include "java/sql/SQLWarning.hxx"
-#include "java/tools.hxx"
-#include "java/ContextClassLoader.hxx"
+#include <java/sql/JStatement.hxx>
+#include <java/sql/ResultSet.hxx>
+#include <java/sql/Connection.hxx>
+#include <java/sql/SQLWarning.hxx>
+#include <java/tools.hxx>
+#include <java/ContextClassLoader.hxx>
 #include <comphelper/property.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/sequence.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 #include <tools/diagnose_ex.h>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/FetchDirection.hpp>
 
-#include "strings.hxx"
+#include <strings.hxx>
 
 #include <algorithm>
 #include <string.h>
diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx
index d90f94cf61e8..b8560ab99c1b 100644
--- a/connectivity/source/drivers/jdbc/Object.cxx
+++ b/connectivity/source/drivers/jdbc/Object.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/lang/Class.hxx"
+#include <java/lang/Class.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include "java/tools.hxx"
-#include "java/sql/SQLException.hxx"
+#include <java/tools.hxx>
+#include <java/sql/SQLException.hxx>
 #include <osl/thread.h>
-#include "java/LocalRef.hxx"
-#include "strings.hxx"
+#include <java/LocalRef.hxx>
+#include <strings.hxx>
 
 #include <comphelper/logging.hxx>
 
diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index b64a9fade6c7..3b726fe197b2 100644
--- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -17,23 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/PreparedStatement.hxx"
-#include "java/sql/ResultSet.hxx"
-#include "java/sql/ResultSetMetaData.hxx"
-#include "java/sql/Connection.hxx"
-#include "java/sql/Timestamp.hxx"
-#include "java/math/BigDecimal.hxx"
-#include "java/tools.hxx"
+#include <java/sql/PreparedStatement.hxx>
+#include <java/sql/ResultSet.hxx>
+#include <java/sql/ResultSetMetaData.hxx>
+#include <java/sql/Connection.hxx>
+#include <java/sql/Timestamp.hxx>
+#include <java/math/BigDecimal.hxx>
+#include <java/tools.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
-#include "java/LocalRef.hxx"
-#include "strings.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
+#include <java/LocalRef.hxx>
+#include <strings.hxx>
 #include <string.h>
 #include <memory>
 
diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx
index 1342d0c0a14c..ef5deeaac096 100644
--- a/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/connectivity/source/drivers/jdbc/Reader.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/io/Reader.hxx"
+#include <java/io/Reader.hxx>
 #include <string.h>
 using namespace connectivity;
 using ::com::sun::star::uno::Sequence;
diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx
index c22001d6c477..bde596267d04 100644
--- a/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/connectivity/source/drivers/jdbc/Ref.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/Ref.hxx"
-#include "java/tools.hxx"
+#include <java/sql/Ref.hxx>
+#include <java/tools.hxx>
 using namespace connectivity;
 
 //************ Class: java.sql.Ref
diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx
index d0db5f52078d..97b1f1233e50 100644
--- a/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -17,33 +17,33 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/lang/String.hxx"
-#include "java/lang/Boolean.hxx"
-#include "java/sql/ResultSet.hxx"
-#include "java/math/BigDecimal.hxx"
-#include "java/sql/JStatement.hxx"
-#include "java/sql/SQLWarning.hxx"
-#include "java/sql/Timestamp.hxx"
-#include "java/sql/Array.hxx"
-#include "java/sql/Ref.hxx"
-#include "java/sql/Clob.hxx"
-#include "java/sql/Blob.hxx"
-#include "java/sql/ResultSetMetaData.hxx"
-#include "java/io/InputStream.hxx"
-#include "java/io/Reader.hxx"
-#include "java/tools.hxx"
+#include <java/lang/String.hxx>
+#include <java/lang/Boolean.hxx>
+#include <java/sql/ResultSet.hxx>
+#include <java/math/BigDecimal.hxx>
+#include <java/sql/JStatement.hxx>
+#include <java/sql/SQLWarning.hxx>
+#include <java/sql/Timestamp.hxx>
+#include <java/sql/Array.hxx>
+#include <java/sql/Ref.hxx>
+#include <java/sql/Clob.hxx>
+#include <java/sql/Blob.hxx>
+#include <java/sql/ResultSetMetaData.hxx>
+#include <java/io/InputStream.hxx>
+#include <java/io/Reader.hxx>
+#include <java/tools.hxx>
 #include <comphelper/property.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
-#include "java/LocalRef.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
+#include <java/LocalRef.hxx>
 
 #include <string.h>
 #include <memory>
diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 4bc977b6bd54..691a136e4a2f 100644
--- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/ResultSetMetaData.hxx"
-#include "java/sql/Connection.hxx"
-#include "java/tools.hxx"
+#include <java/sql/ResultSetMetaData.hxx>
+#include <java/sql/Connection.hxx>
+#include <java/tools.hxx>
 
 using namespace connectivity;
 using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/jdbc/SQLException.cxx b/connectivity/source/drivers/jdbc/SQLException.cxx
index 882d6cb6da33..0bff0890572d 100644
--- a/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/SQLException.hxx"
-#include "java/tools.hxx"
+#include <java/sql/SQLException.hxx>
+#include <java/tools.hxx>
 
 using namespace connectivity;
 using namespace ::com::sun::star::uno;
diff --git a/connectivity/source/drivers/jdbc/SQLWarning.cxx b/connectivity/source/drivers/jdbc/SQLWarning.cxx
index b23526770717..16616d18bb9e 100644
--- a/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/connectivity/source/drivers/jdbc/SQLWarning.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/SQLWarning.hxx"
+#include <java/sql/SQLWarning.hxx>
 using namespace connectivity;
 
 //************ Class: java.sql.SQLWarning
diff --git a/connectivity/source/drivers/jdbc/String.cxx b/connectivity/source/drivers/jdbc/String.cxx
index db3553586338..f7e682c0281c 100644
--- a/connectivity/source/drivers/jdbc/String.cxx
+++ b/connectivity/source/drivers/jdbc/String.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/lang/String.hxx"
-#include "java/tools.hxx"
+#include <java/lang/String.hxx>
+#include <java/tools.hxx>
 using namespace connectivity;
 
 //************ Class: java.lang.String
diff --git a/connectivity/source/drivers/jdbc/Throwable.cxx b/connectivity/source/drivers/jdbc/Throwable.cxx
index f278224459c4..e732d56b2892 100644
--- a/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/lang/Throwable.hxx"
-#include "java/tools.hxx"
+#include <java/lang/Throwable.hxx>
+#include <java/tools.hxx>
 using namespace connectivity;
 
 //************ Class: java.lang.Throwable
diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx
index 41a29d0baa77..f52c8ad891b9 100644
--- a/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/Timestamp.hxx"
-#include "java/tools.hxx"
+#include <java/sql/Timestamp.hxx>
+#include <java/tools.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbconversion.hxx>
 
diff --git a/connectivity/source/drivers/jdbc/jservices.cxx b/connectivity/source/drivers/jdbc/jservices.cxx
index 0712ff682e19..6f78fcc51108 100644
--- a/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/connectivity/source/drivers/jdbc/jservices.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "java/sql/Driver.hxx"
+#include <java/sql/Driver.hxx>
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity;
diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx
index cdb69dd3a76c..7625f3eb5a1e 100644
--- a/connectivity/source/drivers/jdbc/tools.cxx
+++ b/connectivity/source/drivers/jdbc/tools.cxx
@@ -20,10 +20,10 @@
 
 #include <string.h>
 #include <cstdarg>
-#include "java/tools.hxx"
-#include "java/lang/String.hxx"
-#include "java/lang/Class.hxx"
-#include "java/util/Property.hxx"
+#include <java/tools.hxx>
+#include <java/lang/String.hxx>
+#include <java/lang/Class.hxx>
+#include <java/util/Property.hxx>
 #include <com/sun/star/sdbc/DriverPropertyInfo.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <connectivity/dbexception.hxx>
diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx
index 32ea6b192128..3f861f6045a3 100644
--- a/connectivity/source/drivers/mork/MConnection.cxx
+++ b/connectivity/source/drivers/mork/MConnection.cxx
@@ -16,7 +16,7 @@
 
 #include <connectivity/dbexception.hxx>
 
-#include "strings.hrc"
+#include <strings.hrc>
 
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index 7c30b17ae098..2d2b502a8bc2 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCONNECTION_HXX
 
 #include <connectivity/OSubComponent.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include "MColumnAlias.hxx"
 
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index af42e314c41b..585d0bc61d9a 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -12,7 +12,7 @@
 
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <vector>
 
 #include "MDatabaseMetaDataHelper.hxx"
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
index 58b6a213050b..cda03805e0b1 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx
@@ -11,7 +11,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATA_HXX
 
 #include <memory>
-#include "TDatabaseMetaDataBase.hxx"
+#include <TDatabaseMetaDataBase.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
index 47ec10ff991c..21eabd597eb1 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATAHELPER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATAHELPER_HXX
 
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <FDatabaseMetaDataResultSet.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/mork/MQueryHelper.cxx b/connectivity/source/drivers/mork/MQueryHelper.cxx
index 5e93429349b3..94f07cdfd3f3 100644
--- a/connectivity/source/drivers/mork/MQueryHelper.cxx
+++ b/connectivity/source/drivers/mork/MQueryHelper.cxx
@@ -30,7 +30,7 @@
 #include <algorithm>
 #include <string.h>
 
-#include "strings.hrc"
+#include <strings.hrc>
 
 #include <unotools/textsearch.hxx>
 
diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx
index c461d4e09a54..61ff7dd8e15f 100644
--- a/connectivity/source/drivers/mork/MResultSet.cxx
+++ b/connectivity/source/drivers/mork/MResultSet.cxx
@@ -26,11 +26,11 @@
 #include <vector>
 #include <algorithm>
 #include "MResultSet.hxx"
-#include "sqlbison.hxx"
+#include <sqlbison.hxx>
 #include "MResultSetMetaData.hxx"
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <FDatabaseMetaDataResultSet.hxx>
 
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx
index 1a3c8f9d7598..5c040c9aabeb 100644
--- a/connectivity/source/drivers/mork/MResultSet.hxx
+++ b/connectivity/source/drivers/mork/MResultSet.hxx
@@ -40,7 +40,7 @@
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/FValue.hxx>
 #include <connectivity/sqliterator.hxx>
-#include "TSortIndex.hxx"
+#include <TSortIndex.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 965fa5f2acc5..34e94fa3f6e4 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -27,10 +27,10 @@
 
 #include "MDriver.hxx"
 #include "MStatement.hxx"
-#include "sqlbison.hxx"
+#include <sqlbison.hxx>
 #include "MResultSet.hxx"
 
-#include "strings.hrc"
+#include <strings.hrc>
 
 static ::osl::Mutex m_ThreadMutex;
 
diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx
index bd707a954e08..dc4717915b45 100644
--- a/connectivity/source/drivers/mork/MStatement.hxx
+++ b/connectivity/source/drivers/mork/MStatement.hxx
@@ -23,7 +23,7 @@
 #include <comphelper/proparrhlp.hxx>
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/sqlparse.hxx>
-#include "TSortIndex.hxx"
+#include <TSortIndex.hxx>
 #include "MTable.hxx"
 
 #include <memory>
diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx
index 47eb3dd38232..13c53f62c154 100644
--- a/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "mysql/YCatalog.hxx"
-#include "mysql/YUsers.hxx"
-#include "mysql/YTables.hxx"
-#include "mysql/YViews.hxx"
+#include <mysql/YCatalog.hxx>
+#include <mysql/YUsers.hxx>
+#include <mysql/YTables.hxx>
+#include <mysql/YViews.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <comphelper/types.hxx>
diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx
index d8e0b75e3ce7..b4b418fb6583 100644
--- a/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/connectivity/source/drivers/mysql/YColumns.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "mysql/YColumns.hxx"
-#include "TConnection.hxx"
+#include <mysql/YColumns.hxx>
+#include <TConnection.hxx>
 
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx
index f5d5b2cd83ba..b814d5f31e9c 100644
--- a/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/connectivity/source/drivers/mysql/YDriver.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "mysql/YDriver.hxx"
-#include "mysql/YCatalog.hxx"
+#include <mysql/YDriver.hxx>
+#include <mysql/YCatalog.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -26,9 +26,9 @@
 #include <connectivity/dbcharset.hxx>
 #include <com/sun/star/sdbc/DriverManager.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include "TConnection.hxx"
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <TConnection.hxx>
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx
index db9b591ad23e..e5ea3168f2ac 100644
--- a/connectivity/source/drivers/mysql/YTable.cxx
+++ b/connectivity/source/drivers/mysql/YTable.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <string.h>
-#include "mysql/YTable.hxx"
-#include "mysql/YTables.hxx"
+#include <mysql/YTable.hxx>
+#include <mysql/YTables.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
@@ -36,9 +36,9 @@
 #include <connectivity/TKeys.hxx>
 #include <connectivity/TIndexes.hxx>
 #include <connectivity/TColumnsHelper.hxx>
-#include "mysql/YCatalog.hxx"
-#include "mysql/YColumns.hxx"
-#include "TConnection.hxx"
+#include <mysql/YCatalog.hxx>
+#include <mysql/YColumns.hxx>
+#include <TConnection.hxx>
 
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx
index 26ac43ca60f6..988016796b7c 100644
--- a/connectivity/source/drivers/mysql/YTables.cxx
+++ b/connectivity/source/drivers/mysql/YTables.cxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "mysql/YTables.hxx"
-#include "mysql/YViews.hxx"
-#include "mysql/YTable.hxx"
+#include <mysql/YTables.hxx>
+#include <mysql/YViews.hxx>
+#include <mysql/YTable.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
-#include "mysql/YCatalog.hxx"
+#include <mysql/YCatalog.hxx>
 #include <comphelper/extract.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <comphelper/types.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx
index 846f41ba8269..bc9c8c55b22e 100644
--- a/connectivity/source/drivers/mysql/YUser.cxx
+++ b/connectivity/source/drivers/mysql/YUser.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "mysql/YUser.hxx"
+#include <mysql/YUser.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
-#include "TConnection.hxx"
-#include "strings.hrc"
+#include <TConnection.hxx>
+#include <strings.hrc>
 
 using namespace connectivity;
 using namespace connectivity::mysql;
diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx
index db24a1d38976..0b03cf0d87ef 100644
--- a/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/connectivity/source/drivers/mysql/YUsers.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "mysql/YUsers.hxx"
-#include "mysql/YUser.hxx"
-#include "mysql/YTable.hxx"
+#include <mysql/YUsers.hxx>
+#include <mysql/YUser.hxx>
+#include <mysql/YTable.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <connectivity/sdbcx/IRefreshable.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace ::comphelper;
 using namespace connectivity;
diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx
index db8619d7e287..874f8ce33ee8 100644
--- a/connectivity/source/drivers/mysql/YViews.cxx
+++ b/connectivity/source/drivers/mysql/YViews.cxx
@@ -17,22 +17,22 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "mysql/YViews.hxx"
-#include "mysql/YTables.hxx"
+#include <mysql/YViews.hxx>
+#include <mysql/YTables.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/sdbcx/CheckOption.hpp>
-#include "mysql/YCatalog.hxx"
+#include <mysql/YCatalog.hxx>
 #include <comphelper/extract.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <connectivity/sdbcx/VView.hxx>
 #include <comphelper/types.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace ::comphelper;
 
diff --git a/connectivity/source/drivers/mysql/Yservices.cxx b/connectivity/source/drivers/mysql/Yservices.cxx
index e23d1b68f8a4..20f337e80530 100644
--- a/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/connectivity/source/drivers/mysql/Yservices.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "mysql/YDriver.hxx"
+#include <mysql/YDriver.hxx>
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::mysql;
diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx
index ea2d0e07417b..47e7edefb470 100644
--- a/connectivity/source/drivers/odbc/OConnection.cxx
+++ b/connectivity/source/drivers/odbc/OConnection.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "odbc/OTools.hxx"
-#include "odbc/OConnection.hxx"
-#include "odbc/ODatabaseMetaData.hxx"
-#include "odbc/OFunctions.hxx"
-#include "odbc/ODriver.hxx"
-#include "odbc/OStatement.hxx"
-#include "odbc/OPreparedStatement.hxx"
+#include <odbc/OTools.hxx>
+#include <odbc/OConnection.hxx>
+#include <odbc/ODatabaseMetaData.hxx>
+#include <odbc/OFunctions.hxx>
+#include <odbc/ODriver.hxx>
+#include <odbc/OStatement.hxx>
+#include <odbc/OPreparedStatement.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
index 9ff961f09e19..7f6fe1b5a9bd 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "odbc/ODatabaseMetaData.hxx"
-#include "odbc/OTools.hxx"
-#include "odbc/ODatabaseMetaDataResultSet.hxx"
-#include "FDatabaseMetaDataResultSet.hxx"
+#include <odbc/ODatabaseMetaData.hxx>
+#include <odbc/OTools.hxx>
+#include <odbc/ODatabaseMetaDataResultSet.hxx>
+#include <FDatabaseMetaDataResultSet.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbc/TransactionIsolation.hpp>
 #include <connectivity/odbc.hxx>
-#include "TPrivilegesResultSet.hxx"
+#include <TPrivilegesResultSet.hxx>
 #include <connectivity/dbexception.hxx>
 #include <rtl/ustrbuf.hxx>
 
diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
index 370b26f60abb..54dc44decfe9 100644
--- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
-#include "odbc/ODatabaseMetaDataResultSet.hxx"
+#include <odbc/ODatabaseMetaDataResultSet.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 #include <com/sun/star/sdbc/ProcedureResult.hpp>
@@ -28,10 +28,10 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/sequence.hxx>
-#include "odbc/OResultSetMetaData.hxx"
-#include "odbc/OTools.hxx"
+#include <odbc/OResultSetMetaData.hxx>
+#include <odbc/OTools.hxx>
 #include <comphelper/types.hxx>
-#include "FDatabaseMetaDataResultSetMetaData.hxx"
+#include <FDatabaseMetaDataResultSetMetaData.hxx>
 #include <connectivity/dbexception.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx
index 72ae9593c783..33f29d656179 100644
--- a/connectivity/source/drivers/odbc/ODriver.cxx
+++ b/connectivity/source/drivers/odbc/ODriver.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "odbc/ODriver.hxx"
-#include "odbc/OConnection.hxx"
-#include "odbc/OFunctions.hxx"
-#include "odbc/OTools.hxx"
+#include <odbc/ODriver.hxx>
+#include <odbc/OConnection.hxx>
+#include <odbc/OFunctions.hxx>
+#include <odbc/OTools.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 
 using namespace connectivity::odbc;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/odbc/OFunctions.cxx b/connectivity/source/drivers/odbc/OFunctions.cxx
index 27170cd4b392..dbbcdc7ff7f0 100644
--- a/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "odbc/OFunctions.hxx"
+#include <odbc/OFunctions.hxx>
 #include <osl/process.h>
 
 // Implib definitions for ODBC-DLL/shared library:
diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
index 0bc55f8eb247..2bcfb700281b 100644
--- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx
+++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx
@@ -20,14 +20,14 @@
 
 #include <string.h>
 #include <osl/diagnose.h>
-#include "odbc/OPreparedStatement.hxx"
-#include "odbc/OBoundParam.hxx"
+#include <odbc/OPreparedStatement.hxx>
+#include <odbc/OBoundParam.hxx>
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include "odbc/OTools.hxx"
-#include "odbc/ODriver.hxx"
-#include "odbc/OResultSet.hxx"
-#include "odbc/OResultSetMetaData.hxx"
+#include <odbc/OTools.hxx>
+#include <odbc/ODriver.hxx>
+#include <odbc/OResultSet.hxx>
+#include <odbc/OResultSetMetaData.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequence.hxx>
@@ -35,7 +35,7 @@
 #include <connectivity/dbtools.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/FValue.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <connectivity/sqlparse.hxx>
 #include <memory>
 #include <type_traits>
diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx
index 9ad73f59038e..ee59b0d8ae15 100644
--- a/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "ORealDriver.hxx"
-#include "odbc/ODriver.hxx"
-#include "odbc/OTools.hxx"
-#include "odbc/OFunctions.hxx"
+#include <odbc/ODriver.hxx>
+#include <odbc/OTools.hxx>
+#include <odbc/OFunctions.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx
index 7a74762a30c0..e3a9d0aa0e4e 100644
--- a/connectivity/source/drivers/odbc/OResultSet.cxx
+++ b/connectivity/source/drivers/odbc/OResultSet.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "odbc/OResultSet.hxx"
-#include "odbc/OTools.hxx"
-#include "odbc/OResultSetMetaData.hxx"
+#include <odbc/OResultSet.hxx>
+#include <odbc/OTools.hxx>
+#include <odbc/OResultSetMetaData.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyVetoException.hpp>
diff --git a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
index 225f2b5eb62b..59e3fea862b2 100644
--- a/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
+++ b/connectivity/source/drivers/odbc/OResultSetMetaData.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "odbc/OResultSetMetaData.hxx"
-#include "odbc/OTools.hxx"
+#include <odbc/OResultSetMetaData.hxx>
+#include <odbc/OTools.hxx>
 
 using namespace connectivity::odbc;
 using namespace com::sun::star::uno;
diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx
index afa32c37bd4e..3137eb656bb6 100644
--- a/connectivity/source/drivers/odbc/OStatement.cxx
+++ b/connectivity/source/drivers/odbc/OStatement.cxx
@@ -19,11 +19,11 @@
 
 
 #include <osl/diagnose.h>
-#include "odbc/OStatement.hxx"
-#include "odbc/OConnection.hxx"
-#include "odbc/OResultSet.hxx"
+#include <odbc/OStatement.hxx>
+#include <odbc/OConnection.hxx>
+#include <odbc/OResultSet.hxx>
 #include <comphelper/property.hxx>
-#include "odbc/OTools.hxx"
+#include <odbc/OTools.hxx>
 #include <osl/thread.h>
 #include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
 #include <com/sun/star/sdbc/ResultSetType.hpp>
@@ -35,7 +35,7 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
 #include <algorithm>
-#include "strings.hrc"
+#include <strings.hrc>
 #include <connectivity/dbexception.hxx>
 
 using namespace ::comphelper;
diff --git a/connectivity/source/drivers/odbc/OTools.cxx b/connectivity/source/drivers/odbc/OTools.cxx
index cf4d64d994d0..5424ef8cc756 100644
--- a/connectivity/source/drivers/odbc/OTools.cxx
+++ b/connectivity/source/drivers/odbc/OTools.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "odbc/OTools.hxx"
-#include "odbc/OFunctions.hxx"
+#include <odbc/OTools.hxx>
+#include <odbc/OFunctions.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <osl/diagnose.h>
 #include <osl/endian.h>
-#include "odbc/OConnection.hxx"
+#include <odbc/OConnection.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <string.h>
diff --git a/connectivity/source/drivers/odbc/oservices.cxx b/connectivity/source/drivers/odbc/oservices.cxx
index 6895a9b3ea69..4d13ae9bdef9 100644
--- a/connectivity/source/drivers/odbc/oservices.cxx
+++ b/connectivity/source/drivers/odbc/oservices.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "ORealDriver.hxx"
-#include "odbc/ODriver.hxx"
+#include <odbc/ODriver.hxx>
 #include <cppuhelper/factory.hxx>
 
 using namespace connectivity::odbc;
diff --git a/connectivity/source/drivers/writer/WCatalog.cxx b/connectivity/source/drivers/writer/WCatalog.cxx
index 0cf4a1626e40..14e15516d007 100644
--- a/connectivity/source/drivers/writer/WCatalog.cxx
+++ b/connectivity/source/drivers/writer/WCatalog.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "writer/WCatalog.hxx"
-#include "writer/WTables.hxx"
+#include <writer/WCatalog.hxx>
+#include <writer/WTables.hxx>
 
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 
 #include <connectivity/sdbcx/VCollection.hxx>
 
-#include "writer/WConnection.hxx"
+#include <writer/WConnection.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx
index 0a4763e43618..d0e6b2983c14 100644
--- a/connectivity/source/drivers/writer/WConnection.cxx
+++ b/connectivity/source/drivers/writer/WConnection.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "writer/WConnection.hxx"
-#include "writer/WDatabaseMetaData.hxx"
-#include "writer/WCatalog.hxx"
-#include "writer/WDriver.hxx"
-#include "resource/sharedresources.hxx"
-#include "strings.hrc"
+#include <writer/WConnection.hxx>
+#include <writer/WDatabaseMetaData.hxx>
+#include <writer/WCatalog.hxx>
+#include <writer/WDriver.hxx>
+#include <resource/sharedresources.hxx>
+#include <strings.hrc>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <tools/urlobj.hxx>
-#include "component/CPreparedStatement.hxx"
-#include "component/CStatement.hxx"
+#include <component/CPreparedStatement.hxx>
+#include <component/CStatement.hxx>
 #include <unotools/pathoptions.hxx>
 #include <connectivity/dbexception.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
index e83ea87e198d..5dcad41d3eb2 100644
--- a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "writer/WDatabaseMetaData.hxx"
-#include "writer/WConnection.hxx"
+#include <writer/WDatabaseMetaData.hxx>
+#include <writer/WConnection.hxx>
 #include <com/sun/star/text/XTextTablesSupplier.hpp>
 
 using namespace ::com::sun::star;
diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx
index ae6a08157390..d19f2fb2425b 100644
--- a/connectivity/source/drivers/writer/WDriver.cxx
+++ b/connectivity/source/drivers/writer/WDriver.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "writer/WDriver.hxx"
-#include "writer/WConnection.hxx"
+#include <writer/WDriver.hxx>
+#include <writer/WConnection.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/dbexception.hxx>
-#include "resource/sharedresources.hxx"
-#include "strings.hrc"
+#include <resource/sharedresources.hxx>
+#include <strings.hrc>
 #include <comphelper/processfactory.hxx>
 
 using namespace connectivity::file;
diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx
index 9f08b05ca48a..ab191b37f995 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "writer/WTable.hxx"
+#include <writer/WTable.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -30,8 +30,8 @@
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <svl/converter.hxx>
-#include "writer/WConnection.hxx"
-#include "component/CColumns.hxx"
+#include <writer/WConnection.hxx>
+#include <component/CColumns.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/thread.h>
diff --git a/connectivity/source/drivers/writer/WTables.cxx b/connectivity/source/drivers/writer/WTables.cxx
index 685a5b778c54..b41e3ac63bd1 100644
--- a/connectivity/source/drivers/writer/WTables.cxx
+++ b/connectivity/source/drivers/writer/WTables.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "writer/WTables.hxx"
+#include <writer/WTables.hxx>
 
 #include <sal/config.h>
 
 #include <comphelper/types.hxx>
 
 #include <writer/WConnection.hxx>
-#include "file/FCatalog.hxx"
-#include "file/FConnection.hxx"
-#include "writer/WCatalog.hxx"
-#include "writer/WTable.hxx"
+#include <file/FCatalog.hxx>
+#include <file/FConnection.hxx>
+#include <writer/WCatalog.hxx>
+#include <writer/WTable.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/connectivity/source/drivers/writer/Wservices.cxx b/connectivity/source/drivers/writer/Wservices.cxx
index 4e439bece7e0..8b1a7cb314f4 100644
--- a/connectivity/source/drivers/writer/Wservices.cxx
+++ b/connectivity/source/drivers/writer/Wservices.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "writer/WDriver.hxx"
+#include <writer/WDriver.hxx>
 #include <cppuhelper/factory.hxx>
 
 using namespace com::sun::star;
diff --git a/connectivity/source/inc/calc/CCatalog.hxx b/connectivity/source/inc/calc/CCatalog.hxx
index bbdfeea3960a..57051fe8e183 100644
--- a/connectivity/source/inc/calc/CCatalog.hxx
+++ b/connectivity/source/inc/calc/CCatalog.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CCATALOG_HXX
 
-#include "file/FCatalog.hxx"
+#include <file/FCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/calc/CConnection.hxx b/connectivity/source/inc/calc/CConnection.hxx
index b526a8e3a705..08af0458246c 100644
--- a/connectivity/source/inc/calc/CConnection.hxx
+++ b/connectivity/source/inc/calc/CConnection.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CCONNECTION_HXX
 
 #include <memory>
-#include "file/FConnection.hxx"
+#include <file/FConnection.hxx>
 #include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
diff --git a/connectivity/source/inc/calc/CDatabaseMetaData.hxx b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
index 7062a7675efb..7cda0f1c8ef2 100644
--- a/connectivity/source/inc/calc/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/calc/CDatabaseMetaData.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDATABASEMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDATABASEMETADATA_HXX
 
-#include "component/CDatabaseMetaData.hxx"
+#include <component/CDatabaseMetaData.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/calc/CDriver.hxx b/connectivity/source/inc/calc/CDriver.hxx
index 32e23fe16ea0..831284c7c68b 100644
--- a/connectivity/source/inc/calc/CDriver.hxx
+++ b/connectivity/source/inc/calc/CDriver.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDRIVER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CDRIVER_HXX
 
-#include "file/FDriver.hxx"
+#include <file/FDriver.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
diff --git a/connectivity/source/inc/calc/CTable.hxx b/connectivity/source/inc/calc/CTable.hxx
index a4012c4a6305..19cd32116ea1 100644
--- a/connectivity/source/inc/calc/CTable.hxx
+++ b/connectivity/source/inc/calc/CTable.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLE_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLE_HXX
 
-#include "component/CTable.hxx"
+#include <component/CTable.hxx>
 #include <tools/date.hxx>
 
 namespace com { namespace sun { namespace star { namespace sheet {
diff --git a/connectivity/source/inc/calc/CTables.hxx b/connectivity/source/inc/calc/CTables.hxx
index 36c8b9bb8118..b88938cd0d06 100644
--- a/connectivity/source/inc/calc/CTables.hxx
+++ b/connectivity/source/inc/calc/CTables.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLES_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_CALC_CTABLES_HXX
 
-#include "file/FTables.hxx"
+#include <file/FTables.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/component/CColumns.hxx b/connectivity/source/inc/component/CColumns.hxx
index 3ecec1d0b637..ab5ebbf12964 100644
--- a/connectivity/source/inc/component/CColumns.hxx
+++ b/connectivity/source/inc/component/CColumns.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CCOLUMNS_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CCOLUMNS_HXX
 
-#include "file/FColumns.hxx"
+#include <file/FColumns.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/component/CDatabaseMetaData.hxx b/connectivity/source/inc/component/CDatabaseMetaData.hxx
index 36cf77510010..6006455a3029 100644
--- a/connectivity/source/inc/component/CDatabaseMetaData.hxx
+++ b/connectivity/source/inc/component/CDatabaseMetaData.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CDATABASEMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CDATABASEMETADATA_HXX
 
-#include "file/FDatabaseMetaData.hxx"
+#include <file/FDatabaseMetaData.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/component/CPreparedStatement.hxx b/connectivity/source/inc/component/CPreparedStatement.hxx
index 55f8bf9f84c0..30597141a023 100644
--- a/connectivity/source/inc/component/CPreparedStatement.hxx
+++ b/connectivity/source/inc/component/CPreparedStatement.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CPREPAREDSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CPREPAREDSTATEMENT_HXX
 
-#include "file/FPreparedStatement.hxx"
+#include <file/FPreparedStatement.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/component/CResultSet.hxx b/connectivity/source/inc/component/CResultSet.hxx
index 1779412c6c1d..ca1423a9a969 100644
--- a/connectivity/source/inc/component/CResultSet.hxx
+++ b/connectivity/source/inc/component/CResultSet.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CRESULTSET_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CRESULTSET_HXX
 
-#include "file/FResultSet.hxx"
+#include <file/FResultSet.hxx>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/sdbcx/XDeleteRows.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/connectivity/source/inc/component/CStatement.hxx b/connectivity/source/inc/component/CStatement.hxx
index 695d92a4e225..d7fc749810e5 100644
--- a/connectivity/source/inc/component/CStatement.hxx
+++ b/connectivity/source/inc/component/CStatement.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CSTATEMENT_HXX
 
-#include "file/FStatement.hxx"
+#include <file/FStatement.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/component/CTable.hxx b/connectivity/source/inc/component/CTable.hxx
index d268ad01a79e..f1daff08633c 100644
--- a/connectivity/source/inc/component/CTable.hxx
+++ b/connectivity/source/inc/component/CTable.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CTABLE_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_COMPONENT_CTABLE_HXX
 
-#include "file/FTable.hxx"
+#include <file/FTable.hxx>
 #include <tools/date.hxx>
 
 namespace com { namespace sun { namespace star { namespace sheet {
diff --git a/connectivity/source/inc/dbase/DCatalog.hxx b/connectivity/source/inc/dbase/DCatalog.hxx
index 3a4d1bdf4976..3ccfed6f661c 100644
--- a/connectivity/source/inc/dbase/DCatalog.hxx
+++ b/connectivity/source/inc/dbase/DCatalog.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCATALOG_HXX
 
-#include "file/FCatalog.hxx"
+#include <file/FCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DColumns.hxx b/connectivity/source/inc/dbase/DColumns.hxx
index 92e0858d54fa..841bba946bb2 100644
--- a/connectivity/source/inc/dbase/DColumns.hxx
+++ b/connectivity/source/inc/dbase/DColumns.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCOLUMNS_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCOLUMNS_HXX
 
-#include "file/FColumns.hxx"
+#include <file/FColumns.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DConnection.hxx b/connectivity/source/inc/dbase/DConnection.hxx
index 19a837faf258..f09eec3ca614 100644
--- a/connectivity/source/inc/dbase/DConnection.hxx
+++ b/connectivity/source/inc/dbase/DConnection.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCONNECTION_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DCONNECTION_HXX
 
-#include "file/FConnection.hxx"
+#include <file/FConnection.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
index 8576270c848c..3424f9c8b5e4 100644
--- a/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
+++ b/connectivity/source/inc/dbase/DDatabaseMetaData.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDATABASEMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDATABASEMETADATA_HXX
 
-#include "file/FDatabaseMetaData.hxx"
+#include <file/FDatabaseMetaData.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx
index 8d792bf898ad..d8d340af840f 100644
--- a/connectivity/source/inc/dbase/DDriver.hxx
+++ b/connectivity/source/inc/dbase/DDriver.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <connectivity/CommonTools.hxx>
-#include "file/FDriver.hxx"
+#include <file/FDriver.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index 47b157e21cfd..8a0f0bff8b1f 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -22,8 +22,8 @@
 
 #include <connectivity/sdbcx/VIndex.hxx>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include "dbase/DTable.hxx"
-#include "dbase/dindexnode.hxx"
+#include <dbase/DTable.hxx>
+#include <dbase/dindexnode.hxx>
 
 #define dBASE_III_GROUP "dBase III"
 
diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx
index 636cb9d144c8..a6c8858a2438 100644
--- a/connectivity/source/inc/dbase/DIndexColumns.hxx
+++ b/connectivity/source/inc/dbase/DIndexColumns.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXCOLUMNS_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include "dbase/DIndex.hxx"
-#include "dbase/DTable.hxx"
+#include <dbase/DIndex.hxx>
+#include <dbase/DTable.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DIndexIter.hxx b/connectivity/source/inc/dbase/DIndexIter.hxx
index 13b239fcc1da..1401a0eccb3c 100644
--- a/connectivity/source/inc/dbase/DIndexIter.hxx
+++ b/connectivity/source/inc/dbase/DIndexIter.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXITER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXITER_HXX
 
-#include "file/fcode.hxx"
-#include "dbase/DIndex.hxx"
-#include "dbase/dindexnode.hxx"
+#include <file/fcode.hxx>
+#include <dbase/DIndex.hxx>
+#include <dbase/dindexnode.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx
index aeac516534f8..34b7699f655c 100644
--- a/connectivity/source/inc/dbase/DIndexes.hxx
+++ b/connectivity/source/inc/dbase/DIndexes.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXES_HXX
 
 #include <connectivity/sdbcx/VCollection.hxx>
-#include "dbase/DTable.hxx"
+#include <dbase/DTable.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DPreparedStatement.hxx b/connectivity/source/inc/dbase/DPreparedStatement.hxx
index 16dd188dfe06..22df7be8e01f 100644
--- a/connectivity/source/inc/dbase/DPreparedStatement.hxx
+++ b/connectivity/source/inc/dbase/DPreparedStatement.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DPREPAREDSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DPREPAREDSTATEMENT_HXX
 
-#include "file/FPreparedStatement.hxx"
+#include <file/FPreparedStatement.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DResultSet.hxx b/connectivity/source/inc/dbase/DResultSet.hxx
index 9d9834656f32..31a0f6722cb1 100644
--- a/connectivity/source/inc/dbase/DResultSet.hxx
+++ b/connectivity/source/inc/dbase/DResultSet.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DRESULTSET_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DRESULTSET_HXX
 
-#include "file/FResultSet.hxx"
+#include <file/FResultSet.hxx>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <com/sun/star/sdbcx/XDeleteRows.hpp>
 #include <cppuhelper/implbase2.hxx>
diff --git a/connectivity/source/inc/dbase/DStatement.hxx b/connectivity/source/inc/dbase/DStatement.hxx
index e67d9fd7ffac..9c02e2abe6dc 100644
--- a/connectivity/source/inc/dbase/DStatement.hxx
+++ b/connectivity/source/inc/dbase/DStatement.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DSTATEMENT_HXX
 
-#include "file/FStatement.hxx"
+#include <file/FStatement.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx
index a80c0686c7d4..9fa3499a1218 100644
--- a/connectivity/source/inc/dbase/DTable.hxx
+++ b/connectivity/source/inc/dbase/DTable.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLE_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLE_HXX
 
-#include "file/FTable.hxx"
+#include <file/FTable.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <tools/urlobj.hxx>
diff --git a/connectivity/source/inc/dbase/DTables.hxx b/connectivity/source/inc/dbase/DTables.hxx
index d0c68bd3a5a0..f27fb59dbc90 100644
--- a/connectivity/source/inc/dbase/DTables.hxx
+++ b/connectivity/source/inc/dbase/DTables.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLES_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLES_HXX
 
-#include "file/FTables.hxx"
+#include <file/FTables.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index 4ff5b05a3aa5..01b45ddde646 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXNODE_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXNODE_HXX
 
-#include "file/fcode.hxx"
-#include "file/FTable.hxx"
+#include <file/fcode.hxx>
+#include <file/FTable.hxx>
 #include <connectivity/FValue.hxx>
 #include <rtl/ref.hxx>
 #include <memory>
diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx
index b45f3a04f1cc..ad21bfcb711c 100644
--- a/connectivity/source/inc/file/FCatalog.hxx
+++ b/connectivity/source/inc/file/FCatalog.hxx
@@ -22,7 +22,7 @@
 
 #include <connectivity/sdbcx/VCatalog.hxx>
 
-#include "file/filedllapi.hxx"
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx
index 867dfe6e2b55..9e5153bb6943 100644
--- a/connectivity/source/inc/file/FColumns.hxx
+++ b/connectivity/source/inc/file/FColumns.hxx
@@ -23,8 +23,8 @@
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <connectivity/sdbcx/IRefreshable.hxx>
-#include "file/FTable.hxx"
-#include "file/filedllapi.hxx"
+#include <file/FTable.hxx>
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx
index fcf73bda082f..fe535c9d0fdf 100644
--- a/connectivity/source/inc/file/FConnection.hxx
+++ b/connectivity/source/inc/file/FConnection.hxx
@@ -24,15 +24,15 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <connectivity/OSubComponent.hxx>
 #include <connectivity/CommonTools.hxx>
-#include "OTypeInfo.hxx"
+#include <OTypeInfo.hxx>
 #include <rtl/ustring.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
 #include <connectivity/sqlparse.hxx>
 #include <connectivity/sqliterator.hxx>
-#include "TConnection.hxx"
-#include "file/filedllapi.hxx"
+#include <TConnection.hxx>
+#include <file/filedllapi.hxx>
 #include <map>
 
 namespace connectivity
diff --git a/connectivity/source/inc/file/FDatabaseMetaData.hxx b/connectivity/source/inc/file/FDatabaseMetaData.hxx
index 02dd7c70825c..6f726cf74305 100644
--- a/connectivity/source/inc/file/FDatabaseMetaData.hxx
+++ b/connectivity/source/inc/file/FDatabaseMetaData.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATABASEMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATABASEMETADATA_HXX
 
-#include "TDatabaseMetaDataBase.hxx"
-#include "file/FConnection.hxx"
-#include "file/filedllapi.hxx"
+#include <TDatabaseMetaDataBase.hxx>
+#include <file/FConnection.hxx>
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FDateFunctions.hxx b/connectivity/source/inc/file/FDateFunctions.hxx
index 76d934b38342..8547d7e35234 100644
--- a/connectivity/source/inc/file/FDateFunctions.hxx
+++ b/connectivity/source/inc/file/FDateFunctions.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATEFUNCTIONS_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FDATEFUNCTIONS_HXX
 
-#include "file/fcode.hxx"
-#include "file/filedllapi.hxx"
+#include <file/fcode.hxx>
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx
index 6fc0ccdd694a..efff202743b6 100644
--- a/connectivity/source/inc/file/FDriver.hxx
+++ b/connectivity/source/inc/file/FDriver.hxx
@@ -25,7 +25,7 @@
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <connectivity/CommonTools.hxx>
-#include "file/filedllapi.hxx"
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FNumericFunctions.hxx b/connectivity/source/inc/file/FNumericFunctions.hxx
index 6d37df610e79..0678fcb3a343 100644
--- a/connectivity/source/inc/file/FNumericFunctions.hxx
+++ b/connectivity/source/inc/file/FNumericFunctions.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FNUMERICFUNCTIONS_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FNUMERICFUNCTIONS_HXX
 
-#include "file/fcode.hxx"
-#include "file/filedllapi.hxx"
+#include <file/fcode.hxx>
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FPreparedStatement.hxx b/connectivity/source/inc/file/FPreparedStatement.hxx
index aef9e8fa2f18..ffe841aee5ce 100644
--- a/connectivity/source/inc/file/FPreparedStatement.hxx
+++ b/connectivity/source/inc/file/FPreparedStatement.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FPREPAREDSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FPREPAREDSTATEMENT_HXX
 
-#include "file/filedllapi.hxx"
-#include "file/FStatement.hxx"
+#include <file/filedllapi.hxx>
+#include <file/FStatement.hxx>
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
-#include "file/FResultSet.hxx"
+#include <file/FResultSet.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx
index e60ee6f465e6..17094d903f22 100644
--- a/connectivity/source/inc/file/FResultSet.hxx
+++ b/connectivity/source/inc/file/FResultSet.hxx
@@ -32,15 +32,15 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include "file/FStatement.hxx"
+#include <file/FStatement.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <comphelper/propertycontainer.hxx>
-#include "file/fanalyzer.hxx"
-#include "file/FTable.hxx"
-#include "file/filedllapi.hxx"
+#include <file/fanalyzer.hxx>
+#include <file/FTable.hxx>
+#include <file/filedllapi.hxx>
 #include <connectivity/StdTypeDefs.hxx>
-#include "TSortIndex.hxx"
-#include "TSkipDeletedSet.hxx"
+#include <TSortIndex.hxx>
+#include <TSkipDeletedSet.hxx>
 #include <com/sun/star/lang/XEventListener.hpp>
 
 namespace connectivity
diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx
index 173026f0920a..85527e99c13c 100644
--- a/connectivity/source/inc/file/FResultSetMetaData.hxx
+++ b/connectivity/source/inc/file/FResultSetMetaData.hxx
@@ -24,7 +24,7 @@
 #include <cppuhelper/implbase.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <rtl/ref.hxx>
-#include "file/filedllapi.hxx"
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx
index bb4c37926684..936703b4d281 100644
--- a/connectivity/source/inc/file/FStatement.hxx
+++ b/connectivity/source/inc/file/FStatement.hxx
@@ -33,13 +33,13 @@
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/CommonTools.hxx>
-#include "file/FConnection.hxx"
-#include "file/filedllapi.hxx"
+#include <file/FConnection.hxx>
+#include <file/filedllapi.hxx>
 #include <list>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <comphelper/propertycontainer.hxx>
-#include "file/fanalyzer.hxx"
-#include "TSortIndex.hxx"
+#include <file/fanalyzer.hxx>
+#include <TSortIndex.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FStringFunctions.hxx b/connectivity/source/inc/file/FStringFunctions.hxx
index b184787f4322..88bd4e7d5607 100644
--- a/connectivity/source/inc/file/FStringFunctions.hxx
+++ b/connectivity/source/inc/file/FStringFunctions.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTRINGFUNCTIONS_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FSTRINGFUNCTIONS_HXX
 
-#include "file/fcode.hxx"
-#include "file/filedllapi.hxx"
+#include <file/fcode.hxx>
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index 637d15db09b9..60270ff2dead 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -23,11 +23,11 @@
 #include <connectivity/sdbcx/VTable.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-#include "file/FConnection.hxx"
-#include "file/filedllapi.hxx"
+#include <file/FConnection.hxx>
+#include <file/filedllapi.hxx>
 #include <tools/stream.hxx>
 #include <connectivity/FValue.hxx>
-#include "TResultSetHelper.hxx"
+#include <TResultSetHelper.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx
index c8380134b4ff..b1090cbf705b 100644
--- a/connectivity/source/inc/file/FTables.hxx
+++ b/connectivity/source/inc/file/FTables.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLES_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLES_HXX
 
-#include "file/filedllapi.hxx"
+#include <file/filedllapi.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 
diff --git a/connectivity/source/inc/file/fanalyzer.hxx b/connectivity/source/inc/file/fanalyzer.hxx
index e1202fa736e8..63702ed09e85 100644
--- a/connectivity/source/inc/file/fanalyzer.hxx
+++ b/connectivity/source/inc/file/fanalyzer.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FANALYZER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FANALYZER_HXX
 
-#include "file/fcomp.hxx"
-#include "file/filedllapi.hxx"
+#include <file/fcomp.hxx>
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx
index 40e0a1100c95..c9fe37efdecc 100644
--- a/connectivity/source/inc/file/fcode.hxx
+++ b/connectivity/source/inc/file/fcode.hxx
@@ -26,7 +26,7 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <connectivity/FValue.hxx>
-#include "file/filedllapi.hxx"
+#include <file/filedllapi.hxx>
 
 #include <stack>
 
diff --git a/connectivity/source/inc/file/fcomp.hxx b/connectivity/source/inc/file/fcomp.hxx
index a20ce876fe03..90dfb70678ab 100644
--- a/connectivity/source/inc/file/fcomp.hxx
+++ b/connectivity/source/inc/file/fcomp.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOMP_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOMP_HXX
 
-#include "file/fcode.hxx"
-#include "file/filedllapi.hxx"
+#include <file/fcode.hxx>
+#include <file/filedllapi.hxx>
 #include <list>
 
 namespace connectivity
diff --git a/connectivity/source/inc/file/quotedstring.hxx b/connectivity/source/inc/file/quotedstring.hxx
index f5c9268fee99..8d80d15f0319 100644
--- a/connectivity/source/inc/file/quotedstring.hxx
+++ b/connectivity/source/inc/file/quotedstring.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_QUOTEDSTRING_HXX
 
 #include <rtl/ustring.hxx>
-#include "file/filedllapi.hxx"
+#include <file/filedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/flat/ECatalog.hxx b/connectivity/source/inc/flat/ECatalog.hxx
index 561ec88c46cd..b28d110a35a9 100644
--- a/connectivity/source/inc/flat/ECatalog.hxx
+++ b/connectivity/source/inc/flat/ECatalog.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ECATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ECATALOG_HXX
 
-#include "file/FCatalog.hxx"
+#include <file/FCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/flat/EColumns.hxx b/connectivity/source/inc/flat/EColumns.hxx
index fa9248c26a01..7580137cdcdc 100644
--- a/connectivity/source/inc/flat/EColumns.hxx
+++ b/connectivity/source/inc/flat/EColumns.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ECOLUMNS_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ECOLUMNS_HXX
 
-#include "file/FColumns.hxx"
+#include <file/FColumns.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/flat/EConnection.hxx b/connectivity/source/inc/flat/EConnection.hxx
index ef181a0a71b6..36f6d0f49879 100644
--- a/connectivity/source/inc/flat/EConnection.hxx
+++ b/connectivity/source/inc/flat/EConnection.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ECONNECTION_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ECONNECTION_HXX
 
-#include "file/FConnection.hxx"
+#include <file/FConnection.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/flat/EDatabaseMetaData.hxx b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
index f369e5644b9d..f5c1bdd3ccfc 100644
--- a/connectivity/source/inc/flat/EDatabaseMetaData.hxx
+++ b/connectivity/source/inc/flat/EDatabaseMetaData.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_EDATABASEMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_EDATABASEMETADATA_HXX
 
-#include "file/FDatabaseMetaData.hxx"
+#include <file/FDatabaseMetaData.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx
index ae9a13d8a102..036d845cc61b 100644
--- a/connectivity/source/inc/flat/EDriver.hxx
+++ b/connectivity/source/inc/flat/EDriver.hxx
@@ -22,7 +22,7 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <connectivity/CommonTools.hxx>
-#include "file/FDriver.hxx"
+#include <file/FDriver.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/flat/EPreparedStatement.hxx b/connectivity/source/inc/flat/EPreparedStatement.hxx
index 81a1b4b7fe15..3af19bd9420c 100644
--- a/connectivity/source/inc/flat/EPreparedStatement.hxx
+++ b/connectivity/source/inc/flat/EPreparedStatement.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_EPREPAREDSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_EPREPAREDSTATEMENT_HXX
 
-#include "file/FPreparedStatement.hxx"
+#include <file/FPreparedStatement.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/flat/EResultSet.hxx b/connectivity/source/inc/flat/EResultSet.hxx
index d0d7b0c67e06..e7b7c6d8744e 100644
--- a/connectivity/source/inc/flat/EResultSet.hxx
+++ b/connectivity/source/inc/flat/EResultSet.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ERESULTSET_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ERESULTSET_HXX
 
-#include "file/FResultSet.hxx"
+#include <file/FResultSet.hxx>
 #include <com/sun/star/sdbcx/XRowLocate.hpp>
 #include <cppuhelper/implbase1.hxx>
 
diff --git a/connectivity/source/inc/flat/EStatement.hxx b/connectivity/source/inc/flat/EStatement.hxx
index c77f3382a256..215d0b0a9e5b 100644
--- a/connectivity/source/inc/flat/EStatement.hxx
+++ b/connectivity/source/inc/flat/EStatement.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ESTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ESTATEMENT_HXX
 
-#include "file/FStatement.hxx"
+#include <file/FStatement.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index 674f3d0b8b8b..fccc731185c0 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -20,12 +20,12 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ETABLE_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ETABLE_HXX
 
-#include "file/FTable.hxx"
-#include "flat/EConnection.hxx"
+#include <file/FTable.hxx>
+#include <flat/EConnection.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <tools/urlobj.hxx>
-#include "file/quotedstring.hxx"
+#include <file/quotedstring.hxx>
 #include <unotools/syslocale.hxx>
 
 namespace connectivity
diff --git a/connectivity/source/inc/flat/ETables.hxx b/connectivity/source/inc/flat/ETables.hxx
index fd978cb486a0..3ba349f67667 100644
--- a/connectivity/source/inc/flat/ETables.hxx
+++ b/connectivity/source/inc/flat/ETables.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ETABLES_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_ETABLES_HXX
 
-#include "file/FTables.hxx"
+#include <file/FTables.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/ContextClassLoader.hxx b/connectivity/source/inc/java/ContextClassLoader.hxx
index 5ad955e67e07..e441ffb16656 100644
--- a/connectivity/source/inc/java/ContextClassLoader.hxx
+++ b/connectivity/source/inc/java/ContextClassLoader.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_CONTEXTCLASSLOADER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_CONTEXTCLASSLOADER_HXX
 
-#include "java/GlobalRef.hxx"
+#include <java/GlobalRef.hxx>
 
 namespace comphelper
 {
diff --git a/connectivity/source/inc/java/GlobalRef.hxx b/connectivity/source/inc/java/GlobalRef.hxx
index 6ce67eb73f5f..277cfa2dec1e 100644
--- a/connectivity/source/inc/java/GlobalRef.hxx
+++ b/connectivity/source/inc/java/GlobalRef.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_GLOBALREF_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_GLOBALREF_HXX
 
-#include "java/LocalRef.hxx"
-#include "java/lang/Object.hxx"
+#include <java/LocalRef.hxx>
+#include <java/lang/Object.hxx>
 
 #include <jvmaccess/virtualmachine.hxx>
 
diff --git a/connectivity/source/inc/java/io/InputStream.hxx b/connectivity/source/inc/java/io/InputStream.hxx
index e144931e97be..c05309e87c1b 100644
--- a/connectivity/source/inc/java/io/InputStream.hxx
+++ b/connectivity/source/inc/java/io/InputStream.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_INPUTSTREAM_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_INPUTSTREAM_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 
diff --git a/connectivity/source/inc/java/io/Reader.hxx b/connectivity/source/inc/java/io/Reader.hxx
index 5f754489d366..f68fe1239c3a 100644
--- a/connectivity/source/inc/java/io/Reader.hxx
+++ b/connectivity/source/inc/java/io/Reader.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_READER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_IO_READER_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <boost/optional.hpp>
diff --git a/connectivity/source/inc/java/lang/Boolean.hxx b/connectivity/source/inc/java/lang/Boolean.hxx
index 399a9191ca46..27a7e06685c2 100644
--- a/connectivity/source/inc/java/lang/Boolean.hxx
+++ b/connectivity/source/inc/java/lang/Boolean.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_BOOLEAN_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_BOOLEAN_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 
 //************ Class: java.lang.Boolean
 
diff --git a/connectivity/source/inc/java/lang/Class.hxx b/connectivity/source/inc/java/lang/Class.hxx
index 8dc8b3fb6eea..bc68a01a536a 100644
--- a/connectivity/source/inc/java/lang/Class.hxx
+++ b/connectivity/source/inc/java/lang/Class.hxx
@@ -21,7 +21,7 @@
 
 //************ Class: java.lang.Class
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/lang/Exception.hxx b/connectivity/source/inc/java/lang/Exception.hxx
index ea63cbcf3240..5e11e7890be7 100644
--- a/connectivity/source/inc/java/lang/Exception.hxx
+++ b/connectivity/source/inc/java/lang/Exception.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_EXCEPTION_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_EXCEPTION_HXX
 
-#include "java/lang/Throwable.hxx"
+#include <java/lang/Throwable.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/lang/String.hxx b/connectivity/source/inc/java/lang/String.hxx
index 45807594c9ea..25ba03d0da4c 100644
--- a/connectivity/source/inc/java/lang/String.hxx
+++ b/connectivity/source/inc/java/lang/String.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_STRING_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_STRING_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/lang/Throwable.hxx b/connectivity/source/inc/java/lang/Throwable.hxx
index 898d1b84100d..d24395286116 100644
--- a/connectivity/source/inc/java/lang/Throwable.hxx
+++ b/connectivity/source/inc/java/lang/Throwable.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_THROWABLE_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_LANG_THROWABLE_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/math/BigDecimal.hxx b/connectivity/source/inc/java/math/BigDecimal.hxx
index 0b94e6b2187c..e345aeed250d 100644
--- a/connectivity/source/inc/java/math/BigDecimal.hxx
+++ b/connectivity/source/inc/java/math/BigDecimal.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_MATH_BIGDECIMAL_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_MATH_BIGDECIMAL_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 
 //************ Class: java.lang.Boolean
 
diff --git a/connectivity/source/inc/java/sql/Array.hxx b/connectivity/source/inc/java/sql/Array.hxx
index 0e0826bfd6ab..8677daa47763 100644
--- a/connectivity/source/inc/java/sql/Array.hxx
+++ b/connectivity/source/inc/java/sql/Array.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_ARRAY_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_ARRAY_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <com/sun/star/sdbc/XArray.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/connectivity/source/inc/java/sql/Blob.hxx b/connectivity/source/inc/java/sql/Blob.hxx
index dcd6e5a9ef51..605853f60e6a 100644
--- a/connectivity/source/inc/java/sql/Blob.hxx
+++ b/connectivity/source/inc/java/sql/Blob.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_BLOB_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_BLOB_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <com/sun/star/sdbc/XBlob.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/connectivity/source/inc/java/sql/CallableStatement.hxx b/connectivity/source/inc/java/sql/CallableStatement.hxx
index 657d9da4bcb0..31cafdeed2c5 100644
--- a/connectivity/source/inc/java/sql/CallableStatement.hxx
+++ b/connectivity/source/inc/java/sql/CallableStatement.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CALLABLESTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CALLABLESTATEMENT_HXX
 
-#include "java/sql/PreparedStatement.hxx"
+#include <java/sql/PreparedStatement.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XOutParameters.hpp>
 
diff --git a/connectivity/source/inc/java/sql/Clob.hxx b/connectivity/source/inc/java/sql/Clob.hxx
index f94a046aed28..ecea073fa1f2 100644
--- a/connectivity/source/inc/java/sql/Clob.hxx
+++ b/connectivity/source/inc/java/sql/Clob.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CLOB_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CLOB_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <com/sun/star/sdbc/XClob.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx
index 8aa2abd82aed..117d502b2c5e 100644
--- a/connectivity/source/inc/java/sql/Connection.hxx
+++ b/connectivity/source/inc/java/sql/Connection.hxx
@@ -19,15 +19,15 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CONNECTION_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_CONNECTION_HXX
 
-#include "java/lang/Object.hxx"
-#include "TConnection.hxx"
+#include <java/lang/Object.hxx>
+#include <TConnection.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/OSubComponent.hxx>
 #include <cppuhelper/weakref.hxx>
-#include "AutoRetrievingBase.hxx"
-#include "java/sql/ConnectionLog.hxx"
-#include "java/LocalRef.hxx"
-#include "java/GlobalRef.hxx"
+#include <AutoRetrievingBase.hxx>
+#include <java/sql/ConnectionLog.hxx>
+#include <java/LocalRef.hxx>
+#include <java/GlobalRef.hxx>
 
 #include <com/sun/star/beans/NamedValue.hpp>
 
diff --git a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
index dc085c02d779..d87cd6c21849 100644
--- a/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
+++ b/connectivity/source/inc/java/sql/DatabaseMetaData.hxx
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_DATABASEMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_DATABASEMETADATA_HXX
 
-#include "java/lang/Object.hxx"
-#include "TDatabaseMetaDataBase.hxx"
+#include <java/lang/Object.hxx>
+#include <TDatabaseMetaDataBase.hxx>
 
-#include "java/sql/ConnectionLog.hxx"
+#include <java/sql/ConnectionLog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/sql/Driver.hxx b/connectivity/source/inc/java/sql/Driver.hxx
index a295ffd83557..09a2c03b40a0 100644
--- a/connectivity/source/inc/java/sql/Driver.hxx
+++ b/connectivity/source/inc/java/sql/Driver.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_DRIVER_HXX
 
 #include <com/sun/star/sdbc/XDriver.hpp>
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
index 6594b716dd7d..e6065f4a96e4 100644
--- a/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
+++ b/connectivity/source/inc/java/sql/DriverPropertyInfo.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_DRIVERPROPERTYINFO_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_DRIVERPROPERTYINFO_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <com/sun/star/sdbc/DriverPropertyInfo.hpp>
 
 namespace connectivity
diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx
index 2ef95042a377..52b6c5fe5995 100644
--- a/connectivity/source/inc/java/sql/JStatement.hxx
+++ b/connectivity/source/inc/java/sql/JStatement.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_JSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_JSTATEMENT_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <com/sun/star/sdbc/XStatement.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/sdbc/XMultipleResults.hpp>
@@ -36,7 +36,7 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
 #include <java/sql/Connection.hxx>
-#include "java/sql/ConnectionLog.hxx"
+#include <java/sql/ConnectionLog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/sql/PreparedStatement.hxx b/connectivity/source/inc/java/sql/PreparedStatement.hxx
index 5423de35978f..5bfc085876b6 100644
--- a/connectivity/source/inc/java/sql/PreparedStatement.hxx
+++ b/connectivity/source/inc/java/sql/PreparedStatement.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_PREPAREDSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_PREPAREDSTATEMENT_HXX
 
-#include "java/sql/JStatement.hxx"
+#include <java/sql/JStatement.hxx>
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/XPreparedBatchExecution.hpp>
diff --git a/connectivity/source/inc/java/sql/Ref.hxx b/connectivity/source/inc/java/sql/Ref.hxx
index cf121eb493de..eb658925fd92 100644
--- a/connectivity/source/inc/java/sql/Ref.hxx
+++ b/connectivity/source/inc/java/sql/Ref.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_REF_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_REF_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <com/sun/star/sdbc/XRef.hpp>
 #include <cppuhelper/implbase.hxx>
 
diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx
index 346f13262332..e5e0155ff3e9 100644
--- a/connectivity/source/inc/java/sql/ResultSet.hxx
+++ b/connectivity/source/inc/java/sql/ResultSet.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_RESULTSET_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_RESULTSET_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <com/sun/star/sdbc/XResultSet.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
@@ -32,9 +32,9 @@
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/proparrhlp.hxx>
 #include <connectivity/CommonTools.hxx>
-#include "java/sql/JStatement.hxx"
+#include <java/sql/JStatement.hxx>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include "java/sql/ConnectionLog.hxx"
+#include <java/sql/ConnectionLog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
index 2a4e59d6f7e6..2776926aa6d0 100644
--- a/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
+++ b/connectivity/source/inc/java/sql/ResultSetMetaData.hxx
@@ -19,10 +19,10 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_RESULTSETMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_RESULTSETMETADATA_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase.hxx>
-#include "java/sql/ConnectionLog.hxx"
+#include <java/sql/ConnectionLog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/sql/SQLException.hxx b/connectivity/source/inc/java/sql/SQLException.hxx
index e276f9873ab9..88a147faaebe 100644
--- a/connectivity/source/inc/java/sql/SQLException.hxx
+++ b/connectivity/source/inc/java/sql/SQLException.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_SQLEXCEPTION_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_SQLEXCEPTION_HXX
 
-#include "java/lang/Exception.hxx"
+#include <java/lang/Exception.hxx>
 #include <com/sun/star/sdbc/SQLException.hpp>
 
 namespace connectivity
diff --git a/connectivity/source/inc/java/sql/SQLWarning.hxx b/connectivity/source/inc/java/sql/SQLWarning.hxx
index f1840cedb26f..68a83f4635be 100644
--- a/connectivity/source/inc/java/sql/SQLWarning.hxx
+++ b/connectivity/source/inc/java/sql/SQLWarning.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_SQLWARNING_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_SQLWARNING_HXX
 
-#include "java/sql/SQLException.hxx"
+#include <java/sql/SQLException.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/java/sql/Timestamp.hxx b/connectivity/source/inc/java/sql/Timestamp.hxx
index 968638ad079c..7f30f28adf24 100644
--- a/connectivity/source/inc/java/sql/Timestamp.hxx
+++ b/connectivity/source/inc/java/sql/Timestamp.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_TIMESTAMP_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_SQL_TIMESTAMP_HXX
 
-#include "java/util/Date.hxx"
+#include <java/util/Date.hxx>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 
diff --git a/connectivity/source/inc/java/tools.hxx b/connectivity/source/inc/java/tools.hxx
index 0aab2bb0b0e2..31647fe57fc8 100644
--- a/connectivity/source/inc/java/tools.hxx
+++ b/connectivity/source/inc/java/tools.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/uno/Sequence.h>
 
 #include <jni.h>
-#include "java/sql/SQLException.hxx"
+#include <java/sql/SQLException.hxx>
 #include <comphelper/uno3.hxx>
 
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/connectivity/source/inc/java/util/Date.hxx b/connectivity/source/inc/java/util/Date.hxx
index ee71ff96420f..8fdab188d831 100644
--- a/connectivity/source/inc/java/util/Date.hxx
+++ b/connectivity/source/inc/java/util/Date.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_UTIL_DATE_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_UTIL_DATE_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 #include <com/sun/star/util/Date.hpp>
 
 namespace connectivity
diff --git a/connectivity/source/inc/java/util/Property.hxx b/connectivity/source/inc/java/util/Property.hxx
index 611e4d0f540f..f7835e5f1d8d 100644
--- a/connectivity/source/inc/java/util/Property.hxx
+++ b/connectivity/source/inc/java/util/Property.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_UTIL_PROPERTY_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_JAVA_UTIL_PROPERTY_HXX
 
-#include "java/lang/Object.hxx"
+#include <java/lang/Object.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 9dec9b0d25ef..5eeeda4ae947 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -21,7 +21,7 @@
 
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include "odbc/odbcbasedllapi.hxx"
+#include <odbc/odbcbasedllapi.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx
index 201a92c49583..bb1f1430d48d 100644
--- a/connectivity/source/inc/odbc/OConnection.hxx
+++ b/connectivity/source/inc/odbc/OConnection.hxx
@@ -22,14 +22,14 @@
 #include <com/sun/star/sdbc/SQLWarning.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <connectivity/odbc.hxx>
-#include "odbc/odbcbasedllapi.hxx"
+#include <odbc/odbcbasedllapi.hxx>
 #include <connectivity/OSubComponent.hxx>
 #include <connectivity/CommonTools.hxx>
-#include "TConnection.hxx"
-#include "OTypeInfo.hxx"
-#include "odbc/OTools.hxx"
+#include <TConnection.hxx>
+#include <OTypeInfo.hxx>
+#include <odbc/OTools.hxx>
 #include <cppuhelper/weakref.hxx>
-#include "AutoRetrievingBase.hxx"
+#include <AutoRetrievingBase.hxx>
 #include <osl/module.h>
 
 
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
index 0abd72e880f3..a0e21394cb82 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaData.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODATABASEMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODATABASEMETADATA_HXX
 
-#include "odbc/OConnection.hxx"
-#include "odbc/odbcbasedllapi.hxx"
-#include "TDatabaseMetaDataBase.hxx"
+#include <odbc/OConnection.hxx>
+#include <odbc/odbcbasedllapi.hxx>
+#include <TDatabaseMetaDataBase.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
index c242c2eee85c..52aca63b012f 100644
--- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
+++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx
@@ -35,9 +35,9 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include "odbc/OStatement.hxx"
-#include "odbc/ODatabaseMetaData.hxx"
-#include "odbc/odbcbasedllapi.hxx"
+#include <odbc/OStatement.hxx>
+#include <odbc/ODatabaseMetaData.hxx>
+#include <odbc/odbcbasedllapi.hxx>
 #include <connectivity/StdTypeDefs.hxx>
 #include <memory>
 
diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx
index 4fbc1eb40946..6172cd01aa89 100644
--- a/connectivity/source/inc/odbc/ODriver.hxx
+++ b/connectivity/source/inc/odbc/ODriver.hxx
@@ -25,10 +25,10 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <connectivity/odbc.hxx>
-#include "odbc/odbcbasedllapi.hxx"
+#include <odbc/odbcbasedllapi.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <osl/module.h>
-#include "odbc/OTools.hxx"
+#include <odbc/OTools.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/odbc/OPreparedStatement.hxx b/connectivity/source/inc/odbc/OPreparedStatement.hxx
index f01156615f98..b354ca853325 100644
--- a/connectivity/source/inc/odbc/OPreparedStatement.hxx
+++ b/connectivity/source/inc/odbc/OPreparedStatement.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OPREPAREDSTATEMENT_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OPREPAREDSTATEMENT_HXX
 
-#include "odbc/odbcbasedllapi.hxx"
-#include "odbc/OStatement.hxx"
+#include <odbc/odbcbasedllapi.hxx>
+#include <odbc/OStatement.hxx>
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx
index b6db7ba28b99..960db182497a 100644
--- a/connectivity/source/inc/odbc/OResultSet.hxx
+++ b/connectivity/source/inc/odbc/OResultSet.hxx
@@ -34,12 +34,12 @@
 #include <com/sun/star/sdbcx/XDeleteRows.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <comphelper/proparrhlp.hxx>
-#include "odbc/OFunctions.hxx"
-#include "odbc/OStatement.hxx"
-#include "odbc/odbcbasedllapi.hxx"
+#include <odbc/OFunctions.hxx>
+#include <odbc/OStatement.hxx>
+#include <odbc/odbcbasedllapi.hxx>
 #include <connectivity/CommonTools.hxx>
 #include <connectivity/FValue.hxx>
-#include "TSkipDeletedSet.hxx"
+#include <TSkipDeletedSet.hxx>
 #include <memory>
 
 namespace connectivity
diff --git a/connectivity/source/inc/odbc/OResultSetMetaData.hxx b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
index 99fba9562816..412407ad9db7 100644
--- a/connectivity/source/inc/odbc/OResultSetMetaData.hxx
+++ b/connectivity/source/inc/odbc/OResultSetMetaData.hxx
@@ -22,10 +22,10 @@
 
 #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
 #include <cppuhelper/implbase.hxx>
-#include "odbc/OFunctions.hxx"
-#include "odbc/odbcbasedllapi.hxx"
+#include <odbc/OFunctions.hxx>
+#include <odbc/odbcbasedllapi.hxx>
 #include <vector>
-#include "odbc/OConnection.hxx"
+#include <odbc/OConnection.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx
index 44aa88d99a4c..e93f6c7ba5dd 100644
--- a/connectivity/source/inc/odbc/OStatement.hxx
+++ b/connectivity/source/inc/odbc/OStatement.hxx
@@ -33,9 +33,9 @@
 #include <cppuhelper/basemutex.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/CommonTools.hxx>
-#include "odbc/OFunctions.hxx"
-#include "odbc/OConnection.hxx"
-#include "odbc/odbcbasedllapi.hxx"
+#include <odbc/OFunctions.hxx>
+#include <odbc/OConnection.hxx>
+#include <odbc/odbcbasedllapi.hxx>
 #include <vector>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
diff --git a/connectivity/source/inc/odbc/OTools.hxx b/connectivity/source/inc/odbc/OTools.hxx
index f55fc0d31039..29b83c7ec8fe 100644
--- a/connectivity/source/inc/odbc/OTools.hxx
+++ b/connectivity/source/inc/odbc/OTools.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_OTOOLS_HXX
 
 #include <connectivity/odbc.hxx>
-#include "odbc/odbcbasedllapi.hxx"
+#include <odbc/odbcbasedllapi.hxx>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/Time.hpp>
diff --git a/connectivity/source/inc/writer/WCatalog.hxx b/connectivity/source/inc/writer/WCatalog.hxx
index b1ba9a582714..6a12d2424b64 100644
--- a/connectivity/source/inc/writer/WCatalog.hxx
+++ b/connectivity/source/inc/writer/WCatalog.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WCATALOG_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WCATALOG_HXX
 
-#include "file/FCatalog.hxx"
+#include <file/FCatalog.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/writer/WConnection.hxx b/connectivity/source/inc/writer/WConnection.hxx
index 682a33319b38..69e59409f7ef 100644
--- a/connectivity/source/inc/writer/WConnection.hxx
+++ b/connectivity/source/inc/writer/WConnection.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WCONNECTION_HXX
 
 #include <memory>
-#include "file/FConnection.hxx"
+#include <file/FConnection.hxx>
 #include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
 #include <com/sun/star/uno/DeploymentException.hpp>
diff --git a/connectivity/source/inc/writer/WDatabaseMetaData.hxx b/connectivity/source/inc/writer/WDatabaseMetaData.hxx
index e80c8edf4e0d..7d0bad7deb60 100644
--- a/connectivity/source/inc/writer/WDatabaseMetaData.hxx
+++ b/connectivity/source/inc/writer/WDatabaseMetaData.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WDATABASEMETADATA_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WDATABASEMETADATA_HXX
 
-#include "component/CDatabaseMetaData.hxx"
+#include <component/CDatabaseMetaData.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/inc/writer/WDriver.hxx b/connectivity/source/inc/writer/WDriver.hxx
index 0ca53a411c84..d531da480f7f 100644
--- a/connectivity/source/inc/writer/WDriver.hxx
+++ b/connectivity/source/inc/writer/WDriver.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WDRIVER_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WDRIVER_HXX
 
-#include "file/FDriver.hxx"
+#include <file/FDriver.hxx>
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
diff --git a/connectivity/source/inc/writer/WTable.hxx b/connectivity/source/inc/writer/WTable.hxx
index 744e6c3a8c05..aed3e5a8ca4c 100644
--- a/connectivity/source/inc/writer/WTable.hxx
+++ b/connectivity/source/inc/writer/WTable.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WTABLE_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WTABLE_HXX
 
-#include "component/CTable.hxx"
+#include <component/CTable.hxx>
 #include <tools/date.hxx>
 
 namespace com
diff --git a/connectivity/source/inc/writer/WTables.hxx b/connectivity/source/inc/writer/WTables.hxx
index 0f9b61e0de3e..b4eb788d66ca 100644
--- a/connectivity/source/inc/writer/WTables.hxx
+++ b/connectivity/source/inc/writer/WTables.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WTABLES_HXX
 #define INCLUDED_CONNECTIVITY_SOURCE_INC_WRITER_WTABLES_HXX
 
-#include "file/FTables.hxx"
+#include <file/FTables.hxx>
 
 namespace connectivity
 {
diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx
index 1a58935f5401..db3f12d11eec 100644
--- a/connectivity/source/parse/PColumn.cxx
+++ b/connectivity/source/parse/PColumn.cxx
@@ -20,7 +20,7 @@
 
 #include <connectivity/PColumn.hxx>
 #include <connectivity/dbtools.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 #include <comphelper/types.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx
index 33c8af13b2a0..86608cbcded9 100644
--- a/connectivity/source/parse/sqliterator.cxx
+++ b/connectivity/source/parse/sqliterator.cxx
@@ -20,7 +20,7 @@
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/sdbcx/VTable.hxx>
 #include <connectivity/sqlparse.hxx>
-#include "sqlbison.hxx"
+#include <sqlbison.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/sqlerror.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
@@ -33,7 +33,7 @@
 #endif
 #include <connectivity/PColumn.hxx>
 #include <tools/diagnose_ex.h>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbmetadata.hxx>
 #include <com/sun/star/sdb/SQLFilterOperator.hpp>
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index b5a32548af1f..48616492773f 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -46,7 +46,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/util/Date.hpp>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/numbers.hxx>
 #include <comphelper/processfactory.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/connectivity/source/resource/sharedresources.cxx b/connectivity/source/resource/sharedresources.cxx
index f2fe28801ada..0beba630a76f 100644
--- a/connectivity/source/resource/sharedresources.cxx
+++ b/connectivity/source/resource/sharedresources.cxx
@@ -18,7 +18,7 @@
  */
 
 #include <memory>
-#include "resource/sharedresources.hxx"
+#include <resource/sharedresources.hxx>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
 
diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx
index 53f23f4651ca..5b45cd0bc4a7 100644
--- a/connectivity/source/sdbcx/VCatalog.cxx
+++ b/connectivity/source/sdbcx/VCatalog.cxx
@@ -21,7 +21,7 @@
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <connectivity/sdbcx/VDescriptor.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <comphelper/uno3.hxx>
 #include <connectivity/dbtools.hxx>
 
diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx
index 4e0e3a557c22..339504a95d61 100644
--- a/connectivity/source/sdbcx/VCollection.cxx
+++ b/connectivity/source/sdbcx/VCollection.cxx
@@ -28,10 +28,10 @@
 #include <comphelper/container.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/property.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <rtl/ustrbuf.hxx>
-#include "strings.hrc"
-#include "resource/sharedresources.hxx"
+#include <strings.hrc>
+#include <resource/sharedresources.hxx>
 
 using namespace connectivity::sdbcx;
 using namespace connectivity;
diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx
index 32064d8034c8..1b2560e0b415 100644
--- a/connectivity/source/sdbcx/VColumn.cxx
+++ b/connectivity/source/sdbcx/VColumn.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 
 using namespace connectivity;
diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx
index 51d49c2c14ce..af272e62758e 100644
--- a/connectivity/source/sdbcx/VIndex.cxx
+++ b/connectivity/source/sdbcx/VIndex.cxx
@@ -24,7 +24,7 @@
 #include <comphelper/sequence.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace ::connectivity;
 using namespace ::dbtools;
diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx
index 2dd54116405b..d8d48b2ccc79 100644
--- a/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -19,7 +19,7 @@
 
 #include <connectivity/sdbcx/VIndexColumn.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace connectivity;
 using namespace connectivity::sdbcx;
diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx
index 39e9bdb84c02..aea6d6adaca3 100644
--- a/connectivity/source/sdbcx/VKey.cxx
+++ b/connectivity/source/sdbcx/VKey.cxx
@@ -24,7 +24,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace connectivity;
 using namespace connectivity::sdbcx;
diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx
index e01994730e5f..0b1987b7d2d5 100644
--- a/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -19,7 +19,7 @@
 
 #include <connectivity/sdbcx/VKeyColumn.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 using namespace connectivity;
 using namespace connectivity::sdbcx;
diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx
index 44edf0b3575e..26e2db8b507f 100644
--- a/connectivity/source/sdbcx/VTable.cxx
+++ b/connectivity/source/sdbcx/VTable.cxx
@@ -22,7 +22,7 @@
 #include <connectivity/sdbcx/VIndex.hxx>
 #include <comphelper/sequence.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <connectivity/sdbcx/VColumn.hxx>
 #include <connectivity/sdbcx/VKey.hxx>
 #include <connectivity/dbtools.hxx>
diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx
index a4d5657df60b..ad3f32064191 100644
--- a/connectivity/source/sdbcx/VUser.cxx
+++ b/connectivity/source/sdbcx/VUser.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/sdbcx/Privilege.hpp>
 #include <com/sun/star/sdbcx/PrivilegeObject.hpp>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 #include <connectivity/sdbcx/VCollection.hxx>
 #include <connectivity/dbexception.hxx>
 #include <comphelper/sequence.hxx>
diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx
index 65b4c6c22d45..97394fbea8b0 100644
--- a/connectivity/source/sdbcx/VView.cxx
+++ b/connectivity/source/sdbcx/VView.cxx
@@ -21,7 +21,7 @@
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <comphelper/sequence.hxx>
 #include <connectivity/dbtools.hxx>
-#include "TConnection.hxx"
+#include <TConnection.hxx>
 
 
 using namespace connectivity;
author	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:43:41 +0200
committer	Stephan Bergmann <sbergman@redhat.com>	2017-10-23 22:46:11 +0200
commit	25fd3077e85c37ff4077b924ff9a26012d808199 (patch)
tree	57d4f25a972e9223664a5989024c80deb569df49 /connectivity/source
parent	74067098bbf225138fad5d2c208b6e1fc71fa9a9 (diff)