diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index a8d6883b8ef4..8593fb0bc8e5 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -67,7 +67,6 @@ class SystemWindow;
 class SalFrame;
 class SalObject;
 class MenuFloatingWindow;
-class UNOWindowData;
 // Nur fuer ExecuteDrag:
 struct IDataObject;
 class VCLXWindow;
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index c317e6fa800b..84d87e4bc5dc 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -205,38 +205,6 @@ void UnoWrapper::ReleaseAllGraphics( OutputDevice* pOutDev )
 
 }
 
-// It was once called in the Window-CTOR to make listeners of the Container
-// to react. This didn't really work, as the interface within the Window-CTOR
-// was not ready.
-// => Call only the listener, when created through ::com::sun::star::awt::Toolkit
-
-/*
-void ImplSmartWindowCreated( Window* pNewWindow )
-{
-    UNOWindowData* pParentUNOData = pNewWindow->GetParent() ?
-                            pNewWindow->GetParent()->GetUNOData() : NULL;
-
-    if ( pParentUNOData && pParentUNOData->GetListeners( EL_CONTAINER ) )
-    {
-        UNOWindowData* pUNOData = pNewWindow->GetUNOData();
-        if ( !pUNOData )
-            pUNOData = ImplSmartCreateUNOData( pNewWindow );
-
-        ::com::sun::star::awt::VclContainerEvent aEvent;
-        aEvent.Source = (UsrObject*)pParentUNOData->GetWindowPeer();
-        aEvent.Id = VCLCOMPONENT_ADDED;
-        aEvent.Child = (UsrObject*)pUNOData->GetWindowPeer();
-
-        EventList* pLst = pParentUNOData->GetListeners( EL_CONTAINER );
-        for ( sal_uInt32 n = 0; n < pLst->Count(); n++ )
-        {
-            ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > * pRef = pLst->GetObject( n );
-            ((::com::sun::star::awt::XVclContainerListener*)(::com::sun::star::lang::XEventListener*)*pRef)->windowAdded( aEvent );
-        }
-    }
-}
-*/
-
 static sal_Bool lcl_ImplIsParent( Window* pParentWindow, Window* pPossibleChild )
 {
     Window* pWindow = ( pPossibleChild != pParentWindow ) ? pPossibleChild : NULL;