removed duplicate includes in dbaccess

52 files changed, 0 insertions, 78 deletions

diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 1903110a2797..8fb0d6ac9103 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -56,7 +56,6 @@
 #include "querycomposer.hxx"
 #include "composertools.hxx"
 #include <tools/debug.hxx>
-#include <string.h>
 #include <rtl/logfile.hxx>
 #include "PrivateRow.hxx"
 
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 99cfcd4f47b3..94a568c5eb3a 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -44,7 +44,6 @@
 #include "dbastrings.hrc"
 #include "apitools.hxx"
 #include <com/sun/star/sdbcx/XKeysSupplier.hpp>
-#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/sdbcx/XIndexesSupplier.hpp>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/types.hxx>
@@ -59,7 +58,6 @@
 #include "querycomposer.hxx"
 #include "composertools.hxx"
 #include <tools/debug.hxx>
-#include <string.h>
 #include <rtl/logfile.hxx>
 
 using namespace dbaccess;
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index a7f834b71419..091d6e436946 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -32,14 +32,12 @@
 #include "sdbcoretools.hxx"
 #include "SingleSelectQueryComposer.hxx"
 #include "module_dba.hxx"
-#include "sdbcoretools.hxx"
 #include "CRowSetColumn.hxx"
 #include "CRowSetDataColumn.hxx"
 #include "RowSetCache.hxx"
 #include "core_resource.hrc"
 #include "core_resource.hxx"
 #include "tablecontainer.hxx"
-#include "dbastrings.hrc"
 
 /** === begin UNO includes === **/
 #include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx
index 42ca4b3d3166..56063ab56aa9 100644
--- a/dbaccess/source/core/api/RowSet.hxx
+++ b/dbaccess/source/core/api/RowSet.hxx
@@ -48,7 +48,6 @@
 #include <com/sun/star/sdb/XCompletedExecution.hpp>
 #include <com/sun/star/sdb/RowSetVetoException.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
-#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
 #include <com/sun/star/sdb/XParametersSupplier.hpp>
 #include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp>
 /** === end UNO includes === **/
diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx
index 850849ff4ee8..580287435674 100644
--- a/dbaccess/source/core/api/RowSetCache.hxx
+++ b/dbaccess/source/core/api/RowSetCache.hxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/sdbc/XPreparedStatement.hpp>
 #include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
-#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
 #include <com/sun/star/sdbc/XWarningsSupplier.hpp>
 #include <com/sun/star/sdb/XResultSetAccess.hpp>
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 03f804eec38e..a1bf1fa9cf5e 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -48,7 +48,6 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/dbexception.hxx>
-#include <connectivity/dbtools.hxx>
 #include <comphelper/extract.hxx>
 #include "ContainerMediator.hxx"
 #include <rtl/logfile.hxx>
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index f3a6273de996..2554ef308e73 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -36,7 +36,6 @@
 #include <com/sun/star/lang/ServiceNotRegisteredException.hpp>
 #include <comphelper/sequence.hxx>
 #include <com/sun/star/uno/XAggregation.hpp>
-#include <comphelper/sequence.hxx>
 #include <comphelper/processfactory.hxx>
 #include "dbastrings.hrc"
 #include <cppuhelper/typeprovider.hxx>
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index bae8503fd820..8a306e9f6d65 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -60,7 +60,6 @@
 #include <tools/string.hxx>
 #include <rtl/logfile.hxx>
 #include <tools/diagnose_ex.h>
-#include <tools/diagnose_ex.h>
 
 using namespace dbaccess;
 using namespace dbtools;
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 5b525ffedd96..72f4eb94864d 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -79,8 +79,6 @@
 #include <comphelper/numberedcollection.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <comphelper/genericpropertyset.hxx>
-#include <comphelper/property.hxx>
 
 #include <connectivity/dbtools.hxx>
 
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx
index 8b2481a2be7b..d34a125e4e8f 100644
--- a/dbaccess/source/core/dataaccess/documentcontainer.cxx
+++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx
@@ -50,7 +50,6 @@
 
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
-#include <comphelper/namedvaluecollection.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx
index 15b754e3607e..115d99b06b88 100644
--- a/dbaccess/source/core/inc/ContainerMediator.hxx
+++ b/dbaccess/source/core/inc/ContainerMediator.hxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 
 #include <comphelper/broadcasthelper.hxx>
-#include <comphelper/broadcasthelper.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ref.hxx>
 
diff --git a/dbaccess/source/core/inc/preparedstatement.hxx b/dbaccess/source/core/inc/preparedstatement.hxx
index ff2337944a69..9f3a354a29fc 100644
--- a/dbaccess/source/core/inc/preparedstatement.hxx
+++ b/dbaccess/source/core/inc/preparedstatement.hxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/sdbc/XParameters.hpp>
 #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp>
-#include <com/sun/star/sdbc/XParameters.hpp>
 #include <statement.hxx>
 #include <column.hxx>
 
diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx
index 46fea061727f..5506fd59d151 100644
--- a/dbaccess/source/core/inc/querycontainer.hxx
+++ b/dbaccess/source/core/inc/querycontainer.hxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XAppend.hpp>
 #include <com/sun/star/sdbcx/XDrop.hpp>
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx
index 6c2903fb890b..06ad47712ed4 100644
--- a/dbaccess/source/filter/xml/xmlExport.cxx
+++ b/dbaccess/source/filter/xml/xmlExport.cxx
@@ -39,7 +39,6 @@
 #include <comphelper/types.hxx>
 #include "xmlstrings.hrc"
 #include "xmlEnums.hxx"
-#include <xmloff/nmspmap.hxx>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx
index c138c57e85f7..a1648e362f9a 100644
--- a/dbaccess/source/filter/xml/xmlHelper.cxx
+++ b/dbaccess/source/filter/xml/xmlHelper.cxx
@@ -35,7 +35,6 @@
 #include <xmloff/contextid.hxx>
 #include <xmloff/XMLConstantsPropertyHandler.hxx>
 #include <xmloff/xmlement.hxx>
-#include <com/sun/star/awt/TextAlign.hpp>
 #include <tools/debug.hxx>
 
 namespace dbaxml
diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
index bec7c2aa12e0..ee6f28951295 100644
--- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx
+++ b/dbaccess/source/filter/xml/xmlTableFilterList.cxx
@@ -32,7 +32,6 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <xmloff/xmltoken.hxx>
 #include "xmlstrings.hrc"
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <xmloff/xmlimp.hxx>
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index dfa7eb12ff8c..613506907260 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -58,7 +58,6 @@
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <svtools/sfxecode.hxx>
 #include <unotools/moduleoptions.hxx>
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index d5f2b6698309..bc059d3d317d 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -62,11 +62,6 @@
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/frame/XModel2.hpp>
-#include <com/sun/star/container/XHierarchicalNameContainer.hpp>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/frame/FrameSearchFlag.hpp>
-#include <com/sun/star/util/XFlushable.hpp>
 #include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
 #include "com/sun/star/beans/NamedValue.hpp"
 #include <com/sun/star/awt/XTopWindow.hpp>
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index d81d388b11aa..3964aafa5011 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -72,7 +72,6 @@
 #include "AppDetailView.hxx"
 #include "linkeddocuments.hxx"
 #include <vcl/lstbox.hxx>
-#include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include "sqlmessage.hxx"
 #include <tools/string.hxx>
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index da6fa2b7ef6c..013da2777d13 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -51,7 +51,6 @@
 #include <com/sun/star/sdbcx/XRename.hpp>
 #include <com/sun/star/sdb/ErrorCondition.hpp>
 #include <com/sun/star/sdb/application/DatabaseObject.hpp>
-#include <com/sun/star/sdb/SQLContext.hpp>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/ucb/Command.hpp>
@@ -61,14 +60,12 @@
 #include <com/sun/star/uno/XNamingService.hpp>
 #include <com/sun/star/util/XCloseable.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
 /** === end UNO includes === **/
 
 #include <cppuhelper/exc_hlp.hxx>
 #include <connectivity/dbexception.hxx>
 #include <connectivity/dbtools.hxx>
 #include <connectivity/sqlerror.hxx>
-#include <connectivity/dbexception.hxx>
 #include <sfx2/mailmodelapi.hxx>
 #include <svx/dbaexchange.hxx>
 #include <toolkit/unohlp.hxx>
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index dcbf274faf18..cf12780f8713 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -69,7 +69,6 @@
 #include "imageprovider.hxx"
 #include <vcl/waitobj.hxx>
 #include <tools/stream.hxx>
-#include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
 #include "IApplicationController.hxx"
 
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index 7492e8da64ed..b1ca33a34741 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -41,7 +41,6 @@
 #include "listviewitems.hxx"
 #include <vcl/image.hxx>
 #include <vcl/mnemonic.hxx>
-#include <vcl/mnemonic.hxx>
 #include "browserids.hxx"
 #include "AppDetailPageHelper.hxx"
 #include <vcl/svapp.hxx>
diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index a6d097e58f09..ffb6958fec9f 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -45,7 +45,6 @@
 #include "tabletree.hxx"
 #include "AppSwapWindow.hxx"
 #include <vcl/svapp.hxx>
-#include "AppSwapWindow.hxx"
 #include "AppTitleWindow.hxx"
 #include "dsntypes.hxx"
 #include "dbustrings.hrc"
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 6fc175145f0b..926f53dafcbe 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -69,8 +69,6 @@
 
 #include <tools/multisel.hxx>
 
-#include <svx/svxids.hrc>
-
 #include <svl/numuno.hxx>
 
 #include <svl/itempool.hxx>
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 705cb24c2172..3080e56d3e8c 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -56,7 +56,6 @@
 
 /** === begin UNO includes === **/
 #include <com/sun/star/awt/LineEndFormat.hpp>
-#include <com/sun/star/awt/LineEndFormat.hpp>
 #include <com/sun/star/awt/MouseWheelBehavior.hpp>
 #include <com/sun/star/awt/TextAlign.hpp>
 #include <com/sun/star/awt/VisualEffect.hpp>
@@ -97,7 +96,6 @@
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
 #include <com/sun/star/util/XFlushable.hpp>
-#include <com/sun/star/sdb/XDocumentDataSource.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
 #include <com/sun/star/ui/XContextMenuInterceptor.hpp>
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index bbef4c8d0a56..3ecb7d9ebdbd 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -34,7 +34,6 @@
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>
 #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/XImageManager.hpp>
-#include <com/sun/star/ui/ImageType.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>
 #include <vcl/svapp.hxx>
 #include <vcl/toolbox.hxx>
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 6d48a65c4029..ce492daca84e 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -58,8 +58,6 @@
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include "finteraction.hxx"
-#include <connectivity/CommonTools.hxx>
-#include "dbaccess_helpid.hrc"
 #include <unotools/pathoptions.hxx>
 #include <svtools/roadmapwizard.hxx>
 #include "TextConnectionHelper.hxx"
diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
index ffce144460d4..80a92a2603eb 100644
--- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx
+++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx
@@ -68,11 +68,6 @@
 #include <connectivity/DriversConfig.hxx>
 #include <connectivity/dbexception.hxx>
 #include <osl/file.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/itempool.hxx>
-#include <svl/poolitem.hxx>
-#include <svl/stritem.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
 #include <typelib/typedescription.hxx>
diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
index 5a074c9fc2e2..58f0038b0f85 100644
--- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx
@@ -61,14 +61,9 @@
 #include <unotools/ucbhelper.hxx>
 #include <ucbhelper/commandenvironment.hxx>
 #include "finteraction.hxx"
-#include <connectivity/CommonTools.hxx>
 
 #include "DBSetupConnectionPages.hxx"
 
-#include "dbu_dlg.hrc"
-
-#include "dbaccess_helpid.hrc"
-
 #include <unotools/pathoptions.hxx>
 
 #include <svtools/roadmapwizard.hxx>
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index c8bbc1386165..1f7e478b8b14 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -43,9 +43,6 @@
 #include "sqlmessage.hxx"
 
 #include <osl/file.hxx>
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/stritem.hxx>
 #include <vcl/accel.hxx>
 #include <vcl/button.hxx>
 #include <vcl/edit.hxx>
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index bef0ddcd54d9..11a8098afe2d 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -45,9 +45,6 @@
 #include "propertysetitem.hxx"
 #include "stringlistitem.hxx"
 
-#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/stritem.hxx>
 #include <unotools/confignode.hxx>
 #include <vcl/msgbox.hxx>
 
diff --git a/dbaccess/source/ui/dlg/directsql.cxx b/dbaccess/source/ui/dlg/directsql.cxx
index e650fb3ded9b..958d60a90151 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -32,7 +32,6 @@
 #include "dbu_dlg.hrc"
 #include <vcl/msgbox.hxx>
 #include <comphelper/types.hxx>
-#include <vcl/msgbox.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 5a66b22789f2..9179a5a724d1 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -34,8 +34,6 @@
 
 #include <svx/numinf.hxx>
 
-#include <svx/numinf.hxx>
-
 #include <svx/dialogs.hrc>
 #include "dbu_dlg.hrc"
 #include <svl/itemset.hxx>
diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx
index 6b0a1bb7dda2..9d481ac11d58 100644
--- a/dbaccess/source/ui/dlg/queryfilter.cxx
+++ b/dbaccess/source/ui/dlg/queryfilter.cxx
@@ -43,13 +43,11 @@
 #include <comphelper/string.hxx>
 #include <tools/diagnose_ex.h>
 #include <osl/diagnose.h>
-#include "moduledbu.hxx"
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/dbtools.hxx>
 #include "queryfilter.hrc"
 #include "dbustrings.hrc"
 #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp>
-#include <com/sun/star/sdb/SQLFilterOperator.hpp>
 
 using namespace dbaui;
 using namespace connectivity;
diff --git a/dbaccess/source/ui/inc/DExport.hxx b/dbaccess/source/ui/inc/DExport.hxx
index d186b457e4a0..ae8baf5574fc 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -44,7 +44,6 @@
 #include "WTypeSelect.hxx"
 #include "commontypes.hxx"
 #include "IUpdateHelper.hxx"
-#include "WTypeSelect.hxx"
 
 namespace com { namespace sun { namespace star {
     namespace awt{
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index f754e5d9429d..88c5f432eb40 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -33,7 +33,6 @@
 #include "QEnumTypes.hxx"
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/button.hxx>
 
diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx
index 9e8d96fb6bb5..3f3a2bacc65e 100644
--- a/dbaccess/source/ui/inc/adtabdlg.hxx
+++ b/dbaccess/source/ui/inc/adtabdlg.hxx
@@ -37,7 +37,6 @@
 #include <com/sun/star/sdbc/XConnection.hpp>
 
 #include <vcl/lstbox.hxx>
-#include <vcl/dialog.hxx>
 #include <tools/string.hxx>
 
 #include "tabletree.hxx"
diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx
index 363c5517050e..56506528d270 100644
--- a/dbaccess/source/ui/inc/querycontroller.hxx
+++ b/dbaccess/source/ui/inc/querycontroller.hxx
@@ -48,7 +48,6 @@
 #include <comphelper/proparrhlp.hxx>
 #include <comphelper/propertycontainer.hxx>
 #include <comphelper/uno3.hxx>
-#include <comphelper/uno3.hxx>
 #include <connectivity/sqliterator.hxx>
 #include <connectivity/sqlnode.hxx>
 #include <connectivity/sqlparse.hxx>
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 1eb167f1812e..56648b980475 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -35,7 +35,6 @@
 #include "dbustrings.hrc"
 #include <sfx2/sfxhtml.hxx>
 #include <osl/diagnose.h>
-#include <tools/tenccvt.hxx>
 #include "moduledbu.hxx"
 #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
 #include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index aab4c6f0f08c..a68b52af1a3c 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -34,7 +34,6 @@
 #include "dbu_misc.hrc"
 #include "WizardPages.hrc"
 #include <vcl/scrbar.hxx>
-#include "WCopyTable.hxx"
 #include <com/sun/star/sdbc/DataType.hpp>
 
 using namespace ::dbaui;
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 96f6807e7d7f..6de6bb5f758c 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -44,7 +44,6 @@
 #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
 #include <com/sun/star/sdbc/XDataSource.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/frame/XUntitledNumbers.hpp>
 /** === end UNO includes === **/
 
 #include <comphelper/sequence.hxx>
diff --git a/dbaccess/source/ui/querydesign/JAccess.cxx b/dbaccess/source/ui/querydesign/JAccess.cxx
index 4bbed624c5fd..f2717744845e 100644
--- a/dbaccess/source/ui/querydesign/JAccess.cxx
+++ b/dbaccess/source/ui/querydesign/JAccess.cxx
@@ -28,7 +28,6 @@
 
 #include "JAccess.hxx"
 #include "JoinTableView.hxx"
-#include "JoinTableView.hxx"
 #include "TableWindow.hxx"
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include "JoinDesignView.hxx"
diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index 175f00ad43af..ff044f6e10f5 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -46,7 +46,6 @@
 #include "dbustrings.hrc"
 #include <comphelper/extract.hxx>
 #include "UITools.hxx"
-#include "JoinTableView.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx
index 89fdefadb0a7..bf1fdeaa1f9e 100644
--- a/dbaccess/source/ui/querydesign/JoinExchange.cxx
+++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx
@@ -30,7 +30,6 @@
 #include <sot/formats.hxx>
 #include <svx/dbexch.hrc>
 #include <cppuhelper/typeprovider.hxx>
-#include <sot/formats.hxx>
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
index e13dec03c446..2ec25583765b 100644
--- a/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
+++ b/dbaccess/source/ui/querydesign/QTableConnectionData.cxx
@@ -28,7 +28,6 @@
 
 #include "QTableConnectionData.hxx"
 #include <tools/debug.hxx>
-#include "QTableConnectionData.hxx"
 #include "QTableWindow.hxx"
 
 using namespace dbaui;
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 4e6d85203903..751145add512 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -60,7 +60,6 @@
 #include "dbustrings.hrc"
 #include "UITools.hxx"
 #include "querycontainerwindow.hxx"
-#include "QueryTableView.hxx"
 #include "sqlmessage.hxx"
 #include <unotools/syslocale.hxx>
 
diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx
index 0d9b4c784869..d1774fbc9b79 100644
--- a/dbaccess/source/ui/querydesign/QueryTableView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx
@@ -56,7 +56,6 @@
 #include "querydlg.hxx"
 #include "JoinExchange.hxx"
 #include <comphelper/extract.hxx>
-#include "QueryDesignView.hxx"
 #include "dbu_qry.hrc"
 #include <vcl/msgbox.hxx>
 
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index c367b2ba4c9b..fa0749b7ed74 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -35,7 +35,6 @@
 #include "adtabdlg.hxx"
 #include "querycontroller.hxx"
 #include "sqledit.hxx"
-#include "querycontainerwindow.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 b9a73e8c5ab3..a6eb6aa43dc4 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -43,7 +43,6 @@
 #include <com/sun/star/container/XNameAccess.hpp>
 #include "dbustrings.hrc"
 #include "QTableWindow.hxx"
-#include "QueryTableView.hxx"
 #include <vcl/msgbox.hxx>
 #include "QueryDesignFieldUndoAct.hxx"
 #include <svx/dbexch.hrc>
diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx
index 61b63f9054f7..a096d788c0c3 100644
--- a/dbaccess/source/ui/relationdesign/RelationController.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationController.cxx
@@ -62,7 +62,6 @@
 #include "RelationController.hxx"
 #include <vcl/msgbox.hxx>
 #include "TableWindowData.hxx"
-#include "dbustrings.hrc"
 #include "UITools.hxx"
 #include "RTableConnectionData.hxx"
 #include "RelationTableView.hxx"
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index afc4c9934a68..49a01c53bc54 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -50,7 +50,6 @@
 #include "TableRowExchange.hxx"
 #include <sot/storage.hxx>
 #include "UITools.hxx"
-#include "FieldDescControl.hxx"
 #include "TableFieldControl.hxx"
 #include "dsntypes.hxx"
 
diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
index 4321d04f4be5..edfb4c55294f 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx
@@ -31,7 +31,6 @@
 #include <osl/diagnose.h>
 #include "FieldDescriptions.hxx"
 #include "dbu_tbl.hrc"
-#include "FieldDescriptions.hxx"
 #include "TableDesignHelpBar.hxx"
 #include <vcl/fixed.hxx>
 #include "dbaccess_helpid.hrc"