Move declarations into header file