diff --git a/src/tools/builtin.py b/src/tools/builtin.py
index 58cb7f33c..eba1b8c91 100644
--- a/src/tools/builtin.py
+++ b/src/tools/builtin.py
@@ -348,8 +348,11 @@ class SearchedLibTarget (virtual_target.AbstractFileTarget):
 class CScanner (scanner.Scanner):
     def __init__ (self, includes):
         scanner.Scanner.__init__ (self)
-    
-        self.includes_ = includes
+
+        self.includes_ = []
+
+        for i in includes:
+            self.includes_.extend(i.split("&&"))              
 
     def pattern (self):
         return r'#[ \t]*include[ ]*(<(.*)>|"(.*)")'