diff --git a/src/AST/Namespace.cs b/src/AST/Namespace.cs
index 03846a85..7bdb4830 100644
--- a/src/AST/Namespace.cs
+++ b/src/AST/Namespace.cs
@@ -170,7 +170,9 @@ namespace CppSharp.AST
 
             if (entries.Count <= 1)
             {
-                return Classes.Find(e => e.Name.Equals(name, stringComparison));
+                var @class = Classes.Find(c => c.Name.Equals(name, stringComparison));
+                return @class.CompleteDeclaration == null ? @class :
+                    (Class) @class.CompleteDeclaration;
             }
 
             var className = entries[entries.Count - 1];