Moved global vars from header file to c source