move declarations to source file