Include additional headers needed in apt 1.9

APT 1.9 dropped some includes from headers, so we actually
need to include the headers we're using.