13 files changed, 14 insertions, 14 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
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" {