diff --git a/src/Generator/CodeGenerator.cs b/src/Generator/CodeGenerator.cs
index 7b7f29ad..548c0ce8 100644
--- a/src/Generator/CodeGenerator.cs
+++ b/src/Generator/CodeGenerator.cs
@@ -69,16 +69,13 @@ namespace Cxxi
             if (transform != null)
                 transform.Preprocess(new LibraryHelpers(library));
 
-            var passes = new PassBuilder();
-            //passes.AddPass(new Transform());
-            //passes.AddPass(new Preprocess());
+            var passes = new PassBuilder(library);
+            passes.ResolveIncompleteDecls(typeDatabase);
+            passes.CleanInvalidDeclNames();
 
             if (transform != null)
                 transform.SetupPasses(passes);
 
-            var preprocess = new Preprocess(typeDatabase);
-            preprocess.ProcessLibrary(library);
-
             var transformer = new Transform() { Options = options, Passes = passes };
             transformer.TransformLibrary(library);