diff --git a/lib/Doctrine/Db/EventListener/Chain.php b/lib/Doctrine/Db/EventListener/Chain.php
index cadf203ac..562fc85ba 100644
--- a/lib/Doctrine/Db/EventListener/Chain.php
+++ b/lib/Doctrine/Db/EventListener/Chain.php
@@ -18,6 +18,9 @@
  * and is licensed under the LGPL. For more information, see
  * <http://www.phpdoctrine.com>.
  */
+Doctrine::autoload('Doctrine_Access');
+
+Doctrine::autoload('Doctrine_Db_EventListener_Interface');
 /**
  * Doctrine_Db_EventListener
  *
diff --git a/lib/Doctrine/Db/LazyConnector.php b/lib/Doctrine/Db/LazyConnector.php
deleted file mode 100644
index 54ee4ab2d..000000000
--- a/lib/Doctrine/Db/LazyConnector.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information, see
- * <http://www.phpdoctrine.com>.
- */
-/**
- * Doctrine_Db_LazyConnector
- *
- * @author      Konsta Vesterinen
- * @license     LGPL
- * @package     Doctrine
- */
-class Doctrine_Db_LazyConnector extends Doctrine_Db_EventListener {
-    public function onPreQuery(Doctrine_Db $dbh, array $args) { 
-        $dbh->connect();
-    }
-
-    public function onPrePrepare(Doctrine_Db $dbh, array $args) { 
-        $dbh->connect();
-    }
-
-    public function onPreCommit(Doctrine_Db $dbh) {
-        $dbh->connect();
-    }
-
-    public function onPreRollBack(Doctrine_Db $dbh) { 
-        $dbh->connect();
-    }
-
-    public function onPreBeginTransaction(Doctrine_Db $dbh) { 
-        $dbh->connect();    
-    }
-}