Removed useless includes in basctl/source/basicide/ tree

It compiles on Windows and Linux, here, with flags:
--with-help --with-java --with-lang="it"
Made with the ignorant brute force of removing each include
one by one.
The tree with each commit (used to bisect) it's here:
https://github.com/Gelma/core/commits/gr_push_brute_force_slot_2

Conflicts:
basctl/source/basicide/bastype2.cxx

Change-Id: If88eebb6ecba6ae7ab1e98713b66b10f1ad57dca
Reviewed-on: https://gerrit.libreoffice.org/12963
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

50 files changed, 6 insertions, 242 deletions

diff --git a/basctl/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx
index 3dd04bf07279..d11bf03d9129 100644
--- a/basctl/source/basicide/basdoc.cxx
+++ b/basctl/source/basicide/basdoc.cxx
@@ -18,11 +18,8 @@
  */
 
 #include <sfx2/app.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/objface.hxx>
-#include <sfx2/objsh.hxx>
-#include <svl/itemset.hxx>
 
 #include "unomodel.hxx"
 
diff --git a/basctl/source/basicide/basdoc.hxx b/basctl/source/basicide/basdoc.hxx
index 1502bd596642..f86bff421e75 100644
--- a/basctl/source/basicide/basdoc.hxx
+++ b/basctl/source/basicide/basdoc.hxx
@@ -22,7 +22,6 @@
 
 #include <iderid.hxx>
 #include <sfx2/docfac.hxx>
-#include <sfx2/objsh.hxx>
 #include <svx/ifaceids.hxx>
 
 #include <boost/scoped_ptr.hpp>
diff --git a/basctl/source/basicide/basicbox.cxx b/basctl/source/basicide/basicbox.cxx
index 9735c597bf01..198e003e320b 100644
--- a/basctl/source/basicide/basicbox.cxx
+++ b/basctl/source/basicide/basicbox.cxx
@@ -19,21 +19,14 @@
 
 #include <basidesh.hrc>
 #include <basidesh.hxx>
-#include <basobj.hxx>
 
 #include <basicbox.hxx>
-#include <iderid.hxx>
 #include <iderdll.hxx>
-#include <bastypes.hxx>
-#include "bastype2.hxx"
-#include "basdoc.hxx"
 
 #include "localizationmgr.hxx"
 #include "managelang.hxx"
 #include "dlgresid.hrc"
-#include <editeng/unolingu.hxx>
 
-#include <sfx2/dinfdlg.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svtools/langtab.hxx>
 
diff --git a/basctl/source/basicide/basicbox.hxx b/basctl/source/basicide/basicbox.hxx
index 572765bacbc4..e06a51ac7dd2 100644
--- a/basctl/source/basicide/basicbox.hxx
+++ b/basctl/source/basicide/basicbox.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASICBOX_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICBOX_HXX
 
-#include "doceventnotifier.hxx"
 #include <svl/stritem.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <vcl/lstbox.hxx>
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index c7728edd57fc..013807e202b3 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -21,9 +21,7 @@
 #include "bastypes.hxx"
 #include "basidesh.hrc"
 
-#include <com/sun/star/awt/XDevice.hpp>
 #include <toolkit/awt/vclxdevice.hxx>
-#include <vcl/print.hxx>
 #include <tools/multisel.hxx>
 #include <tools/resary.hxx>
 
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 564b0f025d89..d8bf5b41afcd 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -21,8 +21,6 @@
 #include "baside3.hxx"
 #include "brkdlg.hxx"
 #include "iderdll.hxx"
-#include "iderdll2.hxx"
-#include "objdlg.hxx"
 #include "moduldlg.hxx"
 #include "docsignature.hxx"
 
@@ -37,8 +35,6 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <comphelper/processfactory.hxx>
 #include <comphelper/string.hxx>
 #include <sfx2/dinfdlg.hxx>
 #include <sfx2/dispatch.hxx>
@@ -52,10 +48,6 @@
 #include <vcl/xtextedt.hxx>
 #include <vcl/settings.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/layout.hxx>
-#include <cassert>
-#include <basic/codecompletecache.hxx>
-#include <svtools/miscopt.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/baside2.hxx b/basctl/source/basicide/baside2.hxx
index df3aae8cec4a..0f78eb338a12 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BASIDE2_HXX
 
 #include "layout.hxx"
-#include "bastypes.hxx"
 #include "bastype3.hxx"
 #include "basidesh.hxx"
 #include "breakpoint.hxx"
@@ -34,20 +33,11 @@ class SvxSearchItem;
 #include <svtools/headbar.hxx>
 
 #include <vcl/button.hxx>
-#include <basic/sbstar.hxx>
 #include <basic/sbmod.hxx>
-#include <vcl/split.hxx>
-#include <svl/lstner.hxx>
-#include <svtools/colorcfg.hxx>
 #include <vcl/lstbox.hxx>
-#include <vcl/scrbar.hxx>
 
 #include <sfx2/progress.hxx>
-#include <unotools/options.hxx>
-#include <rtl/ref.hxx>
 
-#include <set>
-#include <boost/scoped_ptr.hpp>
 
 #include <vcl/textdata.hxx>
 #include <basic/codecompletecache.hxx>
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index e1733e16811f..8d2708c9a723 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -17,9 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/config.h>
 
-#include <cassert>
 
 #include "helpid.hrc"
 #include "baside2.hrc"
@@ -27,37 +25,27 @@
 #include "baside2.hxx"
 #include "brkdlg.hxx"
 #include "iderdll.hxx"
-#include "iderdll2.hxx"
-#include "objdlg.hxx"
 
 #include <basic/sbmeth.hxx>
 #include <basic/sbuno.hxx>
-#include <com/sun/star/script/XLibraryContainer2.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertiesChangeListener.hpp>
-#include <comphelper/processfactory.hxx>
+#include <com/sun/star/script/XLibraryContainer2.hpp>
 #include <comphelper/string.hxx>
 #include <officecfg/Office/Common.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <vcl/msgbox.hxx>
 #include <svl/urihelper.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/txtattr.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/textwindowpeer.hxx>
-#include <tools/stream.hxx>
-#include <comphelper/syntaxhighlight.hxx>
 #include <svtools/treelistentry.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/help.hxx>
 
 #include <vector>
-#include <com/sun/star/reflection/XInterfaceMemberTypeDescription.hpp>
-#include <com/sun/star/reflection/XIdlMethod.hpp>
-#include <com/sun/star/reflection/XIdlField.hpp>
 #include <com/sun/star/reflection/theCoreReflection.hpp>
-#include <com/sun/star/uno/Exception.hpp>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index b7b7915ba906..84e2ee5d6423 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -31,8 +31,6 @@
 #include "iderdll.hxx"
 #include "idetemp.hxx"
 #include "localizationmgr.hxx"
-#include "propbrw.hxx"
-#include "objdlg.hxx"
 #include "managelang.hxx"
 
 #include <basic/basmgr.hxx>
@@ -42,9 +40,7 @@
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <comphelper/processfactory.hxx>
-#include <sfx2/dinfdlg.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
 #include <svl/aeitem.hxx>
diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx
index c20d4b3e2e06..f7bd70e8ebf4 100644
--- a/basctl/source/basicide/basidectrlr.cxx
+++ b/basctl/source/basicide/basidectrlr.cxx
@@ -21,8 +21,6 @@
 
 #include "basidesh.hxx"
 
-#include <cppuhelper/queryinterface.hxx>
-#include <comphelper/sequence.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 
 #include <vcl/syswin.hxx>
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 35a329f8931e..d9812963dc64 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -22,7 +22,6 @@
 
 #include "baside2.hxx"
 #include "baside3.hxx"
-#include "basobj.hxx"
 #include "docsignature.hxx"
 #include "iderdll.hxx"
 #include "iderdll2.hxx"
@@ -31,16 +30,13 @@
 
 #include <basic/basmgr.hxx>
 #include <basic/sbmeth.hxx>
-#include <boost/scoped_ptr.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
 #include <sfx2/childwin.hxx>
 #include <sfx2/docfac.hxx>
 #include <sfx2/dinfdlg.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/minfitem.hxx>
-#include <sfx2/objface.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
 #include <svl/aeitem.hxx>
diff --git a/basctl/source/basicide/basides2.cxx b/basctl/source/basicide/basides2.cxx
index 27d7743ab933..a05794c10090 100644
--- a/basctl/source/basicide/basides2.cxx
+++ b/basctl/source/basicide/basides2.cxx
@@ -19,27 +19,17 @@
 
 #include "docsignature.hxx"
 
-#include <basic/sbx.hxx>
 #include "basicrenderable.hxx"
 
 #include <com/sun/star/frame/XTitle.hpp>
 
-#include <basidesh.hxx>
 #include <basidesh.hrc>
 #include <baside2.hxx>
 #include <basdoc.hxx>
-#include <basobj.hxx>
-#include <vcl/texteng.hxx>
-#include <vcl/textview.hxx>
 #include <vcl/xtextedt.hxx>
-#include <tools/diagnose_ex.h>
-#include <sfx2/childwin.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/sfxdefs.hxx>
 #include <sfx2/signaturestate.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/basides3.cxx b/basctl/source/basicide/basides3.cxx
index 10db2edf59d5..ff53a779c932 100644
--- a/basctl/source/basicide/basides3.cxx
+++ b/basctl/source/basicide/basides3.cxx
@@ -17,20 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <basidesh.hrc>
 
-#include <basidesh.hxx>
 #include <baside2.hxx>
 #include <baside3.hxx>
-#include <basobj.hxx>
 #include <localizationmgr.hxx>
 #include <dlgedview.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <sfx2/dispatch.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/request.hxx>
 #include <tools/diagnose_ex.h>
 
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index efb602f919d5..665b78f62760 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -19,8 +19,6 @@
 
 #include <config_options.h>
 
-#include "basidesh.hxx"
-
 #include <tools/diagnose_ex.h>
 #include <basic/basmgr.hxx>
 #include <basidesh.hrc>
@@ -29,7 +27,6 @@
 #include <basdoc.hxx>
 #include <basicbox.hxx>
 #include <editeng/sizeitem.hxx>
-#include <objdlg.hxx>
 #include <tbxctl.hxx>
 #include <iderdll2.hxx>
 #include <basidectrlr.hxx>
@@ -41,7 +38,6 @@
 #include <sfx2/minfitem.hxx>
 #include <sfx2/objface.hxx>
 #include <svl/aeitem.hxx>
-#include <svl/intitem.hxx>
 #include <svl/srchitem.hxx>
 
 #define basctl_Shell
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 85bb35a860a0..3b2d2439eff1 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -19,7 +19,6 @@
 
 #include <baside2.hrc>
 #include <helpid.hrc>
-#include <svx/globlmn.hrc>
 #include "dlgresid.hrc"
 #include <sfx2/sfxcommands.h>
 #include <svx/svxcommands.h>
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 5645fb8a68f2..28a781c5a622 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -17,31 +17,20 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "basobj.hxx"
 #include "iderdll.hxx"
 #include "iderdll2.hxx"
-#include "iderid.hxx"
 #include "macrodlg.hxx"
 #include "moduldlg.hxx"
-#include "basidesh.hxx"
 #include "basidesh.hrc"
 #include "baside2.hxx"
-#include "basicmod.hxx"
-#include "basdoc.hxx"
 
-#include <com/sun/star/document/XEmbeddedScripts.hpp>
 #include <com/sun/star/document/XScriptInvocationContext.hpp>
 
 #include <basic/sbmeth.hxx>
-#include <basic/sbx.hxx>
-#include <boost/scoped_ptr.hpp>
 #include <framework/documentundoguard.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/moduleoptions.hxx>
-#include <vcl/layout.hxx>
 
-#include <vector>
-#include <algorithm>
 #include <basic/basmgr.hxx>
 namespace basctl
 {
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index 9c42afc8be2e..141ddaeb22ce 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -18,38 +18,22 @@
  */
 
 #include <vcl/layout.hxx>
-#include <algorithm>
 #include <basic/basmgr.hxx>
 #include <basic/sbmeth.hxx>
-#include <basic/sbx.hxx>
 #include <unotools/moduleoptions.hxx>
 
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
-#include <basobj.hxx>
-#include <basidesh.hxx>
-#include <objdlg.hxx>
-#include <bastypes.hxx>
 #include <basdoc.hxx>
 #include <basidesh.hrc>
 
 #include <baside2.hxx>
 #include <baside3.hxx>
-#include <basicmod.hxx>
 #include <localizationmgr.hxx>
 #include "dlged.hxx"
-#include <dlgeddef.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <xmlscript/xmldlg_imexp.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <rtl/uri.hxx>
-#include <osl/process.h>
-#include <osl/file.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx
index 9a4d75e5e2b5..5d105dbe1082 100644
--- a/basctl/source/basicide/bastype2.cxx
+++ b/basctl/source/basicide/bastype2.cxx
@@ -17,36 +17,24 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/bitmap.hxx>
-#include <vcl/builder.hxx>
 
-#include "basidesh.hxx"
-#include "iderdll.hxx"
-#include "iderdll2.hxx"
-#include <basidesh.hrc>
 #include <bastypes.hxx>
 #include <bastype2.hxx>
-#include <basobj.hxx>
 #include <baside2.hrc>
 #include <iderid.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
-#include <basic/sbx.hxx>
 #include <svtools/imagemgr.hxx>
 #include <svtools/treelistentry.hxx>
-#include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <com/sun/star/frame/ModuleManager.hpp>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <cassert>
 #include <initializer_list>
-#include <memory>
 
 #include <com/sun/star/script/ModuleType.hpp>
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
diff --git a/basctl/source/basicide/bastype2.hxx b/basctl/source/basicide/bastype2.hxx
index b9913cf74d39..2b51b175091d 100644
--- a/basctl/source/basicide/bastype2.hxx
+++ b/basctl/source/basicide/bastype2.hxx
@@ -19,14 +19,11 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BASTYPE2_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BASTYPE2_HXX
 
-#include <sal/config.h>
 
-#include <memory>
 
 #include "doceventnotifier.hxx"
 
 #include <svtools/treelistbox.hxx>
-#include <svl/lstner.hxx>
 #include <basic/sbstar.hxx>
 #include <sbxitem.hxx>
 #include "basobj.hxx"
diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx
index 0847553352c2..8cb3b2f178ee 100644
--- a/basctl/source/basicide/bastype3.cxx
+++ b/basctl/source/basicide/bastype3.cxx
@@ -19,16 +19,11 @@
 
 #include <basic/basmgr.hxx>
 #include <basic/sbmod.hxx>
-#include <basic/sbx.hxx>
 #include <bastype2.hxx>
-#include <basobj.hxx>
 #include <baside2.hrc>
-#include <iderid.hxx>
 #include <bastypes.hxx>
-#include <basdoc.hxx>
 #include <com/sun/star/script/XLibraryContainer.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
-#include <deque>
 #include <sfx2/docfac.hxx>
 #include <svtools/treelistentry.hxx>
 
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index d0b9fe605b4c..e6039e342ecb 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -17,13 +17,11 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "baside2.hrc"
 #include "basidesh.hrc"
 #include "helpid.hrc"
 
 #include "baside2.hxx"
 #include "baside3.hxx"
-#include "basobj.hxx"
 #include "iderdll.hxx"
 #include "iderdll2.hxx"
 
@@ -32,11 +30,8 @@
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/passwd.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <svl/intitem.hxx>
 #include <svl/stritem.hxx>
-#include <vcl/layout.hxx>
-#include <tools/stream.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/breakpoint.cxx b/basctl/source/basicide/breakpoint.cxx
index 6af136525451..3a15047ea76e 100644
--- a/basctl/source/basicide/breakpoint.cxx
+++ b/basctl/source/basicide/breakpoint.cxx
@@ -22,7 +22,6 @@
 #include <basic/sbmod.hxx>
 #include <tools/debug.hxx>
 
-#include <stddef.h>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx
index 30d94cc08873..b5b2ef17d9dc 100644
--- a/basctl/source/basicide/brkdlg.cxx
+++ b/basctl/source/basicide/brkdlg.cxx
@@ -23,10 +23,8 @@
 #include "brkdlg.hxx"
 #include "basidesh.hxx"
 #include "basidesh.hrc"
-#include "iderdll.hxx"
 
 #include <sfx2/dispatch.hxx>
-#include <sfx2/viewfrm.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx
index 2ae1ff77546a..703744efd345 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -20,12 +20,10 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BRKDLG_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BRKDLG_HXX
 
-#include <bastypes.hxx>
 #include <vcl/dialog.hxx>
 
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 0d2bb88ffe76..03ba5c1a5f5a 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -21,7 +21,6 @@
 #include "scriptdocument.hxx"
 
 #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp>
-#include <com/sun/star/document/XDocumentEventBroadcaster.hpp>
 
 #include <vcl/svapp.hxx>
 
@@ -29,8 +28,6 @@
 
 #include <comphelper/processfactory.hxx>
 
-#include <osl/mutex.hxx>
-#include <sal/macros.h>
 
 #include <cppuhelper/compbase1.hxx>
 #include <cppuhelper/basemutex.hxx>
diff --git a/basctl/source/basicide/documentenumeration.cxx b/basctl/source/basicide/documentenumeration.cxx
index de65f8cb1a56..c20ee862b882 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/config.h>
 
 #include <set>
 
@@ -27,8 +26,6 @@
 #include <com/sun/star/frame/XModel2.hpp>
 #include <com/sun/star/frame/FrameSearchFlag.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/frame/XFramesSupplier.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <tools/diagnose_ex.h>
 
diff --git a/basctl/source/basicide/documentenumeration.hxx b/basctl/source/basicide/documentenumeration.hxx
index 5c95b4ceae10..2c8f68908eef 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_DOCUMENTENUMERATION_HXX
 
 #include <boost/scoped_ptr.hpp>
-#include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/uno/Reference.hxx>
 
 #include <vector>
 
diff --git a/basctl/source/basicide/iderdll.cxx b/basctl/source/basicide/iderdll.cxx
index a38919649875..53fd2c19f82b 100644
--- a/basctl/source/basicide/iderdll.cxx
+++ b/basctl/source/basicide/iderdll.cxx
@@ -20,29 +20,19 @@
 #include <comphelper/scoped_disposing_ptr.hxx>
 #include <comphelper/processfactory.hxx>
 
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/genlink.hxx>
 
-#include <svl/solar.hrc>
-#include <iderdll.hxx>
 #include <iderdll2.hxx>
 #include <iderid.hxx>
-#include <svx/svxids.hrc>
 #include <basidesh.hxx>
 #include <basidesh.hrc>
-#include <basobj.hxx>
-#include <bastypes.hxx>
 #include <basdoc.hxx>
 #include <basicmod.hxx>
-#include <propbrw.hxx>
 
 #include <svl/srchitem.hxx>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
 #include <vcl/settings.hxx>
 
-#include <boost/scoped_ptr.hpp>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/iderdll2.hxx b/basctl/source/basicide/iderdll2.hxx
index 92d10b08225a..8c1ec2efaf0d 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -23,7 +23,6 @@
 class StarBASIC;
 class SvxSearchItem;
 
-#include <tools/link.hxx>
 
 #include <bastypes.hxx>
 #include <bastype2.hxx>
diff --git a/basctl/source/basicide/layout.hxx b/basctl/source/basicide/layout.hxx
index 9a6ab12fc3ca..fac9bdc86b69 100644
--- a/basctl/source/basicide/layout.hxx
+++ b/basctl/source/basicide/layout.hxx
@@ -20,12 +20,8 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_LAYOUT_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_LAYOUT_HXX
 
-#include <vcl/window.hxx>
 #include <vcl/split.hxx>
-#include <unotools/options.hxx>
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
 
 class DockingWindow;
 class SfxRequest;
diff --git a/basctl/source/basicide/linenumberwindow.cxx b/basctl/source/basicide/linenumberwindow.cxx
index 57dde92c3cc0..ff3b3d599c35 100644
--- a/basctl/source/basicide/linenumberwindow.cxx
+++ b/basctl/source/basicide/linenumberwindow.cxx
@@ -8,10 +8,8 @@
  */
 
 #include "baside2.hxx"
-#include "linenumberwindow.hxx"
 
 #include <vcl/xtextedt.hxx>
-#include <vcl/textview.hxx>
 #include <vcl/settings.hxx>
 
 namespace basctl
diff --git a/basctl/source/basicide/linenumberwindow.hxx b/basctl/source/basicide/linenumberwindow.hxx
index 5c539d6a767e..caa7f15350c0 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -10,7 +10,6 @@
 #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_LINENUMBERWINDOW_HXX
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_LINENUMBERWINDOW_HXX
 
-#include <vcl/window.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/localizationmgr.cxx b/basctl/source/basicide/localizationmgr.cxx
index 80c11b0c8e3e..ac18baeff86b 100644
--- a/basctl/source/basicide/localizationmgr.cxx
+++ b/basctl/source/basicide/localizationmgr.cxx
@@ -21,13 +21,12 @@
 
 #include "basidesh.hxx"
 #include "baside3.hxx"
-#include "basobj.hxx"
 #include "iderdll.hxx"
 #include "dlged.hxx"
 #include "managelang.hxx"
 
-#include <com/sun/star/resource/XStringResourceSupplier.hpp>
 #include <com/sun/star/frame/XLayoutManager.hpp>
+#include <com/sun/star/resource/XStringResourceSupplier.hpp>
 #include <sfx2/dispatch.hxx>
 
 namespace basctl
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 82b010565cbd..0f70973e74c1 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -17,38 +17,26 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/layout.hxx>
 
 #include <macrodlg.hxx>
 #include <macrodlg.hrc>
-#include <basidesh.hrc>
 #include <basidesh.hxx>
 #include <baside2.hrc>
-#include <basobj.hxx>
-#include <baside3.hxx>
 
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
-#include <iderid.hxx>
 
 #include <moduldlg.hxx>
 #include <basic/basmgr.hxx>
 #include <basic/sbmeth.hxx>
 #include <basic/sbmod.hxx>
-#include <basic/sbx.hxx>
 
-#include <bastypes.hxx>
-#include <sbxitem.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/minfitem.hxx>
 #include <sfx2/request.hxx>
 
-#include <com/sun/star/script/XLibraryContainer2.hpp>
-#include <com/sun/star/document/MacroExecMode.hpp>
 
 #include <map>
-#include <boost/scoped_ptr.hpp>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/macrodlg.hrc b/basctl/source/basicide/macrodlg.hrc
index 451902641956..b61af05c4731 100644
--- a/basctl/source/basicide/macrodlg.hrc
+++ b/basctl/source/basicide/macrodlg.hrc
@@ -19,7 +19,6 @@
 #ifndef BASCTL_MACRODLG_HRC
 #define BASCTL_MACRODLG_HRC
 
-#include <svl/solar.hrc>
 
 #define RID_STR_BTNDEL                  ( RID_BASICIDE_START + 51 )
 #define RID_STR_BTNNEW                  ( RID_BASICIDE_START + 52 )
diff --git a/basctl/source/basicide/macrodlg.hxx b/basctl/source/basicide/macrodlg.hxx
index 68dcd8c4c0ac..212dc7f6ebb9 100644
--- a/basctl/source/basicide/macrodlg.hxx
+++ b/basctl/source/basicide/macrodlg.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_MACRODLG_HXX
 
 #include <bastype2.hxx>
-#include <bastype3.hxx>
 #include <sfx2/basedlgs.hxx>
-#include <vcl/fixed.hxx>
 
 #include <vcl/button.hxx>
 
diff --git a/basctl/source/basicide/macrodlg.src b/basctl/source/basicide/macrodlg.src
index 3fa752228b91..f9ff3de552bd 100644
--- a/basctl/source/basicide/macrodlg.src
+++ b/basctl/source/basicide/macrodlg.src
@@ -17,10 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sfx2/sfx.hrc>
 #include <macrodlg.hrc>
 #include <basidesh.hrc>
-#include <helpid.hrc>
 String RID_STR_BTNDEL
 {
     Text [ en-US ] = "~Delete" ;
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 125ea6066c24..874cbc040518 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -17,23 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <vcl/layout.hxx>
-#include <sot/storinfo.hxx>
 
 #include <moduldlg.hxx>
-#include <basidesh.hrc>
 #include <basidesh.hxx>
-#include <bastypes.hxx>
-#include <basobj.hxx>
 #include <baside2.hrc>
 #include <iderdll.hxx>
 #include <iderdll2.hxx>
 #include <svx/passwd.hxx>
-#include <sbxitem.hxx>
-#include <basdoc.hxx>
 #include <ucbhelper/content.hxx>
 #include <rtl/uri.hxx>
-#include <sfx2/app.hxx>
 #include <sfx2/dinfdlg.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
@@ -42,11 +34,9 @@
 #include <svtools/svlbitm.hxx>
 #include <svtools/treelistentry.hxx>
 
-#include <sot/storage.hxx>
 #include <com/sun/star/io/Pipe.hpp>
 #include <com/sun/star/ui/dialogs/FilePicker.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp>
 #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp>
@@ -58,15 +48,11 @@
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <com/sun/star/packages/manifest/ManifestWriter.hpp>
 #include <unotools/pathoptions.hxx>
-#include <comphelper/processfactory.hxx>
 
 #include <com/sun/star/util/VetoException.hpp>
 #include <com/sun/star/script/ModuleSizeExceededRequest.hpp>
 
-#include <cassert>
-#include <memory>
 
-#include <boost/scoped_ptr.hpp>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index f1381b7ff79c..7e0b61014cbf 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -17,18 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <sal/config.h>
 
-#include <memory>
 
-#include "baside2.hrc"
 #include "basidesh.hrc"
 
 #include "moduldlg.hxx"
 #include "localizationmgr.hxx"
 #include "basidesh.hxx"
-#include "baside3.hxx"
-#include "iderdll.hxx"
 
 #include <basic/basmgr.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
@@ -36,10 +31,7 @@
 #include <sfx2/app.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <svl/itemset.hxx>
 #include <svl/stritem.hxx>
-#include <vcl/layout.hxx>
 #include <tools/diagnose_ex.h>
 #include <xmlscript/xmldlg_imexp.hxx>
 #include <svtools/treelistentry.hxx>
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 9ba3e894deab..a1c3f79e8e45 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -22,9 +22,6 @@
 
 #include <bastype2.hxx>
 #include <svtools/svtabbx.hxx>
-#include <vcl/button.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/layout.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/tabctrl.hxx>
diff --git a/basctl/source/basicide/moduldlg.src b/basctl/source/basicide/moduldlg.src
index 190778663fb3..5f1a23ce7699 100644
--- a/basctl/source/basicide/moduldlg.src
+++ b/basctl/source/basicide/moduldlg.src
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "helpid.hrc"
 #include <basidesh.hrc>
 
 String RID_STR_EXPORTPACKAGE
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 82b49f6659f9..7bc31392b8c9 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -17,21 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "basidesh.hrc"
 #include "objdlg.hrc"
 
-#include "basidesh.hxx"
-#include "iderdll.hxx"
-#include "iderdll2.hxx"
 #include "objdlg.hxx"
 #include "helpid.hrc"
 
-#include <sfx2/app.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <svl/itemset.hxx>
-#include <vcl/msgbox.hxx>
 #include <vcl/taskpanelist.hxx>
 
 namespace basctl
diff --git a/basctl/source/basicide/objdlg.hxx b/basctl/source/basicide/objdlg.hxx
index 43a0953b2584..aca869793836 100644
--- a/basctl/source/basicide/objdlg.hxx
+++ b/basctl/source/basicide/objdlg.hxx
@@ -23,10 +23,7 @@
 #include "bastype2.hxx"
 #include "bastypes.hxx"
 
-#include <vcl/floatwin.hxx>
-#include <vcl/toolbox.hxx>
 #include <vcl/fixed.hxx>
-#include <vcl/image.hxx>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index 11c2df259f64..173f296c9252 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -18,7 +18,6 @@
  */
 
 #include <objdlg.hrc>
-#include <helpid.hrc>
 
 Control RID_TLB_MACROS
 {
diff --git a/basctl/source/basicide/register.cxx b/basctl/source/basicide/register.cxx
index 15b751074f6c..d222782964c5 100644
--- a/basctl/source/basicide/register.cxx
+++ b/basctl/source/basicide/register.cxx
@@ -18,9 +18,6 @@
  */
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/uno/Sequence.h>
-#include <rtl/ustring.hxx>
 
 #include <cppuhelper/factory.hxx>
 
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx
index 0f8c9d9213fe..4a96cc7e23ee 100644
--- a/basctl/source/basicide/scriptdocument.cxx
+++ b/basctl/source/basicide/scriptdocument.cxx
@@ -25,7 +25,6 @@
 #include "doceventnotifier.hxx"
 #include "documentenumeration.hxx"
 
-#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 #include <com/sun/star/util/theMacroExpander.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
@@ -39,12 +38,9 @@
 #include <com/sun/star/script/vba/XVBAModuleInfo.hpp>
 
 #include <sfx2/objsh.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/viewfrm.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/docfile.hxx>
 
-#include <vcl/svapp.hxx>
 
 #include <basic/basicmanagerrepository.hxx>
 
@@ -56,21 +52,14 @@
 
 #include <tools/diagnose_ex.h>
 
-#include <comphelper/processfactory.hxx>
 #include <comphelper/documentinfo.hxx>
+#include <comphelper/processfactory.hxx>
 
-#include <osl/mutex.hxx>
-
-#include <cppuhelper/implbase1.hxx>
-
-#include <rtl/uri.hxx>
-#include <rtl/bootstrap.hxx>
-
-#include <osl/process.h>
 #include <osl/file.hxx>
-
+#include <rtl/uri.hxx>
 #include <set>
 
+
 namespace basctl
 {
     using ::com::sun::star::uno::Sequence;
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index 55c384c4d201..ff7d3da333a8 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <svl/solar.hrc>
 #include <svx/svxids.hrc>
 
 #include "idetemp.hxx"
diff --git a/basctl/source/basicide/tbxctl.hxx b/basctl/source/basicide/tbxctl.hxx
index c084c57965c6..7e8a5dcc409d 100644
--- a/basctl/source/basicide/tbxctl.hxx
+++ b/basctl/source/basicide/tbxctl.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_TBXCTL_HXX
 
 #include <sfx2/tbxctrl.hxx>
-#include <com/sun/star/frame/XLayoutManager.hpp>
 
 namespace basctl
 {
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx
index eba8182e7686..5ae9d532d4e5 100644
--- a/basctl/source/basicide/unomodel.cxx
+++ b/basctl/source/basicide/unomodel.cxx
@@ -19,10 +19,7 @@
 
 
 #include <basdoc.hxx>
-#include <cppuhelper/supportsservice.hxx>
 #include <iderdll.hxx>
-#include <osl/mutex.hxx>
-#include <sfx2/docfac.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/svapp.hxx>
 
diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx
index 14f4ab94f961..e18383e7b278 100644
--- a/basctl/source/basicide/unomodel.hxx
+++ b/basctl/source/basicide/unomodel.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_UNOMODEL_HXX
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <sfx2/sfxbasemodel.hxx>
 
 namespace basctl