loplugin:includeform: dbaccess

Change-Id: I15aee966012612033ab7e2ee03ac1a553802f540

51 files changed, 268 insertions, 268 deletions

diff --git a/dbaccess/source/ui/dlg/CollectionView.cxx b/dbaccess/source/ui/dlg/CollectionView.cxx
index 376edc7f7c44..94d38e3a76f9 100644
--- a/dbaccess/source/ui/dlg/CollectionView.cxx
+++ b/dbaccess/source/ui/dlg/CollectionView.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "CollectionView.hxx"
+#include <CollectionView.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include "core_resource.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
+#include <core_resource.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/propertysequence.hxx>
@@ -33,9 +33,9 @@
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/msgbox.hxx>
-#include "stringconstants.hxx"
-#include "bitmaps.hlst"
-#include "UITools.hxx"
+#include <stringconstants.hxx>
+#include <bitmaps.hlst>
+#include <UITools.hxx>
 #include <com/sun/star/container/XHierarchicalNameContainer.hpp>
 #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
 #include <com/sun/star/ucb/IOErrorCode.hpp>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 33f6fd0faba9..12b79e6348b8 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "core_resource.hxx"
+#include <core_resource.hxx>
 #include "dsnItem.hxx"
 #include "ConnectionHelper.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
 #include <svl/itemset.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <sfx2/fcontnr.hxx>
@@ -29,20 +29,20 @@
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include "dsitems.hxx"
-#include "helpids.h"
+#include <dsitems.hxx>
+#include <helpids.h>
 #include <osl/process.h>
 #include <osl/diagnose.h>
 #include <vcl/msgbox.hxx>
 #include <sfx2/filedlghelper.hxx>
-#include "dbadmin.hxx"
+#include <dbadmin.hxx>
 #include <comphelper/types.hxx>
 #include <vcl/stdtext.hxx>
-#include "sqlmessage.hxx"
+#include <sqlmessage.hxx>
 #include "odbcconfig.hxx"
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
@@ -50,7 +50,7 @@
 #include <com/sun/star/mozilla/MozillaBootstrap.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/commandenvironment.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index d4d2355c57da..0f599e4a9a75 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -22,7 +22,7 @@
 
 #include "adminpages.hxx"
 #include <ucbhelper/content.hxx>
-#include "curledit.hxx"
+#include <curledit.hxx>
 #include <sfx2/filedlghelper.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 0667a8102729..7e6cb24fa402 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -19,10 +19,10 @@
 
 #include <config_features.h>
 #include "ConnectionPage.hxx"
-#include "core_resource.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
-#include "dsmeta.hxx"
+#include <core_resource.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
+#include <dsmeta.hxx>
 #if HAVE_FEATURE_JAVA
 #include <jvmaccess/virtualmachine.hxx>
 #endif
@@ -32,18 +32,18 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <unotools/moduleoptions.hxx>
-#include "dsitems.hxx"
-#include "helpids.h"
+#include <dsitems.hxx>
+#include <helpids.h>
 #include <osl/process.h>
 #include <vcl/msgbox.hxx>
-#include "dbadmin.hxx"
+#include <dbadmin.hxx>
 #include <comphelper/types.hxx>
 #include <vcl/stdtext.hxx>
-#include "sqlmessage.hxx"
+#include <sqlmessage.hxx>
 #include "odbcconfig.hxx"
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -52,7 +52,7 @@
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/commandenvironment.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 5eee03ec4d6f..88c56afa9dd7 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -23,7 +23,7 @@
 #include "ConnectionHelper.hxx"
 #include "adminpages.hxx"
 #include <ucbhelper/content.hxx>
-#include "curledit.hxx"
+#include <curledit.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 6d26d4b4296f..945e7d5da208 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -18,32 +18,32 @@
  */
 
 #include "ConnectionPageSetup.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
-#include "dbu_dlg.hxx"
+#include <strings.hrc>
+#include <core_resource.hxx>
+#include <dbu_dlg.hxx>
 #include <svl/itemset.hxx>
 #include <unotools/pathoptions.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include "dsitems.hxx"
-#include "helpids.h"
+#include <dsitems.hxx>
+#include <helpids.h>
 #include <osl/process.h>
 #include <vcl/msgbox.hxx>
-#include "dbadmin.hxx"
+#include <dbadmin.hxx>
 #include <comphelper/types.hxx>
 #include <vcl/stdtext.hxx>
-#include "sqlmessage.hxx"
+#include <sqlmessage.hxx>
 #include "odbcconfig.hxx"
 #include "dsselect.hxx"
 #include <svl/filenotation.hxx>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/ucb/XProgressHandler.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/commandenvironment.hxx>
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index b9bf054bf79c..515f7f1e8a73 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -23,7 +23,7 @@
 
 #include "adminpages.hxx"
 #include <ucbhelper/content.hxx>
-#include "curledit.hxx"
+#include <curledit.hxx>
 
 #include <vcl/field.hxx>
 
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 27fbfe63a38e..784f0938a560 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -20,18 +20,18 @@
 #include <config_features.h>
 
 #include "DBSetupConnectionPages.hxx"
-#include "core_resource.hxx"
-#include "sqlmessage.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
-#include "dbu_pageids.hxx"
+#include <core_resource.hxx>
+#include <sqlmessage.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
+#include <dbu_pageids.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include "dsitems.hxx"
+#include <dsitems.hxx>
 #include "dsnItem.hxx"
-#include "helpids.h"
+#include <helpids.h>
 #include <vcl/msgbox.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svl/cjkoptions.hxx>
@@ -42,12 +42,12 @@
 
 #include <connectivity/CommonTools.hxx>
 #include "DriverSettings.hxx"
-#include "dbadmin.hxx"
+#include <dbadmin.hxx>
 #include <comphelper/types.hxx>
 
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <com/sun/star/sdbc/XDriverAccess.hpp>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include <svl/filenotation.hxx>
 
 #include <unotools/localfilehelper.hxx>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 4dc43616001f..60018b394033 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -24,7 +24,7 @@
 
 #include "adminpages.hxx"
 #include "admincontrols.hxx"
-#include "curledit.hxx"
+#include <curledit.hxx>
 #include "TextConnectionHelper.hxx"
 
 #include <svtools/roadmapwizard.hxx>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index 518c24af3e05..a09de194faa4 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "DbAdminImpl.hxx"
-#include "dsmeta.hxx"
+#include <dsmeta.hxx>
 
 #include <svl/poolitem.hxx>
 #include <svl/itempool.hxx>
@@ -26,19 +26,19 @@
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include "DriverSettings.hxx"
-#include "IItemSetHelper.hxx"
-#include "UITools.hxx"
-#include "core_resource.hxx"
-#include "dbu_dlg.hxx"
-#include "stringconstants.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
-#include "dsitems.hxx"
+#include <IItemSetHelper.hxx>
+#include <UITools.hxx>
+#include <core_resource.hxx>
+#include <dbu_dlg.hxx>
+#include <stringconstants.hxx>
+#include <strings.hrc>
+#include <strings.hxx>
+#include <dsitems.hxx>
 #include "dsnItem.hxx"
 #include "optionalboolitem.hxx"
-#include "propertysetitem.hxx"
-#include "stringlistitem.hxx"
-#include "OAuthenticationContinuation.hxx"
+#include <propertysetitem.hxx>
+#include <stringlistitem.hxx>
+#include <OAuthenticationContinuation.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/frame/XStorable.hpp>
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.hxx b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
index b86a6ff9dd24..fe3c39fe536e 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.hxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.hxx
@@ -31,7 +31,7 @@
 #include <com/sun/star/sdb/XDatabaseContext.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbc/XDriver.hpp>
-#include "dsntypes.hxx"
+#include <dsntypes.hxx>
 #include <svl/itemset.hxx>
 #include <com/sun/star/frame/XModel.hpp>
 #include <svl/poolitem.hxx>
diff --git a/dbaccess/source/ui/dlg/DriverSettings.cxx b/dbaccess/source/ui/dlg/DriverSettings.cxx
index 549ec62b9b9c..c5352001ff71 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.cxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.cxx
@@ -19,7 +19,7 @@
 
 
 #include "DriverSettings.hxx"
-#include "dsmeta.hxx"
+#include <dsmeta.hxx>
 
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index 7698927927f7..20aac533816c 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX
 
-#include "dsntypes.hxx"
+#include <dsntypes.hxx>
 #include <svl/poolitem.hxx>
 #include <vcl/vclptr.hxx>
 #include <vector>
diff --git a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
index 2b0d4d303686..6b5ffe5dc08f 100644
--- a/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
+++ b/dbaccess/source/ui/dlg/QueryPropertiesDialog.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "QueryPropertiesDialog.hxx"
+#include <QueryPropertiesDialog.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx
index 13994a7108c5..bd25c02610bb 100644
--- a/dbaccess/source/ui/dlg/RelationDlg.cxx
+++ b/dbaccess/source/ui/dlg/RelationDlg.cxx
@@ -17,23 +17,23 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "RelationDlg.hxx"
+#include <RelationDlg.hxx>
 
 #include <vcl/wrkwin.hxx>
 
 #include <vcl/svapp.hxx>
-#include "dbu_dlg.hxx"
-#include "helpids.h"
+#include <dbu_dlg.hxx>
+#include <helpids.h>
 #include <com/sun/star/sdbc/KeyRule.hpp>
 
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include "UITools.hxx"
-#include "JoinDesignView.hxx"
-#include "JoinController.hxx"
+#include <UITools.hxx>
+#include <JoinDesignView.hxx>
+#include <JoinController.hxx>
 #include <connectivity/dbexception.hxx>
-#include "RTableConnectionData.hxx"
-#include "RelationControl.hxx"
+#include <RTableConnectionData.hxx>
+#include <RelationControl.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>
 
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index c22b06489fff..5056f95d809c 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -17,16 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TablesSingleDlg.hxx"
+#include <TablesSingleDlg.hxx>
 #include "DbAdminImpl.hxx"
 #include "tablespage.hxx"
 #include <vcl/msgbox.hxx>
-#include "dsitems.hxx"
+#include <dsitems.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include "propertysetitem.hxx"
+#include <propertysetitem.hxx>
 
-#include "dbu_dlg.hxx"
+#include <dbu_dlg.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index f87ee4279ccf..6387fa7c4927 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -19,20 +19,20 @@
 
 #include <config_features.h>
 
-#include "core_resource.hxx"
+#include <core_resource.hxx>
 #include "TextConnectionHelper.hxx"
-#include "sqlmessage.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
-#include "dbu_pageids.hxx"
+#include <sqlmessage.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
+#include <strings.hxx>
+#include <dbu_pageids.hxx>
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include "dsitems.hxx"
+#include <dsitems.hxx>
 #include "dbfindex.hxx"
-#include "helpids.h"
+#include <helpids.h>
 #include <vcl/layout.hxx>
 #include <vcl/mnemonic.hxx>
 #include <svl/cjkoptions.hxx>
@@ -41,7 +41,7 @@
 #endif
 #include <connectivity/CommonTools.hxx>
 #include "DriverSettings.hxx"
-#include "dbadmin.hxx"
+#include <dbadmin.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 #include <com/sun/star/task/XInteractionHandler.hpp>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
index 0f33c0f23c4c..61074846f264 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx
@@ -22,9 +22,9 @@
 
 #include "ConnectionPageSetup.hxx"
 #include "adminpages.hxx"
-#include "charsetlistbox.hxx"
+#include <charsetlistbox.hxx>
 #include <ucbhelper/content.hxx>
-#include "curledit.hxx"
+#include <curledit.hxx>
 #include <svtools/roadmapwizard.hxx>
 #include <vcl/field.hxx>
 #include <rtl/ustring.hxx>
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index a266c6db50be..2c26dfe85376 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -18,8 +18,8 @@
  */
 
 #include "UserAdmin.hxx"
-#include "UITools.hxx"
-#include "dbu_dlg.hxx"
+#include <UITools.hxx>
+#include <dbu_dlg.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
@@ -32,11 +32,11 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sdbcx/XUser.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
-#include "stringconstants.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
-#include "core_resource.hxx"
-#include "dbadmin.hxx"
+#include <stringconstants.hxx>
+#include <strings.hrc>
+#include <strings.hxx>
+#include <core_resource.hxx>
+#include <dbadmin.hxx>
 #include <vcl/layout.hxx>
 #include <sfx2/passwd.hxx>
 
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 480a5616bfda..c7b47f6bc561 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -25,7 +25,7 @@
 #include <vcl/button.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/group.hxx>
-#include "TableGrantCtrl.hxx"
+#include <TableGrantCtrl.hxx>
 #include "adminpages.hxx"
 #include <comphelper/uno3.hxx>
 
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index e09ad9360c3c..4cd2fc4da71a 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "core_resource.hxx"
+#include <core_resource.hxx>
 #include "adminpages.hxx"
 #include "DbAdminImpl.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
 #include "DriverSettings.hxx"
-#include "dsitems.hxx"
-#include "propertysetitem.hxx"
-#include "UITools.hxx"
+#include <dsitems.hxx>
+#include <propertysetitem.hxx>
+#include <UITools.hxx>
 #include "UserAdmin.hxx"
-#include "UserAdminDlg.hxx"
+#include <UserAdminDlg.hxx>
 
 #include <comphelper/processfactory.hxx>
 #include <connectivity/dbmetadata.hxx>
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index d6d4b1b091f6..e7f71c6a8d27 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -18,9 +18,9 @@
  */
 
 #include "admincontrols.hxx"
-#include "dbu_dlg.hxx"
-#include "dsitems.hxx"
-#include "core_resource.hxx"
+#include <dbu_dlg.hxx>
+#include <dsitems.hxx>
+#include <core_resource.hxx>
 
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index ec2fcda8b3df..944590902af1 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -18,19 +18,19 @@
  */
 
 #include "adminpages.hxx"
-#include "core_resource.hxx"
-#include "dbadmin.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
+#include <core_resource.hxx>
+#include <dbadmin.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include "stringconstants.hxx"
-#include "dsitems.hxx"
+#include <stringconstants.hxx>
+#include <dsitems.hxx>
 #include "dsselect.hxx"
 #include "odbcconfig.hxx"
 #include "optionalboolitem.hxx"
-#include "sqlmessage.hxx"
+#include <sqlmessage.hxx>
 
 #include <osl/file.hxx>
 #include <vcl/accel.hxx>
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index c31942b12fce..0c5d7452e309 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADMINPAGES_HXX
 
 #include <sfx2/tabdlg.hxx>
-#include "dsntypes.hxx"
-#include "commontypes.hxx"
+#include <dsntypes.hxx>
+#include <commontypes.hxx>
 #include <svtools/wizardmachine.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx
index 4850e06d60e1..e7c0bde45c9e 100644
--- a/dbaccess/source/ui/dlg/adtabdlg.cxx
+++ b/dbaccess/source/ui/dlg/adtabdlg.cxx
@@ -17,29 +17,29 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "adtabdlg.hxx"
-#include "sqlmessage.hxx"
+#include <adtabdlg.hxx>
+#include <sqlmessage.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
-#include "core_resource.hxx"
-#include "helpids.h"
-#include "dbu_pageids.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
+#include <core_resource.hxx>
+#include <helpids.h>
+#include <dbu_pageids.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
 #include <sfx2/sfxsids.hrc>
-#include "QueryTableView.hxx"
-#include "QueryDesignView.hxx"
-#include "querycontroller.hxx"
+#include <QueryTableView.hxx>
+#include <QueryDesignView.hxx>
+#include <querycontroller.hxx>
 #include <connectivity/dbtools.hxx>
-#include "browserids.hxx"
+#include <browserids.hxx>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include "UITools.hxx"
-#include "imageprovider.hxx"
+#include <UITools.hxx>
+#include <imageprovider.hxx>
 #include <comphelper/containermultiplexer.hxx>
-#include "cppuhelper/basemutex.hxx"
+#include <cppuhelper/basemutex.hxx>
 #include <algorithm>
 
 // slot ids
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index c0b3364d4bea..2ab712601efd 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -22,14 +22,14 @@
 #include <memory>
 
 #include "advancedsettings.hxx"
-#include "advancedsettingsdlg.hxx"
-#include "core_resource.hxx"
-#include "dsitems.hxx"
+#include <advancedsettingsdlg.hxx>
+#include <core_resource.hxx>
+#include <dsitems.hxx>
 #include "DbAdminImpl.hxx"
 #include "DriverSettings.hxx"
 #include "optionalboolitem.hxx"
-#include "dbu_pageids.hxx"
-#include "dbu_dlg.hxx"
+#include <dbu_pageids.hxx>
+#include <dbu_dlg.hxx>
 
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index a30cfc805aa7..bc538ec577b7 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_ADVANCEDSETTINGS_HXX
 
 #include "adminpages.hxx"
-#include "dsmeta.hxx"
+#include <dsmeta.hxx>
 
 #include <svtools/dialogcontrolling.hxx>
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 4291e1560343..f920b70eae14 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -21,19 +21,19 @@
 #include "DbAdminImpl.hxx"
 #include "DriverSettings.hxx"
 #include "adminpages.hxx"
-#include "dbadmin.hxx"
-#include "dbu_dlg.hxx"
+#include <dbadmin.hxx>
+#include <dbu_dlg.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
-#include "core_resource.hxx"
-#include "stringconstants.hxx"
-#include "strings.hrc"
-#include "dsitems.hxx"
+#include <core_resource.hxx>
+#include <stringconstants.hxx>
+#include <strings.hrc>
+#include <dsitems.hxx>
 #include "dsnItem.hxx"
 #include "optionalboolitem.hxx"
-#include "propertysetitem.hxx"
-#include "stringlistitem.hxx"
+#include <propertysetitem.hxx>
+#include <stringlistitem.hxx>
 
 #include <unotools/confignode.hxx>
 #include <vcl/msgbox.hxx>
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 9569bf31b56a..aeba83f7451a 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -22,8 +22,8 @@
 #include <osl/file.hxx>
 #include <tools/config.hxx>
 #include <sfx2/app.hxx>
-#include "core_resource.hxx"
-#include "dbu_dlg.hxx"
+#include <core_resource.hxx>
+#include <dbu_dlg.hxx>
 #include <osl/diagnose.h>
 #include <unotools/localfilehelper.hxx>
 #include <tools/urlobj.hxx>
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 77acc2c0302f..21c58e43b954 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -17,27 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "core_resource.hxx"
-#include "dbwiz.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
-#include "dsitems.hxx"
+#include <core_resource.hxx>
+#include <dbwiz.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
+#include <strings.hxx>
+#include <dsitems.hxx>
 #include "dsnItem.hxx"
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <vcl/msgbox.hxx>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include "adminpages.hxx"
 #include "generalpage.hxx"
-#include "stringlistitem.hxx"
-#include "propertysetitem.hxx"
+#include <stringlistitem.hxx>
+#include <propertysetitem.hxx>
 #include <unotools/confignode.hxx>
 #include "ConnectionPage.hxx"
 #include "DriverSettings.hxx"
 #include "DbAdminImpl.hxx"
-#include "helpids.h"
+#include <helpids.h>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index eddcc86800de..e79fde0c1466 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "core_resource.hxx"
-#include "dbwizsetup.hxx"
-#include "dsmeta.hxx"
+#include <core_resource.hxx>
+#include <dbwizsetup.hxx>
+#include <dsmeta.hxx>
 #include "DBSetupConnectionPages.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
-#include "dsitems.hxx"
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
+#include <strings.hxx>
+#include <dsitems.hxx>
 #include "dsnItem.hxx"
 
 #include <unotools/pathoptions.hxx>
@@ -32,18 +32,18 @@
 #include <svl/eitem.hxx>
 #include <svl/intitem.hxx>
 #include <vcl/msgbox.hxx>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include "adminpages.hxx"
 #include <sfx2/docfilt.hxx>
 #include <unotools/ucbhelper.hxx>
 #include "generalpage.hxx"
-#include "stringlistitem.hxx"
-#include "propertysetitem.hxx"
+#include <stringlistitem.hxx>
+#include <propertysetitem.hxx>
 #include <unotools/confignode.hxx>
 #include "DbAdminImpl.hxx"
-#include "helpids.h"
+#include <helpids.h>
 #include "ConnectionPageSetup.hxx"
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <dbaccess/AsynchronousLink.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 8a8a6adf8846..a5a6ce66228c 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -18,19 +18,19 @@
  */
 
 #include <config_features.h>
-#include "core_resource.hxx"
+#include <core_resource.hxx>
 #include "detailpages.hxx"
-#include "sqlmessage.hxx"
-#include "dsmeta.hxx"
+#include <sqlmessage.hxx>
+#include <dsmeta.hxx>
 #include "advancedsettings.hxx"
 #include "DbAdminImpl.hxx"
-#include "dsitems.hxx"
+#include <dsitems.hxx>
 #include "dbfindex.hxx"
 #include "dsnItem.hxx"
 
-#include "helpids.h"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
+#include <helpids.h>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
 
 #include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
@@ -44,7 +44,7 @@
 #endif
 #include <connectivity/CommonTools.hxx>
 #include "DriverSettings.hxx"
-#include "dbadmin.hxx"
+#include <dbadmin.hxx>
 #include <comphelper/types.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index d6db15724cfc..41d1263a4473 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -21,8 +21,8 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_DETAILPAGES_HXX
 
 #include "adminpages.hxx"
-#include "charsets.hxx"
-#include "charsetlistbox.hxx"
+#include <charsets.hxx>
+#include <charsetlistbox.hxx>
 #include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index ed2f7c7dae5c..8d4cfc1946c7 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -17,10 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "core_resource.hxx"
-#include "directsql.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
+#include <core_resource.hxx>
+#include <directsql.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
 #include <vcl/layout.hxx>
 #include <comphelper/types.hxx>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index b72eabe3c239..9562f4bab3dd 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -17,20 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dlgattr.hxx"
+#include <dlgattr.hxx>
 
 #include <sfx2/tabdlg.hxx>
 
 #include <svx/numinf.hxx>
 
 #include <svx/dialogs.hrc>
-#include "dbu_dlg.hxx"
+#include <dbu_dlg.hxx>
 #include <svl/itemset.hxx>
 #include <svl/zforlist.hxx>
 #include <svx/svxids.hrc>
 #include <svx/flagsdef.hxx>
 #include <svl/intitem.hxx>
-#include "core_resource.hxx"
+#include <core_resource.hxx>
 using namespace dbaui;
 
 
diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx
index ba74dc26570e..7d2dac178ad7 100644
--- a/dbaccess/source/ui/dlg/dlgsave.cxx
+++ b/dbaccess/source/ui/dlg/dlgsave.cxx
@@ -17,25 +17,25 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dlgsave.hxx"
+#include <dlgsave.hxx>
 #include <vcl/msgbox.hxx>
-#include "core_resource.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
+#include <core_resource.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
-#include "sqlmessage.hxx"
+#include <sqlmessage.hxx>
 #include <connectivity/dbtools.hxx>
-#include "UITools.hxx"
-#include "helpids.h"
-#include "SqlNameEdit.hxx"
+#include <UITools.hxx>
+#include <helpids.h>
+#include <SqlNameEdit.hxx>
 #include <vcl/button.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XHierarchicalNameAccess.hpp>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include "objectnamecheck.hxx"
+#include <objectnamecheck.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index f34a03e1b202..b1b1df3b20f5 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "dlgsize.hxx"
-#include "dbu_dlg.hxx"
-#include "core_resource.hxx"
+#include <dlgsize.hxx>
+#include <dbu_dlg.hxx>
+#include <core_resource.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx
index 3f90fd96c7b6..37d174dfc62e 100644
--- a/dbaccess/source/ui/dlg/dsselect.cxx
+++ b/dbaccess/source/ui/dlg/dsselect.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "dsselect.hxx"
-#include "dbu_dlg.hxx"
+#include <dbu_dlg.hxx>
 #include <vcl/msgbox.hxx>
 
 #include <com/sun/star/sdbcx/XCreateCatalog.hpp>
@@ -26,12 +26,12 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/types.hxx>
 #include <comphelper/processfactory.hxx>
-#include "dsitems.hxx"
+#include <dsitems.hxx>
 #include <svl/stritem.hxx>
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx
index edac249d7ad1..e99937f83df2 100644
--- a/dbaccess/source/ui/dlg/dsselect.hxx
+++ b/dbaccess/source/ui/dlg/dsselect.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_DSSELECT_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_DSSELECT_HXX
 
-#include "dsntypes.hxx"
+#include <dsntypes.hxx>
 #include "odbcconfig.hxx"
-#include "commontypes.hxx"
+#include <commontypes.hxx>
 
 #include <vcl/dialog.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index a43364b6ad8c..90fc389215eb 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "core_resource.hxx"
+#include <core_resource.hxx>
 #include "dsnItem.hxx"
 #include "generalpage.hxx"
 #include <connectivity/dbexception.hxx>
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
-#include "dsitems.hxx"
-#include "stringconstants.hxx"
-#include "dbadmin.hxx"
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
+#include <dsitems.hxx>
+#include <stringconstants.hxx>
+#include <dbadmin.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/docfilt.hxx>
 #include <vcl/stdtext.hxx>
@@ -37,7 +37,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include "DriverSettings.hxx"
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <comphelper/processfactory.hxx>
 #include <unotools/confignode.hxx>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 84269c2cbb6e..ac415990e832 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_GENERALPAGE_HXX
 
 #include "adminpages.hxx"
-#include "opendoccontrols.hxx"
+#include <opendoccontrols.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/edit.hxx>
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index b9ec5a710e02..b833d8b6ba32 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -17,26 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "sal/config.h"
+#include <sal/config.h>
 
 #include <set>
 
-#include "core_resource.hxx"
-#include "indexdialog.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
-#include "bitmaps.hlst"
-#include "helpids.h"
-#include "indexfieldscontrol.hxx"
-#include "indexcollection.hxx"
+#include <core_resource.hxx>
+#include <indexdialog.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
+#include <bitmaps.hlst>
+#include <helpids.h>
+#include <indexfieldscontrol.hxx>
+#include <indexcollection.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 #include <com/sun/star/sdb/SQLContext.hpp>
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <svtools/imgdef.hxx>
-#include "svtools/treelistentry.hxx"
-#include "browserids.hxx"
+#include <svtools/treelistentry.hxx>
+#include <browserids.hxx>
 #include <connectivity/dbtools.hxx>
 #include <osl/diagnose.h>
 
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index c3952074dada..e90713bb988c 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "core_resource.hxx"
-#include "indexfieldscontrol.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
+#include <core_resource.hxx>
+#include <indexfieldscontrol.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
 #include <osl/diagnose.h>
-#include "helpids.h"
+#include <helpids.h>
 #include <vcl/settings.hxx>
 #include <vcl/builderfactory.hxx>
 
diff --git a/dbaccess/source/ui/dlg/odbcconfig.hxx b/dbaccess/source/ui/dlg/odbcconfig.hxx
index 41e9806522f6..e0d0a243f4a4 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.hxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_DLG_ODBCCONFIG_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_DLG_ODBCCONFIG_HXX
 
-#include "commontypes.hxx"
+#include <commontypes.hxx>
 
 #if defined(_WIN32) || (defined (UNX) && !defined(ANDROID) && !defined(IOS))
 #define HAVE_ODBC_SUPPORT
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx
index a5504650193f..ee578a736466 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "core_resource.hxx"
-#include "paramdialog.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
-#include "commontypes.hxx"
+#include <core_resource.hxx>
+#include <paramdialog.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
+#include <strings.hxx>
+#include <commontypes.hxx>
 #include <com/sun/star/util/NumberFormatter.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <comphelper/processfactory.hxx>
 #include <connectivity/dbtools.hxx>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/layout.hxx>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 3584c88ebfeb..4e94ca5e1166 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "queryfilter.hxx"
-#include "core_resource.hxx"
+#include <queryfilter.hxx>
+#include <core_resource.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/DateTime.hpp>
@@ -35,8 +35,8 @@
 #include <osl/diagnose.h>
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/dbtools.hxx>
-#include "stringconstants.hxx"
-#include "strings.hxx"
+#include <stringconstants.hxx>
+#include <strings.hxx>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx
index 4119cf0c1da9..ebb78f2b89f6 100644
--- a/dbaccess/source/ui/dlg/queryorder.cxx
+++ b/dbaccess/source/ui/dlg/queryorder.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "strings.hrc"
-#include "strings.hxx"
-#include "core_resource.hxx"
-#include "queryorder.hxx"
-#include "stringconstants.hxx"
+#include <strings.hrc>
+#include <strings.hxx>
+#include <core_resource.hxx>
+#include <queryorder.hxx>
+#include <stringconstants.hxx>
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/sdbc/ColumnSearch.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 600a15cf2f7e..33adebe519d0 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -17,25 +17,25 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "core_resource.hxx"
-#include "sqlmessage.hxx"
-#include "dbu_dlg.hxx"
-#include "strings.hrc"
-#include "bitmaps.hlst"
+#include <core_resource.hxx>
+#include <sqlmessage.hxx>
+#include <dbu_dlg.hxx>
+#include <strings.hrc>
+#include <bitmaps.hlst>
 #include <com/sun/star/sdbc/SQLException.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <vcl/fixed.hxx>
 #include <osl/diagnose.h>
 #include <svtools/treelistbox.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 #include <svtools/svmedit.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/sqlerror.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/configmgr.hxx>
 #include <sfx2/sfxuno.hxx>
-#include "helpids.h"
-#include "UITools.hxx"
+#include <helpids.h>
+#include <UITools.hxx>
 
 #include <tools/urlobj.hxx>
 
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index ec1fb3af12b7..3832c9183287 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -18,18 +18,18 @@
  */
 
 #include "tablespage.hxx"
-#include "dbu_dlg.hxx"
-#include "dsitems.hxx"
-#include "browserids.hxx"
-#include "datasourceconnector.hxx"
+#include <dbu_dlg.hxx>
+#include <dsitems.hxx>
+#include <browserids.hxx>
+#include <datasourceconnector.hxx>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include "stringlistitem.hxx"
+#include <stringlistitem.hxx>
 #include <svl/eitem.hxx>
 #include <svl/stritem.hxx>
-#include "stringconstants.hxx"
-#include "strings.hxx"
+#include <stringconstants.hxx>
+#include <strings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/waitobj.hxx>
@@ -40,14 +40,14 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
 #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp>
-#include "sqlmessage.hxx"
+#include <sqlmessage.hxx>
 #include <vcl/msgbox.hxx>
-#include "helpids.h"
-#include "UITools.hxx"
+#include <helpids.h>
+#include <UITools.hxx>
 #include <osl/diagnose.h>
 #include <svtools/imgdef.hxx>
-#include "svtools/treelistentry.hxx"
-#include "TablesSingleDlg.hxx"
+#include <svtools/treelistentry.hxx>
+#include <TablesSingleDlg.hxx>
 #include <tools/diagnose_ex.h>
 #include <comphelper/processfactory.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 798e722e335a..ebfa57f066fb 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -23,7 +23,7 @@
 #include "adminpages.hxx"
 #include <com/sun/star/i18n/XCollator.hpp>
 #include <vcl/layout.hxx>
-#include "tabletree.hxx"
+#include <tabletree.hxx>
 #include <com/sun/star/sdbc/XConnection.hpp>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/dlg/textconnectionsettings.cxx b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
index f2e0d8b8718a..5fb86c173b4c 100644
--- a/dbaccess/source/ui/dlg/textconnectionsettings.cxx
+++ b/dbaccess/source/ui/dlg/textconnectionsettings.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "textconnectionsettings.hxx"
+#include <textconnectionsettings.hxx>
 #include "TextConnectionHelper.hxx"
-#include "dbu_pageids.hxx"
-#include "core_resource.hxx"
-#include "dsitems.hxx"
-#include "stringconstants.hxx"
+#include <dbu_pageids.hxx>
+#include <core_resource.hxx>
+#include <dsitems.hxx>
+#include <stringconstants.hxx>
 
 #include <vcl/msgbox.hxx>