diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 3ccf83a224f8..706afe09202f 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -29,7 +29,7 @@
 #include "precompiled_svtools.hxx"
 #include "svtools/genericunodialog.hxx"
 #include <svtools/addresstemplate.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/property.hxx>
 #include <com/sun/star/sdbc/XDataSource.hpp>
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index a7ece1acc369..a1fdc7840a55 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -34,7 +34,7 @@
 #include <com/sun/star/ucb/AlreadyInitializedException.hpp>
 
 #include <toolkit/awt/vclxwindow.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/property.hxx>
 #include <osl/diagnose.h>
diff --git a/unotools/inc/unotools/unotunnelhelper.hxx b/unotools/inc/unotools/unotunnelhelper.hxx
index ec4f1243f4d9..1054249de54b 100644
--- a/unotools/inc/unotools/unotunnelhelper.hxx
+++ b/unotools/inc/unotools/unotunnelhelper.hxx
@@ -33,10 +33,7 @@
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <rtl/uuid.h>
 #include <rtl/memory.h>
-
-#ifndef _CPPUHELPER_EXTRACT_HXX_
-#include <cppuhelper/extract.hxx>
-#endif
+#include <comphelper/extract.hxx>
 
 namespace utl
 {