tdf#42949 Fix IWYU warnings in dbaccess/source/ui/[m-u]*/*cxx

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I6bf360b331589692141f6fca52eee5b8e11ef7bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92827
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

23 files changed, 21 insertions, 122 deletions

diff --git a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
index 6aa5081c14e4..763e53990276 100644
--- a/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
+++ b/dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx
@@ -23,11 +23,8 @@
 #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 <JoinDesignView.hxx>
-#include <JoinController.hxx>
 #include <comphelper/sequence.hxx>
 
 namespace dbaui
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx
index 703d91fe30f9..8068f0fa7f21 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -22,8 +22,6 @@
 #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 <o3tl/safeint.hxx>
 
diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx
index d8f21cf26705..49ad53027729 100644
--- a/dbaccess/source/ui/querydesign/JoinController.cxx
+++ b/dbaccess/source/ui/querydesign/JoinController.cxx
@@ -17,27 +17,10 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sfxsids.hrc>
 #include <browserids.hxx>
-#include <stringconstants.hxx>
-#include <connectivity/dbtools.hxx>
-#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
-#include <com/sun/star/sdbcx/XTablesSupplier.hpp>
-#include <com/sun/star/sdbcx/KeyType.hpp>
-#include <com/sun/star/sdbcx/XDrop.hpp>
-#include <com/sun/star/sdbcx/XAlterTable.hpp>
-#include <com/sun/star/sdbcx/XAppend.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <connectivity/dbexception.hxx>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <sqlmessage.hxx>
 #include <JoinController.hxx>
 #include <TableWindowData.hxx>
 #include <TableWindow.hxx>
@@ -45,7 +28,6 @@
 #include <adtabdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <UITools.hxx>
 #include <osl/diagnose.h>
 
 using namespace ::com::sun::star::uno;
@@ -55,7 +37,6 @@ using namespace ::com::sun::star::frame;
 using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::container;
-using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::ui::dialogs;
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index dfcfc5c0f612..c0d3ea81c7a0 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -20,19 +20,7 @@
 #include <JoinDesignView.hxx>
 #include <JoinTableView.hxx>
 #include <JoinController.hxx>
-#include <svl/undo.hxx>
-#include <adtabdlg.hxx>
 #include <vcl/svapp.hxx>
-#include <browserids.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 <UITools.hxx>
 #include <vcl/settings.hxx>
 
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 02562bf49a5d..54ea53f0e18f 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -19,7 +19,7 @@
 
 #include <JoinTableView.hxx>
 #include <osl/diagnose.h>
-#include <querycontroller.hxx>
+#include <JoinController.hxx>
 #include <JoinDesignView.hxx>
 #include <TableWindow.hxx>
 #include <TableWindowListBox.hxx>
@@ -28,8 +28,8 @@
 #include <ConnectionLine.hxx>
 #include <ConnectionLineData.hxx>
 #include <browserids.hxx>
-#include <svl/urlbmk.hxx>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include "QueryMoveTabWinUndoAct.hxx"
 #include "QuerySizeTabWinUndoAct.hxx"
 #include <toolkit/helper/vclunohelper.hxx>
@@ -38,13 +38,14 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
+#include <vcl/builder.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 <cppuhelper/exc_hlp.hxx>
+#include <connectivity/dbtools.hxx>
 #include <tools/diagnose_ex.h>
 #include <algorithm>
 #include <functional>
diff --git a/dbaccess/source/ui/querydesign/QTableConnection.cxx b/dbaccess/source/ui/querydesign/QTableConnection.cxx
index 15a232683599..c5db155f2257 100644
--- a/dbaccess/source/ui/querydesign/QTableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnection.cxx
@@ -20,7 +20,7 @@
 #include "QTableConnection.hxx"
 #include <osl/diagnose.h>
 #include <QueryTableView.hxx>
-#include <ConnectionLine.hxx>
+
 using namespace dbaui;
 
 OQueryTableConnection::OQueryTableConnection(OQueryTableView* pContainer, const TTableConnectionData::value_type& pTabConnData)
diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx
index cd139398a9fb..6d2916683db9 100644
--- a/dbaccess/source/ui/querydesign/QTableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx
@@ -19,28 +19,21 @@
 
 #include "QTableWindow.hxx"
 #include <QueryTableView.hxx>
-#include <stringconstants.hxx>
+#include <JoinController.hxx>
+#include <JoinDesignView.hxx>
 #include <osl/diagnose.h>
 #include <helpids.h>
-#include <QueryDesignView.hxx>
 #include <browserids.hxx>
-#include <querycontroller.hxx>
-#include <vcl/image.hxx>
 #include <TableWindowListBox.hxx>
 #include <strings.hxx>
-#include <com/sun/star/sdbcx/XKeysSupplier.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/sdbcx/KeyType.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include "TableFieldInfo.hxx"
-#include <UITools.hxx>
+#include <comphelper/stl_types.hxx>
 #include <vcl/treelistentry.hxx>
 #include <comphelper/types.hxx>
 
 using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::sdbcx;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 1ba9ca585e5d..59494bc9b253 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -20,15 +20,12 @@
 #include <QueryDesignView.hxx>
 #include <QueryTableView.hxx>
 #include "QTableWindow.hxx"
-#include <vcl/toolbox.hxx>
 #include <querycontroller.hxx>
 #include <sqlbison.hxx>
 #include <vcl/split.hxx>
-#include <svl/undo.hxx>
 #include <tools/diagnose_ex.h>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
-#include <adtabdlg.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/combobox.hxx>
 #include <vcl/weld.hxx>
@@ -36,24 +33,19 @@
 #include "SelectionBrowseBox.hxx"
 #include <strings.hrc>
 #include <strings.hxx>
-#include <unotools/configmgr.hxx>
 #include <comphelper/string.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include <com/sun/star/i18n/XLocaleData.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/sdbc/ColumnValue.hpp>
 #include <connectivity/PColumn.hxx>
 #include "QTableConnection.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 <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <memory>
diff --git a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
index 71915f527b4a..1e7ca6bb9525 100644
--- a/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx
@@ -19,7 +19,7 @@
 
 #include "QueryMoveTabWinUndoAct.hxx"
 #include <JoinTableView.hxx>
-#include "QTableWindow.hxx"
+
 using namespace dbaui;
 void OJoinMoveTabWinUndoAct::TogglePosition()
 {
diff --git a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
index eb41570e3d0f..b209a62ce5e8 100644
--- a/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx
@@ -19,7 +19,6 @@
 
 #include "QueryTabConnUndoAction.hxx"
 #include "QTableConnection.hxx"
-#include "QTableWindow.hxx"
 #include <QueryTableView.hxx>
 #include "QueryAddTabConnUndoAction.hxx"
 #include "QueryTabWinShowUndoAct.hxx"
diff --git a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
index dee5538ff8dd..6242c94fc09f 100644
--- a/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx
@@ -20,9 +20,7 @@
 #include "QueryTabWinUndoAct.hxx"
 #include <osl/diagnose.h>
 #include "QTableWindow.hxx"
-#include "QTableWindowData.hxx"
 #include <TableConnection.hxx>
-#include <TableConnectionData.hxx>
 #include "QueryDesignFieldUndoAct.hxx"
 #include <QueryTableView.hxx>
 
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 79534d2f1ae7..728925e4f600 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <QueryTableView.hxx>
-#include "TableFieldInfo.hxx"
 #include <TableFieldDescription.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
@@ -27,24 +26,19 @@
 #include "QTableConnection.hxx"
 #include "QTableConnectionData.hxx"
 #include <QueryDesignView.hxx>
-#include <querycontroller.hxx>
 #include "QueryAddTabConnUndoAction.hxx"
 #include "QueryTabWinShowUndoAct.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 <com/sun/star/sdbcx/KeyType.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <stringconstants.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/sequence.hxx>
 #include "querydlg.hxx"
-#include <JoinExchange.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
 #include <strings.hxx>
diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx
index 58542fba5c6e..9633146900c6 100644
--- a/dbaccess/source/ui/querydesign/QueryTextView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx
@@ -19,14 +19,8 @@
 
 #include <QueryTextView.hxx>
 #include <querycontainerwindow.hxx>
-#include <QueryViewSwitch.hxx>
 #include <sqledit.hxx>
 #include <undosqledit.hxx>
-#include <browserids.hxx>
-#include <querycontroller.hxx>
-#include <stringconstants.hxx>
-#include <vcl/split.hxx>
-#include <vcl/svapp.hxx>
 #include <QueryDesignView.hxx>
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index ba3cee82640d..e7d6758f480f 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -21,7 +21,6 @@
 #include <QueryDesignView.hxx>
 #include <QueryTextView.hxx>
 #include <querycontainerwindow.hxx>
-#include <browserids.hxx>
 #include <adtabdlg.hxx>
 #include <querycontroller.hxx>
 #include <sqledit.hxx>
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 9b127f16681b..a288e478bc14 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -33,8 +33,6 @@
 #include <strings.hrc>
 #include <strings.hxx>
 #include <helpids.h>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <stringconstants.hxx>
 #include "QTableWindow.hxx"
 #include <vcl/button.hxx>
 #include <vcl/weld.hxx>
diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx
index 01fd9ad94d0a..ada4b5990890 100644
--- a/dbaccess/source/ui/querydesign/TableConnection.cxx
+++ b/dbaccess/source/ui/querydesign/TableConnection.cxx
@@ -21,7 +21,6 @@
 #include <ConnectionLine.hxx>
 #include <TableConnectionData.hxx>
 #include <JoinTableView.hxx>
-#include <ConnectionLineAccess.hxx>
 
 using namespace dbaui;
 using namespace comphelper;
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 61d09a8aaac0..d32ba27b90ca 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -19,11 +19,11 @@
 
 #include <TableWindow.hxx>
 #include <TableWindowListBox.hxx>
-#include <QueryTableView.hxx>
-#include <QueryDesignView.hxx>
 #include <TableWindowData.hxx>
 #include <imageprovider.hxx>
-#include <tools/diagnose_ex.h>
+#include <JoinController.hxx>
+#include <JoinTableView.hxx>
+#include <JoinDesignView.hxx>
 #include <osl/diagnose.h>
 #include <vcl/svapp.hxx>
 #include <vcl/wall.hxx>
@@ -32,21 +32,15 @@
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
 
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/accessibility/AccessibleEventId.hpp>
-#include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
-#include <querycontroller.hxx>
-#include <stringconstants.hxx>
 #include <bitmaps.hlst>
-#include <UITools.hxx>
 #include <TableWindowAccess.hxx>
-#include <browserids.hxx>
 #include <connectivity/dbtools.hxx>
 #include <vcl/treelistentry.hxx>
+#include <vcl/builder.hxx>
 
 using namespace dbaui;
 using namespace ::utl;
diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
index f63e3d58e871..3cd87ded7a61 100644
--- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx
@@ -18,16 +18,11 @@
  */
 
 #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>
 
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index fe5e5382b9cb..a4ba5f0022ae 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -19,12 +19,13 @@
 
 #include <TableWindowListBox.hxx>
 #include <TableWindow.hxx>
-#include <QueryDesignView.hxx>
-#include <QueryTableView.hxx>
-#include <querycontroller.hxx>
+#include <JoinController.hxx>
 #include <JoinExchange.hxx>
+#include <JoinTableView.hxx>
+#include <JoinDesignView.hxx>
 #include <osl/diagnose.h>
 #include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <vcl/svapp.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
diff --git a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
index 6ac8e0967b93..952063d5d3cc 100644
--- a/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowTitle.cxx
@@ -19,21 +19,15 @@
 
 #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 <vcl/commandevent.hxx>
 #include <vcl/event.hxx>
-#include <stringconstants.hxx>
 #include <TableWindowListBox.hxx>
 #include <TableConnection.hxx>
-#include <QueryDesignView.hxx>
 #include <JoinController.hxx>
 
-#include <algorithm>
-
 using namespace dbaui;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 819c4c55a0a7..aef183bb641d 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -23,16 +23,13 @@
 #include <vcl/settings.hxx>
 #include <JoinController.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <stringconstants.hxx>
 #include <strings.hxx>
 #include <sfx2/sfxsids.hrc>
 #include <vcl/event.hxx>
-#include <vcl/fixed.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>
-#include <memory>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index 79ce00b02c4d..2a99356757ad 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <adtabdlg.hxx>
 #include <browserids.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
@@ -28,14 +27,10 @@
 #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>
@@ -43,18 +38,13 @@
 #include <QueryPropertiesDialog.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/io/XActiveDataSink.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp>
 #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
-#include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
@@ -72,7 +62,6 @@
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <sfx2/sfxsids.hrc>
 #include <svl/undo.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <tools/diagnose_ex.h>
@@ -81,7 +70,6 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <osl/mutex.hxx>
-#include <rtl/strbuf.hxx>
 #include <memory>
 #include <vector>
 
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx
index 0ff7a526d783..322368666cc1 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -18,17 +18,16 @@
  */
 
 #include "querydlg.hxx"
+#include <JoinController.hxx>
+#include <JoinDesignView.hxx>
 #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 <com/sun/star/sdbc/XDatabaseMetaData.hpp>
+#include <com/sun/star/sdbc/SQLException.hpp>
 #include <RelationControl.hxx>
-#include <vcl/settings.hxx>
 
 #define ID_INNER_JOIN       1
 #define ID_LEFT_JOIN        2