Remove unnecessary includes

2 files changed, 65 insertions, 96 deletions

diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index b7663205adb0..91a207115e12 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -26,17 +26,11 @@
  *
  ************************************************************************/
 
-#include <com/sun/star/uno/Reference.h>
-#include <sfx2/basedlgs.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <svtools/svtreebx.hxx>
 #include <tools/resary.hxx>
-#include <vcl/image.hxx>
 #include <vcl/fixbrd.hxx>
-#include <vcl/fixed.hxx>
-#include <svx/xtable.hxx>
 
-#include <vector>
+class SfxModule;
+class SfxShell;
 
 // static ----------------------------------------------------------------
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f41515f0e786..227718806c66 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -26,112 +26,87 @@
  *
  ************************************************************************/
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
-#include <com/sun/star/linguistic2/XDictionaryList.hpp>
+#include "cuires.hrc"
+#include "helpid.hrc"
+#include "treeopt.hrc"
+
+#include <svx/dialogs.hrc>
+
+#include "cfgchart.hxx"
+#include "connpoolconfig.hxx"
+#include "connpooloptions.hxx"
+#include "cuioptgenrl.hxx"
+#include "cuitabarea.hxx"
+#include "dbregister.hxx"
+#include "dbregisterednamesconfig.hxx"
+#include "dialmgr.hxx"
+#include "fontsubs.hxx"
+#include "optaccessibility.hxx"
+#include "optasian.hxx"
+#include "optchart.hxx"
+#include "optcolor.hxx"
+#include "optctl.hxx"
+#include "optfltr.hxx"
+#include "optgdlg.hxx"
+#include "opthtml.hxx"
+#include "optinet2.hxx"
+#include "optjava.hxx"
+#include "optjsearch.hxx"
+#include "optlingu.hxx"
+#include "optmemory.hxx"
+#include "optpath.hxx"
+#include "optsave.hxx"
+#include "optupdt.hxx"
+#include "treeopt.hxx"
+
+#include <com/sun/star/awt/XContainerWindowEventHandler.hpp>
+#include <com/sun/star/awt/XContainerWindowProvider.hpp>
+#include <com/sun/star/awt/XControl.hpp>
+#include <com/sun/star/awt/PosSize.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XModuleManager.hpp>
+#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
 #include <com/sun/star/util/XMacroExpander.hpp>
-#include <osl/module.hxx>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/frame/XLoadable.hpp>
-#include <tools/rcid.h>
-#include <tools/shl.hxx>
-#include <tools/urlobj.hxx>
-#include <comphelper/processfactory.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
 #include <comphelper/configurationhelper.hxx>
-#include <com/sun/star/awt/XDialogProvider.hpp>
-#include <com/sun/star/awt/XDialogProvider2.hpp>
-#include <com/sun/star/awt/XContainerWindowProvider.hpp>
-#include <com/sun/star/awt/XDialogEventHandler.hpp>
-#include <com/sun/star/awt/XContainerWindowEventHandler.hpp>
-#include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/awt/XTopWindow.hpp>
-#include <com/sun/star/awt/XControl.hpp>
-#include <com/sun/star/awt/XTabController.hpp>
-#include <vcl/help.hxx>
+#include <comphelper/processfactory.hxx>
+#include <editeng/optitems.hxx>
+#include <editeng/unolingu.hxx>
 #include <linguistic/misc.hxx>
+#include <osl/module.hxx>
+#include <osl/process.h>
+#include <rtl/bootstrap.hxx>
+#include <rtl/uri.hxx>
+#include <sfx2/app.hxx>
+#include <sfx2/dispatch.hxx>
+#include <sfx2/module.hxx>
+#include <sfx2/printopt.hxx>
+#include <sfx2/shell.hxx>
+#include <sfx2/tplpitem.hxx>
+#include <sfx2/viewsh.hxx>
+#include <svl/languageoptions.hxx>
 #include <svtools/helpopt.hxx>
+#include <svx/drawitem.hxx>
+#include <svx/xtable.hxx>
+#include <svx/xpool.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/shl.hxx>
+#include <tools/urlobj.hxx>
+#include <unotools/linguprops.hxx>
+#include <unotools/misccfg.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <svl/languageoptions.hxx>
 #include <unotools/optionsdlg.hxx>
-#include <sfx2/module.hxx>
+#include <unotools/viewoptions.hxx>
+#include <vcl/help.hxx>
 #include <vcl/msgbox.hxx>
-#include <sfx2/dispatch.hxx>
 #include <vcl/waitobj.hxx>
-#include <svl/slstitm.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <unotools/viewoptions.hxx>
-#include <sfx2/printopt.hxx>
-#include <osl/module.h>
-#include <osl/process.h>
-#include <rtl/bootstrap.hxx>
-#include <unotools/misccfg.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/tplpitem.hxx>
-#include <svtools/apearcfg.hxx>
-#include <unotools/linguprops.hxx>
-#include <sfx2/app.hxx>
-#include <svx/xdef.hxx>
-#include <svx/xflclit.hxx>
-#include <svx/xpool.hxx>
-#include "cuitabarea.hxx"
-#include <svx/ofaitem.hxx>
-#include "opthtml.hxx"
-#include "optcolor.hxx"
-#include "optctl.hxx"
-#include "optjava.hxx"
-#include "optsave.hxx"
-#include "optpath.hxx"
-#include "cuioptgenrl.hxx"
-#include "optlingu.hxx"
-#include "optinet2.hxx"
-#include "optasian.hxx"
-#include "optaccessibility.hxx"
-#include "optjsearch.hxx"
-#include "connpooloptions.hxx"
-#include "optupdt.hxx"
-#include "optchart.hxx"
-#include "optgdlg.hxx"
-#include "optmemory.hxx"
-#include "optfltr.hxx"
-#include <cuires.hrc>
-#include "helpid.hrc"
-#include <dialmgr.hxx>
-#include "treeopt.hxx"
-#include "treeopt.hrc"
-#include "fontsubs.hxx"
-#include <editeng/unolingu.hxx>
-#include <svx/xtable.hxx>
-#include "connpoolconfig.hxx"
-#include "dbregister.hxx"
-#include "dbregisterednamesconfig.hxx"
-#include "cfgchart.hxx"
-#include <svx/dialogs.hrc>
 
 #ifndef _SVX_LANGITEM_HXX
 #define ITEMID_LANGUAGE SID_ATTR_CHAR_LANGUAGE
 #include <editeng/langitem.hxx>
 #endif
 
-
-#include <editeng/optitems.hxx>
-
-#include <svx/drawitem.hxx>
-#include <rtl/uri.hxx>
-
 #ifdef LINUX
-#include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #endif
 
 using namespace ::com::sun::star;