diff --git a/cmd/genbindings/intermediate.go b/cmd/genbindings/intermediate.go
index 102d29c8..3c08d88e 100644
--- a/cmd/genbindings/intermediate.go
+++ b/cmd/genbindings/intermediate.go
@@ -7,6 +7,7 @@ import (
 
 type lookupResultClass struct {
 	PackageName string
+	Class       CppClass
 }
 
 type lookupResultTypedef struct {
diff --git a/cmd/genbindings/main.go b/cmd/genbindings/main.go
index 7cb04d84..a212af40 100644
--- a/cmd/genbindings/main.go
+++ b/cmd/genbindings/main.go
@@ -165,7 +165,7 @@ func generate(packageName string, srcDirs []string, allowHeaderFn func(string) b
 
 		// Update global state tracker (AFTER astTransformChildClasses)
 		for _, c := range parsed.Classes {
-			KnownClassnames[c.ClassName] = lookupResultClass{packageName}
+			KnownClassnames[c.ClassName] = lookupResultClass{packageName, c /* copy */}
 		}
 		for _, td := range parsed.Typedefs {
 			KnownTypedefs[td.Alias] = lookupResultTypedef{packageName, td /* copy */}