diff --git a/new/targets.jam b/new/targets.jam
index 656c7e935..d9abed230 100644
--- a/new/targets.jam
+++ b/new/targets.jam
@@ -309,12 +309,9 @@ rule basic-target ( name : project
                         else 
                         {
                             # Just a source file
-                            # Todo: should use "type.from-file"
                             # FIXME: break an import cycle in a rude way
                             import type ;
-             source-targets +=
-                                [ new virtual-target $(s) : : $(self.project) ] ;                            
-#                            source-targets += [ type.from-file $(s) : $(self.project) ] ;
+                            source-targets += [ type.from-file $(s) : $(self.project) ] ;
                         }
                     }
                     self.generated.$(property-path) = 
diff --git a/new/type.jam b/new/type.jam
index 632a3a2aa..ec5e62c29 100644
--- a/new/type.jam
+++ b/new/type.jam
@@ -58,7 +58,7 @@ rule from-file ( file : project )
     local type = $(.type$(file:S)) ;    
     if ! $(type)
     {
-        warning "cannot determine type for file $(file)" ;
+        # warning "cannot determine type for file $(file)" ;
         return [ new virtual-target $(file) :  : $(project) ] ;            
     }
     else
diff --git a/v2/build/targets.jam b/v2/build/targets.jam
index 656c7e935..d9abed230 100644
--- a/v2/build/targets.jam
+++ b/v2/build/targets.jam
@@ -309,12 +309,9 @@ rule basic-target ( name : project
                         else 
                         {
                             # Just a source file
-                            # Todo: should use "type.from-file"
                             # FIXME: break an import cycle in a rude way
                             import type ;
-             source-targets +=
-                                [ new virtual-target $(s) : : $(self.project) ] ;                            
-#                            source-targets += [ type.from-file $(s) : $(self.project) ] ;
+                            source-targets += [ type.from-file $(s) : $(self.project) ] ;
                         }
                     }
                     self.generated.$(property-path) = 
diff --git a/v2/build/type.jam b/v2/build/type.jam
index 632a3a2aa..ec5e62c29 100644
--- a/v2/build/type.jam
+++ b/v2/build/type.jam
@@ -58,7 +58,7 @@ rule from-file ( file : project )
     local type = $(.type$(file:S)) ;    
     if ! $(type)
     {
-        warning "cannot determine type for file $(file)" ;
+        # warning "cannot determine type for file $(file)" ;
         return [ new virtual-target $(file) :  : $(project) ] ;            
     }
     else