diff --git a/src/Generator/Driver.cs b/src/Generator/Driver.cs
index 4bab6bd2..7bf9b7d9 100644
--- a/src/Generator/Driver.cs
+++ b/src/Generator/Driver.cs
@@ -32,6 +32,10 @@ namespace Cxxi
             transform.SetupHeaders(headers);
 
             var parser = new Parser(options);
+            parser.HeaderParsed += (file, success) =>
+                Console.WriteLine(success ? "  Parsed '" + file + "'." :
+                                            "  Could not parse '" + file + "'.");
+
             parser.ParseHeaders(headers);
             parser.ParseHeaders(options.Headers);
 
diff --git a/src/Generator/Parser.cs b/src/Generator/Parser.cs
index 7ac366b1..e44375cf 100644
--- a/src/Generator/Parser.cs
+++ b/src/Generator/Parser.cs
@@ -32,14 +32,12 @@ namespace Cxxi
                 toolSetToUse = options.ToolsetToUse
             };
 
-            if (!ClangParser.Parse(parserOptions))
-            {
-                //Console.WriteLine("  Could not parse '" + file + "'.");
-                return false;
-            }
+            var result = ClangParser.Parse(parserOptions);
+            HeaderParsed(file, result);
 
-            //Console.WriteLine("  Parsed '" + file + "'.");
-            return true;
+            return result;
         }
+
+        public Action<string, bool> HeaderParsed = delegate {};
     }
 }