--- a/codeviz/lib/CodeViz/CollectCXref.pm
+++ b/codeviz/lib/CodeViz/CollectCXref.pm
@@ -205,7 +205,7 @@ sub readcdepn {
     while (!eof(CDEPFILE)) {
       $line = <CDEPFILE>;
       # Read a function declaration line
-      if ($line =~ /^F {(.*)} {(.+):(.+)}/) {
+      if ($line =~ /^F \{(.*)} \{(.+):(.+)}/) {
         my $fdecl = $1;
         $file = $f;
         $file =~ s/\.cdepn//;
@@ -220,7 +220,7 @@ sub readcdepn {
       }
 
       # Read a function call line
-      if ($line =~ /^C {(.*)} {(.+):(.+)}\s+(.+)/) {
+      if ($line =~ /^C \{(.*)} \{(.+):(.+)}\s+(.+)/) {
         $caller = parseDeclaration($1);
 	$callee = parseDeclaration($4);
         $line   = $3;
--- a/codeviz/lib/CodeViz/CollectCppDepn.pm
+++ b/codeviz/lib/CodeViz/CollectCppDepn.pm
@@ -136,14 +136,14 @@ sub analyse_cdepn {
       # has been included from an external file and 
       # should be ignored, otherwise record it as a function
       # declaration
-      if (/^F {(.*)} {(.+):(.+)}/) {
+      if (/^F \{(.*)} \{(.+):(.+)}/) {
         my $loc="$2:$3";
 	$f1 = parseDeclaration($1);
         
 	#if ($cpp) { $f1 =~ s/<.*>//g; }
         $F{$f1} = "$2:$3";
         $M{$f1}=3;
-      } elsif (/^C {(.*)} {(.+):(.+)}\s+(.+)/) {
+      } elsif (/^C \{(.*)} \{(.+):(.+)}\s+(.+)/) {
         my $loc = "$2:$3";
         # Lines beginning with C are calling a function
         # The key is hashed as "caller:callee" and the