Remove the need for StaticInit and clean up CommonProxies.cpp includes