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

6 files changed, 8 insertions, 6 deletions

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