loplugin:includeform: dbaccess

Change-Id: I15aee966012612033ab7e2ee03ac1a553802f540

43 files changed, 239 insertions, 239 deletions

diff --git a/dbaccess/source/ui/querydesign/ConnectionLine.cxx b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
index 8745e1c67714..2809c4d761e1 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLine.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLine.cxx
@@ -17,11 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ConnectionLine.hxx"
-#include "ConnectionLineData.hxx"
-#include "TableWindow.hxx"
-#include "TableWindowListBox.hxx"
-#include "TableConnection.hxx"
+#include <ConnectionLine.hxx>
+#include <ConnectionLineData.hxx>
+#include <TableWindow.hxx>
+#include <TableWindowListBox.hxx>
+#include <TableConnection.hxx>
 #include <vcl/svapp.hxx>
 #include <math.h>
 #include <osl/diagnose.h>
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 8621f30311f1..366c827a9744 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ConnectionLineAccess.hxx"
-#include "JoinTableView.hxx"
+#include <ConnectionLineAccess.hxx>
+#include <JoinTableView.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <toolkit/awt/vclxwindow.hxx>
-#include "TableConnection.hxx"
-#include "TableWindow.hxx"
+#include <TableConnection.hxx>
+#include <TableWindow.hxx>
 #include <comphelper/uno3.hxx>
-#include "JoinDesignView.hxx"
-#include "JoinController.hxx"
+#include <JoinDesignView.hxx>
+#include <JoinController.hxx>
 #include <comphelper/sequence.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
index 67809c28a04a..58a3d4a537ad 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineData.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "ConnectionLineData.hxx"
+#include <ConnectionLineData.hxx>
 
 using namespace dbaui;
 //class OConnectionLineData
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx
index 70f152588e85..796749e494a9 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "JAccess.hxx"
-#include "JoinTableView.hxx"
-#include "TableWindow.hxx"
+#include <JAccess.hxx>
+#include <JoinTableView.hxx>
+#include <TableWindow.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include "JoinDesignView.hxx"
-#include "JoinController.hxx"
-#include "TableConnection.hxx"
+#include <JoinDesignView.hxx>
+#include <JoinController.hxx>
+#include <TableConnection.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index 0ab7984581f6..7abab13dc14f 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -18,10 +18,10 @@
  */
 
 #include <sfx2/sfxsids.hrc>
-#include "strings.hrc"
-#include "browserids.hxx"
+#include <strings.hrc>
+#include <browserids.hxx>
 #include <comphelper/types.hxx>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/extract.hxx>
 #include <com/sun/star/container/XChild.hpp>
@@ -42,17 +42,17 @@
 #include <comphelper/seqstream.hxx>
 #include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/io/XActiveDataSink.hpp>
-#include "sqlmessage.hxx"
-#include "JoinController.hxx"
+#include <sqlmessage.hxx>
+#include <JoinController.hxx>
 #include <vcl/msgbox.hxx>
-#include "TableWindowData.hxx"
-#include "TableWindow.hxx"
-#include "TableConnectionData.hxx"
-#include "adtabdlg.hxx"
+#include <TableWindowData.hxx>
+#include <TableWindow.hxx>
+#include <TableConnectionData.hxx>
+#include <adtabdlg.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <osl/diagnose.h>
 
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index fc399c246915..440705ab50ab 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -17,26 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "JoinDesignView.hxx"
-#include "JoinTableView.hxx"
-#include "JoinController.hxx"
+#include <JoinDesignView.hxx>
+#include <JoinTableView.hxx>
+#include <JoinController.hxx>
 #include <svl/undo.hxx>
-#include "adtabdlg.hxx"
+#include <adtabdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/msgbox.hxx>
-#include "browserids.hxx"
-#include "strings.hrc"
+#include <browserids.hxx>
+#include <strings.hrc>
 #include <comphelper/types.hxx>
 #include <connectivity/dbtools.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include "TableConnection.hxx"
-#include "ConnectionLine.hxx"
-#include "ConnectionLineData.hxx"
-#include "TableConnectionData.hxx"
-#include "stringconstants.hxx"
+#include <TableConnection.hxx>
+#include <ConnectionLine.hxx>
+#include <ConnectionLineData.hxx>
+#include <TableConnectionData.hxx>
+#include <stringconstants.hxx>
 #include <comphelper/extract.hxx>
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <vcl/settings.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index 1d027c04afda..63762020aefb 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "JoinExchange.hxx"
+#include <JoinExchange.hxx>
 #include <sot/formats.hxx>
 #include <cppuhelper/typeprovider.hxx>
 
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 14d89cd448d5..d59f85e15d89 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -17,30 +17,30 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "JoinTableView.hxx"
+#include <JoinTableView.hxx>
 #include <osl/diagnose.h>
-#include "querycontroller.hxx"
-#include "JoinDesignView.hxx"
-#include "strings.hrc"
-#include "TableWindow.hxx"
-#include "TableWindowListBox.hxx"
-#include "TableConnection.hxx"
-#include "TableConnectionData.hxx"
-#include "ConnectionLine.hxx"
-#include "ConnectionLineData.hxx"
-#include "browserids.hxx"
+#include <querycontroller.hxx>
+#include <JoinDesignView.hxx>
+#include <strings.hrc>
+#include <TableWindow.hxx>
+#include <TableWindowListBox.hxx>
+#include <TableConnection.hxx>
+#include <TableConnectionData.hxx>
+#include <ConnectionLine.hxx>
+#include <ConnectionLineData.hxx>
+#include <browserids.hxx>
 #include <svl/urlbmk.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include "QueryMoveTabWinUndoAct.hxx"
 #include "QuerySizeTabWinUndoAct.hxx"
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include "TableWindowData.hxx"
-#include "JAccess.hxx"
+#include <TableWindowData.hxx>
+#include <JAccess.hxx>
 #include <com/sun/star/accessibility/XAccessible.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/querydesign/LimitBox.cxx b/dbaccess/source/ui/querydesign/LimitBox.cxx
index 9eb4851f039e..4944f3d30541 100644
--- a/dbaccess/source/ui/querydesign/LimitBox.cxx
+++ b/dbaccess/source/ui/querydesign/LimitBox.cxx
@@ -8,9 +8,9 @@
  */
 
 #include <vcl/builderfactory.hxx>
-#include "LimitBox.hxx"
-#include "strings.hrc"
-#include "core_resource.hxx"
+#include <LimitBox.hxx>
+#include <strings.hrc>
+#include <core_resource.hxx>
 
 #define ALL_STRING DBA_RES(STR_QUERY_LIMIT_ALL)
 #define ALL_INT -1
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx
index 4a17b327f923..201d74b01cae 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx
@@ -19,8 +19,8 @@
 
 #include "QTableConnection.hxx"
 #include <osl/diagnose.h>
-#include "QueryTableView.hxx"
-#include "ConnectionLine.hxx"
+#include <QueryTableView.hxx>
+#include <ConnectionLine.hxx>
 using namespace dbaui;
 // class OQueryTableConnection
 
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.hxx b/dbaccess/source/ui/querydesign/QTableConnection.hxx
index ddf15b1a6074..1e0f057fb9f7 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTION_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTION_HXX
 
-#include "TableConnection.hxx"
+#include <TableConnection.hxx>
 #include "QTableConnectionData.hxx"
-#include "QEnumTypes.hxx"
+#include <QEnumTypes.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
index 4ff60d1c3a03..524177b20f57 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTIONDATA_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLECONNECTIONDATA_HXX
 
-#include "TableConnectionData.hxx"
-#include "TableFieldDescription.hxx"
-#include "QEnumTypes.hxx"
+#include <TableConnectionData.hxx>
+#include <TableFieldDescription.hxx>
+#include <QEnumTypes.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index 2bb7a503aaf8..155618254a81 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -18,17 +18,17 @@
  */
 
 #include "QTableWindow.hxx"
-#include "QueryTableView.hxx"
-#include "stringconstants.hxx"
+#include <QueryTableView.hxx>
+#include <stringconstants.hxx>
 #include <osl/diagnose.h>
-#include "helpids.h"
-#include "QueryDesignView.hxx"
-#include "browserids.hxx"
-#include "querycontroller.hxx"
+#include <helpids.h>
+#include <QueryDesignView.hxx>
+#include <browserids.hxx>
+#include <querycontroller.hxx>
 #include <vcl/image.hxx>
-#include "TableWindowListBox.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
+#include <TableWindowListBox.hxx>
+#include <strings.hrc>
+#include <strings.hxx>
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -39,8 +39,8 @@
 #include <comphelper/extract.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/uno3.hxx>
-#include "UITools.hxx"
-#include "svtools/treelistentry.hxx"
+#include <UITools.hxx>
+#include <svtools/treelistentry.hxx>
 
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdbcx;
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.hxx b/dbaccess/source/ui/querydesign/QTableWindow.hxx
index a7832021b16d..a13145b267f5 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.hxx
@@ -19,9 +19,9 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOW_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOW_HXX
 
-#include "TableWindow.hxx"
+#include <TableWindow.hxx>
 #include "QTableWindowData.hxx"
-#include "TableFieldDescription.hxx"
+#include <TableFieldDescription.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/QTableWindowData.hxx b/dbaccess/source/ui/querydesign/QTableWindowData.hxx
index 9fa4de2fdd67..401a9a0fdd52 100644
--- a/dbaccess/source/ui/querydesign/QTableWindowData.hxx
+++ b/dbaccess/source/ui/querydesign/QTableWindowData.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOWDATA_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QTABLEWINDOWDATA_HXX
 
-#include "TableWindowData.hxx"
+#include <TableWindowData.hxx>
 #include <vector>
 #include <com/sun/star/io/XObjectOutputStream.hpp>
 #include <com/sun/star/io/XObjectInputStream.hpp>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
index 582ca7912a32..db7dbeec49b8 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNFIELDUNDOACT_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNFIELDUNDOACT_HXX
 
-#include "GeneralUndo.hxx"
-#include "strings.hrc"
+#include <GeneralUndo.hxx>
+#include <strings.hrc>
 #include "SelectionBrowseBox.hxx"
 
 namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
index f5ab95bd49d1..17e6e734d8ec 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNUNDOACTION_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYDESIGNUNDOACTION_HXX
 
-#include "GeneralUndo.hxx"
+#include <GeneralUndo.hxx>
 #include <vcl/vclptr.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 63be1bcc2569..87e18ae5d924 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -17,25 +17,25 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "QueryDesignView.hxx"
-#include "QueryTableView.hxx"
+#include <QueryDesignView.hxx>
+#include <QueryTableView.hxx>
 #include "QTableWindow.hxx"
 #include <vcl/toolbox.hxx>
-#include "querycontroller.hxx"
-#include "sqlbison.hxx"
+#include <querycontroller.hxx>
+#include <sqlbison.hxx>
 #include <vcl/split.hxx>
 #include <svl/undo.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include "adtabdlg.hxx"
+#include <adtabdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/layout.hxx>
-#include "browserids.hxx"
+#include <browserids.hxx>
 #include "SelectionBrowseBox.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
+#include <strings.hrc>
+#include <strings.hxx>
 #include <unotools/configmgr.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/string.hxx>
@@ -48,14 +48,14 @@
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <connectivity/PColumn.hxx>
 #include "QTableConnection.hxx"
-#include "ConnectionLine.hxx"
-#include "ConnectionLineData.hxx"
+#include <ConnectionLine.hxx>
+#include <ConnectionLineData.hxx>
 #include "QTableConnectionData.hxx"
-#include "core_resource.hxx"
-#include "stringconstants.hxx"
-#include "UITools.hxx"
-#include "querycontainerwindow.hxx"
-#include "sqlmessage.hxx"
+#include <core_resource.hxx>
+#include <stringconstants.hxx>
+#include <UITools.hxx>
+#include <querycontainerwindow.hxx>
+#include <sqlmessage.hxx>
 #include <unotools/syslocale.hxx>
 #include <memory>
 #include <set>
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
index 5ac1436a80c3..71915f527b4a 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "QueryMoveTabWinUndoAct.hxx"
-#include "JoinTableView.hxx"
+#include <JoinTableView.hxx>
 #include "QTableWindow.hxx"
 using namespace dbaui;
 void OJoinMoveTabWinUndoAct::TogglePosition()
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
index b97ae8b42e10..9e5e907a47bd 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYMOVETABWINUNDOACT_HXX
 
 #include "QueryDesignUndoAction.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include <tools/gen.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
index 4ea75f11e4bc..aaea469c267a 100644
--- a/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
+++ b/dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_QUERYSIZETABWINUNDOACT_HXX
 
 #include "QueryDesignUndoAction.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
index 6f7eeec54f96..eb41570e3d0f 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
@@ -20,10 +20,10 @@
 #include "QueryTabConnUndoAction.hxx"
 #include "QTableConnection.hxx"
 #include "QTableWindow.hxx"
-#include "QueryTableView.hxx"
+#include <QueryTableView.hxx>
 #include "QueryAddTabConnUndoAction.hxx"
 #include "QueryTabWinShowUndoAct.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 
 using namespace dbaui;
 
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index 8b7ec538d769..0c1303e3b4ce 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -21,10 +21,10 @@
 #include <osl/diagnose.h>
 #include "QTableWindow.hxx"
 #include "QTableWindowData.hxx"
-#include "TableConnection.hxx"
-#include "TableConnectionData.hxx"
+#include <TableConnection.hxx>
+#include <TableConnectionData.hxx>
 #include "QueryDesignFieldUndoAct.hxx"
-#include "QueryTableView.hxx"
+#include <QueryTableView.hxx>
 
 using namespace dbaui;
 OQueryDesignFieldUndoAct::OQueryDesignFieldUndoAct(OSelectionBrowseBox* pSelBrwBox, const char* pCommentID)
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 5979dc4585db..5144525f2c97 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -17,39 +17,39 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "QueryTableView.hxx"
+#include <QueryTableView.hxx>
 #include "TableFieldInfo.hxx"
-#include "TableFieldDescription.hxx"
+#include <TableFieldDescription.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include "helpids.h"
+#include <helpids.h>
 #include "QTableWindow.hxx"
 #include "QTableConnection.hxx"
 #include "QTableConnectionData.hxx"
-#include "QueryDesignView.hxx"
-#include "querycontroller.hxx"
+#include <QueryDesignView.hxx>
+#include <querycontroller.hxx>
 #include "QueryAddTabConnUndoAction.hxx"
 #include "QueryTabWinShowUndoAct.hxx"
-#include "browserids.hxx"
+#include <browserids.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include "JAccess.hxx"
+#include <JAccess.hxx>
 #include <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/sequence.hxx>
 #include "querydlg.hxx"
-#include "JoinExchange.hxx"
+#include <JoinExchange.hxx>
 #include <comphelper/extract.hxx>
-#include "strings.hrc"
-#include "strings.hxx"
+#include <strings.hrc>
+#include <strings.hxx>
 #include <vcl/msgbox.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 0ce7d09ab064..f7fa0cd10a02 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -17,20 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "QueryTextView.hxx"
-#include "querycontainerwindow.hxx"
-#include "QueryViewSwitch.hxx"
-#include "sqledit.hxx"
-#include "undosqledit.hxx"
-#include "browserids.hxx"
-#include "querycontroller.hxx"
-#include "strings.hrc"
-#include "stringconstants.hxx"
+#include <QueryTextView.hxx>
+#include <querycontainerwindow.hxx>
+#include <QueryViewSwitch.hxx>
+#include <sqledit.hxx>
+#include <undosqledit.hxx>
+#include <browserids.hxx>
+#include <querycontroller.hxx>
+#include <strings.hrc>
+#include <stringconstants.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/split.hxx>
 #include <vcl/svapp.hxx>
 #include <comphelper/types.hxx>
-#include "QueryDesignView.hxx"
+#include <QueryDesignView.hxx>
 
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index d5463f10415a..9904e70fe3ca 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -17,15 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "QueryViewSwitch.hxx"
-#include "QueryDesignView.hxx"
-#include "QueryTextView.hxx"
-#include "querycontainerwindow.hxx"
-#include "strings.hrc"
-#include "browserids.hxx"
-#include "adtabdlg.hxx"
-#include "querycontroller.hxx"
-#include "sqledit.hxx"
+#include <QueryViewSwitch.hxx>
+#include <QueryDesignView.hxx>
+#include <QueryTextView.hxx>
+#include <querycontainerwindow.hxx>
+#include <strings.hrc>
+#include <browserids.hxx>
+#include <adtabdlg.hxx>
+#include <querycontroller.hxx>
+#include <sqledit.hxx>
 
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 63138efeb749..3fc5508b5bf7 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -20,29 +20,29 @@
 #include "SelectionBrowseBox.hxx"
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
-#include "QueryDesignView.hxx"
-#include "querycontroller.hxx"
-#include "sqlbison.hxx"
-#include "QueryTableView.hxx"
-#include "browserids.hxx"
+#include <QueryDesignView.hxx>
+#include <querycontroller.hxx>
+#include <sqlbison.hxx>
+#include <QueryTableView.hxx>
+#include <browserids.hxx>
 #include <comphelper/extract.hxx>
 #include <comphelper/stl_types.hxx>
 #include <comphelper/string.hxx>
 #include <comphelper/types.hxx>
 #include "TableFieldInfo.hxx"
-#include "strings.hrc"
-#include "strings.hxx"
-#include "helpids.h"
+#include <strings.hrc>
+#include <strings.hxx>
+#include <helpids.h>
 #include <com/sun/star/container/XNameAccess.hpp>
-#include "stringconstants.hxx"
+#include <stringconstants.hxx>
 #include "QTableWindow.hxx"
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 #include "QueryDesignFieldUndoAct.hxx"
-#include "sqlmessage.hxx"
-#include "UITools.hxx"
+#include <sqlmessage.hxx>
+#include <UITools.hxx>
 #include <osl/diagnose.h>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 using namespace ::svt;
 using namespace ::dbaui;
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index a17bcfd9be0e..782dd6f9ae05 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -20,9 +20,9 @@
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_SELECTIONBROWSEBOX_HXX
 
 #include <svtools/editbrowsebox.hxx>
-#include "TableFieldDescription.hxx"
-#include "JoinExchange.hxx"
-#include "QEnumTypes.hxx"
+#include <TableFieldDescription.hxx>
+#include <JoinExchange.hxx>
+#include <QEnumTypes.hxx>
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <svtools/transfer.hxx>
 
diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx
index d8c9859f8d0a..e08020f1ff12 100644
--- a/dbaccess/source/ui/querydesign/TableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnection.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TableConnection.hxx"
-#include "ConnectionLine.hxx"
-#include "TableConnectionData.hxx"
-#include "JoinTableView.hxx"
+#include <TableConnection.hxx>
+#include <ConnectionLine.hxx>
+#include <TableConnectionData.hxx>
+#include <JoinTableView.hxx>
 #include <comphelper/stl_types.hxx>
-#include "ConnectionLineAccess.hxx"
+#include <ConnectionLineAccess.hxx>
 
 using namespace dbaui;
 using namespace comphelper;
diff --git a/dbaccess/source/ui/querydesign/TableConnectionData.cxx b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
index 633af8529457..812948d9efc8 100644
--- a/dbaccess/source/ui/querydesign/TableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnectionData.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TableConnectionData.hxx"
+#include <TableConnectionData.hxx>
 #include <osl/diagnose.h>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
index 44ead8996757..f46efb890195 100644
--- a/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
+++ b/dbaccess/source/ui/querydesign/TableFieldDescription.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TableFieldDescription.hxx"
+#include <TableFieldDescription.hxx>
 
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx
index 25dc9123cf23..7d0e83b4c0e4 100644
--- a/dbaccess/source/ui/querydesign/TableFieldInfo.hxx
+++ b/dbaccess/source/ui/querydesign/TableFieldInfo.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_TABLEFIELDINFO_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_TABLEFIELDINFO_HXX
 
-#include "QEnumTypes.hxx"
+#include <QEnumTypes.hxx>
 #include <sal/types.h>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index e821efc8b5f6..7e372a0c848a 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TableWindow.hxx"
-#include "TableWindowListBox.hxx"
-#include "QueryTableView.hxx"
-#include "QueryDesignView.hxx"
-#include "TableWindowData.hxx"
-#include "imageprovider.hxx"
+#include <TableWindow.hxx>
+#include <TableWindowListBox.hxx>
+#include <QueryTableView.hxx>
+#include <QueryDesignView.hxx>
+#include <TableWindowData.hxx>
+#include <imageprovider.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
@@ -34,16 +34,16 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
-#include "querycontroller.hxx"
-#include "strings.hrc"
-#include "stringconstants.hxx"
-#include "bitmaps.hlst"
+#include <querycontroller.hxx>
+#include <strings.hrc>
+#include <stringconstants.hxx>
+#include <bitmaps.hlst>
 #include <comphelper/extract.hxx>
-#include "UITools.hxx"
-#include "TableWindowAccess.hxx"
-#include "browserids.hxx"
+#include <UITools.hxx>
+#include <TableWindowAccess.hxx>
+#include <browserids.hxx>
 #include <connectivity/dbtools.hxx>
-#include "svtools/treelistentry.hxx"
+#include <svtools/treelistentry.hxx>
 
 using namespace dbaui;
 using namespace ::utl;
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index 121807118f94..8c227da3957c 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -17,20 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TableWindowAccess.hxx"
-#include "JAccess.hxx"
-#include "TableWindow.hxx"
-#include "TableWindowListBox.hxx"
-#include "JoinDesignView.hxx"
-#include "JoinController.hxx"
-#include "JoinTableView.hxx"
+#include <TableWindowAccess.hxx>
+#include <JAccess.hxx>
+#include <TableWindow.hxx>
+#include <TableWindowListBox.hxx>
+#include <JoinDesignView.hxx>
+#include <JoinController.hxx>
+#include <JoinTableView.hxx>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <comphelper/sequence.hxx>
-#include "strings.hrc"
+#include <strings.hrc>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/TableWindowData.cxx b/dbaccess/source/ui/querydesign/TableWindowData.cxx
index a2bd40288ac6..d29a7c695047 100644
--- a/dbaccess/source/ui/querydesign/TableWindowData.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowData.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TableWindowData.hxx"
+#include <TableWindowData.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index fae19f31f19f..75f46bf5510a 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TableWindowListBox.hxx"
-#include "TableWindow.hxx"
-#include "QueryDesignView.hxx"
-#include "QueryTableView.hxx"
-#include "querycontroller.hxx"
-#include "JoinExchange.hxx"
+#include <TableWindowListBox.hxx>
+#include <TableWindow.hxx>
+#include <QueryDesignView.hxx>
+#include <QueryTableView.hxx>
+#include <querycontroller.hxx>
+#include <JoinExchange.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 231952f62f65..dcf9bbedbc78 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -17,19 +17,19 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "TableWindowTitle.hxx"
-#include "TableWindow.hxx"
-#include "QueryTableView.hxx"
+#include <TableWindowTitle.hxx>
+#include <TableWindow.hxx>
+#include <QueryTableView.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/settings.hxx>
-#include "stringconstants.hxx"
-#include "TableWindowListBox.hxx"
-#include "TableConnection.hxx"
-#include "strings.hrc"
-#include "QueryDesignView.hxx"
-#include "JoinController.hxx"
+#include <stringconstants.hxx>
+#include <TableWindowListBox.hxx>
+#include <TableConnection.hxx>
+#include <strings.hrc>
+#include <QueryDesignView.hxx>
+#include <JoinController.hxx>
 
 #include <algorithm>
 
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
index e1a8517e3d35..51c2d2912b91 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx
@@ -8,7 +8,7 @@
  */
 
 #include "limitboxcontroller.hxx"
-#include "uiservices.hxx"
+#include <uiservices.hxx>
 
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
@@ -19,9 +19,9 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include "LimitBox.hxx"
-#include "dbu_reghelper.hxx"
-#include "core_resource.hxx"
+#include <LimitBox.hxx>
+#include <dbu_reghelper.hxx>
+#include <core_resource.hxx>
 
 
 using namespace ::com::sun::star;
diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
index c2a2adc14bf9..3928509c1e6c 100644
--- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
+++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx
@@ -15,7 +15,7 @@
 #include <rtl/ustring.hxx>
 #include <vcl/vclptr.hxx>
 
-#include "apitools.hxx"
+#include <apitools.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 03b504faaa51..c558da3bd186 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -17,17 +17,17 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "querycontainerwindow.hxx"
-#include "QueryDesignView.hxx"
+#include <querycontainerwindow.hxx>
+#include <QueryDesignView.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
-#include "JoinController.hxx"
+#include <JoinController.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include "stringconstants.hxx"
-#include "strings.hxx"
+#include <stringconstants.hxx>
+#include <strings.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <vcl/fixed.hxx>
-#include "UITools.hxx"
+#include <UITools.hxx>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/Frame.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 331147134f1a..1375ac8ba17a 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -17,30 +17,30 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "adtabdlg.hxx"
-#include "browserids.hxx"
-#include "core_resource.hxx"
-#include "strings.hrc"
-#include "query.hrc"
-#include "dbu_reghelper.hxx"
-#include "dbu_pageids.hxx"
-#include "stringconstants.hxx"
-#include "defaultobjectnamecheck.hxx"
-#include "dlgsave.hxx"
-#include "uiservices.hxx"
+#include <adtabdlg.hxx>
+#include <browserids.hxx>
+#include <core_resource.hxx>
+#include <strings.hrc>
+#include <query.hrc>
+#include <dbu_reghelper.hxx>
+#include <dbu_pageids.hxx>
+#include <stringconstants.hxx>
+#include <defaultobjectnamecheck.hxx>
+#include <dlgsave.hxx>
+#include <uiservices.hxx>
 #include "QTableWindow.hxx"
 #include "QTableWindowData.hxx"
-#include "querycontainerwindow.hxx"
-#include "querycontroller.hxx"
-#include "QueryDesignView.hxx"
-#include "QueryTableView.hxx"
-#include "QueryTextView.hxx"
-#include "QueryViewSwitch.hxx"
-#include "sqlmessage.hxx"
-#include "TableConnectionData.hxx"
-#include "TableFieldDescription.hxx"
-#include "UITools.hxx"
-#include "QueryPropertiesDialog.hxx"
+#include <querycontainerwindow.hxx>
+#include <querycontroller.hxx>
+#include <QueryDesignView.hxx>
+#include <QueryTableView.hxx>
+#include <QueryTextView.hxx>
+#include <QueryViewSwitch.hxx>
+#include <sqlmessage.hxx>
+#include <TableConnectionData.hxx>
+#include <TableFieldDescription.hxx>
+#include <UITools.hxx>
+#include <QueryPropertiesDialog.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XChild.hpp>
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index d9b3bd1d040f..6a6ae3ead9b0 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -18,16 +18,16 @@
  */
 
 #include "querydlg.hxx"
-#include "strings.hrc"
+#include <strings.hrc>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include "QTableConnectionData.hxx"
-#include "core_resource.hxx"
-#include "querycontroller.hxx"
-#include "QueryTableView.hxx"
-#include "QueryDesignView.hxx"
+#include <core_resource.hxx>
+#include <querycontroller.hxx>
+#include <QueryTableView.hxx>
+#include <QueryDesignView.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
-#include "RelationControl.hxx"
+#include <RelationControl.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx
index 9fa4f2beffda..dc423e2184c7 100644
--- a/dbaccess/source/ui/querydesign/querydlg.hxx
+++ b/dbaccess/source/ui/querydesign/querydlg.hxx
@@ -25,10 +25,10 @@
 #include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 
-#include "QEnumTypes.hxx"
+#include <QEnumTypes.hxx>
 
-#include "RelControliFace.hxx"
-#include "JoinTableView.hxx"
+#include <RelControliFace.hxx>
+#include <JoinTableView.hxx>
 
 
 namespace dbaui