Fix warnings about struct/class mixup

I know that we agreed to always use class, but ossi and dt both
prefer struct here.