Enclosing superfluous struct removed - causes header parsing tool to fail