Move variable declarations from header to source