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

4 files changed, 4 insertions, 5 deletions

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;