2 files changed, 7 insertions, 5 deletions
diff --git a/cppu/source/threadpool/current.cxx b/cppu/source/threadpool/current.cxx
index a173140da212..6c66320c57f8 100644
--- a/cppu/source/threadpool/current.cxx
+++ b/cppu/source/threadpool/current.cxx
@@ -17,7 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <sal/config.h>
 
+#include <rtl/byteseq.h>
 #include "rtl/uuid.h"
 #include "osl/thread.h"
 #include "osl/mutex.hxx"
diff --git a/cppu/source/threadpool/current.hxx b/cppu/source/threadpool/current.hxx
index d69d1eade5e3..ea26851ddb00 100644
--- a/cppu/source/threadpool/current.hxx
+++ b/cppu/source/threadpool/current.hxx
@@ -20,18 +20,18 @@
 #ifndef INCLUDED_CPPU_SOURCE_THREADPOOL_CURRENT_HXX
 #define INCLUDED_CPPU_SOURCE_THREADPOOL_CURRENT_HXX
 
-#include "rtl/byteseq.h"
+#include <sal/config.h>
 
-typedef struct _uno_ExtEnvironment uno_ExtEnvironment;
+#include <sal/types.h>
+
+struct _uno_ExtEnvironment;
 
 namespace cppu
 {
-struct CurrentContext;
-
 struct IdContainer
 {
     void *               pCurrentContext;
-    uno_ExtEnvironment * pCurrentContextEnv;
+    _uno_ExtEnvironment * pCurrentContextEnv;
 
     bool            bInit;
     sal_Sequence *      pLocalThreadId;