Remove unneeded use of nesting class.
Plug memory leak.
Merge topic 'memoize-link-iface-includes-defines' into next

c3f43a0 Plug memory leak.
71cbfff Remove unneeded use of nesting class.