diff --git a/lib/Doctrine/Compiler.php b/lib/Doctrine/Compiler.php
index 4db8d5204..602487ff7 100644
--- a/lib/Doctrine/Compiler.php
+++ b/lib/Doctrine/Compiler.php
@@ -32,64 +32,75 @@ class Doctrine_Compiler {
      * @var array $classes          an array containing all runtime classes of Doctrine framework
      */
     private static $classes = array(
-                         "Doctrine",
-                         "Configurable",
-                         "Overloadable",
-                         "Access",
-
-                         "Manager",
-                         "Table",
-                         "Table_Exception",
-                         "Exception",
-
-                         "Null",
-                         "Identifier",
-                         "Record",
-                         "Record_Exception",
-                         "Record_Iterator",
-                         "Collection",
-                         "Collection_Immediate",
-                         "Validator",
-                         "Validator_Exception",
-                         "Validator_Notnull",
-                         "Validator_Nospace",
-                         "Validator_Range",
-                         "Validator_Regexp",
-                         "Validator_Country",
-                         "Validator_Notblank",
-                         "Validator_Creditcard",
-                         "Validator_Date",
-                         "Validator_Ip",
-                         "Validator_Unique",
-                         "Validator_Usstate",
-                         "Validator_Htmlcolor",
-                         "Validator_Email",
-                         "Hydrate",
-                         "Query",
-                         "Query_Part",
-                         "Query_From",
-                         "Query_Orderby",
-                         "Query_Groupby",
-                         "Query_Condition",
-                         "Query_Where",
-                         "Query_Having",
-                         "Query_Exception",
-                         "RawSql",
-                         "RawSql_Exception",
-                         "EventListener_Interface",
-                         "EventListener",
-                         "EventListener_Empty",
-                         "EventListener_Chain",
-                         "Relation",
-                         "Relation_ForeignKey",
-                         "Relation_LocalKey",
-                         "Relation_Association",
-                         "DB",
-                         "DBStatement",
-                         "Connection",
-                         "Connection_Exception",
-                         "Connection_UnitOfWork",
-                         "Connection_Transaction");
+                         'Access',
+                         'Adapter_Exception',
+                         'Adapter_Interface',
+                         'Doctrine',
+                         'Configurable',
+                         'Collection',
+                         'Collection_Immediate',
+                         'Connection',
+                         'Connection_Exception',
+                         'Connection_UnitOfWork',
+                         'Connection_Transaction',
+                         'DB',
+                         'DB_Exception',
+                         'DB_EventListener',
+                         'DB_Event',
+                         'DB_EventListener_Chain',
+                         'DB_EventListener_Interface',
+                         'DB_Profiler',
+                         'DB_Statement',
+                         'Exception',
+                         'EventListener_Interface',
+                         'EventListener',
+                         'EventListener_Empty',
+                         'EventListener_Chain',
+                         'Hydrate',
+                         'Identifier',
+                         'Locking_Exception',
+                         'Manager',
+                         'Null',
+                         'Overloadable',
+                         'Query',
+                         'Query_Part',
+                         'Query_From',
+                         'Query_Orderby',
+                         'Query_Groupby',
+                         'Query_Condition',
+                         'Query_Where',
+                         'Query_Having',
+                         'Query_Exception',
+                         'Query_Set',
+                         'RawSql',
+                         'RawSql_Exception',
+                         'Record',
+                         'Record_Exception',
+                         'Record_Iterator',
+                         'Relation',
+                         'Relation_ForeignKey',
+                         'Relation_LocalKey',
+                         'Relation_Association',
+                         'Relation_Association_Self',
+                         'Table',
+                         'Table_Exception',
+                         'Validator',
+                         'Validator_Exception',
+                         'Validator_Notnull',
+                         'Validator_Nospace',
+                         'Validator_Range',
+                         'Validator_Regexp',
+                         'Validator_Country',
+                         'Validator_Notblank',
+                         'Validator_Creditcard',
+                         'Validator_Date',
+                         'Validator_Ip',
+                         'Validator_Unique',
+                         'Validator_Usstate',
+                         'Validator_Htmlcolor',
+                         'Validator_Email',
+                         'View',
+                         'View_Exception');
 
     /**
      * getRuntimeClasses