Remove unnecessary includes

12 files changed, 69 insertions, 125 deletions

diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index e449ba9da000..101a8a844972 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -31,41 +31,29 @@
 
 #include <ide_pch.hxx>
 
-#include <svtools/texteng.hxx>
-#include <svtools/textview.hxx>
-#include <svtools/xtextedt.hxx>
-#include <basic/sbx.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
+#include "baside2.hxx"
+#include "brkdlg.hxx"
+#include "iderdll.hxx"
+#include "iderdll2.hxx"
+
+#include "baside2.hrc"
+
+#include <basic/basrdll.hxx>
+#include <com/sun/star/script/ModuleType.hpp>
+#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
 #include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/script/XLibraryContainer2.hpp>
-#include <com/sun/star/document/MacroExecMode.hpp>
-#include <com/sun/star/script/ModuleType.hpp>
-#include <toolkit/helper/vclunohelper.hxx>
+#include <comphelper/processfactory.hxx>
 #include <sfx2/docfile.hxx>
-#include <basic/basrdll.hxx>
-
-#include <baside2.hrc>
-#include <baside2.hxx>
-#include <objdlg.hxx>
-#include <iderdll.hxx>
-#include <iderdll2.hxx>
-
-#include <basobj.hxx>
-#include <brkdlg.hxx>
-
+#include <svtools/xtextedt.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <vcl/msgbox.hxx>
 #include <vcl/sound.hxx>
 
-#include <unotools/textsearch.hxx>
-#include <tools/diagnose_ex.h>
-
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
-
 #define SPLIT_MARGIN    5
 #define SPLIT_HEIGHT    2
 
diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index ebfdc5ee944f..ed6d85c5feb6 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -37,47 +37,35 @@
 #define _SDR_NODRAGMETHODS
 #define _SDR_NOXOUTDEV
 
-#include <ide_pch.hxx>
-
-
-#include <vector>
-#include <basidesh.hrc>
-#include <baside3.hxx>
-#include <localizationmgr.hxx>
-#include <accessibledialogwindow.hxx>
-#include <dlged.hxx>
-#include <dlgedmod.hxx>
-#include <dlgedview.hxx>
-#include <dlgeddef.hxx>
-#include <propbrw.hxx>
-
-#include <basobj.hxx>
-#include <iderdll.hxx>
-#include <basidesh.hxx>
-#include <idetemp.hxx>
-#include <helpid.hrc>
-#include <bastype2.hxx>
-#include <svx/svdview.hxx>
-#include <editeng/unolingu.hxx>
+#include "ide_pch.hxx"
+
+#include "basidesh.hrc"
+#include "helpid.hrc"
+
+#include "accessibledialogwindow.hxx"
+#include "baside3.hxx"
+#include "basidesh.hxx"
+#include "bastype2.hxx"
+#include "dlged.hxx"
+#include "dlgeddef.hxx"
+#include "dlgedmod.hxx"
+#include "dlgedview.hxx"
+#include "iderdll.hxx"
+#include "idetemp.hxx"
+#include "localizationmgr.hxx"
+#include "propbrw.hxx"
+
+#include <com/sun/star/resource/StringResourceWithLocation.hpp>
+#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
+#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
+#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
+#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
+#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
+#include <comphelper/processfactory.hxx>
 #include <tools/diagnose_ex.h>
 #include <tools/urlobj.hxx>
-#include <comphelper/processfactory.hxx>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
+#include <vcl/msgbox.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
-#include <com/sun/star/script/XLibraryContainer2.hpp>
-#include <svtools/ehdl.hxx>
-#include <svtools/langtab.hxx>
-#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-#include <com/sun/star/resource/XStringResourceResolver.hpp>
-#include <com/sun/star/resource/StringResourceWithLocation.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/script/vba/XVBACompatibility.hpp>
 
 using namespace comphelper;
 using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx
index 8a00b83fe9bd..06c2151c1e34 100644
--- a/basctl/source/basicide/basides1.cxx
+++ b/basctl/source/basicide/basides1.cxx
@@ -29,17 +29,11 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basctl.hxx"
 
-#include "docsignature.hxx"
-
-#include <basic/sbx.hxx>
 #define _SVSTDARR_STRINGS
-#include <svl/svstdarr.hxx>
-#include <svl/visitem.hxx>
-#include <ide_pch.hxx>
 
-#define _SOLAR__PRIVATE 1
+#include "ide_pch.hxx"
 
-// #define _SVX_NOIDERESIDS
+#define _SOLAR__PRIVATE 1
 
 #define SI_NOCONTROL
 #define SI_NOSBXCONTROLS
@@ -47,44 +41,30 @@
 #define SI_NODRW
 #define _VCTRLS_HXX
 
-#include <basidesh.hrc>
-#include <basidesh.hxx>
-#include <baside2.hxx>
-#include <baside3.hxx>
-#include <basobj.hxx>
-#include <iderdll.hxx>
-#include <iderdll2.hxx>
-#include <sbxitem.hxx>
-#include <managelang.hxx>
-#include <localizationmgr.hxx>
-#include <helpid.hrc>
-#include <moduldlg.hxx>
-
-#include <svtools/texteng.hxx>
-#include <svtools/textview.hxx>
-#include <svtools/xtextedt.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/diagnose_ex.h>
-#include <sfx2/minfitem.hxx>
-#include <sfx2/docfile.hxx>
-#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
-#include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/script/XLibraryContainerPassword.hpp>
-#include <com/sun/star/frame/XDispatchProvider.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
+#include "basidesh.hrc"
+#include "helpid.hrc"
 
-#include <algorithm>
-#include <memory>
+#include "baside2.hxx"
+#include "baside3.hxx"
+#include "basobj.hxx"
+#include "docsignature.hxx"
+#include "iderdll.hxx"
+#include "iderdll2.hxx"
+#include "localizationmgr.hxx"
+#include "managelang.hxx"
+#include "moduldlg.hxx"
 
+#include <com/sun/star/frame/XLayoutManager.hpp>
+#include <com/sun/star/script/XLibraryContainerPassword.hpp>
+#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
+#include <svl/visitem.hxx>
+#include <svtools/xtextedt.hxx>
+#include <vcl/msgbox.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::frame;
 
-class SvxSearchItem;
-
-
 // until we have some configuration lets just keep
 // persist this value for the process lifetime
 bool& lcl_GetSourceLinesEnabledValue()
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index c1967f9ec391..566563f458cd 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -30,11 +30,8 @@
 #include "precompiled_basctl.hxx"
 
 // CLOOKS:
-//#define _MENUBTN_HXX
 #define _SPIN_HXX
 #define _PRVWIN_HXX
-//#define _FIELD_HXX ***
-//#define _TAB_HXX ***
 #define _DIALOGS_HXX
 #define _SVRTF_HXX
 #define _ISETBRW_HXX
@@ -47,20 +44,13 @@
 // if without PCH's:
 #include <ide_pch.hxx>
 
-
 #define _SOLAR__PRIVATE 1
-#include <basic/sbx.hxx>
-#include <svl/hint.hxx>
 #include <tools/diagnose_ex.h>
 #include <basidesh.hrc>
-#include <basidesh.hxx>
 #include <baside2.hxx>
 #include <basdoc.hxx>
-#include <basobj.hxx>
-#include <bastypes.hxx>
 #include <basicbox.hxx>
 #include <objdlg.hxx>
-#include <sbxitem.hxx>
 #include <tbxctl.hxx>
 #include <iderdll2.hxx>
 #include <basidectrlr.hxx>
@@ -74,16 +64,12 @@
 #include <svx/pszctrl.hxx>
 #include <svx/insctrl.hxx>
 #include <svx/srchdlg.hxx>
-#include <svx/lboxctrl.hxx>
 #include <svx/tbcontrl.hxx>
 #include <com/sun/star/script/XLibraryContainerPassword.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XContainer.hpp>
-#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/script/XLibraryContainer.hpp>
-
 #include <svx/xmlsecctrl.hxx>
 #include <sfx2/viewfac.hxx>
+#include <vcl/msgbox.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx
index 68a40f6b919e..cf280dde6b53 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -50,6 +50,7 @@
 #include <framework/documentundoguard.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/moduleoptions.hxx>
+#include <vcl/msgbox.hxx>
 
 #include <vector>
 #include <algorithm>
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index f01a67ed4342..ca551e4762ae 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -31,6 +31,7 @@
 
 #include <ide_pch.hxx>
 
+#include <vcl/msgbox.hxx>
 #include <vector>
 #include <algorithm>
 #include <basic/sbx.hxx>
diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx
index 480773f15a21..10310ec72b1f 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -29,7 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_basctl.hxx"
 
-
+#include <vcl/msgbox.hxx>
 #include <vector>
 #include <algorithm>
 
diff --git a/basctl/source/basicide/ide_pch.hxx b/basctl/source/basicide/ide_pch.hxx
index 78e39abb6c23..a7eb874e920d 100644
--- a/basctl/source/basicide/ide_pch.hxx
+++ b/basctl/source/basicide/ide_pch.hxx
@@ -25,12 +25,11 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#include <svheader.hxx>
 
 #define ITEMID_SEARCH           0
 #define ITEMID_SIZE             0
 
-#include <vcl/msgbox.hxx>
+//#include <vcl/msgbox.hxx>
 #include <svl/aeitem.hxx>
 #include <svl/whiter.hxx>
 #include <svl/intitem.hxx>
diff --git a/basctl/source/basicide/macrodlg.cxx b/basctl/source/basicide/macrodlg.cxx
index 688c54b3c9d3..85a6367e8ad8 100644
--- a/basctl/source/basicide/macrodlg.cxx
+++ b/basctl/source/basicide/macrodlg.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_basctl.hxx"
 
 #include <memory>
-
+#include <vcl/msgbox.hxx>
 #include <ide_pch.hxx>
 
 
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index be743881a242..996ab0c9f86f 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -30,7 +30,7 @@
 #include "precompiled_basctl.hxx"
 
 #include <ide_pch.hxx>
-
+#include <vcl/msgbox.hxx>
 #include <sot/storinfo.hxx>
 
 #include <moduldlg.hrc>
diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx
index c3912bd1da41..876e971a663b 100644
--- a/basctl/source/basicide/moduldlg.cxx
+++ b/basctl/source/basicide/moduldlg.cxx
@@ -32,7 +32,7 @@
 #include <memory>
 
 #include <ide_pch.hxx>
-
+#include <vcl/msgbox.hxx>
 
 #include <moduldlg.hrc>
 #include <moduldlg.hxx>
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 38ed7c57ffe3..9a94ce4f21f3 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -33,6 +33,7 @@
 
 
 #include <basic/sbx.hxx>
+#include <vcl/msgbox.hxx>
 #include <vcl/cmdevt.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/sound.hxx>