Avoid initialization dependencies across compilation units



Avoid initialization dependencies across compilation units