diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx
index f81441cd747e..ec4fc389b80b 100644
--- a/basctl/inc/pch/precompiled_basctl.hxx
+++ b/basctl/inc/pch/precompiled_basctl.hxx
@@ -103,7 +103,7 @@
 #include <comphelper/types.hxx>
 #include <config_options.h>
 #include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/component_context.hxx>
 #include <cppuhelper/factory.hxx>
 #include <cppuhelper/supportsservice.hxx>
diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx
index 72814178984b..61b7d2f191d4 100644
--- a/basctl/source/basicide/basicrenderable.cxx
+++ b/basctl/source/basicide/basicrenderable.cxx
@@ -24,7 +24,7 @@
 #include <toolkit/awt/vclxdevice.hxx>
 #include <tools/multisel.hxx>
 #include <tools/resary.hxx>
-
+#include <cppuhelper/compbase.hxx>
 #include <comphelper/propertysequence.hxx>
 
 namespace basctl
@@ -34,7 +34,7 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 
 Renderable::Renderable (BaseWindow* pWin)
-: cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >( maMutex )
+: cppu::WeakComponentImplHelper< com::sun::star::view::XRenderable >( maMutex )
 , mpWindow( pWin )
 {
     ResStringArray aStrings( IDEResId( RID_PRINTDLG_STRLIST )  );
diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx
index e48ffecc1f94..dba38c85eff5 100644
--- a/basctl/source/basicide/basicrenderable.hxx
+++ b/basctl/source/basicide/basicrenderable.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_BASCTL_SOURCE_BASICIDE_BASICRENDERABLE_HXX
 
 #include <com/sun/star/view/XRenderable.hpp>
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 
 #include <vcl/print.hxx>
 
@@ -30,7 +30,7 @@ namespace basctl
 class BaseWindow;
 
 class Renderable :
-    public cppu::WeakComponentImplHelper1< com::sun::star::view::XRenderable >,
+    public cppu::WeakComponentImplHelper< com::sun::star::view::XRenderable >,
     public vcl::PrinterOptionsHelper
 {
     VclPtr<BaseWindow>  mpWindow;
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index c54043d8be63..c21839829f42 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -43,7 +43,7 @@
 #include <svtools/treelistentry.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/help.hxx>
-
+#include <cppuhelper/implbase.hxx>
 #include <vector>
 #include <com/sun/star/reflection/theCoreReflection.hpp>
 
@@ -176,7 +176,7 @@ void lcl_SeparateNameAndIndex( const OUString& rVName, OUString& rVar, OUString&
 
 
 class EditorWindow::ChangesListener:
-    public cppu::WeakImplHelper1< beans::XPropertiesChangeListener >
+    public cppu::WeakImplHelper< beans::XPropertiesChangeListener >
 {
 public:
     explicit ChangesListener(EditorWindow & editor): editor_(editor) {}
diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx
index 7958911dbfef..742e48cd944d 100644
--- a/basctl/source/basicide/basidesh.cxx
+++ b/basctl/source/basicide/basidesh.cxx
@@ -55,6 +55,7 @@
 #include <sfx2/viewfac.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/settings.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace basctl
 {
@@ -62,7 +63,7 @@ namespace basctl
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star;
 
-typedef ::cppu::WeakImplHelper1< container::XContainerListener > ContainerListenerBASE;
+typedef ::cppu::WeakImplHelper< container::XContainerListener > ContainerListenerBASE;
 
 class ContainerListenerImpl : public ContainerListenerBASE
 {
diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx
index 03ba5c1a5f5a..a37a028e6ff2 100644
--- a/basctl/source/basicide/doceventnotifier.cxx
+++ b/basctl/source/basicide/doceventnotifier.cxx
@@ -29,7 +29,7 @@
 #include <comphelper/processfactory.hxx>
 
 
-#include <cppuhelper/compbase1.hxx>
+#include <cppuhelper/compbase.hxx>
 #include <cppuhelper/basemutex.hxx>
 
 namespace basctl
@@ -51,8 +51,8 @@ namespace basctl
 
     // DocumentEventNotifier::Impl
 
-    typedef ::cppu::WeakComponentImplHelper1    <   XDocumentEventListener
-                                                >   DocumentEventNotifier_Impl_Base;
+    typedef ::cppu::WeakComponentImplHelper<   XDocumentEventListener
+                                           >   DocumentEventNotifier_Impl_Base;
 
     enum ListenerAction
     {
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 5f57528894ec..8069443e648e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -54,6 +54,7 @@
 #include <com/sun/star/script/ModuleSizeExceededRequest.hpp>
 
 #include <comphelper/propertysequence.hxx>
+#include <cppuhelper/implbase.hxx>
 
 
 namespace basctl
@@ -65,7 +66,7 @@ using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::ucb;
 using namespace ::com::sun::star::ui::dialogs;
 
-typedef ::cppu::WeakImplHelper1< task::XInteractionHandler > HandlerImpl_BASE;
+typedef ::cppu::WeakImplHelper< task::XInteractionHandler > HandlerImpl_BASE;
 
 namespace
 {
@@ -1165,7 +1166,7 @@ void LibPage::implExportLib( const OUString& aLibName, const OUString& aTargetUR
 }
 
 // Implementation XCommandEnvironment
-typedef cppu::WeakImplHelper1< XCommandEnvironment > LibCommandEnvironmentHelper;
+typedef cppu::WeakImplHelper< XCommandEnvironment > LibCommandEnvironmentHelper;
 
 class OLibCommandEnvironment : public LibCommandEnvironmentHelper
 {
diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx
index e38ea8aac650..f671e50b256a 100644
--- a/basctl/source/inc/dlgedclip.hxx
+++ b/basctl/source/inc/dlgedclip.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_BASCTL_SOURCE_INC_DLGEDCLIP_HXX
 
 #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#include <cppuhelper/implbase2.hxx>
+#include <cppuhelper/implbase.hxx>
 
 namespace basctl
 {
@@ -30,7 +30,7 @@ namespace basctl
 // DlgEdTransferableImpl
 
 
-typedef ::cppu::WeakImplHelper2< ::com::sun::star::datatransfer::XTransferable, ::com::sun::star::datatransfer::clipboard::XClipboardOwner > DlgEdTransferableHelper;
+typedef ::cppu::WeakImplHelper< ::com::sun::star::datatransfer::XTransferable, ::com::sun::star::datatransfer::clipboard::XClipboardOwner > DlgEdTransferableHelper;
 
 class DlgEdTransferableImpl : public DlgEdTransferableHelper
 {
diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx
index 7452dcd85511..fed787ee517c 100644
--- a/basctl/source/inc/dlgedlist.hxx
+++ b/basctl/source/inc/dlgedlist.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_BASCTL_SOURCE_INC_DLGEDLIST_HXX
 #define INCLUDED_BASCTL_SOURCE_INC_DLGEDLIST_HXX
 
-#include <cppuhelper/implbase1.hxx>
+#include <cppuhelper/implbase.hxx>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
 #include <com/sun/star/container/XContainerListener.hpp>
 
@@ -33,7 +33,7 @@ class DlgEdObj;
 // DlgEdPropListenerImpl
 
 
-typedef ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener > PropertyChangeListenerHelper;
+typedef ::cppu::WeakImplHelper< ::com::sun::star::beans::XPropertyChangeListener > PropertyChangeListenerHelper;
 
 class DlgEdPropListenerImpl: public PropertyChangeListenerHelper
 {
@@ -56,7 +56,7 @@ public:
 // DlgEdEvtContListenerImpl
 
 
-typedef ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener > ContainerListenerHelper;
+typedef ::cppu::WeakImplHelper< ::com::sun::star::container::XContainerListener > ContainerListenerHelper;
 
 class DlgEdEvtContListenerImpl: public ContainerListenerHelper
 {