Merge "Move variables declarations from header to source" into tizen