diff --git a/src/Generator/Generators/CLI/CLIHelpers.cs b/src/Generator/Generators/CLI/CLIHelpers.cs
index 3e05ad36..afa29cad 100644
--- a/src/Generator/Generators/CLI/CLIHelpers.cs
+++ b/src/Generator/Generators/CLI/CLIHelpers.cs
@@ -267,6 +267,10 @@ namespace Cxxi.Generators.CLI
 
         public bool VisitClassDecl(Class @class)
         {
+            var completeDecl = @class.CompleteDeclaration as Class;
+            if (@class.IsIncomplete && completeDecl != null)
+                return VisitClassDecl(completeDecl);
+
             if (@class.IsValueType)
             {
                 Refs.Add(string.Format("value struct {0};", @class.Name));