move some forward decls