framework: cleanup xinterface.hxx includes

Change-Id: I66b27e623e411c9ba9c5ba17c46c052336d031b8 Reviewed-on: https://gerrit.libreoffice.org/38503Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>

framework: cleanup xinterface.hxx includes
Change-Id: I66b27e623e411c9ba9c5ba17c46c052336d031b8 Reviewed-on: https://gerrit.libreoffice.org/38503Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
f95cb284 · Jochen Nitschke · 8af868e2 · f95cb284 · f95cb284 · f95cb284
Kaydet (Commit) f95cb284 authored Haz 07, 2017 tarafından Jochen Nitschke
51 changed files
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_CLOSEDISPATCHER_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_CLOSEDISPATCHER_HXX

-#include <macros/xinterface.hxx>
 #include <stdtypes.h>
 #include <general.h>


--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX

-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

--- a/framework/inc/dispatch/dispatchprovider.hxx
+++ b/framework/inc/dispatch/dispatchprovider.hxx
@@ -22,7 +22,6 @@

 #include <classes/protocolhandlercache.hxx>

-#include <macros/xinterface.hxx>
 #include <stdtypes.h>

 #include <com/sun/star/lang/XTypeProvider.hpp>

--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX

-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>

--- a/framework/inc/dispatch/mailtodispatcher.hxx
+++ b/framework/inc/dispatch/mailtodispatcher.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>
 #include <stdtypes.h>

--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>
 #include <stdtypes.h>

--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>
 #include <stdtypes.h>

--- a/framework/inc/dispatch/servicehandler.hxx
+++ b/framework/inc/dispatch/servicehandler.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>
 #include <stdtypes.h>

--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_STARTMODULEDISPATCHER_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_STARTMODULEDISPATCHER_HXX

-#include <macros/xinterface.hxx>
 #include <stdtypes.h>
 #include <general.h>


--- a/framework/inc/dispatch/systemexec.hxx
+++ b/framework/inc/dispatch/systemexec.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX
 #define INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>
 #include <stdtypes.h>

--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX

 #include <classes/framecontainer.hxx>
-#include <macros/xinterface.hxx>

 #include <com/sun/star/ui/XDockingAreaAcceptor.hpp>
 #include <com/sun/star/frame/XFrame.hpp>

--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX

-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/frame/XFramesSupplier.hpp>

--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX

-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/lang/XEventListener.hpp>

--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_HELPER_OFRAMES_HXX

 #include <classes/framecontainer.hxx>
-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX

-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX

 // include files of own module
-
 #include <helper/statusindicatorfactory.hxx>
-#include <macros/xinterface.hxx>

 // include UNO interfaces
 #include <com/sun/star/task/XStatusIndicator.hpp>

--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -26,7 +26,6 @@

 // include files of own module
 #include <helper/wakeupthread.hxx>
-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>


--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_TAGWINDOWASMODIFIED_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_TAGWINDOWASMODIFIED_HXX

-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/lang/XMultiServiceFactory.hpp>

--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_TITLEBARUPDATE_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_TITLEBARUPDATE_HXX

-#include <macros/xinterface.hxx>
 #include <general.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>

--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_UICONFIGELEMENTWRAPPERBASE_HXX

-#include <macros/xinterface.hxx>
-
 #include <com/sun/star/ui/XUIElement.hpp>
 #include <com/sun/star/ui/XUIElementSettings.hpp>
 #include <com/sun/star/ui/XUIConfigurationManager.hpp>

--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_UIELEMENTWRAPPERBASE_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_UIELEMENTWRAPPERBASE_HXX

-#include <macros/xinterface.hxx>
-
 #include <com/sun/star/ui/XUIElement.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XComponent.hpp>

--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_VCLSTATUSINDICATOR_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_VCLSTATUSINDICATOR_HXX

-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/task/XStatusIndicator.hpp>

--- a/framework/inc/interaction/quietinteraction.hxx
+++ b/framework/inc/interaction/quietinteraction.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_INTERACTION_QUIETINTERACTION_HXX
 #define INCLUDED_FRAMEWORK_INC_INTERACTION_QUIETINTERACTION_HXX

-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/task/XInteractionHandler.hpp>

--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_JOBS_HELPONSTARTUP_HXX
 #define INCLUDED_FRAMEWORK_INC_JOBS_HELPONSTARTUP_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>

 #include <cppuhelper/implbase.hxx>

--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -22,7 +22,6 @@

 #include <jobs/jobresult.hxx>
 #include <jobs/jobdata.hxx>
-#include <macros/xinterface.hxx>
 #include <stdtypes.h>
 #include <general.h>


--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_JOBS_SHELLJOB_HXX
 #define INCLUDED_FRAMEWORK_INC_JOBS_SHELLJOB_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>

 #include <cppuhelper/implbase.hxx>

--- a/framework/inc/recording/dispatchrecorder.hxx
+++ b/framework/inc/recording/dispatchrecorder.hxx
@@ -25,7 +25,6 @@
 */
 #include <vector>

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>
 #include <rtl/ustring.hxx>

--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDERSUPPLIER_HXX
 #define INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDERSUPPLIER_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>
 #include <stdtypes.h>

--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_SERVICES_MEDIATYPEDETECTIONHELPER_HXX
 #define INCLUDED_FRAMEWORK_INC_SERVICES_MEDIATYPEDETECTIONHELPER_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>


--- a/framework/inc/services/uriabbreviation.hxx
+++ b/framework/inc/services/uriabbreviation.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_SERVICES_URIABBREVIATION_HXX
 #define INCLUDED_FRAMEWORK_INC_SERVICES_URIABBREVIATION_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <general.h>


--- a/framework/inc/tabwin/tabwinfactory.hxx
+++ b/framework/inc/tabwin/tabwinfactory.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_TABWIN_TABWINFACTORY_HXX

 #include <stdtypes.h>
-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <services.h>


--- a/framework/inc/uiconfiguration/globalsettings.hxx
+++ b/framework/inc/uiconfiguration/globalsettings.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX
 #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>


--- a/framework/inc/uiconfiguration/moduleimagemanager.hxx
+++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX
 #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 #include <uiconfiguration/imagetype.hxx>

--- a/framework/inc/uielement/addonstoolbarmanager.hxx
+++ b/framework/inc/uielement/addonstoolbarmanager.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_ADDONSTOOLBARMANAGER_HXX

 #include <uielement/toolbarmanager.hxx>
-#include <macros/xinterface.hxx>

 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>

--- a/framework/inc/uielement/constitemcontainer.hxx
+++ b/framework/inc/uielement/constitemcontainer.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX

-#include <macros/xinterface.hxx>
-
 #include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>

--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ITEMCONTAINER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_ITEMCONTAINER_HXX

-#include <macros/xinterface.hxx>
 #include <helper/shareablemutex.hxx>

 #include <com/sun/star/container/XIndexContainer.hpp>

--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_PROGRESSBARWRAPPER_HXX

 #include <helper/uielementwrapperbase.hxx>
-#include <macros/xinterface.hxx>

 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/awt/XWindow.hpp>

--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_ROOTITEMCONTAINER_HXX

-#include <macros/xinterface.hxx>
 #include <helper/shareablemutex.hxx>

 #include <com/sun/star/container/XIndexContainer.hpp>

--- a/framework/inc/uielement/statusbarmanager.hxx
+++ b/framework/inc/uielement/statusbarmanager.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX

-#include <macros/xinterface.hxx>
 #include <stdtypes.h>

 #include <com/sun/star/frame/XFrame.hpp>

--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -20,8 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX

-#include <macros/xinterface.hxx>
-
 #include <com/sun/star/task/XStatusIndicator.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/lang/XComponent.hpp>

--- a/framework/inc/uielement/toolbarmanager.hxx
+++ b/framework/inc/uielement/toolbarmanager.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX
 #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX

-#include <macros/xinterface.hxx>
 #include <stdtypes.h>
 #include <uielement/commandinfo.hxx>


--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX
 #define INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>


--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONREADER_HXX

 #include <accelerators/acceleratorcache.hxx>
-#include <macros/xinterface.hxx>
 #include <general.h>

 #include <com/sun/star/xml/sax/XDocumentHandler.hpp>

--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -22,7 +22,6 @@

 #include <accelerators/presethandler.hxx>
 #include <accelerators/acceleratorcache.hxx>
-#include <macros/xinterface.hxx>
 #include <general.h>
 #include <stdtypes.h>


--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -35,6 +35,7 @@
 #include <com/sun/star/ui/XUIElementSettings.hpp>
 #include <com/sun/star/ui/XUIFunctionListener.hpp>

+#include <cppuhelper/queryinterface.hxx>
 #include <unotools/cmdoptions.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/helper/convert.hxx>

--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -25,7 +25,6 @@
 */
 #include <vector>

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 #include <properties.h>

--- a/framework/source/uiconfiguration/imagemanagerimpl.hxx
+++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX
 #define INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>
 #include <uiconfiguration/imagetype.hxx>

--- a/framework/source/uielement/langselectionstatusbarcontroller.cxx
+++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx
@@ -54,7 +54,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ref.hxx>

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <stdtypes.h>


--- a/framework/source/uielement/statusbarmanager.cxx
+++ b/framework/source/uielement/statusbarmanager.cxx
@@ -24,7 +24,6 @@
 #include <framework/addonsoptions.hxx>
 #include <uielement/statusbarmerger.hxx>
 #include <uielement/statusbaritem.hxx>
-#include <macros/xinterface.hxx>
 #include <stdtypes.h>
 #include "services.h"
 #include "general.h"

--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -35,6 +35,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/processfactory.hxx>
+#include <cppuhelper/queryinterface.hxx>

 #include <svtools/miscopt.hxx>
 #include <vcl/svapp.hxx>

--- a/framework/source/uifactory/addonstoolbarfactory.cxx
+++ b/framework/source/uifactory/addonstoolbarfactory.cxx
@@ -35,7 +35,6 @@
 #include <rtl/ref.hxx>
 #include <rtl/ustrbuf.hxx>

-#include <macros/xinterface.hxx>
 #include <macros/xserviceinfo.hxx>
 #include <services.h>