missing include + moved struct