diff --git a/src/Generator/Generators/CLI/CLIHelpers.cs b/src/Generator/Generators/CLI/CLIHelpers.cs
index a3e64517..7226f17f 100644
--- a/src/Generator/Generators/CLI/CLIHelpers.cs
+++ b/src/Generator/Generators/CLI/CLIHelpers.cs
@@ -292,7 +292,11 @@ namespace Cxxi.Generators.CLI
             Class @class;
             if (field.Type.IsTagDecl(out @class))
             {
-                Includes.Add(GetHeaderFromDecl(@class));
+                if (@class.IsValueType)
+                    Includes.Add(GetHeaderFromDecl(@class));
+                else
+                    VisitClassDecl(@class);
+
                 return true;
             }