snapshot: move declarations to the right interface header