Index: SfMapBuilderBuilder.php
===================================================================
--- SfMapBuilderBuilder.php	(revision 5043)
+++ SfMapBuilderBuilder.php	(working copy)
@@ -20,12 +20,17 @@
 {
   public function build()
   {
+    $mapCode = parent::build();
     if (!DataModelBuilder::getBuildProperty('builderAddComments'))
     {
-      return sfToolkit::stripComments(parent::build());
+      $mapCode =  sfToolkit::stripComments($mapCode);
     }
-    
-    return parent::build();
+    if (!DataModelBuilder::getBuildProperty('builderAddIncludes'))
+    {
+      // remove all inline includes:
+      // at the moment map classes do not have inline includes
+    }
+    return $mapCode;
   }
 
   protected function addIncludes(&$script)
Index: SfObjectBuilder.php
===================================================================
--- SfObjectBuilder.php	(revision 5043)
+++ SfObjectBuilder.php	(working copy)
@@ -20,12 +20,18 @@
 {
   public function build()
   {
+    $objectCode = parent::build();
     if (!DataModelBuilder::getBuildProperty('builderAddComments'))
     {
-      return sfToolkit::stripComments(parent::build());
+      $objectCode =  sfToolkit::stripComments($objectCode);
     }
-    
-    return parent::build();
+    if (!DataModelBuilder::getBuildProperty('builderAddIncludes'))
+    {
+      //remove all inline includes:
+      //object classes include the peers
+      $objectCode = preg_replace("/include_once\s*.*Base.*Peer\.php.*\s*/", "", $objectCode);
+    }
+    return $objectCode;
   }
 
   protected function addIncludes(&$script)
Index: SfPeerBuilder.php
===================================================================
--- SfPeerBuilder.php	(revision 5043)
+++ SfPeerBuilder.php	(working copy)
@@ -20,12 +20,18 @@
 {
   public function build()
   {
+    $peerCode = parent::build();
     if (!DataModelBuilder::getBuildProperty('builderAddComments'))
     {
-      return sfToolkit::stripComments(parent::build());
+      $peerCode =  sfToolkit::stripComments($peerCode);
     }
-
-    return parent::build();
+    if (!DataModelBuilder::getBuildProperty('builderAddIncludes'))
+    {
+      //remove all inline includes:
+      //peer class include inline the mapbuilder classes
+      $peerCode = preg_replace("/(include|require)_once\s*.*MapBuilder\.php.*\s*/", "", $peerCode);
+    }
+    return $peerCode;
   }
 
   protected function addIncludes(&$script)