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

Unfortunately iwyu gets quite confused by the weird cyclic dependencies
between various foo.h/foo.hxx and cppumaker generated headers, so it's
not obvious if any improvement here is realistic...

Change-Id: I0bc66f98b146712e28cabc18d56c11c08418c721

34 files changed, 38 insertions, 16 deletions

diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
index b2152ddc7b31..92df84bded44 100644
--- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx
@@ -35,7 +35,6 @@
 
 
 using namespace ::std;
-using namespace ::osl;
 using namespace ::com::sun::star::uno;
 using namespace ::__cxxabiv1;
 
diff --git a/configmgr/source/propertynode.cxx b/configmgr/source/propertynode.cxx
index 102423aabafe..acc35773fda7 100644
--- a/configmgr/source/propertynode.cxx
+++ b/configmgr/source/propertynode.cxx
@@ -23,6 +23,7 @@
 
 #include <com/sun/star/beans/Optional.hpp>
 #include <com/sun/star/uno/Any.hxx>
+#include <osl/mutex.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx
index 378544edf652..a6cc4b7816d8 100644
--- a/cppu/source/AffineBridge/AffineBridge.cxx
+++ b/cppu/source/AffineBridge/AffineBridge.cxx
@@ -23,6 +23,7 @@
 #include "osl/mutex.hxx"
 #include <osl/diagnose.h>
 
+#include <cppu/Enterable.hxx>
 #include "cppu/helper/purpenv/Environment.hxx"
 #include "cppu/helper/purpenv/Mapping.hxx"
 
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 3393580d5bad..709946e1a39b 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -24,6 +24,7 @@
 #include <osl/diagnose.h>
 #include "uno/dispatcher.h"
 #include "typelib/typedescription.hxx"
+#include <cppu/Enterable.hxx>
 #include "cppu/helper/purpenv/Environment.hxx"
 #include "cppu/helper/purpenv/Mapping.hxx"
 #include "cppu/EnvDcp.hxx"
diff --git a/cppu/source/UnsafeBridge/UnsafeBridge.cxx b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
index 27cea46275b1..7483bbd5e8ed 100644
--- a/cppu/source/UnsafeBridge/UnsafeBridge.cxx
+++ b/cppu/source/UnsafeBridge/UnsafeBridge.cxx
@@ -22,6 +22,7 @@
 #include "osl/thread.h"
 #include "osl/thread.hxx"
 
+#include <cppu/Enterable.hxx>
 #include "cppu/helper/purpenv/Environment.hxx"
 #include "cppu/helper/purpenv/Mapping.hxx"
 
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index ba70199dadbe..d3b47bfee7f0 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -22,6 +22,7 @@
 
 #include "osl/diagnose.h"
 #include "uno/lbnames.h"
+#include <cppu/Enterable.hxx>
 
 #include "typelib/typedescription.h"
 #include "osl/interlck.h"
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 5d2525f8d60b..b60aa0a8c8e7 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_ACTIONLOCKGUARD_HXX
 
 #include <com/sun/star/document/XActionLockable.hpp>
+#include <osl/mutex.hxx>
 
 namespace framework{
 
diff --git a/i18nlangtag/source/isolang/inunx.cxx b/i18nlangtag/source/isolang/inunx.cxx
index 2fb73df526f5..fd62c9462c37 100644
--- a/i18nlangtag/source/isolang/inunx.cxx
+++ b/i18nlangtag/source/isolang/inunx.cxx
@@ -27,8 +27,9 @@
 
 #else   // MACOSX
 #include <rtl/string.hxx>
-
 #endif  // MACOSX
+
+#include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include "i18nlangtag/languagetag.hxx"
 #include "i18nlangtag/mslangid.hxx"
diff --git a/i18nlangtag/source/isolang/inwnt.cxx b/i18nlangtag/source/isolang/inwnt.cxx
index 33e9c3e25841..158dd8bdf627 100644
--- a/i18nlangtag/source/isolang/inwnt.cxx
+++ b/i18nlangtag/source/isolang/inwnt.cxx
@@ -29,6 +29,7 @@
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
+#include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include "i18nlangtag/mslangid.hxx"
 
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx
index b3f76ceac6af..e3b6c9ec8858 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -15,6 +15,7 @@
 #include <rtl/ustrbuf.hxx>
 #include <rtl/bootstrap.hxx>
 #include <osl/file.hxx>
+#include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <rtl/locale.h>
 #include <boost/unordered_set.hpp>
diff --git a/include/com/sun/star/uno/Any.h b/include/com/sun/star/uno/Any.h
index 67374e5acd0f..2f44d741bcd2 100644
--- a/include/com/sun/star/uno/Any.h
+++ b/include/com/sun/star/uno/Any.h
@@ -21,10 +21,11 @@
 
 #include <uno/any2.h>
 #include <typelib/typedescription.h>
-#include <com/sun/star/uno/Type.h>
 #include <cppu/unotype.hxx>
+#include <com/sun/star/uno/TypeClass.hdl>
 #include <rtl/alloc.h>
 
+namespace rtl { class OUString; }
 
 namespace com
 {
@@ -35,6 +36,8 @@ namespace star
 namespace uno
 {
 
+class Type;
+
 /** C++ class representing an IDL any.
     This class is used to transport any type defined in IDL. The class inherits from the
     binary C representation of uno_Any.
@@ -258,7 +261,6 @@ template<>
 inline Any SAL_CALL makeAny( bool const & value );
 
 class BaseReference;
-class Type;
 
 /** Template binary <<= operator to set the value of an any.
 
diff --git a/include/com/sun/star/uno/Any.hxx b/include/com/sun/star/uno/Any.hxx
index 8d5b7dd19446..b0fbbf914f70 100644
--- a/include/com/sun/star/uno/Any.hxx
+++ b/include/com/sun/star/uno/Any.hxx
@@ -29,8 +29,9 @@
 #include <uno/data.h>
 #include <uno/sequence2.h>
 #include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/XInterface.hpp>
+#include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/genfunc.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
 #include <cppu/unotype.hxx>
 
 namespace com
diff --git a/include/com/sun/star/uno/Reference.hxx b/include/com/sun/star/uno/Reference.hxx
index 69ea87b40c03..db489e593dd8 100644
--- a/include/com/sun/star/uno/Reference.hxx
+++ b/include/com/sun/star/uno/Reference.hxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/RuntimeException.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/uno/genfunc.hxx>
+#include <com/sun/star/uno/Any.hxx>
 
 namespace com
 {
diff --git a/include/com/sun/star/uno/Type.h b/include/com/sun/star/uno/Type.h
index 2d64c9438fd1..45a866013747 100644
--- a/include/com/sun/star/uno/Type.h
+++ b/include/com/sun/star/uno/Type.h
@@ -21,7 +21,6 @@
 
 #include <typelib/typedescription.h>
 #include <com/sun/star/uno/TypeClass.hdl>
-#include <cppu/macros.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/alloc.h>
 
diff --git a/include/com/sun/star/uno/Type.hxx b/include/com/sun/star/uno/Type.hxx
index cdd4929bd69d..5eab3fecda07 100644
--- a/include/com/sun/star/uno/Type.hxx
+++ b/include/com/sun/star/uno/Type.hxx
@@ -19,7 +19,6 @@
 #ifndef INCLUDED_COM_SUN_STAR_UNO_TYPE_HXX
 #define INCLUDED_COM_SUN_STAR_UNO_TYPE_HXX
 
-#include <osl/mutex.hxx>
 #include <com/sun/star/uno/Type.h>
 #include <cppu/unotype.hxx>
 
diff --git a/include/com/sun/star/uno/genfunc.hxx b/include/com/sun/star/uno/genfunc.hxx
index 7a85f5a84419..49f9e6d129df 100644
--- a/include/com/sun/star/uno/genfunc.hxx
+++ b/include/com/sun/star/uno/genfunc.hxx
@@ -21,6 +21,7 @@
 
 #include <com/sun/star/uno/genfunc.h>
 #include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/XInterface.hpp>
 
 
 namespace com
diff --git a/include/cppu/EnvGuards.hxx b/include/cppu/EnvGuards.hxx
index a64807abe8ea..c95d8dfb4f5c 100644
--- a/include/cppu/EnvGuards.hxx
+++ b/include/cppu/EnvGuards.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_CPPU_ENVGUARDS_HXX
 
 #include <uno/environment.hxx>
-#include <uno/mapping.hxx>
 
 
 namespace cppu
diff --git a/include/cppu/helper/purpenv/Environment.hxx b/include/cppu/helper/purpenv/Environment.hxx
index 318baa0b468f..35614b1a84e6 100644
--- a/include/cppu/helper/purpenv/Environment.hxx
+++ b/include/cppu/helper/purpenv/Environment.hxx
@@ -22,8 +22,8 @@
 
 #include <cppu/cppudllapi.h>
 #include <uno/environment.h>
-#include <cppu/Enterable.hxx>
 
+namespace cppu { class Enterable; }
 
 namespace cppu { namespace helper { namespace purpenv {
 
diff --git a/include/cppu/helper/purpenv/Mapping.hxx b/include/cppu/helper/purpenv/Mapping.hxx
index 7e834fd09d3a..c824607b60d5 100644
--- a/include/cppu/helper/purpenv/Mapping.hxx
+++ b/include/cppu/helper/purpenv/Mapping.hxx
@@ -20,9 +20,9 @@
 #ifndef INCLUDED_CPPU_HELPER_PURPENV_MAPPING_HXX
 #define INCLUDED_CPPU_HELPER_PURPENV_MAPPING_HXX
 
-#include <com/sun/star/uno/Any.h>
-
 #include <cppu/cppudllapi.h>
+#include <typelib/typedescription.h>
+#include <uno/any2.h>
 #include <uno/environment.h>
 #include <uno/mapping.h>
 
diff --git a/include/cppu/unotype.hxx b/include/cppu/unotype.hxx
index 640bd2bd57e1..0706502b5449 100644
--- a/include/cppu/unotype.hxx
+++ b/include/cppu/unotype.hxx
@@ -21,12 +21,12 @@
 #define INCLUDED_CPPU_UNOTYPE_HXX
 
 #include <sal/config.h>
-#include <com/sun/star/uno/Type.h>
 #include <sal/types.h>
 #include <typelib/typeclass.h>
 #include <typelib/typedescription.h>
 
 namespace com { namespace sun { namespace star { namespace uno {
+    class Type;
     class Any;
     class Exception;
     template< typename > class Reference;
diff --git a/include/uno/dispatcher.h b/include/uno/dispatcher.h
index 058ad964ccf7..71d1563db09a 100644
--- a/include/uno/dispatcher.h
+++ b/include/uno/dispatcher.h
@@ -20,7 +20,6 @@
 #define INCLUDED_UNO_DISPATCHER_H
 
 #include <sal/types.h>
-#include <rtl/ustring.h>
 #include <uno/any2.h>
 
 #ifdef __cplusplus
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 2ad5ae1708d7..949542f1b9c6 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_UNO_MAPPING_HXX
 #define INCLUDED_UNO_MAPPING_HXX
 
-#include <cppu/macros.hxx>
+#include <uno/lbnames.h>
 #include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
 #include <osl/diagnose.h>
diff --git a/include/uno/threadpool.h b/include/uno/threadpool.h
index d1e738b264d1..c64b9e4dc811 100644
--- a/include/uno/threadpool.h
+++ b/include/uno/threadpool.h
@@ -21,7 +21,7 @@
 #define INCLUDED_UNO_THREADPOOL_H
 
 #include <cppu/cppudllapi.h>
-#include <rtl/byteseq.h>
+#include <sal/types.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/io/source/acceptor/acc_pipe.cxx b/io/source/acceptor/acc_pipe.cxx
index abab10b6851b..34d9bf65d15e 100644
--- a/io/source/acceptor/acc_pipe.cxx
+++ b/io/source/acceptor/acc_pipe.cxx
@@ -22,6 +22,7 @@
 #include <com/sun/star/connection/ConnectionSetupException.hpp>
 
 #include <osl/diagnose.h>
+#include <osl/mutex.hxx>
 #include <cppuhelper/implbase1.hxx>
 
 using namespace ::osl;
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx
index 4ad86a597950..d98e79c3b076 100644
--- a/io/source/acceptor/acc_socket.cxx
+++ b/io/source/acceptor/acc_socket.cxx
@@ -22,6 +22,7 @@
 #include <boost/unordered_set.hpp>
 #include <algorithm>
 
+#include <osl/mutex.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <com/sun/star/connection/XConnectionBroadcaster.hpp>
 #include <com/sun/star/connection/ConnectionSetupException.hpp>
diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx
index 53db4df449f6..8b8c74931c02 100644
--- a/io/source/acceptor/acceptor.hxx
+++ b/io/source/acceptor/acceptor.hxx
@@ -22,6 +22,7 @@
 
 #include <osl/pipe.hxx>
 #include <osl/socket.hxx>
+#include <osl/mutex.hxx>
 
 #include <com/sun/star/connection/XConnection.hpp>
 
diff --git a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
index cf671f25dcd4..ccfcf3f0bfe8 100644
--- a/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
+++ b/sd/source/ui/framework/configuration/ConfigurationControllerResourceManager.hxx
@@ -23,6 +23,8 @@
 #include <com/sun/star/drawing/framework/XConfiguration.hpp>
 #include <com/sun/star/drawing/framework/XResource.hpp>
 #include <com/sun/star/drawing/framework/XResourceFactory.hpp>
+#include <osl/mutex.hxx>
+
 #include <boost/noncopyable.hpp>
 #include <boost/shared_ptr.hpp>
 #include <map>
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index 7ac42cc95800..6c1f46ede48c 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.cxx
@@ -20,6 +20,7 @@
 
 #include <com/sun/star/uno/Exception.hpp>
 
+#include <osl/mutex.hxx>
 #include <comphelper/flagguard.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 1ddf9b398e1f..007160484c82 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -26,6 +26,7 @@
 #include <toolkit/helper/accessiblefactory.hxx>
 #include <osl/module.h>
 #include <osl/diagnose.h>
+#include <osl/mutex.hxx>
 #include <tools/solar.h>
 
 #include "helper/accessibilityclient.hxx"
diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
index 5040b690943e..9ad1bcfe37b9 100644
--- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx
@@ -27,6 +27,7 @@
  ************************************************************************/
 
 #include <osl/diagnose.h>
+#include <osl/mutex.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/PropertyState.hpp>
 #include "NeonHeadRequest.hxx"
diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
index 73b6c7c5df32..fa94624cc94f 100644
--- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
+++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx
@@ -28,6 +28,7 @@
 
 
 #include "osl/diagnose.h"
+#include <osl/mutex.hxx>
 #include "rtl/strbuf.hxx"
 #include "NeonTypes.hxx"
 #include "DAVException.hxx"
diff --git a/unoxml/source/events/eventdispatcher.cxx b/unoxml/source/events/eventdispatcher.cxx
index c94e3b66cd00..aa698e1846a5 100644
--- a/unoxml/source/events/eventdispatcher.cxx
+++ b/unoxml/source/events/eventdispatcher.cxx
@@ -26,6 +26,8 @@
 
 #include "../dom/document.hxx"
 
+#include <osl/mutex.hxx>
+
 using namespace css::uno;
 using namespace css::xml::dom;
 using namespace css::xml::dom::events;
diff --git a/unoxml/source/events/eventdispatcher.hxx b/unoxml/source/events/eventdispatcher.hxx
index 20f75597971b..93de12017c83 100644
--- a/unoxml/source/events/eventdispatcher.hxx
+++ b/unoxml/source/events/eventdispatcher.hxx
@@ -33,6 +33,8 @@
 #include <com/sun/star/xml/dom/events/PhaseType.hpp>
 #include <com/sun/star/xml/dom/events/XEvent.hpp>
 
+namespace osl { class Mutex; }
+
 namespace DOM {
 
 class CDocument;
diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx
index 4da6571e32ac..b6a285100b1c 100644
--- a/xmloff/source/forms/handler/form_handler_factory.cxx
+++ b/xmloff/source/forms/handler/form_handler_factory.cxx
@@ -21,6 +21,7 @@
 #include "vcl_date_handler.hxx"
 #include "vcl_time_handler.hxx"
 #include <osl/diagnose.h>
+#include <osl/mutex.hxx>
 
 namespace xmloff
 {