Include struct name in declaration