cppuhelper: clean up public headers with include-what-you-use

Change-Id: I41ba46831f24b2960a1fe982b74a2b623e682e0b

17 files changed, 15 insertions, 20 deletions

diff --git a/include/comphelper/servicedecl.hxx b/include/comphelper/servicedecl.hxx
index 499bcbc353a0..0b1eb22fcbfe 100644
--- a/include/comphelper/servicedecl.hxx
+++ b/include/comphelper/servicedecl.hxx
@@ -23,6 +23,7 @@
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <uno/environment.h>
 #include <boost/utility.hpp>
diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx
index 4d942809e251..debddcf18df2 100644
--- a/include/cppuhelper/bootstrap.hxx
+++ b/include/cppuhelper/bootstrap.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX
 
 #include <sal/config.h>
-#include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx
index a5ff85769571..f902e53786c1 100644
--- a/include/cppuhelper/compbase_ex.hxx
+++ b/include/cppuhelper/compbase_ex.hxx
@@ -19,14 +19,15 @@
 #ifndef INCLUDED_CPPUHELPER_COMPBASE_EX_HXX
 #define INCLUDED_CPPUHELPER_COMPBASE_EX_HXX
 
-#include <osl/mutex.hxx>
 #include <cppuhelper/implbase_ex.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/interfacecontainer.h>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <cppuhelper/cppuhelperdllapi.h>
 
 /// @cond INTERNAL
 
+namespace osl { class Mutex; }
+
 namespace cppu
 {
 
diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx
index e22bb45b5396..ffcd50fb51a6 100644
--- a/include/cppuhelper/component.hxx
+++ b/include/cppuhelper/component.hxx
@@ -19,17 +19,17 @@
 #ifndef INCLUDED_CPPUHELPER_COMPONENT_HXX
 #define INCLUDED_CPPUHELPER_COMPONENT_HXX
 
-#include <osl/mutex.hxx>
 #include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/interfacecontainer.h>
 
 #include <cppuhelper/implbase1.hxx>
 
 #include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
 
 #include <cppuhelper/cppuhelperdllapi.h>
 
+namespace osl { class Mutex; }
+
 namespace cppu
 {
 
diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx
index 95c518326e72..f22ff2c1df6d 100644
--- a/include/cppuhelper/component_context.hxx
+++ b/include/cppuhelper/component_context.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX
 
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/lang/XSingleComponentFactory.hpp>
 #include <cppuhelper/cppuhelperdllapi.h>
 
 
diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx
index b507674a8ff5..2d82e288cbd6 100644
--- a/include/cppuhelper/factory.hxx
+++ b/include/cppuhelper/factory.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_CPPUHELPER_FACTORY_HXX
 
 #include <rtl/ustring.hxx>
-#include <uno/dispatcher.h>
 #include <rtl/unload.h>
 
 #include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx
index efbe8dc2af7e..e2335fb6f326 100644
--- a/include/cppuhelper/implbase_ex.hxx
+++ b/include/cppuhelper/implbase_ex.hxx
@@ -23,10 +23,6 @@
 #include <cppuhelper/weakagg.hxx>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 
-// Despite the fact that the following include is not used in this header, it has to remain,
-// because it is expected by files including cppuhelper/implbaseN.hxx.
-// So maybe we can omit it some time in the future...
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 /* If you need to define implementation helper classes that deal with more than
    12 interfaces, then use macros as follows, e.g. for 3 interfaces:
diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx
index 8bb916c9afc6..fc1ded273699 100644
--- a/include/cppuhelper/propshlp.hxx
+++ b/include/cppuhelper/propshlp.hxx
@@ -22,7 +22,7 @@
 
 #include <rtl/alloc.h>
 
-#include <cppuhelper/interfacecontainer.hxx>
+#include <cppuhelper/interfacecontainer.h>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySetOption.hpp>
diff --git a/include/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h
index a0d863cadccd..ac1e075e6300 100644
--- a/include/cppuhelper/proptypehlp.h
+++ b/include/cppuhelper/proptypehlp.h
@@ -19,8 +19,7 @@
 #ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_H
 #define INCLUDED_CPPUHELPER_PROPTYPEHLP_H
 
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include <com/sun/star/uno/TypeClass.hpp>
+#include <com/sun/star/uno/Any.h>
 
 
 namespace cppu {
diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx
index 9a3d26788c0c..c93a7961169f 100644
--- a/include/cppuhelper/proptypehlp.hxx
+++ b/include/cppuhelper/proptypehlp.hxx
@@ -20,6 +20,8 @@
 #define INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX
 
 #include <cppuhelper/proptypehlp.h>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/uno/TypeClass.hpp>
 
 namespace cppu
 {
diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx
index bc2c6c14b420..3a62ef5ff1d1 100644
--- a/include/cppuhelper/shlib.hxx
+++ b/include/cppuhelper/shlib.hxx
@@ -21,8 +21,6 @@
 
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
-#include <com/sun/star/loader/CannotActivateFactoryException.hpp>
-#include <com/sun/star/registry/CannotRegisterImplementationException.hpp>
 #include <cppuhelper/cppuhelperdllapi.h>
 
 
diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx
index 6b77bf5b5042..50344096d772 100644
--- a/include/cppuhelper/typeprovider.hxx
+++ b/include/cppuhelper/typeprovider.hxx
@@ -20,7 +20,6 @@
 #define INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX
 
 #include <rtl/alloc.h>
-#include <rtl/uuid.h>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
 
diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx
index 41a8073dac34..60ee36cc2275 100644
--- a/include/cppuhelper/weak.hxx
+++ b/include/cppuhelper/weak.hxx
@@ -21,8 +21,6 @@
 
 #include <osl/interlck.h>
 #include <rtl/alloc.h>
-#include <cppuhelper/weakref.hxx>
-#include <cppuhelper/queryinterface.hxx>
 #include <com/sun/star/uno/XWeak.hpp>
 #include <cppuhelper/cppuhelperdllapi.h>
 
diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx
index 8575fb3cce5b..abc0cade6149 100644
--- a/include/cppuhelper/weakagg.hxx
+++ b/include/cppuhelper/weakagg.hxx
@@ -20,6 +20,7 @@
 #define INCLUDED_CPPUHELPER_WEAKAGG_HXX
 
 #include <cppuhelper/weak.hxx>
+#include <cppuhelper/weakref.hxx>
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <cppuhelper/cppuhelperdllapi.h>
 
diff --git a/include/svl/numuno.hxx b/include/svl/numuno.hxx
index 9a24568d4eb6..d1a3373b1fe4 100644
--- a/include/svl/numuno.hxx
+++ b/include/svl/numuno.hxx
@@ -22,6 +22,7 @@
 #include <svl/svldllapi.h>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <cppuhelper/implbase2.hxx>
 
 class SvNumberFormatter;
diff --git a/include/svtools/contextmenuhelper.hxx b/include/svtools/contextmenuhelper.hxx
index d49f38f3e95d..6b5d58ce6485 100644
--- a/include/svtools/contextmenuhelper.hxx
+++ b/include/svtools/contextmenuhelper.hxx
@@ -28,6 +28,7 @@
 
 #include <rtl/ustring.hxx>
 #include <cppuhelper/weak.hxx>
+#include <cppuhelper/weakref.hxx>
 #include <vcl/menu.hxx>
 #include <svtools/svtdllapi.h>
 
diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx
index 65dbe8e99510..0d44bc33188d 100644
--- a/include/toolkit/controls/controlmodelcontainerbase.hxx
+++ b/include/toolkit/controls/controlmodelcontainerbase.hxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/container/XContainer.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/awt/XTabControllerModel.hpp>
 #include <com/sun/star/util/XChangesNotifier.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>