diff --git a/v2/test/dependency-test/foo.py b/v2/test/dependency-test/foo.py
index e4277cc0e..f807bf4fa 100644
--- a/v2/test/dependency-test/foo.py
+++ b/v2/test/dependency-test/foo.py
@@ -21,6 +21,6 @@ def prepare_foo(targets, sources, properties):
     pass
 
 get_manager().engine().register_action("foo.foo",\
-"""echo $(DECL:E="//")\n > $(<[1])
-echo "#include <z.h>"\n > $(<[2])
+"""echo -e $(DECL:E="//")\\n > $(<[1])
+echo -e "#include <z.h>\\n" > $(<[2])
 """, function=prepare_foo)
diff --git a/v2/tools/builtin.py b/v2/tools/builtin.py
index 5fd28e229..decad8501 100644
--- a/v2/tools/builtin.py
+++ b/v2/tools/builtin.py
@@ -380,7 +380,7 @@ class CScanner (scanner.Scanner):
 
         engine = get_manager().engine()
         engine.set_target_variable(angle, "SEARCH", get_value(self.includes_))
-        engine.set_target_variable(quoted, "SEARCH", get_value(self.includes_))
+        engine.set_target_variable(quoted, "SEARCH", [b] + get_value(self.includes_))
         
         # Just propagate current scanner to includes, in a hope
         # that includes do not change scanners. 
@@ -388,6 +388,7 @@ class CScanner (scanner.Scanner):
         
 scanner.register (CScanner, 'include')
 type.set_scanner ('CPP', CScanner)
+type.set_scanner ('C', CScanner)
 
 # Ported to trunk@47077
 class LibGenerator (generators.Generator):