Remove unused include from master.
Replace static with function.